fix scope bug and py2 bug

ecohealthalliance · Apr 26, 2019 · 02faeb9 · 02faeb9
1 parent 8c1ad2c
commit 02faeb9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/epitator/incident_annotator.py b/epitator/incident_annotator.py
@@ -109,14 +109,14 @@ def annotate(self, doc, case_counts=None):
                 span.start,
                 span.end,
                 span.doc,
-                metadata=format_geoname(span.metadata['geoname'].to_dict()))
+                metadata=dict(geoname=format_geoname(span.metadata['geoname'].to_dict())))
             for span in geonames]
         geoname_spans += [
             AnnoSpan(
                 span.start,
                 span.end,
                 span.doc,
-                metadata={
+                metadata=dict(geoname={
                     'name': 'Earth',
                     'id': '6295630',
                     'asciiname': 'Earth',
@@ -129,14 +129,14 @@ def annotate(self, doc, case_counts=None):
                     'admin2Code': '',
                     'latitude': 0,
                     'longitude': 0,
-                })
+                }))
             for span in doc.create_regex_tier(r"\b(global(ly)?|worldwide)\b").spans]
         geoname_spans += [
             AnnoSpan(
                 span.start,
                 span.end,
                 span.doc,
-                metadata=None)
+                metadata={})
             for span in doc.create_regex_tier(r"\b(national(ly)?|nationwide)\b").spans]
         geonames = AnnoTier(geoname_spans)
         sent_spans = doc.require_tiers('spacy.sentences', via=SpacyAnnotator)
@@ -209,7 +209,7 @@ def annotate(self, doc, case_counts=None):
             # grouping is done to deduplicate geonames
             geonames_by_id = {}
             for span in geoname_territory.metadata:
-                geoname = span.metadata
+                geoname = span.metadata.get('geoname')
                 if geoname:
                     geonames_by_id[geoname['id']] = geoname
                 incident_spans.append(span)

diff --git a/epitator/raw_number_annotator.py b/epitator/raw_number_annotator.py
@@ -6,7 +6,9 @@
 from .date_annotator import DateAnnotator
 from . import utils
 import re
-import math
+
+
+infinity = float('inf')
 
 
 def is_valid_number(num_string):
@@ -16,7 +18,7 @@ def is_valid_number(num_string):
     if num_string[0] == '0' and len(num_string) > 1:
         return False
     value = utils.parse_spelled_number(num_string)
-    return value not in [None, math.inf]
+    return value not in [None, infinity]
 
 
 class RawNumberAnnotator(Annotator):