Updating async wrapper for handling return types gracefully.

Author: Khurdhula-Harshavardhan

jigsawstack/async_request.py

@@ -39,72 +39,65 @@ def __init__(
     async def perform(self) -> Union[T, None]:
         """
         Async method to make an HTTP request to the JigsawStack API.
-
-        Returns:
-            Union[T, None]: A generic type of the Request class or None
-
-        Raises:
-            aiohttp.ClientResponseError: If the request fails
         """
         async with self.__get_session() as session:
             resp = await self.make_request(session, url=f"{self.api_url}{self.path}")
 
-            # delete calls do not return a body
-            if await resp.text() == "" and resp.status == 200:
-                return None
+            # For binary responses
+            if resp.status == 200:
+                content_type = resp.headers.get("content-type", "")
+                if content_type not in ["application/json", "text/html"]:
+                    content = await resp.read()
+                    return cast(T, content)
 
-            # safety net for non-JSON responses
-            content_type = resp.headers.get("content-type", "")
-            if "application/json" not in content_type:
-                raise_for_code_and_type(
-                    code=500,
-                    message="Failed to parse JigsawStack API response. Please try again.",
-                )
-
-            # handle error responses
+            # For error responses
             if resp.status != 200:
-                error = await resp.json()
-                raise_for_code_and_type(
-                    code=resp.status,
-                    message=error.get("message"),
-                    err=error.get("error"),
-                )
-
-            return cast(T, await resp.json())
-
-    async def perform_file(self) -> Union[aiohttp.ClientResponse, None]:
-        """
-        Async method to make an HTTP request and return the raw response.
-
-        Returns:
-            Union[aiohttp.ClientResponse, None]: The raw response object
-        """
+                try:
+                    error = await resp.json()
+                    raise_for_code_and_type(
+                        code=resp.status,
+                        message=error.get("message"),
+                        err=error.get("error"),
+                    )
+                except json.JSONDecodeError:
+                    raise_for_code_and_type(
+                        code=500,
+                        message="Failed to parse response. Invalid content type or encoding.",
+                    )
+
+            # For JSON responses
+            try:
+                return cast(T, await resp.json())
+            except json.JSONDecodeError:
+                content = await resp.read()
+                return cast(T, content)
+
+    async def perform_file(self) -> Union[T, None]:
         async with self.__get_session() as session:
             resp = await self.make_request(session, url=f"{self.api_url}{self.path}")
 
-            # delete calls do not return a body
-            if await resp.text() == "" and resp.status == 200:
-                return None
-
-            # handle error responses
-            if (
-                "application/json" not in resp.headers.get("content-type", "")
-                and resp.status != 200
-            ):
-                raise_for_code_and_type(
-                    code=500,
-                    message="Failed to parse JigsawStack API response. Please try again.",
-                    error_type="InternalServerError",
-                )
-
             if resp.status != 200:
-                error = await resp.json()
-                raise_for_code_and_type(
-                    code=resp.status,
-                    message=error.get("message"),
-                    err=error.get("error"),
-                )
-            return resp
+                try:
+                    error = await resp.json()
+                    raise_for_code_and_type(
+                        code=resp.status,
+                        message=error.get("message"),
+                        err=error.get("error"),
+                    )
+                except json.JSONDecodeError:
+                    raise_for_code_and_type(
+                        code=500,
+                        message="Failed to parse response. Invalid content type or encoding.",
+                    )
+
+            # For binary responses
+            if resp.status == 200:
+                content_type = resp.headers.get("content-type", "")
+                if "application/json" not in content_type:
+                    content = await resp.read()
+                    return cast(T, content)
+
+            return cast(T, await resp.json())
 
     async def perform_with_content(self) -> T:
         """