From a5182d1203f730b1118dd2cb83ac9091a3b1a32a Mon Sep 17 00:00:00 2001 From: Osma Suominen Date: Fri, 22 Sep 2023 15:55:46 +0300 Subject: [PATCH] optimization: load a vocabulary only once even if used in different languages --- annif/registry.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/annif/registry.py b/annif/registry.py index 81bd541ef..a97dc366e 100644 --- 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: