osbot-utils 2.3.0__tar.gz → 2.5.0__tar.gz

{osbot_utils-2.3.0 → osbot_utils-2.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: osbot_utils
-Version: 2.3.0
+Version: 2.5.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.3.0-blue)
+![Current Release](https://img.shields.io/badge/release-v2.5.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.3.0 → osbot_utils-2.5.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.3.0-blue)
+![Current Release](https://img.shields.io/badge/release-v2.5.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.3.0 → osbot_utils-2.5.0}/osbot_utils/helpers/Guid.py

@@ -1,5 +1,4 @@
 import uuid
-
 from osbot_utils.utils.Misc import is_guid
 
 GUID__NAMESPACE = uuid.UUID('2cfec064-537a-4ff7-8fdc-2fc9e2606f3d')

{osbot_utils-2.3.0 → osbot_utils-2.5.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
@@ -142,7 +142,7 @@ class Type_Safe:
         from enum                      import EnumMeta
         from osbot_utils.utils.Objects import obj_is_type_union_compatible
 
-        IMMUTABLE_TYPES = (bool, int, float, complex, str, tuple, frozenset, bytes, NoneType, EnumMeta)
+        IMMUTABLE_TYPES = (bool, int, float, complex, str, tuple, frozenset, bytes, NoneType, EnumMeta, type)
 
 
         kwargs = {}
@@ -172,7 +172,15 @@ class Type_Safe:
                         if var_value is not None:                                                                   # allow None assignments on ctor since that is a valid use case
                             if get_origin(var_type) is Annotated:
                                 continue
-                            if var_type and not isinstance(var_value, var_type):                                    # check type
+                            if get_origin(var_type) is type:  # Special handling for Type[T]
+                                if not isinstance(var_value, type):
+                                    exception_message = f"variable '{var_name}' is defined as Type[T] but has value '{var_value}' which is not a type"
+                                    raise ValueError(exception_message)
+                                type_arg = get_args(var_type)[0]
+                                if not issubclass(var_value, type_arg):
+                                    exception_message = f"variable '{var_name}' is defined as {var_type} but value {var_value} is not a subclass of {type_arg}"
+                                    raise ValueError(exception_message)
+                            elif var_type and not isinstance(var_value, var_type):                                    # check type
                                 exception_message = f"variable '{var_name}' is defined as type '{var_type}' but has value '{var_value}' of type '{type(var_value)}'"
                                 raise ValueError(exception_message)
                             if var_type not in IMMUTABLE_TYPES and var_name.startswith('__') is False:              # if var_type is not one of the IMMUTABLE_TYPES or is an __ internal

osbot_utils-2.3.0/osbot_utils/type_safe/Type_Safe_Method.py → osbot_utils-2.5.0/osbot_utils/type_safe/Type_Safe__Method.py

@@ -3,7 +3,7 @@ from enum     import Enum
 from typing   import get_args, get_origin, Union, List, Any                              # 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

{osbot_utils-2.3.0 → osbot_utils-2.5.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.3.0 → osbot_utils-2.5.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.3.0 → osbot_utils-2.5.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.3.0 → osbot_utils-2.5.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.3.0 → osbot_utils-2.5.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.3.0 → osbot_utils-2.5.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
+    from typing import get_origin, get_args, List, Tuple, Dict, Type, _GenericAlias, ForwardRef
 
 
 def are_types_compatible_for_assigment(source_type, target_type):
@@ -128,6 +128,16 @@ def convert_to_value_from_obj_annotation(target, attr_name, value):
             if hasattr(obj_annotations,'get'):
                 attribute_annotation = obj_annotations.get(attr_name)
                 if attribute_annotation:
+                    origin = get_origin(attribute_annotation)                               # Add handling for Type[T] annotations
+                    if origin is type and isinstance(value, str):
+                        try:                                                                # Convert string path to actual type
+                            if len(value.rsplit('.', 1)) > 1:
+                                module_name, class_name = value.rsplit('.', 1)
+                                module = __import__(module_name, fromlist=[class_name])
+                                return getattr(module, class_name)
+                        except (ValueError, ImportError, AttributeError) as e:
+                            raise ValueError(f"Could not convert '{value}' to type: {str(e)}")
+
                     if attribute_annotation in TYPE_SAFE__CONVERT_VALUE__SUPPORTED_TYPES:          # for now hard-coding this to just these types until we understand the side effects
                         return attribute_annotation(value)
     return value
@@ -373,6 +383,8 @@ def obj_is_type_union_compatible(var_type, compatible_types):
     from typing import Union
 
     origin = get_origin(var_type)
+    if isinstance(var_type, _GenericAlias) and origin is type:              # Add handling for Type[T]
+        return type in compatible_types                                     # Allow if 'type' is in compatible types
     if origin is Union:                                                     # For Union types, including Optionals
         args = get_args(var_type)                                           # Get the argument types
         for arg in args:                                                    # Iterate through each argument in the Union
@@ -454,8 +466,13 @@ def value_type_matches_obj_annotation_for_attr(target, attr_name, value):
     annotations = all_annotations(target)
     attr_type   = annotations.get(attr_name)
     if attr_type:
-        origin_attr_type = get_origin(attr_type)                # to handle when type definition contains a generic
-        if origin_attr_type is Annotated:                # if the type is Annotated
+        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)
             origin_attr_type = args[0]
 

osbot_utils-2.5.0/osbot_utils/version

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

{osbot_utils-2.3.0 → osbot_utils-2.5.0}/pyproject.toml

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

osbot_utils-2.3.0/osbot_utils/version

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