Merge dev into main

Author: DinisCruz

README.md

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

@@ -288,15 +288,13 @@ def serialize_to_dict(obj):
     elif isinstance(obj, (set, frozenset)):
         return [serialize_to_dict(item) for item in obj]
     elif isinstance(obj, dict):
-        serialized_dict = {}                                                        # todo: refactor to separate method
+        serialized_dict = {}
         for key, value in obj.items():
-            if isinstance(key, type):                                           # Handle type keys by converting to fully qualified string
-                serialized_key = f"{key.__module__}.{key.__name__}"
-            else:
-                serialized_key = key
-            serialized_dict[serialized_key] = serialize_to_dict(value)         # Recursively serialize the value
+            serialized_key   = serialize_to_dict(key)                               # Recursively handle ALL key types
+            serialized_value = serialize_to_dict(value)
+            serialized_dict[serialized_key] = serialized_value
         return serialized_dict
-        #return {key: serialize_to_dict(value) for key, value in obj.items()}
+
     elif callable(obj) and not isinstance(obj, type):                                                         # For functions/lambdas, return a string representation
         if hasattr(obj, '__name__'):
             return obj.__name__

osbot_utils/version

@@ -1 +1 @@
-v3.48.0
+v3.48.1

pyproject.toml

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

tests/unit/type_safe/primitives/domains/identifiers/test_Cache_Id.py

@@ -1,15 +1,15 @@
-from typing                                                         import List
-from unittest                                                       import TestCase
 import pytest
-from osbot_utils.testing.__                                         import __
-from osbot_utils.type_safe.Type_Safe                                import Type_Safe
-from osbot_utils.type_safe.Type_Safe__Primitive                     import Type_Safe__Primitive
-from osbot_utils.type_safe.primitives.domains.identifiers.Cache_Id  import Cache_Id
+from typing                                                           import List
+from unittest                                                         import TestCase
+from osbot_utils.testing.__                                           import __
+from osbot_utils.type_safe.Type_Safe                                  import Type_Safe
+from osbot_utils.type_safe.Type_Safe__Primitive                       import Type_Safe__Primitive
+from osbot_utils.type_safe.primitives.domains.identifiers.Cache_Id    import Cache_Id
 from osbot_utils.type_safe.primitives.domains.identifiers.Random_Guid import Random_Guid
 from osbot_utils.type_safe.type_safe_core.collections.Type_Safe__List import Type_Safe__List
-from osbot_utils.utils.Json                                         import json_to_str, json_round_trip
-from osbot_utils.utils.Misc                                         import is_guid
-from osbot_utils.utils.Objects                                      import base_classes
+from osbot_utils.utils.Json                                           import json_to_str, json_round_trip
+from osbot_utils.utils.Misc                                           import is_guid
+from osbot_utils.utils.Objects                                        import base_classes
 
 
 class test_Cache_Id(TestCase):
@@ -80,7 +80,7 @@ def test__init__validates_like_random_guid(self):
     # ═══════════════════════════════════════════════════════════════════════════════
 
     def test__is_string_subclass(self):                                                     # Test that Cache_Id is a string
-        cache_id = Cache_Id()
+        cache_id = Cache_Id(Random_Guid())
 
         assert isinstance(cache_id, str)
         assert isinstance(cache_id, Random_Guid)

tests/unit/type_safe/primitives/domains/identifiers/test_Graph_Id.py

@@ -61,13 +61,13 @@ def test__init__with_bad(self):
     # ═══════════════════════════════════════════════════════════════════════════════
 
     def test__is_string_subclass(self):                                                     # Test that Graph_Id is a string
-        graph_id = Graph_Id()
+        graph_id = Graph_Id(Obj_Id())
 
         assert isinstance(graph_id, str         )
         assert isinstance(graph_id, Graph_Id    )
 
     def test__can_be_used_as_string(self):                                                  # Test string operations work
-        graph_id = Graph_Id()
+        graph_id = Graph_Id(Obj_Id())
 
         assert graph_id.upper()  == graph_id.upper()                                        # String methods work
         assert graph_id.lower()  == graph_id.lower()
@@ -130,7 +130,7 @@ def test__multiple_empty_instances(self):
             assert type(empty) is Graph_Id
 
     def test__use_in_dict_key(self):                                                        # Test Graph_Id can be used as dict key
-        graph_id = Graph_Id()
+        graph_id = Graph_Id(Obj_Id())
         data     = {graph_id: 'test_value'}
 
         assert data[graph_id] == 'test_value'

tests/unit/type_safe/type_safe_core/steps/test_perf__Type_Safe__Step__Set_Attr.py

@@ -27,6 +27,7 @@ def setUpClass(cls):                                                           #
         cls.time_8_kns   =  8_000
         cls.time_9_kns   =  9_000
         cls.time_10_kns  = 10_000
+        cls.time_20_kns  = 20_000
 
     def test_simple_setattr(self):                                                 # Test simple attribute setting
         class SimpleClass:
@@ -59,8 +60,8 @@ def set_dict_attr():                                                       # Tes
             type_safe_step_set_attr.setattr(obj, obj, "dict_val", {"key": "value"})
 
         with Performance_Measure__Session() as session:
-            session.measure(set_list_attr).assert_time__less_than(self.time_10_kns)
-            session.measure(set_dict_attr).assert_time__less_than(self.time_10_kns)
+            session.measure(set_list_attr).assert_time__less_than(self.time_20_kns)     # was 10k but was failing in some python version in GH Actions
+            session.measure(set_dict_attr).assert_time__less_than(self.time_20_kns)
 
     def test_union_setattr(self):                                                  # Test union type attribute setting
         class UnionClass:
@@ -120,7 +121,7 @@ def set_dict_convert():                                                     # Te
         with Performance_Measure__Session() as session:
             session.measure(set_str_from_int ).assert_time__less_than(self.time_10_kns)
             session.measure(set_int_from_str ).assert_time__less_than(self.time_10_kns)
-            session.measure(set_dict_convert ).assert_time__less_than(self.time_10_kns)
+            session.measure(set_dict_convert ).assert_time__less_than(self.time_20_kns)
 
     def test_error_cases(self):                                                     # Test error handling performance
         class ErrorClass:
@@ -144,4 +145,4 @@ def set_none_value():                                                       # Te
 
         with Performance_Measure__Session() as session:
             session.measure(set_wrong_type ).assert_time__less_than(self.time_6_kns)
-            session.measure(set_none_value ).assert_time__less_than(self.time_2_kns)
+            session.measure(set_none_value ).assert_time__less_than(self.time_3_kns)