Remove mockup data (#70)

Author: hvdbm

cluv/cli/status.py

@@ -2,7 +2,6 @@
 
 import asyncio
 import logging
-import random
 from dataclasses import dataclass
 
 from rich import box
@@ -18,52 +17,6 @@
 logger = logging.getLogger(__name__)
 __all__ = ["status"]
 
-# ---------------------------------------------------------------------------
-# Data layer – replace these with real implementations later
-# ---------------------------------------------------------------------------
-
-CLUSTERS = (
-    "mila",
-    "narval",
-    "tamia",
-    "rorqual",
-    "fir",
-    "nibi",
-    "killarney",
-    "vulcan",
-    "trillium",
-)
-
-MOCK_DATA_SEED = 42  # deterministic seed so the display is reproducible
-OFFLINE_PROBABILITY = 0.08  # ~8 % chance of a cluster being down/maintenance
-
-
-# Rough GPU pool sizes per cluster (total GPUs available on the cluster).
-_GPU_TOTALS: dict[str, int] = {
-    "mila": 2048,
-    "narval": 1024,
-    "tamia": 512,
-    "rorqual": 768,
-    "fir": 640,
-    "nibi": 256,
-    "killarney": 384,
-    "vulcan": 512,
-    "trillium": 1280,
-}
-
-# Storage quota in GiB (home, scratch)
-_STORAGE_QUOTAS: dict[str, tuple[int, int]] = {
-    "mila": (50, 5000),
-    "narval": (50, 10000),
-    "tamia": (100, 8000),
-    "rorqual": (100, 12000),
-    "fir": (50, 6000),
-    "nibi": (50, 4000),
-    "killarney": (100, 7500),
-    "vulcan": (100, 9000),
-    "trillium": (50, 15000),
-}
-
 
 @dataclass
 class JobStats:
@@ -80,7 +33,6 @@ class JobStats:
 @dataclass
 class StorageStats:
     """Disk usage as (used_gib, quota_gib) for $HOME and $SCRATCH."""
-
     home_used: float
     home_quota: float
     scratch_used: float
@@ -96,8 +48,6 @@ class ClusterStatus:
     gpu_model: str
     jobs: JobStats
     storage: StorageStats
-    avg_wait_min: int | None = None  # estimated queue wait time in minutes
-    avg_gpu_util_pct: float | None = None  # average GPU utilisation across running jobs
 
 
 # ---------------------------------------------------------------------------
@@ -282,69 +232,6 @@ async def get_all_cluster_statuses(
     return statuses, True
 
 
-def get_mock_cluster_status(username: str = "you") -> list[ClusterStatus]:
-    """Return fake but plausible status data for every known cluster.
-
-    This function is intentionally free of any UI logic so it can be swapped
-    out for a real implementation that queries Slurm / the cluster APIs.
-    """
-    rng = random.Random(MOCK_DATA_SEED)
-
-    gpu_models = ["A100", "H100", "V100", "A40", "RTX 8000"]
-
-    results: list[ClusterStatus] = []
-    for cluster in get_config().clusters:
-        gpu_total = _GPU_TOTALS[cluster]
-        # Simulate varying load – some clusters busier than others
-        load_factor = rng.uniform(0.55, 0.98)
-        gpu_busy = int(gpu_total * load_factor)
-        gpu_idle = gpu_total - gpu_busy
-
-        total_jobs = int(gpu_busy * rng.uniform(0.8, 1.4))
-        pending = int(total_jobs * rng.uniform(0.1, 0.4))
-        running = total_jobs - pending
-        cancelled = int(total_jobs * rng.uniform(0.01, 0.05))
-        completed = int(total_jobs * rng.uniform(0.5, 2.0))
-
-        my_running = rng.randint(0, min(8, running))
-        my_pending = rng.randint(0, min(4, pending))
-        my_completed = completed * my_running // max(running, 1)
-
-        home_quota, scratch_quota = _STORAGE_QUOTAS[cluster]
-        home_used = round(rng.uniform(5, home_quota * 0.90), 1)
-        scratch_used = round(rng.uniform(home_quota, scratch_quota * 0.95), 1)
-
-        online = rng.random() > OFFLINE_PROBABILITY
-
-        results.append(
-            ClusterStatus(
-                name=cluster,
-                online=online,
-                gpu_idle=gpu_idle,
-                gpu_total=gpu_total,
-                gpu_model=rng.choice(gpu_models),
-                jobs=JobStats(
-                    running=running,
-                    pending=pending,
-                    my_running=my_running,
-                    my_pending=my_pending,
-                    cancelled=cancelled,
-                    completed=completed,
-                    my_completed=my_completed,
-                ),
-                storage=StorageStats(
-                    home_used=home_used,
-                    home_quota=home_quota,
-                    scratch_used=scratch_used,
-                    scratch_quota=scratch_quota,
-                ),
-                avg_wait_min=rng.randint(2, 240),
-                avg_gpu_util_pct=round(rng.uniform(40, 99), 1),
-            )
-        )
-    return results
-
-
 # ---------------------------------------------------------------------------
 # UI helpers
 # ---------------------------------------------------------------------------
@@ -380,27 +267,6 @@ def _gpu_bar(idle: int, total: int, width: int = 10) -> Text:
     return Text(f"{bar_str} {idle:>5}/{total}", style=colour)
 
 
-def _wait_text(minutes: int) -> Text:
-    if minutes < 15:
-        return Text(f"~{minutes}m", style="green")
-    elif minutes < 60:
-        return Text(f"~{minutes}m", style="yellow")
-    else:
-        h = minutes // 60
-        m = minutes % 60
-        return Text(f"~{h}h{m:02d}m", style="red")
-
-
-def _util_text(pct: float) -> Text:
-    s = f"{pct:.0f}%"
-    if pct >= 80:
-        return Text(s, style="green")
-    elif pct >= 55:
-        return Text(s, style="yellow")
-    else:
-        return Text(s, style="red")
-
-
 # ---------------------------------------------------------------------------
 # Main display
 # ---------------------------------------------------------------------------
@@ -422,8 +288,6 @@ def _build_cluster_table(data: list[ClusterStatus]) -> Table:
     table.add_column("Free GPUs", justify="left", ratio=2)
     table.add_column("My jobs\nrun/pend", justify="center", ratio=1)
     table.add_column("All jobs\nrun/pend", justify="center", ratio=1)
-    table.add_column("Avg wait", justify="center", ratio=1)
-    table.add_column("GPU util", justify="center", ratio=1)
     table.add_column("$HOME", justify="left", ratio=2)
     table.add_column("$SCRATCH", justify="left", ratio=2)
 
@@ -449,10 +313,6 @@ def _build_cluster_table(data: list[ClusterStatus]) -> Table:
             _gpu_bar(c.gpu_idle, c.gpu_total),
             my_jobs,
             all_jobs,
-            Text("—", style="dim") if c.avg_wait_min is None else _wait_text(c.avg_wait_min),
-            Text("—", style="dim")
-            if c.avg_gpu_util_pct is None
-            else _util_text(c.avg_gpu_util_pct),
             home_bar,
             scratch_bar,
             style=row_style,
@@ -544,18 +404,11 @@ async def status(clusters: list[str] | None = None):
 
     if not is_live:
         console.print(
-            "[yellow]No active cluster connections found. "
-            "Run [bold]cluv login[/bold] first, or showing mock data.[/yellow]\n"
+            "[yellow]No active cluster connections found. Run [bold]cluv login[/bold] first.[/yellow]"
         )
-        mock = get_mock_cluster_status()
-        # When specific clusters were requested, only show mock rows for those.
-        data = [c for c in mock if not clusters or c.name in clusters]
-        label = "[dim](mock data)[/dim]"
-    else:
-        label = "[dim](live data)[/dim]"
 
     console.print()
-    console.rule(f"[bold cyan]cluv status[/bold cyan]  {label}")
+    console.rule("[bold cyan]cluv status[/bold cyan]")
     console.print()
 
     console.print(_build_cluster_table(data))