[CLI] Show replica=... and job=... only when needed.

Author: peterschmidt85

src/dstack/_internal/cli/utils/run.py

@@ -287,6 +287,23 @@ def get_runs_table(
         if not merge_job_rows:
             add_row_from_dict(table, run_row)
 
+        # Determine if we need to show replica= and job= fields
+        replica_nums = {job.job_spec.replica_num for job in run.jobs}
+        show_replica = len(replica_nums) > 1  # Show if there are multiple different replicas
+
+        # Group jobs by replica to check if each replica has multiple jobs
+        jobs_by_replica: Dict[int, List[Any]] = {}
+        for job in run.jobs:
+            replica_num = job.job_spec.replica_num
+            if replica_num not in jobs_by_replica:
+                jobs_by_replica[replica_num] = []
+            jobs_by_replica[replica_num].append(job)
+
+        # Check if any replica has multiple different job_nums
+        show_job = any(
+            len({j.job_spec.job_num for j in jobs}) > 1 for jobs in jobs_by_replica.values()
+        )
+
         for job in run.jobs:
             latest_job_submission = job.job_submissions[-1]
             status = latest_job_submission.status.value
@@ -296,13 +313,23 @@ def get_runs_table(
             status_text = latest_job_submission.status_message
             status_style = _get_job_status_style(status_text, latest_job_submission.status)
 
+            # Build NAME field conditionally showing replica= and job=
+            name_parts = []
+            if show_replica:
+                name_parts.append(f"replica={job.job_spec.replica_num}")
+            if show_job:
+                name_parts.append(f"job={job.job_spec.job_num}")
+            name_suffix = (
+                f" deployment={latest_job_submission.deployment_num}"
+                if show_deployment_num
+                else ""
+            )
+            # Always include indentation for job rows, even if there are no parts
+            name_value = "  " + (" ".join(name_parts) if name_parts else "")
+            name_value += name_suffix
+
             job_row: Dict[Union[str, int], Any] = {
-                "NAME": f"  replica={job.job_spec.replica_num} job={job.job_spec.job_num}"
-                + (
-                    f" deployment={latest_job_submission.deployment_num}"
-                    if show_deployment_num
-                    else ""
-                ),
+                "NAME": name_value,
                 "STATUS": f"[{status_style}]{status_text}[/]",
                 "PROBES": _format_job_probes(
                     job.job_spec.probes, latest_job_submission.probes, latest_job_submission.status

src/tests/_internal/cli/utils/test_run.py

@@ -12,9 +12,14 @@
 
 from dstack._internal.cli.utils.run import get_runs_table
 from dstack._internal.core.models.backends.base import BackendType
-from dstack._internal.core.models.configurations import AnyRunConfiguration, TaskConfiguration
+from dstack._internal.core.models.configurations import (
+    AnyRunConfiguration,
+    ServiceConfiguration,
+    TaskConfiguration,
+)
 from dstack._internal.core.models.instances import Disk, InstanceType, Resources
 from dstack._internal.core.models.profiles import Profile
+from dstack._internal.core.models.resources import Range
 from dstack._internal.core.models.runs import (
     JobProvisioningData,
     JobStatus,
@@ -297,3 +302,220 @@ async def test_status_messages(
 
         status_style = get_table_cell_style(table, "STATUS", 0)
         assert status_style == expected_style
+
+    async def test_multi_node_task_with_multiple_jobs(self, session: AsyncSession):
+        """Test that a multi-node task with multiple jobs shows replica= and job= in table rows."""
+        submitted_at = datetime(2023, 1, 2, 3, 4, 5, tzinfo=timezone.utc)
+
+        project = await create_project(session=session)
+        user = await create_user(session=session)
+        repo = await create_repo(session=session, project_id=project.id)
+
+        # Create a multi-node task configuration (3 nodes)
+        configuration = TaskConfiguration(
+            type="task",
+            image="ubuntu:latest",
+            commands=["echo hello"],
+            nodes=3,
+        )
+
+        run_spec = get_run_spec(
+            run_name="multi-node-run",
+            repo_id=repo.name,
+            profile=Profile(name="default"),
+            configuration=configuration,
+        )
+
+        run_model_db = await create_run(
+            session=session,
+            project=project,
+            repo=repo,
+            user=user,
+            run_name="multi-node-run",
+            run_spec=run_spec,
+            status=RunStatus.RUNNING,
+            submitted_at=submitted_at,
+        )
+
+        # Create 3 jobs, all with replica_num=0 but different job_num values
+        resources = Resources(
+            cpus=2,
+            memory_mib=4096,
+            gpus=[],
+            spot=False,
+            disk=Disk(size_mib=102400),
+        )
+        instance_type = InstanceType(name="t2.medium", resources=resources)
+        job_provisioning_data = get_job_provisioning_data(
+            backend=BackendType.AWS,
+            region="us-east-1",
+            cpu_count=2,
+            memory_gib=4,
+            spot=False,
+            hostname="1.2.3.4",
+            price=0.0464,
+            instance_type=instance_type,
+        )
+
+        # Create 3 jobs: all replica_num=0, job_num=0,1,2
+        for job_num in range(3):
+            await create_job(
+                session=session,
+                run=run_model_db,
+                status=JobStatus.RUNNING,
+                submitted_at=submitted_at,
+                last_processed_at=submitted_at,
+                job_provisioning_data=job_provisioning_data,
+                replica_num=0,
+                job_num=job_num,
+            )
+
+        await session.refresh(run_model_db)
+
+        res = await session.execute(
+            select(RunModel)
+            .where(RunModel.id == run_model_db.id)
+            .options(selectinload(RunModel.jobs))
+        )
+        run_model_db = res.scalar_one()
+
+        run_model = run_model_to_run(run_model_db)
+
+        api_run = Run(
+            api_client=Mock(spec=APIClient),
+            project=project.name,
+            run=run_model,
+        )
+
+        table = get_runs_table([api_run], verbose=False)
+        cells = get_table_cells(table)
+
+        # Should have 4 rows: 1 run header + 3 job rows
+        assert len(cells) == 4
+
+        # First row should be the run header
+        assert cells[0]["NAME"] == "multi-node-run"
+
+        # Next 3 rows should be job rows with job=0,1,2 (replica= should NOT be shown since all jobs have same replica)
+        for i in range(1, 4):
+            job_row = cells[i]
+            assert (
+                "replica=" not in job_row["NAME"]
+            )  # Should not show replica since all are replica=0
+            assert f"job={i - 1}" in job_row["NAME"]
+            assert job_row["STATUS"] == "running"
+
+    async def test_service_with_multiple_replicas_and_jobs(self, session: AsyncSession):
+        """Test that a service with multiple replicas and jobs shows different replica= and same job= in table rows."""
+        submitted_at = datetime(2023, 1, 2, 3, 4, 5, tzinfo=timezone.utc)
+
+        project = await create_project(session=session)
+        user = await create_user(session=session)
+        repo = await create_repo(session=session, project_id=project.id)
+
+        # Create a service configuration with 3 replicas
+        configuration = ServiceConfiguration(
+            type="service",
+            image="ubuntu:latest",
+            commands=["echo hello"],
+            port=8000,
+            replicas=Range[int](min=3, max=3),
+        )
+
+        run_spec = get_run_spec(
+            run_name="service-run",
+            repo_id=repo.name,
+            profile=Profile(name="default"),
+            configuration=configuration,
+        )
+
+        run_model_db = await create_run(
+            session=session,
+            project=project,
+            repo=repo,
+            user=user,
+            run_name="service-run",
+            run_spec=run_spec,
+            status=RunStatus.RUNNING,
+            submitted_at=submitted_at,
+        )
+
+        # Create jobs: 3 replicas, 2 jobs per replica
+        # replica=0: job=0, job=1
+        # replica=1: job=0, job=1
+        # replica=2: job=0, job=1
+        resources = Resources(
+            cpus=2,
+            memory_mib=4096,
+            gpus=[],
+            spot=False,
+            disk=Disk(size_mib=102400),
+        )
+        instance_type = InstanceType(name="t2.medium", resources=resources)
+        job_provisioning_data = get_job_provisioning_data(
+            backend=BackendType.AWS,
+            region="us-east-1",
+            cpu_count=2,
+            memory_gib=4,
+            spot=False,
+            hostname="1.2.3.4",
+            price=0.0464,
+            instance_type=instance_type,
+        )
+
+        # Create 3 replicas, each with 2 jobs
+        for replica_num in range(3):
+            for job_num in range(2):
+                await create_job(
+                    session=session,
+                    run=run_model_db,
+                    status=JobStatus.RUNNING,
+                    submitted_at=submitted_at,
+                    last_processed_at=submitted_at,
+                    job_provisioning_data=job_provisioning_data,
+                    replica_num=replica_num,
+                    job_num=job_num,
+                )
+
+        await session.refresh(run_model_db)
+
+        res = await session.execute(
+            select(RunModel)
+            .where(RunModel.id == run_model_db.id)
+            .options(selectinload(RunModel.jobs))
+        )
+        run_model_db = res.scalar_one()
+
+        run_model = run_model_to_run(run_model_db)
+
+        api_run = Run(
+            api_client=Mock(spec=APIClient),
+            project=project.name,
+            run=run_model,
+        )
+
+        table = get_runs_table([api_run], verbose=False)
+        cells = get_table_cells(table)
+
+        # Should have 7 rows: 1 run header + 6 job rows (3 replicas × 2 jobs)
+        assert len(cells) == 7
+
+        # First row should be the run header
+        assert cells[0]["NAME"] == "service-run"
+
+        # Next 6 rows should be job rows with both replica= and job= (since there are multiple replicas and multiple jobs per replica)
+        # Expected order: replica=0 job=0, replica=0 job=1, replica=1 job=0, replica=1 job=1, replica=2 job=0, replica=2 job=1
+        expected_jobs = [
+            (0, 0),
+            (0, 1),
+            (1, 0),
+            (1, 1),
+            (2, 0),
+            (2, 1),
+        ]
+
+        for i, (expected_replica, expected_job) in enumerate(expected_jobs, start=1):
+            job_row = cells[i]
+            assert f"replica={expected_replica}" in job_row["NAME"]
+            assert f"job={expected_job}" in job_row["NAME"]
+            assert job_row["STATUS"] == "running"