Merge pull request #25 from odissei-data/development

Development
odissei-data · Mar 19, 2024 · 904e36a · 904e36a
2 parents 26fdba8 + 8943bac
commit 904e36a
Show file tree

Hide file tree

Showing 8 changed files with 53,327 additions and 20 deletions.
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "metadata-enhancer"
-version = "2.2.3"
+version = "2.2.4"
 description = "A service that enriches metadata using controlled vocabularies."
 authors = ["Fjodor van Rijsselberg"]
 include = ["src"]

diff --git a/src/enhancers/VocabularyEnhancer.py b/src/enhancers/VocabularyEnhancer.py
@@ -57,7 +57,7 @@ def vocab_enhance_metadata(self, metadata_block, compound_field, field):
         # match
         for term_dict in matchable_terms:
             term = _try_for_key(term_dict, f'{field}.value')
-            if term in self.added_terms_set:
+            if not term or term in self.added_terms_set:
                 break
             label = term.upper()
             uri = self.query_enrichment_table(label)

diff --git a/src/main.py b/src/main.py
@@ -9,11 +9,10 @@
 from api.queries import CBS_VOCAB_QUERY, ELSST_VOCAB_QUERY
 from api.skosmos import create_table_concepts_skosmos
 from api.fuseki import create_table_terms
-from schema.input import EnhancerInput, VocabInput, LangInput, Lang
+from schema.input import EnhancerInput, VocabInput, Lang
 from version import get_version
 
 app = FastAPI()
-
 GITHUB_RAW_URL = os.environ['GITHUB_RAW_URL']
 ELSST_FUSEKI_URL = os.environ['ELSST_FUSEKI_URL']
 VARIABLE_FUSEKI_URL = os.environ['VARIABLE_FUSEKI_URL']