trd-utils 0.0.47__tar.gz → 0.0.48__tar.gz

{trd_utils-0.0.47 → trd_utils-0.0.48}/PKG-INFO

@@ -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 → trd_utils-0.0.48}/pyproject.toml

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

trd_utils-0.0.48/trd_utils/__init__.py

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

{trd_utils-0.0.47 → trd_utils-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-0.0.47 → trd_utils-0.0.48}/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/trd_utils/__init__.py

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