osbot-utils 2.24.0__py3-none-any.whl → 2.26.0__py3-none-any.whl

osbot_utils/type_safe/shared/Type_Safe__Validation.py

@@ -166,12 +166,16 @@ class Type_Safe__Validation:
                 if type(value) is list:
                     return True                                                         # if the attribute is a set and the value is a list, then they are compatible
             if origin_attr_type is type:                                                # Add handling for Type[T]
-                type_arg = get_args(attr_type)[0]                                       # Get T from Type[T]
-                if type_arg == value:
-                    return True
-                if isinstance(type_arg, (str, ForwardRef)):                             # Handle forward reference
-                    type_arg = target.__class__                                         # If it's a forward reference, the target class should be the containing class
-                return isinstance(value, type) and issubclass(value, type_arg)          # Check that value is a type and is subclass of type_arg
+                type_args = get_args(attr_type)
+                if type_args:
+                    type_arg = get_args(attr_type)[0]                                       # Get T from Type[T]
+                    if type_arg == value:
+                        return True
+                    if isinstance(type_arg, (str, ForwardRef)):                             # Handle forward reference
+                        type_arg = target.__class__                                         # If it's a forward reference, the target class should be the containing class
+                    return isinstance(value, type) and issubclass(value, type_arg)          # Check that value is a type and is subclass of type_arg
+                else:
+                    return isinstance(value, type)
 
             if origin_attr_type is Annotated:                                           # if the type is Annotated
                 args             = get_args(attr_type)

osbot_utils/type_safe/steps/Type_Safe__Step__From_Json.py

@@ -142,7 +142,7 @@ class Type_Safe__Step__From_Json:
                 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}")
-                new__dict_key = get_args(key_class)[0]
+                new__dict_key = dict_key
             elif issubclass(key_class, Type_Safe):
                 new__dict_key = self.deserialize_from_dict(key_class(), dict_key)
             else:

osbot_utils/version

@@ -1 +1 @@
-v2.24.0
+v2.26.0

{osbot_utils-2.24.0.dist-info → osbot_utils-2.26.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: osbot_utils
-Version: 2.24.0
+Version: 2.26.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.24.0-blue)
+![Current Release](https://img.shields.io/badge/release-v2.26.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.24.0.dist-info → osbot_utils-2.26.0.dist-info}/RECORD

@@ -314,12 +314,12 @@ osbot_utils/type_safe/shared/Type_Safe__Json_Compressor__Type_Registry.py,sha256
 osbot_utils/type_safe/shared/Type_Safe__Not_Cached.py,sha256=25FAl6SOLxdStco_rm9tgOYLfuKyBWheGdl7vVa56UU,800
 osbot_utils/type_safe/shared/Type_Safe__Raise_Exception.py,sha256=pbru8k8CTQMNUfmFBndiJhg2KkqEYzFvJAPcNZHeHfQ,829
 osbot_utils/type_safe/shared/Type_Safe__Shared__Variables.py,sha256=SuZGl9LryQX6IpOE0I_lbzClT-h17UNylC__-M8ltTY,129
-osbot_utils/type_safe/shared/Type_Safe__Validation.py,sha256=5dVs2zDU_sDh3e025KjaDfUS7B8XENlQ77-7U34b2KY,19017
+osbot_utils/type_safe/shared/Type_Safe__Validation.py,sha256=1oamgApW2Pug0vvTqMLPxBLFvtcnp1bFnjSUByfJBrs,19192
 osbot_utils/type_safe/shared/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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=K1ln_6ZlfioIV9rq68iXZdzrcn-c_PBUUX8f4tLUzuA,12581
+osbot_utils/type_safe/steps/Type_Safe__Step__From_Json.py,sha256=V-ipKwuQq2wjWXj3Nfq5VadxN8F8bPjjNFR5sVH4pRg,12567
 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
@@ -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=MOhmXbQoerhmm0TRkznaAE74Mf1OvmLhG1RrIItFiI4,8
-osbot_utils-2.24.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-osbot_utils-2.24.0.dist-info/METADATA,sha256=ntHjYFolklm0hJ6Xu0Qr3C35CZ5adpdTxjDOWqfI3Qk,1329
-osbot_utils-2.24.0.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-osbot_utils-2.24.0.dist-info/RECORD,,
+osbot_utils/version,sha256=RZSaVXviZF3y9UfjXr3YrDmllry-euUcFHCuLsyhkPU,8
+osbot_utils-2.26.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+osbot_utils-2.26.0.dist-info/METADATA,sha256=mfZ8WcLMiykJ8Sn7KstCiYQmPEw1JCGByBinJ1SQXAU,1329
+osbot_utils-2.26.0.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+osbot_utils-2.26.0.dist-info/RECORD,,