osbot-utils 2.5.0__py3-none-any.whl → 2.7.0__py3-none-any.whl

osbot_utils/type_safe/Type_Safe.py

@@ -337,8 +337,8 @@ class Type_Safe:
 
     def deserialize_dict__using_key_value_annotations(self, key, value):
         from osbot_utils.type_safe.Type_Safe__Dict import Type_Safe__Dict
-
-        dict_annotations_tuple =  get_args(self.__annotations__[key])
+        annotations = all_annotations(self)
+        dict_annotations_tuple = get_args(annotations.get(key))
         if not dict_annotations_tuple:                                      # happens when the value is a dict/Dict with no annotations
             return value
         if not type(value) is dict:

osbot_utils/type_safe/Type_Safe__Method.py

@@ -1,9 +1,9 @@
 import inspect                                                                            # For function introspection
-from enum     import Enum
-from typing   import get_args, get_origin, Union, List, Any                              # For type hinting utilities
+from enum       import Enum
+from typing     import get_args, get_origin, Union, List, Any, Dict                     # For type hinting utilities
 
 
-class Type_Safe__Method:                                                                   # Class to handle method type safety validation
+class Type_Safe__Method:                                                                  # Class to handle method type safety validation
     def __init__(self, func):                                                             # Initialize with function
         self.func         = func                                                          # Store original function
         self.sig          = inspect.signature(func)                                       # Get function signature
@@ -88,8 +88,10 @@ class Type_Safe__Method:
     def is_union_type(self, origin_type: Any, is_optional: bool) -> bool:             # Check if type is a Union
         return origin_type is Union and not is_optional                               # Must be Union but not Optional
 
-    def validate_union_type(self, param_name: str,                                   # Validate union type
-                          param_value: Any, expected_type: Any):                      # Union parameters
+    def validate_union_type(self, param_name   : str,
+                                  param_value  : Any,
+                                  expected_type: Any):                                  # validate Union type  parameters
+
         args_types = get_args(expected_type)                                         # Get allowed types
         if not any(isinstance(param_value, arg_type) for arg_type in args_types):    # Check if value matches any type
             raise ValueError(f"Parameter '{param_name}' expected one of types {args_types}, but got {type(param_value)}")  # Raise error if no match
@@ -110,10 +112,37 @@ class Type_Safe__Method:
             except Exception:                                                                                           # Handle conversion failure
                 pass                                                                                                    # Continue without conversion
         return False                                                                                                    # Return failure
-                                                           # Return failure
+                                                            # Return failure
+
+    def validate_direct_type(self, param_name: str, param_value: Any, expected_type: Any):
+        if expected_type is Any:                            # Handle typing.Any which accepts everything
+            return True
+
+        if param_value is None:                                                           # Handle None value case
+            is_optional = self.is_optional_type(expected_type)                            # Check if type is optional
+            has_default = self.has_default_value(param_name)                              # Check if has default value
+            self.validate_none_value(param_name, is_optional, has_default)                # Validate None value
 
-    def validate_direct_type(self, param_name: str,                               # Validate direct type match
-                           param_value: Any, expected_type: Any):                  # Type parameters
-        if expected_type is not Any:
-            if not isinstance(param_value, expected_type):                            # Check type match
-                raise ValueError(f"Parameter '{param_name}' expected type {expected_type}, but got {type(param_value)}")  # Raise error if no match
+        origin = get_origin(expected_type)
+
+        if origin is Union:                                                               # If it's a Union type
+            return True                                                                   # there is another check that confirms it: todo: confirm this
+
+        if origin is not None:                                                                              # If it's a generic type (like Dict, List, etc)
+            if origin in (dict, Dict):                                                                      # Special handling for Dict
+                if not isinstance(param_value, dict):
+                    raise ValueError(f"Parameter '{param_name}' expected dict but got {type(param_value)}")
+                key_type, value_type = get_args(expected_type)
+                for k, v in param_value.items():
+                    if not isinstance(k, key_type):
+                        raise ValueError(f"Dict key '{k}' expected type {key_type}, but got {type(k)}")
+                    if not isinstance(v, value_type):
+                        raise ValueError(f"Dict value for key '{k}' expected type {value_type}, but got {type(v)}")
+                return True
+            base_type = origin
+        else:
+            base_type = expected_type
+
+        if not isinstance(param_value, base_type):
+            raise ValueError(f"Parameter '{param_name}' expected type {expected_type}, but got {type(param_value)}")
+        return True

osbot_utils/version

@@ -1 +1 @@
-v2.5.0
+v2.7.0

{osbot_utils-2.5.0.dist-info → osbot_utils-2.7.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: osbot_utils
-Version: 2.5.0
+Version: 2.7.0
 Summary: OWASP Security Bot - Utils
 Home-page: https://github.com/owasp-sbot/OSBot-Utils
 License: MIT
@@ -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.5.0-blue)
+![Current Release](https://img.shields.io/badge/release-v2.7.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.5.0.dist-info → osbot_utils-2.7.0.dist-info}/RECORD

@@ -277,11 +277,11 @@ osbot_utils/testing/Temp_Zip_In_Memory.py,sha256=ibDIWt3K4CX558PbkLbX3InHyWYZcwQ
 osbot_utils/testing/Unit_Test.py,sha256=MReR_wDGbbXFDPz7cmuGflcTxRB6TBnO9mYqRpSq8Pk,1304
 osbot_utils/testing/Unzip_File.py,sha256=V5H97XO9rlvG5EYOSzAH4kTtAH1ohZ8R8ImvJh46ZNg,1177
 osbot_utils/testing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-osbot_utils/type_safe/Type_Safe.py,sha256=icn7r8mS1hkeo30uJ3NVJ7kms8P6MeHbA0ldz_MMXps,30430
+osbot_utils/type_safe/Type_Safe.py,sha256=NwniGTMB9La3Sbo08FkPn01ka9h70n8jTRcqtqSrmi4,30467
 osbot_utils/type_safe/Type_Safe__Base.py,sha256=mL8GMaR9tsaUfwk8d-8zp2g-A8kNKiN6kroEFaNvMOk,5518
 osbot_utils/type_safe/Type_Safe__Dict.py,sha256=I_Ac0JH-ahmQrkADFVyiobTlH1JI31MKHaNszQW4PBo,2396
 osbot_utils/type_safe/Type_Safe__List.py,sha256=SzSIBkwSOAEpW_V2qh4-f0YHzmgB0T8PczBLbDgZGvg,1340
-osbot_utils/type_safe/Type_Safe__Method.py,sha256=wn05pjmdnjhXVFIUaxm6YfWJZGoTzs-IhJ534JKFiV0,10970
+osbot_utils/type_safe/Type_Safe__Method.py,sha256=LOG2sqQyKBNNEiJxk_jngH6IWvpyVueouAzNTlj-_pY,12676
 osbot_utils/type_safe/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osbot_utils/type_safe/decorators/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osbot_utils/type_safe/decorators/type_safe.py,sha256=ERFfJuAIo5qLp03YEDu2zu5wxu65OhR7hOybwuTfLlc,1006
@@ -317,8 +317,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=ry5x0al4PtQq-0dv-mNU4Gk_sTAHYopdKOQmdWyn-ZE,7
-osbot_utils-2.5.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-osbot_utils-2.5.0.dist-info/METADATA,sha256=Ow8znW_Olql05eKUGfwxkJDw5XMf0o_wwXjdS7J2In0,1315
-osbot_utils-2.5.0.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
-osbot_utils-2.5.0.dist-info/RECORD,,
+osbot_utils/version,sha256=EtyVXU03AffYJg9oYhRGCGg4FoQy8uTssAJDNu9cIQY,7
+osbot_utils-2.7.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+osbot_utils-2.7.0.dist-info/METADATA,sha256=EwDB5K1xIrl97T8tWVAoGIdK8XOKdyQ4uqe9ZR_qI6Y,1315
+osbot_utils-2.7.0.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
+osbot_utils-2.7.0.dist-info/RECORD,,