Merge dev into main

Author: DinisCruz

README.md

@@ -1,6 +1,6 @@
 # OSBot-Utils
 
-![Current Release](https://img.shields.io/badge/release-v3.20.0-blue)
+![Current Release](https://img.shields.io/badge/release-v3.20.1-blue)
 ![Python](https://img.shields.io/badge/python-3.8+-green)
 ![Type-Safe](https://img.shields.io/badge/Type--Safe-✓-brightgreen)
 ![Caching](https://img.shields.io/badge/Caching-Built--In-orange)

osbot_utils/type_safe/type_safe_core/methods/Type_Safe__Method.py

@@ -235,7 +235,13 @@ def validate_direct_type(self, param_name: str, param_value: Any, expected_type:
             if origin in (dict, Dict):                                                                      # Special handling for Dict
                 if not isinstance(param_value, dict):
                     raise ValueError(f"Parameter '{param_name}' expected dict but got {type(param_value)}")
-                key_type, value_type = get_args(expected_type)
+
+                type_args = get_args(expected_type)
+                if not type_args:                                                                           # Dict without parameters (e.g., Dict instead of Dict[str, int])
+                    return True                                                                             # Accept any dict without validating keys/values
+
+                key_type, value_type = type_args
+
                 if value_type is Any:                                                                       # if value type is Any, we don't need to do any checks since they will all match
                     return True
                 for k, v in param_value.items():

osbot_utils/version

@@ -1 +1 @@
-v3.20.0
+v3.20.1

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name        = "osbot_utils"
-version     = "v3.20.0"
+version     = "v3.20.1"
 description = "OWASP Security Bot - Utils"
 authors     = ["Dinis Cruz <[email protected]>"]
 license     = "MIT"

tests/unit/testing/test__.py

@@ -1,5 +1,6 @@
-from unittest                import TestCase
-from osbot_utils.testing.__  import __, __SKIP__, __MISSING__
+from unittest                       import TestCase
+from osbot_utils.testing.__         import __, __SKIP__, __MISSING__
+from osbot_utils.testing.__helpers  import obj
 
 
 class test__(TestCase):
@@ -290,4 +291,11 @@ def test__real_world_example__api_response_validation(self):
         )
 
         assert api_response == expected_structure                                       # Structure valid
-        assert api_response.json.contains(__(meta=__(total=2)))                        # Specific check
+        assert api_response.json.contains(__(meta=__(total=2)))                        # Specific check
+
+
+    def test__regression__osbot_utils__obj__doesnt_handle_reserved_keywords(self):
+        an_json = {"tag"   : "p",
+                   "class" : "title"}
+
+        assert obj(an_json) == __(tag='p', _class='title')  # FIXED : BUG :this doesn't compile

tests/unit/type_safe/type_safe_core/decorators/test__decorator__type_safe__regression.py

@@ -12,6 +12,48 @@
 
 class test_decorator__type_safe__regression(TestCase):
 
+    def test__regression__type_safe__method__failed_with_dict(self):
+        @type_safe
+        def an_method_1(html_dict: Dict): pass
+
+        @type_safe
+        def an_method_2(self, html_dict: Dict): pass
+
+        @type_safe
+        def an_method_3(html_dict: dict): pass
+
+        @type_safe
+        def an_method_4(self, html_dict: dict): pass
+
+        an_dict_1     = {}
+        an_dict_2     = dict()
+
+        # BUG: with Dict fails
+        # error_message = "not enough values to unpack (expected 2, got 0)"
+        # with pytest.raises(ValueError, match=re.escape(error_message)):
+        #     an_method_1({})                                                     # BUG
+        #
+        # with pytest.raises(ValueError, match=re.escape(error_message)):
+        #     an_method_2(None, {})                                 # BUG
+        #
+        # with pytest.raises(ValueError, match=re.escape(error_message)):
+        #     an_method_2(None, an_dict_1)                                   # BUG
+
+
+        an_method_1({})                                                     # FIXED: BUG
+        an_method_2(None, {})                                               # FIXED: BUG
+        an_method_2(None, an_dict_1)                                        # FIXED: BUG
+
+        # with dict it works
+        an_method_3({})                                  # works with an_method_3(html_dict: dict)
+        an_method_3(an_dict_1)                           # works with an_method_3(html_dict: dict)
+        an_method_3(an_dict_2)                           # works with an_method_3(html_dict: dict)
+        an_method_4(None, {})              # works with an_method_4(self, html_dict: dict)
+        an_method_4(None, an_dict_1)                # works with an_method_4(self, html_dict: dict)
+        an_method_4(None, an_dict_2)                # works with an_method_4(self, html_dict: dict)
+
+
+
     def test__regression__enum_doesnt_convert_str(self):
         class An_Enum(str, Enum):
             VALUE_A = 'value_a'