Merge pull request #736 from NatLibFi/optimize-registry-vocab-language

optimization: load a vocabulary only once even if used in different languages
NatLibFi · Oct 3, 2023 · ff1d32c · ff1d32c
2 parents a231fb3 + a5182d1
commit ff1d32c
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/annif/registry.py b/annif/registry.py
@@ -99,14 +99,11 @@ def get_vocab(
         vocab_id = match.group(1)
         posargs, kwargs = parse_args(match.group(3))
         language = posargs[0] if posargs else default_language
-        vocab_key = (vocab_id, language)
 
         self._init_vars()
-        if vocab_key not in self._vocabs[self._rid]:
-            self._vocabs[self._rid][vocab_key] = AnnifVocabulary(
-                vocab_id, self._datadir
-            )
-        return self._vocabs[self._rid][vocab_key], language
+        if vocab_id not in self._vocabs[self._rid]:
+            self._vocabs[self._rid][vocab_id] = AnnifVocabulary(vocab_id, self._datadir)
+        return self._vocabs[self._rid][vocab_id], language
 
 
 def initialize_projects(app: Flask) -> None: