unique_toolkit 0.5.37__py3-none-any.whl → 0.5.39__py3-none-any.whl

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}")

unique_toolkit/language_model/schemas.py

@@ -14,6 +14,8 @@ from pydantic import (
     model_validator,
 )
 
+from unique_toolkit.language_model.utils import format_message
+
 # set config to convert camelCase to snake_case
 model_config = ConfigDict(
     alias_generator=camelize,
@@ -88,6 +90,9 @@ class LanguageModelMessage(BaseModel):
     content: Optional[str | list[dict]] = None
     tool_calls: Optional[list[LanguageModelFunctionCall]] = None
 
+    def __str__(self):
+        return format_message(self.role.capitalize(), message=self.content, num_tabs=1)
+
 
 class LanguageModelSystemMessage(LanguageModelMessage):
     role: LanguageModelMessageRole = LanguageModelMessageRole.SYSTEM
@@ -118,6 +123,13 @@ class LanguageModelToolMessage(LanguageModelMessage):
     name: str
     tool_call_id: str
 
+    def __str__(self):
+        return format_message(
+            user=self.role.capitalize(),
+            message=f"{self.name}, {self.tool_call_id}, {self.content}",
+            num_tabs=1,
+        )
+
     @field_validator("role", mode="before")
     def set_role(cls, value):
         return LanguageModelMessageRole.TOOL
@@ -132,6 +144,9 @@ class LanguageModelMessages(RootModel):
         | LanguageModelUserMessage
     ]
 
+    def __str__(self):
+        return "\n\n".join([str(message) for message in self.root])
+
     def __iter__(self):
         return iter(self.root)
 

unique_toolkit/language_model/utils.py

@@ -42,3 +42,27 @@ def find_last_json_object(text: str) -> str | None:
         return matches[-1]
     else:
         return None
+
+
+def format_message(user: str, message: str, num_tabs: int = 1) -> str:
+    """
+    Formats a message from a user by indenting each line with a specified number of tabs.
+
+    Args:
+        user (str): The name of the user sending the message.
+        message (str): The message content that may include multiple lines.
+        num_tabs (int): The number of tabs to use for indenting each line. Default is 1 tab.
+
+    Returns:
+        str: A formatted string with user and indented message lines.
+
+    Example:
+        >>> format_message("Alice", "Hello\nWorld", 2)
+        Alice:
+        \t\tHello
+        \t\tWorld
+    """
+    indentation = "\t" * num_tabs
+    indented_message = message.replace("\n", "\n" + indentation)
+    formatted_message = f"{user}:\n{indentation}{indented_message}"
+    return formatted_message

{unique_toolkit-0.5.37.dist-info → unique_toolkit-0.5.39.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: unique_toolkit
-Version: 0.5.37
+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,15 @@ 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
+
 ## [0.5.37] - 2024-11-26
 - `content` parameter in `ChatService.modify_assistant_message` and `ChatService.modify_assistant_message_async` is now optional
 - Added optional parameter `original_content` to `ChatService.modify_assistant_message` and `ChatService.modify_assistant_message_async`

{unique_toolkit-0.5.37.dist-info → unique_toolkit-0.5.39.dist-info}/RECORD

@@ -17,7 +17,7 @@ unique_toolkit/chat/state.py,sha256=Cjgwv_2vhDFbV69xxsn7SefhaoIAEqLx3ferdVFCnOg,
 unique_toolkit/chat/utils.py,sha256=ihm-wQykBWhB4liR3LnwPVPt_qGW6ETq21Mw4HY0THE,854
 unique_toolkit/content/__init__.py,sha256=MSH2sxjQyKD2Sef92fzE5Dt9SihdzivB6yliSwJfTmQ,890
 unique_toolkit/content/schemas.py,sha256=zks_Pkki2VhxICJJgHZyc-LPmRuj5dLbw3pgcUT7SW8,2362
-unique_toolkit/content/service.py,sha256=e23GX2pzIppHCFPUHng-82pSELT8JKT4TRMCO6M2Lok,16968
+unique_toolkit/content/service.py,sha256=rznSUyOuB4nbo6bFworzFv86kzo6TVT4Nc8GMAeAJB4,17711
 unique_toolkit/content/utils.py,sha256=Lake671plRsqNvO3pN_rmyVcpwbdED_KQpLcCnc4lv4,6902
 unique_toolkit/embedding/__init__.py,sha256=dr8M9jvslQTxPpxgaGwzxY0FildiWf-DidN_cahPAWw,191
 unique_toolkit/embedding/schemas.py,sha256=1GvKCaSk4jixzVQ2PKq8yDqwGEVY_hWclYtoAr6CC2g,96
@@ -37,10 +37,10 @@ unique_toolkit/evaluators/output_parser.py,sha256=eI72qkzK1dZyUvnfP2SOAQCGBj_-Pw
 unique_toolkit/evaluators/schemas.py,sha256=Jaue6Uhx75X1CyHKWj8sT3RE1JZXTqoLtfLt2xQNCX8,2507
 unique_toolkit/language_model/__init__.py,sha256=YuhyczGPj6w9xX-sOVUhmozvzIFxcckHFEkeMBecr5s,1784
 unique_toolkit/language_model/infos.py,sha256=kQK6F3r8xTN7oT6b39J7rxW-Y4iPXjx_Fr9bCOVQdm0,12509
-unique_toolkit/language_model/schemas.py,sha256=0pMLM1cCplw1OlM-eLqldZtYMObGr7tjHKXSHQP7hwE,6216
+unique_toolkit/language_model/schemas.py,sha256=wg_ly66UvLOVNdrq8xr-0uN0HPY41UIk5mVPxdG-VGs,6687
 unique_toolkit/language_model/service.py,sha256=s5X6EStyYumiYqlD9gkW4GANif18d9QZOMysmUSfv8M,13433
-unique_toolkit/language_model/utils.py,sha256=WBPj1XKkDgxy_-T8HCZvsfkkSzj_1w4UZzNmyvdbBLY,1081
-unique_toolkit-0.5.37.dist-info/LICENSE,sha256=GlN8wHNdh53xwOPg44URnwag6TEolCjoq3YD_KrWgss,193
-unique_toolkit-0.5.37.dist-info/METADATA,sha256=3-Ejv450nzyLOaJQN28zS0o6TefCijU7F2lCAmxYKik,14064
-unique_toolkit-0.5.37.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-unique_toolkit-0.5.37.dist-info/RECORD,,
+unique_toolkit/language_model/utils.py,sha256=bPQ4l6_YO71w-zaIPanUUmtbXC1_hCvLK0tAFc3VCRc,1902
+unique_toolkit-0.5.39.dist-info/LICENSE,sha256=GlN8wHNdh53xwOPg44URnwag6TEolCjoq3YD_KrWgss,193
+unique_toolkit-0.5.39.dist-info/METADATA,sha256=30jmpa5iHACeXTpmNB0XyY6GSanJvFAi10S8K0qg4Ew,14411
+unique_toolkit-0.5.39.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+unique_toolkit-0.5.39.dist-info/RECORD,,