unique_toolkit 0.5.38__tar.gz → 0.5.39__tar.gz

{unique_toolkit-0.5.38 → unique_toolkit-0.5.39}/CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), 
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+
+
+## [0.5.39] - 2024-12-09
+- Add `contentIds` to `Search.create` and `Search.create_async`
+- Use `metadata_filter` from event in `ContentService.search_content_chunks` and `ContentService.async_search_content_chunks` as default.
+
 ## [0.5.38] - 2024-11-26
 - Added string representation to `LanguageModelMessage` and `LanguageModelMessages` class
 

{unique_toolkit-0.5.38 → unique_toolkit-0.5.39}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: unique_toolkit
-Version: 0.5.38
+Version: 0.5.39
 Summary: 
 License: Proprietary
 Author: Martin Fadler
@@ -17,7 +17,7 @@ Requires-Dist: python-dotenv (>=1.0.1,<2.0.0)
 Requires-Dist: regex (>=2024.5.15,<2025.0.0)
 Requires-Dist: tiktoken (>=0.7.0,<0.8.0)
 Requires-Dist: typing-extensions (>=4.9.0,<5.0.0)
-Requires-Dist: unique-sdk (>=0.9.8,<0.10.0)
+Requires-Dist: unique-sdk (>=0.9.14,<0.10.0)
 Description-Content-Type: text/markdown
 
 # Unique Toolkit
@@ -100,6 +100,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), 
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+
+
+## [0.5.39] - 2024-12-09
+- Add `contentIds` to `Search.create` and `Search.create_async`
+- Use `metadata_filter` from event in `ContentService.search_content_chunks` and `ContentService.async_search_content_chunks` as default.
+
 ## [0.5.38] - 2024-11-26
 - Added string representation to `LanguageModelMessage` and `LanguageModelMessages` class
 

{unique_toolkit-0.5.38 → unique_toolkit-0.5.39}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "unique_toolkit"
-version = "0.5.38"
+version = "0.5.39"
 description = ""
 authors = [
     "Martin Fadler <martin.fadler@unique.ch>",
@@ -20,7 +20,7 @@ numpy = "^1.26.4"
 python-dotenv = "^1.0.1"
 regex = "^2024.5.15"
 tiktoken = "^0.7.0"
-unique-sdk = "^0.9.8"
+unique-sdk = "^0.9.14"
 
 [tool.poetry.group.dev.dependencies]
 ruff = "0.5.0"

{unique_toolkit-0.5.38 → unique_toolkit-0.5.39}/unique_toolkit/content/service.py

@@ -29,6 +29,7 @@ class ContentService(BaseService):
 
     def __init__(self, event: Event, logger: Optional[logging.Logger] = None):
         super().__init__(event, logger)
+        self.metadata_filter = event.payload.metadata_filter
 
     DEFAULT_SEARCH_LANGUAGE = "english"
 
@@ -42,6 +43,7 @@ class ContentService(BaseService):
         scope_ids: Optional[list[str]] = None,
         chat_only: Optional[bool] = None,
         metadata_filter: Optional[dict] = None,
+        content_ids: Optional[list[str]] = None,
     ) -> list[ContentChunk]:
         """
         Performs a synchronous search for content chunks in the knowledge base.
@@ -54,14 +56,17 @@ class ContentService(BaseService):
             reranker_config (Optional[ContentRerankerConfig]): The reranker configuration. Defaults to None.
             scope_ids (Optional[list[str]]): The scope IDs. Defaults to None.
             chat_only (Optional[bool]): Whether to search only in the current chat. Defaults to None.
-            metadata_filter (Optional[dict]): UniqueQL metadata filter. Defaults to None.
-
+            metadata_filter (Optional[dict]): UniqueQL metadata filter. If unspecified/None, it tries to use the metadata filter from the event. Defaults to None.
+            content_ids (Optional[list[str]]): The content IDs to search. Defaults to None.
         Returns:
             list[ContentChunk]: The search results.
         """
         if not scope_ids:
             self.logger.warning("No scope IDs provided for search.")
 
+        if metadata_filter is None:
+            metadata_filter = self.metadata_filter
+
         try:
             searches = unique_sdk.Search.create(
                 user_id=self.event.user_id,
@@ -79,6 +84,7 @@ class ContentService(BaseService):
                 language=search_language,
                 chatOnly=chat_only,
                 metaDataFilter=metadata_filter,
+                contentIds=content_ids,
             )
         except Exception as e:
             self.logger.error(f"Error while searching content chunks: {e}")
@@ -101,6 +107,7 @@ class ContentService(BaseService):
         scope_ids: Optional[list[str]] = None,
         chat_only: Optional[bool] = None,
         metadata_filter: Optional[dict] = None,
+        content_ids: Optional[list[str]] = None,
     ):
         """
         Performs an asynchronous search for content chunks in the knowledge base.
@@ -113,14 +120,17 @@ class ContentService(BaseService):
             reranker_config (Optional[ContentRerankerConfig]): The reranker configuration. Defaults to None.
             scope_ids (Optional[list[str]]): The scope IDs. Defaults to None.
             chat_only (Optional[bool]): Whether to search only in the current chat. Defaults to None.
-            metadata_filter (Optional[dict]): UniqueQL metadata filter. Defaults to None.
-
+            metadata_filter (Optional[dict]): UniqueQL metadata filter. If unspecified/None, it tries to use the metadata filter from the event. Defaults to None.
+            content_ids (Optional[list[str]]): The content IDs to search. Defaults to None.
         Returns:
             list[ContentChunk]: The search results.
         """
         if not scope_ids:
             self.logger.warning("No scope IDs provided for search.")
 
+        if metadata_filter is None:
+            metadata_filter = self.metadata_filter
+
         try:
             searches = await unique_sdk.Search.create_async(
                 user_id=self.event.user_id,
@@ -138,6 +148,7 @@ class ContentService(BaseService):
                 language=search_language,
                 chatOnly=chat_only,
                 metaDataFilter=metadata_filter,
+                contentIds=content_ids,
             )
         except Exception as e:
             self.logger.error(f"Error while searching content chunks: {e}")