osbot-utils 1.94.0__py3-none-any.whl → 1.96.0__py3-none-any.whl

osbot_utils/base_classes/Type_Safe.py

@@ -3,7 +3,8 @@
 
 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)
+from osbot_utils.utils.Objects import default_value                     # todo: remove test mocking requirement for this to be here (instead of on the respective method)
+from osbot_utils.utils.Objects import all_annotations
 
 # Backport implementations of get_origin and get_args for Python 3.7
 if sys.version_info < (3, 8):                                           # pragma: no cover
@@ -89,7 +90,8 @@ class Type_Safe:
         from osbot_utils.utils.Objects                          import value_type_matches_obj_annotation_for_union_and_annotated
         from osbot_utils.helpers.type_safe.Type_Safe__Validator import Type_Safe__Validator
 
-        if not hasattr(self, '__annotations__'):                    # can't do type safety checks if the class does not have annotations
+        annotations = all_annotations(self)
+        if not annotations:                                             # can't do type safety checks if the class does not have annotations
             return super().__setattr__(name, value)
 
         if value is not None:
@@ -101,20 +103,20 @@ class Type_Safe:
                 origin = get_origin(value)
                 if origin is not None:
                     value = origin
-            check_1 = value_type_matches_obj_annotation_for_attr      (self, name, value)
+            check_1 = value_type_matches_obj_annotation_for_attr              (self, name, value)
             check_2 = value_type_matches_obj_annotation_for_union_and_annotated(self, name, value)
             if (check_1 is False and check_2 is None  or
                 check_1 is None  and check_2 is False or
                 check_1 is False and check_2 is False   ):          # fix for type safety assigment on Union vars
-                raise ValueError(f"Invalid type for attribute '{name}'. Expected '{self.__annotations__.get(name)}' but got '{type(value)}'")
+                raise ValueError(f"Invalid type for attribute '{name}'. Expected '{annotations.get(name)}' but got '{type(value)}'")
         else:
-            if hasattr(self, name) and self.__annotations__.get(name) :     # don't allow previously set variables to be set to None
+            if hasattr(self, name) and annotations.get(name) :     # don't allow previously set variables to be set to None
                 if getattr(self, name) is not None:                         # unless it is already set to None
                     raise ValueError(f"Can't set None, to a variable that is already set. Invalid type for attribute '{name}'. Expected '{self.__annotations__.get(name)}' but got '{type(value)}'")
 
         # todo: refactor this to separate method
-        if hasattr(self.__annotations__, 'get'):
-            annotation = self.__annotations__.get(name)
+        if hasattr(annotations, 'get'):
+            annotation = annotations.get(name)
             if annotation and get_origin(annotation) is Annotated:
                 annotation_args = get_args(annotation)
                 target_type = annotation_args[0]

osbot_utils/base_classes/Type_Safe__Dict.py

@@ -19,4 +19,4 @@ class Type_Safe__Dict(Type_Safe__Base, dict):
     def __repr__(self):
         key_type_name   = type_str(self.expected_key_type)
         value_type_name = type_str(self.expected_value_type)
-        return f"dict[{key_type_name}, {value_type_name}] with {len(self)} entries"
+        return f"dict[{key_type_name}, {value_type_name}] with {len(self)} entries"

osbot_utils/helpers/Guid.py

@@ -11,7 +11,7 @@ class Guid(str):
         if is_guid(value):
             guid = value
         else:
-            guid = uuid.uuid5(GUID__NAMESPACE, value)                                       # Generate a UUID5 using the namespace and value
+            guid = uuid.uuid5(GUID__NAMESPACE, value)                                   # Generate a UUID5 using the namespace and value
         return super().__new__(cls, str(guid))                                          # Return a new instance of Guid initialized with the string version of the UUID
 
     def __str__(self):

osbot_utils/helpers/trace/Trace_Call__Handler.py

@@ -12,6 +12,7 @@ GLOBAL_FUNCTIONS_TO_IGNORE   = ['value_type_matches_obj_annotation_for_attr'
                                 'value_type_matches_obj_annotation_for_union_and_annotated' ,            # todo: map out and document why exactly these methods are ignore (and what is the side effect)
                                 'are_types_compatible_for_assigment'                        ,
                                 'obj_attribute_annotation'                                  ,
+                                'all_annotations'                                           ,
                                 'get_origin'                                                ,
                                 'getmro'                                                    ,
                                 'default_value'                                             ,

osbot_utils/utils/Objects.py

@@ -1,6 +1,8 @@
 # todo add tests
 import sys
-from types                              import SimpleNamespace
+from types                                               import SimpleNamespace
+from osbot_utils.helpers.python_compatibility.python_3_8 import Annotated
+
 
 class __(SimpleNamespace):
     pass
@@ -439,29 +441,38 @@ def pickle_load_from_bytes(pickled_data: bytes):
         except Exception:
             return {}
 
+def all_annotations(target):
+    annotations = {}
+    if hasattr(target.__class__, '__mro__'):
+        for base in reversed(target.__class__.__mro__):
+            if hasattr(base, '__annotations__'):
+                annotations.update(base.__annotations__)
+    return annotations
+
 def value_type_matches_obj_annotation_for_attr(target, attr_name, value):
     import typing
-
-    if hasattr(target, '__annotations__'):
-        obj_annotations  = target.__annotations__
-        if hasattr(obj_annotations,'get'):
-            attr_type        = obj_annotations.get(attr_name)
-            if attr_type:
-                origin_attr_type = get_origin(attr_type)                # to handle when type definion contains an generic
-                if origin_attr_type is typing.Union:
-                    args = get_args(attr_type)
-                    if len(args)==2 and args[1] is type(None):          # todo: find a better way to do this, since this is handling an edge case when origin_attr_type is Optional (which is an shorthand for Union[X, None] )
-                        attr_type = args[0]
-                        origin_attr_type = get_origin(attr_type)
-
-                if origin_attr_type:
-                    attr_type = origin_attr_type
-                value_type = type(value)
-                if are_types_compatible_for_assigment(source_type=value_type, target_type=attr_type):
-                    return True
-                if are_types_magic_mock(source_type=value_type, target_type=attr_type):
-                    return True
-                return value_type is attr_type
+    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
+            args             = get_args(attr_type)
+            origin_attr_type = args[0]
+
+        elif origin_attr_type is typing.Union:
+            args = get_args(attr_type)
+            if len(args)==2 and args[1] is type(None):          # todo: find a better way to do this, since this is handling an edge case when origin_attr_type is Optional (which is an shorthand for Union[X, None] )
+                attr_type = args[0]
+                origin_attr_type = get_origin(attr_type)
+
+        if origin_attr_type:
+            attr_type = origin_attr_type
+        value_type = type(value)
+        if are_types_compatible_for_assigment(source_type=value_type, target_type=attr_type):
+            return True
+        if are_types_magic_mock(source_type=value_type, target_type=attr_type):
+            return True
+        return value_type is attr_type
     return None
 
 

osbot_utils/version

@@ -1 +1 @@
-v1.94.0
+v1.96.0

{osbot_utils-1.94.0.dist-info → osbot_utils-1.96.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: osbot_utils
-Version: 1.94.0
+Version: 1.96.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-v1.94.0-blue)
+![Current Release](https://img.shields.io/badge/release-v1.96.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-1.94.0.dist-info → osbot_utils-1.96.0.dist-info}/RECORD

@@ -2,9 +2,9 @@ osbot_utils/__init__.py,sha256=DdJDmQc9zbQUlPVyTJOww6Ixrn9n4bD3ami5ItQfzJI,16
 osbot_utils/base_classes/Cache_Pickle.py,sha256=kPCwrgUbf_dEdxUz7vW1GuvIPwlNXxuRhb-H3AbSpII,5884
 osbot_utils/base_classes/Kwargs_To_Disk.py,sha256=HHoy05NC_w35WcT-OnSKoSIV_cLqaU9rdjH0_KNTM0E,1096
 osbot_utils/base_classes/Kwargs_To_Self.py,sha256=weFNsBfBNV9W_qBkN-IdBD4yYcJV_zgTxBRO-ZlcPS4,141
-osbot_utils/base_classes/Type_Safe.py,sha256=XzJd1tOEFFT67ycg5QaiXv5pFeWD8Fq4YDVQGGVYAjc,28990
+osbot_utils/base_classes/Type_Safe.py,sha256=cfpLk3x0TQNeRMSRda91_DAO_m14_QtYcRrGMWZ8dmU,29076
 osbot_utils/base_classes/Type_Safe__Base.py,sha256=CFPYe8_i5vvTLyc7s8CXbY4n_dY6sqVfBY8w9Vo77ZA,5468
-osbot_utils/base_classes/Type_Safe__Dict.py,sha256=sfZcukhXUd9TS0PQpAk-gGLfZUJSC6BtMh6jF4Fn8Jw,1107
+osbot_utils/base_classes/Type_Safe__Dict.py,sha256=yB9dSNPh_PARqXhNLg1HBFXgMsB-o-PC7h-BUE8njg0,1106
 osbot_utils/base_classes/Type_Safe__List.py,sha256=pXDzJJttpEQQ9oTdsw7BykMB4VIX2rZzi1ZrnCzMZ8M,650
 osbot_utils/base_classes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osbot_utils/context_managers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -41,7 +41,7 @@ osbot_utils/helpers/CFormat.py,sha256=1_XvqGwgU6qC97MbzcKF0o7s9mCXpU5Kq9Yf-1ixUw
 osbot_utils/helpers/CPrint.py,sha256=ztKPNmT8BGxeyPXSQKRs63PqqbgxKDz_BiZmzFMup9g,1413
 osbot_utils/helpers/Dependency_Manager.py,sha256=79YRYnVfchewq8iSMJ5dzwW2D5u8chWcIqYE-G9YrSo,1337
 osbot_utils/helpers/Dict_To_Attr.py,sha256=NdhXl5mJH7-NaBk213amzc5Nfy3tJgW-N_uYIRE4hoc,208
-osbot_utils/helpers/Guid.py,sha256=22oNPpugnzOkc7swHzw6_duc3PyzXQg5f5mnBXLC-Jw,832
+osbot_utils/helpers/Guid.py,sha256=fqiCYHrYff3yZ_Df-WJdXHl1RQtJHb4oCmDkJpcGN_k,828
 osbot_utils/helpers/Hashicorp_Secrets.py,sha256=zjXa_dQvfR9L1uoulWJ8nYYaDvznV6o_QPPS4zmb6mo,4235
 osbot_utils/helpers/Local_Cache.py,sha256=0JZZX3fFImcwtbBvxAQl-EbBegSNJRhRMYF6ovTH6zY,3141
 osbot_utils/helpers/Local_Caches.py,sha256=aQmi1HSM0TH6WQPedG2fbz4KCCJ3DQTU9d18rB1jR0M,1885
@@ -239,7 +239,7 @@ osbot_utils/helpers/ssh/TestCase__SSH.py,sha256=MD8sq0_kI4f6pEmEO0cLq2mQOhIqbP45
 osbot_utils/helpers/ssh/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osbot_utils/helpers/trace/Trace_Call.py,sha256=O_y6cncgneYrj3ARDMz-o9Yi1LjsESibUqkGFAg0Jk0,8886
 osbot_utils/helpers/trace/Trace_Call__Config.py,sha256=UAjdsDEqsPBBsu-h4_QKYL4UMukJmQYBBWGYTmSKS40,3361
-osbot_utils/helpers/trace/Trace_Call__Handler.py,sha256=9EQyIiGB6r3UURyNgEXHPOCmZNOejM0UJNW9c_MjpNU,12650
+osbot_utils/helpers/trace/Trace_Call__Handler.py,sha256=lXMk_7M9SK7s13qNpLuk5qx9CJJ3lzMJGdI8tB-nO-c,12744
 osbot_utils/helpers/trace/Trace_Call__Print_Lines.py,sha256=cy7zLv0_JNxdOIQPfZk6J9bv6AkIW6O643w0ykClXbw,4820
 osbot_utils/helpers/trace/Trace_Call__Print_Traces.py,sha256=2LGeWMGP1uhSojGMmJmL3bH2B5LFIlfYEqEPNqoyKJw,8628
 osbot_utils/helpers/trace/Trace_Call__Stack.py,sha256=pIvZ2yP4tymOQraUR2N5R-qlmg5QijyLxt85zmMajUs,7462
@@ -304,7 +304,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=nsheXk2t4sRQVJStsKYDgCj8wF3knQ8X1AtLO1M4SlM,21614
+osbot_utils/utils/Objects.py,sha256=7QS_rBiLMLiD28be_br-7NrLfR7LtxFImjUGko8MqXM,21933
 osbot_utils/utils/Png.py,sha256=V1juGp6wkpPigMJ8HcxrPDIP4bSwu51oNkLI8YqP76Y,1172
 osbot_utils/utils/Process.py,sha256=lr3CTiEkN3EiBx3ZmzYmTKlQoPdkgZBRjPulMxG-zdo,2357
 osbot_utils/utils/Python_Logger.py,sha256=tx8N6wRKL3RDHboDRKZn8SirSJdSAE9cACyJkxrThZ8,12792
@@ -316,8 +316,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=_0FgKn2Budr8baj8RE7pf68-C8Yvew0utOg1014PVtc,8
-osbot_utils-1.94.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-osbot_utils-1.94.0.dist-info/METADATA,sha256=v3Ivesk54q4PsxGFrjpS-7clJ6b6tkX_-vhJkZ-ZZp4,1317
-osbot_utils-1.94.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-osbot_utils-1.94.0.dist-info/RECORD,,
+osbot_utils/version,sha256=idBQWZKGK2d1XFMMuNvvIctFv7Fbwu_HFj9LNFyYPr0,8
+osbot_utils-1.96.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+osbot_utils-1.96.0.dist-info/METADATA,sha256=lidaLHgX0Z8-vuoHwr9SvH7LJnjQ2X2KKqLHQpV6PKQ,1317
+osbot_utils-1.96.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+osbot_utils-1.96.0.dist-info/RECORD,,