Merge pull request #38 from ccb-hms/development

Fixes None bug
ccb-hms · Aug 9, 2023 · 50a0f94 · 50a0f94
2 parents 0789b8e + 7ecae8b
commit 50a0f94
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/test/simple-test.py b/test/simple-test.py
@@ -12,7 +12,7 @@ def main():
 	# caches = text2term.cache_ontology_set("text2term/resources/ontologies.csv")
 	# df = text2term.map_terms(["asthma", "disease location", "obsolete food allergy"], "EFO", min_score=.8, mapper=text2term.Mapper.JARO_WINKLER, excl_deprecated=True, use_cache=True, term_type="classes")
 	# df = text2term.map_terms(["contains", "asthma"], "EFO", term_type="classes")
-	df = text2term.map_terms({"asthma":"disease", "allergy":["ignore", "response"], "assdhfbswif":["sent"], "isdjfnsdfwd":""}, "EFO", excl_deprecated=True, use_cache=True, incl_unmapped=True)
+	df = text2term.map_terms({"asthma":"disease", "allergy":["ignore", "response"], "assdhfbswif":["sent"], "isdjfnsdfwd":None}, "EFO", excl_deprecated=True, use_cache=True, incl_unmapped=True)
 	# taggedterms = text2term.preprocess_tagged_terms("test/simple_preprocess.txt")
 	# df = text2term.map_terms(taggedterms, "EFO", excl_deprecated=True, use_cache=True, incl_unmapped=True)
 	print(df.to_string())

diff --git a/text2term/config.py b/text2term/config.py
@@ -1 +1 @@
-VERSION = "3.0.0"
+VERSION = "3.0.1"
diff --git a/text2term/t2t.py b/text2term/t2t.py
@@ -238,7 +238,9 @@ def _add_unmapped_terms(mappings_df, tags, source_terms, source_terms_ids):
 def _add_tag(tags, term, to_add, ignore=False):
     if isinstance(tags, dict):
         new_tags = tags.get(term, [])
-        if not any(tag in IGNORE_TAGS for tag in new_tags):
+        if new_tags is None:
+            new_tags = []
+        if not (ignore and any(tag in IGNORE_TAGS for tag in new_tags)):
             if isinstance(new_tags, list):
                 new_tags.append(to_add)
             elif new_tags != "":