Merge commit '8c1df9ee00aa38d3b4097048b7a36b5643517ec5' into dev

* commit '8c1df9ee00aa38d3b4097048b7a36b5643517ec5':
  Update release badge and version file
  refactored bug test to regression test

# Conflicts:
#	tests/unit/type_safe/type_safe_core/_regression/test_Type_Safe__regression.py

Author: DinisCruz

README.md

@@ -1,6 +1,6 @@
 # OSBot-Utils
 
-![Current Release](https://img.shields.io/badge/release-v3.52.1-blue)
+![Current Release](https://img.shields.io/badge/release-v3.53.0-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/version

@@ -1 +1 @@
-v3.52.1
+v3.53.0

pyproject.toml

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

tests/unit/type_safe/type_safe_core/_bugs/test_Type_Safe__bugs.py

@@ -100,39 +100,3 @@ class Extended_Config(Base_Config):
             Extended_Config()                                           # BUG: should auto-assign Extended_Handler
 
 
-
-    def test__bug__set__json__serialisation_issue(self):
-        import json
-        from typing import Dict, Set
-        from osbot_utils.testing.__ import __
-        from osbot_utils.type_safe.primitives.domains.identifiers.Safe_Id import Safe_Id
-        from osbot_utils.type_safe.primitives.domains.identifiers.Edge_Id import Edge_Id
-
-        class An_Class(Type_Safe):
-            an_dict : Dict[Safe_Id  , Set[Edge_Id ]]
-        safe_id = Safe_Id('safe-id_jlqsh')
-        edge_id = Edge_Id('6106b8e7')
-        an_class = An_Class()
-        an_class.an_dict[safe_id] = {edge_id}
-
-        #assert an_class.obj () == __(an_dict=__(safe_id_jlqsh={'6106b8e7'}))            # BUG, this should be list, right? i.e. ['6106b8e7']
-        #assert an_class.json() == {'an_dict': {'safe-id_jlqsh': {'6106b8e7'}}}          # BUG, this should be list, right? i.e. ['6106b8e7']
-
-        assert an_class.obj () == __(an_dict=__(safe_id_jlqsh=['6106b8e7']))            # FIXED
-        assert an_class.json() == {'an_dict': {'safe-id_jlqsh': ['6106b8e7']}}          # FIXED
-
-        # error_message = "Object of type set is not JSON serializable"
-        # with pytest.raises(TypeError, match=error_message):                             # BUG
-        #     json.dumps(an_class.json())
-        assert json.dumps(an_class.json()) == '{"an_dict": {"safe-id_jlqsh": ["6106b8e7"]}}'
-
-        assert type(an_class.json().get('an_dict')                     ) is dict
-        #assert type(an_class.json().get('an_dict').get('safe-id_jlqsh')) is set         # BUG
-        assert type(an_class.json().get('an_dict').get('safe-id_jlqsh')) is list         # FIXED
-        assert json.loads(json.dumps(an_class.json())) ==  an_class.json()
-        error_message = "Type Set cannot be instantiated; use set() instead"
-        # with pytest.raises(TypeError, match=re.escape(error_message)):
-        #     An_Class.from_json(an_class.json())                                           # BUG
-        assert An_Class.from_json(an_class.json()).obj() == an_class.obj()                  # FIXED
-        assert An_Class.from_json(an_class.json()).json() == an_class.json()                # FIXED
-

tests/unit/type_safe/type_safe_core/_regression/test_Type_Safe__regression.py

@@ -1,11 +1,14 @@
 import re
 import sys
+import json
 import pytest
 from enum                                                                          import Enum
 from decimal                                                                       import Decimal
 from typing                                                                        import Optional, Union, List, Dict, get_origin, Type, ForwardRef, Any, Set, Tuple
 from unittest                                                                      import TestCase
 from unittest.mock                                                                 import patch
+from osbot_utils.type_safe.primitives.domains.identifiers.Safe_Id                  import Safe_Id
+from osbot_utils.type_safe.primitives.domains.identifiers.Edge_Id                  import Edge_Id
 from osbot_utils.type_safe.primitives.core.Safe_Float                              import Safe_Float
 from osbot_utils.type_safe.primitives.domains.identifiers.safe_str.Safe_Str__Id    import Safe_Str__Id
 from osbot_utils.type_safe.primitives.domains.identifiers.Obj_Id                   import Obj_Id
@@ -2024,6 +2027,7 @@ class An_Class(Type_Safe):
         assert With_Base ().json() == {'an_str': ''}      # FIXED
         assert With_Base ().obj () == __(an_str='')       # FIXED
 
+
     def test__regression__cls_kwargs_creates_ghost_objects_ignoring_provided_kwargs(self):
         """
         BUG: __cls_kwargs__() creates default values for ALL annotated fields,
@@ -2247,4 +2251,34 @@ def test__regression__ghost_object_creation(self):
 
         with Cache__Hash__Generator() as _:
             #assert _.config is None             # BUG
-            assert _.config is not None         # FIXED
+            assert _.config is not None         # FIXED
+
+    def test__regression__set__json__serialisation_issue(self):
+
+        class An_Class(Type_Safe):
+            an_dict : Dict[Safe_Id  , Set[Edge_Id ]]
+        safe_id = Safe_Id('safe-id_jlqsh')
+        edge_id = Edge_Id('6106b8e7')
+        an_class = An_Class()
+        an_class.an_dict[safe_id] = {edge_id}
+
+        #assert an_class.obj () == __(an_dict=__(safe_id_jlqsh={'6106b8e7'}))            # BUG, this should be list, right? i.e. ['6106b8e7']
+        #assert an_class.json() == {'an_dict': {'safe-id_jlqsh': {'6106b8e7'}}}          # BUG, this should be list, right? i.e. ['6106b8e7']
+
+        assert an_class.obj () == __(an_dict=__(safe_id_jlqsh=['6106b8e7']))            # FIXED
+        assert an_class.json() == {'an_dict': {'safe-id_jlqsh': ['6106b8e7']}}          # FIXED
+
+        # error_message = "Object of type set is not JSON serializable"
+        # with pytest.raises(TypeError, match=error_message):                             # BUG
+        #     json.dumps(an_class.json())
+        assert json.dumps(an_class.json()) == '{"an_dict": {"safe-id_jlqsh": ["6106b8e7"]}}'
+
+        assert type(an_class.json().get('an_dict')                     ) is dict
+        #assert type(an_class.json().get('an_dict').get('safe-id_jlqsh')) is set         # BUG
+        assert type(an_class.json().get('an_dict').get('safe-id_jlqsh')) is list         # FIXED
+        assert json.loads(json.dumps(an_class.json())) ==  an_class.json()
+        error_message = "Type Set cannot be instantiated; use set() instead"
+        # with pytest.raises(TypeError, match=re.escape(error_message)):
+        #     An_Class.from_json(an_class.json())                                           # BUG
+        assert An_Class.from_json(an_class.json()).obj() == an_class.obj()                  # FIXED
+        assert An_Class.from_json(an_class.json()).json() == an_class.json()                # FIXED