osbot-utils 1.45.0__tar.gz → 1.47.0__tar.gz

{osbot_utils-1.45.0 → osbot_utils-1.47.0}/PKG-INFO

@@ -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 → osbot_utils-1.47.0}/README.md

@@ -2,7 +2,7 @@
 
 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 → osbot_utils-1.47.0}/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-1.45.0 → osbot_utils-1.47.0}/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-1.47.0/osbot_utils/utils/Threads.py

@@ -0,0 +1,45 @@
+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."""
+    logger         = logging.getLogger('asyncio')
+    level_original = logger.level
+    logger.level   = logging.INFO  # this will suppress the asyncio debug messages which where showing in tests
+    try:
+        original_loop = asyncio.get_event_loop()
+    except RuntimeError:
+        original_loop = None  # No event loop was set
+
+    loop = asyncio.new_event_loop()
+    asyncio.set_event_loop(loop)
+    try:
+        return loop.run_until_complete(target)
+    finally:
+        loop.close()
+        # Restore the original event loop
+        if original_loop is not None:
+            asyncio.set_event_loop(original_loop)
+        else:
+            asyncio.set_event_loop(None)
+
+        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-1.45.0 → osbot_utils-1.47.0}/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-1.47.0/osbot_utils/version

@@ -0,0 +1 @@
+v1.47.0

{osbot_utils-1.45.0 → osbot_utils-1.47.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name        = "osbot_utils"
-version     = "v1.45.0"
+version     = "v1.47.0"
 description = "OWASP Security Bot - Utils"
 authors     = ["Dinis Cruz <dinis.cruz@owasp.org>"]
 license     = "MIT"

osbot_utils-1.45.0/osbot_utils/utils/Threads.py

@@ -1,27 +0,0 @@
-import asyncio
-import logging
-import typing
-
-def invoke_async_function(target: typing.Coroutine):
-    """Run an asynchronous coroutine in a new event loop."""
-    logger         = logging.getLogger('asyncio')
-    level_original = logger.level
-    logger.level   = logging.INFO  # this will suppress the asyncio debug messages which where showing in tests
-    try:
-        original_loop = asyncio.get_event_loop()
-    except RuntimeError:
-        original_loop = None  # No event loop was set
-
-    loop = asyncio.new_event_loop()
-    asyncio.set_event_loop(loop)
-    try:
-        return loop.run_until_complete(target)
-    finally:
-        loop.close()
-        # Restore the original event loop
-        if original_loop is not None:
-            asyncio.set_event_loop(original_loop)
-        else:
-            asyncio.set_event_loop(None)
-
-        logger.level = level_original  # restore the original log level

osbot_utils-1.45.0/osbot_utils/version

@@ -1 +0,0 @@
-v1.45.0