unique_toolkit 0.5.4__tar.gz → 0.5.6__tar.gz

{unique_toolkit-0.5.4 → unique_toolkit-0.5.6}/CHANGELOG.md

@@ -5,6 +5,14 @@ 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.6] - 2024-07-30
+- Bug fix: `ContentService.search_content_chunks` and it's `async` equivalent now accept `None` as a valid parameter value for `scope_ids`.
+
+## [0.5.5] - 2024-07-30
+- Added parameters to `ContentService.search_content_chunks` and `ContentService.async_search_content_chunks`
+  - `reranker_config` to optinally rerank the search results
+  - `search_language` to specify a language for full-text-search
+
 ## [0.5.4] - 2024-07-26
 - correct ChatMessage schema
 

{unique_toolkit-0.5.4 → unique_toolkit-0.5.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: unique_toolkit
-Version: 0.5.4
+Version: 0.5.6
 Summary: 
 License: MIT
 Author: Martin Fadler
@@ -18,7 +18,7 @@ Requires-Dist: regex (>=2024.5.15,<2025.0.0)
 Requires-Dist: requests (>=2.32.3,<3.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.8.10,<0.9.0)
+Requires-Dist: unique-sdk (>=0.9.2,<0.10.0)
 Description-Content-Type: text/markdown
 
 # Unique Toolkit
@@ -102,6 +102,14 @@ 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.6] - 2024-07-30
+- Bug fix: `ContentService.search_content_chunks` and it's `async` equivalent now accept `None` as a valid parameter value for `scope_ids`.
+
+## [0.5.5] - 2024-07-30
+- Added parameters to `ContentService.search_content_chunks` and `ContentService.async_search_content_chunks`
+  - `reranker_config` to optinally rerank the search results
+  - `search_language` to specify a language for full-text-search
+
 ## [0.5.4] - 2024-07-26
 - correct ChatMessage schema
 

{unique_toolkit-0.5.4 → unique_toolkit-0.5.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "unique_toolkit"
-version = "0.5.4"
+version = "0.5.6"
 description = ""
 authors = [
     "Martin Fadler <martin.fadler@unique.ch>",
@@ -16,7 +16,7 @@ python = "^3.11"
 typing-extensions = "^4.9.0"
 pydantic = "^2.8.2"
 pyhumps = "^3.8.0"
-unique-sdk = "^0.8.10"
+unique-sdk = "^0.9.2"
 numpy = "^1.26.4"
 python-dotenv = "^1.0.1"
 requests = "^2.32.3"

{unique_toolkit-0.5.4 → unique_toolkit-0.5.6}/unique_toolkit/content/schemas.py

@@ -88,3 +88,9 @@ class ContentUploadInput(BaseModel):
     owner_type: Optional[str] = None
     owner_id: Optional[str] = None
     byte_size: Optional[int] = None
+
+
+class RerankerConfig(BaseModel):
+    model_config = model_config
+    deployment_name: str
+    options: dict | None = None

{unique_toolkit-0.5.4 → unique_toolkit-0.5.6}/unique_toolkit/content/service.py

@@ -14,10 +14,13 @@ from unique_toolkit.content.schemas import (
     ContentChunk,
     ContentSearchType,
     ContentUploadInput,
+    RerankerConfig,
 )
 
 
 class ContentService:
+    DEFAULT_SEARCH_LANGUAGE = "english"
+
     def __init__(self, state: ChatState, logger: Optional[logging.Logger] = None):
         self.state = state
         self.logger = logger or logging.getLogger(__name__)
@@ -27,6 +30,8 @@ class ContentService:
         search_string: str,
         search_type: ContentSearchType,
         limit: int,
+        reranker_config: Optional[RerankerConfig] = None,
+        search_language: str = DEFAULT_SEARCH_LANGUAGE,
         scope_ids: Optional[list[str]] = None,
     ) -> list[ContentChunk]:
         """
@@ -36,16 +41,20 @@ class ContentService:
             search_string (str): The search string.
             search_type (ContentSearchType): The type of search to perform.
             limit (int): The maximum number of results to return.
+            reranker_config (Optional[RerankerConfig]): The reranker configuration. Defaults to None.
+            search_language (str): The language for the full-text search. Defaults to "english".
             scope_ids (Optional[list[str]]): The scope IDs. Defaults to None.
 
         Returns:
             list[ContentChunk]: The search results.
         """
         return self._trigger_search_content_chunks(
-            search_string,
-            search_type,
-            limit,
-            scope_ids,
+            search_string=search_string,
+            search_type=search_type,
+            limit=limit,
+            reranker_config=reranker_config,
+            search_language=search_language,
+            scope_ids=scope_ids,
         )
 
     @to_async
@@ -55,7 +64,9 @@ class ContentService:
         search_string: str,
         search_type: ContentSearchType,
         limit: int,
-        scope_ids: Optional[list[str]],
+        reranker_config: Optional[RerankerConfig] = None,
+        search_language: str = DEFAULT_SEARCH_LANGUAGE,
+        scope_ids: Optional[list[str]] = None,
     ):
         """
         Performs an asynchronous search for content chunks in the knowledge base.
@@ -64,16 +75,20 @@ class ContentService:
             search_string (str): The search string.
             search_type (ContentSearchType): The type of search to perform.
             limit (int): The maximum number of results to return.
+            reranker_config (Optional[RerankerConfig]): The reranker configuration. Defaults to None.
+            search_language (str): The language for the full-text search. Defaults to "english".
             scope_ids (Optional[list[str]]): The scope IDs. Defaults to [].
 
         Returns:
             list[ContentChunk]: The search results.
         """
         return self._trigger_search_content_chunks(
-            search_string,
-            search_type,
-            limit,
-            scope_ids,
+            search_string=search_string,
+            search_type=search_type,
+            limit=limit,
+            reranker_config=reranker_config,
+            search_language=search_language,
+            scope_ids=scope_ids,
         )
 
     def _trigger_search_content_chunks(
@@ -81,10 +96,10 @@ class ContentService:
         search_string: str,
         search_type: ContentSearchType,
         limit: int,
-        scope_ids: Optional[list[str]],
+        reranker_config: Optional[RerankerConfig] = None,
+        search_language: str = DEFAULT_SEARCH_LANGUAGE,
+        scope_ids: Optional[list[str]] = None,
     ) -> list[ContentChunk]:
-        scope_ids = scope_ids or self.state.scope_ids or []
-
         if not scope_ids:
             self.logger.warning("No scope IDs provided for search.")
 
@@ -97,6 +112,8 @@ class ContentService:
                 searchType=search_type.name,
                 scopeIds=scope_ids,
                 limit=limit,
+                reranker=reranker_config.model_dump() if reranker_config else None,
+                language=search_language,
                 chatOnly=self.state.chat_only,
             )
         except Exception as e:

{unique_toolkit-0.5.4 → unique_toolkit-0.5.6}/unique_toolkit/language_model/service.py

@@ -92,7 +92,7 @@ class LanguageModelService:
         tools: Optional[list[LanguageModelTool]] = None,
     ) -> LanguageModelResponse:
         options = self._add_tools_to_options({}, tools)
-        messages = messages.model_dump(exclude_none=True)
+        messages = messages.model_dump(exclude_none=True, exclude={"tool_calls"})
         try:
             response = unique_sdk.ChatCompletion.create(
                 company_id=self.state.company_id,
@@ -217,7 +217,7 @@ class LanguageModelService:
             for chunk in content_chunks
         ]
 
-        messages = messages.model_dump(exclude_none=True)
+        messages = messages.model_dump(exclude_none=True, exclude={"tool_calls"})
 
         try:
             response = unique_sdk.Integrated.chat_stream_completion(