hte-cli 0.2.12__py3-none-any.whl → 0.2.14__py3-none-any.whl

hte_cli/cli.py

@@ -310,113 +310,21 @@ def session_join(ctx, session_id: str, force_setup: bool):
                     cached_images.append(img)
                     continue
 
-                # Need to pull - show aggregated progress across all layers
-                import re
-                layer_progress: dict[str, dict] = {}  # layer_id -> {current, total, phase}
-                last_display = [""]
-
-                def parse_size(s: str) -> float:
-                    """Parse size string like '10.5MB' or '1.2GB' to bytes."""
-                    if not s:
-                        return 0
-                    s = s.strip()
-                    multipliers = {"B": 1, "KB": 1024, "MB": 1024**2, "GB": 1024**3}
-                    for suffix, mult in multipliers.items():
-                        if s.upper().endswith(suffix):
-                            try:
-                                return float(s[:-len(suffix)].strip()) * mult
-                            except ValueError:
-                                return 0
-                    try:
-                        return float(s)
-                    except ValueError:
-                        return 0
-
-                def format_size(b: float) -> str:
-                    """Format bytes to human readable."""
-                    if b >= 1024**3:
-                        return f"{b/1024**3:.1f}GB"
-                    elif b >= 1024**2:
-                        return f"{b/1024**2:.0f}MB"
-                    elif b >= 1024:
-                        return f"{b/1024:.0f}KB"
-                    return f"{b:.0f}B"
-
+                # Need to pull - show progress
+                last_status = ["connecting..."]
                 with console.status(f"[yellow]↓[/yellow] {short_name} [dim]connecting...[/dim]") as status:
                     def show_progress(image: str, line: str):
-                        # Parse: "abc123: Downloading  10.5MB/50MB" or "abc123: Extracting  10MB/50MB"
-                        size_match = re.search(
-                            r"([a-f0-9]+):\s*(Downloading|Extracting)\s+(\d+\.?\d*\s*[kMGT]?B)/(\d+\.?\d*\s*[kMGT]?B)",
-                            line, re.IGNORECASE
-                        )
-                        if size_match:
-                            layer_id = size_match.group(1)
-                            phase = size_match.group(2)
-                            current = parse_size(size_match.group(3))
-                            total = parse_size(size_match.group(4))
-                            layer_progress[layer_id] = {"current": current, "total": total, "phase": phase}
-
-                        # Check for completed layers
-                        complete_match = re.search(r"([a-f0-9]+):\s*(Pull complete|Download complete|Already exists)", line)
-                        if complete_match:
-                            layer_id = complete_match.group(1)
-                            if layer_id in layer_progress:
-                                layer_progress[layer_id]["current"] = layer_progress[layer_id]["total"]
-                                layer_progress[layer_id]["phase"] = "done"
-
-                        # Track waiting layers
-                        waiting_match = re.search(r"([a-f0-9]+):\s*Waiting", line)
-                        if waiting_match:
-                            layer_id = waiting_match.group(1)
-                            if layer_id not in layer_progress:
-                                layer_progress[layer_id] = {"current": 0, "total": 0, "phase": "waiting"}
-
-                        # Aggregate progress
-                        total_current = sum(lp.get("current", 0) for lp in layer_progress.values())
-                        total_size = sum(lp.get("total", 0) for lp in layer_progress.values())
-                        downloading = sum(1 for lp in layer_progress.values() if lp.get("phase") == "Downloading")
-                        extracting = sum(1 for lp in layer_progress.values() if lp.get("phase") == "Extracting")
-                        done_layers = sum(1 for lp in layer_progress.values() if lp.get("phase") == "done")
-                        waiting = sum(1 for lp in layer_progress.values() if lp.get("phase") == "waiting")
-                        total_layers = len(layer_progress)
-
-                        # Find largest active layer for detail display
-                        active_layers = [(lid, lp) for lid, lp in layer_progress.items()
-                                        if lp.get("phase") in ("Downloading", "Extracting") and lp.get("total", 0) > 0]
-                        largest_layer = None
-                        if active_layers:
-                            largest_layer = max(active_layers, key=lambda x: x[1].get("total", 0))
-
-                        # Build display
-                        if total_size > 1024 * 1024:  # >1MB meaningful data
-                            display = f"{format_size(total_current)}/{format_size(total_size)}"
-                            # Show largest layer progress
-                            if largest_layer:
-                                lid, lp = largest_layer
-                                pct = (lp["current"] / lp["total"] * 100) if lp["total"] > 0 else 0
-                                display += f" | {lid[:8]}: {format_size(lp['current'])}/{format_size(lp['total'])} ({pct:.0f}%)"
-                        elif total_layers > 0:
-                            # Show layer counts
-                            parts = []
-                            if downloading > 0:
-                                parts.append(f"{downloading} downloading")
-                            if extracting > 0:
-                                parts.append(f"{extracting} extracting")
-                            if done_layers > 0:
-                                parts.append(f"{done_layers} done")
-                            if waiting > 0:
-                                parts.append(f"{waiting} waiting")
-                            display = ", ".join(parts) if parts else "starting..."
-                        elif "Pulling" in line:
-                            display = "preparing..."
-                        elif line.strip():
-                            display = line[:40]
-                        else:
-                            return
-
-                        if display != last_display[0]:
-                            last_display[0] = display
-                            status.update(f"[yellow]↓[/yellow] {short_name} [dim]{display}[/dim]")
+                        # Show docker output directly - includes MB progress from PTY
+                        # Lines look like: "abc123: Downloading  360.9MB/4.075GB"
+                        if ": " in line:
+                            parts = line.split(": ", 1)
+                            if len(parts) == 2:
+                                layer_id = parts[0][-8:]
+                                layer_status = parts[1][:45]
+                                display = f"{layer_id}: {layer_status}"
+                                if display != last_status[0]:
+                                    last_status[0] = display
+                                    status.update(f"[yellow]↓[/yellow] {short_name} [dim]{display}[/dim]")
 
                     success = pull_image_with_progress(img, on_progress=show_progress)
 
@@ -446,6 +354,15 @@ def session_join(ctx, session_id: str, force_setup: bool):
         console.print("[dim]Skipping setup (use --force-setup to re-run)[/dim]")
         console.print()
 
+    # Check if session was cancelled during setup
+    try:
+        updated_session = api.get_session(session_id)
+        if updated_session.get("status") == "cancelled":
+            console.print("[yellow]Session was cancelled. Exiting.[/yellow]")
+            sys.exit(0)
+    except APIError:
+        pass  # Continue if we can't check - server might be temporarily unavailable
+
     # Step 4: Show instructions
     if session_info.get("instructions"):
         console.print(Panel(session_info["instructions"], title="Task Instructions"))
@@ -454,18 +371,19 @@ def session_join(ctx, session_id: str, force_setup: bool):
     # Step 3: Run the task using TaskRunner
     step_num = "3" if (not is_reconnect or force_setup) and images else "2" if (not is_reconnect or force_setup) else "1"
     console.print(f"[bold]Step {step_num}:[/bold] Starting task environment...")
+    console.print("[dim]Launching Docker containers...[/dim]")
+    console.print()
 
     events.docker_started()
 
     runner = TaskRunner()
     eval_log_bytes = None
     try:
-        with console.status("[dim]Launching Docker containers (this may take a minute)...[/dim]"):
-            result = runner.run_from_assignment(
-                assignment=assignment,
-                compose_yaml=compose_yaml,
-                files_zip=files_zip,
-            )
+        result = runner.run_from_assignment(
+            assignment=assignment,
+            compose_yaml=compose_yaml,
+            files_zip=files_zip,
+        )
         # Read eval log before cleanup
         if result.eval_log_path and result.eval_log_path.exists():
             eval_log_bytes = result.eval_log_path.read_bytes()

{hte_cli-0.2.12.dist-info → hte_cli-0.2.14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hte-cli
-Version: 0.2.12
+Version: 0.2.14
 Summary: Human Time-to-Completion Evaluation CLI
 Project-URL: Homepage, https://github.com/sean-peters-au/lyptus-mono
 Author: Lyptus Research

{hte_cli-0.2.12.dist-info → hte_cli-0.2.14.dist-info}/RECORD

@@ -1,7 +1,7 @@
 hte_cli/__init__.py,sha256=fDGXp-r8bIoLtlQnn5xJ_CpwMhonvk9bGjZQsjA2mDI,914
 hte_cli/__main__.py,sha256=63n0gNGfskidWDU0aAIF2N8lylVCLYKVIkrN9QiORoo,107
 hte_cli/api_client.py,sha256=m42kfFZS72Nu_VuDwxRsLNy4ziCcvgk7KNWBh9gwqy0,9257
-hte_cli/cli.py,sha256=VnUp0A71JUw35VaN_Xlbusn6_2LD2ZkcnenO3LBc0LE,46464
+hte_cli/cli.py,sha256=d1_FhXeGkzrFucEOZd3uZhFPffvk4aRHKRbG9pZz9qo,41590
 hte_cli/config.py,sha256=42Xv__YMSeRLs2zhGukJkIXFKtnBtYCHnONfViGyt2g,3387
 hte_cli/errors.py,sha256=1J5PpxcUKBu6XjigMMCPOq4Zc12tnv8LhAsiaVFWLQM,2762
 hte_cli/events.py,sha256=Zn-mroqaLHNzdT4DFf8st1Qclglshihdc09dBfCN070,5522
@@ -9,7 +9,7 @@ hte_cli/image_utils.py,sha256=TLwJdswUQrSD2bQcAXW03R8j8WG2pbHzd12TWcE7zy4,6418
 hte_cli/runner.py,sha256=DhC8FMjHwfLR193iP4thLDRZrNssYA9KH1WYKU2JKeg,13535
 hte_cli/scorers.py,sha256=sFoPJePRt-K191-Ga4cVmrldruJclYXTOLkU_C9nCDI,6025
 hte_cli/version_check.py,sha256=WVZyGy2XfAghQYdd2N9-0Qfg-7pgp9gt4761-PnmacI,1708
-hte_cli-0.2.12.dist-info/METADATA,sha256=mpWz2A-3JiJquxws5sM1KdCclRqDw3sGGYXeY6XPjhY,3768
-hte_cli-0.2.12.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-hte_cli-0.2.12.dist-info/entry_points.txt,sha256=XbyEEi1H14DFAt0Kdl22e_IRVEGzimSzYSh5HlhKlFA,41
-hte_cli-0.2.12.dist-info/RECORD,,
+hte_cli-0.2.14.dist-info/METADATA,sha256=91S9qXd9btOSrtUhmnupFoxfrL6iXX0eh_8csVCP1qE,3768
+hte_cli-0.2.14.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+hte_cli-0.2.14.dist-info/entry_points.txt,sha256=XbyEEi1H14DFAt0Kdl22e_IRVEGzimSzYSh5HlhKlFA,41
+hte_cli-0.2.14.dist-info/RECORD,,