osbot-utils 2.20.0__py3-none-any.whl → 2.22.0__py3-none-any.whl

osbot_utils/type_safe/shared/Type_Safe__Validation.py

@@ -1,3 +1,5 @@
+import collections
+import inspect
 import types
 import typing
 from enum                                                           import EnumMeta
@@ -151,14 +153,15 @@ class Type_Safe__Validation:
         return all(isinstance(k, key_type) and isinstance(v, value_type)
                   for k, v in value.items())                                                        # if it is not a Union or Annotated types just return None (to give an indication to the caller that the comparison was not made)
 
-    def check_if__type_matches__obj_annotation__for_attr(self, target,
-                                                               attr_name,
-                                                               value
-                                                         )              -> Optional[bool]:
+    def check_if__type_matches__obj_annotation__for_attr(self, target, attr_name, value) -> Optional[bool]:
         annotations = type_safe_cache.get_obj_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 collections.abc.Callable:                            # Handle Callable types
+                return self.is_callable_compatible(value, attr_type)                    # ISSUE: THIS IS NEVER CALLED
+
             if origin_attr_type is set:
                 if type(value) is list:
                     return True                                                         # if the attribute is a set and the value is a list, then they are compatible
@@ -190,6 +193,42 @@ class Type_Safe__Validation:
             return value_type is attr_type
         return None
 
+    def is_callable_compatible(self, value, expected_type) -> bool:
+        if not callable(value):
+            return False
+
+        expected_args = get_args(expected_type)
+        if not expected_args:                                                                                   # Callable without type hints
+            return True
+
+        if len(expected_args) != 2:                                                                             # Should have args and return type
+            return False
+
+        expected_param_types = expected_args[0]                                                                 # First element is tuple of parameter types
+        expected_return_type = expected_args[1]                                                                 # Second element is return type
+
+
+        try:                                                                                                    # Get the signature of the actual value
+            sig = inspect.signature(value)
+        except ValueError:                                                                                      # Some built-in functions don't support introspection
+            return True
+
+        actual_params = list(sig.parameters.values())                                                           # Get actual parameters
+
+        if len(actual_params) != len(expected_param_types):                                                     # Check number of parameters matches
+            return False
+
+        for actual_param, expected_param_type in zip(actual_params, expected_param_types):                      # Check each parameter type
+            if actual_param.annotation != inspect.Parameter.empty:
+                if not self.are_types_compatible_for_assigment(actual_param.annotation, expected_param_type):
+                    return False                                                                                # todo: check if we shouldn't raise an exception here, since this is the only place where we actually know the types that don't match in the method signature
+
+        if sig.return_annotation != inspect.Parameter.empty:                                                    # Check return type
+            if not self.are_types_compatible_for_assigment(sig.return_annotation, expected_return_type):
+                return False                                                                                    # todo: check if we shouldn't raise an exception here, since this is the only place where we actually know the types that don't match in the method return type
+
+        return True
+
     # todo: add cache support to this method
     def should_skip_type_check(self, var_type):                                                         # Determine if type checking should be skipped
         origin = type_safe_cache.get_origin(var_type)                                                   # Use cached get_origin

osbot_utils/utils/Http.py

@@ -56,7 +56,6 @@ def http_request(url, data=None, headers=None, method='GET', encoding ='utf-8',
     ssl_request = url.startswith('https://')
     headers = headers or {}
     if data:
-        print()
         if type(data) is not str:                                   # if the data object is not a string
             if headers.get('Content-Type') == "application/json":   # and a json payload is expected
                 data = json.dumps(data)                             # convert it to json
@@ -164,6 +163,17 @@ def POST(url, data='', headers=None):
 def POST_json(*args, **kwargs):
     return json.loads(POST(*args, **kwargs))
 
+def POST_json_get_bytes(url=None, data=None):
+    headers          = {'Content-Type': "application/json"}     # todo add support for providing custom headers
+    kwargs = dict(url     = url   ,
+                  data    = data,
+                  headers = headers      ,
+                  method  = 'POST'       ,
+                  encoding = None
+                  )
+    response = http_request(**kwargs)
+    return response
+
 def PUT(url, data='', headers=None):
     return http_request(url, data, headers, 'PUT')
 

osbot_utils/version

@@ -1 +1 @@
-v2.20.0
+v2.22.0

{osbot_utils-2.20.0.dist-info → osbot_utils-2.22.0.dist-info}/METADATA

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

@@ -312,7 +312,7 @@ osbot_utils/type_safe/shared/Type_Safe__Convert.py,sha256=mS92_sKjKM_aNSB3ERMEgv
 osbot_utils/type_safe/shared/Type_Safe__Not_Cached.py,sha256=25FAl6SOLxdStco_rm9tgOYLfuKyBWheGdl7vVa56UU,800
 osbot_utils/type_safe/shared/Type_Safe__Raise_Exception.py,sha256=pbru8k8CTQMNUfmFBndiJhg2KkqEYzFvJAPcNZHeHfQ,829
 osbot_utils/type_safe/shared/Type_Safe__Shared__Variables.py,sha256=SuZGl9LryQX6IpOE0I_lbzClT-h17UNylC__-M8ltTY,129
-osbot_utils/type_safe/shared/Type_Safe__Validation.py,sha256=CNGuTlfGCwm35d_MQ1ssiNFr2OxsbgI_MczqH_-EK6g,16315
+osbot_utils/type_safe/shared/Type_Safe__Validation.py,sha256=5dVs2zDU_sDh3e025KjaDfUS7B8XENlQ77-7U34b2KY,19017
 osbot_utils/type_safe/shared/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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
@@ -335,7 +335,7 @@ osbot_utils/utils/Env.py,sha256=rBksAy6k-J5oAJp-S_JedVlcj1b2VK8V3zsQbacopMc,6076
 osbot_utils/utils/Exceptions.py,sha256=KyOUHkXQ_6jDTq04Xm261dbEZuRidtsM4dgzNwSG8-8,389
 osbot_utils/utils/Files.py,sha256=yxteAcyhDcUy1_r9Eihx80V16lV_UAE6cvoOe2Dc7DU,23001
 osbot_utils/utils/Functions.py,sha256=0E6alPJ0fJpBiJgFOWooCOi265wSRyxxXAJ5CELBnso,3498
-osbot_utils/utils/Http.py,sha256=Cm_-b2EgxKoQJ47ThZp-dgHCdeGv4UcCNLfTOH94-7s,7790
+osbot_utils/utils/Http.py,sha256=ywjQlpKgklPnh7iLMGrbf4vbNMH50sUGX4crZHAfCQc,8201
 osbot_utils/utils/Int.py,sha256=PmlUdU4lSwf4gJdmTVdqclulkEp7KPCVUDO6AcISMF4,116
 osbot_utils/utils/Json.py,sha256=TvfDoXwOkWzWH-9KMnme5C7iFsMZOleAeue92qmkH6g,8831
 osbot_utils/utils/Json_Cache.py,sha256=mLPkkDZN-3ZVJiDvV1KBJXILtKkTZ4OepzOsDoBPhWg,2006
@@ -353,8 +353,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=_AdBljqQIMGdYF8CAu4LpRlHwcO1_ZTkZ6xVkrPLW2g,8
-osbot_utils-2.20.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-osbot_utils-2.20.0.dist-info/METADATA,sha256=sDcWTKrsC67UUFw6lSmE_xy7Edao-yAs5XTVjJ-XS8s,1329
-osbot_utils-2.20.0.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-osbot_utils-2.20.0.dist-info/RECORD,,
+osbot_utils/version,sha256=pjqcOqrciyAyeCyzaoa2eweE7t6j5-cKqPjIXB68cZM,8
+osbot_utils-2.22.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+osbot_utils-2.22.0.dist-info/METADATA,sha256=EOAI0IncGbtFRJgC2HW5R7OJWT5fQV30Fv6PmV_zL1M,1329
+osbot_utils-2.22.0.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+osbot_utils-2.22.0.dist-info/RECORD,,