osbot-utils 2.4.0__tar.gz → 2.6.0__tar.gz

{osbot_utils-2.4.0 → osbot_utils-2.6.0}/PKG-INFO

@@ -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 → osbot_utils-2.6.0}/README.md

@@ -2,7 +2,7 @@
 
 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 → osbot_utils-2.6.0}/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-2.4.0/osbot_utils/type_safe/Type_Safe_Method.py → osbot_utils-2.6.0/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-2.4.0 → osbot_utils-2.6.0}/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-2.4.0 → osbot_utils-2.6.0}/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-2.4.0 → osbot_utils-2.6.0}/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-2.4.0 → osbot_utils-2.6.0}/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-2.4.0 → osbot_utils-2.6.0}/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-2.4.0 → osbot_utils-2.6.0}/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-2.6.0/osbot_utils/version

@@ -0,0 +1 @@
+v2.6.0

{osbot_utils-2.4.0 → osbot_utils-2.6.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name        = "osbot_utils"
-version     = "v2.4.0"
+version     = "v2.6.0"
 description = "OWASP Security Bot - Utils"
 authors     = ["Dinis Cruz <dinis.cruz@owasp.org>"]
 license     = "MIT"

osbot_utils-2.4.0/osbot_utils/version

@@ -1 +0,0 @@
-v2.4.0