trd-utils 0.0.23__py3-none-any.whl → 0.0.25__py3-none-any.whl

trd_utils/__init__.py

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

trd_utils/exchanges/okx/okx_types.py

@@ -44,7 +44,7 @@ class UserPositionInfo(BaseModel):
     mark_px: Decimal = None
     mgn_mode: str = None
     mgn_ratio: Decimal = None
-    notional_usd: int = None
+    notional_usd: Decimal = None
     pnl: Decimal = None
     pos: Decimal = None
     pos_ccy: str = None

trd_utils/types_helper/base_model.py

@@ -98,6 +98,21 @@ def value_to_normal_obj(value, omit_none: bool = False):
 
     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,
@@ -144,7 +159,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)}")
 
@@ -266,7 +284,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.23.dist-info → trd_utils-0.0.25.dist-info}/METADATA

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

{trd_utils-0.0.23.dist-info → trd_utils-0.0.25.dist-info}/RECORD

@@ -1,4 +1,4 @@
-trd_utils/__init__.py,sha256=ycZRLTPOff6iyw6emCSdTkhoNYR94Dl7xx09yStvLVE,25
+trd_utils/__init__.py,sha256=ya5l9DV6rbzbgF3LG_OERJrXy20GL9syFL-MON5solU,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
@@ -21,15 +21,15 @@ trd_utils/exchanges/hyperliquid/hyperliquid_client.py,sha256=dE-WIj1_H_5qHnO2Uu4
 trd_utils/exchanges/hyperliquid/hyperliquid_types.py,sha256=MiGG5fRU7wHqOMtCzQXD1fwwbeUK1HEcQwW5rl-9D4c,2678
 trd_utils/exchanges/okx/__init__.py,sha256=OjVpvcwB9mrCTofLt14JRHV2-fMAzGz9-YkJAMwl6dM,67
 trd_utils/exchanges/okx/okx_client.py,sha256=M6P1lDJ2UDqT7WMvXgiK4BbUwa73OHvh-8Dbo51oOqo,7118
-trd_utils/exchanges/okx/okx_types.py,sha256=u9Y2vxcja1DvlclAxB1g3LDznei8bZLKNGEzgCSLGFw,5009
+trd_utils/exchanges/okx/okx_types.py,sha256=IkFOfgivcvvIw950jyGHAVfFFGbGqfZcYGfZLWfNLvc,5013
 trd_utils/html_utils/__init__.py,sha256=1WWs8C7JszRjTkmzIRLHpxWECHur_DrulTPGIeX88oM,426
 trd_utils/html_utils/html_formats.py,sha256=unKsvOiiDmYTTaM0DYZEUNLEUzWQKKrqASJXvY54kvU,2299
 trd_utils/tradingview/__init__.py,sha256=H0QYb-O5qvy7qC3yswtlcSWLmeBnaS6oJ3JtjvmaV_Y,154
 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.23.dist-info/LICENSE,sha256=J1EP2xt87RjjmsTV1jTjHDQMLIM9FjdwEftTpw8hyv4,1067
-trd_utils-0.0.23.dist-info/METADATA,sha256=TMmJW3ynSCFdDvx3-J2Vd4p3y65hL8YNkYR_KY0EB1s,1095
-trd_utils-0.0.23.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-trd_utils-0.0.23.dist-info/RECORD,,
+trd_utils/types_helper/base_model.py,sha256=tu5PYwxD5aYtQgJ2oVL7qPT9lIXUNxRow8YGVxM5zVg,11571
+trd_utils-0.0.25.dist-info/LICENSE,sha256=J1EP2xt87RjjmsTV1jTjHDQMLIM9FjdwEftTpw8hyv4,1067
+trd_utils-0.0.25.dist-info/METADATA,sha256=z08ADWgMrzRSX8Onkbx9oRAAk6Dv0zWg2f-Yr6_S2Rs,1095
+trd_utils-0.0.25.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+trd_utils-0.0.25.dist-info/RECORD,,