dh-cli 0.7.0__tar.gz → 0.8.0__tar.gz

{dh_cli-0.7.0 → dh_cli-0.8.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dh-cli
-Version: 0.7.0
+Version: 0.8.0
 Summary: Dayhoff Labs developer CLI
 Author-email: Dayhoff Labs <dev@dayhofflabs.com>
 License: # PolyForm Noncommercial License 1.0.0

{dh_cli-0.7.0 → dh_cli-0.8.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "dh-cli"
-version = "0.7.0"
+version = "0.8.0"
 description = "Dayhoff Labs developer CLI"
 requires-python = ">=3.11"
 readme = "README.md"

{dh_cli-0.7.0 → dh_cli-0.8.0}/src/dh_cli/batch/aws_batch.py

@@ -124,7 +124,7 @@ class BatchClient:
                 resource_requirements.append({"type": "VCPU", "value": str(vcpus)})
             if memory_mb is not None:
                 resource_requirements.append({"type": "MEMORY", "value": str(memory_mb)})
-            if gpus is not None:
+            if gpus not in (None, 0):
                 resource_requirements.append({"type": "GPU", "value": str(gpus)})
 
             container_overrides: dict[str, Any] = {}

{dh_cli-0.7.0 → dh_cli-0.8.0}/src/dh_cli/batch/commands/submit.py

@@ -71,7 +71,7 @@ def submit(
       queue: t4-1x-spot
       memory: 30G
       vcpus: 8
-      gpus: 1
+      gpus: 1              # omit, set to 0, or null for CPU-only
       array: 10
       retry: 3
       timeout: 6h
@@ -113,11 +113,12 @@ def submit(
     timeout_seconds = _parse_timeout(job_timeout)
 
     # Show plan
+    gpus_display = "no GPUs" if job_gpus in (None, 0) else f"{job_gpus} GPUs"
     click.echo()
     click.echo(f"Job ID:      {job_id}")
     click.echo(f"Command:     {job_command}")
     click.echo(f"Queue:       {job_queue}")
-    click.echo(f"Resources:   {job_vcpus} vCPUs, {job_memory} memory, {job_gpus} GPUs")
+    click.echo(f"Resources:   {job_vcpus} vCPUs, {job_memory} memory, {gpus_display}")
     click.echo(f"Array Size:  {job_array}")
     click.echo(f"Retry:       {job_retry}")
     click.echo(f"Timeout:     {job_timeout} ({timeout_seconds}s)")

dh_cli-0.8.0/tests/batch/test_aws_batch_resources.py

@@ -0,0 +1,92 @@
+"""Tests for BatchClient resource-requirement construction.
+
+These tests mock only boto3.client("batch") and assert on the
+submit_args passed to submit_job. They pin the GPU-handling contract:
+gpus=None and gpus=0 both mean "no GPU requirement"; positive values
+are forwarded verbatim.
+"""
+
+from unittest.mock import MagicMock, patch
+
+
+def _make_client():
+    """Construct a BatchClient with mocked boto3 batch/logs clients."""
+    with patch("dh_cli.batch.aws_batch.boto3") as mock_boto3:
+        mock_batch = MagicMock()
+        mock_logs = MagicMock()
+        mock_boto3.client.side_effect = [mock_batch, mock_logs]
+        mock_batch.submit_job.return_value = {"jobId": "aws-uuid"}
+
+        from dh_cli.batch.aws_batch import BatchClient
+
+        client = BatchClient()
+        return client, mock_batch
+
+
+def _get_gpu_resource(submit_args):
+    """Extract the GPU resourceRequirement entry from submit_args, or None."""
+    overrides = submit_args.get("containerOverrides", {})
+    for req in overrides.get("resourceRequirements", []):
+        if req.get("type") == "GPU":
+            return req
+    return None
+
+
+class TestGpuResourceRequirement:
+    """gpus=None and gpus=0 must both omit the GPU resource requirement."""
+
+    def test_gpus_none_omits_gpu_resource(self):
+        client, mock_batch = _make_client()
+        client.submit_job(
+            job_name="j",
+            job_definition="dayhoff-generic",
+            job_queue="cpu-spot",
+            vcpus=4,
+            memory_mb=8192,
+            gpus=None,
+            command=["sh", "-c", "echo hi"],
+        )
+        submit_args = mock_batch.submit_job.call_args[1]
+        assert _get_gpu_resource(submit_args) is None
+
+    def test_gpus_zero_omits_gpu_resource(self):
+        client, mock_batch = _make_client()
+        client.submit_job(
+            job_name="j",
+            job_definition="dayhoff-generic",
+            job_queue="cpu-spot",
+            vcpus=4,
+            memory_mb=8192,
+            gpus=0,
+            command=["sh", "-c", "echo hi"],
+        )
+        submit_args = mock_batch.submit_job.call_args[1]
+        assert _get_gpu_resource(submit_args) is None
+
+    def test_gpus_one_includes_gpu_resource(self):
+        client, mock_batch = _make_client()
+        client.submit_job(
+            job_name="j",
+            job_definition="dayhoff-generic",
+            job_queue="t4-1x-spot",
+            vcpus=4,
+            memory_mb=8192,
+            gpus=1,
+            command=["sh", "-c", "echo hi"],
+        )
+        submit_args = mock_batch.submit_job.call_args[1]
+        assert _get_gpu_resource(submit_args) == {"type": "GPU", "value": "1"}
+
+    def test_gpus_two_includes_gpu_resource(self):
+        client, mock_batch = _make_client()
+        client.submit_job(
+            job_name="j",
+            job_definition="dayhoff-generic",
+            job_queue="t4-1x-spot",
+            vcpus=4,
+            memory_mb=8192,
+            gpus=2,
+            command=["sh", "-c", "echo hi"],
+        )
+        submit_args = mock_batch.submit_job.call_args[1]
+        assert _get_gpu_resource(submit_args) == {"type": "GPU", "value": "2"}

dh_cli-0.8.0/tests/batch/test_submit_cpu_only.py

@@ -0,0 +1,162 @@
+"""Tests for CPU-only submission paths through the CLI.
+
+Uses Click's CliRunner with BatchClient.submit_job mocked. Pins the
+contract: users can express "no GPU" via --gpus 0, YAML gpus: 0, or
+YAML gpus: null; the implicit --gpus 1 default still applies when
+nothing is specified; and the dry-run echo reads "no GPUs" rather
+than "None GPUs" or "0 GPUs".
+"""
+
+from unittest.mock import MagicMock, patch
+
+import pytest
+import yaml
+from click.testing import CliRunner
+
+
+@pytest.fixture
+def cli_runner():
+    return CliRunner()
+
+
+def _invoke(cli_runner, args, tmp_path):
+    """Invoke submit with BatchClient mocked and base-path tucked under tmp_path."""
+    base = tmp_path / "jobs"
+    with (
+        patch("dh_cli.batch.commands.submit.get_aws_username", return_value="jason"),
+        patch("dh_cli.batch.commands.submit.BatchClient") as mock_batch_cls,
+        patch(
+            "dh_cli.batch.commands.submit.generate_job_id",
+            return_value="jason-batch-20260511-cpu00001",
+        ),
+    ):
+        mock_client = MagicMock()
+        mock_client.submit_job.return_value = "aws-uuid-cpu"
+        mock_batch_cls.return_value = mock_client
+
+        from dh_cli.batch.commands.submit import submit
+
+        result = cli_runner.invoke(submit, args + ["--base-path", str(base)])
+        return result, mock_client
+
+
+class TestCpuOnlySubmissionPaths:
+    """--gpus 0, YAML gpus: 0, and YAML gpus: null must all submit with no GPU."""
+
+    def test_cli_gpus_zero_sends_no_gpu_requirement(self, cli_runner, tmp_path):
+        result, mock_client = _invoke(
+            cli_runner,
+            ["--command", "echo hi", "--queue", "cpu-spot", "--gpus", "0"],
+            tmp_path,
+        )
+        assert result.exit_code == 0, result.output
+        call_kwargs = mock_client.submit_job.call_args[1]
+        assert call_kwargs["gpus"] == 0
+
+    def test_yaml_gpus_zero_sends_no_gpu_requirement(self, cli_runner, tmp_path):
+        config_path = tmp_path / "job.yaml"
+        config_path.write_text(
+            yaml.dump(
+                {
+                    "command": "echo hi",
+                    "queue": "cpu-spot",
+                    "gpus": 0,
+                }
+            )
+        )
+        result, mock_client = _invoke(cli_runner, ["-f", str(config_path)], tmp_path)
+        assert result.exit_code == 0, result.output
+        call_kwargs = mock_client.submit_job.call_args[1]
+        assert call_kwargs["gpus"] == 0
+
+    def test_yaml_gpus_null_sends_no_gpu_requirement(self, cli_runner, tmp_path):
+        config_path = tmp_path / "job.yaml"
+        config_path.write_text(
+            yaml.dump(
+                {
+                    "command": "echo hi",
+                    "queue": "cpu-spot",
+                    "gpus": None,
+                }
+            )
+        )
+        result, mock_client = _invoke(cli_runner, ["-f", str(config_path)], tmp_path)
+        assert result.exit_code == 0, result.output
+        call_kwargs = mock_client.submit_job.call_args[1]
+        assert call_kwargs["gpus"] is None
+
+
+class TestGpuDefaultPreserved:
+    """Omitting --gpus and YAML gpus still gives the implicit GPU=1 default."""
+
+    def test_cli_gpus_omitted_gets_implicit_one(self, cli_runner, tmp_path):
+        result, mock_client = _invoke(cli_runner, ["--command", "echo hi"], tmp_path)
+        assert result.exit_code == 0, result.output
+        call_kwargs = mock_client.submit_job.call_args[1]
+        assert call_kwargs["gpus"] == 1
+
+    def test_cli_gpus_one_still_works(self, cli_runner, tmp_path):
+        result, mock_client = _invoke(cli_runner, ["--command", "echo hi", "--gpus", "1"], tmp_path)
+        assert result.exit_code == 0, result.output
+        call_kwargs = mock_client.submit_job.call_args[1]
+        assert call_kwargs["gpus"] == 1
+
+    def test_yaml_gpus_one_still_works(self, cli_runner, tmp_path):
+        config_path = tmp_path / "job.yaml"
+        config_path.write_text(yaml.dump({"command": "echo hi", "gpus": 1}))
+        result, mock_client = _invoke(cli_runner, ["-f", str(config_path)], tmp_path)
+        assert result.exit_code == 0, result.output
+        call_kwargs = mock_client.submit_job.call_args[1]
+        assert call_kwargs["gpus"] == 1
+
+
+class TestCliBeatsYamlOnZero:
+    """--gpus 0 on the CLI must beat YAML gpus: 1."""
+
+    def test_cli_gpus_zero_overrides_yaml_one(self, cli_runner, tmp_path):
+        config_path = tmp_path / "job.yaml"
+        config_path.write_text(yaml.dump({"command": "echo hi", "gpus": 1}))
+        result, mock_client = _invoke(cli_runner, ["-f", str(config_path), "--gpus", "0"], tmp_path)
+        assert result.exit_code == 0, result.output
+        call_kwargs = mock_client.submit_job.call_args[1]
+        assert call_kwargs["gpus"] == 0
+
+
+class TestDryRunEcho:
+    """The dry-run plan line must read 'no GPUs' or 'N GPUs', never 'None'/'0 GPUs'."""
+
+    def test_dry_run_echo_reads_no_gpus_when_gpus_zero(self, cli_runner, tmp_path):
+        result, _ = _invoke(
+            cli_runner,
+            [
+                "--command",
+                "echo hi",
+                "--queue",
+                "cpu-spot",
+                "--gpus",
+                "0",
+                "--dry-run",
+            ],
+            tmp_path,
+        )
+        assert result.exit_code == 0, result.output
+        assert "no GPUs" in result.output
+        assert "None GPUs" not in result.output
+        assert "0 GPUs" not in result.output
+
+    def test_dry_run_echo_reads_no_gpus_when_yaml_gpus_null(self, cli_runner, tmp_path):
+        config_path = tmp_path / "job.yaml"
+        config_path.write_text(yaml.dump({"command": "echo hi", "queue": "cpu-spot", "gpus": None}))
+        result, _ = _invoke(cli_runner, ["-f", str(config_path), "--dry-run"], tmp_path)
+        assert result.exit_code == 0, result.output
+        assert "no GPUs" in result.output
+        assert "None GPUs" not in result.output
+
+    def test_dry_run_echo_reads_n_gpus_when_gpus_positive(self, cli_runner, tmp_path):
+        result, _ = _invoke(
+            cli_runner,
+            ["--command", "echo hi", "--gpus", "2", "--dry-run"],
+            tmp_path,
+        )
+        assert result.exit_code == 0, result.output
+        assert "2 GPUs" in result.output