osbot-utils 1.57.0__py3-none-any.whl → 1.59.0__py3-none-any.whl

osbot_utils/base_classes/Type_Safe.py

@@ -14,10 +14,10 @@ from osbot_utils.helpers.Random_Guid            import Random_Guid
 from osbot_utils.utils.Dev                      import pprint
 from osbot_utils.utils.Json                     import json_parse
 from osbot_utils.utils.Misc                     import list_set
-from osbot_utils.utils.Objects                  import default_value, value_type_matches_obj_annotation_for_attr, \
+from osbot_utils.utils.Objects import default_value, value_type_matches_obj_annotation_for_attr, \
     raise_exception_on_obj_type_annotation_mismatch, obj_is_attribute_annotation_of_type, enum_from_value, \
     obj_is_type_union_compatible, value_type_matches_obj_annotation_for_union_attr, \
-    convert_dict_to_value_from_obj_annotation
+    convert_dict_to_value_from_obj_annotation, dict_to_obj
 
 # Backport implementations of get_origin and get_args for Python 3.7
 if sys.version_info < (3, 8):                                           # pragma: no cover
@@ -272,6 +272,9 @@ class Type_Safe:
 
         return self
 
+    def obj(self):
+        return dict_to_obj(self.json())
+
     def serialize_to_dict(self):                        # todo: see if we need this method or if the .json() is enough
         return serialize_to_dict(self)
 

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,6 +35,8 @@ 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,
@@ -69,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()
@@ -93,14 +98,14 @@ class Flow(Type_Safe):
 
 
     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)
@@ -178,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/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/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
@@ -121,18 +122,21 @@ def dict_remove(data, target):
                 del data[target]
     return data
 
+class __(SimpleNamespace):
+    pass
 
-def dict_to_obj(target, class_name="_"):
-    DynamicClass = type(class_name, (SimpleNamespace,), {})
-    if isinstance(target, dict):
+def dict_to_obj(target):
+    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
-        return DynamicClass(**new_dict)
+            new_dict[key] = dict_to_obj(value)                                  # Recursively convert elements in the dict
+        return __(**new_dict)
     elif isinstance(target, list):                                              # Recursively convert elements in the list
-        return [dict_to_obj(item, class_name=class_name) for item in target]
+        return [dict_to_obj(item) for item in target]
     elif isinstance(target, tuple):                                             # Recursively convert elements in the tuple
-        return tuple(dict_to_obj(item, class_name=class_name) for item in target)
+        return tuple(dict_to_obj(item) for item in target)
+    # elif hasattr(target, 'json'):                                             # todo: see if we need this. I don't like the idea of adding this extra hidden behaviour to this class
+    #     return dict_to_obj(target.json())
 
     return target
 

osbot_utils/version

@@ -1 +1 @@
-v1.57.0
+v1.59.0

{osbot_utils-1.57.0.dist-info → osbot_utils-1.59.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: osbot_utils
-Version: 1.57.0
+Version: 1.59.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.57.0-blue)
+![Current Release](https://img.shields.io/badge/release-v1.59.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.57.0.dist-info → osbot_utils-1.59.0.dist-info}/RECORD

@@ -2,7 +2,7 @@ osbot_utils/__init__.py,sha256=DdJDmQc9zbQUlPVyTJOww6Ixrn9n4bD3ami5ItQfzJI,16
 osbot_utils/base_classes/Cache_Pickle.py,sha256=kPCwrgUbf_dEdxUz7vW1GuvIPwlNXxuRhb-H3AbSpII,5884
 osbot_utils/base_classes/Kwargs_To_Disk.py,sha256=HHoy05NC_w35WcT-OnSKoSIV_cLqaU9rdjH0_KNTM0E,1096
 osbot_utils/base_classes/Kwargs_To_Self.py,sha256=weFNsBfBNV9W_qBkN-IdBD4yYcJV_zgTxBRO-ZlcPS4,141
-osbot_utils/base_classes/Type_Safe.py,sha256=xG3peP_hyuUYYi84zR6LhzmgoFYYLBbYwoIQb9XAmpQ,17905
+osbot_utils/base_classes/Type_Safe.py,sha256=SwgDhPKeC2jUWNmihUXwvDoXFhnZPOSrrsu1YnCyyx0,17961
 osbot_utils/base_classes/Type_Safe__List.py,sha256=-80C9OhsK6iDR2dAG8yNLAZV0qg5x3faqvSUigFCMJw,517
 osbot_utils/base_classes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osbot_utils/context_managers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -154,9 +154,9 @@ 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=EpREDUue3OF7KkX2ocGfUT5NGUmqNPzpSv5qFo0rXXY,8914
+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=ITR6qFd_BWEFtWJ5wZUFcxq3A3FyN4YzU7_CeIuUph0,4809
+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
@@ -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=0XKssf_aGarfWI-2Gl-XXUb2tYglTfCBkiKa5zTF0O4,17498
 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=-M9mlli4O3LFg1u4RXSB9HGXK1Oa4UQlFSszYzJo7pc,8
-osbot_utils-1.57.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-osbot_utils-1.57.0.dist-info/METADATA,sha256=Y_i8XIlAw6apKcCZkM-wT8Dm-gcCsOkMIfwTUrX6w1I,1266
-osbot_utils-1.57.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-osbot_utils-1.57.0.dist-info/RECORD,,
+osbot_utils/version,sha256=EhXG92o5KIntEa30a4LpsRMDYwjYTabNawYRJaxsOiI,8
+osbot_utils-1.59.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+osbot_utils-1.59.0.dist-info/METADATA,sha256=DdvKFldlZVnDRyR4XMvON5CIAjR_-MNMAKm2e4XeDHY,1266
+osbot_utils-1.59.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+osbot_utils-1.59.0.dist-info/RECORD,,