trd-utils 0.0.5__tar.gz → 0.0.6__tar.gz

{trd_utils-0.0.5 → trd_utils-0.0.6}/PKG-INFO

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

{trd_utils-0.0.5 → trd_utils-0.0.6}/pyproject.toml

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

trd_utils-0.0.6/trd_utils/__init__.py

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

{trd_utils-0.0.5 → trd_utils-0.0.6}/trd_utils/types_helper/base_model.py

@@ -3,7 +3,7 @@ from typing import (
     Union,
     get_type_hints,
     Any,
-    get_args as get_type_args
+    get_args as get_type_args,
 )
 
 from trd_utils.html_utils.html_formats import camel_to_snake
@@ -19,6 +19,7 @@ ULTRA_LIST_ENABLED: bool = False
 # attribute names are converted to snake_case.
 SET_CAMEL_ATTR_NAMES = False
 
+
 def get_my_field_types(cls):
     type_hints = {}
     for current_cls in cls.__class__.__mro__:
@@ -27,24 +28,31 @@ def get_my_field_types(cls):
         type_hints.update(get_type_hints(current_cls))
     return type_hints
 
+
 def get_real_attr(cls, attr_name):
     if cls is None:
         return None
-    
+
     if isinstance(cls, dict):
         return cls.get(attr_name, None)
 
     if hasattr(cls, attr_name):
         return getattr(cls, attr_name)
-    
+
     return None
 
+
+def is_any_type(target_type: type) -> bool:
+    return target_type == Any or target_type is type(None)
+
+
 class UltraList(list):
     def __getattr__(self, attr):
         if len(self) == 0:
             return None
         return UltraList([get_real_attr(item, attr) for item in self])
 
+
 def convert_to_ultra_list(value: Any) -> UltraList:
     if not value:
         return UltraList()
@@ -61,7 +69,7 @@ def convert_to_ultra_list(value: Any) -> UltraList:
             return tuple(convert_to_ultra_list(v) for v in value)
         elif isinstance(value, set):
             return {convert_to_ultra_list(v) for v in value}
-        
+
         for attr, attr_value in get_my_field_types(value).items():
             if isinstance(attr_value, list):
                 setattr(value, attr, convert_to_ultra_list(getattr(value, attr)))
@@ -70,6 +78,7 @@ def convert_to_ultra_list(value: Any) -> UltraList:
     except Exception:
         return value
 
+
 class BaseModel:
     def __init__(self, **kwargs):
         annotations = get_my_field_types(self)
@@ -83,17 +92,19 @@ class BaseModel:
                     # just ignore and continue
                     annotations[key] = Any
                     annotations[corrected_key] = Any
-            
+
             expected_type = annotations[corrected_key]
             if hasattr(self, "_get_" + corrected_key + "_type"):
                 try:
-                    overridden_type = getattr(self, "_get_" + corrected_key + "_type")(kwargs)
+                    overridden_type = getattr(self, "_get_" + corrected_key + "_type")(
+                        kwargs
+                    )
                     if overridden_type:
                         expected_type = overridden_type
                 except Exception:
                     pass
-            
-            is_optional_type = getattr(expected_type, '_name', None) == 'Optional'
+
+            is_optional_type = getattr(expected_type, "_name", None) == "Optional"
             # maybe in the future we can have some other usages for is_optional_type
             # variable or something like that.
             if is_optional_type:
@@ -102,11 +113,11 @@ class BaseModel:
                 except Exception:
                     # something went wrong, just ignore and continue
                     expected_type = Any
-            
+
             # Handle nested models
             if isinstance(value, dict) and issubclass(expected_type, BaseModel):
                 value = expected_type(**value)
-            
+
             elif isinstance(value, list):
                 type_args = get_type_args(expected_type)
                 if not type_args:
@@ -118,27 +129,29 @@ class BaseModel:
                     nested_type = type_args[0]
                     if issubclass(nested_type, BaseModel):
                         value = [nested_type(**item) for item in value]
-                
+
                 if ULTRA_LIST_ENABLED and isinstance(value, list):
                     value = convert_to_ultra_list(value)
-            
+
             # Type checking
-            elif expected_type != Any and not isinstance(value, expected_type):
+            elif not (is_any_type(expected_type) or isinstance(value, expected_type)):
                 try:
                     value = expected_type(value)
                 except Exception:
-                    raise TypeError(f"Field {corrected_key} must be of type {expected_type}," +
-                                    f" but it's {type(value)}")
-            
+                    raise TypeError(
+                        f"Field {corrected_key} must be of type {expected_type},"
+                        + f" but it's {type(value)}"
+                    )
+
             setattr(self, corrected_key, value)
             if SET_CAMEL_ATTR_NAMES and key != corrected_key:
                 setattr(self, key, value)
-        
+
         # Check if all required fields are present
         # for field in self.__annotations__:
         #     if not hasattr(self, field):
         #         raise ValueError(f"Missing required field: {field}")
-    
+
     @classmethod
     def deserialize(cls, json_data: Union[str, dict]):
         if isinstance(json_data, str):
@@ -146,4 +159,3 @@ class BaseModel:
         else:
             data = json_data
         return cls(**data)
-

trd_utils-0.0.5/trd_utils/__init__.py

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