osbot-utils 2.86.0__tar.gz → 2.87.0__tar.gz

{osbot_utils-2.86.0 → osbot_utils-2.87.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: osbot_utils
-Version: 2.86.0
+Version: 2.87.0
 Summary: OWASP Security Bot - Utils
 License: MIT
 Author: Dinis Cruz
@@ -21,7 +21,7 @@ Description-Content-Type: text/markdown
 
 # OSBot-Utils
 
-![Current Release](https://img.shields.io/badge/release-v2.86.0-blue)
+![Current Release](https://img.shields.io/badge/release-v2.87.0-blue)
 ![Python](https://img.shields.io/badge/python-3.8+-green)
 ![Type-Safe](https://img.shields.io/badge/Type--Safe-✓-brightgreen)
 ![Caching](https://img.shields.io/badge/Caching-Built--In-orange)

{osbot_utils-2.86.0 → osbot_utils-2.87.0}/README.md

@@ -1,6 +1,6 @@
 # OSBot-Utils
 
-![Current Release](https://img.shields.io/badge/release-v2.86.0-blue)
+![Current Release](https://img.shields.io/badge/release-v2.87.0-blue)
 ![Python](https://img.shields.io/badge/python-3.8+-green)
 ![Type-Safe](https://img.shields.io/badge/Type--Safe-✓-brightgreen)
 ![Caching](https://img.shields.io/badge/Caching-Built--In-orange)

{osbot_utils-2.86.0 → osbot_utils-2.87.0}/osbot_utils/type_safe/Type_Safe.py

@@ -1,8 +1,8 @@
 # todo: find a way to add these documentations strings to a separate location so that
 #       the data is available in IDE's code complete
-from osbot_utils.type_safe.type_safe_core.shared.Type_Safe__Validation import type_safe_validation
+from osbot_utils.type_safe.type_safe_core.shared.Type_Safe__Validation          import type_safe_validation
 from osbot_utils.type_safe.type_safe_core.steps.Type_Safe__Step__Class_Kwargs   import type_safe_step_class_kwargs
-from osbot_utils.type_safe.type_safe_core.steps.Type_Safe__Step__Default_Kwargs  import type_safe_step_default_kwargs
+from osbot_utils.type_safe.type_safe_core.steps.Type_Safe__Step__Default_Kwargs import type_safe_step_default_kwargs
 from osbot_utils.type_safe.type_safe_core.steps.Type_Safe__Step__Default_Value  import type_safe_step_default_value
 from osbot_utils.type_safe.type_safe_core.steps.Type_Safe__Step__Init           import type_safe_step_init
 from osbot_utils.type_safe.type_safe_core.steps.Type_Safe__Step__Set_Attr       import type_safe_step_set_attr

{osbot_utils-2.86.0 → osbot_utils-2.87.0}/osbot_utils/type_safe/primitives/safe_str/identifiers/Random_Guid_Short.py

@@ -1,8 +1,8 @@
-# todo add to osbot utils
-from osbot_utils.utils.Misc import random_guid_short
+from osbot_utils.type_safe.Type_Safe__Primitive import Type_Safe__Primitive
+from osbot_utils.utils.Misc                     import random_guid_short
 
 
-class Random_Guid_Short(str):
+class Random_Guid_Short(Type_Safe__Primitive, str):
     def __new__(cls, value=None):
         if value is None:
             value = random_guid_short()

{osbot_utils-2.86.0 → osbot_utils-2.87.0}/osbot_utils/type_safe/type_safe_core/collections/Type_Safe__Dict.py

@@ -1,7 +1,9 @@
 from typing                                                           import Type
+from osbot_utils.testing.__                                           import __
 from osbot_utils.type_safe.Type_Safe__Base                            import Type_Safe__Base
-from osbot_utils.type_safe.Type_Safe__Primitive import Type_Safe__Primitive
+from osbot_utils.type_safe.Type_Safe__Primitive                       import Type_Safe__Primitive
 from osbot_utils.type_safe.type_safe_core.collections.Type_Safe__List import Type_Safe__List
+from osbot_utils.utils.Objects                                        import dict_to_obj
 
 
 class Type_Safe__Dict(Type_Safe__Base, dict):
@@ -28,33 +30,54 @@ class Type_Safe__Dict(Type_Safe__Base, dict):
     def __enter__(self): return self
     def __exit__ (self, type, value, traceback): pass
 
-    def json(self):                                                                         # Convert the dictionary to a JSON-serializable format.
-        from osbot_utils.type_safe.Type_Safe import Type_Safe                               # can only import this here to avoid circular imports
+    def json(self):
+        from osbot_utils.type_safe.Type_Safe import Type_Safe
+
+        def serialize_value(v):
+            """Recursively serialize values, handling nested structures"""
+            if isinstance(v, Type_Safe):
+                return v.json()
+            elif isinstance(v, Type_Safe__Primitive):
+                return v.__to_primitive__()
+            elif isinstance(v, dict):
+                # Recursively handle nested dictionaries
+                return {k2: serialize_value(v2) for k2, v2 in v.items()}
+            elif isinstance(v, (list, tuple, set)):
+                # Recursively handle sequences
+                serialized = [serialize_value(item) for item in v]
+                if isinstance(v, list):
+                    return serialized
+                elif isinstance(v, tuple):
+                    return tuple(serialized)
+                else:  # set
+                    return set(serialized)
+            else:
+                return v
 
         result = {}
         for key, value in self.items():
-
-            if isinstance(key, (type, Type)):                                                     # Handle Type objects as keys
+            # Handle Type objects as keys
+            if isinstance(key, (type, Type)):
                 key = f"{key.__module__}.{key.__name__}"
             elif isinstance(key, Type_Safe__Primitive):
                 key = key.__to_primitive__()
-            if isinstance(value, Type_Safe):                                                # Handle Type_Safe objects in values
-                result[key] = value.json()
-            elif isinstance(value, (list, tuple)):                                          # Handle lists/tuples that might contain Type_Safe objects
-                result[key] = [item.json() if isinstance(item, Type_Safe) else item
-                               for item in value]
-            elif isinstance(value, dict):                                                   # Handle nested dictionaries that might contain Type_Safe objects
-                result[key] = {k: v.json() if isinstance(v, Type_Safe) else v
-                               for k, v in value.items()}
-            else:
-                if isinstance(value, Type_Safe__Primitive):
-                    result[key] = value.__to_primitive__()
-                else:
-                    result[key] = value
+
+            # Use recursive serialization for values
+            result[key] = serialize_value(value)
+
         return result
 
+    def get(self, key, default=None):       # this makes it consistent with the modified behaviour of __get__item
+        try:
+            return self[key]                # Use __getitem__ with conversion
+        except KeyError:
+            return default                  # Return default instead of raising
+
     def keys(self) -> Type_Safe__List:
         return Type_Safe__List(self.expected_key_type, super().keys())
 
+    def obj(self) -> __:
+        return dict_to_obj(self.json())
+
     def values(self) -> Type_Safe__List:
         return Type_Safe__List(self.expected_value_type, super().values())

{osbot_utils-2.86.0 → osbot_utils-2.87.0}/osbot_utils/type_safe/type_safe_core/collections/Type_Safe__Set.py

@@ -1,4 +1,4 @@
-from osbot_utils.type_safe.Type_Safe__Base import Type_Safe__Base, type_str
+from osbot_utils.type_safe.Type_Safe__Base      import Type_Safe__Base, type_str
 from osbot_utils.type_safe.Type_Safe__Primitive import Type_Safe__Primitive
 
 

{osbot_utils-2.86.0 → osbot_utils-2.87.0}/osbot_utils/type_safe/type_safe_core/steps/Type_Safe__Step__From_Json.py

@@ -5,7 +5,7 @@ from enum
 from osbot_utils.helpers.Obj_Id                                                   import Obj_Id
 from osbot_utils.type_safe.Type_Safe                                              import Type_Safe
 from osbot_utils.type_safe.primitives.safe_str.identifiers.Random_Guid            import Random_Guid
-from osbot_utils.type_safe.primitives.safe_str.identifiers.Random_Guid_Short                                        import Random_Guid_Short
+from osbot_utils.type_safe.primitives.safe_str.identifiers.Random_Guid_Short      import Random_Guid_Short
 from osbot_utils.type_safe.primitives.safe_str.cryptography.hashes.Safe_Str__Hash import Safe_Str__Hash
 from osbot_utils.type_safe.type_safe_core.collections.Type_Safe__Dict             import Type_Safe__Dict
 from osbot_utils.type_safe.type_safe_core.collections.Type_Safe__List             import Type_Safe__List
@@ -16,7 +16,7 @@ from osbot_utils.type_safe.type_safe_core.shared.Type_Safe__Cache
 from osbot_utils.type_safe.type_safe_core.shared.Type_Safe__Convert               import type_safe_convert
 from osbot_utils.utils.Objects                                                    import enum_from_value
 from osbot_utils.type_safe.primitives.safe_str.identifiers.Safe_Id                import Safe_Id
-from osbot_utils.type_safe.primitives.safe_int.Timestamp_Now                       import Timestamp_Now
+from osbot_utils.type_safe.primitives.safe_int.Timestamp_Now                      import Timestamp_Now
 
 # todo; refactor all this python compatibility into the python_3_8 class
 if sys.version_info < (3, 8):                                           # pragma: no cover

osbot_utils-2.87.0/osbot_utils/version

@@ -0,0 +1 @@
+v2.87.0

{osbot_utils-2.86.0 → osbot_utils-2.87.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name        = "osbot_utils"
-version     = "v2.86.0"
+version     = "v2.87.0"
 description = "OWASP Security Bot - Utils"
 authors     = ["Dinis Cruz <dinis.cruz@owasp.org>"]
 license     = "MIT"

osbot_utils-2.86.0/osbot_utils/version

@@ -1 +0,0 @@
-v2.86.0