fixed nasty bug in type_safe on how dicts with primitive types were being serialised (the fix is quite elegant, since it reuses the existing main serialisation method)

Author: DinisCruz

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__

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'