hte-cli 0.2.3__tar.gz → 0.2.5__tar.gz

{hte_cli-0.2.3 → hte_cli-0.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hte-cli
-Version: 0.2.3
+Version: 0.2.5
 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.3 → hte_cli-0.2.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "hte-cli"
-version = "0.2.3"
+version = "0.2.5"
 description = "Human Time-to-Completion Evaluation CLI"
 readme = "README.md"
 requires-python = ">=3.11"

{hte_cli-0.2.3 → hte_cli-0.2.5}/src/hte_cli/cli.py

@@ -230,26 +230,26 @@ def session_join(ctx, session_id: str, force_setup: bool):
     compose_yaml = None
 
     if not is_reconnect or force_setup:
-        with Progress(
-            SpinnerColumn(),
-            TextColumn("[progress.description]{task.description}"),
-            console=console,
-        ) as progress:
-            task_id_display = progress.add_task("Downloading task files...", total=None)
+        console.print("[bold]Step 1:[/bold] Downloading task resources...")
+
+        with console.status("[dim]Fetching task files...[/dim]"):
             try:
                 files_zip = api.get_session_files(session_id)
+                console.print("  [green]✓[/green] Task files downloaded")
             except APIError as e:
-                # Files are optional for some benchmarks
-                console.print(f"[dim]Note: {e}[/dim]")
+                console.print(f"  [dim]○ No task files (optional)[/dim]")
                 files_zip = None
 
-            progress.update(task_id_display, description="Downloading compose file...")
+        with console.status("[dim]Fetching compose configuration...[/dim]"):
             try:
                 compose_yaml = api.get_session_compose(session_id)
+                console.print("  [green]✓[/green] Docker compose downloaded")
             except APIError as e:
-                # Compose is optional for simple benchmarks
+                console.print(f"  [dim]○ No compose file (optional)[/dim]")
                 compose_yaml = None
 
+        console.print()
+
     # Validate compose for sandbox-required benchmarks
     benchmark = session_info.get("benchmark", "").lower()
     SANDBOX_REQUIRED_BENCHMARKS = {"cybench", "intercode-ctf", "cvebench", "cybergym", "nyuctf"}
@@ -298,7 +298,7 @@ def session_join(ctx, session_id: str, force_setup: bool):
         if images:
             from hte_cli.image_utils import check_image_exists_locally
 
-            console.print(f"[bold]Pulling {len(images)} Docker image(s)...[/bold]")
+            console.print(f"[bold]Step 2:[/bold] Pulling {len(images)} Docker image(s)...")
             pull_start = time.monotonic()
 
             for img in images:
@@ -315,11 +315,15 @@ def session_join(ctx, session_id: str, force_setup: bool):
                     def show_progress(image: str, line: str):
                         # Parse docker pull output for layer progress
                         # Lines look like: "abc123: Downloading [====>   ] 10MB/50MB"
+                        # Or: "Digest: sha256:..." or "Status: Downloaded newer image"
                         if ": " in line:
                             parts = line.split(": ", 1)
                             if len(parts) == 2:
                                 layer_status = parts[1][:50]  # Truncate
                                 status.update(f"[yellow]↓[/yellow] {short_name} [dim]{layer_status}[/dim]")
+                        elif line.strip():
+                            # Show any other non-empty output
+                            status.update(f"[yellow]↓[/yellow] {short_name} [dim]{line[:50]}[/dim]")
 
                     success = pull_image_with_progress(img, on_progress=show_progress)
 
@@ -354,21 +358,21 @@ def session_join(ctx, session_id: str, force_setup: bool):
         console.print(Panel(session_info["instructions"], title="Task Instructions"))
         console.print()
 
-    # Step 5: Run the task using TaskRunner
-    console.print("[bold]Starting task environment...[/bold]")
-    console.print("[dim]Launching Docker containers...[/dim]")
-    console.print()
+    # 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...")
 
     events.docker_started()
 
     runner = TaskRunner()
     eval_log_bytes = None
     try:
-        result = runner.run_from_assignment(
-            assignment=assignment,
-            compose_yaml=compose_yaml,
-            files_zip=files_zip,
-        )
+        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,
+            )
         # 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()