trd-utils 0.0.25__tar.gz → 0.0.27__tar.gz

{trd_utils-0.0.25 → trd_utils-0.0.27}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: trd_utils
-Version: 0.0.25
+Version: 0.0.27
 Summary: Common Basic Utils for Python3. By ALiwoto.
 Keywords: utils,trd_utils,basic-utils,common-utils
 Author: ALiwoto

{trd_utils-0.0.25 → trd_utils-0.0.27}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "trd_utils"
-version = "0.0.25"
+version = "0.0.27"
 description = "Common Basic Utils for Python3. By ALiwoto."
 authors = ["ALiwoto <aminnimaj@gmail.com>"]
 packages = [

trd_utils-0.0.27/trd_utils/__init__.py

@@ -0,0 +1,3 @@
+
+__version__ = "0.0.27"
+

{trd_utils-0.0.25 → trd_utils-0.0.27}/trd_utils/exchanges/exchange_base.py

@@ -82,13 +82,12 @@ class ExchangeBase(ABC):
             headers=headers,
             params=params,
         )
-        if raw_data:
-            return response.content
-
-        if not model_type:
-            return response.json()
-
-        return model_type.deserialize(response.json(parse_float=parse_float))
+        return self._handle_response(
+            response=response,
+            model_type=model_type,
+            parse_float=parse_float,
+            raw_data=raw_data,
+        )
 
     async def invoke_post(
         self,
@@ -113,14 +112,61 @@ class ExchangeBase(ABC):
             params=params,
             content=content,
         )
+        return self._handle_response(
+            response=response,
+            model_type=model_type,
+            parse_float=parse_float,
+            raw_data=raw_data,
+        )
+
+    def _handle_response(
+        self,
+        response: httpx.Response,
+        model_type: Type[BaseModel] | None = None,
+        parse_float=Decimal,
+        raw_data: bool = False,
+    ) -> "BaseModel":
         if raw_data:
             return response.content
 
+        j_obj = self._resp_to_json(
+            response=response,
+        )
         if not model_type:
-            return response.json()
+            return j_obj
 
-        return model_type.deserialize(response.json(parse_float=parse_float))
+        return model_type.deserialize(j_obj)
 
+    def _resp_to_json(
+        self,
+        response: httpx.Response,
+        parse_float=None,
+    ):
+        try:
+            return response.json(parse_float=parse_float)
+        except UnicodeDecodeError:
+            # try to decompress manually
+            import gzip
+            import brotli
+
+            content_encoding = response.headers.get("Content-Encoding", "").lower()
+            content = response.content
+
+            if "gzip" in content_encoding:
+                content = gzip.decompress(content)
+            elif "br" in content_encoding:
+                content = brotli.decompress(content)
+            elif "deflate" in content_encoding:
+                import zlib
+
+                content = zlib.decompress(content, -zlib.MAX_WBITS)
+            else:
+                raise ValueError(
+                    f"failed to detect content encoding: {content_encoding}"
+                )
+
+            # Now parse the decompressed content
+            return json.loads(content.decode("utf-8"), parse_float=parse_float)
 
     async def aclose(self) -> None:
         await self.httpx_client.aclose()

{trd_utils-0.0.25 → trd_utils-0.0.27}/trd_utils/types_helper/base_model.py

@@ -47,6 +47,14 @@ def get_real_attr(cls, attr_name):
     return None
 
 
+def is_base_model_type(expected_type: type) -> bool:
+    return (
+        expected_type is not None
+        and expected_type != Any
+        and issubclass(expected_type, BaseModel)
+    )
+
+
 def is_any_type(target_type: type) -> bool:
     return target_type == Any or target_type is type(None)
 
@@ -92,16 +100,17 @@ def value_to_normal_obj(value, omit_none: bool = False):
             result[inner_key] = normalized_value
 
         return result
-    
+
     if isinstance(value, datetime.datetime):
         return dt_to_ts(value)
 
     raise TypeError(f"unsupported type provided: {type(value)}")
 
+
 def convert_to_expected_type(
     expected_type: type,
     value: Any,
-    default_value = None,
+    default_value=None,
 ):
     try:
         return expected_type(value)
@@ -148,7 +157,7 @@ def generic_obj_to_value(
             )
         return result
 
-    if isinstance(value, dict) and issubclass(expected_type, BaseModel):
+    if isinstance(value, dict) and is_base_model_type(expected_type=expected_type):
         if len(expected_type_args) > 1:
             raise ValueError(
                 "unsupported operation: at this time we cannot have"
@@ -249,7 +258,9 @@ class BaseModel:
                 )
 
             # Handle nested models
-            elif isinstance(value, dict) and issubclass(expected_type, BaseModel):
+            elif isinstance(value, dict) and is_base_model_type(
+                expected_type=expected_type
+            ):
                 value = expected_type(**value)
 
             elif isinstance(value, list):

trd_utils-0.0.25/trd_utils/__init__.py

@@ -1,3 +0,0 @@
-
-__version__ = "0.0.25"
-