hydraflow 0.10.2__py3-none-any.whl → 0.11.0__py3-none-any.whl

hydraflow/executor/conf.py

@@ -5,9 +5,9 @@ from dataclasses import dataclass, field
 
 @dataclass
 class Step:
-    args: str = ""
     batch: str = ""
-    options: str = ""
+    args: str = ""
+    configs: str = ""
 
 
 @dataclass
@@ -15,6 +15,7 @@ class Job:
     name: str = ""
     run: str = ""
     call: str = ""
+    configs: str = ""
     steps: list[Step] = field(default_factory=list)
 
 

hydraflow/executor/job.py

@@ -12,7 +12,7 @@ The module supports two execution modes:
 2. Python function calls
 
 Each job can consist of multiple steps, and each step can have its own
-arguments and options that will be expanded into multiple runs.
+arguments and configurations that will be expanded into multiple runs.
 """
 
 from __future__ import annotations
@@ -31,27 +31,27 @@ from .parser import collect, expand
 if TYPE_CHECKING:
     from collections.abc import Iterator
 
-    from .conf import Job, Step
+    from .conf import Job
 
 
-def iter_args(step: Step) -> Iterator[list[str]]:
+def iter_args(batch: str, args: str) -> Iterator[list[str]]:
     """Iterate over combinations generated from parsed arguments.
 
     Generate all possible combinations of arguments by parsing and
     expanding each one, yielding them as an iterator.
 
     Args:
-        step (Step): The step to parse.
+        batch (str): The batch to parse.
+        args (str): The arguments to parse.
 
     Yields:
         list[str]: a list of the parsed argument combinations.
 
     """
-    args = collect(step.args)
-    options = [o for o in step.options.split(" ") if o]
+    args_ = collect(args)
 
-    for batch in expand(step.batch):
-        yield [*options, *sorted([*batch, *args])]
+    for batch_ in expand(batch):
+        yield [*batch_, *args_]
 
 
 def iter_batches(job: Job) -> Iterator[list[str]]:
@@ -69,11 +69,14 @@ def iter_batches(job: Job) -> Iterator[list[str]]:
 
     """
     job_name = f"hydra.job.name={job.name}"
+    job_configs = shlex.split(job.configs)
 
     for step in job.steps:
-        for args in iter_args(step):
+        configs = shlex.split(step.configs) or job_configs
+
+        for args in iter_args(step.batch, step.args):
             sweep_dir = f"hydra.sweep.dir=multirun/{ulid.ULID()}"
-            yield ["--multirun", sweep_dir, job_name, *args]
+            yield ["--multirun", *args, job_name, sweep_dir, *configs]
 
 
 def multirun(job: Job) -> None:
@@ -162,4 +165,4 @@ def to_text(job: Job) -> str:
         for args in it:
             text += f"args: {args}\n"
 
-    return text
+    return text.rstrip()

{hydraflow-0.10.2.dist-info → hydraflow-0.11.0.dist-info}/METADATA

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

{hydraflow-0.10.2.dist-info → hydraflow-0.11.0.dist-info}/RECORD

@@ -13,12 +13,12 @@ hydraflow/entities/run_collection.py,sha256=E8IRBgxCnJE_IPCaSmS2mc9GtDXXLBfc7GHv
 hydraflow/entities/run_data.py,sha256=Y2_Lc-BdQ7nXhcEIjdHGHIkLrXsmAktOftESEwYOY8o,1602
 hydraflow/entities/run_info.py,sha256=FRC6ICOlzB2u_xi_33Qs-YZLt677UotuNbYqI7XSmHY,1017
 hydraflow/executor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hydraflow/executor/conf.py,sha256=q_FrPXQJCVGKS1FYnGRGqTUgMQeMBkaVPW2mtQc8oxk,384
+hydraflow/executor/conf.py,sha256=SJNiQ87MXMlpDfdm0POcv55MY3GS5FUh5wT7u3XU3oU,406
 hydraflow/executor/io.py,sha256=xV3m-nV9eKbu9Fb7u04J2bfmR_Ky3jTEJjq4QC2m6V4,954
-hydraflow/executor/job.py,sha256=YZ9JuVrdAcG3_HvNngHy9NL4-3bjJTaColE_5efF8TU,4743
+hydraflow/executor/job.py,sha256=yiVbAYgsZZtSTRER-H5pUopULeygzPNzKlSkl27yFI4,4856
 hydraflow/executor/parser.py,sha256=MO8VU0uVQZeku6kbw8Urid_5QEcnR8atd5h-yDP5OhQ,10147
-hydraflow-0.10.2.dist-info/METADATA,sha256=BidbFHVOZjuNytZBhYAg9_T5OBkmu4VNprJJFxnCqPI,4574
-hydraflow-0.10.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-hydraflow-0.10.2.dist-info/entry_points.txt,sha256=XI0khPbpCIUo9UPqkNEpgh-kqK3Jy8T7L2VCWOdkbSM,48
-hydraflow-0.10.2.dist-info/licenses/LICENSE,sha256=IGdDrBPqz1O0v_UwCW-NJlbX9Hy9b3uJ11t28y2srmY,1062
-hydraflow-0.10.2.dist-info/RECORD,,
+hydraflow-0.11.0.dist-info/METADATA,sha256=MIDZ7Vec2SDAcj0S1SvghtlN5RQTpfR1N3MLlwoLD9A,4574
+hydraflow-0.11.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+hydraflow-0.11.0.dist-info/entry_points.txt,sha256=XI0khPbpCIUo9UPqkNEpgh-kqK3Jy8T7L2VCWOdkbSM,48
+hydraflow-0.11.0.dist-info/licenses/LICENSE,sha256=IGdDrBPqz1O0v_UwCW-NJlbX9Hy9b3uJ11t28y2srmY,1062
+hydraflow-0.11.0.dist-info/RECORD,,