[CLI] Show RESOURCES only in verbose mode, otherwise only show GPU. Also move (spot) to `PRICE.

Author: peterschmidt85

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

@@ -189,7 +189,7 @@ def _get_run_status_style(status: RunStatus, status_message: Optional[str] = Non
         RunStatus.SUBMITTED: "grey",
         RunStatus.PROVISIONING: "deep_sky_blue1",
         RunStatus.RUNNING: "sea_green3",
-        RunStatus.TERMINATING: "white",
+        RunStatus.TERMINATING: "deep_sky_blue1",
         RunStatus.TERMINATED: "grey",
         RunStatus.FAILED: "indian_red1",
         RunStatus.DONE: "grey",
@@ -218,7 +218,7 @@ def _get_job_status_style(status_message: str, job_status: JobStatus) -> str:
             JobStatus.PROVISIONING: "deep_sky_blue1",
             JobStatus.PULLING: "sea_green3",
             JobStatus.RUNNING: "sea_green3",
-            JobStatus.TERMINATING: "white",
+            JobStatus.TERMINATING: "deep_sky_blue1",
             JobStatus.TERMINATED: "grey",
             JobStatus.ABORTED: "gold1",
             JobStatus.FAILED: "indian_red1",
@@ -237,9 +237,12 @@ def get_runs_table(
     table = Table(box=None, expand=shutil.get_terminal_size(fallback=(120, 40)).columns <= 110)
     table.add_column("NAME", style="bold", no_wrap=True, ratio=2)
     table.add_column("BACKEND", style="grey58", ratio=2)
-    table.add_column("RESOURCES", ratio=3 if not verbose else 2)
     if verbose:
-        table.add_column("INSTANCE TYPE", no_wrap=True, ratio=1)
+        table.add_column("RESOURCES", style="grey58", ratio=3)
+    else:
+        table.add_column("GPU", ratio=2)
+    if verbose:
+        table.add_column("INSTANCE TYPE", style="grey58", no_wrap=True, ratio=1)
     table.add_column("PRICE", style="grey58", ratio=1)
     table.add_column("STATUS", no_wrap=True, ratio=1)
     if verbose or any(
@@ -270,11 +273,14 @@ def get_runs_table(
             run.status, status_message=status_text if run.status.is_finished() else status_text
         )
 
+        resource_key = "RESOURCES" if verbose else "GPU"
         run_row: Dict[Union[str, int], Any] = {
             "NAME": run.run_spec.run_name
             + (f" [secondary]deployment={run.deployment_num}[/]" if show_deployment_num else ""),
             "SUBMITTED": format_date(run.submitted_at),
             "STATUS": f"[{status_style}]{status_text}[/]",
+            resource_key: "-",  # Default value when no provisioning data
+            "PRICE": "-",  # Default value when no provisioning data
         }
         if run.error:
             run_row["ERROR"] = run.error
@@ -303,6 +309,8 @@ def get_runs_table(
                 ),
                 "SUBMITTED": format_date(latest_job_submission.submitted_at),
                 "ERROR": latest_job_submission.error,
+                resource_key: "-",  # Initialize with default, will be updated if provisioning data exists
+                "PRICE": "-",  # Initialize with default, will be updated if provisioning data exists
             }
             jpd = latest_job_submission.job_provisioning_data
             if jpd is not None:
@@ -315,16 +323,28 @@ def get_runs_table(
                         instance_type += f" ({jrd.offer.blocks}/{jrd.offer.total_blocks})"
                 if jpd.reservation:
                     instance_type += f" ({jpd.reservation})"
-                job_row.update(
-                    {
-                        "BACKEND": f"{jpd.backend.value.replace('remote', 'ssh')} ({jpd.region})",
-                        "RESOURCES": resources.pretty_format(include_spot=True),
-                        "INSTANCE TYPE": instance_type,
-                        "PRICE": f"${jpd.price:.4f}".rstrip("0").rstrip("."),
-                    }
+                resource_value = (
+                    resources.pretty_format(include_spot=False)
+                    if verbose
+                    else resources.pretty_format(gpu_only=True, include_spot=False)
                 )
+                price_str = f"${jpd.price:.4f}".rstrip("0").rstrip(".")
+                if resources.spot:
+                    price_str += " (spot)"
+                update_dict: Dict[Union[str, int], Any] = {
+                    "BACKEND": f"{jpd.backend.value.replace('remote', 'ssh')} ({jpd.region})",
+                    resource_key: resource_value,
+                    "INSTANCE TYPE": instance_type,
+                    "PRICE": price_str,
+                }
+                job_row.update(update_dict)
             if merge_job_rows:
+                # Merge run_row into job_row, but preserve job_row's resource_key if it was set
+                resource_value = job_row.get(resource_key, "-")
+                price_value = job_row.get("PRICE", "")
                 job_row.update(run_row)
+                job_row[resource_key] = resource_value  # Restore job-specific resource value
+                job_row["PRICE"] = price_value  # Restore job-specific price value
                 job_row["STATUS"] = run_row["STATUS"]
             add_row_from_dict(table, job_row, style="secondary" if len(run.jobs) != 1 else None)
 

src/dstack/_internal/core/models/instances.py

@@ -83,7 +83,23 @@ def _pretty_format(
         gpus: List[Gpu],
         spot: bool,
         include_spot: bool = False,
+        gpu_only: bool = False,
     ) -> str:
+        if gpu_only:
+            if not gpus:
+                return "-"
+            gpu = gpus[0]
+            gpu_resources = {
+                "gpu_name": gpu.name,
+                "gpu_count": len(gpus),
+            }
+            if gpu.memory_mib > 0:
+                gpu_resources["gpu_memory"] = f"{gpu.memory_mib / 1024:.0f}GB"
+            output = pretty_resources(**gpu_resources)
+            if include_spot and spot:
+                output += " (spot)"
+            return output
+
         resources = {}
         if cpus > 0:
             resources["cpus"] = cpus
@@ -103,7 +119,7 @@ def _pretty_format(
             output += " (spot)"
         return output
 
-    def pretty_format(self, include_spot: bool = False) -> str:
+    def pretty_format(self, include_spot: bool = False, gpu_only: bool = False) -> str:
         return Resources._pretty_format(
             self.cpus,
             self.cpu_arch,
@@ -112,6 +128,7 @@ def pretty_format(self, include_spot: bool = False) -> str:
             self.gpus,
             self.spot,
             include_spot,
+            gpu_only,
         )
 
 

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

@@ -114,6 +114,8 @@ async def create_run_with_job(
             run_status = RunStatus.FAILED
         elif job_status in [JobStatus.TERMINATED, JobStatus.ABORTED]:
             run_status = RunStatus.TERMINATED
+        elif job_status == JobStatus.TERMINATING:
+            run_status = RunStatus.TERMINATING
         elif job_status == JobStatus.PROVISIONING:
             run_status = RunStatus.PROVISIONING
         elif job_status == JobStatus.PULLING:
@@ -268,6 +270,7 @@ async def test_simple_run(self, session: AsyncSession):
             (JobStatus.RUNNING, None, None, "running", "bold sea_green3"),
             (JobStatus.PROVISIONING, None, None, "provisioning", "bold deep_sky_blue1"),
             (JobStatus.PULLING, None, None, "pulling", "bold sea_green3"),
+            (JobStatus.TERMINATING, None, None, "terminating", "bold deep_sky_blue1"),
         ],
     )
     async def test_status_messages(