personal_knowledge_library 3.3.0__tar.gz → 3.3.2__tar.gz

{personal_knowledge_library-3.3.0 → personal_knowledge_library-3.3.2}/PKG-INFO

@@ -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 → personal_knowledge_library-3.3.2}/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
 

{personal_knowledge_library-3.3.0 → personal_knowledge_library-3.3.2}/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"])

{personal_knowledge_library-3.3.0 → personal_knowledge_library-3.3.2}/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:

{personal_knowledge_library-3.3.0 → personal_knowledge_library-3.3.2}/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 → personal_knowledge_library-3.3.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "personal_knowledge_library"
-version = "3.3.0"
+version = "3.3.2"
 description = "Library to access Wacom's Personal Knowledge graph."
 authors = [{ name = "Markus Weber", email = "markus.weber@wacom.com" }]
 license = "Apache-2.0"