personal_knowledge_library 3.3.2__py3-none-any.whl → 3.4.0__py3-none-any.whl

knowledge/services/base.py

@@ -164,8 +164,8 @@ def handle_error(
     ----------
     message: str
         Error message
-    response: aiohttp.ClientResponse
-        Response
+    response: Response
+        Response from the service
     parameters: Optional[Dict[str, Any]] (Default:= None)
         Parameters
     payload: Optional[Dict[str, Any]] (Default:= None)
@@ -300,8 +300,9 @@ class WacomServiceAPIClient(RESTAPIClient):
             raise WacomServiceException(f"Unknown session id:= {self.__current_session_id}. Please login first.")
         return session
 
-    def request_user_token(self, tenant_api_key: str, external_id: str, timeout: int = DEFAULT_TIMEOUT) \
-            -> Tuple[str, str, datetime]:
+    def request_user_token(
+        self, tenant_api_key: str, external_id: str, timeout: int = DEFAULT_TIMEOUT
+    ) -> Tuple[str, str, datetime]:
         """
         Login as user by using the tenant key and its external user id.
 
@@ -336,8 +337,7 @@ class WacomServiceAPIClient(RESTAPIClient):
         }
         payload: dict = {EXTERNAL_USER_ID: external_id}
         response: Response = requests.post(
-            url, headers=headers, json=payload, timeout=timeout, verify=self.verify_calls,
-            allow_redirects=True
+            url, headers=headers, json=payload, timeout=timeout, verify=self.verify_calls, allow_redirects=True
         )
         if response.ok:
             try:

knowledge/services/graph.py

@@ -229,7 +229,8 @@ class WacomKnowledgeService(WacomServiceAPIClient):
                 return thing
             raise handle_error(f"Retrieving of entity content failed. URI:={uri}.", response)
 
-    def entities(self,
+    def entities(
+        self,
         uris: List[str],
         locale: Optional[LocaleCode] = None,
         auth_key: Optional[str] = None,
@@ -282,8 +283,9 @@ class WacomKnowledgeService(WacomServiceAPIClient):
         with requests.Session() as session:
             retries: Retry = Retry(total=max_retries, backoff_factor=backoff_factor, status_forcelist=STATUS_FORCE_LIST)
             session.mount(mount_point, HTTPAdapter(max_retries=retries))
-            response: Response = session.get(url, params=params, headers=headers, timeout=timeout,
-                                             verify=self.verify_calls)
+            response: Response = session.get(
+                url, params=params, headers=headers, timeout=timeout, verify=self.verify_calls
+            )
             if response.ok:
                 things: List[ThingObject] = []
                 entities: List[Dict[str, Any]] = response.json()
@@ -1743,7 +1745,7 @@ class WacomKnowledgeService(WacomServiceAPIClient):
                     _, file_extension = os.path.splitext(file_name.lower())
                     if file_extension not in MIME_TYPE:
                         raise handle_error(
-                            "Creation of entity image failed. Mime-type cannot be identified or is not " "supported.",
+                            "Creation of entity image failed. " "Mime-type cannot be identified or is not supported.",
                             response,
                         )
                     mime_type = MIME_TYPE[file_extension]
@@ -1914,6 +1916,8 @@ class WacomKnowledgeService(WacomServiceAPIClient):
         ------
         WacomServiceException
             If the graph service returns an error code.
+        FileNotFoundError
+            If the file does not exist.
         """
         if not file_path.exists():
             raise FileNotFoundError(f"The file {file_path} does not exist.")
@@ -1929,7 +1933,9 @@ class WacomKnowledgeService(WacomServiceAPIClient):
             url: str = f"{self.service_base_url}{self.IMPORT_ENTITIES_ENDPOINT}"
             mount_point: str = "https://" if self.service_url.startswith("https") else "http://"
             with requests.Session() as session:
-                retries: Retry = Retry(total=max_retries, backoff_factor=backoff_factor, status_forcelist=STATUS_FORCE_LIST)
+                retries: Retry = Retry(
+                    total=max_retries, backoff_factor=backoff_factor, status_forcelist=STATUS_FORCE_LIST
+                )
                 session.mount(mount_point, HTTPAdapter(max_retries=retries))
                 response: Response = session.post(
                     url, headers=headers, files=files, timeout=timeout, verify=self.verify_calls

knowledge/services/helper.py

@@ -92,13 +92,6 @@ def entity_payload(entity: ThingObject) -> Dict[str, Any]:
 
         if len(desc.content) > 0 and not desc.content == " ":
             descriptions.append({DESCRIPTION_TAG: desc.content, LOCALE_TAG: desc.language_code})
-    if len(descriptions) == 0:
-        #  Adding an empty description
-        for label in entity.label:
-            if len(label.content) > 0 and not label.content == " ":
-                descriptions.append(
-                    {DESCRIPTION_TAG: f"Description of {label.content}", LOCALE_TAG: label.language_code}
-                )
 
     # Labels are tagged as main label
     for label in entity.label:

knowledge/services/ontology.py

@@ -1179,8 +1179,9 @@ class OntologyService(WacomServiceAPIClient):
         with requests.Session() as session:
             retries: Retry = Retry(total=max_retries, backoff_factor=backoff_factor, status_forcelist=STATUS_FORCE_LIST)
             session.mount(mount_point, HTTPAdapter(max_retries=retries))
-            response: Response = session.put(url, params=params, headers=headers, verify=self.verify_calls,
-                                             timeout=timeout)
+            response: Response = session.put(
+                url, params=params, headers=headers, verify=self.verify_calls, timeout=timeout
+            )
             if not response.ok:
                 raise handle_error("Commit of ontology failed.", response, headers=headers)
 

knowledge/services/tenant.py

@@ -68,9 +68,6 @@ class TenantManagementServiceAPI(WacomServiceAPIClient):
         name: str,
         create_and_apply_onto: bool = True,
         rights: Optional[List[str]] = None,
-        vector_search_data_properties: Optional[List[str]] = None,
-        vector_search_object_properties: Optional[List[str]] = None,
-        content_data_property_name: str = "",
         timeout: int = DEFAULT_TIMEOUT,
         max_retries: int = DEFAULT_MAX_RETRIES,
         backoff_factor: float = DEFAULT_BACKOFF_FACTOR,
@@ -86,12 +83,6 @@ class TenantManagementServiceAPI(WacomServiceAPIClient):
             Creates and applies the ontology.
         rights: List[str]
             List of rights for the tenant. They are encoded in the user token, e.g., "ink-to-text"
-        vector_search_data_properties: List[str]
-            List of data properties that are automatically added to meta-data of the vector search index documents.
-        vector_search_object_properties: List[str]
-            List of object properties that are automatically added to meta-data of the vector search index documents.
-        content_data_property_name: str
-            The data property that is used to indexing its content to the document index.
         timeout: int
             Timeout for the request (default: 60 seconds)
         max_retries: int
@@ -121,13 +112,7 @@ class TenantManagementServiceAPI(WacomServiceAPIClient):
             AUTHORIZATION_HEADER_FLAG: f"Bearer {self.__tenant_management_token}",
             CONTENT_TYPE_HEADER_FLAG: "application/json",
         }
-        payload: dict = {
-            "name": name,
-            "rights": rights if rights else [],
-            "vectorSearchDataProperties": vector_search_data_properties if vector_search_object_properties else [],
-            "vectorSearchObjectProperties": vector_search_object_properties if vector_search_object_properties else [],
-            "contentDataPropertyName": content_data_property_name,
-        }
+        payload: dict = {"name": name, "rights": rights if rights else []}
         params: dict = {"createAndApplyOnto": create_and_apply_onto}
         mount_point: str = "https://" if self.service_url.startswith("https") else "http://"
         with requests.Session() as session:
@@ -227,9 +212,8 @@ class TenantManagementServiceAPI(WacomServiceAPIClient):
             "vectorSearchDataProperties": vector_search_data_properties,
             "vectorSearchObjectProperties": vector_search_object_properties,
             "contentDataPropertyName": content_data_property_name,
+            "rights": rights,
         }
-        if len(rights) > 0:
-            payload["rights"] = rights
         mount_point: str = "https://" if self.service_url.startswith("https") else "http://"
         with requests.Session() as session:
             retries: Retry = Retry(total=max_retries, backoff_factor=backoff_factor, status_forcelist=STATUS_FORCE_LIST)

knowledge/services/users.py

@@ -176,7 +176,7 @@ class UserManagementServiceAPI(WacomServiceAPIClient):
         timeout: int = DEFAULT_TIMEOUT,
     ) -> Tuple[User, str, str, datetime]:
         """
-        Creates user for a tenant.
+        Creates a user for a tenant.
 
         Parameters
         ----------
@@ -430,7 +430,7 @@ class UserManagementServiceAPI(WacomServiceAPIClient):
         """
         url: str = f"{self.service_base_url}{UserManagementServiceAPI.USER_ENDPOINT}"
         headers: Dict[str, str] = {USER_AGENT_TAG: self.user_agent, TENANT_API_KEY_FLAG: tenant_key}
-        params: Dict[str, str] = {OFFSET_TAG: offset, LIMIT_TAG: limit}
+        params: Dict[str, int] = {OFFSET_TAG: offset, LIMIT_TAG: limit}
         mount_point: str = "https://" if self.service_url.startswith("https") else "http://"
         with requests.Session() as session:
             retries: Retry = Retry(total=max_retries, backoff_factor=backoff_factor, status_forcelist=STATUS_FORCE_LIST)

knowledge/utils/graph.py

@@ -1,12 +1,17 @@
 # -*- coding: utf-8 -*-
 # Copyright © 2024-present Wacom. All rights reserved.
+import asyncio
 from typing import Optional, Iterator, Tuple, AsyncIterator
 
+import loguru
+
 from knowledge.base.language import LocaleCode
 from knowledge.base.ontology import OntologyClassReference, ThingObject
 from knowledge.services.asyncio.graph import AsyncWacomKnowledgeService
 from knowledge.services.graph import WacomKnowledgeService, Visibility
 
+logger = loguru.logger
+
 
 def count_things(
     wacom_client: WacomKnowledgeService,
@@ -401,17 +406,21 @@ async def async_things_session_iter(
         raise ValueError("No session configured for client")
 
     while True:
-        things, _, next_page_id = await async_client.listing(
-            concept_type,
-            visibility=visibility,
-            is_owner=only_own,
-            locale=locale,
-            limit=fetch_size,
-            page_id=next_page_id,
-        )
-        if len(things) == 0:
-            return
-        for obj in things:
-            await async_client.handle_token(force_refresh_timeout=force_refresh_timeout)
-            if obj.owner or not only_own:
-                yield obj
+        try:
+            things, _, next_page_id = await async_client.listing(
+                concept_type,
+                visibility=visibility,
+                is_owner=only_own,
+                locale=locale,
+                limit=fetch_size,
+                page_id=next_page_id,
+            )
+            if len(things) == 0:
+                return
+            for obj in things:
+                await async_client.handle_token(force_refresh_timeout=force_refresh_timeout)
+                if obj.owner or not only_own:
+                    yield obj
+        except TimeoutError as e:
+            logger.error(f"Timeout error while fetching things: {e}")
+            await asyncio.sleep(2)  # Wait before retrying

{personal_knowledge_library-3.3.2.dist-info → personal_knowledge_library-3.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: personal_knowledge_library
-Version: 3.3.2
+Version: 3.4.0
 Summary: Library to access Wacom's Personal Knowledge graph.
 License-Expression: Apache-2.0
 License-File: LICENSE

{personal_knowledge_library-3.3.2.dist-info → personal_knowledge_library-3.4.0.dist-info}/RECORD

@@ -1,46 +1,46 @@
-knowledge/__init__.py,sha256=flQ1lRI4EvDr7UK_m3TSu6wMprmvVNFrhVlnzMFv3WY,2680
+knowledge/__init__.py,sha256=peGvMBf-uwyMLzHXRnXvPnj0TiGQm22pJdJnLqfhKTk,2680
 knowledge/base/__init__.py,sha256=rgAcl0azO6eoVk1gK9z0UFNlTHj3AN88k6LG-GdATFk,1079
 knowledge/base/access.py,sha256=BSh-6QbeHOCu55XTxA-p3DwEyRzgtN8TSxtcn6UvmZo,4411
 knowledge/base/entity.py,sha256=b-Ana_H_WI2-AT_n-V_HzUL6W9Ri16DcZFS3q4ziI94,8445
 knowledge/base/language.py,sha256=L4VAKRuFRQxE0BfzxkQUeChyhvLKoZM7ooqxm0dACO4,1478
-knowledge/base/ontology.py,sha256=kPZAPBYuT-2LY33lldP66hXArqKO8WwZj8SMJhgTEjU,95434
-knowledge/base/response.py,sha256=dqdskdcjKnM142nX_8sDVs8v7xTQjiVY1MqJCI-Dfkc,10918
-knowledge/base/search.py,sha256=J1PSVpTU2JKF9xSZLZZvAbJfFy1HiMPJRzPjHhR7IQM,14722
+knowledge/base/ontology.py,sha256=Ix_LP7np2tDYIQVhVX9cNCf-N_S6RhAuGY3Pm21doL8,95443
+knowledge/base/response.py,sha256=Y1xk5QCRCd2jGosI9FXYFOf4umP1T85AE65dcCeQW7Q,11006
+knowledge/base/search.py,sha256=IBSi4sEUExtPg5s3-4RSQwr2mCU50cdDG4PCR78CR2Y,15241
 knowledge/base/tenant.py,sha256=f2Z_LjUcjIt5J2_Rse9aQyTzJ0sSyVvCzlm8PP3PqY8,6084
 knowledge/nel/__init__.py,sha256=eTT88LV_KQ-Ku-a4RnTv_TUCNogl357ui4KT1pEKMuQ,330
-knowledge/nel/base.py,sha256=EloMv3utdYVaor7dFp0R79IxXd7oXq4kv7AwTHzbQhw,15775
+knowledge/nel/base.py,sha256=Nmt2SrxI8yOVWSCloeE08LQmhIQMlheQMXj4gwnD0w8,15774
 knowledge/nel/engine.py,sha256=2fCGkrS3PVPVEfO6AmYyWDPUOpwIeLxDRmNQT3-eMvo,5456
 knowledge/ontomapping/__init__.py,sha256=u_t6i5a6pYYnf43Q_S6sG7NRLeGuKmahIHW6TFGHqOk,18848
 knowledge/ontomapping/manager.py,sha256=pXBwRGSTcS731df5vewNv6oMgP18HzvnjZqiUgyFIhI,13361
 knowledge/public/__init__.py,sha256=FrW5sqJGVcIfg5IVpt_g7qlWiIYNGA370jkE5mJDhoo,812
 knowledge/public/cache.py,sha256=uKEuW9WN9xPmY-fwWPLSxmdEP6xg-XG3g8fKAmGZgBQ,14510
 knowledge/public/client.py,sha256=7Z-nYhYIni_jKDWJw18CvuUxuOCns74l8XjeEEJXl_Y,15437
-knowledge/public/helper.py,sha256=PDsInMHMHgP8rMvcFk5E47afdE3rC7V3BzPS-DdOsww,13238
+knowledge/public/helper.py,sha256=OJIjo_c1eE-PVlOlgCFHDJLkoXsOXgRWpX6HtfL-LqY,13620
 knowledge/public/relations.py,sha256=DrL-rYuwLzaE2H2TOM2gG1TGqHbkcPL4EsRD54LQqLs,4182
-knowledge/public/wikidata.py,sha256=LwMP2kq2mH5Oi9JhPvG8lN9pZMDlQvxgaZgQKQO3kaM,36683
+knowledge/public/wikidata.py,sha256=9wj99ZhFF_FZzeD75hU3CWy5XzNuMSUu_Tw3Xsfjx7U,36683
 knowledge/services/__init__.py,sha256=Pg4Pd9cCRiQ4-v3E0WCqldOhJFcMmkZrQHA7BY1Z1K8,3604
 knowledge/services/asyncio/__init__.py,sha256=dq9yGTxg_hoQb8E1kEtY4AeB8zrdJfw3-XlPoYn2j5U,225
-knowledge/services/asyncio/base.py,sha256=im6J1CWOp1N1tt6WdJ1uU0R-VFpvdYc6lZu8TyPrU5A,16222
-knowledge/services/asyncio/graph.py,sha256=XLVqDli8-Nr92MuLUKvHDisSqqca3fxg6e3_O0HC_2o,74144
-knowledge/services/asyncio/group.py,sha256=UKbk8vnPqqAkuc5gAd6g3IVOKmUJNqG2lreZM0O-hRg,18356
-knowledge/services/asyncio/search.py,sha256=DMxcevIM_pd6HF2_JTdva7t_zVUdSg5PbjJ8rPkBHi4,16774
-knowledge/services/asyncio/users.py,sha256=NJ7xagjr4gF6yKJXdwa0bz0eaYlQDee5RCEpfQJEHWk,10274
-knowledge/services/base.py,sha256=PdHfObShUBpbAS71LBhe5jOA13Y1JXbUkhRi9op8wis,18018
-knowledge/services/graph.py,sha256=hMGFomueC7lOr7-PjVZWeQn2S-D8FsU-0Ah7lCiAJH4,92095
+knowledge/services/asyncio/base.py,sha256=CaB9Q9enzT6HS4kLjTKHTXVevVB6CXZt-oVq1m_uTfQ,16235
+knowledge/services/asyncio/graph.py,sha256=Yvt0kJZiMFgzKI2PEX9FdkD6InUDNPu6c1vm7iqHaUk,75359
+knowledge/services/asyncio/group.py,sha256=uhfrO5gPnAhf3AK9DQGb1Fla8FlTUYMRY5kens7Vm_0,20133
+knowledge/services/asyncio/search.py,sha256=bn7vHaCO_2GvkGH953Gfssv83qSkWtQ5qk-p5sQplKk,18029
+knowledge/services/asyncio/users.py,sha256=3xzCsZZpEEnBzLziQXUARUorHaimeeTIH15ps_Xr6sQ,10995
+knowledge/services/base.py,sha256=xs7Iz1DUnrmIKzEKvzfME7anris8dpCSR7KQLcbR0m8,18009
+knowledge/services/graph.py,sha256=paHB4j1JYqsmuX9NWHyWPqhTyi5wlr9d4BP9XxwFjSU,92193
 knowledge/services/group.py,sha256=b8dBBrHXqgwpJ7BtUqqweoR_WQH5MZ0aLh0fBBTyHUI,30698
-knowledge/services/helper.py,sha256=NYhRkYXtiFgovsXaQr6rBVN2mjBwOT7cSSuLTyjvzKA,4990
-knowledge/services/ontology.py,sha256=1QewHZoNTNrQe9cAgLMvWRPQ2YYn4IltscEOV9Dy2qM,51800
+knowledge/services/helper.py,sha256=x9dfUSdM39B_ZbHECNnYT5PREl6MK5WSiMA-uZtQh04,4656
+knowledge/services/ontology.py,sha256=8fEOs9k7ajRWyPsmg2UH17RSqmJ1Gr0mVYIirFh84ys,51785
 knowledge/services/search.py,sha256=L97EXWoG7XoYSLP5ABnN5BtOSd7yr9KLR6bZT4vzicc,19862
 knowledge/services/session.py,sha256=y8uTETRMDOBbC30UAlrrtWTN7Zgs2klqHsoMjLO2tq0,14145
-knowledge/services/tenant.py,sha256=rQsUe8qNFTt_WZG4XBTg8QSLoyavuCWLWk3QhU1fBG8,11728
-knowledge/services/users.py,sha256=nOwyZhqERTNFPTN21c_q7-6XaEMb3SnHfnXr4Kf22qk,16594
+knowledge/services/tenant.py,sha256=YOLyJSreylE3lMyrkXWWSAzD8jWA7NDmUvXqaSpaJwg,10707
+knowledge/services/users.py,sha256=-ORhjidxQ3LlqPbERNXnU73oATLT6WVFkaEfCPePATo,16596
 knowledge/utils/__init__.py,sha256=7unsBV5ge6eIyicKCIc_C4OroD-zkKRMVE0jXcH6EOw,313
 knowledge/utils/diff.py,sha256=HrU03qGvkirPqC0vRRZRLA49eI08o-JI3dcHS5-uv4g,26647
-knowledge/utils/graph.py,sha256=kuPZEGhexVN9McoT8JK2ViIrfXTh-nFPv_8XPfG0wlA,12318
+knowledge/utils/graph.py,sha256=IXLVsiIqDB6doaxIy1I38235fCuFFZ-pNXAYQ3vXpzg,12604
 knowledge/utils/import_format.py,sha256=fjuWpd91eAs7MbqSpLrFgdRvFaHK0nzV1L83ByjTmV0,5277
 knowledge/utils/wikidata.py,sha256=vRH-4AMR-3xywyvmDqbjI4KSw4tF4TEYqUGCJmUMqK8,5512
 knowledge/utils/wikipedia.py,sha256=rBuFqYVM58JCj5ISLxuhYVVl2gOIlPLWx7_CghyQgvE,5052
-personal_knowledge_library-3.3.2.dist-info/METADATA,sha256=Cw39qFfSsOaRAyoTJgzlj_MG0aXcLwe1eIKVyr0uKFc,57120
-personal_knowledge_library-3.3.2.dist-info/WHEEL,sha256=M5asmiAlL6HEcOq52Yi5mmk9KmTVjY2RDPtO4p9DMrc,88
-personal_knowledge_library-3.3.2.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-personal_knowledge_library-3.3.2.dist-info/RECORD,,
+personal_knowledge_library-3.4.0.dist-info/METADATA,sha256=ZfMkBQ7eIcOYrUO-iMXGABNqBzHJtVdLRhrzBLGywIw,57120
+personal_knowledge_library-3.4.0.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+personal_knowledge_library-3.4.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+personal_knowledge_library-3.4.0.dist-info/RECORD,,

{personal_knowledge_library-3.3.2.dist-info → personal_knowledge_library-3.4.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.2.0
+Generator: poetry-core 2.2.1
 Root-Is-Purelib: true
 Tag: py3-none-any