hydraflow 0.11.0__tar.gz → 0.12.0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hydraflow
-Version: 0.11.0
+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
@@ -97,7 +97,6 @@ Here is a simple example to get you started with Hydraflow:
 from __future__ import annotations
 
 from dataclasses import dataclass
-from pathlib import Path
 from typing import TYPE_CHECKING
 
 import hydraflow

{hydraflow-0.11.0 → hydraflow-0.12.0}/README.md

@@ -51,7 +51,6 @@ Here is a simple example to get you started with Hydraflow:
 from __future__ import annotations
 
 from dataclasses import dataclass
-from pathlib import Path
 from typing import TYPE_CHECKING
 
 import hydraflow

{hydraflow-0.11.0 → hydraflow-0.12.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "hydraflow"
-version = "0.11.0"
+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.0 → 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.0 → 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.0 → 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.0 → hydraflow-0.12.0}/src/hydraflow/executor/parser.py

@@ -216,6 +216,9 @@ def collect_values(arg: str) -> list[str]:
         list[str]: A list of the collected values.
 
     """
+    if "(" in arg:
+        return collect_parentheses(arg)
+
     if ":" not in arg:
         return [arg]
 
@@ -235,6 +238,58 @@ def collect_values(arg: str) -> list[str]:
     return [add_exponent(x, exponent) for x in values]
 
 
+def split_parentheses(arg: str) -> Iterator[str]:
+    """Split a string with parentheses into a list of strings.
+
+    Args:
+        arg (str): The string to split.
+
+    Returns:
+        Iterator[str]: An iterator of the split strings.
+
+    Examples:
+        >>> list(split_parentheses("a(b,c)m(e:f)k"))
+        ['a', 'b,c', 'e-3', 'e:f', 'e3']
+        >>> list(split_parentheses("(b,c)d(e:f)"))
+        ['b,c', 'd', 'e:f']
+
+    """
+    current = ""
+
+    for char in arg:
+        if char in ("(", ")"):
+            if current:
+                yield SUFFIX_EXPONENT.get(current, current)
+                current = ""
+        else:
+            current += char
+
+    if current:
+        yield SUFFIX_EXPONENT.get(current, current)
+
+
+def collect_parentheses(arg: str) -> list[str]:
+    """Collect values from a string with parentheses.
+
+    Args:
+        arg (str): The string to collect values from.
+
+    Returns:
+        list[str]: A list of the collected values.
+
+    Examples:
+        >>> collect_parentheses("(1:3,5:2:9,20)k")
+        ['1e3', '2e3', '3e3', '5e3', '7e3', '9e3', '20e3']
+        >>> collect_parentheses("2e(-1,-2,-3)")
+        ['2e-1', '2e-2', '2e-3']
+        >>> collect_parentheses("(1:3)e(3,5)")
+        ['1e3', '2e3', '3e3', '1e5', '2e5', '3e5']
+
+    """
+    it = [expand_values(x) for x in split_parentheses(arg)]
+    return ["".join(x[::-1]) for x in product(*it[::-1])]
+
+
 def split(arg: str) -> list[str]:
     r"""Split a string by top-level commas.
 
@@ -255,11 +310,14 @@ def split(arg: str) -> list[str]:
         ['"x,y"', 'z']
         >>> split("'p,q',r")
         ["'p,q'", 'r']
+        >>> split("(a,b)m,(1,2:4)k")
+        ['(a,b)m', '(1,2:4)k']
 
     """
     result = []
     current = []
     bracket_count = 0
+    paren_count = 0
     in_single_quote = False
     in_double_quote = False
 
@@ -272,9 +330,14 @@ def split(arg: str) -> list[str]:
             bracket_count += 1
         elif char == "]" and not (in_single_quote or in_double_quote):
             bracket_count -= 1
+        elif char == "(" and not (in_single_quote or in_double_quote):
+            paren_count += 1
+        elif char == ")" and not (in_single_quote or in_double_quote):
+            paren_count -= 1
         elif (
             char == ","
             and bracket_count == 0
+            and paren_count == 0
             and not in_single_quote
             and not in_double_quote
         ):
@@ -303,8 +366,7 @@ def expand_values(arg: str, suffix: str = "") -> Iterator[str]:
         Iterator[str]: An iterator of the expanded values.
 
     """
-    if suffix in SUFFIX_EXPONENT:
-        suffix = SUFFIX_EXPONENT[suffix]
+    suffix = SUFFIX_EXPONENT.get(suffix, suffix)
 
     for value in chain.from_iterable(collect_values(x) for x in split(arg)):
         yield f"{value}{suffix}"
@@ -320,10 +382,14 @@ def split_arg(arg: str) -> tuple[str, str, str]:
         tuple[str, str, str]: A tuple containing the key, suffix, and value.
 
     """
+    if "=" not in arg:
+        msg = f"Invalid argument: {arg}"
+        raise ValueError(msg)
+
     key, value = arg.split("=")
 
     if "/" in key:
-        key, suffix = key.split("/", 1)
+        key, suffix = key.split("/")
         return key, suffix, value
 
     return key, "", value
@@ -399,8 +465,6 @@ def collect(args: str | list[str]) -> list[str]:
     if isinstance(args, str):
         args = shlex.split(args)
 
-    args = [arg for arg in args if "=" in arg]
-
     return [collect_arg(arg) for arg in args]
 
 
@@ -417,6 +481,4 @@ def expand(args: str | list[str]) -> list[list[str]]:
     if isinstance(args, str):
         args = shlex.split(args)
 
-    args = [arg for arg in args if "=" in arg]
-
     return [list(x) for x in product(*(expand_arg(arg) for arg in args))]

{hydraflow-0.11.0 → 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.0 → 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.0 → 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()

{hydraflow-0.11.0 → hydraflow-0.12.0}/tests/executor/test_parser.py

@@ -103,6 +103,7 @@ def test_split_suffix(s, x):
         ("1:2:e2", ["1e2", "2e2"]),
         (":2:e2", ["0", "1e2", "2e2"]),
         ("-2:2:k", ["-2e3", "-1e3", "0", "1e3", "2e3"]),
+        ("(1:3,5:2:9,20)k", ["1e3", "2e3", "3e3", "5e3", "7e3", "9e3", "20e3"]),
     ],
 )
 def test_collect_value(s, x):
@@ -124,6 +125,8 @@ def test_collect_value(s, x):
         ("[1,2],[3,4]", ["[1,2]", "[3,4]"]),
         ("'1,2','3,4'", ["'1,2'", "'3,4'"]),
         ('"1,2","3,4"', ['"1,2"', '"3,4"']),
+        ("(1,4)k,(6,8)M", ["1e3", "4e3", "6e6", "8e6"]),
+        ("(1:3)e-2,(5:7)e-3", ["1e-2", "2e-2", "3e-2", "5e-3", "6e-3", "7e-3"]),
     ],
 )
 def test_expand_value(s, x):
@@ -147,6 +150,13 @@ def test_expand_value_suffix(s, x):
     assert list(expand_values(s, "k")) == x
 
 
+def test_split_arg_error():
+    from hydraflow.executor.parser import split_arg
+
+    with pytest.raises(ValueError):
+        split_arg("1,2,3")
+
+
 @pytest.mark.parametrize(
     ("s", "x"),
     [
@@ -157,6 +167,7 @@ def test_expand_value_suffix(s, x):
         ("a=1:2", "a=1,2"),
         ("a/M=1:2", "a=1e6,2e6"),
         ("a=:2:3", "a=0,2"),
+        ("a=(2,4)m,2,3", "a=2e-3,4e-3,2,3"),
         ("a=1:3:k", "a=1e3,2e3,3e3"),
         ("a=1:3:k,2:4:M", "a=1e3,2e3,3e3,2e6,3e6,4e6"),
         ("a/m=1:3,8:10", "a=1e-3,2e-3,3e-3,8e-3,9e-3,10e-3"),
@@ -177,6 +188,9 @@ def test_collect_arg(s, x):
         ("a=1:2", ["a=1", "a=2"]),
         ("a/n=1:2", ["a=1e-9", "a=2e-9"]),
         ("a=:2:3", ["a=0", "a=2"]),
+        ("a=(0.1:0.1:0.4)k", ["a=0.1e3", "a=0.2e3", "a=0.3e3", "a=0.4e3"]),
+        ("a=(1,2)(e-1,e2)", ["a=1e-1", "a=2e-1", "a=1e2", "a=2e2"]),
+        ("a=(1,2)e(-1,2)", ["a=1e-1", "a=2e-1", "a=1e2", "a=2e2"]),
         ("a=1:3:k", ["a=1e3", "a=2e3", "a=3e3"]),
         ("a=1:3:k,2:4:M", ["a=1e3", "a=2e3", "a=3e3", "a=2e6", "a=3e6", "a=4e6"]),
         ("a=1,2|3,4", ["a=1,2", "a=3,4"]),
@@ -202,7 +216,7 @@ def test_expand_arg_error():
 @pytest.mark.parametrize(
     ("s", "x"),
     [
-        (["a=1", "b"], ["a=1"]),
+        (["a=1"], ["a=1"]),
         (["a=1:3"], ["a=1,2,3"]),
         (["a/m=1:3"], ["a=1e-3,2e-3,3e-3"]),
         (["a=1:3", "b=4:6"], ["a=1,2,3", "b=4,5,6"]),
@@ -233,7 +247,7 @@ def test_collect_str(s, x):
 @pytest.mark.parametrize(
     ("s", "x"),
     [
-        (["a=1", "b"], [["a=1"]]),
+        (["a=1"], [["a=1"]]),
         (["a/k=1,2"], [["a=1e3"], ["a=2e3"]]),
         (
             " a=1,2\n b=3,4\n",