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

hydraflow/cli.py

@@ -2,54 +2,53 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Annotated
+from typing import Annotated
 
 import typer
 from rich.console import Console
 from typer import Argument, Option
 
-from hydraflow.executor.io import load_config
-
-if TYPE_CHECKING:
-    from hydraflow.executor.job import Job
+from hydraflow.executor.io import get_job, load_config
 
 app = typer.Typer(add_completion=False)
 console = Console()
 
 
-def get_job(name: str) -> Job:
-    cfg = load_config()
-    job = cfg.jobs[name]
-
-    if not job.name:
-        job.name = name
-
-    return job
-
-
 @app.command()
 def run(
     name: Annotated[str, Argument(help="Job name.", show_default=False)],
+    *,
+    dry_run: Annotated[
+        bool,
+        Option("--dry-run", help="Perform a dry run"),
+    ] = False,
 ) -> None:
     """Run a job."""
     import mlflow
 
-    from hydraflow.executor.job import multirun
+    from hydraflow.executor.job import multirun, to_text
 
     job = get_job(name)
-    mlflow.set_experiment(job.name)
-    multirun(job)
+    if dry_run:
+        typer.echo(to_text(job))
+    else:
+        mlflow.set_experiment(job.name)
+        multirun(job)
 
 
 @app.command()
 def show(
-    name: Annotated[str, Argument(help="Job name.", show_default=False)],
+    name: Annotated[str, Argument(help="Job name.", show_default=False)] = "",
 ) -> None:
-    """Show a job."""
-    from hydraflow.executor.job import show
+    """Show the hydraflow config."""
+    from omegaconf import OmegaConf
 
-    job = get_job(name)
-    show(job)
+    if name:
+        cfg = get_job(name)
+    else:
+        cfg = load_config()
+
+    typer.echo(OmegaConf.to_yaml(cfg))
 
 
 @app.callback(invoke_without_command=True)

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/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/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/executor/io.py

@@ -3,11 +3,15 @@
 from __future__ import annotations
 
 from pathlib import Path
+from typing import TYPE_CHECKING
 
 from omegaconf import OmegaConf
 
 from .conf import HydraflowConf
 
+if TYPE_CHECKING:
+    from .job import Job
+
 
 def find_config_file() -> Path | None:
     """Find the hydraflow config file."""
@@ -32,3 +36,14 @@ def load_config() -> HydraflowConf:
     cfg = OmegaConf.load(path)
 
     return OmegaConf.merge(schema, cfg)  # type: ignore
+
+
+def get_job(name: str) -> Job:
+    """Get a job from the config."""
+    cfg = load_config()
+    job = cfg.jobs[name]
+
+    if not job.name:
+        job.name = name
+
+    return job

hydraflow/executor/job.py

@@ -20,6 +20,7 @@ from __future__ import annotations
 import importlib
 import shlex
 import subprocess
+import sys
 from subprocess import CalledProcessError
 from typing import TYPE_CHECKING
 
@@ -99,6 +100,9 @@ def multirun(job: Job) -> None:
 
     if job.run:
         base_cmds = shlex.split(job.run)
+        if base_cmds[0] == "python" and sys.platform == "win32":
+            base_cmds[0] = sys.executable
+
         for args in it:
             cmds = [*base_cmds, *args]
             try:
@@ -108,45 +112,54 @@ 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
 
 
-def show(job: Job) -> None:
-    """Show the job configuration.
+def to_text(job: Job) -> str:
+    """Convert the job configuration to a string.
 
-    This function shows the job configuration for a given job.
+    This function returns the job configuration for a given job.
 
     Args:
         job (Job): The job configuration to show.
 
+    Returns:
+        str: The job configuration.
+
     """
+    text = ""
+
     it = iter_batches(job)
 
     if job.run:
         base_cmds = shlex.split(job.run)
         for args in it:
             cmds = " ".join([*base_cmds, *args])
-            print(cmds)  # noqa: T201
+            text += f"{cmds}\n"
 
     elif job.call:
-        print(f"call: {job.call}")  # noqa: T201
+        text = f"call: {job.call}\n"
         for args in it:
-            print(f"args: {args}")  # noqa: T201
+            text += f"args: {args}\n"
+
+    return text

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.dist-info → hydraflow-0.10.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hydraflow
-Version: 0.10.0
+Version: 0.10.2
 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.dist-info → hydraflow-0.10.2.dist-info}/RECORD

@@ -1,24 +1,24 @@
 hydraflow/__init__.py,sha256=f2KO2iF7um-nNmayNyEr7TWG4UICOXy7YAN1d3qu0OY,936
-hydraflow/cli.py,sha256=gbDPj49azP8CCGxkxU0rksh1-gCyjP0VkVYH34ktcsA,1338
+hydraflow/cli.py,sha256=b-M368amGUblOOqOi7JuBsnzLuaNqgpTit9ZRj0qqac,1410
 hydraflow/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hydraflow/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hydraflow/core/config.py,sha256=SJzjgsO_kzB78_whJ3lmy7GlZvTvwZONH1BJBn8zCuI,3817
 hydraflow/core/context.py,sha256=QPyPg1xrTlmhviKNn-0nDY9bXcVky1zInqRqPN-VNhc,4741
-hydraflow/core/io.py,sha256=KK9_mkx4XnBgA63Ab-g833N5q9aCsSrJR-7pp6unEKw,6746
-hydraflow/core/main.py,sha256=gYb1OOVH0CL4385Dm-06Mqi1Mr9-24URwLUiW86pGNs,5018
+hydraflow/core/io.py,sha256=C207DsGAU4CLvlHySyyIl0_aKZ83ysJ-W_wNM2n4RPI,6754
+hydraflow/core/main.py,sha256=500fh5cnlKj9CHFgD8-f16wZcOuPF-5zSvFeVMqI8MQ,5100
 hydraflow/core/mlflow.py,sha256=M3MhiChnMzKnKRmjBl4h_SRGkAZKL7GAmFr3DdzwRuQ,5666
 hydraflow/core/param.py,sha256=LHU9j9_7oA99igasoOyKofKClVr9FmGA3UABJ-KmyS0,4538
 hydraflow/entities/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hydraflow/entities/run_collection.py,sha256=BHbMvYB4WyG5qSNYpIzwmHySOtmGNb-jg2OrCaTPr2I,19651
+hydraflow/entities/run_collection.py,sha256=E8IRBgxCnJE_IPCaSmS2mc9GtDXXLBfc7GHv07d2j98,19635
 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/io.py,sha256=4nafwge6vHanYFuEHxd0LRv_3ZLgMpV50qSbssZNe3Q,696
-hydraflow/executor/job.py,sha256=Lji8hsalwsUyxZIoGc2XO2jrXV_YysUMZ7dlBhcQKiI,4479
-hydraflow/executor/parser.py,sha256=y4C9wVdUnazJDxdWrT5y3yWFIo0zAGzO-cS9x1MTK_8,9486
-hydraflow-0.10.0.dist-info/METADATA,sha256=Oe04r5_IvW0YBddGrjQRdu_dNPdgyDb2K_2_2WuawNk,4574
-hydraflow-0.10.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-hydraflow-0.10.0.dist-info/entry_points.txt,sha256=XI0khPbpCIUo9UPqkNEpgh-kqK3Jy8T7L2VCWOdkbSM,48
-hydraflow-0.10.0.dist-info/licenses/LICENSE,sha256=IGdDrBPqz1O0v_UwCW-NJlbX9Hy9b3uJ11t28y2srmY,1062
-hydraflow-0.10.0.dist-info/RECORD,,
+hydraflow/executor/io.py,sha256=xV3m-nV9eKbu9Fb7u04J2bfmR_Ky3jTEJjq4QC2m6V4,954
+hydraflow/executor/job.py,sha256=YZ9JuVrdAcG3_HvNngHy9NL4-3bjJTaColE_5efF8TU,4743
+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,,