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

osbot_utils/type_safe/Type_Safe.py

@@ -1,6 +1,6 @@
 # todo: find a way to add these documentations strings to a separate location so that
 #       the data is available in IDE's code complete
-
+import inspect
 import sys
 import types
 from osbot_utils.utils.Objects import default_value                     # todo: remove test mocking requirement for this to be here (instead of on the respective method)
@@ -157,6 +157,8 @@ class Type_Safe:
                         continue
                     if type(v) is functools._lru_cache_wrapper:                         # todo, find better way to handle edge cases like this one (which happens when the @cache decorator is used in a instance method that uses Kwargs_To_Self)
                         continue
+                    if isinstance(v, property):                                         # skip property descriptors since they should not be handled here
+                        continue
                     if (k in kwargs) is False:                                          # do not set the value is it has already been set
                         kwargs[k] = v
 
@@ -198,6 +200,15 @@ class Type_Safe:
         import typing
         from osbot_utils.type_safe.Type_Safe__List import Type_Safe__List
         from osbot_utils.type_safe.Type_Safe__Dict import Type_Safe__Dict
+        if get_origin(var_type) is type:                        # Special handling for Type[T]  # todo: reuse the get_origin value
+            type_args = get_args(var_type)
+            if type_args:
+                if isinstance(type_args[0], ForwardRef):
+                    forward_name = type_args[0].__forward_arg__
+                    for base_cls in inspect.getmro(cls):
+                        if base_cls.__name__ == forward_name:
+                            return cls                                                      # note: in this case we return the cls, and not the base_cls (which makes sense since this happens when the cls class uses base_cls as base, which has a ForwardRef to base_cls )
+                return type_args[0]                             # Return the actual type as the default value
 
         if var_type is typing.Set:                              # todo: refactor the dict, set and list logic, since they are 90% the same
             return set()

osbot_utils/type_safe/methods/type_safe_property.py

@@ -0,0 +1,36 @@
+from typing import TypeVar, Type, Optional
+
+T = TypeVar('T')
+
+def type_safe_property(target_path: str, target_name: str, expected_type: Optional[Type[T]] = None) -> property: # Creates a type-safe property that delegates get/set operations to a nested data object
+
+    def getter(self) -> T:
+        target = self
+        for part in target_path.split('.'):
+            target = getattr(target, part)
+
+        value = getattr(target, target_name)
+
+        if expected_type and value is not None:
+            if not isinstance(value, expected_type):
+                raise TypeError(f"Property '{target_name}' returned value of type {type(value)}, expected {expected_type}")
+        return value
+
+    def setter(self, value: T) -> None:
+        if expected_type and value is not None:
+            if not isinstance(value, expected_type):
+                raise TypeError(f"Cannot set property '{target_name}' with value of type {type(value)}, expected {expected_type}")
+
+        target = self
+        for part in target_path.split('.'):
+            target = getattr(target, part)
+        if hasattr(target, target_name) is False:
+            raise AttributeError(f"Target path '{target_path}' does not have an attribute '{target_name}'")
+        setattr(target, target_name, value)
+
+    return property(getter, setter)
+
+
+wire_as_property = type_safe_property
+bind_as_property = type_safe_property
+set_as_property  = type_safe_property

osbot_utils/utils/Objects.py

@@ -469,9 +469,12 @@ 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 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
+
         if origin_attr_type is Annotated:                                           # if the type is Annotated
             args             = get_args(attr_type)
             origin_attr_type = args[0]

osbot_utils/version

@@ -1 +1 @@
-v2.7.0
+v2.9.0

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

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

@@ -277,7 +277,7 @@ 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=NwniGTMB9La3Sbo08FkPn01ka9h70n8jTRcqtqSrmi4,30467
+osbot_utils/type_safe/Type_Safe.py,sha256=RTi44N_p_gVO4-w6MwvRErv6z4DR-Vgv_X1JjfDV36M,31488
 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
@@ -285,6 +285,8 @@ osbot_utils/type_safe/Type_Safe__Method.py,sha256=LOG2sqQyKBNNEiJxk_jngH6IWvpyVu
 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
+osbot_utils/type_safe/methods/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+osbot_utils/type_safe/methods/type_safe_property.py,sha256=wl_wNPOZDWcNeb3JqRJLyYW0we-fZW6AylIil58VwyI,1432
 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
@@ -305,7 +307,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=KN04fgKTlPtKr1d84ESDNlYMQikunyWJ3-I2VKZ8jjw,23661
+osbot_utils/utils/Objects.py,sha256=3GHd0MzqXgE-_mTS58GIgmIUy2SY4lb6V99EtkgRUc0,23724
 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 +319,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=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,,
+osbot_utils/version,sha256=351BylEWiITd1QlbdsxCEiDfpPqKeADndEHAIk3Q9AQ,7
+osbot_utils-2.9.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+osbot_utils-2.9.0.dist-info/METADATA,sha256=-b-4-_Mt8tmi9TiODuka_8lw3eWnL74svEqP1kTLDMo,1315
+osbot_utils-2.9.0.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
+osbot_utils-2.9.0.dist-info/RECORD,,