personal_knowledge_library 3.1.0__py3-none-any.whl → 3.1.1__py3-none-any.whl

knowledge/__init__.py

@@ -17,7 +17,7 @@ __license__ = "Wacom"
 __maintainer__ = ["Markus Weber"]
 __email__ = "markus.weber@wacom.com"
 __status__ = "beta"
-__version__ = "3.1.0"
+__version__ = "3.1.1"
 
 import loguru
 

knowledge/public/cache.py

@@ -53,7 +53,7 @@ class WikidataCache:
 
     _instance = None  # Singleton instance
 
-    def __init__(self, max_size: int = 10000):
+    def __init__(self, max_size: int = 100000):
         self.max_size = max_size
         self.cache: OrderedDict = OrderedDict()  # Maintain insertion order for LRU eviction
         self.property_cache: OrderedDict = OrderedDict()  # Cache for properties

knowledge/public/client.py

@@ -3,7 +3,7 @@
 import multiprocessing
 from collections import deque
 from multiprocessing import Pool
-from typing import Union, Any, Dict, List, Tuple, Set
+from typing import Union, Any, Dict, List, Tuple, Set, Optional, Callable
 
 import requests
 from requests import Response
@@ -321,18 +321,10 @@ class WikiDataAPIClient:
         """
         try:
             results: List[WikidataThing] = []
-            request_qids: List[str] = []
-            for qid in qids:
-                if wikidata_cache.qid_in_cache(qid):
-                    results.append(wikidata_cache.get_wikidata_object(qid))
-                else:
-                    request_qids.append(qid)
-            if len(request_qids) > 0:
-                for e in __waiting_multi_request__(request_qids):
+            if len(qids) > 0:
+                for e in __waiting_multi_request__(qids):
                     w_thing = WikidataThing.from_wikidata(e)
                     results.append(w_thing)
-                    # Add the thing to the cache
-                    wikidata_cache.cache_wikidata_object(w_thing)
             return results
         except Exception as e:
             logger.exception(e)
@@ -356,13 +348,16 @@ class WikiDataAPIClient:
         return WikiDataAPIClient.__wikidata_task__(qid)
 
     @staticmethod
-    def retrieve_entities(qids: Union[List[str], Set[str]]) -> List[WikidataThing]:
+    def retrieve_entities(qids: Union[List[str], Set[str]], progress: Optional[Callable[[int, int], None]] = None) \
+            -> List[WikidataThing]:
         """
         Retrieve multiple Wikidata things.
         Parameters
         ----------
         qids: List[str]
             QIDs of the entities.
+        progress: Optional[Callable[[int, int], None]]
+            Optional callback function to report progress.
 
         Returns
         -------
@@ -370,17 +365,40 @@ class WikiDataAPIClient:
             List of wikidata things.
         """
         pulled: List[WikidataThing] = []
+        task_size: int = len(qids)
         if len(qids) == 0:
             return []
-        jobs: List[List[str]] = list(chunks(list(qids), API_LIMIT))
+        missing_qids: List[str] = []
+        for qid in qids:
+            if not wikidata_cache.qid_in_cache(qid):
+                if qid and qid.startswith("Q") and len(qid) > 1:
+                    missing_qids.append(qid)
+            else:
+                pulled.append(wikidata_cache.get_wikidata_object(qid))
+        ctr: int = len(pulled)
+        if progress:
+            progress(len(pulled), task_size)
+        jobs: List[List[str]] = list(chunks(list(missing_qids), API_LIMIT))
         num_processes: int = min(len(jobs), multiprocessing.cpu_count())
         if num_processes > 1:
             with Pool(processes=num_processes) as pool:
                 # Wikidata thing is not support in multiprocessing
                 for lst in pool.imap_unordered(__waiting_multi_request__, jobs):
-                    pulled.extend([WikidataThing.from_wikidata(e) for e in lst])
+                    for w_dict in lst:
+                        w_thing = WikidataThing.from_wikidata(w_dict)
+                        wikidata_cache.cache_wikidata_object(w_thing)
+                        pulled.append(w_thing)
+                        ctr += 1
+                        if progress:
+                            progress(ctr, task_size)
         else:
-            pulled = WikiDataAPIClient.__wikidata_multiple_task__(jobs[0])
+            results = WikiDataAPIClient.__wikidata_multiple_task__(jobs[0])
+            for w_thing in results:
+                wikidata_cache.cache_wikidata_object(w_thing)
+                ctr += 1
+                if progress:
+                    progress(ctr, task_size)
+            pulled.extend(results)
         return pulled
 
     @staticmethod

knowledge/public/wikidata.py

@@ -877,7 +877,7 @@ class WikidataThing:
                             val = {"tabular": data_value["value"]}
                         elif data_type == "entity-schema":
                             val = {"id": data_value["value"]["id"]}
-                        elif data_type == "wikibase-form":
+                        elif data_type in ["wikibase-form", "musical-notation"]:
                             continue
                         else:
                             raise WikiDataAPIException(f"Data type: {data_type} not supported.")

{personal_knowledge_library-3.1.0.dist-info → personal_knowledge_library-3.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: personal_knowledge_library
-Version: 3.1.0
+Version: 3.1.1
 Summary: Library to access Wacom's Personal Knowledge graph.
 License: Apache-2.0
 Keywords: semantic-knowledge,knowledge-graph

{personal_knowledge_library-3.1.0.dist-info → personal_knowledge_library-3.1.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-knowledge/__init__.py,sha256=jQahttsGtb_GDFJCWfJEJ3J_wJF4v-msV1VN4RUG5Fk,2680
+knowledge/__init__.py,sha256=UL4La2Ep9cXbMd4imaLqt6UCqBhjLjusWHDZXU8Pc8s,2680
 knowledge/base/__init__.py,sha256=q0NJRQLhfZ8khE-uZCK0SVA38dzbaMomcgL5Olnjtio,895
 knowledge/base/access.py,sha256=BSh-6QbeHOCu55XTxA-p3DwEyRzgtN8TSxtcn6UvmZo,4411
 knowledge/base/entity.py,sha256=b-Ana_H_WI2-AT_n-V_HzUL6W9Ri16DcZFS3q4ziI94,8445
@@ -12,11 +12,11 @@ knowledge/nel/engine.py,sha256=qvQkfsdeYPWJ_5m8mmGFw1tvd699vOQ3IKoBIwALRWk,5347
 knowledge/ontomapping/__init__.py,sha256=9E-rZpxQPfukjDz_0ymrRieYDpv_e3tvpqDfkWzPJy0,18846
 knowledge/ontomapping/manager.py,sha256=pXBwRGSTcS731df5vewNv6oMgP18HzvnjZqiUgyFIhI,13361
 knowledge/public/__init__.py,sha256=FrW5sqJGVcIfg5IVpt_g7qlWiIYNGA370jkE5mJDhoo,812
-knowledge/public/cache.py,sha256=nqKIVfY45bHsuf4dOe4aPK-JfRL1pT7NQT_KF1puzLY,14509
-knowledge/public/client.py,sha256=kW4bRXgBYxHMNsyyBtMSNTYKNqReaPih_Que2lgNrG0,14676
+knowledge/public/cache.py,sha256=uKEuW9WN9xPmY-fwWPLSxmdEP6xg-XG3g8fKAmGZgBQ,14510
+knowledge/public/client.py,sha256=KA8EwLHAjn1-ggT8keUMaKIJnbJDlFEp0j8V0RT_32I,15437
 knowledge/public/helper.py,sha256=PDsInMHMHgP8rMvcFk5E47afdE3rC7V3BzPS-DdOsww,13238
 knowledge/public/relations.py,sha256=DrL-rYuwLzaE2H2TOM2gG1TGqHbkcPL4EsRD54LQqLs,4182
-knowledge/public/wikidata.py,sha256=wGM4XH5jOF1R7woML90lq28piu9AW7ADgpUcK2qIJV4,36661
+knowledge/public/wikidata.py,sha256=LwMP2kq2mH5Oi9JhPvG8lN9pZMDlQvxgaZgQKQO3kaM,36683
 knowledge/services/__init__.py,sha256=FQMTLg7RYglLwCtEO0sOrgj55YrzSNqJV-yj3aqttb8,3490
 knowledge/services/asyncio/__init__.py,sha256=dq9yGTxg_hoQb8E1kEtY4AeB8zrdJfw3-XlPoYn2j5U,225
 knowledge/services/asyncio/base.py,sha256=im6J1CWOp1N1tt6WdJ1uU0R-VFpvdYc6lZu8TyPrU5A,16222
@@ -37,7 +37,7 @@ knowledge/utils/__init__.py,sha256=rgLqdgZwjuCnqA4NEY9echbGFaJ5YUhqBEkyVv9R9CM,2
 knowledge/utils/graph.py,sha256=kuPZEGhexVN9McoT8JK2ViIrfXTh-nFPv_8XPfG0wlA,12318
 knowledge/utils/wikidata.py,sha256=vRH-4AMR-3xywyvmDqbjI4KSw4tF4TEYqUGCJmUMqK8,5512
 knowledge/utils/wikipedia.py,sha256=rBuFqYVM58JCj5ISLxuhYVVl2gOIlPLWx7_CghyQgvE,5052
-personal_knowledge_library-3.1.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-personal_knowledge_library-3.1.0.dist-info/METADATA,sha256=3tiRSrNWLBnrHbaKzj7WC_y6VMgXKBfwLLTOnoHJqsY,57087
-personal_knowledge_library-3.1.0.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-personal_knowledge_library-3.1.0.dist-info/RECORD,,
+personal_knowledge_library-3.1.1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+personal_knowledge_library-3.1.1.dist-info/METADATA,sha256=kJZ15MOIszkwgs8hv6YMnKXLc0RKNyFfYz9X4r1l6f0,57087
+personal_knowledge_library-3.1.1.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+personal_knowledge_library-3.1.1.dist-info/RECORD,,