hydraflow 0.10.0__tar.gz → 0.10.1__tar.gz

hydraflow-0.10.1/.cursorrules

@@ -0,0 +1,6 @@
+You are an AI assistant specialized in Python development. Your approach emphasizes:
+
+1. Comprehensive testing with pytest.
+2. Code style consistency using Ruff.
+3. Detailed documentation using docstrings and README files.
+4. Generate Git commit messages in English.

{hydraflow-0.10.0 → hydraflow-0.10.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hydraflow
-Version: 0.10.0
+Version: 0.10.1
 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.0 → hydraflow-0.10.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "hydraflow"
-version = "0.10.0"
+version = "0.10.1"
 description = "Hydraflow integrates Hydra and MLflow to manage and track machine learning experiments."
 readme = "README.md"
 license = { file = "LICENSE" }

{hydraflow-0.10.0 → hydraflow-0.10.1}/src/hydraflow/core/io.py

@@ -136,7 +136,7 @@ def load_overrides(run: Run) -> ListConfig:
 
     """
     path = get_artifact_dir(run) / ".hydra/overrides.yaml"
-    return OmegaConf.load(path)  # type: ignore
+    return sorted(OmegaConf.load(path))  # type: ignore
 
 
 def remove_run(run: Run | Iterable[Run]) -> None:

{hydraflow-0.10.0 → hydraflow-0.10.1}/src/hydraflow/core/main.py

@@ -154,11 +154,15 @@ def equals(run_dir: Path, config: Any, overrides: list[str] | None) -> bool:
     """
     if overrides is None:
         path = run_dir / "artifacts/.hydra/config.yaml"
-    else:
-        path = run_dir / "artifacts/.hydra/overrides.yaml"
-        config = overrides
+
+        if not path.exists():
+            return False
+
+        return OmegaConf.load(path) == config
+
+    path = run_dir / "artifacts/.hydra/overrides.yaml"
 
     if not path.exists():
         return False
 
-    return OmegaConf.load(path) == config
+    return sorted(OmegaConf.load(path)) == sorted(overrides)

{hydraflow-0.10.0 → hydraflow-0.10.1}/src/hydraflow/entities/run_collection.py

@@ -116,7 +116,7 @@ class RunCollection:
             but not in the other.
 
         """
-        runs = [run for run in self._runs if run not in other._runs]  # noqa: SLF001
+        runs = [run for run in self._runs if run not in other._runs]
         return self.__class__(runs)
 
     @property

{hydraflow-0.10.0 → hydraflow-0.10.1}/src/hydraflow/executor/job.py

@@ -99,6 +99,7 @@ def multirun(job: Job) -> None:
 
     if job.run:
         base_cmds = shlex.split(job.run)
+
         for args in it:
             cmds = [*base_cmds, *args]
             try:
@@ -108,22 +109,24 @@ def multirun(job: Job) -> None:
                 raise RuntimeError(msg) from e
 
     elif job.call:
-        if "." not in job.call:
-            msg = f"Invalid function path: {job.call}."
+        call_name, *base_args = shlex.split(job.call)
+
+        if "." not in call_name:
+            msg = f"Invalid function path: {call_name}."
             msg += " Expected format: 'package.module.function'"
             raise ValueError(msg)
 
         try:
-            module_name, func_name = job.call.rsplit(".", 1)
+            module_name, func_name = call_name.rsplit(".", 1)
             module = importlib.import_module(module_name)
             func = getattr(module, func_name)
         except (ImportError, AttributeError, ModuleNotFoundError) as e:
-            msg = f"Failed to import or find function: {job.call}"
+            msg = f"Failed to import or find function: {call_name}"
             raise ValueError(msg) from e
 
         for args in it:
             try:
-                func(*args)
+                func([*base_args, *args])
             except Exception as e:  # noqa: PERF203
                 msg = f"Function call '{job.call}' failed with args: {args}"
                 raise RuntimeError(msg) from e

{hydraflow-0.10.0 → hydraflow-0.10.1}/src/hydraflow/executor/parser.py

@@ -8,7 +8,7 @@ ranges, and expand values from string arguments.
 
 from __future__ import annotations
 
-import re
+import shlex
 from itertools import chain, product
 from typing import TYPE_CHECKING
 
@@ -289,7 +289,7 @@ def split(arg: str) -> list[str]:
     return result
 
 
-def expand_values(arg: str) -> list[str]:
+def expand_values(arg: str, suffix: str = "") -> Iterator[str]:
     """Expand a string argument into a list of values.
 
     Take a string containing comma-separated values or ranges and return a list
@@ -297,12 +297,36 @@ def expand_values(arg: str) -> list[str]:
 
     Args:
         arg (str): The argument to expand.
+        suffix (str): The suffix to append to each value.
 
     Returns:
-        list[str]: A list of the expanded values.
+        Iterator[str]: An iterator of the expanded values.
 
     """
-    return list(chain.from_iterable(collect_values(x) for x in split(arg)))
+    if suffix in SUFFIX_EXPONENT:
+        suffix = SUFFIX_EXPONENT[suffix]
+
+    for value in chain.from_iterable(collect_values(x) for x in split(arg)):
+        yield f"{value}{suffix}"
+
+
+def split_arg(arg: str) -> tuple[str, str, str]:
+    """Split an argument into a key, suffix, and value.
+
+    Args:
+        arg (str): The argument to split.
+
+    Returns:
+        tuple[str, str, str]: A tuple containing the key, suffix, and value.
+
+    """
+    key, value = arg.split("=")
+
+    if "/" in key:
+        key, suffix = key.split("/", 1)
+        return key, suffix, value
+
+    return key, "", value
 
 
 def collect_arg(arg: str) -> str:
@@ -318,9 +342,9 @@ def collect_arg(arg: str) -> str:
         str: A string of the collected key and values.
 
     """
-    key, arg = arg.split("=")
-    arg = ",".join(expand_values(arg))
-    return f"{key}={arg}"
+    key, suffix, value = split_arg(arg)
+    value = ",".join(expand_values(value, suffix))
+    return f"{key}={value}"
 
 
 def expand_arg(arg: str) -> Iterator[str]:
@@ -338,26 +362,27 @@ def expand_arg(arg: str) -> Iterator[str]:
 
     """
     if "|" not in arg:
-        key, value = arg.split("=")
+        key, suffix, value = split_arg(arg)
 
-        for v in expand_values(value):
+        for v in expand_values(value, suffix):
             yield f"{key}={v}"
 
         return
 
     args = arg.split("|")
     key = ""
+    suffix = ""
 
     for arg_ in args:
         if "=" in arg_:
-            key, value = arg_.split("=")
+            key, suffix, value = split_arg(arg_)
         elif key:
             value = arg_
         else:
             msg = f"Invalid argument: {arg_}"
             raise ValueError(msg)
 
-        value = ",".join(expand_values(value))
+        value = ",".join(expand_values(value, suffix))
         yield f"{key}={value}"
 
 
@@ -372,7 +397,7 @@ def collect(args: str | list[str]) -> list[str]:
 
     """
     if isinstance(args, str):
-        args = re.split(r"\s+", args.strip())
+        args = shlex.split(args)
 
     args = [arg for arg in args if "=" in arg]
 
@@ -390,7 +415,7 @@ def expand(args: str | list[str]) -> list[list[str]]:
 
     """
     if isinstance(args, str):
-        args = re.split(r"\s+", args.strip())
+        args = shlex.split(args)
 
     args = [arg for arg in args if "=" in arg]
 

{hydraflow-0.10.0 → hydraflow-0.10.1}/tests/core/io/test_hydra_dir.py

@@ -61,4 +61,4 @@ def test_load_overrides(run: Run):
     from hydraflow.core.io import load_overrides
 
     overrides = load_overrides(run)
-    assert overrides == ["name=a", "age=10"]
+    assert overrides == ["age=10", "name=a"]

{hydraflow-0.10.0 → hydraflow-0.10.1}/tests/core/main/test_match_overrides.py

@@ -11,8 +11,8 @@ pytestmark = pytest.mark.xdist_group(name="group5")
 def rc(collect):
     file = Path(__file__).parent / "match_overrides.py"
     collect(file, ["-m", "count=1,2"])
-    collect(file, ["-m", "name=a,b"])
-    return collect(file, ["-m", "name=a,b"])
+    collect(file, ["-m", "name=a,b", "count=1"])
+    return collect(file, ["-m", "count=1", "name=a,b"])
 
 
 def test_rc_len(rc: RunCollection):
@@ -23,3 +23,9 @@ def test_config(rc: RunCollection):
     df = rc.data.config
     assert len(df) == 4
     assert len(df.drop_duplicates()) == 3
+
+
+def test_equals():
+    from hydraflow.core.main import equals
+
+    assert equals(Path.cwd(), None, []) is False

{hydraflow-0.10.0 → hydraflow-0.10.1}/tests/executor/test_job.py

@@ -94,27 +94,46 @@ def test_multirun_run_error(job: Job):
         multirun(job)
 
 
-def test_multirun_call_invalid(job: Job):
+def test_multirun_call(job: Job, capsys: pytest.CaptureFixture):
     from hydraflow.executor.job import multirun
 
-    job.call = "print"
-    with pytest.raises(ValueError):
+    job.call = "typer.echo"
+    multirun(job)
+    out, _ = capsys.readouterr()
+    assert "'a=1,2', 'b=5'" in out
+    assert "'a=3,4', 'c=8'" in out
+
+
+def test_multirun_call_args(job: Job, capsys: pytest.CaptureFixture):
+    from hydraflow.executor.job import multirun
+
+    job.call = "typer.echo a 'b c'"
+    multirun(job)
+    out, _ = capsys.readouterr()
+    assert "['a', 'b c', '--multirun'," in out
+
+
+def test_multirun_call_error(job: Job):
+    from hydraflow.executor.job import multirun
+
+    job.call = "hydraflow.executor.job.multirun"
+    with pytest.raises(RuntimeError):
         multirun(job)
 
 
-def test_multirun_call_not_found(job: Job):
+def test_multirun_call_invalid(job: Job):
     from hydraflow.executor.job import multirun
 
-    job.call = "hydraflow.invalid"
+    job.call = "print"
     with pytest.raises(ValueError):
         multirun(job)
 
 
-def test_multirun_call_error(job: Job):
+def test_multirun_call_not_found(job: Job):
     from hydraflow.executor.job import multirun
 
-    job.call = "typer.echo"
-    with pytest.raises(RuntimeError):
+    job.call = "hydraflow.invalid"
+    with pytest.raises(ValueError):
         multirun(job)
 
 

{hydraflow-0.10.0 → hydraflow-0.10.1}/tests/executor/test_parser.py

@@ -129,18 +129,37 @@ def test_collect_value(s, x):
 def test_expand_value(s, x):
     from hydraflow.executor.parser import expand_values
 
-    assert expand_values(s) == x
+    assert list(expand_values(s)) == x
+
+
+@pytest.mark.parametrize(
+    ("s", "x"),
+    [
+        ("1,2,3", ["1e3", "2e3", "3e3"]),
+        ("1:3,5:6", ["1e3", "2e3", "3e3", "5e3", "6e3"]),
+        ("0:0.25:1,2.0", ["0e3", "0.25e3", "0.5e3", "0.75e3", "1.0e3", "2.0e3"]),
+        ("3", ["3e3"]),
+    ],
+)
+def test_expand_value_suffix(s, x):
+    from hydraflow.executor.parser import expand_values
+
+    assert list(expand_values(s, "k")) == x
 
 
 @pytest.mark.parametrize(
     ("s", "x"),
     [
         ("a=1", "a=1"),
+        ("a/M=1", "a=1e6"),
         ("a=1,2", "a=1,2"),
+        ("a/n=1,2", "a=1e-9,2e-9"),
         ("a=1:2", "a=1,2"),
+        ("a/M=1:2", "a=1e6,2e6"),
         ("a=:2:3", "a=0,2"),
         ("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"),
     ],
 )
 def test_collect_arg(s, x):
@@ -154,13 +173,17 @@ def test_collect_arg(s, x):
     [
         ("a=1", ["a=1"]),
         ("a=1,2", ["a=1", "a=2"]),
+        ("a/M=1,2", ["a=1e6", "a=2e6"]),
         ("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=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"]),
+        ("a/G=1,2|3,4", ["a=1e9,2e9", "a=3e9,4e9"]),
         ("a=1:4|3:5:m", ["a=1,2,3,4", "a=3e-3,4e-3,5e-3"]),
         ("a=1,2|b=3,4|c=5,6", ["a=1,2", "b=3,4", "c=5,6"]),
+        ("a/k=1,2|b/m=3,4|c/u=5,6", ["a=1e3,2e3", "b=3e-3,4e-3", "c=5e-6,6e-6"]),
     ],
 )
 def test_expand_arg(s, x):
@@ -179,14 +202,29 @@ def test_expand_arg_error():
 @pytest.mark.parametrize(
     ("s", "x"),
     [
-        (["a=1"], ["a=1"]),
+        (["a=1", "b"], ["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"]),
+        (["a/k=1:3", "b/m=4:6"], ["a=1e3,2e3,3e3", "b=4e-3,5e-3,6e-3"]),
+    ],
+)
+def test_collect_list(s, x):
+    from hydraflow.executor.parser import collect
+
+    assert collect(s) == x
+
+
+@pytest.mark.parametrize(
+    ("s", "x"),
+    [
         ("a=1:3\nb=4:6", ["a=1,2,3", "b=4,5,6"]),
+        ("a/k=1:3 b=4:6", ["a=1e3,2e3,3e3", "b=4,5,6"]),
+        ("a/n=4,5 b=c,d", ["a=4e-9,5e-9", "b=c,d"]),
         ("", []),
     ],
 )
-def test_collect(s, x):
+def test_collect_str(s, x):
     from hydraflow.executor.parser import collect
 
     assert collect(s) == x
@@ -195,13 +233,14 @@ def test_collect(s, x):
 @pytest.mark.parametrize(
     ("s", "x"),
     [
-        (["a=1"], [["a=1"]]),
-        (["a=1,2"], [["a=1"], ["a=2"]]),
+        (["a=1", "b"], [["a=1"]]),
+        (["a/k=1,2"], [["a=1e3"], ["a=2e3"]]),
         (
             " a=1,2\n b=3,4\n",
             [["a=1", "b=3"], ["a=1", "b=4"], ["a=2", "b=3"], ["a=2", "b=4"]],
         ),
         (["a=1:2|3,4"], [["a=1,2"], ["a=3,4"]]),
+        (["a/k=1:2|3,4"], [["a=1e3,2e3"], ["a=3e3,4e3"]]),
         (
             ["a=1:2|3,4", "b=5:6|c=7,8"],
             [
@@ -211,10 +250,39 @@ def test_collect(s, x):
                 ["a=3,4", "c=7,8"],
             ],
         ),
+        (
+            ["a/m=1:2|3,4", "b/k=5:6|c/u=7,8"],
+            [
+                ["a=1e-3,2e-3", "b=5e3,6e3"],
+                ["a=1e-3,2e-3", "c=7e-6,8e-6"],
+                ["a=3e-3,4e-3", "b=5e3,6e3"],
+                ["a=3e-3,4e-3", "c=7e-6,8e-6"],
+            ],
+        ),
+    ],
+)
+def test_expand_list(s, x):
+    from hydraflow.executor.parser import expand
+
+    assert expand(s) == x
+
+
+@pytest.mark.parametrize(
+    ("s", "x"),
+    [
+        (
+            "a/m=1:2|3,4 b/k=5:6|c=7,8",
+            [
+                ["a=1e-3,2e-3", "b=5e3,6e3"],
+                ["a=1e-3,2e-3", "c=7,8"],
+                ["a=3e-3,4e-3", "b=5e3,6e3"],
+                ["a=3e-3,4e-3", "c=7,8"],
+            ],
+        ),
         ("", [[]]),
     ],
 )
-def test_expand(s, x):
+def test_expand_str(s, x):
     from hydraflow.executor.parser import expand
 
     assert expand(s) == x