unique_toolkit 0.5.35__py3-none-any.whl → 0.5.36__py3-none-any.whl

unique_toolkit/content/service.py

@@ -1,5 +1,6 @@
 import logging
 import os
+import re
 import tempfile
 from pathlib import Path
 from typing import Optional, Union, cast
@@ -350,6 +351,88 @@ class ContentService(BaseService):
 
         return Content(**created_content)
 
+    def request_content_by_id(
+        self, content_id: str, chat_id: str | None
+    ) -> requests.Response:
+        """
+        Sends a request to download content from a chat.
+
+        Args:
+            content_id (str): The ID of the content to download.
+            chat_id (str): The ID of the chat from which to download the content. Defaults to None to download from knowledge base.
+
+        Returns:
+            requests.Response: The response object containing the downloaded content.
+
+        """
+        url = f"{unique_sdk.api_base}/content/{content_id}/file"
+        if chat_id:
+            url = f"{url}?chatId={chat_id}"
+
+        # Download the file and save it to the random directory
+        headers = {
+            "x-api-version": unique_sdk.api_version,
+            "x-app-id": unique_sdk.app_id,
+            "x-user-id": self.event.user_id,
+            "x-company-id": self.event.company_id,
+            "Authorization": "Bearer %s" % (unique_sdk.api_key,),
+        }
+
+        return requests.get(url, headers=headers)
+
+    def download_content_to_file_by_id(
+        self,
+        content_id: str,
+        chat_id: Optional[str] = None,
+        filename: str | None = None,
+        tmp_dir_path: Optional[Union[str, Path]] = "/tmp",
+    ):
+        """
+        Downloads content from a chat and saves it to a file.
+
+        Args:
+            content_id (str): The ID of the content to download.
+            chat_id (Optional[str]): The ID of the chat to download from. Defaults to None and the file is downloaded from the knowledge base.
+            filename (str | None): The name of the file to save the content as. If not provided, the original filename will be used. Defaults to None.
+            tmp_dir_path (Optional[Union[str, Path]]): The path to the temporary directory where the content will be saved. Defaults to "/tmp".
+
+        Returns:
+            Path: The path to the downloaded file.
+
+        Raises:
+            Exception: If the download fails or the filename cannot be determined.
+        """
+
+        response = self.request_content_by_id(content_id, chat_id)
+        random_dir = tempfile.mkdtemp(dir=tmp_dir_path)
+
+        if response.status_code == 200:
+            if filename:
+                content_path = Path(random_dir) / filename
+            else:
+                pattern = r'filename="([^"]+)"'
+                match = re.search(
+                    pattern, response.headers.get("Content-Disposition", "")
+                )
+                if match:
+                    content_path = Path(random_dir) / match.group(1)
+                else:
+                    error_msg = (
+                        "Error downloading file: Filename could not be determined"
+                    )
+                    self.logger.error(error_msg)
+                    raise Exception(error_msg)
+
+            with open(content_path, "wb") as file:
+                file.write(response.content)
+        else:
+            error_msg = f"Error downloading file: Status code {response.status_code}"
+            self.logger.error(error_msg)
+            raise Exception(error_msg)
+
+        return content_path
+
+    # TODO: Discuss if we should deprecate this method due to unclear use by content_name
     def download_content(
         self,
         content_id: str,
@@ -373,26 +456,11 @@ class ContentService(BaseService):
             Exception: If the download fails.
         """
 
-        url = f"{unique_sdk.api_base}/content/{content_id}/file"
-        if chat_id:
-            url = f"{url}?chatId={chat_id}"
+        response = self.request_content_by_id(content_id, chat_id)
 
-        # Create a random directory inside /tmp
         random_dir = tempfile.mkdtemp(dir=dir_path)
-
-        # Create the full file path
         content_path = Path(random_dir) / content_name
 
-        # Download the file and save it to the random directory
-        headers = {
-            "x-api-version": unique_sdk.api_version,
-            "x-app-id": unique_sdk.app_id,
-            "x-user-id": self.event.user_id,
-            "x-company-id": self.event.company_id,
-            "Authorization": "Bearer %s" % (unique_sdk.api_key,),
-        }
-
-        response = requests.get(url, headers=headers)
         if response.status_code == 200:
             with open(content_path, "wb") as file:
                 file.write(response.content)

{unique_toolkit-0.5.35.dist-info → unique_toolkit-0.5.36.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: unique_toolkit
-Version: 0.5.35
+Version: 0.5.36
 Summary: 
 License: Proprietary
 Author: Martin Fadler
@@ -100,6 +100,10 @@ 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.36] - 2024-11-19
+- Add possibility to return the response from the download file from chat request
+- Add possibility to not specify a filename and use filename from response headers
+
 ## [0.5.35] - 2024-11-18
 - Add the possibilty to upload files without triggering ingestion by setting `skip_ingestion` to `True` in `ContentService.upload_content`
 

{unique_toolkit-0.5.35.dist-info → unique_toolkit-0.5.36.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=YClD-johtUe8rjeWgsUo-HUGgNEBhk_74Go1iMJ2oak,14282
+unique_toolkit/content/service.py,sha256=e23GX2pzIppHCFPUHng-82pSELT8JKT4TRMCO6M2Lok,16968
 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
@@ -40,7 +40,7 @@ unique_toolkit/language_model/infos.py,sha256=kQK6F3r8xTN7oT6b39J7rxW-Y4iPXjx_Fr
 unique_toolkit/language_model/schemas.py,sha256=0pMLM1cCplw1OlM-eLqldZtYMObGr7tjHKXSHQP7hwE,6216
 unique_toolkit/language_model/service.py,sha256=s5X6EStyYumiYqlD9gkW4GANif18d9QZOMysmUSfv8M,13433
 unique_toolkit/language_model/utils.py,sha256=WBPj1XKkDgxy_-T8HCZvsfkkSzj_1w4UZzNmyvdbBLY,1081
-unique_toolkit-0.5.35.dist-info/LICENSE,sha256=GlN8wHNdh53xwOPg44URnwag6TEolCjoq3YD_KrWgss,193
-unique_toolkit-0.5.35.dist-info/METADATA,sha256=2FdoeyNYUy50Szp_YldFsdkaqluyWwC6cuqIn8kS5Tg,13444
-unique_toolkit-0.5.35.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-unique_toolkit-0.5.35.dist-info/RECORD,,
+unique_toolkit-0.5.36.dist-info/LICENSE,sha256=GlN8wHNdh53xwOPg44URnwag6TEolCjoq3YD_KrWgss,193
+unique_toolkit-0.5.36.dist-info/METADATA,sha256=4YTkAbPH4uPA3IxsLyxr4-eI3wvn8LLJTAxhO-UDNTw,13635
+unique_toolkit-0.5.36.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+unique_toolkit-0.5.36.dist-info/RECORD,,