osbot-utils 2.34.0__py3-none-any.whl → 2.36.0__py3-none-any.whl

osbot_utils/testing/performance/Performance_Measure__Session.py

@@ -122,7 +122,7 @@ class Performance_Measure__Session(Type_Safe):
         if self.assert_enabled is False:
             return
         if in_github_action():
-            max_time   = max_time * 5               # adjust for GitHub's slowness
+            max_time   = max_time * 6               # adjust for GitHub's slowness
 
         assert self.result.final_score <= max_time,  f"Performance changed for {self.result.name}: got {self.result.final_score:,d}ns, expected less than {max_time}ns"
 

osbot_utils/type_safe/Type_Safe__Base.py

@@ -1,3 +1,4 @@
+import types
 from typing                                         import get_args, Union, Optional, Any, ForwardRef
 from osbot_utils.helpers.Obj_Id                     import Obj_Id
 from osbot_utils.type_safe.shared.Type_Safe__Cache  import type_safe_cache
@@ -28,9 +29,9 @@ class Type_Safe__Base:
                     actual_type_name   = type_str(type(item))
                     raise TypeError(f"Expected '{expected_type_name}', but got '{actual_type_name}'")
 
-        elif origin is list and args:                                                    # Expected type is List[...]
+        elif origin in (list, set) and args:                                                    # Expected type is List[...]
             (item_type,) = args
-            if not isinstance(item, list):
+            if not isinstance(item, (list,set)):
                 expected_type_name = type_str(expected_type)
                 actual_type_name   = type_str(type(item))
                 raise TypeError(f"Expected '{expected_type_name}', but got '{actual_type_name}'")
@@ -82,9 +83,11 @@ class Type_Safe__Base:
             actual_type_name   = type_str(type(item))
             raise TypeError(f"Expected '{expected_type_name}', but got '{actual_type_name}'")
         elif origin is type:                                            # Expected type is Type[T]
+            if type(item) is str:
+                item = deserialize_type__using_value(item)
             if not isinstance(item, type):                              # First check if item is actually a type
                 expected_type_name = type_str(expected_type)
-                actual_type_name = type_str(type(item))
+                actual_type_name   = type_str(type(item))
                 raise TypeError(f"Expected {expected_type_name}, but got instance: {actual_type_name}")
 
             args = get_args(expected_type)
@@ -115,4 +118,24 @@ def type_str(tp):
     else:
         args = get_args(tp)
         args_str = ', '.join(type_str(arg) for arg in args)
-        return f"{origin.__name__}[{args_str}]"
+        return f"{origin.__name__}[{args_str}]"
+
+# todo: this is duplicated from Type_Safe__Step__From_Json (review and figure out how to do this more centrally)
+def deserialize_type__using_value(value):         # TODO: Check the security implications of this deserialisation
+    from osbot_utils.type_safe.Type_Safe import Type_Safe
+    if value:
+        try:
+            module_name, type_name = value.rsplit('.', 1)
+            if module_name == 'builtins' and type_name == 'NoneType':                       # Special case for NoneType (which serialises as builtins.* , but it actually in types.* )
+                value = types.NoneType
+            else:
+                module = __import__(module_name, fromlist=[type_name])
+                value = getattr(module, type_name)
+                if isinstance(value, type) is False:
+                    raise ValueError(f"Security alert, in deserialize_type__using_value only classes are allowed")
+                # todo: figure out a way to do this
+                # if issubclass(value, (Type_Safe, str, int))  is False:
+                #     raise ValueError(f"Security alert, in deserialize_type__using_value only class of type Type_Safe, str, int are allowed")
+        except (ValueError, ImportError, AttributeError) as e:
+            raise ValueError(f"Could not reconstruct type from '{value}': {str(e)}")
+    return value

osbot_utils/type_safe/Type_Safe__List.py

@@ -18,7 +18,7 @@ class Type_Safe__List(Type_Safe__Base, list):
             try:
                 self.is_instance_of_type(item, self.expected_type)
             except TypeError as e:
-                raise TypeError(f"In Type_Safe__List: Invalid type for item: {e}")
+               raise TypeError(f"In Type_Safe__List: Invalid type for item: {e}")
         super().append(item)
 
 

osbot_utils/type_safe/steps/Type_Safe__Step__From_Json.py

@@ -127,6 +127,14 @@ class Type_Safe__Step__From_Json:
                 else:
                     module = __import__(module_name, fromlist=[type_name])
                     value = getattr(module, type_name)
+                    if isinstance(value, type) is False:
+                        raise ValueError(f"Security alert, in deserialize_type__using_value only classes are allowed")
+
+                    # todo: figure out a way to do this
+                    # supported_types = (Type_Safe, str, int, type, dict)
+                    # if issubclass(value, supported_types)  is False:
+                    #     raise ValueError(f"Security alert, in deserialize_type__using_value only class of {supported_types} are allowed and it was {value}")
+
             except (ValueError, ImportError, AttributeError) as e:
                 raise ValueError(f"Could not reconstruct type from '{value}': {str(e)}")
         return value

osbot_utils/type_safe/steps/Type_Safe__Step__Init.py

@@ -31,6 +31,8 @@ class Type_Safe__Step__Init:
         annotation = type_safe_annotations.obj_attribute_annotation(__self, key)
         if annotation:
             if isinstance(annotation, EnumMeta) and type(value) is str:
+                if value not in annotation.__members__:
+                    raise ValueError(f"Invalid value '{value}' for enum {annotation.__name__}")
                 value = annotation[value]
             else:
 
@@ -69,7 +71,7 @@ class Type_Safe__Step__Init:
                 elif origin is dict and isinstance(value, dict):
                     from osbot_utils.type_safe.Type_Safe__Dict import Type_Safe__Dict
                     key_type, value_type = get_args(annotation)
-                    type_safe_dict = Type_Safe__Dict(expected_key_type=key_type, expected_value_type=value_type)
+                    type_safe_dict       = Type_Safe__Dict(expected_key_type=key_type, expected_value_type=value_type)
                     for k, v in value.items():
                         type_safe_dict[k] = v
                     return type_safe_dict

osbot_utils/version

@@ -1 +1 @@
-v2.34.0
+v2.36.0

{osbot_utils-2.34.0.dist-info → osbot_utils-2.36.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: osbot_utils
-Version: 2.34.0
+Version: 2.36.0
 Summary: OWASP Security Bot - Utils
 License: MIT
 Author: Dinis Cruz
@@ -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.34.0-blue)
+![Current Release](https://img.shields.io/badge/release-v2.36.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.34.0.dist-info → osbot_utils-2.36.0.dist-info}/RECORD

@@ -332,15 +332,15 @@ 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/testing/performance/Performance_Measure__Session.py,sha256=_Nq9oVilWaFn-tjvakCw7ojYVzRas9XmQY66DJT1clk,9108
+osbot_utils/testing/performance/Performance_Measure__Session.py,sha256=CWce0vJAZH_PDbIgK5bNcNFr1qsB37FQJKd05K-63kk,9108
 osbot_utils/testing/performance/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osbot_utils/testing/performance/models/Model__Performance_Measure__Measurement.py,sha256=xT_uKzbSYo9AGiJgNmCHSt3ApneNNyKh8vsMVN6IJQ0,1127
 osbot_utils/testing/performance/models/Model__Performance_Measure__Result.py,sha256=k9HJYNLmW6sjRVsfpduSxHFiVANc1zmYtO_Oz9azpW8,755
 osbot_utils/testing/performance/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osbot_utils/type_safe/Type_Safe.py,sha256=LOWRGOGpnRU2iTRLP47vUoyalK0vjFrWlnaghBIogWg,6267
-osbot_utils/type_safe/Type_Safe__Base.py,sha256=y4L-TeoE7rAZ_mLSZESfRM36avARwcnygqAFYhqAimU,6179
+osbot_utils/type_safe/Type_Safe__Base.py,sha256=9VfmZzY7aE5rNES7F38YYB7U4BqcUqXET1tABuZDsCk,7634
 osbot_utils/type_safe/Type_Safe__Dict.py,sha256=9TExQtFHQNLdw_ASfQ49i1YhC7fSyCiGdVkK8n-hGlc,2407
-osbot_utils/type_safe/Type_Safe__List.py,sha256=xpcozE5XE9pgar7SWBQlkzr8EKHD7RA7xs9fM3RE4zU,1708
+osbot_utils/type_safe/Type_Safe__List.py,sha256=6PIo52QUBu83KhPlvlVOT8tpPpQQkDUGswKKhOxoymg,1707
 osbot_utils/type_safe/Type_Safe__Method.py,sha256=PRV4enbwuD81QKP_5UtUA3OAp0m0xSiUhwkCoseZoq4,15687
 osbot_utils/type_safe/Type_Safe__Set.py,sha256=j12fc8cbd9-s_a13ysaz723rNEW4Dt6hObCd0S-AjIg,1432
 osbot_utils/type_safe/Type_Safe__Tuple.py,sha256=Kx7C4YfHybRbMmVMcmV6yFLi4T48pb592vEZfjjyLxo,1710
@@ -362,8 +362,8 @@ osbot_utils/type_safe/shared/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NM
 osbot_utils/type_safe/steps/Type_Safe__Step__Class_Kwargs.py,sha256=snoyJKvZ1crgF2fp0zexwNPnV_E63RfyRIsMAZdrKNY,6995
 osbot_utils/type_safe/steps/Type_Safe__Step__Default_Kwargs.py,sha256=tzKXDUc0HVP5QvCWsmcPuuZodNvQZ9FeMDNI2x00Ngw,1943
 osbot_utils/type_safe/steps/Type_Safe__Step__Default_Value.py,sha256=b5vsgM8eg9yq2KM0wRMntVHma6OhN_HnU76LxhEIpoA,4483
-osbot_utils/type_safe/steps/Type_Safe__Step__From_Json.py,sha256=zitcFrqSlQyrTiBKi2ndryW3XebDpin_W-Jv2vf8hnM,13595
-osbot_utils/type_safe/steps/Type_Safe__Step__Init.py,sha256=-7uX0qdj7MvvMSheGizGWs9f3s1Xvcdd5taybSSlx6k,4315
+osbot_utils/type_safe/steps/Type_Safe__Step__From_Json.py,sha256=y6iet08nQboMPZ1ymrPA61oaSVE3YB1EvPn8a8PiqOE,14133
+osbot_utils/type_safe/steps/Type_Safe__Step__Init.py,sha256=dQRwFxEMdmoW2ogmYZ6ZxLOvt1XnALx41LPpIB6yp3s,4473
 osbot_utils/type_safe/steps/Type_Safe__Step__Set_Attr.py,sha256=VuKHH9QEYlbAL9R4zwQ5dwexx2sFY6wMx52QmF7eqcg,5219
 osbot_utils/type_safe/steps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osbot_utils/type_safe/validators/Type_Safe__Validator.py,sha256=cJIPSBarjV716SZUOLvz7Mthjk-aUYKUQtRDtKUBmN4,779
@@ -398,8 +398,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=rz42neWw2MmhX3xG5kPsKjPOk2yrM6Z8LOkSP1tTKKc,8
-osbot_utils-2.34.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-osbot_utils-2.34.0.dist-info/METADATA,sha256=FRfMt0c1C3YB_07V0pvgRaOyO0Llz8jF_d7ckzV6_hY,1329
-osbot_utils-2.34.0.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-osbot_utils-2.34.0.dist-info/RECORD,,
+osbot_utils/version,sha256=0wuMx2pp2iJlRaFRxv3KMCNynwS_XlqQIvYnQrKGDbw,8
+osbot_utils-2.36.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+osbot_utils-2.36.0.dist-info/METADATA,sha256=yDtZSLfjqU_kaWUAJsFyHCNM9s3-EfZ7WkpQNk-Eyn0,1329
+osbot_utils-2.36.0.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+osbot_utils-2.36.0.dist-info/RECORD,,