hydraflow 0.13.0__tar.gz → 0.14.0__tar.gz

{hydraflow-0.13.0 → hydraflow-0.14.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hydraflow
-Version: 0.13.0
+Version: 0.14.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
@@ -38,10 +38,9 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.10
 Requires-Dist: hydra-core>=1.3
 Requires-Dist: mlflow>=2.15
-Requires-Dist: omegaconf
+Requires-Dist: omegaconf>=2.3
 Requires-Dist: python-ulid>=3.0.0
-Requires-Dist: rich
-Requires-Dist: typer
+Requires-Dist: typer>=0.15
 Description-Content-Type: text/markdown
 
 # Hydraflow

{hydraflow-0.13.0 → hydraflow-0.14.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "hydraflow"
-version = "0.13.0"
+version = "0.14.0"
 description = "Hydraflow integrates Hydra and MLflow to manage and track machine learning experiments."
 readme = "README.md"
 license = { file = "LICENSE" }
@@ -22,10 +22,9 @@ requires-python = ">=3.10"
 dependencies = [
   "hydra-core>=1.3",
   "mlflow>=2.15",
-  "omegaconf",
+  "omegaconf>=2.3",
   "python-ulid>=3.0.0",
-  "rich",
-  "typer",
+  "typer>=0.15",
 ]
 
 [project.urls]

{hydraflow-0.13.0 → hydraflow-0.14.0}/src/hydraflow/cli.py

@@ -3,14 +3,15 @@
 from __future__ import annotations
 
 import shlex
-from typing import Annotated
+from typing import TYPE_CHECKING, Annotated
 
 import typer
-from rich.console import Console
-from typer import Argument, Option
+from typer import Argument, Exit, Option
+
+if TYPE_CHECKING:
+    from hydraflow.executor.conf import Job
 
 app = typer.Typer(add_completion=False)
-console = Console()
 
 
 @app.command(context_settings={"ignore_unknown_options": True})
@@ -33,6 +34,10 @@ def run(
     args = args or []
     job = get_job(name)
 
+    if job.submit:
+        submit(job, args, dry_run=dry_run)
+        raise Exit
+
     if job.run:
         args = [*shlex.split(job.run), *args]
         it = iter_runs(args, iter_batches(job), dry_run=dry_run)
@@ -41,7 +46,7 @@ def run(
         it = iter_calls(args, iter_batches(job), dry_run=dry_run)
     else:
         typer.echo(f"No command found in job: {job.name}.")
-        raise typer.Exit(1)
+        raise Exit(1)
 
     if not dry_run:
         import mlflow
@@ -57,36 +62,16 @@ def run(
             typer.echo(f"{funcname}([{arg}])")
 
 
-@app.command(context_settings={"ignore_unknown_options": True})
-def submit(
-    name: Annotated[str, Argument(help="Job name.", show_default=False)],
-    *,
-    args: Annotated[
-        list[str] | None,
-        Argument(help="Arguments to pass to the job.", show_default=False),
-    ] = None,
-    dry_run: Annotated[
-        bool,
-        Option("--dry-run", help="Perform a dry run."),
-    ] = False,
-) -> None:
+def submit(job: Job, args: list[str], *, dry_run: bool) -> None:
     """Submit a job."""
-    from hydraflow.executor.io import get_job
     from hydraflow.executor.job import iter_batches, submit
 
-    args = args or []
-    job = get_job(name)
-
-    if not job.run:
-        typer.echo(f"No run found in job: {job.name}.")
-        raise typer.Exit(1)
-
     if not dry_run:
         import mlflow
 
         mlflow.set_experiment(job.name)
 
-    args = [*shlex.split(job.run), *args]
+    args = [*shlex.split(job.submit), *args]
     result = submit(args, iter_batches(job), dry_run=dry_run)
 
     if dry_run and isinstance(result, tuple):
@@ -124,4 +109,4 @@ def callback(
         import importlib.metadata
 
         typer.echo(f"hydraflow {importlib.metadata.version('hydraflow')}")
-        raise typer.Exit
+        raise Exit

{hydraflow-0.13.0 → hydraflow-0.14.0}/src/hydraflow/executor/conf.py

@@ -15,6 +15,7 @@ class Job:
     name: str = ""
     run: str = ""
     call: str = ""
+    submit: str = ""
     with_: str = ""
     steps: list[Step] = field(default_factory=list)
 

{hydraflow-0.13.0 → hydraflow-0.14.0}/tests/cli/hydraflow.yaml

@@ -28,7 +28,7 @@ jobs:
       - batch: name=c,d
         args: count=4:6
   submit:
-    run: python submit.py
+    submit: python submit.py
     steps:
       - batch: name=a,b
         args: count=1

{hydraflow-0.13.0 → hydraflow-0.14.0}/tests/cli/test_run.py

@@ -54,7 +54,7 @@ def test_run_echo_dry_run():
 
 
 def test_submit_dry_run():
-    args = ["submit", "submit", "--dry-run", "a", "--b", "--", "--dry-run"]
+    args = ["run", "submit", "--dry-run", "a", "--b", "--", "--dry-run"]
     result = runner.invoke(app, args)
     assert result.exit_code == 0
     assert result.stdout.count("submit.py a --b --dry-run --multirun") == 4
@@ -99,7 +99,7 @@ def test_run_echo():
 
 @pytest.mark.xdist_group(name="group4")
 def test_submit():
-    result = runner.invoke(app, ["submit", "submit"])
+    result = runner.invoke(app, ["run", "submit"])
     assert result.exit_code == 0
     out = result.stdout
     lines = out.splitlines()
@@ -113,10 +113,3 @@ def test_run_error():
     result = runner.invoke(app, ["run", "error"])
     assert result.exit_code == 1
     assert "No command found in job: error." in result.stdout
-
-
-@pytest.mark.xdist_group(name="group5")
-def test_submit_error():
-    result = runner.invoke(app, ["submit", "error"])
-    assert result.exit_code == 1
-    assert "No run found in job: error." in result.stdout