unique_toolkit 0.6.4__py3-none-any.whl → 0.6.5__py3-none-any.whl

unique_toolkit/content/functions.py

@@ -204,6 +204,49 @@ def _upsert_content(
     )  # type: ignore
 
 
+def upload_content_from_bytes(
+    user_id: str,
+    company_id: str,
+    content: bytes,
+    content_name: str,
+    mime_type: str,
+    scope_id: str | None = None,
+    chat_id: str | None = None,
+    skip_ingestion: bool = False,
+):
+    """
+    Uploads content to the knowledge base.
+
+    Args:
+        user_id (str): The user ID.
+        company_id (str): The company ID.
+        content (bytes): The content to upload.
+        content_name (str): The name of the content.
+        mime_type (str): The MIME type of the content.
+        scope_id (str | None): The scope ID. Defaults to None.
+        chat_id (str | None): The chat ID. Defaults to None.
+        skip_ingestion (bool): Whether to skip ingestion. Defaults to False.
+
+    Returns:
+        Content: The uploaded content.
+    """
+
+    try:
+        return _trigger_upload_content(
+            user_id=user_id,
+            company_id=company_id,
+            content=content,
+            content_name=content_name,
+            mime_type=mime_type,
+            scope_id=scope_id,
+            chat_id=chat_id,
+            skip_ingestion=skip_ingestion,
+        )
+    except Exception as e:
+        logger.error(f"Error while uploading content: {e}")
+        raise e
+
+
 def upload_content(
     user_id: str,
     company_id: str,
@@ -235,7 +278,7 @@ def upload_content(
         return _trigger_upload_content(
             user_id=user_id,
             company_id=company_id,
-            path_to_content=path_to_content,
+            content=path_to_content,
             content_name=content_name,
             mime_type=mime_type,
             scope_id=scope_id,
@@ -250,7 +293,7 @@ def upload_content(
 def _trigger_upload_content(
     user_id: str,
     company_id: str,
-    path_to_content: str,
+    content: str | Path | bytes,
     content_name: str,
     mime_type: str,
     scope_id: str | None = None,
@@ -263,7 +306,7 @@ def _trigger_upload_content(
     Args:
         user_id (str): The user ID.
         company_id (str): The company ID.
-        path_to_content (str): The path to the content to upload.
+        content (str | Path | bytes): The content to upload. If string or Path, file will be read from disk.
         content_name (str): The name of the content.
         mime_type (str): The MIME type of the content.
         scope_id (str | None): The scope ID. Defaults to None.
@@ -277,7 +320,9 @@ def _trigger_upload_content(
     if not chat_id and not scope_id:
         raise ValueError("chat_id or scope_id must be provided")
 
-    byte_size = os.path.getsize(path_to_content)
+    byte_size = (
+        os.path.getsize(content) if isinstance(content, (Path, str)) else len(content)
+    )
     created_content = _upsert_content(
         user_id=user_id,
         company_id=company_id,
@@ -297,16 +342,24 @@ def _trigger_upload_content(
         logger.error(error_msg)
         raise ValueError(error_msg)
 
+    headers = {
+        "X-Ms-Blob-Content-Type": mime_type,
+        "X-Ms-Blob-Type": "BlockBlob",
+    }
     # upload to azure blob storage SAS url uploadUrl the pdf file translatedFile make sure it is treated as a application/pdf
-    with open(path_to_content, "rb") as file:
+    if isinstance(content, bytes):
         requests.put(
             url=write_url,
-            data=file,
-            headers={
-                "X-Ms-Blob-Content-Type": mime_type,
-                "X-Ms-Blob-Type": "BlockBlob",
-            },
+            data=content,
+            headers=headers,
         )
+    else:
+        with open(content, "rb") as file:
+            requests.put(
+                url=write_url,
+                data=file,
+                headers=headers,
+            )
 
     read_url = created_content["readUrl"]
 
@@ -431,6 +484,23 @@ def download_content_to_file_by_id(
     return content_path
 
 
+def download_content_to_bytes(
+    user_id: str,
+    company_id: str,
+    content_id: str,
+    chat_id: str | None,
+) -> bytes:
+    logger.info(f"Downloading content with content_id: {content_id}")
+    response = request_content_by_id(user_id, company_id, content_id, chat_id)
+
+    if response.status_code != 200:
+        error_msg = f"Error downloading file: Status code {response.status_code}"
+        logger.error(error_msg)
+        raise Exception(error_msg)
+
+    return response.content
+
+
 # TODO: Discuss if we should deprecate this method due to unclear use by content_name
 def download_content(
     user_id: str,

unique_toolkit/content/service.py

@@ -10,6 +10,7 @@ from unique_toolkit.content import DOMAIN_NAME
 from unique_toolkit.content.constants import DEFAULT_SEARCH_LANGUAGE
 from unique_toolkit.content.functions import (
     download_content,
+    download_content_to_bytes,
     download_content_to_file_by_id,
     request_content_by_id,
     search_content_chunks,
@@ -17,6 +18,7 @@ from unique_toolkit.content.functions import (
     search_contents,
     search_contents_async,
     upload_content,
+    upload_content_from_bytes,
 )
 from unique_toolkit.content.schemas import (
     Content,
@@ -222,6 +224,41 @@ class ContentService:
 
         return self.search_contents(where)
 
+    def upload_content_from_bytes(
+        self,
+        content: bytes,
+        content_name: str,
+        mime_type: str,
+        scope_id: str | None = None,
+        chat_id: str | None = None,
+        skip_ingestion: bool = False,
+    ) -> Content:
+        """
+        Uploads content to the knowledge base.
+
+        Args:
+            content (bytes): The content to upload.
+            content_name (str): The name of the content.
+            mime_type (str): The MIME type of the content.
+            scope_id (str | None): The scope ID. Defaults to None.
+            chat_id (str | None): The chat ID. Defaults to None.
+            skip_ingestion (bool): Whether to skip ingestion. Defaults to False.
+
+        Returns:
+            Content: The uploaded content.
+        """
+
+        return upload_content_from_bytes(
+            user_id=self.user_id,
+            company_id=self.company_id,
+            content=content,
+            content_name=content_name,
+            mime_type=mime_type,
+            scope_id=scope_id,
+            chat_id=chat_id,
+            skip_ingestion=skip_ingestion,
+        )
+
     def upload_content(
         self,
         path_to_content: str,
@@ -344,3 +381,29 @@ class ContentService:
             chat_id=chat_id,
             dir_path=dir_path,
         )
+
+    def download_content_to_bytes(
+        self,
+        content_id: str,
+        chat_id: str | None = None,
+    ) -> bytes:
+        """
+        Downloads content to memory
+
+        Args:
+            content_id (str): The id of the uploaded content.
+            chat_id (Optional[str]): The chat_id, defaults to None.
+
+        Returns:
+            bytes: The downloaded content.
+
+        Raises:
+            Exception: If the download fails.
+        """
+
+        return download_content_to_bytes(
+            user_id=self.user_id,
+            company_id=self.company_id,
+            content_id=content_id,
+            chat_id=chat_id,
+        )

{unique_toolkit-0.6.4.dist-info → unique_toolkit-0.6.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: unique_toolkit
-Version: 0.6.4
+Version: 0.6.5
 Summary: 
 License: Proprietary
 Author: Martin Fadler
@@ -111,6 +111,9 @@ 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.6.5] - 2025-03-04
+- Add `upload_content_from_bytes` to `ContentService`
+- Add `download_content_to_bytes` to `ContentService`
 
 ## [0.6.3] - 2025-02-27
 - Simplified imports for services. `from unique_toolkit.language_model import LanguageModelService` -> `from unique_toolkit import LanguageModelService` to reduce number of import lines.

{unique_toolkit-0.6.4.dist-info → unique_toolkit-0.6.5.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=0589SVNyePI-8uOc-mfWHLZr7hgSqeTpz-O9Y64KWfg,15096
+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=5_4ao-K4VtF5P_dkenh8dP94Ce7Yq2ro_dPBSKNZAc4,12412
+unique_toolkit/content/service.py,sha256=CyQNW3TJX4trMnQhm5Ec2XGE9GHIW_NSGGT7YuOZIHQ,14234
 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=gdsVzoNqTXmLoBR_-p_lJlZDBo8L7Cr5EKchTNVJg1Q,5233
-unique_toolkit-0.6.4.dist-info/LICENSE,sha256=GlN8wHNdh53xwOPg44URnwag6TEolCjoq3YD_KrWgss,193
-unique_toolkit-0.6.4.dist-info/METADATA,sha256=dSeB-ilRjS8PXAPrssjGar0aCsxTqBqqju2hPiDCYNw,19703
-unique_toolkit-0.6.4.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-unique_toolkit-0.6.4.dist-info/RECORD,,
+unique_toolkit-0.6.5.dist-info/LICENSE,sha256=GlN8wHNdh53xwOPg44URnwag6TEolCjoq3YD_KrWgss,193
+unique_toolkit-0.6.5.dist-info/METADATA,sha256=QpySQwwkqfBL9Mm9g8urq7LIhQrBy4LF7ZTWQroXED4,19835
+unique_toolkit-0.6.5.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+unique_toolkit-0.6.5.dist-info/RECORD,,