Shared lazy label factory for multi-ID retrieval

Author: philippesaade-wmde

main.py

@@ -5,7 +5,7 @@
 import requests
 
 from src.Normalizer import TTLNormalizer, JSONNormalizer
-from src.WikidataLabel import WikidataLabel
+from src.WikidataLabel import WikidataLabel, LazyLabelFactory
 from src import utils
 
 # Start Fastapi app
@@ -89,6 +89,7 @@ async def get_textified_wd(
             filter_pids = [p.strip() for p in pid.split(',')]
 
         qids = [q.strip() for q in id.split(',')]
+        label_factory = LazyLabelFactory(lang=lang, fallback_lang=fallback_lang)
 
         entities = {}
         if len(qids) == 1:
@@ -107,6 +108,7 @@ async def get_textified_wd(
                 ttl_text=entity_data,
                 lang=lang,
                 fallback_lang=fallback_lang,
+                label_factory=label_factory,
                 debug=False,
             )
 
@@ -135,6 +137,7 @@ async def get_textified_wd(
                     entity_json=entity_data[qid],
                     lang=lang,
                     fallback_lang=fallback_lang,
+                    label_factory=label_factory,
                     debug=False,
                 ) if entity_data.get(qid) else None
                 for qid in qids

src/Normalizer/JSONNormalizer.py

@@ -26,6 +26,7 @@ def __init__(
         entity_json: Dict[str, Any],
         lang: str = "en",
         fallback_lang: str = "en",
+        label_factory: Optional[LazyLabelFactory] = None,
         debug: bool = False,
     ):
         self.entity_id = entity_id
@@ -35,7 +36,8 @@ def __init__(
         self.fallback_lang = fallback_lang
         self.debug = debug
 
-        self.label_factory = LazyLabelFactory(lang=lang, fallback_lang=fallback_lang)
+
+        self.label_factory = label_factory or LazyLabelFactory(lang=lang, fallback_lang=fallback_lang)
 
     # -------------------------------------------------------------------------
     # Public API

src/Normalizer/TTLNormalizer.py

@@ -60,6 +60,7 @@ def __init__(
         ttl_text: str,
         lang: str = "en",
         fallback_lang: str = "en",
+        label_factory: Optional[LazyLabelFactory] = None,
         debug: bool = False,
     ):
         self.entity_id = entity_id
@@ -70,7 +71,7 @@ def __init__(
         self.fallback_lang = fallback_lang
         self.debug = debug
 
-        self.label_factory = LazyLabelFactory(lang=lang, fallback_lang=fallback_lang)
+        self.label_factory = label_factory or LazyLabelFactory(lang=lang, fallback_lang=fallback_lang)
 
     # -------------------------------------------------------------------------
     # Public API