hydraflow 0.11.1__tar.gz → 0.12.0__tar.gz

{hydraflow-0.11.1 → hydraflow-0.12.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hydraflow
-Version: 0.11.1
+Version: 0.12.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.11.1 → hydraflow-0.12.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "hydraflow"
-version = "0.11.1"
+version = "0.12.0"
 description = "Hydraflow integrates Hydra and MLflow to manage and track machine learning experiments."
 readme = "README.md"
 license = { file = "LICENSE" }
@@ -101,3 +101,6 @@ ignore = [
 "src/hydraflow/core/main.py" = ["ANN201", "D401"]
 "src/hydraflow/executor/conf.py" = ["ANN", "D"]
 "tests/*" = ["A001", "ANN", "ARG", "D", "FBT", "PD", "PLR", "PT", "S", "SLF"]
+
+[tool.pyright]
+include = ["src", "tests"]

{hydraflow-0.11.1 → hydraflow-0.12.0}/src/hydraflow/executor/conf.py

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

{hydraflow-0.11.1 → hydraflow-0.12.0}/src/hydraflow/executor/io.py

@@ -5,7 +5,7 @@ from __future__ import annotations
 from pathlib import Path
 from typing import TYPE_CHECKING
 
-from omegaconf import OmegaConf
+from omegaconf import DictConfig, ListConfig, OmegaConf
 
 from .conf import HydraflowConf
 
@@ -35,7 +35,26 @@ def load_config() -> HydraflowConf:
 
     cfg = OmegaConf.load(path)
 
-    return OmegaConf.merge(schema, cfg)  # type: ignore
+    if not isinstance(cfg, DictConfig):
+        return schema
+
+    rename_with(cfg)
+
+    return OmegaConf.merge(schema, cfg)  # type: ignore[return-value]
+
+
+def rename_with(cfg: DictConfig) -> None:
+    """Rename the `with` field to `with_`."""
+    if "with" in cfg:
+        cfg["with_"] = cfg.pop("with")
+
+    for key in list(cfg.keys()):
+        if isinstance(cfg[key], DictConfig):
+            rename_with(cfg[key])
+        elif isinstance(cfg[key], ListConfig):
+            for item in cfg[key]:
+                if isinstance(item, DictConfig):
+                    rename_with(item)
 
 
 def get_job(name: str) -> Job:

{hydraflow-0.11.1 → hydraflow-0.12.0}/src/hydraflow/executor/job.py

@@ -69,10 +69,10 @@ def iter_batches(job: Job) -> Iterator[list[str]]:
 
     """
     job_name = f"hydra.job.name={job.name}"
-    job_configs = shlex.split(job.configs)
+    job_configs = shlex.split(job.with_)
 
     for step in job.steps:
-        configs = shlex.split(step.configs) or job_configs
+        configs = shlex.split(step.with_) or job_configs
 
         for args in iter_args(step.batch, step.args):
             sweep_dir = f"hydra.sweep.dir=multirun/{ulid.ULID()}"

{hydraflow-0.11.1 → hydraflow-0.12.0}/src/hydraflow/executor/parser.py

@@ -389,7 +389,7 @@ def split_arg(arg: str) -> tuple[str, str, str]:
     key, value = arg.split("=")
 
     if "/" in key:
-        key, suffix = key.split("/", 1)
+        key, suffix = key.split("/")
         return key, suffix, value
 
     return key, "", value

{hydraflow-0.11.1 → hydraflow-0.12.0}/tests/cli/hydraflow.yaml

@@ -13,10 +13,10 @@ jobs:
         args: count=100
   parallel:
     run: python app.py
-    configs: hydra/launcher=joblib hydra.launcher.n_jobs=2
+    with: hydra/launcher=joblib hydra.launcher.n_jobs=2
     steps:
       - batch: name=a
         args: count=1:4
       - batch: name=b
         args: count=11:14
-        configs: hydra/launcher=joblib hydra.launcher.n_jobs=4
+        with: hydra/launcher=joblib hydra.launcher.n_jobs=4

{hydraflow-0.11.1 → hydraflow-0.12.0}/tests/executor/test_conf.py

@@ -25,10 +25,11 @@ def test_none():
 
 
 def test_job(config):
-    cfg = config("jobs:\n  a:\n    run: a.test\n")
+    cfg = config("jobs:\n  a:\n    run: a.test\n    with: --opt1 --opt2\n")
     assert cfg.jobs["a"].run == "a.test"
+    assert cfg.jobs["a"].with_ == "--opt1 --opt2"
 
 
 def test_step(config):
-    cfg = config("jobs:\n  a:\n    steps:\n      - configs: --opt1 --opt2\n")
-    assert cfg.jobs["a"].steps[0].configs == "--opt1 --opt2"
+    cfg = config("jobs:\n  a:\n    steps:\n      - with: --opt1 --opt2\n")
+    assert cfg.jobs["a"].steps[0].with_ == "--opt1 --opt2"

{hydraflow-0.11.1 → hydraflow-0.12.0}/tests/executor/test_io.py

@@ -1,6 +1,7 @@
 from pathlib import Path
 
 import pytest
+from omegaconf import DictConfig
 
 
 @pytest.mark.parametrize("file", ["hydraflow.yaml", "hydraflow.yml"])
@@ -16,3 +17,15 @@ def test_find_config_none(chdir):
     from hydraflow.executor.io import find_config_file
 
     assert find_config_file() is None
+
+
+def test_load_config_list(chdir):
+    from hydraflow.executor.io import load_config
+
+    Path("hydraflow.yaml").write_text("- a\n- b\n")
+
+    cfg = load_config()
+    assert isinstance(cfg, DictConfig)
+    assert cfg.jobs == {}
+
+    Path("hydraflow.yaml").unlink()