unique_toolkit 0.7.0__py3-none-any.whl → 0.7.2__py3-none-any.whl

unique_toolkit/content/functions.py

@@ -130,6 +130,7 @@ async def search_content_chunks_async(
 def search_contents(
     user_id: str,
     company_id: str,
+    chat_id: str,
     where: dict,
 ):
     """
@@ -151,6 +152,7 @@ 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
         )
@@ -163,6 +165,7 @@ 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."""
@@ -173,6 +176,7 @@ 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,9 +35,11 @@ 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.
+        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.
+        chat_id (str): The chat ID. Defaults to None
+        metadata_filter (dict | None): is only initialised from an Event(Deprecated) or ChatEvent.
     """
 
     def __init__(
@@ -45,6 +47,7 @@ class ContentService:
         event: Event | BaseEvent | None = None,
         company_id: str | None = None,
         user_id: str | None = None,
+        chat_id: str | None = None,
     ):
         self._event = event  # Changed to protected attribute
         self.metadata_filter = None
@@ -53,10 +56,12 @@ class ContentService:
             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.chat_id = chat_id
 
     @property
     @deprecated(
@@ -77,6 +82,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,
@@ -90,24 +96,34 @@ 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
 
+        chat_id = chat_id or self.chat_id  # type: ignore
+
+        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="",
+                chat_id=chat_id,
                 search_string=search_string,
                 search_type=search_type,
                 limit=limit,
@@ -129,6 +145,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,
@@ -142,23 +159,33 @@ 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
 
+        chat_id = chat_id or self.chat_id  # type: ignore
+
+        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="",
+                chat_id=chat_id,
                 search_string=search_string,
                 search_type=search_type,
                 limit=limit,
@@ -177,6 +204,7 @@ class ContentService:
     def search_contents(
         self,
         where: dict,
+        chat_id: str = "",
     ) -> list[Content]:
         """
         Performs a search in the knowledge base by filter (and not a smilarity search)
@@ -188,15 +216,19 @@ class ContentService:
         Returns:
             list[Content]: The search results.
         """
+        chat_id = chat_id or self.chat_id  # type: ignore
+
         return search_contents(
             user_id=self.user_id,
             company_id=self.company_id,
+            chat_id=chat_id,
             where=where,
         )
 
     async def search_contents_async(
         self,
         where: dict,
+        chat_id: str = "",
     ) -> list[Content]:
         """
         Performs an asynchronous search for content files in the knowledge base by filter.
@@ -207,16 +239,19 @@ class ContentService:
         Returns:
             list[Content]: The search results.
         """
+        chat_id = chat_id or self.chat_id  # type: ignore
+
         return await search_contents_async(
             user_id=self.user_id,
             company_id=self.company_id,
+            chat_id=chat_id,
             where=where,
         )
 
     def search_content_on_chat(self, chat_id: str) -> list[Content]:
         where = {"ownerId": {"equals": chat_id}}
 
-        return self.search_contents(where)
+        return self.search_contents(where, chat_id=chat_id)
 
     def upload_content_from_bytes(
         self,
@@ -291,7 +326,7 @@ class ContentService:
     def request_content_by_id(
         self,
         content_id: str,
-        chat_id: str | None,
+        chat_id: str | None = None,
     ) -> Response:
         """
         Sends a request to download content from a chat.
@@ -304,6 +339,8 @@ class ContentService:
             requests.Response: The response object containing the downloaded content.
 
         """
+        chat_id = chat_id or self.chat_id  # type: ignore
+
         return request_content_by_id(
             user_id=self.user_id,
             company_id=self.company_id,
@@ -334,6 +371,8 @@ class ContentService:
             Exception: If the download fails or the filename cannot be determined.
         """
 
+        chat_id = chat_id or self.chat_id  # type: ignore
+
         return download_content_to_file_by_id(
             user_id=self.user_id,
             company_id=self.company_id,
@@ -367,6 +406,8 @@ class ContentService:
             Exception: If the download fails.
         """
 
+        chat_id = chat_id or self.chat_id  # type: ignore
+
         return download_content(
             user_id=self.user_id,
             company_id=self.company_id,
@@ -394,7 +435,7 @@ class ContentService:
         Raises:
             Exception: If the download fails.
         """
-
+        chat_id = chat_id or self.chat_id  # type: ignore
         return download_content_to_bytes(
             user_id=self.user_id,
             company_id=self.company_id,

{unique_toolkit-0.7.0.dist-info → unique_toolkit-0.7.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: unique_toolkit
-Version: 0.7.0
+Version: 0.7.2
 Summary: 
 License: Proprietary
 Author: Martin Fadler
@@ -111,9 +111,16 @@ 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.2] - 2025-03-17
+- HotFix `ContentService.search_content_chunks` to use `chat_id` from event if provided.
+
+## [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 chang: `ContentService.search_content_on_chat` now requires you pass in a `chat_id` for the specific chat instance
+- 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.7.0.dist-info → unique_toolkit-0.7.2.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=iuclQjuiupIJPk0-6ldl35EVkQ2h34_dxKxWisMrxWM,17001
+unique_toolkit/content/functions.py,sha256=yB87wrbtmHzr3jGJUHetmuhy-7RVtnqG2IQ6gqFAun8,17093
 unique_toolkit/content/schemas.py,sha256=zks_Pkki2VhxICJJgHZyc-LPmRuj5dLbw3pgcUT7SW8,2362
-unique_toolkit/content/service.py,sha256=xcFN-vUakuovuzMXMN8qOmdlUzt2f1ZwHE4RzOWYjnQ,14040
+unique_toolkit/content/service.py,sha256=cb5q8oFbKQbuyikQyTdrSvJMfVdpC9K3S5GT0NkD5uo,15771
 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
@@ -58,7 +58,7 @@ unique_toolkit/short_term_memory/constants.py,sha256=698CL6-wjup2MvU19RxSmQk3gX7
 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=0wrwuo6K17Edcuiwp5LMCvxFuBSDP82HF0_5qwi0nYc,5307
-unique_toolkit-0.7.0.dist-info/LICENSE,sha256=GlN8wHNdh53xwOPg44URnwag6TEolCjoq3YD_KrWgss,193
-unique_toolkit-0.7.0.dist-info/METADATA,sha256=jDT49L28AksCEFj_0CXSyHJKg5Q2IWGXqNYLr0ninHY,20561
-unique_toolkit-0.7.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-unique_toolkit-0.7.0.dist-info/RECORD,,
+unique_toolkit-0.7.2.dist-info/LICENSE,sha256=GlN8wHNdh53xwOPg44URnwag6TEolCjoq3YD_KrWgss,193
+unique_toolkit-0.7.2.dist-info/METADATA,sha256=grlxS6ihrKZ5fk-IeNN7iGqMK0iKVkAPMOzN8Kx-u28,20871
+unique_toolkit-0.7.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+unique_toolkit-0.7.2.dist-info/RECORD,,