Merge dev into main

Author: DinisCruz

README.md

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

@@ -3,7 +3,7 @@
 from osbot_utils.type_safe.Type_Safe__Base                            import Type_Safe__Base
 from osbot_utils.type_safe.Type_Safe__Primitive                       import Type_Safe__Primitive
 from osbot_utils.type_safe.type_safe_core.collections.Type_Safe__List import Type_Safe__List
-from osbot_utils.utils.Objects                                        import class_full_name
+from osbot_utils.utils.Objects                                        import class_full_name, serialize_to_dict
 
 
 class Type_Safe__Dict(Type_Safe__Base, dict):
@@ -54,7 +54,7 @@ def serialize_value(v):
             elif isinstance(v, dict):
                 # Recursively handle nested dictionaries
                 return {k2: serialize_value(v2) for k2, v2 in v.items()}
-            elif isinstance(v, (list, tuple, set)):
+            elif isinstance(v, (list, tuple, set, frozenset)):
                 # Recursively handle sequences
                 serialized = [serialize_value(item) for item in v]
                 if isinstance(v, list):
@@ -64,7 +64,8 @@ def serialize_value(v):
                 else:  # set
                     return set(serialized)
             else:
-                return v
+                return serialize_to_dict(v)             # Use serialize_to_dict for unknown types (so that we don't return a non json object)
+
 
         result = {}
         for key, value in self.items():

osbot_utils/type_safe/type_safe_core/collections/Type_Safe__List.py

@@ -1,6 +1,6 @@
 from enum                                       import Enum
 from typing                                     import Type
-from osbot_utils.utils.Objects                  import class_full_name
+from osbot_utils.utils.Objects                  import class_full_name, serialize_to_dict
 from osbot_utils.type_safe.Type_Safe__Primitive import Type_Safe__Primitive
 from osbot_utils.type_safe.Type_Safe__Base      import Type_Safe__Base, type_str
 
@@ -82,12 +82,14 @@ def json(self): # Convert the list to a JSON-serializable format.
                 result.append(item.json())
             elif isinstance(item, Type_Safe__Primitive):
                 result.append(item.__to_primitive__())
-            elif isinstance(item, (list, tuple)):
-                result.append([x.json() if isinstance(x, Type_Safe) else x for x in item])
+            elif isinstance(item, (list, tuple, frozenset)):
+                result.append([x.json() if isinstance(x, Type_Safe) else serialize_to_dict(x) for x in item])
+                #result.append([x.json() if isinstance(x, Type_Safe) else x for x in item])      # BUG here
             elif isinstance(item, dict):
-                result.append({k: v.json() if isinstance(v, Type_Safe) else v for k, v in item.items()})
+                result.append(serialize_to_dict(item))          # leverage serialize_to_dict since that method already knows how to handle
+                #result.append({k: v.json() if isinstance(v, Type_Safe) else v for k, v in item.items()})
             elif isinstance(item, type):
                 result.append(class_full_name(item))
             else:
-                result.append(item)
+                result.append(serialize_to_dict(item))          # also Use serialize_to_dict for unknown types (so that we don't return a non json object)
         return result

osbot_utils/type_safe/type_safe_core/collections/Type_Safe__Set.py

@@ -1,4 +1,4 @@
-from osbot_utils.utils.Objects                  import class_full_name
+from osbot_utils.utils.Objects                  import class_full_name, serialize_to_dict
 from osbot_utils.type_safe.Type_Safe__Base      import Type_Safe__Base, type_str
 from osbot_utils.type_safe.Type_Safe__Primitive import Type_Safe__Primitive
 
@@ -52,14 +52,14 @@ def json(self):
                 result.append(item.json())
             elif isinstance(item, Type_Safe__Primitive):
                 result.append(item.__to_primitive__())
-            elif isinstance(item, (list, tuple, set)):
-                result.append([x.json() if isinstance(x, Type_Safe) else x for x in item])
-            elif isinstance(item, dict):
-                result.append({k: v.json() if isinstance(v, Type_Safe) else v for k, v in item.items()})
+            elif isinstance(item, (list, tuple, set, frozenset)):
+                result.append([x.json() if isinstance(x, Type_Safe) else serialize_to_dict(x) for x in item])
+            # elif isinstance(item, dict):
+            #     result.append({k: v.json() if isinstance(v, Type_Safe) else v for k, v in item.items()})
             elif isinstance(item, type):
                 result.append(class_full_name(item))
             else:
-                result.append(item)
+                result.append(serialize_to_dict(item))          # Use serialize_to_dict for unknown types (so that we don't return a non json object)
         return result
 
     def __eq__(self, other):                                        # todo: see if this is needed

osbot_utils/type_safe/type_safe_core/collections/Type_Safe__Tuple.py

@@ -1,4 +1,4 @@
-from osbot_utils.utils.Objects              import class_full_name
+from osbot_utils.utils.Objects              import class_full_name, serialize_to_dict
 from osbot_utils.type_safe.Type_Safe__Base  import Type_Safe__Base, type_str
 
 class Type_Safe__Tuple(Type_Safe__Base, tuple):
@@ -66,12 +66,12 @@ def json(self):
                 result.append(item.json())
             elif isinstance(item, Type_Safe__Primitive):
                 result.append(item.__to_primitive__())  # Convert primitives to base types
-            elif isinstance(item, (list, tuple)):
-                result.append([x.json() if isinstance(x, Type_Safe) else x for x in item])
+            elif isinstance(item, (list, tuple, frozenset)):
+                result.append([x.json() if isinstance(x, Type_Safe) else serialize_to_dict(x) for x in item])
             elif isinstance(item, dict):
-                result.append({k: v.json() if isinstance(v, Type_Safe) else v for k, v in item.items()})
+                result.append(serialize_to_dict(item))
             elif isinstance(item, type):
                 result.append(class_full_name(item))
             else:
-                result.append(item)
+                result.append(serialize_to_dict(item))          # Use serialize_to_dict for unknown types (so that we don't return a non json object)
         return result

osbot_utils/utils/Objects.py

@@ -275,7 +275,7 @@ def serialize_to_dict(obj):
     elif isinstance(obj, Enum):
         if isinstance(obj.value, (str, int, float, bool, type(None))):                          # Check if the enum value is directly serializable
             return obj.value
-        elif isinstance(obj.value, (list, tuple, dict, set)):                                        # Recursively serialize complex values
+        elif isinstance(obj.value, (list, tuple, dict, set, frozenset)):                                        # Recursively serialize complex values
             return serialize_to_dict(obj.value)
         else:
             return obj.name                                                                     # Fallback to name for non-serializable values
@@ -285,7 +285,7 @@ def serialize_to_dict(obj):
         return f"{obj.__module__}.{obj.__name__}"                                   # save the full type name
     elif isinstance(obj, (list, tuple, List)):                                     # Added tuple here
         return [serialize_to_dict(item) for item in obj]
-    elif isinstance(obj, set):
+    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
@@ -310,7 +310,8 @@ def serialize_to_dict(obj):
                 data[key] = serialize_to_dict(value)                                # Recursive call for complex types
         return data
     else:
-        raise TypeError(f"Type {type(obj)} not serializable")
+        #raise TypeError(f"Type {type(obj)} not serializable")                      # Breaking change (we don't raise exception any more)
+        return None                                                                 # just return None
 
 
 

osbot_utils/version

@@ -1 +1 @@
-v3.24.0
+v3.24.1

pyproject.toml

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