trd-utils 0.0.24__py3-none-any.whl → 0.0.26__py3-none-any.whl

trd_utils/__init__.py

@@ -1,3 +1,3 @@
 
-__version__ = "0.0.24"
+__version__ = "0.0.26"
 

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,13 +100,29 @@ 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,
+):
+    try:
+        return expected_type(value)
+    except Exception:
+        if value == "":
+            try:
+                return expected_type()
+            except Exception:
+                return default_value
+        return default_value
+
+
 def generic_obj_to_value(
     expected_type: type,
     expected_type_args: tuple[type],
@@ -133,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"
@@ -144,7 +168,10 @@ def generic_obj_to_value(
     if not expected_type_args:
         if value is None or isinstance(value, expected_type):
             return value
-        return expected_type(value)
+        return convert_to_expected_type(
+            expected_type=expected_type,
+            value=value,
+        )
 
     raise TypeError(f"unsupported type: {type(value)}")
 
@@ -231,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):
@@ -266,7 +295,10 @@ class BaseModel:
             # Type checking
             elif not (is_any_type(expected_type) or isinstance(value, expected_type)):
                 try:
-                    value = expected_type(value)
+                    value = convert_to_expected_type(
+                        expected_type=expected_type,
+                        value=value,
+                    )
                 except Exception:
                     raise TypeError(
                         f"Field {corrected_key} must be of type {expected_type},"

{trd_utils-0.0.24.dist-info → trd_utils-0.0.26.dist-info}/METADATA

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

{trd_utils-0.0.24.dist-info → trd_utils-0.0.26.dist-info}/RECORD

@@ -1,4 +1,4 @@
-trd_utils/__init__.py,sha256=BdPJxY5Id-AZ9wkd-avrl6Mcm-AJ8wfeCAWD6kCw4vk,25
+trd_utils/__init__.py,sha256=Wy_DfSBoQg4JGnSX4I-RPMxCXnRcYWQW07O41KIS8LM,25
 trd_utils/cipher/__init__.py,sha256=V05KNuzQwCic-ihMVHlC8sENaJGc3I8MCb4pg4849X8,1765
 trd_utils/common_utils/float_utils.py,sha256=W-jv7nzjl88xwGB6gsEXmDDhF6DseOrrVT2qx7OvyCo,266
 trd_utils/common_utils/wallet_utils.py,sha256=OX9q2fymP0VfIWTRIRBP8W33cfyjLXimxMgPOsZe-3g,727
@@ -28,8 +28,8 @@ 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=lLbUiW1jUV1gjzTMFLthwkvF0hwauH-F_J2JZq--1U0,67
-trd_utils/types_helper/base_model.py,sha256=EEVEfIpXc5_HhQMAfWXan1i7WFmj7MZvCuwnw3zBgtI,11029
-trd_utils-0.0.24.dist-info/LICENSE,sha256=J1EP2xt87RjjmsTV1jTjHDQMLIM9FjdwEftTpw8hyv4,1067
-trd_utils-0.0.24.dist-info/METADATA,sha256=tvZ8_oljtkI3o1ZYl0YHhClobu3GHp4TA6UUnlWyNf4,1095
-trd_utils-0.0.24.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-trd_utils-0.0.24.dist-info/RECORD,,
+trd_utils/types_helper/base_model.py,sha256=Q2KK0r4UXP9PlWeIl6nxdAeCGB5InU5IkTNGAfJasfM,11808
+trd_utils-0.0.26.dist-info/LICENSE,sha256=J1EP2xt87RjjmsTV1jTjHDQMLIM9FjdwEftTpw8hyv4,1067
+trd_utils-0.0.26.dist-info/METADATA,sha256=CorynlnCD_2-PAjDTKSRYOdkt61sShVt-KqZlSQxSKo,1095
+trd_utils-0.0.26.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+trd_utils-0.0.26.dist-info/RECORD,,