refactor(cli): restructure to resource-based hierarchy

Move CLI commands to `dirac job submit {cwl,cmd,jdl}` hierarchy:
- dirac cwl submit → dirac job submit cwl
- dirac submit → dirac job submit cmd
- dirac jobs submit (JDL) → dirac job submit jdl

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: ryuwd

diracx-cli/pyproject.toml

@@ -42,7 +42,6 @@ dirac-cwl-run = "diracx.cli.executor.__main__:cli"
 job = "diracx.cli.job:app"
 jobs = "diracx.cli.jobs:app"
 config = "diracx.cli.config:app"
-cwl = "diracx.cli.cwl:app"
 
 [project.entry-points."diracx.cli.hidden"]
 internal = "diracx.cli.internal:app"

diracx-cli/src/diracx/cli/__init__.py

@@ -3,13 +3,9 @@
 from diracx.core.extensions import DiracEntryPoint, select_from_extension
 
 from .auth import app
-from .submit import register_submit
 
 __all__ = ("app",)
 
-# Register top-level submit command
-register_submit(app)
-
 # Load all the sub commands
 cli_names = set(
     [

diracx-cli/src/diracx/cli/cwl/__init__.py

@@ -3,8 +3,10 @@
 __all__ = ("app",)
 
 from ..utils import AsyncTyper
+from .submit import app as submit_app
 
 app = AsyncTyper(help="Job operations.")
+app.add_typer(submit_app, name="submit")
 
 # Import submodules to register commands
 from . import search as _search  # noqa: F401, E402

diracx-cli/src/diracx/cli/job/__init__.py

@@ -0,0 +1,12 @@
+from __future__ import annotations
+
+__all__ = ("app",)
+
+from ...utils import AsyncTyper
+
+app = AsyncTyper(help="Submit jobs to the grid.")
+
+# Import submodules to register commands
+from . import cmd as _cmd  # noqa: F401, E402
+from . import cwl as _cwl  # noqa: F401, E402
+from . import jdl as _jdl  # noqa: F401, E402

diracx-cli/src/diracx/cli/job/submit/__init__.py

@@ -0,0 +1,78 @@
+from __future__ import annotations
+
+__all__: list[str] = []
+
+import tempfile
+from pathlib import Path
+from typing import Annotated
+
+import typer
+import yaml
+
+from ..._submission.pipeline import submit_cwl
+from ..._submission.simple import detect_sandbox_files, generate_cwl
+from . import app
+
+
+@app.async_command(
+    help="""Submit a simple command to the grid.
+
+Runs COMMAND on a worker node. Local files referenced in the command
+are automatically detected and shipped as input sandboxes.
+
+Use --sandbox for additional files not mentioned in the command.
+
+Examples:
+  dirac job submit cmd "python my_script.py"
+  dirac job submit cmd "python my_script.py" --sandbox config.json
+""",
+)
+async def cmd(
+    command: Annotated[str, typer.Argument(help="Shell command to run on the grid")],
+    sandbox: Annotated[
+        list[Path],
+        typer.Option("--sandbox", help="Additional local files to ship"),
+    ] = [],
+    yes: Annotated[
+        bool, typer.Option("-y", "--yes", help="Skip confirmation prompt")
+    ] = False,
+):
+    """Submit a simple command to the grid."""
+    # Auto-detect files from command
+    auto_files = detect_sandbox_files(command)
+    all_sandbox = list(set(auto_files + sandbox))
+
+    # Generate CWL
+    cwl = generate_cwl(command=command, sandbox_files=all_sandbox)
+
+    # Write CWL to temp file (pipeline expects a Path)
+    with tempfile.NamedTemporaryFile(mode="w", suffix=".cwl", delete=False) as f:
+        yaml.dump(cwl, f)
+        cwl_path = Path(f.name)
+
+    try:
+        # Build sandbox inputs if files exist
+        input_files: list[Path] = []
+        if all_sandbox:
+            sandbox_input = {
+                "sandbox_files": [
+                    {"class": "File", "path": str(p)} for p in all_sandbox
+                ]
+            }
+            with tempfile.NamedTemporaryFile(
+                mode="w", suffix=".yaml", delete=False
+            ) as inp_f:
+                yaml.dump(sandbox_input, inp_f)
+                input_files = [Path(inp_f.name)]
+
+        results = await submit_cwl(
+            workflow=cwl_path,
+            input_files=input_files,
+            cli_args=[],
+            range_spec=None,
+            yes=yes,
+        )
+        job_ids = [str(r.job_id) for r in results]
+        print(f"Submitted {len(results)} job(s): {', '.join(job_ids)}")
+    finally:
+        cwl_path.unlink(missing_ok=True)

diracx-cli/src/diracx/cli/job/submit/cmd.py

@@ -7,7 +7,7 @@
 
 import typer
 
-from .._submission.pipeline import submit_cwl
+from ..._submission.pipeline import submit_cwl
 from . import app
 
 
@@ -21,14 +21,14 @@
 Workflow inputs can also be passed as CLI arguments after a -- separator.
 These are parsed against the workflow's declared input parameters:
 
-  dirac cwl submit workflow.cwl -- --message "hello" --count 42
+  dirac job submit cwl workflow.cwl -- --message "hello" --count 42
 
 Combine file inputs with CLI overrides:
 
-  dirac cwl submit workflow.cwl base.yaml -- --message "override"
+  dirac job submit cwl workflow.cwl base.yaml -- --message "override"
 """,
 )
-async def submit(
+async def cwl(
     ctx: typer.Context,
     workflow: Annotated[Path, typer.Argument(help="CWL workflow file (.cwl)")],
     range: Annotated[

diracx-cli/src/diracx/cli/cwl/submit.py …acx-cli/src/diracx/cli/job/submit/cwl.pydiracx-cli/src/diracx/cli/cwl/submit.py renamed to diracx-cli/src/diracx/cli/job/submit/cwl.py diracx-cli/src/diracx/cli/cwl/submit.py renamed to diracx-cli/src/diracx/cli/job/submit/cwl.py

@@ -0,0 +1,28 @@
+from __future__ import annotations
+
+__all__: list[str] = []
+
+from typer import FileText
+
+from diracx.client.aio import AsyncDiracClient
+
+from . import app
+
+
+@app.async_command(
+    help="""Submit jobs in JDL format.
+
+JDL is one or more JDL file paths.
+
+Examples:
+  dirac job submit jdl job.jdl
+  dirac job submit jdl job1.jdl job2.jdl
+""",
+)
+async def jdl(jdl: list[FileText]):
+    """Submit jobs in JDL format."""
+    async with AsyncDiracClient() as api:
+        jobs = await api.jobs.submit_jdl_jobs([x.read() for x in jdl])
+    print(
+        f"Inserted {len(jobs)} jobs with ids: {','.join(map(str, (job.job_id for job in jobs)))}"
+    )

diracx-cli/src/diracx/cli/job/submit/jdl.py

@@ -10,7 +10,7 @@
 
 from rich.console import Console
 from rich.table import Table
-from typer import FileText, Option
+from typer import Option
 
 from diracx.client.aio import AsyncDiracClient
 from diracx.core.models.search import (
@@ -151,12 +151,3 @@ def display_rich(data, content_range: ContentRange) -> None:
         for job in data:
             table.add_row(*map(str, job.values()))
     console.print(table)
-
-
-@app.async_command()
-async def submit(jdl: list[FileText]):
-    async with AsyncDiracClient() as api:
-        jobs = await api.jobs.submit_jdl_jobs([x.read() for x in jdl])
-    print(
-        f"Inserted {len(jobs)} jobs with ids: {','.join(map(str, (job.job_id for job in jobs)))}"
-    )