unique_toolkit 0.5.14__py3-none-any.whl → 0.5.16__py3-none-any.whl

unique_toolkit/content/service.py

@@ -2,7 +2,7 @@ import logging
 import os
 import tempfile
 from pathlib import Path
-from typing import Optional, cast
+from typing import Optional, Union, cast
 
 import requests
 import unique_sdk
@@ -14,7 +14,6 @@ from unique_toolkit.content.schemas import (
     ContentChunk,
     ContentRerankerConfig,
     ContentSearchType,
-    ContentUploadInput,
 )
 
 
@@ -69,9 +68,11 @@ class ContentService(BaseService):
                 searchType=search_type.name,
                 scopeIds=scope_ids,
                 limit=limit,
-                reranker=reranker_config.model_dump(by_alias=True)
-                if reranker_config
-                else None,
+                reranker=(
+                    reranker_config.model_dump(by_alias=True)
+                    if reranker_config
+                    else None
+                ),
                 language=search_language,
                 chatOnly=chat_only,
             )
@@ -123,9 +124,11 @@ class ContentService(BaseService):
                 searchType=search_type.name,
                 scopeIds=scope_ids,
                 limit=limit,
-                reranker=reranker_config.model_dump(by_alias=True)
-                if reranker_config
-                else None,
+                reranker=(
+                    reranker_config.model_dump(by_alias=True)
+                    if reranker_config
+                    else None
+                ),
                 language=search_language,
                 chatOnly=chat_only,
             )
@@ -241,16 +244,43 @@ class ContentService(BaseService):
             Content: The uploaded content.
         """
 
-        byte_size = os.path.getsize(path_to_content)
-        created_content = self._trigger_upsert_content(
-            input=ContentUploadInput(
-                key=content_name, title=content_name, mime_type=mime_type
-            ),
-            scope_id=scope_id,
-            chat_id=chat_id,
-        )
+        try:
+            return self._trigger_upload_content(
+                path_to_content=path_to_content,
+                content_name=content_name,
+                mime_type=mime_type,
+                scope_id=scope_id,
+                chat_id=chat_id,
+            )
+        except Exception as e:
+            self.logger.error(f"Error while uploading content: {e}")
+            raise e
 
-        write_url = created_content.write_url
+    def _trigger_upload_content(
+        self,
+        path_to_content: str,
+        content_name: str,
+        mime_type: str,
+        scope_id: Optional[str] = None,
+        chat_id: Optional[str] = None,
+    ):
+        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)
+        created_content = unique_sdk.Content.upsert(
+            user_id=self.event.user_id,
+            company_id=self.event.company_id,
+            input={
+                "key": content_name,
+                "title": content_name,
+                "mimeType": mime_type,
+            },
+            scopeId=scope_id,
+            chatId=chat_id,
+        )  # type: ignore
+
+        write_url = created_content["writeUrl"]
 
         if not write_url:
             error_msg = "Write url for uploaded content is missing"
@@ -268,7 +298,7 @@ class ContentService(BaseService):
                 },
             )
 
-        read_url = created_content.read_url
+        read_url = created_content["readUrl"]
 
         if not read_url:
             error_msg = "Read url for uploaded content is missing"
@@ -276,74 +306,40 @@ class ContentService(BaseService):
             raise ValueError(error_msg)
 
         if chat_id:
-            self._trigger_upsert_content(
-                input=ContentUploadInput(
-                    key=content_name,
-                    title=content_name,
-                    mime_type=mime_type,
-                    byte_size=byte_size,
-                ),
-                content_url=read_url,
-                chat_id=chat_id,
-            )
+            unique_sdk.Content.upsert(
+                user_id=self.event.user_id,
+                company_id=self.event.company_id,
+                input={
+                    "key": content_name,
+                    "title": content_name,
+                    "mimeType": mime_type,
+                    "byteSize": byte_size,
+                },
+                fileUrl=read_url,
+                chatId=chat_id,
+            )  # type: ignore
         else:
-            self._trigger_upsert_content(
-                input=ContentUploadInput(
-                    key=content_name,
-                    title=content_name,
-                    mime_type=mime_type,
-                    byte_size=byte_size,
-                ),
-                content_url=read_url,
-                scope_id=scope_id,
-            )
-
-        return created_content
-
-    def _trigger_upsert_content(
-        self,
-        input: ContentUploadInput,
-        scope_id: Optional[str] = None,
-        chat_id: Optional[str] = None,
-        content_url: Optional[str] = None,
-    ):
-        if not chat_id and not scope_id:
-            raise ValueError("chat_id or scope_id must be provided")
-
-        try:
-            if input.byte_size:
-                input_json = {
-                    "key": input.key,
-                    "title": input.title,
-                    "mimeType": input.mime_type,
-                    "byteSize": input.byte_size,
-                }
-            else:
-                input_json = {
-                    "key": input.key,
-                    "title": input.title,
-                    "mimeType": input.mime_type,
-                }
-            content = unique_sdk.Content.upsert(
+            unique_sdk.Content.upsert(
                 user_id=self.event.user_id,
                 company_id=self.event.company_id,
-                input=input_json,  # type: ignore
-                fileUrl=content_url,
+                input={
+                    "key": content_name,
+                    "title": content_name,
+                    "mimeType": mime_type,
+                    "byteSize": byte_size,
+                },
+                fileUrl=read_url,
                 scopeId=scope_id,
-                chatId=chat_id,
-                sourceOwnerType=None,  # type: ignore
-                storeInternally=False,
-            )
-            return Content(**content)
-        except Exception as e:
-            self.logger.error(f"Error while uploading content: {e}")
-            raise e
+            )  # type: ignore
+
+        return Content(**created_content)
 
     def download_content(
         self,
         content_id: str,
         content_name: str,
         chat_id: Optional[str] = None,
+        dir_path: Optional[Union[str, Path]] = "/tmp",
     ) -> Path:
         """
         Downloads content to temporary directory
@@ -352,6 +348,7 @@ class ContentService(BaseService):
             content_id (str): The id of the uploaded content.
             content_name (str): The name of the uploaded content.
             chat_id (Optional[str]): The chat_id, defaults to None.
+            dir_path (Optional[Union[str, Path]]): The directory path to download the content to, defaults to "/tmp". If not provided, the content will be downloaded to a random directory inside /tmp. Be aware that this directory won't be cleaned up automatically.
 
         Returns:
             content_path: The path to the downloaded content in the temporary directory.
@@ -365,7 +362,7 @@ class ContentService(BaseService):
             url = f"{url}?chatId={chat_id}"
 
         # Create a random directory inside /tmp
-        random_dir = tempfile.mkdtemp(dir="/tmp")
+        random_dir = tempfile.mkdtemp(dir=dir_path)
 
         # Create the full file path
         content_path = Path(random_dir) / content_name

{unique_toolkit-0.5.14.dist-info → unique_toolkit-0.5.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: unique_toolkit
-Version: 0.5.14
+Version: 0.5.16
 Summary: 
 License: MIT
 Author: Martin Fadler
@@ -101,6 +101,12 @@ 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.16] - 2024-08-27
+- Fix `ContentService.upload_content` function.
+
+## [0.5.15] - 2024-08-27
+- Possibility to specify root directory in `ContentService.download_content`
+
 ## [0.5.14] - 2024-08-26
 - Add AZURE_GPT_4o_MINI_2024_0718 to language model infos
 

{unique_toolkit-0.5.14.dist-info → unique_toolkit-0.5.16.dist-info}/RECORD

@@ -15,7 +15,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=UlC5nBIaFkq9TD31LR6ioG9JRZ1ScmtABi0l06HZR70,2231
-unique_toolkit/content/service.py,sha256=4CHqZDE3C-VQpG6RAlenarvBmBgI28Ec6T9HZf9TB84,13565
+unique_toolkit/content/service.py,sha256=NoH8FNP36Jt92RRswDZAfUV0UItrsrtokcqKP__ERRc,13656
 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
@@ -26,7 +26,7 @@ unique_toolkit/language_model/infos.py,sha256=JkugUAFFlrhTHXeM3A_R5QLkNSR9Ro85xW
 unique_toolkit/language_model/schemas.py,sha256=h5zjZNk7O-wLKtRuiNtMCIbp5hEVXrAOviKonQcjFuI,4594
 unique_toolkit/language_model/service.py,sha256=JjsOOcGDcR7db3yF3_oDXclEGfxqmwWpL5jor7Q42cU,10470
 unique_toolkit/language_model/utils.py,sha256=WBPj1XKkDgxy_-T8HCZvsfkkSzj_1w4UZzNmyvdbBLY,1081
-unique_toolkit-0.5.14.dist-info/LICENSE,sha256=bIeCWCYuoUU_MzNdg48-ubJSVm7qxakaRbzTiJ5uxrs,1065
-unique_toolkit-0.5.14.dist-info/METADATA,sha256=p_jPjGwKWiNOLzbVcibqdWCrXA1TA813LnIdLfkkmVE,10124
-unique_toolkit-0.5.14.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-unique_toolkit-0.5.14.dist-info/RECORD,,
+unique_toolkit-0.5.16.dist-info/LICENSE,sha256=bIeCWCYuoUU_MzNdg48-ubJSVm7qxakaRbzTiJ5uxrs,1065
+unique_toolkit-0.5.16.dist-info/METADATA,sha256=h7bIucz9PpU2PCc6BLMlAkDQO4s9aBZB_sGsc69oMlc,10301
+unique_toolkit-0.5.16.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+unique_toolkit-0.5.16.dist-info/RECORD,,