osbot-utils 2.86.0__py3-none-any.whl → 2.87.0__py3-none-any.whl

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/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/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/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/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/version

@@ -1 +1 @@
-v2.86.0
+v2.87.0

{osbot_utils-2.86.0.dist-info → osbot_utils-2.87.0.dist-info}/METADATA

@@ -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.dist-info → osbot_utils-2.87.0.dist-info}/RECORD

@@ -349,7 +349,7 @@ osbot_utils/testing/performance/models/Model__Performance_Measure__Result.py,sha
 osbot_utils/testing/performance/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osbot_utils/testing/test_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osbot_utils/testing/test_data/const__test__data__html.py,sha256=_DmA7OoCwvl1xxxn2aS8mfvf3Ct4bOt1KTUyTDqtwaQ,1718
-osbot_utils/type_safe/Type_Safe.py,sha256=G0HCBk52ehaJGhLYnt4cKUBsqfnxyRDxrY7_7YhktZg,6390
+osbot_utils/type_safe/Type_Safe.py,sha256=WrsGJgD4iEoKN8z-ZU6RB78QcloLVxck-CB83f44yJw,6398
 osbot_utils/type_safe/Type_Safe__Base.py,sha256=cui8fIzUGaPsb-fnANj8nw9cYrVikdx1XZ8in3Y_-QU,9174
 osbot_utils/type_safe/Type_Safe__Primitive.py,sha256=Eufm1CSenInqW8gAgULhUAXV_lMmA4UY4A5U9v8qmnU,4135
 osbot_utils/type_safe/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -394,7 +394,7 @@ osbot_utils/type_safe/primitives/safe_str/http/Safe_Str__Http__Text.py,sha256=mi
 osbot_utils/type_safe/primitives/safe_str/http/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osbot_utils/type_safe/primitives/safe_str/identifiers/Guid.py,sha256=-WeQzrNj98ay-8rWCBuM-FnhccmygDzZKW1LZ0Frm3M,945
 osbot_utils/type_safe/primitives/safe_str/identifiers/Random_Guid.py,sha256=86xnlevsiitCzFB-VjjBmXXV14pbcKd67YWEDsYTCFk,483
-osbot_utils/type_safe/primitives/safe_str/identifiers/Random_Guid_Short.py,sha256=YP_k5OLuYvXWGU2OEnQHk_OGViBQofTWKm3pUdQaJao,404
+osbot_utils/type_safe/primitives/safe_str/identifiers/Random_Guid_Short.py,sha256=cXye_Bo5cco24FOyXwyN0qotXHc-X4-eQ-ZgOaQrocE,496
 osbot_utils/type_safe/primitives/safe_str/identifiers/Safe_Id.py,sha256=Mj66QVcEHqUKDFb0cdl7cbMOlQKxfFuRxnupmKo6UG8,696
 osbot_utils/type_safe/primitives/safe_str/identifiers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osbot_utils/type_safe/primitives/safe_str/text/Safe_Str__Text.py,sha256=95E4ALhah2AEfL-m5JB7XpUOkyxQ0lJQM139RPQJjv4,327
@@ -411,9 +411,9 @@ osbot_utils/type_safe/primitives/safe_uint/Safe_UInt__Percentage.py,sha256=MKD2A
 osbot_utils/type_safe/primitives/safe_uint/Safe_UInt__Port.py,sha256=gcqi3UaWaFNSktqUTrfdgRKVI5JKWnqxcpi5FlX75J0,496
 osbot_utils/type_safe/primitives/safe_uint/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osbot_utils/type_safe/type_safe_core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-osbot_utils/type_safe/type_safe_core/collections/Type_Safe__Dict.py,sha256=IM_5I_cMw6PhJk2bIRZ6siRAh5GR3QwuHCqzuELPzFs,3371
+osbot_utils/type_safe/type_safe_core/collections/Type_Safe__Dict.py,sha256=1heFE2F7kLUNOKFMZ2eG7DMidcogsaf6dDruHLFGOr4,3734
 osbot_utils/type_safe/type_safe_core/collections/Type_Safe__List.py,sha256=os5dOU7iKnjKoWt00SLj0Wy_X1RL2iGEErsYvg04tto,2719
-osbot_utils/type_safe/type_safe_core/collections/Type_Safe__Set.py,sha256=AqaimwY8Ba-GRI9xsCCZwLmAjMHK3HLV_tJiKXEp7Sc,2575
+osbot_utils/type_safe/type_safe_core/collections/Type_Safe__Set.py,sha256=jbKLz5Kqo527JWY5Xa4k1c7wqonNz8BYXw22b2O2ov4,2580
 osbot_utils/type_safe/type_safe_core/collections/Type_Safe__Tuple.py,sha256=MEUHVwPDVqPmnZsvxwAhQAQY9JwFsMe2R42z4tWKRN4,3445
 osbot_utils/type_safe/type_safe_core/collections/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osbot_utils/type_safe/type_safe_core/decorators/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -434,7 +434,7 @@ osbot_utils/type_safe/type_safe_core/shared/__init__.py,sha256=47DEQpj8HBSa-_TIm
 osbot_utils/type_safe/type_safe_core/steps/Type_Safe__Step__Class_Kwargs.py,sha256=BbMPfCv5-RUZzh-TbyLBvykXZkdkR91jCGJoZ4R697g,8237
 osbot_utils/type_safe/type_safe_core/steps/Type_Safe__Step__Default_Kwargs.py,sha256=tzKXDUc0HVP5QvCWsmcPuuZodNvQZ9FeMDNI2x00Ngw,1943
 osbot_utils/type_safe/type_safe_core/steps/Type_Safe__Step__Default_Value.py,sha256=mRu0yV3w7Ch1H8SOfXMRqMBp3ooY95yR_oni7JafJBc,4603
-osbot_utils/type_safe/type_safe_core/steps/Type_Safe__Step__From_Json.py,sha256=caRTpPbzvBbV18oGHf6MDiazxGfg4tvf4Ik9sc_ikIo,15747
+osbot_utils/type_safe/type_safe_core/steps/Type_Safe__Step__From_Json.py,sha256=QDVf-cN7aK8_xYdkHS74seSrMYyhurd_MEzgTlUyStg,15712
 osbot_utils/type_safe/type_safe_core/steps/Type_Safe__Step__Init.py,sha256=lZpQCCTNt6JcqyWwDoj-9Zgrq10vHXIUBh9lx37vRkE,4990
 osbot_utils/type_safe/type_safe_core/steps/Type_Safe__Step__Set_Attr.py,sha256=ywUYo97jcZkHZ7BJ7GTTuici2obz-Nwch4TcM6ilDcY,9237
 osbot_utils/type_safe/type_safe_core/steps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -470,8 +470,8 @@ osbot_utils/utils/Toml.py,sha256=grjWkVPIMVkawJ499FVIJKxQp8FJ2wcsd0Z3YIR4drM,114
 osbot_utils/utils/Version.py,sha256=Ww6ChwTxqp1QAcxOnztkTicShlcx6fbNsWX5xausHrg,422
 osbot_utils/utils/Zip.py,sha256=mG42lgTY0tnm14T3P1-DSAIZKkTiYoO3odZ1aOUdc1I,14394
 osbot_utils/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-osbot_utils/version,sha256=6Cn7UOgy_SJPSb16yrGhCgZKuq2nwG2aj2B0loLVsZc,8
-osbot_utils-2.86.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-osbot_utils-2.86.0.dist-info/METADATA,sha256=hVm2edAsrGB02PyLzWfO5xAOPsvFMntpGOGLCFV4AT4,7918
-osbot_utils-2.86.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-osbot_utils-2.86.0.dist-info/RECORD,,
+osbot_utils/version,sha256=XwHyoJ_wFA2bjrNtuxOF4NM6cnDdMz3jajvwUly7V7w,8
+osbot_utils-2.87.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+osbot_utils-2.87.0.dist-info/METADATA,sha256=f7H-pt4SZ5tPhp3S_3fP5LXkSbiQnibM-NL8NbIzcVw,7918
+osbot_utils-2.87.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+osbot_utils-2.87.0.dist-info/RECORD,,