FlowerPower 0.11.6.7__py3-none-any.whl → 0.11.6.8__py3-none-any.whl

flowerpower/utils/misc.py

@@ -266,6 +266,8 @@ else:
 
 if importlib.util.find_spec("joblib"):
     from joblib import Parallel, delayed
+    from rich.progress import (BarColumn, Progress, TextColumn,
+                               TimeElapsedColumn)
 
     def run_parallel(
         func: callable,
@@ -299,19 +301,15 @@ if importlib.util.find_spec("joblib"):
             >>> # Only kwargs iterables
             >>> run_parallel(func, x=[1,2,3], y=[4,5,6], fixed=42)
         """
-        # Special kwargs for run_parallel itself
         parallel_kwargs = {"n_jobs": n_jobs, "backend": backend, "verbose": 0}
 
-        # Process args and kwargs to separate iterables and fixed values
         iterables = []
         fixed_args = []
         iterable_kwargs = {}
         fixed_kwargs = {}
 
-        # Get the length of the first iterable to determine number of iterations
         first_iterable_len = None
 
-        # Process args
         for arg in args:
             if isinstance(arg, (list, tuple)) and not isinstance(arg[0], (list, tuple)):
                 iterables.append(arg)
@@ -324,7 +322,6 @@ if importlib.util.find_spec("joblib"):
             else:
                 fixed_args.append(arg)
 
-        # Process kwargs
         for key, value in kwargs.items():
             if isinstance(value, (list, tuple)) and not isinstance(
                 value[0], (list, tuple)
@@ -342,26 +339,56 @@ if importlib.util.find_spec("joblib"):
         if first_iterable_len is None:
             raise ValueError("At least one iterable argument is required")
 
-        # Create parameter combinations
         all_iterables = iterables + list(iterable_kwargs.values())
-        param_combinations = list(zip(*all_iterables))  # Convert to list for tqdm
-
-        # if verbose:
-        #    param_combinations = tqdm.tqdm(param_combinations)
-
-        return Parallel(**parallel_kwargs)(
-            delayed(func)(
-                *(list(param_tuple[: len(iterables)]) + fixed_args),
-                **{
-                    k: v
-                    for k, v in zip(
-                        iterable_kwargs.keys(), param_tuple[len(iterables) :]
-                    )
-                },
-                **fixed_kwargs,
+        param_combinations = list(zip(*all_iterables))
+
+        if not verbose:
+            return Parallel(**parallel_kwargs)(
+                delayed(func)(
+                    *(list(param_tuple[: len(iterables)]) + fixed_args),
+                    **{
+                        k: v
+                        for k, v in zip(
+                            iterable_kwargs.keys(), param_tuple[len(iterables) :]
+                        )
+                    },
+                    **fixed_kwargs,
+                )
+                for param_tuple in param_combinations
             )
-            for param_tuple in param_combinations
-        )
+        else:
+            results = [None] * len(param_combinations)
+            with Progress(
+                TextColumn("[progress.description]{task.description}"),
+                BarColumn(),
+                "[progress.percentage]{task.percentage:>3.0f}%",
+                TimeElapsedColumn(),
+                transient=True,
+            ) as progress:
+                task = progress.add_task(
+                    "Running in parallel...", total=len(param_combinations)
+                )
+
+                def wrapper(idx, param_tuple):
+                    res = func(
+                        *(list(param_tuple[: len(iterables)]) + fixed_args),
+                        **{
+                            k: v
+                            for k, v in zip(
+                                iterable_kwargs.keys(), param_tuple[len(iterables) :]
+                            )
+                        },
+                        **fixed_kwargs,
+                    )
+                    progress.update(task, advance=1)
+                    return idx, res
+
+                for idx, result in Parallel(**parallel_kwargs)(
+                    delayed(wrapper)(i, param_tuple)
+                    for i, param_tuple in enumerate(param_combinations)
+                ):
+                    results[idx] = result
+            return results
 
 else:
 

{flowerpower-0.11.6.7.dist-info → flowerpower-0.11.6.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: FlowerPower
-Version: 0.11.6.7
+Version: 0.11.6.8
 Summary: A simple workflow framework. Hamilton + APScheduler = FlowerPower
 Author-email: "Volker L." <ligno.blades@gmail.com>
 Project-URL: Homepage, https://github.com/legout/flowerpower

{flowerpower-0.11.6.7.dist-info → flowerpower-0.11.6.8.dist-info}/RECORD

@@ -89,14 +89,14 @@ flowerpower/settings/logging.py,sha256=xzoiM-87WGduC-RJu8RfyeweHGTM7SnHXHQPbxKwe
 flowerpower/settings/retry.py,sha256=W3AAVSxmTUAeeSbzRGA37RxqtKKyUdi2MkwDzCsXP94,181
 flowerpower/utils/callback.py,sha256=sGYSrEbnl0xfRa1X-mA-om3erpH7pmpsWdyPQ9HpU7E,6736
 flowerpower/utils/logging.py,sha256=QO1Q3pv-m3mK2xT_VbkjTsomFnDeuqBmRuOtoxaowgg,864
-flowerpower/utils/misc.py,sha256=7VKlmso0jyJwOZ2VR1mPIiN_3LHpbJ0nJ_gkgVzJGWg,15986
+flowerpower/utils/misc.py,sha256=SK913FEYmOjS7GfSQ8oXNFiQ7owrH70fxp952vN5aWg,17099
 flowerpower/utils/monkey.py,sha256=VPl3yimoWhwD9kI05BFsjNvtyQiDyLfY4Q85Bb6Ma0w,2903
 flowerpower/utils/open_telemetry.py,sha256=fQWJWbIQFtKIxMBjAWeF12NGnqT0isO3A3j-DSOv_vE,949
 flowerpower/utils/scheduler.py,sha256=2zJ_xmLXpvXUQNF1XS2Gqm3Ogo907ctZ50GtvQB_rhE,9354
 flowerpower/utils/templates.py,sha256=ouyEeSDqa9PjW8c32fGpcINlpC0WToawRFZkMPtwsLE,1591
-flowerpower-0.11.6.7.dist-info/licenses/LICENSE,sha256=9AkLexxrmr0aBgSHiqxpJk9wgazpP1CTJyiDyr56J9k,1063
-flowerpower-0.11.6.7.dist-info/METADATA,sha256=GVpO7ezPrWQ-YOnadysNNaOKVUOvzJR3GwseHdlALQY,21612
-flowerpower-0.11.6.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-flowerpower-0.11.6.7.dist-info/entry_points.txt,sha256=61X11i5a2IwC9LBiP20XCDl5zMOigGCjMCx17B7bDbQ,52
-flowerpower-0.11.6.7.dist-info/top_level.txt,sha256=VraH4WtEUfSxs5L-rXwDQhzQb9eLHTUtgvmFZ2dAYnA,12
-flowerpower-0.11.6.7.dist-info/RECORD,,
+flowerpower-0.11.6.8.dist-info/licenses/LICENSE,sha256=9AkLexxrmr0aBgSHiqxpJk9wgazpP1CTJyiDyr56J9k,1063
+flowerpower-0.11.6.8.dist-info/METADATA,sha256=KAhpefN-RefOMHvlJrCkVPumnQXBB_n28BWf3FDFA_Q,21612
+flowerpower-0.11.6.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+flowerpower-0.11.6.8.dist-info/entry_points.txt,sha256=61X11i5a2IwC9LBiP20XCDl5zMOigGCjMCx17B7bDbQ,52
+flowerpower-0.11.6.8.dist-info/top_level.txt,sha256=VraH4WtEUfSxs5L-rXwDQhzQb9eLHTUtgvmFZ2dAYnA,12
+flowerpower-0.11.6.8.dist-info/RECORD,,