osbot-utils 2.26.0__py3-none-any.whl → 2.28.0__py3-none-any.whl

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/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,8 +50,10 @@ class Task(Type_Safe):
         return self.execute__after()
 
     def execute__before(self):
-        self.on_task_start()
-        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")
 
@@ -60,6 +63,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 +91,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/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/type_safe/Type_Safe.py

@@ -62,6 +62,10 @@ class Type_Safe:
     def json(self):
         return self.serialize_to_dict()
 
+    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)
+
     # 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.
@@ -93,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):
@@ -106,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/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/version

@@ -1 +1 @@
-v2.26.0
+v2.28.0

{osbot_utils-2.26.0.dist-info → osbot_utils-2.28.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: osbot_utils
-Version: 2.26.0
+Version: 2.28.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.26.0-blue)
+![Current Release](https://img.shields.io/badge/release-v2.28.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.26.0.dist-info → osbot_utils-2.28.0.dist-info}/RECORD

@@ -136,8 +136,8 @@ osbot_utils/helpers/cache_requests/Cache__Requests__Row.py,sha256=Sb7E_zDB-LPlWI
 osbot_utils/helpers/cache_requests/Cache__Requests__Table.py,sha256=BW7tXM0TFYma3Db4M-58IKpx0vevLuFsH7QQeiggPaI,388
 osbot_utils/helpers/cache_requests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osbot_utils/helpers/cache_requests/flows/flow__Cache__Requests.py,sha256=xgx_oExxkcvRwQN1UCobimECIMUKGoIX5oGdCmp8Nyw,243
-osbot_utils/helpers/flows/Flow.py,sha256=SjVh8eUjtEgzr7lSfxYzyUmgmRXEqeaT4tJjRiXMLps,13094
-osbot_utils/helpers/flows/Task.py,sha256=b9DvSBP2DfDRK7wQ2X0zGBUX6j7XmCMf_IL7_DdJ7GE,6371
+osbot_utils/helpers/flows/Flow.py,sha256=eSqv_pY7vDC1XmX65RyW4swnhQNtMwZXkXnc4De2oc0,13239
+osbot_utils/helpers/flows/Task.py,sha256=AQ69b97woemCZxxBxluV5pqOlBU0KW4OpculC5Ix4nw,6605
 osbot_utils/helpers/flows/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osbot_utils/helpers/flows/actions/Flow__Data.py,sha256=h9h5yVFIK0ZdXukNFgfRVV1XW0YQartVMcJTakwVqKY,5155
 osbot_utils/helpers/flows/actions/Flow__Events.py,sha256=g7KBafFeA7tV-v31v_m3MT__cZEX63gh8CehnZwRYU0,2840
@@ -145,7 +145,7 @@ osbot_utils/helpers/flows/actions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeR
 osbot_utils/helpers/flows/decorators/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osbot_utils/helpers/flows/decorators/flow.py,sha256=7wj5TtUO_ffbACnagZtZ6LfFgclmbQSfn2lKkMMrnJI,670
 osbot_utils/helpers/flows/decorators/task.py,sha256=Z5GqoUirnm98HAyvRlVcoXLcmZNagXjOXon2kb5OHsY,755
-osbot_utils/helpers/flows/models/Flow_Run__Config.py,sha256=vwtUSXEpBd7q9b8KXX1-FDWk90bwnNE1xiLnP3evks0,543
+osbot_utils/helpers/flows/models/Flow_Run__Config.py,sha256=eW7uYZngnmEv1PZOi3sMyJ3jaTlD6S7juzxaDkNO88Y,588
 osbot_utils/helpers/flows/models/Flow_Run__Event.py,sha256=2E-T6XXvsF2RnbIt5qq0rktOVBpembYvQudhoyM_6vc,589
 osbot_utils/helpers/flows/models/Flow_Run__Event_Data.py,sha256=zIAhfz1oUs0ocxbfCPmgj8tsXt2Ycjo0nFdeetKlnZ8,400
 osbot_utils/helpers/flows/models/Flow_Run__Event_Type.py,sha256=4wYRGAtztlhSV6XZa6DIfAAf7ZLp95KOIGU8G1EC4jc,373
@@ -294,7 +294,7 @@ osbot_utils/testing/performance/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm
 osbot_utils/testing/performance/models/Model__Performance_Measure__Measurement.py,sha256=xT_uKzbSYo9AGiJgNmCHSt3ApneNNyKh8vsMVN6IJQ0,1127
 osbot_utils/testing/performance/models/Model__Performance_Measure__Result.py,sha256=k9HJYNLmW6sjRVsfpduSxHFiVANc1zmYtO_Oz9azpW8,755
 osbot_utils/testing/performance/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-osbot_utils/type_safe/Type_Safe.py,sha256=Yd6s60Ykgke8YuIone-69Ozc4uzEq2fGHu97HTmhydU,5514
+osbot_utils/type_safe/Type_Safe.py,sha256=LOWRGOGpnRU2iTRLP47vUoyalK0vjFrWlnaghBIogWg,6267
 osbot_utils/type_safe/Type_Safe__Base.py,sha256=Bzrh8TxFglB0FEUAQTlgovlnFHnBN4lOX1Vu327r1Vc,5223
 osbot_utils/type_safe/Type_Safe__Dict.py,sha256=vE_Ut7MabBjOq5Hpr3vdFO5RNf-M-cL83S76CvxD-9g,2488
 osbot_utils/type_safe/Type_Safe__List.py,sha256=SzSIBkwSOAEpW_V2qh4-f0YHzmgB0T8PczBLbDgZGvg,1340
@@ -309,7 +309,7 @@ osbot_utils/type_safe/methods/type_safe_property.py,sha256=DcJkOIs6swJtkglsZVKLy
 osbot_utils/type_safe/shared/Type_Safe__Annotations.py,sha256=nmVqCbhk4kUYrw_mdYqugxQlv4gM3NUUH89FYTHUg-c,1133
 osbot_utils/type_safe/shared/Type_Safe__Cache.py,sha256=G03pmpds9sTwU5z5pNLssD_GTvVSIR11nGYbkV5KaiY,7913
 osbot_utils/type_safe/shared/Type_Safe__Convert.py,sha256=mS92_sKjKM_aNSB3ERMEgv-3DtkLVAS8AZF067G-JWM,2995
-osbot_utils/type_safe/shared/Type_Safe__Json_Compressor.py,sha256=uAtb2-wYUUsx_E67oqVHCKPaRUMZBRQFyd8xjqziOEA,5431
+osbot_utils/type_safe/shared/Type_Safe__Json_Compressor.py,sha256=TDbot_NNzCPXBQv0l5mksWueJNfxlVFDBGxIH8Jf_XY,5426
 osbot_utils/type_safe/shared/Type_Safe__Json_Compressor__Type_Registry.py,sha256=wYOCg7F1nTrRn8HlnZvrs_8A8WL4gxRYRLnXZpGIiuk,1119
 osbot_utils/type_safe/shared/Type_Safe__Not_Cached.py,sha256=25FAl6SOLxdStco_rm9tgOYLfuKyBWheGdl7vVa56UU,800
 osbot_utils/type_safe/shared/Type_Safe__Raise_Exception.py,sha256=pbru8k8CTQMNUfmFBndiJhg2KkqEYzFvJAPcNZHeHfQ,829
@@ -355,8 +355,8 @@ osbot_utils/utils/Toml.py,sha256=Rxl8gx7mni5CvBAK-Ai02EKw-GwtJdd3yeHT2kMloik,166
 osbot_utils/utils/Version.py,sha256=Ww6ChwTxqp1QAcxOnztkTicShlcx6fbNsWX5xausHrg,422
 osbot_utils/utils/Zip.py,sha256=pR6sKliUY0KZXmqNzKY2frfW-YVQEVbLKiyqQX_lc-8,14052
 osbot_utils/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-osbot_utils/version,sha256=RZSaVXviZF3y9UfjXr3YrDmllry-euUcFHCuLsyhkPU,8
-osbot_utils-2.26.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-osbot_utils-2.26.0.dist-info/METADATA,sha256=mfZ8WcLMiykJ8Sn7KstCiYQmPEw1JCGByBinJ1SQXAU,1329
-osbot_utils-2.26.0.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-osbot_utils-2.26.0.dist-info/RECORD,,
+osbot_utils/version,sha256=UbzDBZPY98UyBryCzA0kKO9CjEdrWfTme6oAH7T38yE,8
+osbot_utils-2.28.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+osbot_utils-2.28.0.dist-info/METADATA,sha256=-RtnCiZmy4ROrr2I8Fvv2zBvHSLQd9xta4mSlXOb3ks,1329
+osbot_utils-2.28.0.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+osbot_utils-2.28.0.dist-info/RECORD,,

{osbot_utils-2.26.0.dist-info → osbot_utils-2.28.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.0.1
+Generator: poetry-core 2.1.1
 Root-Is-Purelib: true
 Tag: py3-none-any