hydraflow 0.2.9__tar.gz → 0.2.10__tar.gz

{hydraflow-0.2.9 → hydraflow-0.2.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: hydraflow
-Version: 0.2.9
+Version: 0.2.10
 Summary: Hydraflow integrates Hydra and MLflow to manage and track machine learning experiments.
 Project-URL: Documentation, https://github.com/daizutabi/hydraflow
 Project-URL: Source, https://github.com/daizutabi/hydraflow

{hydraflow-0.2.9 → hydraflow-0.2.10}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "hydraflow"
-version = "0.2.9"
+version = "0.2.10"
 description = "Hydraflow integrates Hydra and MLflow to manage and track machine learning experiments."
 readme = "README.md"
 license = "MIT"

{hydraflow-0.2.9 → hydraflow-0.2.10}/src/hydraflow/progress.py

@@ -160,43 +160,32 @@ def multi_tasks_progress(
     iterables = list(iterables)
 
     with Progress(*columns, transient=transient or False, **kwargs) as progress:
-        n = len(iterables)
-
-        task_main = progress.add_task(main_description, total=None) if n > 1 else None
-        tasks = [
-            progress.add_task(description.format(i), start=False, total=None)
-            for i in range(n)
-        ]
-
+        task_main = progress.add_task(main_description, total=None)
         total = {}
         completed = {}
 
-        def func(i: int) -> None:
+        def func(i: int, iterable: Iterable[int | tuple[int, int]]) -> None:
+            task_id = progress.add_task(description.format(i), total=None)
             completed[i] = 0
             total[i] = None
-            progress.start_task(tasks[i])
 
-            for index in iterables[i]:
+            for index in iterable:
                 if isinstance(index, tuple):
                     completed[i], total[i] = index[0] + 1, index[1]
                 else:
                     completed[i] = index + 1
 
-                progress.update(tasks[i], total=total[i], completed=completed[i])
-                if task_main is not None:
-                    if all(t is not None for t in total.values()):
-                        t = sum(total.values())
-                    else:
-                        t = None
-                    c = sum(completed.values())
-                    progress.update(task_main, total=t, completed=c)
+                progress.update(task_id, total=total[i], completed=completed[i])
 
-            if transient or n > 1:
-                progress.remove_task(tasks[i])
+                if all(t is not None for t in total.values()):
+                    t = sum(total.values())
+                else:
+                    t = None
+                c = sum(completed.values())
+                progress.update(task_main, total=t, completed=c)
 
-        if n > 1:
-            it = (joblib.delayed(func)(i) for i in range(n))
-            joblib.Parallel(n_jobs, prefer="threads")(it)
+            if transient is not False:
+                progress.remove_task(task_id)
 
-        else:
-            func(0)
+        it = (joblib.delayed(func)(i, it) for i, it in enumerate(iterables))
+        joblib.Parallel(n_jobs, prefer="threads")(it)

{hydraflow-0.2.9 → hydraflow-0.2.10}/tests/scripts/progress.py

@@ -13,16 +13,7 @@ from rich.progress import (
 from hydraflow import multi_tasks_progress, parallel_progress
 
 
-def task(total):
-    for i in range(total or 90):
-        if total is None:
-            yield i
-        else:
-            yield i, total
-        time.sleep(random.random() / 30)
-
-
-def parallel_progress_test():
+def test_parallel_progress(**kwargs):
     def func(x: int) -> str:
         time.sleep(1)
         return f"result: {x}"
@@ -36,14 +27,22 @@ def parallel_progress_test():
         TimeElapsedColumn(),
     ]
 
-    results = parallel_progress(func, it, *columns, n_jobs=4)
-    print(results)
+    parallel_progress(func, it, *columns, n_jobs=-1, **kwargs)
+
+
+def task(total):
+    for i in range(total or 90):
+        if total is None:
+            yield i
+        else:
+            yield i, total
+        time.sleep(random.random() / 30)
 
 
-def multi_tasks_progress_test(unknown_total: bool):
-    tasks = [task(random.randint(80, 100)) for _ in range(4)]
-    if unknown_total:
-        tasks = [task(None), *tasks, task(None)]
+def test_multi_tasks_progress(total: bool, **kwargs):
+    tasks = (task(random.randint(80, 100)) for _ in range(4))
+    if total:
+        tasks = (task(None), *list(tasks)[:2], task(None))
 
     columns = [
         SpinnerColumn(),
@@ -52,21 +51,15 @@ def multi_tasks_progress_test(unknown_total: bool):
         TimeElapsedColumn(),
     ]
 
-    kwargs = {}
-    if unknown_total:
+    if total:
         kwargs["main_description"] = "unknown"
 
     multi_tasks_progress(tasks, *columns, n_jobs=4, **kwargs)
 
 
 if __name__ == "__main__":
-    parallel_progress_test()
-
-    multi_tasks_progress_test(False)
-    multi_tasks_progress_test(True)
-    multi_tasks_progress([task(100)])
-    multi_tasks_progress([task(None)], description="unknown")
-
-    desc = "transient"
-    multi_tasks_progress([task(100), task(None)], main_description=desc, transient=True)
-    multi_tasks_progress([task(100)], description=desc, transient=True)
+    test_parallel_progress(description="parallel")
+    test_parallel_progress(transient=True)
+    test_multi_tasks_progress(False)
+    test_multi_tasks_progress(True, transient=False)
+    test_multi_tasks_progress(False, transient=True)