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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: osbot_utils
-Version: 2.25.0
+Version: 2.27.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.25.0-blue)
+![Current Release](https://img.shields.io/badge/release-v2.27.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.25.0 → osbot_utils-2.27.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.25.0-blue)
+![Current Release](https://img.shields.io/badge/release-v2.27.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.25.0 → osbot_utils-2.27.0}/osbot_utils/helpers/flows/Flow.py

@@ -11,6 +11,7 @@ from osbot_utils.helpers.flows.models.Flow_Run__Config      import Flow_Run__Con
 from osbot_utils.helpers.flows.actions.Flow__Events         import flow_events
 from osbot_utils.helpers.flows.models.Flow_Run__Event_Data  import Flow_Run__Event_Data
 from osbot_utils.testing.Stdout                             import Stdout
+from osbot_utils.utils.Dev                                  import pprint
 from osbot_utils.utils.Misc                                 import random_id, lower, time_now
 from osbot_utils.utils.Python_Logger                        import Python_Logger
 from osbot_utils.utils.Str                                  import ansis_to_texts
@@ -280,3 +281,6 @@ class Flow(Type_Safe):
     def json(self) -> typing.Dict[str, typing.Any]:         # Convert flow data to JSON
         return self.flow_data.json()
 
+    def print__flow_data(self):
+        pprint(self.flow_data.json())
+

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

@@ -1,4 +1,5 @@
 import inspect
+import traceback
 import typing
 
 from osbot_utils.helpers.flows.models.Flow_Run__Event_Data  import Flow_Run__Event_Data
@@ -49,7 +50,6 @@ class Task(Type_Safe):
         return self.execute__after()
 
     def execute__before(self):
-        self.on_task_start()
         self.task_flow = self.find_flow()
         if self.task_flow is None:
             raise Exception("No Flow found for Task")
@@ -60,6 +60,7 @@ class Task(Type_Safe):
         if not self.task_id:
             self.task_id = self.random_task_id()
 
+        self.on_task_start()
         flow_events.on__task__start(self.task_event_data())
 
         self.task_flow.executed_tasks.append(self)
@@ -87,6 +88,9 @@ class Task(Type_Safe):
                 self.task_return_value =  self.task_target(*self.resolved_args, **self.resolved_kwargs)
         except Exception as error:
             self.task_error = error
+            if self.task_flow.flow_config.print_error_stack_trace:
+                tb = traceback.format_exc()
+                print(f'{tb}')
         self.task_flow.log_captured_stdout(stdout)
 
     async def execute__task_target__async(self):

{osbot_utils-2.25.0 → osbot_utils-2.27.0}/osbot_utils/helpers/flows/models/Flow_Run__Config.py

@@ -9,6 +9,7 @@ class Flow_Run__Config(Type_Safe):
     print_logs                : bool = False
     print_none_return_value   : bool = False
     print_finished_message    : bool = False
+    print_error_stack_trace   : bool = False
     raise_flow_error          : bool = True
     flow_data__capture_events : bool = False
 

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

@@ -62,6 +62,10 @@ class Type_Safe:
     def json(self):
         return self.serialize_to_dict()
 
+    def json__compress(self):
+        from osbot_utils.type_safe.shared.Type_Safe__Json_Compressor import Type_Safe__Json_Compressor
+        return Type_Safe__Json_Compressor().compress(self)
+
     # todo: see if we still need this. now that Type_Safe handles base types, there should be no need for this
     def merge_with(self, target):
         original_attrs = {k: v for k, v in self.__dict__.items() if k not in target.__dict__}       # Store the original attributes of self that should be retained.

{osbot_utils-2.25.0 → osbot_utils-2.27.0}/osbot_utils/type_safe/shared/Type_Safe__Json_Compressor.py

@@ -10,12 +10,12 @@ class Type_Safe__Json_Compressor(Type_Safe__Base):
     def __init__(self):
         self.type_registry = Type_Safe__Json_Compressor__Type_Registry()
 
-    def compress(self, data: dict) -> dict:
-        if not data:
-            return data
+    def compress(self, obj: Any) -> dict:
+        if not obj:
+            return obj
 
         self.type_registry.clear()
-        compressed = self.compress_object(data)
+        compressed = self.compress_object(obj)
 
         if self.type_registry.registry:
             return { "_type_registry": self.type_registry.reverse,

{osbot_utils-2.25.0 → osbot_utils-2.27.0}/osbot_utils/type_safe/shared/Type_Safe__Validation.py

@@ -166,12 +166,16 @@ class Type_Safe__Validation:
                 if type(value) is list:
                     return True                                                         # if the attribute is a set and the value is a list, then they are compatible
             if origin_attr_type is type:                                                # Add handling for Type[T]
-                type_arg = get_args(attr_type)[0]                                       # Get T from Type[T]
-                if type_arg == value:
-                    return True
-                if isinstance(type_arg, (str, ForwardRef)):                             # Handle forward reference
-                    type_arg = target.__class__                                         # If it's a forward reference, the target class should be the containing class
-                return isinstance(value, type) and issubclass(value, type_arg)          # Check that value is a type and is subclass of type_arg
+                type_args = get_args(attr_type)
+                if type_args:
+                    type_arg = get_args(attr_type)[0]                                       # Get T from Type[T]
+                    if type_arg == value:
+                        return True
+                    if isinstance(type_arg, (str, ForwardRef)):                             # Handle forward reference
+                        type_arg = target.__class__                                         # If it's a forward reference, the target class should be the containing class
+                    return isinstance(value, type) and issubclass(value, type_arg)          # Check that value is a type and is subclass of type_arg
+                else:
+                    return isinstance(value, type)
 
             if origin_attr_type is Annotated:                                           # if the type is Annotated
                 args             = get_args(attr_type)

osbot_utils-2.27.0/osbot_utils/version

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

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

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

osbot_utils-2.25.0/osbot_utils/version

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