trd-utils 0.0.47__py3-none-any.whl → 0.0.48__py3-none-any.whl

trd_utils/__init__.py

@@ -1,3 +1,3 @@
 
-__version__ = "0.0.47"
+__version__ = "0.0.48"
 

trd_utils/types_helper/base_model.py

@@ -13,7 +13,7 @@ from trd_utils.date_utils.datetime_helpers import dt_from_ts, dt_to_ts
 from trd_utils.html_utils.html_formats import camel_to_snake
 from trd_utils.types_helper.model_config import ModelConfig
 from trd_utils.types_helper.ultra_list import convert_to_ultra_list
-from trd_utils.types_helper.utils import AbstractModel, get_my_field_types
+from trd_utils.types_helper.utils import AbstractModel, get_my_field_types, is_type_optional
 
 # Whether to use ultra-list instead of normal python list or not.
 # This might be convenient in some cases, but it is not recommended
@@ -199,7 +199,7 @@ class BaseModel(AbstractModel):
 
             expected_type_args = get_type_args(expected_type)
             expected_type_name = getattr(expected_type, "__name__", None)
-            is_optional_type = expected_type_name == "Optional"
+            is_optional_type = is_type_optional(expected_type)
             is_dict_type = expected_type_name == "dict"
             # maybe in the future we can have some other usages for is_optional_type
             # variable or something like that.
@@ -278,9 +278,16 @@ class BaseModel(AbstractModel):
         #         raise ValueError(f"Missing required field: {field}")
 
     @classmethod
-    def deserialize(cls, json_data: Union[str, dict]):
+    def deserialize(
+        cls,
+        json_data: Union[str, dict],
+        parse_float=Decimal,
+    ):
         if isinstance(json_data, str):
-            data = json.loads(json_data)
+            data = json.loads(
+                json_data,
+                parse_float=parse_float,
+            )
         else:
             data = json_data
         return cls(**data)

trd_utils/types_helper/utils.py

@@ -5,6 +5,18 @@ from typing import (
 class AbstractModel:
     pass
 
+def is_type_optional(target: type) -> bool:
+    if getattr(target, "__name__", None) == "Optional":
+        # e.g: my_field: Optional[str] = None
+        return True
+    
+    target_args = getattr(target, "__args__", None)
+    if target_args and len(target_args) > 1 and target_args[1] is type(None):
+        # e.g: my_field: Decimal | None = None
+        return True
+    
+    return False
+
 def get_real_attr(cls, attr_name):
     if cls is None:
         return None

{trd_utils-0.0.47.dist-info → trd_utils-0.0.48.dist-info}/METADATA

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

{trd_utils-0.0.47.dist-info → trd_utils-0.0.48.dist-info}/RECORD

@@ -1,4 +1,4 @@
-trd_utils/__init__.py,sha256=7UU7HS7yxJAEYyOKLnxUasYKfDeCqB9WVSiQaW6z6r0,25
+trd_utils/__init__.py,sha256=F6nqO7h9gFbxijcrf5rruAh2gbKqWBYRYodKJG82pGA,25
 trd_utils/cipher/__init__.py,sha256=V05KNuzQwCic-ihMVHlC8sENaJGc3I8MCb4pg4849X8,1765
 trd_utils/common_utils/float_utils.py,sha256=aYPwJ005LmrRhXAngojwvdDdtRgeb1FfR6hKeQ5ndMU,470
 trd_utils/common_utils/wallet_utils.py,sha256=OX9q2fymP0VfIWTRIRBP8W33cfyjLXimxMgPOsZe-3g,727
@@ -30,12 +30,12 @@ trd_utils/tradingview/__init__.py,sha256=H0QYb-O5qvy7qC3yswtlcSWLmeBnaS6oJ3Jtjvm
 trd_utils/tradingview/tradingview_client.py,sha256=g_eWYaCRQAL8Kvd-r6AnAdbH7Jha6C_GAyCuxh-RQUU,3917
 trd_utils/tradingview/tradingview_types.py,sha256=z21MXPVdWHAduEl3gSeMIRhxtBN9yK-jPYHfZSMIbSA,6144
 trd_utils/types_helper/__init__.py,sha256=cVm7Pbvuow4zS9vvH4cI9TQjRjPf_d1JE15zXb6dG40,188
-trd_utils/types_helper/base_model.py,sha256=5y_QHYiNu57IxYtyFpPUNA3HI9Jywryl8cyxbM5jQcI,11066
+trd_utils/types_helper/base_model.py,sha256=A1AGScpvnpxdf_sCD4PLc6bbd6MSeOEUQ-FoEuU7PaQ,11207
 trd_utils/types_helper/decorators.py,sha256=ziQGDKV0RnhMG6gBPAz244Ug3j6ayr0iKXeucAdnXB8,527
 trd_utils/types_helper/model_config.py,sha256=uvyhdGHQZ1A_I5RUbCgzlDk6MxWL6RLV8r0cdVi6nBk,60
 trd_utils/types_helper/ultra_list.py,sha256=01WQSkx0G7lD9O9XcXccexniNwyuQ9LwVOeixxr4tWQ,1178
-trd_utils/types_helper/utils.py,sha256=Xq4SZG4NkkGzJyOBs9huAvzl2YcCZ7ZRjfOHol3o-Kc,569
-trd_utils-0.0.47.dist-info/LICENSE,sha256=J1EP2xt87RjjmsTV1jTjHDQMLIM9FjdwEftTpw8hyv4,1067
-trd_utils-0.0.47.dist-info/METADATA,sha256=XVe1RaP3QDNuatLXmKdUN4ksyhE8nvYK1Xn_Lk92A88,1179
-trd_utils-0.0.47.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-trd_utils-0.0.47.dist-info/RECORD,,
+trd_utils/types_helper/utils.py,sha256=hJzxI6D1ZSmv4y4wLrv-QW5AvrDU4BARXJmLpB-CTEI,960
+trd_utils-0.0.48.dist-info/LICENSE,sha256=J1EP2xt87RjjmsTV1jTjHDQMLIM9FjdwEftTpw8hyv4,1067
+trd_utils-0.0.48.dist-info/METADATA,sha256=GKHCGk74bb8OZ7UVLSV9hte6gaNQm9rb67mHJz0wxns,1179
+trd_utils-0.0.48.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+trd_utils-0.0.48.dist-info/RECORD,,