osbot-utils 2.4.0__py3-none-any.whl → 2.6.0__py3-none-any.whl

osbot_utils/type_safe/Type_Safe.py

@@ -88,7 +88,7 @@ class Type_Safe:
         from osbot_utils.utils.Objects                  import convert_to_value_from_obj_annotation
         from osbot_utils.utils.Objects                  import value_type_matches_obj_annotation_for_attr
         from osbot_utils.utils.Objects                  import value_type_matches_obj_annotation_for_union_and_annotated
-        from osbot_utils.type_safe.Type_Safe__Validator import Type_Safe__Validator
+        from osbot_utils.type_safe.validators.Type_Safe__Validator import Type_Safe__Validator
 
         annotations = all_annotations(self)
         if not annotations:                                             # can't do type safety checks if the class does not have annotations

osbot_utils/type_safe/{Type_Safe_Method.py → 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/type_safe/decorators/type_safe.py

@@ -1,10 +1,10 @@
 import functools                                                                           # For wrapping functions
-from osbot_utils.type_safe.Type_Safe_Method import Type_Safe_Method
+from osbot_utils.type_safe.Type_Safe__Method import Type_Safe__Method
 
 def type_safe(func):                                                                       # Main decorator function
     @functools.wraps(func)                                                                 # Preserve function metadata
     def wrapper(*args, **kwargs):                                                          # Wrapper function
-        type_checker = Type_Safe_Method(func)                                              # Create type checker instance
+        type_checker = Type_Safe__Method(func)                                              # Create type checker instance
         bound_args   = type_checker.handle_type_safety(args, kwargs)                       # Validate type safety
         return func(**bound_args.arguments)                                                # Call original function
 

osbot_utils/type_safe/validators/Validator__Max.py

@@ -1,5 +1,5 @@
 from typing                                             import Any
-from osbot_utils.type_safe.Type_Safe__Validator import Type_Safe__Validator
+from osbot_utils.type_safe.validators.Type_Safe__Validator import Type_Safe__Validator
 
 
 class Validator__Max(Type_Safe__Validator):                             #    Validates that a numeric value is at most the specified maximum."""

osbot_utils/type_safe/validators/Validator__Min.py

@@ -1,5 +1,5 @@
 from typing                                             import Any
-from osbot_utils.type_safe.Type_Safe__Validator import Type_Safe__Validator
+from osbot_utils.type_safe.validators.Type_Safe__Validator import Type_Safe__Validator
 
 class Validator__Min(Type_Safe__Validator):                     # Validates that a value is at least the specified minimum. Works with any type that supports the < operator (numbers, strings, lists, etc.)
     min_value: Any

osbot_utils/type_safe/validators/Validator__One_Of.py

@@ -1,5 +1,5 @@
 from typing                                             import Any
-from osbot_utils.type_safe.Type_Safe__Validator import Type_Safe__Validator
+from osbot_utils.type_safe.validators.Type_Safe__Validator import Type_Safe__Validator
 
 
 class Validator__One_Of(Type_Safe__Validator):                  # Validates that a value is one of a set of allowed values."""

osbot_utils/type_safe/validators/Validator__Regex.py

@@ -1,5 +1,5 @@
 from typing                                             import Any
-from osbot_utils.type_safe.Type_Safe__Validator import Type_Safe__Validator
+from osbot_utils.type_safe.validators.Type_Safe__Validator import Type_Safe__Validator
 
 class Validator__Regex(Type_Safe__Validator):            # Validates that a string matches the specified regex pattern.
     pattern    : str

osbot_utils/utils/Objects.py

@@ -25,7 +25,7 @@ if sys.version_info < (3, 8):
         else:
             return ()
 else:
-    from typing import get_origin, get_args, List, Tuple, Dict, Type, _GenericAlias
+    from typing import get_origin, get_args, List, Tuple, Dict, Type, _GenericAlias, ForwardRef
 
 
 def are_types_compatible_for_assigment(source_type, target_type):
@@ -469,6 +469,8 @@ def value_type_matches_obj_annotation_for_attr(target, attr_name, value):
         origin_attr_type = get_origin(attr_type)                                    # to handle when type definition contains a generic
         if origin_attr_type is type:                                                # Add handling for Type[T]
             type_arg = get_args(attr_type)[0]                                       # Get T from Type[T]
+            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
         if origin_attr_type is Annotated:                                           # if the type is Annotated
             args             = get_args(attr_type)

osbot_utils/version

@@ -1 +1 @@
-v2.4.0
+v2.6.0

{osbot_utils-2.4.0.dist-info → osbot_utils-2.6.0.dist-info}/METADATA

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

@@ -277,19 +277,19 @@ 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=asybUt2JqDP34b7s6clCcurJpaJg_4oOI4Qt10PQ2bM,30419
-osbot_utils/type_safe/Type_Safe_Method.py,sha256=JLB7NkeuY4x_lIWJyvG1bDApCM_VyAQqrzQXhH7Z-8A,10969
+osbot_utils/type_safe/Type_Safe.py,sha256=icn7r8mS1hkeo30uJ3NVJ7kms8P6MeHbA0ldz_MMXps,30430
 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__Validator.py,sha256=cJIPSBarjV716SZUOLvz7Mthjk-aUYKUQtRDtKUBmN4,779
+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=yK1td-9WHFj2pe4dvBtw1cjYOE6z6-VnG5DCStGCO1c,1003
-osbot_utils/type_safe/validators/Validator__Max.py,sha256=ctsMADDqq9l9mxwedrOfI9Dg53nPxCsluB0cO8C6bT4,1264
-osbot_utils/type_safe/validators/Validator__Min.py,sha256=FfVoErZcibqYXvnH-Nl9c2pfPSKFH-CgAhUVBYsxVrc,1970
-osbot_utils/type_safe/validators/Validator__One_Of.py,sha256=RvEYjf2zT06LVucZeNhzFqTZOh-Bs-C9UNjXd_YLWa8,670
-osbot_utils/type_safe/validators/Validator__Regex.py,sha256=BZemPOU8XWc9bxk4jqPm_adnfhbOf6GD4-gatr_L0wo,997
+osbot_utils/type_safe/decorators/type_safe.py,sha256=ERFfJuAIo5qLp03YEDu2zu5wxu65OhR7hOybwuTfLlc,1006
+osbot_utils/type_safe/validators/Type_Safe__Validator.py,sha256=cJIPSBarjV716SZUOLvz7Mthjk-aUYKUQtRDtKUBmN4,779
+osbot_utils/type_safe/validators/Validator__Max.py,sha256=pCvYF5Jb_cBgn1ArGhf6FNUB-NGCXPq3D36oYDCyAzg,1275
+osbot_utils/type_safe/validators/Validator__Min.py,sha256=_-9MdAX2Jc2U0VzCHpEQLA8OVxuNe2y8uaJ6bQttimE,1981
+osbot_utils/type_safe/validators/Validator__One_Of.py,sha256=YVdZv3Fw4vpJGXRSXFmTktFgzcLlUK7bkVSBV6Fxl-4,681
+osbot_utils/type_safe/validators/Validator__Regex.py,sha256=oO_NKTcrcl7wjs5-HB-ovSV9S-3XOZjsa04rdUPsOMg,1008
 osbot_utils/type_safe/validators/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osbot_utils/utils/Assert.py,sha256=u9XLgYn91QvNWZGyPi29SjPJSXRHlm9andIn3NJEVog,1745
 osbot_utils/utils/Call_Stack.py,sha256=awhWstC2mJCrOjNqNheTe2B7at-JFP6XG7VkMPpPNOE,6647
@@ -305,7 +305,7 @@ osbot_utils/utils/Json.py,sha256=0t7Hwefx8bg4JiZVr-xIbWP3BAk6_ZsnY7iV5pnRLDQ,713
 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=F3H0ux-IjfyMIA1ou-xc0Ra1Z7oON3fuYRH_qaGsQ4Y,23375
+osbot_utils/utils/Objects.py,sha256=KN04fgKTlPtKr1d84ESDNlYMQikunyWJ3-I2VKZ8jjw,23661
 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
@@ -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=p1zoKgZOpZRdZ0kkLKwgWGFUdRL6IoXVo1tPBL0f9tY,7
-osbot_utils-2.4.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-osbot_utils-2.4.0.dist-info/METADATA,sha256=M41QEpJLyE3h5hjXubqfqshQ7-wn0ioHXjgt7AKFuOU,1315
-osbot_utils-2.4.0.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
-osbot_utils-2.4.0.dist-info/RECORD,,
+osbot_utils/version,sha256=dngZhSwLPfXtj92IQJKmOr3AcG9xlHjFvq5HyQEcl_s,7
+osbot_utils-2.6.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+osbot_utils-2.6.0.dist-info/METADATA,sha256=I0JH-4t4kPo3RIKeAMFjQp616AUaaXsWBjGkzq0oc5c,1315
+osbot_utils-2.6.0.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
+osbot_utils-2.6.0.dist-info/RECORD,,