unique_toolkit 0.6.9__py3-none-any.whl → 0.7.1__py3-none-any.whl

unique_toolkit/content/functions.py

@@ -130,7 +130,6 @@ async def search_content_chunks_async(
 def search_contents(
     user_id: str,
     company_id: str,
-    chat_id: str,
     where: dict,
 ):
     """
@@ -152,7 +151,6 @@ def search_contents(
         contents = unique_sdk.Content.search(
             user_id=user_id,
             company_id=company_id,
-            chatId=chat_id,
             # TODO add type parameter in SDK
             where=where,  # type: ignore
         )
@@ -165,7 +163,6 @@ def search_contents(
 async def search_contents_async(
     user_id: str,
     company_id: str,
-    chat_id: str,
     where: dict,
 ):
     """Asynchronously searches for content in the knowledge base."""
@@ -176,7 +173,6 @@ async def search_contents_async(
         contents = await unique_sdk.Content.search_async(
             user_id=user_id,
             company_id=company_id,
-            chatId=chat_id,
             where=where,  # type: ignore
         )
         return map_contents(contents)

unique_toolkit/content/service.py

@@ -35,10 +35,10 @@ class ContentService:
     Provides methods for searching, downloading and uploading content in the knowledge base.
 
     Attributes:
-        company_id (str | None): The company ID.
-        user_id (str | None): The user ID.
-        metadata_filter (dict | None): The metadata filter.
-        chat_id (str | None): The chat ID.
+        event: BaseEvent | Event, this can be None ONLY if company_id and user_id are provided.
+        company_id (str): The company ID.
+        user_id (str): The user ID.
+        metadata_filter (dict | None): is only initialised from an Event(Deprecated) or ChatEvent.
     """
 
     def __init__(
@@ -48,17 +48,16 @@ class ContentService:
         user_id: str | None = None,
     ):
         self._event = event  # Changed to protected attribute
+        self.metadata_filter = None
         if event:
             self.company_id = event.company_id
             self.user_id = event.user_id
             if isinstance(event, (ChatEvent, Event)):
                 self.metadata_filter = event.payload.metadata_filter
-                self.chat_id = event.payload.chat_id
         else:
             [company_id, user_id] = validate_required_values([company_id, user_id])
             self.company_id = company_id
             self.user_id = user_id
-            self.metadata_filter = None
 
     @property
     @deprecated(
@@ -79,6 +78,7 @@ class ContentService:
         search_type: ContentSearchType,
         limit: int,
         search_language: str = DEFAULT_SEARCH_LANGUAGE,
+        chat_id: str = "",
         reranker_config: ContentRerankerConfig | None = None,
         scope_ids: list[str] | None = None,
         chat_only: bool | None = None,
@@ -92,24 +92,32 @@ 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.
-            search_language (str): The language for the full-text search. Defaults to "english".
-            reranker_config (ContentRerankerConfig | None): The reranker configuration. Defaults to None.
-            scope_ids (list[str] | None): The scope IDs. Defaults to None.
-            chat_only (bool | None): Whether to search only in the current chat. Defaults to None.
-            metadata_filter (dict | None): UniqueQL metadata filter. If unspecified/None, it tries to use the metadata filter from the event. Defaults to None.
-            content_ids (list[str] | None): The content IDs to search. Defaults to None.
+            search_language (str, optional): The language for the full-text search. Defaults to "english".
+            chat_id (str, optional): The chat ID for context. Defaults to empty string.
+            reranker_config (ContentRerankerConfig | None, optional): The reranker configuration. Defaults to None.
+            scope_ids (list[str] | None, optional): The scope IDs to filter by. Defaults to None.
+            chat_only (bool | None, optional): Whether to search only in the current chat. Defaults to None.
+            metadata_filter (dict | None, optional): UniqueQL metadata filter. If unspecified/None, it tries to use the metadata filter from the event. Defaults to None.
+            content_ids (list[str] | None, optional): The content IDs to search within. Defaults to None.
+
         Returns:
             list[ContentChunk]: The search results.
+
+        Raises:
+            Exception: If there's an error during the search operation.
         """
 
         if metadata_filter is None:
             metadata_filter = self.metadata_filter
 
+        if chat_only and not chat_id:
+            raise ValueError("Please provide chat_id when limiting with chat_only")
+
         try:
             searches = search_content_chunks(
                 user_id=self.user_id,
                 company_id=self.company_id,
-                chat_id=self.chat_id,
+                chat_id=chat_id,
                 search_string=search_string,
                 search_type=search_type,
                 limit=limit,
@@ -131,6 +139,7 @@ class ContentService:
         search_type: ContentSearchType,
         limit: int,
         search_language: str = DEFAULT_SEARCH_LANGUAGE,
+        chat_id: str = "",
         reranker_config: ContentRerankerConfig | None = None,
         scope_ids: list[str] | None = None,
         chat_only: bool | None = None,
@@ -144,23 +153,31 @@ 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.
-            search_language (str): The language for the full-text search. Defaults to "english".
-            reranker_config (ContentRerankerConfig | None): The reranker configuration. Defaults to None.
-            scope_ids (list[str] | None): The scope IDs. Defaults to None.
-            chat_only (bool | None): Whether to search only in the current chat. Defaults to None.
-            metadata_filter (dict | None): UniqueQL metadata filter. If unspecified/None, it tries to use the metadata filter from the event. Defaults to None.
-            content_ids (list[str] | None): The content IDs to search. Defaults to None.
+            search_language (str, optional): The language for the full-text search. Defaults to "english".
+            chat_id (str, optional): The chat ID for context. Defaults to empty string.
+            reranker_config (ContentRerankerConfig | None, optional): The reranker configuration. Defaults to None.
+            scope_ids (list[str] | None, optional): The scope IDs to filter by. Defaults to None.
+            chat_only (bool | None, optional): Whether to search only in the current chat. Defaults to None.
+            metadata_filter (dict | None, optional): UniqueQL metadata filter. If unspecified/None, it tries to use the metadata filter from the event. Defaults to None.
+            content_ids (list[str] | None, optional): The content IDs to search within. Defaults to None.
+
         Returns:
             list[ContentChunk]: The search results.
+
+        Raises:
+            Exception: If there's an error during the search operation.
         """
         if metadata_filter is None:
             metadata_filter = self.metadata_filter
 
+        if chat_only and not chat_id:
+            raise ValueError("Please provide chat_id when limiting with chat_only.")
+
         try:
             searches = await search_content_chunks_async(
                 user_id=self.user_id,
                 company_id=self.company_id,
-                chat_id=self.chat_id,
+                chat_id=chat_id,
                 search_string=search_string,
                 search_type=search_type,
                 limit=limit,
@@ -193,7 +210,6 @@ class ContentService:
         return search_contents(
             user_id=self.user_id,
             company_id=self.company_id,
-            chat_id=self.chat_id,
             where=where,
         )
 
@@ -213,14 +229,11 @@ class ContentService:
         return await search_contents_async(
             user_id=self.user_id,
             company_id=self.company_id,
-            chat_id=self.chat_id,
             where=where,
         )
 
-    def search_content_on_chat(
-        self,
-    ) -> list[Content]:
-        where = {"ownerId": {"equals": self.chat_id}}
+    def search_content_on_chat(self, chat_id: str) -> list[Content]:
+        where = {"ownerId": {"equals": chat_id}}
 
         return self.search_contents(where)
 

unique_toolkit/short_term_memory/service.py

@@ -136,6 +136,8 @@ class ShortTermMemoryService:
             company_id=self.company_id,
             key=key,
             value=value,
+            chat_id=self.chat_id,
+            message_id=self.message_id,
         )
 
     def create_memory(self, key: str, value: str | dict):

{unique_toolkit-0.6.9.dist-info → unique_toolkit-0.7.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: unique_toolkit
-Version: 0.6.9
+Version: 0.7.1
 Summary: 
 License: Proprietary
 Author: Martin Fadler
@@ -111,6 +111,13 @@ 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.7.1] - 2025-03-11
+- Fix Breaking change: `ContentService.search_content_chunks` `ContentService.search_content_chunks` now accepts`chat_id` for the specific to handle chat_only instances
+
+## [0.7.0] - 2025-03-11
+- Fix the issue with `ShortTermMemoryService.create_memory_async` adding `self.chat_id` and `self.message_id` as part of the parameter.
+- Breaking change: `ContentService.search_content_on_chat` now requires you pass in a `chat_id` for the specific chat instance
+
 ## [0.6.9] - 2025-03-11
 - Add o1-preview as part of the language model info, make the name consistent across board.
 

{unique_toolkit-0.6.9.dist-info → unique_toolkit-0.7.1.dist-info}/RECORD

@@ -20,9 +20,9 @@ unique_toolkit/chat/state.py,sha256=Cjgwv_2vhDFbV69xxsn7SefhaoIAEqLx3ferdVFCnOg,
 unique_toolkit/chat/utils.py,sha256=ihm-wQykBWhB4liR3LnwPVPt_qGW6ETq21Mw4HY0THE,854
 unique_toolkit/content/__init__.py,sha256=EdJg_A_7loEtCQf4cah3QARQreJx6pdz89Rm96YbMVg,940
 unique_toolkit/content/constants.py,sha256=1iy4Y67xobl5VTnJB6SxSyuoBWbdLl9244xfVMUZi5o,60
-unique_toolkit/content/functions.py,sha256=yB87wrbtmHzr3jGJUHetmuhy-7RVtnqG2IQ6gqFAun8,17093
+unique_toolkit/content/functions.py,sha256=iuclQjuiupIJPk0-6ldl35EVkQ2h34_dxKxWisMrxWM,17001
 unique_toolkit/content/schemas.py,sha256=zks_Pkki2VhxICJJgHZyc-LPmRuj5dLbw3pgcUT7SW8,2362
-unique_toolkit/content/service.py,sha256=CyQNW3TJX4trMnQhm5Ec2XGE9GHIW_NSGGT7YuOZIHQ,14234
+unique_toolkit/content/service.py,sha256=jnXUtQ9ax8tS52lrUIOzMypYCJiRZ56XeIz87hIMur4,14988
 unique_toolkit/content/utils.py,sha256=GUVPrkZfMoAj4MRoBs5BD_7vSuLZTZx69hyWzYFrI50,7747
 unique_toolkit/embedding/__init__.py,sha256=uUyzjonPvuDCYsvXCIt7ErQXopLggpzX-MEQd3_e2kE,250
 unique_toolkit/embedding/constants.py,sha256=Lj8-Lcy1FvuC31PM9Exq7vaFuxQV4pEI1huUMFX-J2M,52
@@ -57,8 +57,8 @@ unique_toolkit/short_term_memory/__init__.py,sha256=2mI3AUrffgH7Yt-xS57EGqnHf7jn
 unique_toolkit/short_term_memory/constants.py,sha256=698CL6-wjup2MvU19RxSmQk3gX7aqW_OOpZB7sbz_Xg,34
 unique_toolkit/short_term_memory/functions.py,sha256=3WiK-xatY5nh4Dr5zlDUye1k3E6kr41RiscwtTplw5k,4484
 unique_toolkit/short_term_memory/schemas.py,sha256=OhfcXyF6ACdwIXW45sKzjtZX_gkcJs8FEZXcgQTNenw,1406
-unique_toolkit/short_term_memory/service.py,sha256=gdsVzoNqTXmLoBR_-p_lJlZDBo8L7Cr5EKchTNVJg1Q,5233
-unique_toolkit-0.6.9.dist-info/LICENSE,sha256=GlN8wHNdh53xwOPg44URnwag6TEolCjoq3YD_KrWgss,193
-unique_toolkit-0.6.9.dist-info/METADATA,sha256=x6rRwyHVnMSaaQ2uzBaVrRua8gr234_exrWDG0ybbQY,20274
-unique_toolkit-0.6.9.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-unique_toolkit-0.6.9.dist-info/RECORD,,
+unique_toolkit/short_term_memory/service.py,sha256=0wrwuo6K17Edcuiwp5LMCvxFuBSDP82HF0_5qwi0nYc,5307
+unique_toolkit-0.7.1.dist-info/LICENSE,sha256=GlN8wHNdh53xwOPg44URnwag6TEolCjoq3YD_KrWgss,193
+unique_toolkit-0.7.1.dist-info/METADATA,sha256=vEkFTjpS9QGRvfgIHvRt80Fxyi49Fh127CFKlmXjIqs,20756
+unique_toolkit-0.7.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+unique_toolkit-0.7.1.dist-info/RECORD,,