osbot-utils 2.31.0__py3-none-any.whl → 2.33.0__py3-none-any.whl

osbot_utils/helpers/flows/Flow.py

@@ -122,6 +122,11 @@ class Flow(Type_Safe):
     def captured_logs(self):
         return ansis_to_texts(self.captured_exec_logs)
 
+    def durations(self):
+        return self.flow_stats.durations()
+
+    def durations__with_tasks_status(self):
+        return self.flow_stats.durations__with_tasks_status()
 
     async def invoke_flow_target__thread(self, flow):                               # this is a REALLY important method which is used to pin the flow object to the call stack
         return await flow.flow_target(*flow.resolved_args, **flow.resolved_kwargs)          #   which is then used by the Task.find_flow method to find it
@@ -133,6 +138,10 @@ class Flow(Type_Safe):
         else:
             self.flow_return_value  = self.flow_target(*self.resolved_args, **self.resolved_kwargs)     # if the flow is sync, just execute the flow target
 
+    def flow_output(self):
+        return dict(output    =  self.flow_return_value,
+                    durations = self.durations()       )
+
     def f__flow_id(self):
         return self.cformat.green(self.flow_id)
 

osbot_utils/helpers/flows/actions/Flow__Stats__Collector.py

@@ -5,6 +5,7 @@ from osbot_utils.helpers.flows.schemas.Schema__Task__Stats   import Schema__Task
 from osbot_utils.helpers.flows.schemas.Schema__Flow__Stats   import Schema__Flow__Stats
 from osbot_utils.type_safe.Type_Safe                         import Type_Safe
 
+FLOW__ERROR_MESSAGE__TASK_FAILED = 'At least one task failed'
 
 class Flow__Stats__Collector(Type_Safe):
     duration               : Duration
@@ -31,6 +32,9 @@ class Flow__Stats__Collector(Type_Safe):
             if flow_error:
                 _.status = Schema__Flow__Status.FAILED
                 _.error_message = str(flow_error)
+            elif _.failed_tasks:
+                _.status = Schema__Flow__Status.FAILED
+                _.error_message = FLOW__ERROR_MESSAGE__TASK_FAILED
             else:
                 _.status = Schema__Flow__Status.COMPLETED
         return self
@@ -44,4 +48,36 @@ class Flow__Stats__Collector(Type_Safe):
         return self
 
     def json(self):                                                                                                     # Return JSON representation of the stats.
-        return self.stats.json()
+        return self.stats.json()
+
+    def durations__with_tasks_status(self):
+        with self.stats as _:
+            tasks_durations = dict()
+            flow_durations  = dict(flow_name     = _.flow_name                ,
+                                   flow_duration = _.duration.duration_seconds,
+                                   flow_status   = _.status.value             ,
+                                   flow_tasks    =  tasks_durations           )
+
+            for task_id, flow_task in self.stats.tasks_stats.items():
+                task_duration   = dict(task_name = flow_task.task_name                     ,
+                                       task_duration  = flow_task.duration.duration_seconds,
+                                       task_status    = flow_task.status.value             )
+                execution_order = flow_task.execution_order
+                tasks_durations[execution_order] = task_duration
+        return flow_durations
+
+    def durations(self):
+        with self.stats as _:
+            if _.status is None:
+                flow_durations = dict()
+            else:
+                tasks_durations = dict()
+                flow_durations  = dict(flow_name     = _.flow_name                ,
+                                       flow_duration = _.duration.duration_seconds,
+                                       flow_status   = _.status.value             ,
+                                       flow_tasks    =  tasks_durations           )
+
+                for task_id, flow_task in self.stats.tasks_stats.items():
+
+                    tasks_durations[flow_task.task_name] = flow_task.duration.duration_seconds
+        return flow_durations

osbot_utils/version

@@ -1 +1 @@
-v2.31.0
+v2.33.0

{osbot_utils-2.31.0.dist-info → osbot_utils-2.33.0.dist-info}/METADATA

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

@@ -142,12 +142,12 @@ osbot_utils/helpers/duration/decorators/duration.py,sha256=ucJP1fCQEN8ALCDCG9CPz
 osbot_utils/helpers/duration/decorators/print_duration.py,sha256=w7k3OPiRkL5KqLv0S5o1NVo2y_TeOOvDOb-51YbJjAc,283
 osbot_utils/helpers/duration/schemas/Schema__Duration.py,sha256=-h32wBcpiVRkEbc_sZoamnRFNGaQQM4YsxqoVzPGe38,209
 osbot_utils/helpers/duration/schemas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-osbot_utils/helpers/flows/Flow.py,sha256=dFjD3czAZDKvcCCk5yeVdpOWCVWvsn5D_q2AnO8340k,13653
+osbot_utils/helpers/flows/Flow.py,sha256=WxpaWrbLhlkHtZuiTaNE8S9ocpmLcVQQL0C4PGzcDMY,13970
 osbot_utils/helpers/flows/Task.py,sha256=RfccOCev5XTsNoKuDJzK1JItF-Lm7P6FGCGZyh9swyY,7116
 osbot_utils/helpers/flows/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osbot_utils/helpers/flows/actions/Flow__Data.py,sha256=rgUggQo_z6KLtNa92KfzRG6ORdT_8ic5zJVuhk_st38,5064
 osbot_utils/helpers/flows/actions/Flow__Events.py,sha256=g7KBafFeA7tV-v31v_m3MT__cZEX63gh8CehnZwRYU0,2840
-osbot_utils/helpers/flows/actions/Flow__Stats__Collector.py,sha256=GOxXUjDXCQs6cx1BQ9Z_a5KpUI4ztZHaQ-L7-85Ybpc,2276
+osbot_utils/helpers/flows/actions/Flow__Stats__Collector.py,sha256=GCszqIGj8yVlr283ZXiejDCof-tbDgynjzAdmhEqBWg,4155
 osbot_utils/helpers/flows/actions/Task__Stats__Collector.py,sha256=rDYABaHpikIAK0Odleu8-dZ9ECJZYDmgFdd0KvsbByI,1462
 osbot_utils/helpers/flows/actions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osbot_utils/helpers/flows/decorators/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -365,8 +365,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=HCRke6XnsWX14IEkvcnr363MBi6BbkbVDkvEZXWN1Dg,8
-osbot_utils-2.31.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-osbot_utils-2.31.0.dist-info/METADATA,sha256=cA1LigYUC3D4O8kl4ofRRahn_BQ0MwTtvIIbPSSwf3k,1329
-osbot_utils-2.31.0.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-osbot_utils-2.31.0.dist-info/RECORD,,
+osbot_utils/version,sha256=UzPaV1nLfhdRXaPnxoRowDnXt8jTG9HI_R0xTg5g0TY,8
+osbot_utils-2.33.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+osbot_utils-2.33.0.dist-info/METADATA,sha256=pDF4s4KDlDj62b11GuDqJN8C6qYse1VL6XrZTWmMHGI,1329
+osbot_utils-2.33.0.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+osbot_utils-2.33.0.dist-info/RECORD,,