personal_knowledge_library 3.3.0__py3-none-any.whl → 3.3.2__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.3.0"
+__version__ = "3.3.2"
 
 import loguru
 

knowledge/services/asyncio/graph.py

@@ -1797,7 +1797,7 @@ class AsyncWacomKnowledgeService(AsyncServiceAPIClient):
                             content_link="",
                             ontology_types=entity_types,
                             entity_type=EntityType.PERSONAL_ENTITY,
-                            tokens=e.get("token"),
+                            tokens=e.get("tokens"),
                             token_indexes=e.get("tokenIndexes"),
                         )
                         ne.relevant_type = OntologyClassReference.parse(e["type"])

knowledge/services/asyncio/search.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # Copyright © 2024 Wacom. All rights reserved.
 import asyncio
-from typing import Dict, Any, Optional, List
+from typing import Dict, Any, Optional, List, Literal
 
 import orjson
 
@@ -333,6 +333,7 @@ class AsyncSemanticSearchClient(AsyncServiceAPIClient):
         locale: str,
         filters: Optional[Dict[str, Any]] = None,
         max_results: int = 10,
+        filter_mode: Optional[Literal["AND", "OR"]] = None,
         auth_key: Optional[str] = None,
     ) -> DocumentSearchResponse:
         """
@@ -348,6 +349,8 @@ class AsyncSemanticSearchClient(AsyncServiceAPIClient):
             Filters for the search
         max_results: int
             Maximum number of results
+        filter_mode: Optional[Literal["AND", "OR"]] = None
+            Filter mode for the search. If None is provided, the default is "AND".
         auth_key: Optional[str] (Default:= None)
             If the auth key is set the logged-in user (if any) will be ignored and the auth key will be used.
 
@@ -375,6 +378,8 @@ class AsyncSemanticSearchClient(AsyncServiceAPIClient):
             "locale": locale,
             "max_results": max_results,
         }
+        if filter_mode:
+            params["filter_mode"] = filter_mode
         async with self.__async_session__() as session:
             async with session.post(url, headers=headers, json=params) as response:
                 if response.ok:
@@ -390,6 +395,7 @@ class AsyncSemanticSearchClient(AsyncServiceAPIClient):
         locale: str,
         filters: Optional[Dict[str, Any]] = None,
         max_results: int = 10,
+        filter_mode: Optional[Literal["AND", "OR"]] = None,
         auth_key: Optional[str] = None,
     ) -> LabelMatchingResponse:
         """
@@ -405,6 +411,8 @@ class AsyncSemanticSearchClient(AsyncServiceAPIClient):
             Filters for the search
         max_results: int
             Maximum number of results
+        filter_mode: Optional[Literal["AND", "OR"]] = None
+            Filter mode for the search. If None is provided, the default is "AND".
         auth_key: Optional[str] (Default:= None)
             If the auth key is set the logged-in user (if any) will be ignored and the auth key will be used.
 
@@ -427,6 +435,8 @@ class AsyncSemanticSearchClient(AsyncServiceAPIClient):
             "locale": locale,
             "max_results": max_results,
         }
+        if filter_mode:
+            params["filter_mode"] = filter_mode
         async with self.__async_session__() as session:
             async with session.post(url, headers=headers, json=params) as response:
                 if response.ok:

knowledge/services/search.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Copyright © 2024-present Wacom. All rights reserved.
-from typing import Dict, Any, Optional, List
+from typing import Dict, Any, Optional, List, Literal
 
 import requests
 from requests.adapters import HTTPAdapter
@@ -373,6 +373,7 @@ class SemanticSearchClient(WacomServiceAPIClient):
         locale: LocaleCode,
         filters: Optional[Dict[str, Any]] = None,
         max_results: int = 10,
+        filter_mode: Optional[Literal["AND", "OR"]] = None,
         max_retries: int = 3,
         backoff_factor: float = 0.1,
         auth_key: Optional[str] = None,
@@ -390,6 +391,8 @@ class SemanticSearchClient(WacomServiceAPIClient):
             Filters for the search
         max_results: int
             Maximum number of results
+        filter_mode: Optional[Literal["AND", "OR"]] = None
+            Filter mode for the search. If None is provided, the default is "AND".
         max_retries: int
             Maximum number of retries
         backoff_factor: float
@@ -421,6 +424,8 @@ class SemanticSearchClient(WacomServiceAPIClient):
             "locale": locale,
             "max_results": max_results,
         }
+        if filter_mode:
+            params["filter_mode"] = filter_mode
         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)
@@ -436,6 +441,7 @@ class SemanticSearchClient(WacomServiceAPIClient):
         query: str,
         locale: LocaleCode,
         filters: Optional[Dict[str, Any]] = None,
+        filter_mode: Optional[Literal["AND", "OR"]] = None,
         max_results: int = 10,
         max_retries: int = 3,
         backoff_factor: float = 0.1,
@@ -454,6 +460,8 @@ class SemanticSearchClient(WacomServiceAPIClient):
             Filters for the search
         max_results: int
             Maximum number of results
+        filter_mode: Optional[Literal["AND", "OR"]] = None
+            Filter mode for the search. If None is provided, the default is "AND".
         max_retries: int
             Maximum number of retries
         backoff_factor: float
@@ -480,6 +488,8 @@ class SemanticSearchClient(WacomServiceAPIClient):
             "locale": locale,
             "max_results": max_results,
         }
+        if filter_mode:
+            params["filter_mode"] = filter_mode
         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)

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

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

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

@@ -1,4 +1,4 @@
-knowledge/__init__.py,sha256=GRwtZsuLOUMj3OElzD5iDRR2A0q7EdiQ-Uu34AgELtw,2680
+knowledge/__init__.py,sha256=flQ1lRI4EvDr7UK_m3TSu6wMprmvVNFrhVlnzMFv3WY,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
@@ -21,16 +21,16 @@ knowledge/public/wikidata.py,sha256=LwMP2kq2mH5Oi9JhPvG8lN9pZMDlQvxgaZgQKQO3kaM,
 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=9ZNNJvWKKYxyJBdTOxpx1Y3Iu1NzI6bdDDbKmgld4CU,74143
+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=fm1j6fJDQx831B82bqmZ3czYrYH3qtPCYlisSF26M5g,16217
+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/group.py,sha256=b8dBBrHXqgwpJ7BtUqqweoR_WQH5MZ0aLh0fBBTyHUI,30698
 knowledge/services/helper.py,sha256=NYhRkYXtiFgovsXaQr6rBVN2mjBwOT7cSSuLTyjvzKA,4990
 knowledge/services/ontology.py,sha256=1QewHZoNTNrQe9cAgLMvWRPQ2YYn4IltscEOV9Dy2qM,51800
-knowledge/services/search.py,sha256=9I4ZdCFnVSCCmYHeQralrw47VwKnMqA08UpAq_BMxQs,19305
+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
@@ -40,7 +40,7 @@ knowledge/utils/graph.py,sha256=kuPZEGhexVN9McoT8JK2ViIrfXTh-nFPv_8XPfG0wlA,1231
 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.0.dist-info/METADATA,sha256=xzv1A74fPWL7oB1DVg9tSVqnDyZ8fBxkmsVp_mzt4Vk,57120
-personal_knowledge_library-3.3.0.dist-info/WHEEL,sha256=M5asmiAlL6HEcOq52Yi5mmk9KmTVjY2RDPtO4p9DMrc,88
-personal_knowledge_library-3.3.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-personal_knowledge_library-3.3.0.dist-info/RECORD,,
+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,,