fix: drop unnecessary data param, as every request is not multipartform.

Author: Khurdhula-Harshavardhan

jigsawstack/async_request.py

@@ -243,7 +243,6 @@ async def make_request(
         headers = self.__get_headers()
         params = self.params
         verb = self.verb
-        data = self.data
         files = self.files
 
         _params = None
@@ -252,64 +251,27 @@ async def make_request(
         _form_data = None
 
         if verb.lower() in ["get", "delete"]:
-            # convert params for URL encoding if needed
             _params = self.__convert_params(params)
         elif files:
-            # for multipart requests - matches request.py behavior
             _form_data = aiohttp.FormData()
-
-            # add file(s) to form data
-            for field_name, file_data in files.items():
-                if isinstance(file_data, bytes):
-                    # just pass the blob without filename
-                    _form_data.add_field(
-                        field_name, BytesIO(file_data), content_type="application/octet-stream"
-                    )
-                elif isinstance(file_data, tuple):
-                    # if tuple format (filename, data, content_type)
-                    filename, content, content_type = file_data
-                    _form_data.add_field(
-                        field_name, content, filename=filename, content_type=content_type
-                    )
-
-            # add params as 'body' field in multipart form (JSON stringified)
+            _form_data.add_field("file", BytesIO(files["file"]), filename="upload")
             if params and isinstance(params, dict):
-                _form_data.add_field("body", json.dumps(params), content_type="application/json")
-        elif data:
-            # for binary data without multipart
-            _data = data
-            # pass params as query parameters for binary uploads
-            if params and isinstance(params, dict):
-                _params = self.__convert_params(params)
-        else:
-            # for JSON requests
+                _form_data.add_field(
+                    "body", json.dumps(params), content_type="application/json"
+                )
+
+            headers.pop("Content-Type", None)
+        else:  # pure JSON request
             _json = params
 
-        # m,ake the request based on the data type
-        if _form_data:
-            return await session.request(
-                verb,
-                url,
-                params=_params,
-                data=_form_data,
-                headers=headers,
-            )
-        elif _json is not None:
-            return await session.request(
-                verb,
-                url,
-                params=_params,
-                json=_json,
-                headers=headers,
-            )
-        else:
-            return await session.request(
-                verb,
-                url,
-                params=_params,
-                data=_data,
-                headers=headers,
-            )
+        return await session.request(
+            verb,
+            url,
+            params=_params,
+            json=_json,
+            data=_form_data or _data,
+            headers=headers,
+        )
 
     def __get_session(self) -> aiohttp.ClientSession:
         """

jigsawstack/audio.py

@@ -133,7 +133,6 @@ async def speech_to_text(
     ) -> Union[SpeechToTextResponse, SpeechToTextWebhookResponse]:
         options = options or {}
         path = "/ai/transcribe"
-        params = options or {}
         if isinstance(blob, dict):
             resp = await AsyncRequest(
                 config=self.config,
@@ -147,7 +146,7 @@ async def speech_to_text(
         resp = await AsyncRequest(
             config=self.config,
             path=path,
-            params=params,
+            params=options,
             verb="post",
             files=files,
         ).perform_with_content()

jigsawstack/embedding.py

@@ -46,7 +46,9 @@ def __init__(
     @overload
     def execute(self, params: EmbeddingParams) -> EmbeddingResponse: ...
     @overload
-    def execute(self, blob: bytes, options: EmbeddingParams = None) -> EmbeddingResponse: ...
+    def execute(
+        self, blob: bytes, options: EmbeddingParams = None
+    ) -> EmbeddingResponse: ...
 
     def execute(
         self,
@@ -69,7 +71,6 @@ def execute(
             config=self.config,
             path=path,
             params=options,
-            data=blob,
             files=files,
             verb="post",
         ).perform_with_content()
@@ -95,7 +96,9 @@ def __init__(
     @overload
     async def execute(self, params: EmbeddingParams) -> EmbeddingResponse: ...
     @overload
-    async def execute(self, blob: bytes, options: EmbeddingParams = None) -> EmbeddingResponse: ...
+    async def execute(
+        self, blob: bytes, options: EmbeddingParams = None
+    ) -> EmbeddingResponse: ...
 
     async def execute(
         self,
@@ -118,7 +121,6 @@ async def execute(
             config=self.config,
             path=path,
             params=options,
-            data=blob,
             files=files,
             verb="post",
         ).perform_with_content()

jigsawstack/embedding_v2.py

@@ -44,7 +44,9 @@ def __init__(
     @overload
     def execute(self, params: EmbeddingV2Params) -> EmbeddingV2Response: ...
     @overload
-    def execute(self, blob: bytes, options: EmbeddingV2Params = None) -> EmbeddingV2Response: ...
+    def execute(
+        self, blob: bytes, options: EmbeddingV2Params = None
+    ) -> EmbeddingV2Response: ...
 
     def execute(
         self,
@@ -67,7 +69,6 @@ def execute(
             config=self.config,
             path=path,
             params=options,
-            data=blob,
             files=files,
             verb="post",
         ).perform_with_content()
@@ -118,7 +119,6 @@ async def execute(
             config=self.config,
             path=path,
             params=options,
-            data=blob,
             files=files,
             verb="post",
         ).perform_with_content()

jigsawstack/request.py

@@ -28,7 +28,7 @@ def __init__(
         headers: Dict[str, str] = None,
         data: Union[bytes, None] = None,
         stream: Union[bool, None] = False,
-        files: Union[Dict[str, Any], None] = None,  # Change from 'file' to 'files'
+        files: Union[Dict[str, Any], None] = None,
     ):
         self.path = path
         self.params = params
@@ -39,7 +39,7 @@ def __init__(
         self.headers = headers or {"Content-Type": "application/json"}
         self.disable_request_logging = config.get("disable_request_logging")
         self.stream = stream
-        self.files = files  # Change from 'file' to 'files'
+        self.files = files
 
     def perform(self) -> Union[T, None]:
         """Is the main function that makes the HTTP request
@@ -93,7 +93,10 @@ def perform_file(self) -> Union[T, None]:
         # handle error in case there is a statusCode attr present
         # and status != 200 and response is a json.
 
-        if "application/json" not in resp.headers["content-type"] and resp.status_code != 200:
+        if (
+            "application/json" not in resp.headers["content-type"]
+            and resp.status_code != 200
+        ):
             raise_for_code_and_type(
                 code=500,
                 message="Failed to parse JigsawStack API response. Please try again.",
@@ -253,7 +256,7 @@ def make_request(self, url: str) -> requests.Response:
         params = self.params
         verb = self.verb
         data = self.data
-        files = self.files  # Change from 'file' to 'files'
+        files = self.files
 
         _requestParams = None
         _json = None
@@ -262,23 +265,14 @@ def make_request(self, url: str) -> requests.Response:
 
         if verb.lower() in ["get", "delete"]:
             _requestParams = params
-        elif files:
-            # For multipart requests
+        elif files:  # multipart request
             _files = files
-            # Add params as 'body' field in multipart form (JSON stringified)
             if params and isinstance(params, dict):
-                # Convert params to JSON string and add as 'body' field
                 _data = {"body": json.dumps(params)}
-        elif data:
-            # For binary data without multipart
-            _data = data
-            # Pass params as query parameters for binary uploads
-            if params and isinstance(params, dict):
-                _requestParams = params
-        else:
-            # For JSON requests
-            _json = params
+            headers.pop("Content-Type", None)  # let requests set it for multipart
 
+        else:  # pure JSON request
+            _json = params
         try:
             return requests.request(
                 verb,

jigsawstack/translate.py

@@ -83,7 +83,9 @@ def text(self, params: TranslateParams) -> TranslateResponse:
         return resp
 
     @overload
-    def image(self, params: TranslateImageParams) -> Union[TranslateImageResponse, bytes]: ...
+    def image(
+        self, params: TranslateImageParams
+    ) -> Union[TranslateImageResponse, bytes]: ...
     @overload
     def image(
         self, blob: bytes, options: TranslateImageParams = None
@@ -112,7 +114,6 @@ def image(
             config=self.config,
             path=path,
             params=options,
-            data=blob,
             files=files,
             verb="post",
         ).perform_with_content()
@@ -145,7 +146,9 @@ async def text(self, params: TranslateParams) -> TranslateResponse:
         return resp
 
     @overload
-    async def image(self, params: TranslateImageParams) -> Union[TranslateImageResponse, bytes]: ...
+    async def image(
+        self, params: TranslateImageParams
+    ) -> Union[TranslateImageResponse, bytes]: ...
     @overload
     async def image(
         self, blob: bytes, options: TranslateImageParams = None
@@ -172,7 +175,6 @@ async def image(
             config=self.config,
             path=path,
             params=options,
-            data=blob,
             files=files,
             verb="post",
         ).perform_with_content()

jigsawstack/validate.py

@@ -117,7 +117,6 @@ def nsfw(
             config=self.config,
             path=path,
             params=options,
-            data=blob,
             files=files,
             verb="post",
         ).perform_with_content()
@@ -204,7 +203,6 @@ async def nsfw(
             config=self.config,
             path=path,
             params=options,
-            data=blob,
             files=files,
             verb="post",
         ).perform_with_content()

jigsawstack/version.py

@@ -1,4 +1,4 @@
-__version__ = "0.3.3"
+__version__ = "0.3.4"
 
 
 def get_version() -> str:

jigsawstack/vision.py

@@ -209,14 +209,15 @@ def vocr(
             config=self.config,
             path=path,
             params=options,
-            data=blob,
             files=files,
             verb="post",
         ).perform_with_content()
         return resp
 
     @overload
-    def object_detection(self, params: ObjectDetectionParams) -> ObjectDetectionResponse: ...
+    def object_detection(
+        self, params: ObjectDetectionParams
+    ) -> ObjectDetectionResponse: ...
     @overload
     def object_detection(
         self, blob: bytes, options: ObjectDetectionParams = None
@@ -242,7 +243,6 @@ def object_detection(
             config=self.config,
             path=path,
             params=options,
-            data=blob,
             files=files,
             verb="post",
         ).perform_with_content()
@@ -291,14 +291,15 @@ async def vocr(
             config=self.config,
             path=path,
             params=options,
-            data=blob,
             files=files,
             verb="post",
         ).perform_with_content()
         return resp
 
     @overload
-    async def object_detection(self, params: ObjectDetectionParams) -> ObjectDetectionResponse: ...
+    async def object_detection(
+        self, params: ObjectDetectionParams
+    ) -> ObjectDetectionResponse: ...
     @overload
     async def object_detection(
         self, blob: bytes, options: ObjectDetectionParams = None
@@ -327,7 +328,6 @@ async def object_detection(
             config=self.config,
             path=path,
             params=options,
-            data=blob,
             files=files,
             verb="post",
         ).perform_with_content()