hydraflow 0.13.0__py3-none-any.whl → 0.14.0__py3-none-any.whl

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

@@ -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.dist-info → hydraflow-0.14.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
 hydraflow/__init__.py,sha256=f2KO2iF7um-nNmayNyEr7TWG4UICOXy7YAN1d3qu0OY,936
-hydraflow/cli.py,sha256=nGFrZeQnn1h7lCbVhjBJwdrcDDGoqYpVFbqqwkLMzng,3385
+hydraflow/cli.py,sha256=LrRHXiYln1OcH27Bf3Xf-5sesLl-eVV3YS8ZFJFpWa0,2942
 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
@@ -13,12 +13,12 @@ hydraflow/entities/run_collection.py,sha256=4sfZWXaS7kqnVCo9GyB3pN6BaSUCkA-ZqSSl
 hydraflow/entities/run_data.py,sha256=lz8HPxG0iz1Jf9FU6HTFW4gcAc3N2pgMyAPqAIK6I74,1644
 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=2dv6_PlsynRmia-fGZlmBEVt8GopT0f32N13qY7tYnM,402
+hydraflow/executor/conf.py,sha256=icGbLDh86KgkyiGXwDoEkmZpgAP3X8Jmu_PYqJoTooY,423
 hydraflow/executor/io.py,sha256=yZMcBVmAbPZZ82cAXhgiJfj9p8WvHmzOCMBg_vtEVek,1509
 hydraflow/executor/job.py,sha256=bmjlqE-cE7lyNFFKj1nUhxiQHKf7DsFkCSTD9iTEQ5I,5606
 hydraflow/executor/parser.py,sha256=_Rfund3FDgrXitTt_znsTpgEtMDqZ_ICynaB_Zje14Q,14561
-hydraflow-0.13.0.dist-info/METADATA,sha256=DcBL4IuQHdGIyEXTqFoDGlUdI2sgH0THpTuyFoB3Wg0,4549
-hydraflow-0.13.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-hydraflow-0.13.0.dist-info/entry_points.txt,sha256=XI0khPbpCIUo9UPqkNEpgh-kqK3Jy8T7L2VCWOdkbSM,48
-hydraflow-0.13.0.dist-info/licenses/LICENSE,sha256=IGdDrBPqz1O0v_UwCW-NJlbX9Hy9b3uJ11t28y2srmY,1062
-hydraflow-0.13.0.dist-info/RECORD,,
+hydraflow-0.14.0.dist-info/METADATA,sha256=8u8nSvKmLBhIfw4QWX9DpfC56wbb0_Dnhg1WTjBwazw,4540
+hydraflow-0.14.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+hydraflow-0.14.0.dist-info/entry_points.txt,sha256=XI0khPbpCIUo9UPqkNEpgh-kqK3Jy8T7L2VCWOdkbSM,48
+hydraflow-0.14.0.dist-info/licenses/LICENSE,sha256=IGdDrBPqz1O0v_UwCW-NJlbX9Hy9b3uJ11t28y2srmY,1062
+hydraflow-0.14.0.dist-info/RECORD,,