osbot-utils 1.45.0__py3-none-any.whl → 1.47.0__py3-none-any.whl

osbot_utils/helpers/flows/Flow.py

@@ -22,6 +22,7 @@ class Flow(Type_Safe):
     flow_id            : str
     flow_name          : str
     flow_config        : Flow__Config
+    flow_error         : Exception           = None
     flow_target        : callable
     flow_args          : tuple
     flow_kwargs        : dict
@@ -62,6 +63,7 @@ class Flow(Type_Safe):
             with Stdout() as stdout:
                 self.flow_return_value = self.flow_target(*self.flow_args, **self.flow_kwargs)           # todo, capture *args, **kwargs in logs
         except Exception as error:
+            self.flow_error = error
             self.logger.error(self.cformat.red(f"Error executing flow: {error}"))
 
         self.log_captured_stdout        (stdout)

osbot_utils/helpers/flows/decorators/flow.py

@@ -3,8 +3,8 @@ from typing import TypeVar, Callable, Any
 
 from osbot_utils.helpers.flows.Flow import Flow
 
-# todo: find way to make the casting below work for the users of this decorator
-
+# todo: BUG find way to make the casting below work for the users of this decorator
+#           since at the moment we need to use: flow = cast(Flow, _.create_flow()) where create_flow is the method with the @flow decorator
 def flow(**flow_kwargs):
     def decorator(function) -> Flow:
         @wraps(function)

osbot_utils/utils/Threads.py

@@ -1,6 +1,7 @@
 import asyncio
 import logging
 import typing
+from concurrent.futures import ThreadPoolExecutor
 
 def invoke_async_function(target: typing.Coroutine):
     """Run an asynchronous coroutine in a new event loop."""
@@ -24,4 +25,21 @@ def invoke_async_function(target: typing.Coroutine):
         else:
             asyncio.set_event_loop(None)
 
-        logger.level = level_original  # restore the original log level
+        logger.level = level_original  # restore the original log level
+
+
+def invoke_in_new_event_loop(target: typing.Coroutine):             # Runs a coroutine in a new event loop in a separate thread and returns the result
+    def run_in_new_loop():                                          # Function to run the coroutine in a new event loop
+        new_loop = asyncio.new_event_loop()                         # Create a new event loop
+        asyncio.set_event_loop(new_loop)                            # Set the new event loop as the current event loop
+        try:
+            return new_loop.run_until_complete(target)              # Run the coroutine in the new event loop
+        finally:
+            new_loop.close()                                        # Close the event loop to free resources
+
+    with ThreadPoolExecutor() as pool:                              # Create a thread pool executor
+        future = pool.submit(run_in_new_loop)                       # Submit the function to run in the thread pool
+        result = future.result()                                    # Wait for the result of the future
+        return result                                               # Return the result from the coroutine
+
+async_invoke_in_new_loop = invoke_in_new_event_loop

osbot_utils/utils/Toml.py

@@ -43,5 +43,5 @@ def toml_to_dict(str_toml):
         raise NotImplementedError("TOML parsing is not supported in Python versions earlier than 3.11")
     return tomllib.loads(str_toml)
 
-
+json_load_file = toml_dict_from_file
 toml_file_load = toml_dict_from_file

osbot_utils/version

@@ -1 +1 @@
-v1.45.0
+v1.47.0

{osbot_utils-1.45.0.dist-info → osbot_utils-1.47.0.dist-info}/METADATA

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

@@ -154,12 +154,12 @@ 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=_93-0FpH_bq7j--6DvKW7n2YC6hU_tINx8YMvMX4_uM,5659
+osbot_utils/helpers/flows/Flow.py,sha256=hVIjIzotQyHc4Ms0K_Rh1Jtb5rg1zYWdfaUnBROLYxI,5747
 osbot_utils/helpers/flows/Flow__Config.py,sha256=PE8hH8KXDHz1Ex93cPMuR9nkv8AoXzXQwVxleSDkU7k,341
 osbot_utils/helpers/flows/Task.py,sha256=edbvtd78kzz5ghKp-awyOWop2QYxqDB0-aupcz0sjVM,3530
 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=7H9NXR7416BCBC-2wgQz7KCA0_d8I0gZbxSyxcL4khQ,595
+osbot_utils/helpers/flows/decorators/flow.py,sha256=LUL7bHjZ_lC3QoTNh-KsDZHzjE2u4mU-5EpZnfsEGuc,738
 osbot_utils/helpers/flows/decorators/task.py,sha256=2Eg8abx7ky8PVKVQijy6Oji60UKW31nXmtYftqBDB0k,394
 osbot_utils/helpers/html/Dict_To_Css.py,sha256=u6B4Mx7PXr-gDrTrs1hgknnvsZVK4Fic5LqedKjo-lk,1097
 osbot_utils/helpers/html/Dict_To_Html.py,sha256=OlRSaDGOeseBNTxRB2ho5whqEacMXeAXWOfeVSEYqC4,3355
@@ -292,13 +292,13 @@ osbot_utils/utils/Python_Logger.py,sha256=tx8N6wRKL3RDHboDRKZn8SirSJdSAE9cACyJkx
 osbot_utils/utils/Regex.py,sha256=0ubgp8HKsS3PNe2H6XlzMIcUuV7jhga3VkQVDNOJWuA,866
 osbot_utils/utils/Status.py,sha256=Yq4s0TelXgn0i2QjCP9V8mP30GabXp_UL-jjM6Iwiw4,4305
 osbot_utils/utils/Str.py,sha256=kxdY8ROX4FdJtCaMTfOc8fK_xcDICprNkefHu2MMNU4,2585
-osbot_utils/utils/Threads.py,sha256=fgFrZZXY2G9yJmfQcOv76GB_8MhCrvoUdcbkAhYxDBI,909
-osbot_utils/utils/Toml.py,sha256=dqiegndCJF7V1YT1Tc-b0-Bl6QWyL5q30urmQwMXfMQ,1402
+osbot_utils/utils/Threads.py,sha256=RB6NNPqQxbmGwoaQ2OzkY4vyjVq6pzN2OjB6Y7SBILo,2175
+osbot_utils/utils/Toml.py,sha256=SD6IA4-mrtoBXcI0dIGKV9POMQNd6WYKvmDQq7GQ6ZQ,1438
 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=8XvA-W5tRj_AQS8FtlMP3PtCMBpTiglUjp-DGhdTGZY,8
-osbot_utils-1.45.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-osbot_utils-1.45.0.dist-info/METADATA,sha256=CZxciwssi8uAl_O1N7wfuoPBMeg3x8e5G6qjieln_Ac,1266
-osbot_utils-1.45.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-osbot_utils-1.45.0.dist-info/RECORD,,
+osbot_utils/version,sha256=ybXNKWCKaEXFNoc6Pk5GIikdkvQM-RC7qdKIjQo88V4,8
+osbot_utils-1.47.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+osbot_utils-1.47.0.dist-info/METADATA,sha256=A3c6zDzb3VAaDjlh9lsrfUAupaukx_cIAnRcNwoDpes,1266
+osbot_utils-1.47.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+osbot_utils-1.47.0.dist-info/RECORD,,