osbot-utils 1.56.0__py3-none-any.whl → 1.58.0__py3-none-any.whl

osbot_utils/helpers/flows/Flow.py

@@ -2,6 +2,8 @@ import asyncio
 import logging
 import typing
 
+from osbot_utils.helpers.Dependency_Manager import Dependency_Manager
+
 from osbot_utils.base_classes.Type_Safe             import Type_Safe
 from osbot_utils.helpers.CFormat                    import CFormat, f_dark_grey, f_magenta, f_bold
 from osbot_utils.helpers.flows.models.Flow__Config  import Flow__Config
@@ -33,8 +35,23 @@ class Flow(Type_Safe):
     logger             : Python_Logger
     cformat            : CFormat
     executed_tasks     : typing.List
+    resolved_args      : tuple
+    resolved_kwargs    : dict
+
+    def add_flow_artifact(self, description=None, key=None, data=None, artifact_type=None):     # todo: figure out how to make this work since at the moment most are showing an unknown type 
+        result_data = dict(flow_run_id = self.flow_id,
+                           description = description    or 'description'                                                    ,
+                           key         = key            or 'an-artifact-key'                                                ,
+                           data        = data           or {"link": "https://www.google.com", "link_text": "link to Google"},       # test data to see if it worksw
+                           type        = artifact_type  or "link"                                                           )   # type clashed with built-in type
 
+        flow_events.on__new_artifact(self, result_data )
 
+    def add_flow_result(self, key, description):
+        result_data = dict(flow_run_id = self.flow_id,
+                           key         = key         ,
+                           description = description )
+        flow_events.on__new_result(self, result_data )
 
     def config_logger(self):
         with self.logger as _:
@@ -56,6 +73,7 @@ class Flow(Type_Safe):
             self.logger.add_memory_logger()                                     # todo: move to method that does pre-execute tasks
 
         self.log_debug(f"Executing flow run '{self.f__flow_id()}'")
+        self.resolve_args_and_kwargs()
         try:
             with Stdout() as stdout:
                 self.invoke_flow_target()
@@ -70,28 +88,31 @@ class Flow(Type_Safe):
         if self.flow_config.log_to_memory:
             self.captured_exec_logs = self.log_messages_with_colors()
             self.logger.remove_memory_logger()                                                          # todo: move to method that does post-execute tasks
+        if self.flow_return_value:
+            self.add_flow_result(key = 'flow-return-value', description=f'{self.flow_return_value}')
         flow_events.on__flow__stop(self)
         return self
 
-    def f__flow_id(self):
-        return self.cformat.green(self.flow_id)
-
-    def f__flow_name(self):
-        return self.cformat.blue(self.flow_name)
-
     def captured_logs(self):
         return ansis_to_texts(self.captured_exec_logs)
 
 
     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.flow_args, **flow.flow_kwargs)          #   which is then used by the Task.find_flow method to find it
+        return await flow.flow_target(*flow.resolved_args, **flow.resolved_kwargs)          #   which is then used by the Task.find_flow method to find it
 
     def invoke_flow_target(self):
         if asyncio.iscoroutinefunction(self.flow_target):
             async_coroutine         = self.invoke_flow_target__thread(self)                     # use this special method to pin the flow object to the call stack
             self.flow_return_value  = invoke_in_new_event_loop(async_coroutine)                 # this will start a complete new thread to execute the flow (which is exactly what we want)
         else:
-            self.flow_return_value  = self.flow_target(*self.flow_args, **self.flow_kwargs)     # if the flow is sync, just execute the flow target
+            self.flow_return_value  = self.flow_target(*self.resolved_args, **self.resolved_kwargs)     # if the flow is sync, just execute the flow target
+
+    def f__flow_id(self):
+        return self.cformat.green(self.flow_id)
+
+    def f__flow_name(self):
+        return self.cformat.blue(self.flow_name)
+
 
     def log_captured_stdout(self, stdout):
         for line in stdout.value().splitlines():
@@ -162,6 +183,13 @@ class Flow(Type_Safe):
     def random_flow_name(self):
         return lower(random_id(prefix=FLOW__RANDOM_NAME__PREFIX))
 
+    def resolve_args_and_kwargs(self):
+        dependency_manager = Dependency_Manager()
+        dependency_manager.add_dependency('this_flow', self)
+        dependency_manager.add_dependency('flow_data', self.data)
+        self.resolved_args, self.resolved_kwargs = dependency_manager.resolve_dependencies(self.flow_target,
+                                                                                           *self.flow_args,
+                                                                                           **self.flow_kwargs)
 
     def set_flow_target(self, target, *args, **kwargs):
         self.flow_target = target

osbot_utils/helpers/flows/Flow__Events.py

@@ -27,6 +27,14 @@ class Flow_Events(Type_Safe):
         flow_event = Flow__Event(event_type=Flow__Event_Type.FLOW_MESSAGE, event_source=flow, event_data=event_data)
         self.raise_event(flow_event)
 
+    def on__new_artifact(self, flow, result_data):
+        flow_event = Flow__Event(event_type=Flow__Event_Type.NEW_ARTIFACT , event_source=flow, event_data=result_data)
+        self.raise_event(flow_event)
+
+    def on__new_result(self, flow, result_data):
+        flow_event = Flow__Event(event_type=Flow__Event_Type.NEW_RESULT , event_source=flow, event_data=result_data)
+        self.raise_event(flow_event)
+
     def on__task__start(self, task):
         flow_event = Flow__Event(event_type=Flow__Event_Type.TASK_START, event_source=task)
         self.raise_event(flow_event)

osbot_utils/helpers/flows/Task.py

@@ -61,6 +61,9 @@ class Task(Type_Safe):
 
         self.task_flow.executed_tasks.append(self)
         self.log_debug(f"Executing task '{f_blue(self.task_name)}'")
+        self.resolve_args_and_kwargs()
+
+    def resolve_args_and_kwargs(self):
         dependency_manager = Dependency_Manager()
         dependency_manager.add_dependency('this_task', self               )
         dependency_manager.add_dependency('this_flow', self.task_flow     )
@@ -68,7 +71,6 @@ class Task(Type_Safe):
         dependency_manager.add_dependency('flow_data', self.task_flow.data)
         self.resolved_args, self.resolved_kwargs = dependency_manager.resolve_dependencies(self.task_target, *self.task_args, **self.task_kwargs)
 
-
     def execute__task_target__sync(self):
         try:
             with Stdout() as stdout:

osbot_utils/helpers/flows/models/Flow__Event_Type.py

@@ -4,5 +4,7 @@ class Flow__Event_Type(Type_Safe):
     FLOW_MESSAGE: str = 'flow_message'
     FLOW_START  : str = 'flow_start'
     FLOW_STOP   : str = 'flow_stop'
+    NEW_ARTIFACT: str = 'new_artifact'
+    NEW_RESULT  : str = 'new_result'
     TASK_START  : str = 'task_start'
     TASK_STOP   : str = 'task_stop'

osbot_utils/utils/Objects.py

@@ -4,6 +4,7 @@ import pickle
 import sys
 import types
 import typing
+from collections.abc        import Mapping
 
 from typing                 import Union
 from types                  import SimpleNamespace
@@ -124,7 +125,7 @@ def dict_remove(data, target):
 
 def dict_to_obj(target, class_name="_"):
     DynamicClass = type(class_name, (SimpleNamespace,), {})
-    if isinstance(target, dict):
+    if isinstance(target, Mapping):
         new_dict = {}
         for key, value in target.items():
             new_dict[key] = dict_to_obj(value, class_name=class_name)           # Recursively convert elements in the dict

osbot_utils/version

@@ -1 +1 @@
-v1.56.0
+v1.58.0

{osbot_utils-1.56.0.dist-info → osbot_utils-1.58.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: osbot_utils
-Version: 1.56.0
+Version: 1.58.0
 Summary: OWASP Security Bot - Utils
 Home-page: https://github.com/owasp-sbot/OSBot-Utils
 License: MIT
@@ -22,7 +22,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-v1.56.0-blue)
+![Current Release](https://img.shields.io/badge/release-v1.58.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-1.56.0.dist-info → osbot_utils-1.58.0.dist-info}/RECORD

@@ -154,16 +154,16 @@ osbot_utils/helpers/cache_requests/Cache__Requests__Row.py,sha256=h-yc7NkpScbHww
 osbot_utils/helpers/cache_requests/Cache__Requests__Table.py,sha256=RgxAYhm-FIrXXteQRtD91pOLq8JXhSzxb51Jb6MTUdY,391
 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=iO-4B0uIv31n66INoXpodoYss5eEsOEGu3LDFevkKQ8,7626
-osbot_utils/helpers/flows/Flow__Events.py,sha256=Gy5P130Bz5RtRV7NaV5Iss4wZrjLdVxaps1r02kQLCk,2123
-osbot_utils/helpers/flows/Task.py,sha256=ITR6qFd_BWEFtWJ5wZUFcxq3A3FyN4YzU7_CeIuUph0,4809
+osbot_utils/helpers/flows/Flow.py,sha256=m5j9OxR_xDgMh2z9u2FVQN_cQTQV_juJjbbNiNS8BuI,9645
+osbot_utils/helpers/flows/Flow__Events.py,sha256=u9GzVNd08Hr49ZRIpoRDhwJnAHUFB-XzFzmNw-r3_Q0,2535
+osbot_utils/helpers/flows/Task.py,sha256=ifPm0aqUG4sWAUTaYwT7ig-7Y9JmG9YTiNyC3dOX5sw,4887
 osbot_utils/helpers/flows/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osbot_utils/helpers/flows/decorators/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osbot_utils/helpers/flows/decorators/flow.py,sha256=LUL7bHjZ_lC3QoTNh-KsDZHzjE2u4mU-5EpZnfsEGuc,738
 osbot_utils/helpers/flows/decorators/task.py,sha256=9bhQBPJU1dO-J4FAsFkmxqQMBNtay4FT_b1BdpHJ9sA,734
 osbot_utils/helpers/flows/models/Flow__Config.py,sha256=NLIfT0S8zxbig6Q1p9KeoyE2qRVWorHxk-JXCv9Yx-U,382
 osbot_utils/helpers/flows/models/Flow__Event.py,sha256=O2SNmDG8FTsQQqm5tWmbomQsC_usA7EqMQhTWIFl4KM,157
-osbot_utils/helpers/flows/models/Flow__Event_Type.py,sha256=YSOjzcRjCHmF_AIoWiccoNH0EAmNdTSmObXYB5exTGw,277
+osbot_utils/helpers/flows/models/Flow__Event_Type.py,sha256=vPDW-7D96Sjn0X6-V1Xgp4ytQ58SgSbX0kyflXNwmK4,353
 osbot_utils/helpers/flows/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osbot_utils/helpers/html/Dict_To_Css.py,sha256=u6B4Mx7PXr-gDrTrs1hgknnvsZVK4Fic5LqedKjo-lk,1097
 osbot_utils/helpers/html/Dict_To_Html.py,sha256=OlRSaDGOeseBNTxRB2ho5whqEacMXeAXWOfeVSEYqC4,3355
@@ -290,7 +290,7 @@ osbot_utils/utils/Json.py,sha256=7COxBlZRnpxtpNqpmzMPYkcKTnCok-s686nT27oiKEQ,648
 osbot_utils/utils/Json_Cache.py,sha256=mLPkkDZN-3ZVJiDvV1KBJXILtKkTZ4OepzOsDoBPhWg,2006
 osbot_utils/utils/Lists.py,sha256=tPz5x5s3sRO97WZ_nsxREBPC5cwaHrhgaYBhsrffTT8,5599
 osbot_utils/utils/Misc.py,sha256=nODZT6p44B4xYiIiqfEeKYEErQiKR9SGthhGtZWGhkI,16804
-osbot_utils/utils/Objects.py,sha256=oiWF75BPahRtBRhFrQi_5Mv4wrqkjJnKAc_diw9CZdk,17321
+osbot_utils/utils/Objects.py,sha256=60OFmwQZgqyfmOGS_WtD59-b0lB7rGhqWoh0tgkBKOc,17367
 osbot_utils/utils/Png.py,sha256=V1juGp6wkpPigMJ8HcxrPDIP4bSwu51oNkLI8YqP76Y,1172
 osbot_utils/utils/Process.py,sha256=lr3CTiEkN3EiBx3ZmzYmTKlQoPdkgZBRjPulMxG-zdo,2357
 osbot_utils/utils/Python_Logger.py,sha256=tx8N6wRKL3RDHboDRKZn8SirSJdSAE9cACyJkxrThZ8,12792
@@ -302,8 +302,8 @@ osbot_utils/utils/Toml.py,sha256=SD6IA4-mrtoBXcI0dIGKV9POMQNd6WYKvmDQq7GQ6ZQ,143
 osbot_utils/utils/Version.py,sha256=Ww6ChwTxqp1QAcxOnztkTicShlcx6fbNsWX5xausHrg,422
 osbot_utils/utils/Zip.py,sha256=G6Hk_hDcm9yvWzhTKzhT0R_6f0NBIAchHqMxGb3kfh4,14037
 osbot_utils/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-osbot_utils/version,sha256=Tr_IKFeVZOtzWeW8sdbz6QZge0TiRXb54jrSp_tV3_s,8
-osbot_utils-1.56.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-osbot_utils-1.56.0.dist-info/METADATA,sha256=BkDSFwnvPd92g4ESDYOX5lwCnwWG8n5wBeDH33WfP60,1266
-osbot_utils-1.56.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-osbot_utils-1.56.0.dist-info/RECORD,,
+osbot_utils/version,sha256=3zcuCY19oU6Xohxuk7cSp-mCBuuGU7OwYkdC8RVRMgw,8
+osbot_utils-1.58.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+osbot_utils-1.58.0.dist-info/METADATA,sha256=jOtdSqjuFy3-p5D93fRccvYUYdAyQuM3irMTOpltDhw,1266
+osbot_utils-1.58.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+osbot_utils-1.58.0.dist-info/RECORD,,