osbot-utils 2.27.0__tar.gz → 2.29.0__tar.gz

{osbot_utils-2.27.0 → osbot_utils-2.29.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: osbot_utils
-Version: 2.27.0
+Version: 2.29.0
 Summary: OWASP Security Bot - Utils
 License: MIT
 Author: Dinis Cruz
@@ -23,7 +23,7 @@ Description-Content-Type: text/markdown
 
 Powerful Python util methods and classes that simplify common apis and tasks.
 
-![Current Release](https://img.shields.io/badge/release-v2.27.0-blue)
+![Current Release](https://img.shields.io/badge/release-v2.29.0-blue)
 [![codecov](https://codecov.io/gh/owasp-sbot/OSBot-Utils/graph/badge.svg?token=GNVW0COX1N)](https://codecov.io/gh/owasp-sbot/OSBot-Utils)
 
 

{osbot_utils-2.27.0 → osbot_utils-2.29.0}/README.md

@@ -2,7 +2,7 @@
 
 Powerful Python util methods and classes that simplify common apis and tasks.
 
-![Current Release](https://img.shields.io/badge/release-v2.27.0-blue)
+![Current Release](https://img.shields.io/badge/release-v2.29.0-blue)
 [![codecov](https://codecov.io/gh/owasp-sbot/OSBot-Utils/graph/badge.svg?token=GNVW0COX1N)](https://codecov.io/gh/owasp-sbot/OSBot-Utils)
 
 

{osbot_utils-2.27.0 → osbot_utils-2.29.0}/osbot_utils/helpers/flows/Task.py

@@ -50,7 +50,10 @@ class Task(Type_Safe):
         return self.execute__after()
 
     def execute__before(self):
-        self.task_flow = self.find_flow()
+        flow_from_stack = self.find_flow()
+        if flow_from_stack:
+            self.task_flow = flow_from_stack
+
         if self.task_flow is None:
             raise Exception("No Flow found for Task")
 

{osbot_utils-2.27.0 → osbot_utils-2.29.0}/osbot_utils/type_safe/Type_Safe.py

@@ -62,7 +62,7 @@ class Type_Safe:
     def json(self):
         return self.serialize_to_dict()
 
-    def json__compress(self):
+    def json__compress(self):                                           # todo: see if this is the best place to put these Type_Safe__Json_Compressor methods
         from osbot_utils.type_safe.shared.Type_Safe__Json_Compressor import Type_Safe__Json_Compressor
         return Type_Safe__Json_Compressor().compress(self)
 
@@ -97,7 +97,7 @@ class Type_Safe:
 
         return dict_to_obj(self.json())
 
-    def serialize_to_dict(self):                        # todo: see if we need this method or if the .json() is enough
+    def serialize_to_dict(self):                                        # todo: see if we need this method or if the .json() is enough
         return serialize_to_dict(self)
 
     def print(self):
@@ -110,4 +110,8 @@ class Type_Safe:
         from osbot_utils.type_safe.steps.Type_Safe__Step__From_Json import type_safe_step_from_json     # circular dependency on Type_Safe
         return type_safe_step_from_json.from_json(cls, json_data, raise_on_not_found)
 
-
+    @classmethod
+    def from_json__compressed(cls, json_data):                          # todo: see if this is the best place to put these Type_Safe__Json_Compressor methods
+        from osbot_utils.type_safe.shared.Type_Safe__Json_Compressor import Type_Safe__Json_Compressor
+        json_data__decompressed = Type_Safe__Json_Compressor().decompress(json_data)
+        return cls.from_json(json_data__decompressed)

{osbot_utils-2.27.0 → osbot_utils-2.29.0}/osbot_utils/type_safe/Type_Safe__Dict.py

@@ -1,3 +1,5 @@
+from typing import Type
+
 from osbot_utils.type_safe.Type_Safe__Base import Type_Safe__Base
 
 class Type_Safe__Dict(Type_Safe__Base, dict):
@@ -27,6 +29,10 @@ class Type_Safe__Dict(Type_Safe__Base, dict):
 
         result = {}
         for key, value in self.items():
+
+            if isinstance(key, (type, Type)):                                                     # Handle Type objects as keys
+                key = f"{key.__module__}.{key.__name__}"
+
             if isinstance(value, Type_Safe):                                                # Handle Type_Safe objects in values
                 result[key] = value.json()
             elif isinstance(value, (list, tuple)):                                          # Handle lists/tuples that might contain Type_Safe objects

{osbot_utils-2.27.0 → osbot_utils-2.29.0}/osbot_utils/type_safe/steps/Type_Safe__Step__From_Json.py

@@ -110,7 +110,7 @@ class Type_Safe__Step__From_Json:
 
         return _self
 
-    def deserialize_type__using_value(self, value):
+    def deserialize_type__using_value(self, value):         # TODO: Check the security implications of this deserialisation
         if value:
             try:
                 module_name, type_name = value.rsplit('.', 1)
@@ -139,6 +139,8 @@ class Type_Safe__Step__From_Json:
         for dict_key, dict_value in value.items():
             key_origin = type_safe_cache.get_origin(key_class)
             if key_origin is type:
+                if type(dict_key) is str:
+                    dict_key = self.deserialize_type__using_value(dict_key)
                 expected_dict_type = get_args(key_class)[0]
                 if dict_key != expected_dict_type and not issubclass(dict_key,expected_dict_type):
                     raise TypeError(f"Expected {expected_dict_type} class for key but got instance: {dict_key}")

{osbot_utils-2.27.0 → osbot_utils-2.29.0}/osbot_utils/utils/Objects.py

@@ -284,7 +284,15 @@ def serialize_to_dict(obj):
     elif isinstance(obj, set):
         return [serialize_to_dict(item) for item in obj]
     elif isinstance(obj, dict):
-        return {key: serialize_to_dict(value) for key, value in obj.items()}
+        serialized_dict = {}                                                        # todo: refactor to separate method
+        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
+        return serialized_dict
+        #return {key: serialize_to_dict(value) for key, value in obj.items()}
     elif hasattr(obj, "__dict__"):
         data = {}                                                                   # todo: look at a more advanced version which saved the type of the object, for example with {'__type__': type(obj).__name__}
         for key, value in obj.__dict__.items():

osbot_utils-2.29.0/osbot_utils/version

@@ -0,0 +1 @@
+v2.29.0

{osbot_utils-2.27.0 → osbot_utils-2.29.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name        = "osbot_utils"
-version     = "v2.27.0"
+version     = "v2.29.0"
 description = "OWASP Security Bot - Utils"
 authors     = ["Dinis Cruz <dinis.cruz@owasp.org>"]
 license     = "MIT"

osbot_utils-2.27.0/osbot_utils/version

@@ -1 +0,0 @@
-v2.27.0