osbot-utils 2.28.0__py3-none-any.whl → 2.30.0__py3-none-any.whl

osbot_utils/type_safe/Type_Safe__Dict.py

@@ -1,3 +1,5 @@
+from typing import Type
+
 from osbot_utils.type_safe.Type_Safe__Base import Type_Safe__Base
 
 class Type_Safe__Dict(Type_Safe__Base, dict):
@@ -27,6 +29,10 @@ class Type_Safe__Dict(Type_Safe__Base, dict):
 
         result = {}
         for key, value in self.items():
+
+            if isinstance(key, (type, Type)):                                                     # Handle Type objects as keys
+                key = f"{key.__module__}.{key.__name__}"
+
             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

osbot_utils/type_safe/steps/Type_Safe__Step__From_Json.py

@@ -110,7 +110,7 @@ class Type_Safe__Step__From_Json:
 
         return _self
 
-    def deserialize_type__using_value(self, value):
+    def deserialize_type__using_value(self, value):         # TODO: Check the security implications of this deserialisation
         if value:
             try:
                 module_name, type_name = value.rsplit('.', 1)
@@ -139,9 +139,16 @@ class Type_Safe__Step__From_Json:
         for dict_key, dict_value in value.items():
             key_origin = type_safe_cache.get_origin(key_class)
             if key_origin is type:
-                expected_dict_type = get_args(key_class)[0]
-                if dict_key != expected_dict_type and not issubclass(dict_key,expected_dict_type):
-                    raise TypeError(f"Expected {expected_dict_type} class for key but got instance: {dict_key}")
+                if type(dict_key) is str:
+                    dict_key = self.deserialize_type__using_value(dict_key)
+                key_class_args = get_args(key_class)
+                if key_class_args:
+                    expected_dict_type = key_class_args[0]
+                    if dict_key != expected_dict_type and not issubclass(dict_key,expected_dict_type):
+                        raise TypeError(f"Expected {expected_dict_type} class for key but got instance: {dict_key}")
+                else:
+                    if not isinstance(dict_key, key_class):
+                        raise TypeError(f"Expected {key_class} class for key but got instance: {dict_key}")
                 new__dict_key = dict_key
             elif issubclass(key_class, Type_Safe):
                 new__dict_key = self.deserialize_from_dict(key_class(), dict_key)

osbot_utils/utils/Objects.py

@@ -284,7 +284,15 @@ def serialize_to_dict(obj):
     elif isinstance(obj, set):
         return [serialize_to_dict(item) for item in obj]
     elif isinstance(obj, dict):
-        return {key: serialize_to_dict(value) for key, value in obj.items()}
+        serialized_dict = {}                                                        # todo: refactor to separate method
+        for key, value in obj.items():
+            if isinstance(key, type):                                           # Handle type keys by converting to fully qualified string
+                serialized_key = f"{key.__module__}.{key.__name__}"
+            else:
+                serialized_key = key
+            serialized_dict[serialized_key] = serialize_to_dict(value)         # Recursively serialize the value
+        return serialized_dict
+        #return {key: serialize_to_dict(value) for key, value in obj.items()}
     elif hasattr(obj, "__dict__"):
         data = {}                                                                   # todo: look at a more advanced version which saved the type of the object, for example with {'__type__': type(obj).__name__}
         for key, value in obj.__dict__.items():

osbot_utils/version

@@ -1 +1 @@
-v2.28.0
+v2.30.0

{osbot_utils-2.28.0.dist-info → osbot_utils-2.30.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: osbot_utils
-Version: 2.28.0
+Version: 2.30.0
 Summary: OWASP Security Bot - Utils
 License: MIT
 Author: Dinis Cruz
@@ -23,7 +23,7 @@ Description-Content-Type: text/markdown
 
 Powerful Python util methods and classes that simplify common apis and tasks.
 
-![Current Release](https://img.shields.io/badge/release-v2.28.0-blue)
+![Current Release](https://img.shields.io/badge/release-v2.30.0-blue)
 [![codecov](https://codecov.io/gh/owasp-sbot/OSBot-Utils/graph/badge.svg?token=GNVW0COX1N)](https://codecov.io/gh/owasp-sbot/OSBot-Utils)
 
 

{osbot_utils-2.28.0.dist-info → osbot_utils-2.30.0.dist-info}/RECORD

@@ -296,7 +296,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/type_safe/Type_Safe.py,sha256=LOWRGOGpnRU2iTRLP47vUoyalK0vjFrWlnaghBIogWg,6267
 osbot_utils/type_safe/Type_Safe__Base.py,sha256=Bzrh8TxFglB0FEUAQTlgovlnFHnBN4lOX1Vu327r1Vc,5223
-osbot_utils/type_safe/Type_Safe__Dict.py,sha256=vE_Ut7MabBjOq5Hpr3vdFO5RNf-M-cL83S76CvxD-9g,2488
+osbot_utils/type_safe/Type_Safe__Dict.py,sha256=yEswrqWcYoL97eeeSXRAdIqsz9MjLdC1F6nnuq7JS3s,2700
 osbot_utils/type_safe/Type_Safe__List.py,sha256=SzSIBkwSOAEpW_V2qh4-f0YHzmgB0T8PczBLbDgZGvg,1340
 osbot_utils/type_safe/Type_Safe__Method.py,sha256=LOG2sqQyKBNNEiJxk_jngH6IWvpyVueouAzNTlj-_pY,12676
 osbot_utils/type_safe/Type_Safe__Set.py,sha256=j12fc8cbd9-s_a13ysaz723rNEW4Dt6hObCd0S-AjIg,1432
@@ -319,7 +319,7 @@ osbot_utils/type_safe/shared/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NM
 osbot_utils/type_safe/steps/Type_Safe__Step__Class_Kwargs.py,sha256=snoyJKvZ1crgF2fp0zexwNPnV_E63RfyRIsMAZdrKNY,6995
 osbot_utils/type_safe/steps/Type_Safe__Step__Default_Kwargs.py,sha256=tzKXDUc0HVP5QvCWsmcPuuZodNvQZ9FeMDNI2x00Ngw,1943
 osbot_utils/type_safe/steps/Type_Safe__Step__Default_Value.py,sha256=K_tkVQyLUbbWYzDnzoPLCgDBAFYyUjAG4VdLsvjzL1g,4485
-osbot_utils/type_safe/steps/Type_Safe__Step__From_Json.py,sha256=V-ipKwuQq2wjWXj3Nfq5VadxN8F8bPjjNFR5sVH4pRg,12567
+osbot_utils/type_safe/steps/Type_Safe__Step__From_Json.py,sha256=yy3QrfYd1WMakWvFfDYa-ECajv6hMPY7o0x4xTAHbZs,13042
 osbot_utils/type_safe/steps/Type_Safe__Step__Init.py,sha256=v4FD7zxQiOFLiOF1Ma8wZMP8aLgRlXwJZnsIfBu2zeg,1266
 osbot_utils/type_safe/steps/Type_Safe__Step__Set_Attr.py,sha256=VuKHH9QEYlbAL9R4zwQ5dwexx2sFY6wMx52QmF7eqcg,5219
 osbot_utils/type_safe/steps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -343,7 +343,7 @@ osbot_utils/utils/Json.py,sha256=TvfDoXwOkWzWH-9KMnme5C7iFsMZOleAeue92qmkH6g,883
 osbot_utils/utils/Json_Cache.py,sha256=mLPkkDZN-3ZVJiDvV1KBJXILtKkTZ4OepzOsDoBPhWg,2006
 osbot_utils/utils/Lists.py,sha256=tPz5x5s3sRO97WZ_nsxREBPC5cwaHrhgaYBhsrffTT8,5599
 osbot_utils/utils/Misc.py,sha256=H_xexJgiTxB3jDeDiW8efGQbO0Zuy8MM0iQ7qXC92JI,17363
-osbot_utils/utils/Objects.py,sha256=pLES6h48qsbrPihF4VRKbwzxD9wwh49A8lpJkL2iMRk,12905
+osbot_utils/utils/Objects.py,sha256=RqHzikmIDuqWUbnn7Lxd5ZkIa6smYJmRP6jM0Re5Awk,13471
 osbot_utils/utils/Png.py,sha256=V1juGp6wkpPigMJ8HcxrPDIP4bSwu51oNkLI8YqP76Y,1172
 osbot_utils/utils/Process.py,sha256=lr3CTiEkN3EiBx3ZmzYmTKlQoPdkgZBRjPulMxG-zdo,2357
 osbot_utils/utils/Python_Logger.py,sha256=M9Oi62LxfnRSlCN8GhaiwiBINvcSdGy39FCWjyDD-Xg,12792
@@ -355,8 +355,8 @@ osbot_utils/utils/Toml.py,sha256=Rxl8gx7mni5CvBAK-Ai02EKw-GwtJdd3yeHT2kMloik,166
 osbot_utils/utils/Version.py,sha256=Ww6ChwTxqp1QAcxOnztkTicShlcx6fbNsWX5xausHrg,422
 osbot_utils/utils/Zip.py,sha256=pR6sKliUY0KZXmqNzKY2frfW-YVQEVbLKiyqQX_lc-8,14052
 osbot_utils/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-osbot_utils/version,sha256=UbzDBZPY98UyBryCzA0kKO9CjEdrWfTme6oAH7T38yE,8
-osbot_utils-2.28.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-osbot_utils-2.28.0.dist-info/METADATA,sha256=-RtnCiZmy4ROrr2I8Fvv2zBvHSLQd9xta4mSlXOb3ks,1329
-osbot_utils-2.28.0.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-osbot_utils-2.28.0.dist-info/RECORD,,
+osbot_utils/version,sha256=yHbqsyTtzLh9SfdLRSqp3t4wKZmWSYYIo9w2bDpbXnw,8
+osbot_utils-2.30.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+osbot_utils-2.30.0.dist-info/METADATA,sha256=LAH0B4WB2lteq-ABcbqfnZh5LvicUKyoCuVb1TAIz_4,1329
+osbot_utils-2.30.0.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+osbot_utils-2.30.0.dist-info/RECORD,,