trd-utils 0.0.8__tar.gz → 0.0.10__tar.gz

{trd_utils-0.0.8 → trd_utils-0.0.10}/PKG-INFO

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

{trd_utils-0.0.8 → trd_utils-0.0.10}/pyproject.toml

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

trd_utils-0.0.10/trd_utils/__init__.py

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

{trd_utils-0.0.8 → trd_utils-0.0.10}/trd_utils/types_helper/base_model.py

@@ -48,7 +48,7 @@ def is_any_type(target_type: type) -> bool:
 
 
 # TODO: add support for max_depth for this...
-def value_to_normal_obj(value):
+def value_to_normal_obj(value, omit_none: bool = False,):
     """
     Converts a custom value, to a corresponding "normal object" which can be used
     in dict.
@@ -71,7 +71,11 @@ def value_to_normal_obj(value):
     if isinstance(value, dict):
         result = {}
         for inner_key, inner_value in value.items():
-            result[inner_key] = value_to_normal_obj(inner_value)
+            normalized_value = value_to_normal_obj(inner_value)
+            if normalized_value is None and omit_none:
+                continue
+
+            result[inner_key] = normalized_value
 
         return result
 
@@ -92,11 +96,13 @@ def generic_obj_to_value(
     if isinstance(value, list):
         result = []
         for current in value:
-            result.append(generic_obj_to_value(
-                expected_type=expected_type_args[0],
-                expected_type_args=expected_type_args[1:],
-                value=current,
-            ))
+            result.append(
+                generic_obj_to_value(
+                    expected_type=expected_type_args[0],
+                    expected_type_args=expected_type_args[1:],
+                    value=current,
+                )
+            )
         return result
 
     expected_type_name = getattr(expected_type, "__name__", None)
@@ -266,16 +272,26 @@ class BaseModel:
             sort_keys=sort_keys,
         )
 
-    def to_dict(self) -> dict:
+    def to_dict(
+        self,
+        omit_none: bool = False,
+    ) -> dict:
         annotations = get_my_field_types(self)
         result_dict = {}
         for key, _ in annotations.items():
             if not isinstance(key, str):
                 continue
 
-            if key.startswith("__"):
+            if key.startswith("__") or key.startswith(f"_{self.__class__.__name__}__"):
                 # ignore private attributes
                 continue
 
-            result_dict[key] = value_to_normal_obj(getattr(self, key))
+            normalized_value = value_to_normal_obj(
+                value=getattr(self, key),
+                omit_none=omit_none,
+            )
+            if normalized_value is None and omit_none:
+                continue
+
+            result_dict[key] = normalized_value
         return result_dict

trd_utils-0.0.8/trd_utils/__init__.py

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