jigsawstack 0.2.0__tar.gz → 0.2.2__tar.gz

{jigsawstack-0.2.0 → jigsawstack-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jigsawstack
-Version: 0.2.0
+Version: 0.2.2
 Summary: JigsawStack - The AI SDK for Python
 Home-page: https://github.com/jigsawstack/jigsawstack-python
 Author: JigsawStack

{jigsawstack-0.2.0 → jigsawstack-0.2.2}/jigsawstack/__init__.py

@@ -100,7 +100,7 @@ class JigsawStack:
             api_key=api_key,
             api_url=api_url,
             disable_request_logging=disable_request_logging,
-        ).translate
+        )
         
         self.prompt_engine = PromptEngine(
             api_key=api_key,
@@ -209,7 +209,7 @@ class AsyncJigsawStack:
             api_key=api_key,
             api_url=api_url,
             disable_request_logging=disable_request_logging,
-        ).translate
+        )
 
         self.prompt_engine = AsyncPromptEngine(
             api_key=api_key,

{jigsawstack-0.2.0 → jigsawstack-0.2.2}/jigsawstack/audio.py

@@ -1,4 +1,4 @@
-from typing import Any, Dict, List, cast, Union, Optional
+from typing import Any, Dict, List, cast, Union, Optional, overload
 from typing_extensions import NotRequired, TypedDict
 from .request import Request, RequestConfig
 from .async_request import AsyncRequest, AsyncRequestConfig
@@ -6,6 +6,7 @@ from ._config import ClientConfig
 from typing import Any, Dict, List, cast
 from typing_extensions import NotRequired, TypedDict
 from .custom_typing import SupportedAccents
+from .helpers import build_path
 
 
 class TextToSpeechParams(TypedDict):
@@ -29,6 +30,7 @@ class SpeechToTextParams(TypedDict):
     by_speaker: NotRequired[bool]
     webhook_url: NotRequired[str]
     batch_size: NotRequired[int]
+    chunk_duration: NotRequired[int]
 
 
 class ChunkParams(TypedDict):
@@ -63,16 +65,41 @@ class Audio(ClientConfig):
             disable_request_logging=disable_request_logging,
         )
 
-    def speech_to_text(self, params: SpeechToTextParams) -> SpeechToTextResponse:
-        path = "/ai/transcribe"
+    @overload
+    def speech_to_text(self, params: SpeechToTextParams) -> SpeechToTextResponse: ...
+    @overload
+    def speech_to_text(self, file: bytes, options: Optional[SpeechToTextParams] = None) -> SpeechToTextResponse: ...
+
+    def speech_to_text(
+        self,
+        blob: Union[SpeechToTextParams, bytes],
+        options: Optional[SpeechToTextParams] = None,
+    ) -> SpeechToTextResponse:
+        if isinstance(blob, dict): # If params is provided as a dict, we assume it's the first argument
+            resp = Request(
+                config=self.config,
+                path="/ai/transcribe",
+                params=cast(Dict[Any, Any], blob),
+                verb="post",
+            ).perform_with_content()
+            return resp
+
+        options = options or {}
+        path = build_path(base_path="/ai/transcribe", params=options)
+        content_type = options.get("content_type", "application/octet-stream")
+        headers = {"Content-Type": content_type}
+
         resp = Request(
             config=self.config,
             path=path,
-            params=cast(Dict[Any, Any], params),
+            params=options,
+            data=blob,
+            headers=headers,
             verb="post",
         ).perform_with_content()
         return resp
 
+
     def text_to_speech(self, params: TextToSpeechParams) -> TextToSpeechResponse:
         path = "/ai/tts"
         resp = Request(
@@ -110,12 +137,36 @@ class AsyncAudio(ClientConfig):
             disable_request_logging=disable_request_logging,
         )
 
-    async def speech_to_text(self, params: SpeechToTextParams) -> SpeechToTextResponse:
-        path = "/ai/transcribe"
+    @overload
+    async def speech_to_text(self, params: SpeechToTextParams) -> SpeechToTextResponse: ...
+    @overload
+    async def speech_to_text(self, file: bytes, options: Optional[SpeechToTextParams] = None) -> SpeechToTextResponse: ...
+
+    async def speech_to_text(
+        self,
+        blob: Union[SpeechToTextParams, bytes],
+        options: Optional[SpeechToTextParams] = None,
+    ) -> SpeechToTextResponse:
+        if isinstance(blob, dict):
+            resp = await AsyncRequest(
+                config=self.config,
+                path="/ai/transcribe",
+                params=cast(Dict[Any, Any], blob),
+                verb="post",
+            ).perform_with_content()
+            return resp
+        
+        options = options or {}
+        path = build_path(base_path="/ai/transcribe", params=options)
+        content_type = options.get("content_type", "application/octet-stream")
+        headers = {"Content-Type": content_type}
+
         resp = await AsyncRequest(
             config=self.config,
             path=path,
-            params=cast(Dict[Any, Any], params),
+            params=options,
+            data=blob,
+            headers=headers,
             verb="post",
         ).perform_with_content()
         return resp

{jigsawstack-0.2.0 → jigsawstack-0.2.2}/jigsawstack/embedding.py

@@ -1,9 +1,10 @@
-from typing import Any, Dict, List, Union, cast, Literal
+from typing import Any, Dict, List, Union, cast, Literal, overload
 from typing_extensions import NotRequired, TypedDict
 from .request import Request, RequestConfig
 from .async_request import AsyncRequest
 from typing import List, Union
 from ._config import ClientConfig
+from .helpers import build_path
 
 
 class EmbeddingParams(TypedDict):
@@ -38,12 +39,37 @@ class Embedding(ClientConfig):
             disable_request_logging=disable_request_logging,
         )
 
-    def execute(self, params: EmbeddingParams) -> EmbeddingResponse:
-        path = "/embedding"
+    @overload
+    def execute(self, params: EmbeddingParams) -> EmbeddingResponse: ...
+    @overload
+    def execute(self, file: bytes, options: EmbeddingParams = None) -> EmbeddingResponse: ...
+
+    def execute(
+        self,
+        blob: Union[EmbeddingParams, bytes],
+        options: EmbeddingParams = None,
+    ) -> EmbeddingResponse:
+        path="/embedding"
+        if isinstance(blob, dict):
+            resp = Request(
+                config=self.config,
+                path=path,
+                params=cast(Dict[Any, Any], blob),
+                verb="post",
+            ).perform_with_content()
+            return resp
+
+        options = options or {}
+        path = build_path(base_path=path, params=options)
+        content_type = options.get("content_type", "application/octet-stream")
+        _headers = {"Content-Type": content_type}
+
         resp = Request(
             config=self.config,
             path=path,
-            params=cast(Dict[Any, Any], params),
+            params=options,
+            data=blob,
+            headers=_headers,
             verb="post",
         ).perform_with_content()
         return resp
@@ -66,12 +92,37 @@ class AsyncEmbedding(ClientConfig):
             disable_request_logging=disable_request_logging,
         )
 
-    async def execute(self, params: EmbeddingParams) -> EmbeddingResponse:
-        path = "/embedding"
+    @overload
+    async def execute(self, params: EmbeddingParams) -> EmbeddingResponse: ...
+    @overload
+    async def execute(self, file: bytes, options: EmbeddingParams = None) -> EmbeddingResponse: ...
+
+    async def execute(
+        self,
+        blob: Union[EmbeddingParams, bytes],
+        options: EmbeddingParams = None,
+    ) -> EmbeddingResponse:
+        path="/embedding"
+        if isinstance(blob, dict):
+            resp = await AsyncRequest(
+                config=self.config,
+                path=path,
+                params=cast(Dict[Any, Any], blob),
+                verb="post",
+            ).perform_with_content()
+            return resp
+
+        options = options or {}
+        path = build_path(base_path=path, params=options)
+        content_type = options.get("content_type", "application/octet-stream")
+        _headers = {"Content-Type": content_type}
+
         resp = await AsyncRequest(
             config=self.config,
             path=path,
-            params=cast(Dict[Any, Any], params),
+            params=options,
+            data=blob,
+            headers=_headers,
             verb="post",
         ).perform_with_content()
         return resp

{jigsawstack-0.2.0 → jigsawstack-0.2.2}/jigsawstack/helpers.py

@@ -17,7 +17,7 @@ def build_path(base_path: str, params: Optional[Dict[str, Union[str, int, bool]]
         return base_path
     
     #remove None values from the parameters
-    filtered_params = {k: v for k, v in params.items() if v is not None}
+    filtered_params = { k: str(v).lower() if isinstance(v, bool) else v for k, v in params.items() if v is not None}
 
     #encode the parameters
     return f"{base_path}?{urlencode(filtered_params)}" if filtered_params else base_path

{jigsawstack-0.2.0 → jigsawstack-0.2.2}/jigsawstack/store.py

@@ -10,8 +10,16 @@ class FileDeleteResponse(TypedDict):
 
 class FileUploadParams(TypedDict):
     overwrite: NotRequired[bool]
-    filename: NotRequired[str]
+    key: NotRequired[str]
     content_type: NotRequired[str]
+    temp_public_url: NotRequired[bool]
+
+class FileUploadResponse(TypedDict):
+    key: str
+    url: str
+    size: int
+    temp_public_url: NotRequired[str] # Optional, only if temp_public_url is set to True in params
+    
 
 class Store(ClientConfig):
 
@@ -30,7 +38,7 @@ class Store(ClientConfig):
             disable_request_logging=disable_request_logging,
         )
 
-    def upload(self, file: bytes, options: Union[FileUploadParams, None] = None) -> Any:
+    def upload(self, file: bytes, options: Union[FileUploadParams, None] = None) -> FileUploadResponse:
         if options is None:
             options = {}
             
@@ -87,7 +95,7 @@ class AsyncStore(ClientConfig):
         )
         
 
-    async def upload(self, file: bytes, options: Union[FileUploadParams, None] = None) -> Any:
+    async def upload(self, file: bytes, options: Union[FileUploadParams, None] = None) -> FileUploadResponse:
         if options is None:
             options = {}
             

{jigsawstack-0.2.0 → jigsawstack-0.2.2}/jigsawstack/translate.py

@@ -1,17 +1,17 @@
-from typing import Any, Dict, List, Union, cast
+from typing import Any, Dict, List, Union, cast, overload
 from typing_extensions import NotRequired, TypedDict
 from .request import Request, RequestConfig
 from .async_request import AsyncRequest
 from typing import List, Union
 from ._config import ClientConfig
-
+from .helpers import build_path
 
 class TranslateImageParams(TypedDict):
     target_language: str
     """
     Target langauge to translate to.
     """
-    url: str
+    url: NotRequired[str]
     """
     The URL of the image to translate.
     """
@@ -82,7 +82,7 @@ class Translate(ClientConfig):
             disable_request_logging=disable_request_logging,
         )
 
-    def translate_text(
+    def text(
         self, params: TranslateParams
     ) -> Union[TranslateResponse, TranslateListResponse]:
         resp = Request(
@@ -92,25 +92,41 @@ class Translate(ClientConfig):
             verb="post",
         ).perform()
         return resp
+    
+    @overload
+    def image(self, params: TranslateImageParams) -> TranslateImageResponse: ...
+    @overload
+    def image(self, file: bytes, options: TranslateImageParams = None) -> TranslateImageParams: ...
+
+    def image(
+        self,
+        blob: Union[TranslateImageParams, bytes],
+        options: TranslateImageParams = None,
+    ) -> TranslateImageResponse:
+        if isinstance(blob, dict): # If params is provided as a dict, we assume it's the first argument
+            resp = Request(
+                config=self.config,
+                path="/ai/translate/image",
+                params=cast(Dict[Any, Any], blob),
+                verb="post",
+            ).perform_with_content()
+            return resp
+
+        options = options or {}
+        path = build_path(base_path="/ai/translate/image", params=options)
+        content_type = options.get("content_type", "application/octet-stream")
+        headers = {"Content-Type": content_type}
 
-    def translate_image(
-    self, params: TranslateImageParams
-) -> TranslateImageResponse:
         resp = Request(
             config=self.config,
-            path="/ai/translate/image",
-            params=cast(Dict[Any, Any], params),
+            path=path,
+            params=options,
+            data=blob,
+            headers=headers,
             verb="post",
-        ).perform()
+        ).perform_with_content()
         return resp
 
-    def translate(
-    self, params: Union[TranslateParams, TranslateImageParams]
-) -> Union[TranslateResponse, TranslateListResponse, TranslateImageResponse]:
-        if "url" in params or "file_store_key" in params:
-            return self.translate_image(params)
-        return self.translate_text(params)
-
 
 class AsyncTranslate(ClientConfig):
     config: RequestConfig
@@ -128,7 +144,7 @@ class AsyncTranslate(ClientConfig):
             disable_request_logging=disable_request_logging,
         )
 
-    async def translate_text(
+    async def text(
         self, params: TranslateParams
     ) -> Union[TranslateResponse, TranslateListResponse]:
         resp = await AsyncRequest(
@@ -138,21 +154,37 @@ class AsyncTranslate(ClientConfig):
             verb="post",
         ).perform()
         return resp
-
-    async def translate_image(
-        self, params: TranslateImageParams
+    
+    @overload
+    async def image(self, params: TranslateImageParams) -> TranslateImageResponse: ...
+    @overload
+    async def image(self, file: bytes, options: TranslateImageParams = None) -> TranslateImageParams: ...
+    
+    async def image(
+        self,
+        blob: Union[TranslateImageParams, bytes],
+        options: TranslateImageParams = None,
     ) -> TranslateImageResponse:
+        if isinstance(blob, dict):
+            resp = await AsyncRequest(
+                config=self.config,
+                path="/ai/translate/image",
+                params=cast(Dict[Any, Any], blob),
+                verb="post",
+            ).perform_with_content()
+            return resp
+
+        options = options or {}
+        path = build_path(base_path="/ai/translate/image", params=options)
+        content_type = options.get("content_type", "application/octet-stream")
+        headers = {"Content-Type": content_type}
+
         resp = await AsyncRequest(
             config=self.config,
-            path="/ai/translate/image",
-            params=cast(Dict[Any, Any], params),
+            path=path,
+            params=options,
+            data=blob,
+            headers=headers,
             verb="post",
-        ).perform()
-        return resp
-
-    async def translate(
-        self, params: Union[TranslateParams, TranslateImageParams]
-    ) -> Union[TranslateResponse, TranslateListResponse, TranslateImageResponse]:
-        if "url" in params or "file_store_key" in params:
-            return await self.translate_image(params)
-        return await self.translate_text(params)
+        ).perform_with_content()
+        return resp

{jigsawstack-0.2.0 → jigsawstack-0.2.2}/jigsawstack/validate.py

@@ -1,10 +1,10 @@
-from typing import Any, Dict, List, Union, cast
+from typing import Any, Dict, List, Union, cast, overload
 from typing_extensions import NotRequired, TypedDict
 from .request import Request, RequestConfig
 from .async_request import AsyncRequest, AsyncRequestConfig
 from ._config import ClientConfig
 from typing import Any, Dict, List, cast
-from typing_extensions import NotRequired, TypedDict
+from typing_extensions import NotRequired, TypedDict, Union, Optional
 from .helpers import build_path
 
 
@@ -46,7 +46,9 @@ class ProfanityResponse(TypedDict):
 
 
 class NSFWParams(TypedDict):
-    url: str
+    url: NotRequired[str]
+    file_store_key: NotRequired[str]
+
 
 
 class NSFWResponse(TypedDict):
@@ -99,16 +101,25 @@ class Validate(ClientConfig):
             verb="get",
         ).perform_with_content()
         return resp
-
-    def nsfw(self, params: NSFWParams) -> NSFWResponse:
-        path = f"/validate/nsfw"
+    
+    def nsfw(self, params: Union[NSFWParams, bytes]) -> NSFWResponse:
+        path="/validate/nsfw"
+        if isinstance(params, dict):
+            resp = Request(
+                config=self.config,
+                path=path,
+                params=cast(Dict[Any, Any], params),
+                verb="post",
+            ).perform_with_content()
+            return resp
+
+        _headers = {"Content-Type": "application/octet-stream"}
         resp = Request(
             config=self.config,
             path=path,
-            params=cast(
-                Dict[Any, Any],
-                params
-            ),
+            params={}, #since we're already passing data.
+            data=params,
+            headers=_headers,
             verb="post",
         ).perform_with_content()
         return resp
@@ -170,7 +181,10 @@ class AsyncValidate(ClientConfig):
         )
 
     async def email(self, params: EmailValidationParams) -> EmailValidationResponse:
-        path = bui
+        path = build_path(
+            base_path="/validate/email",
+            params=params,
+        )
         resp = await AsyncRequest(
             config=self.config,
             path=path,
@@ -178,16 +192,25 @@ class AsyncValidate(ClientConfig):
             verb="get",
         ).perform_with_content()
         return resp
-
-    async def nsfw(self, params: NSFWParams) -> NSFWResponse:
-        path = f"/validate/nsfw"
+    
+    async def nsfw(self, params: Union[NSFWParams, bytes]) -> NSFWResponse:
+        path="/validate/nsfw"
+        if isinstance(params, dict):
+            resp = await AsyncRequest(
+                config=self.config,
+                path=path,
+                params=cast(Dict[Any, Any], params),
+                verb="post",
+            ).perform_with_content()
+            return resp
+
+        _headers = {"Content-Type": "application/octet-stream"}
         resp = await AsyncRequest(
             config=self.config,
             path=path,
-            params=cast(
-                Dict[Any, Any],
-                params,
-            ),
+            params={},
+            data=params,
+            headers=_headers,
             verb="post",
         ).perform_with_content()
         return resp

{jigsawstack-0.2.0 → jigsawstack-0.2.2}/jigsawstack.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jigsawstack
-Version: 0.2.0
+Version: 0.2.2
 Summary: JigsawStack - The AI SDK for Python
 Home-page: https://github.com/jigsawstack/jigsawstack-python
 Author: JigsawStack

{jigsawstack-0.2.0 → jigsawstack-0.2.2}/setup.py

@@ -6,7 +6,7 @@ install_requires = open("requirements.txt").readlines()
 
 setup(
     name="jigsawstack",
-    version="0.2.0",
+    version="0.2.2",
     description="JigsawStack - The AI SDK for Python",
     long_description=open("README.md", encoding="utf8").read(),
     long_description_content_type="text/markdown",