hte-cli 0.2.2__py3-none-any.whl → 0.2.4__py3-none-any.whl

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"}
@@ -296,18 +296,38 @@ def session_join(ctx, session_id: str, force_setup: bool):
 
         # Pull images if we have any
         if images:
-            console.print(f"[bold]Pulling {len(images)} Docker image(s)...[/bold]")
+            from hte_cli.image_utils import check_image_exists_locally
+
+            console.print(f"[bold]Step 2:[/bold] Pulling {len(images)} Docker image(s)...")
             pull_start = time.monotonic()
 
             for img in images:
                 short_name = img.split("/")[-1][:40]
-                with console.status(f"[yellow]↓[/yellow] {short_name}") as status:
-                    success = pull_image_with_progress(img)
+
+                # Check if already cached
+                if check_image_exists_locally(img):
+                    console.print(f"  [green]✓[/green] {short_name} [dim](cached)[/dim]")
+                    cached_images.append(img)
+                    continue
+
+                # Need to pull - show progress
+                with console.status(f"[yellow]↓[/yellow] {short_name} [dim]connecting...[/dim]") as status:
+                    def show_progress(image: str, line: str):
+                        # Parse docker pull output for layer progress
+                        # Lines look like: "abc123: Downloading [====>   ] 10MB/50MB"
+                        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]")
+
+                    success = pull_image_with_progress(img, on_progress=show_progress)
+
                 if success:
-                    console.print(f"  [green]✓[/green] {short_name}")
+                    console.print(f"  [green]✓[/green] {short_name} [dim](downloaded)[/dim]")
                     pulled_images.append(img)
                 else:
-                    console.print(f"  [red]✗[/red] {short_name} (failed)")
+                    console.print(f"  [red]✗[/red] {short_name} [dim](failed)[/dim]")
                     failed_images.append(img)
 
             pull_duration = time.monotonic() - pull_start
@@ -334,21 +354,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()

{hte_cli-0.2.2.dist-info → hte_cli-0.2.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hte-cli
-Version: 0.2.2
+Version: 0.2.4
 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.2.dist-info → hte_cli-0.2.4.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=jl8wCzCc6EVpHLSyK3-mo6DskQiZWARv8R-r8lpV4iU,39713
+hte_cli/cli.py,sha256=dAkHNF9J_9xP500FDQtfSb6I-X2hWNqz8bFBvZbfQis,40948
 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=454yoZEI1duNYrZC8UjhfZzDRP4Nxdrf2TvnZ_54G1k,4439
 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.2.dist-info/METADATA,sha256=aHmC-LkN9nSUw3HOZ0oMD1hV5BRcBc3w_rSIDilMOF8,3767
-hte_cli-0.2.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-hte_cli-0.2.2.dist-info/entry_points.txt,sha256=XbyEEi1H14DFAt0Kdl22e_IRVEGzimSzYSh5HlhKlFA,41
-hte_cli-0.2.2.dist-info/RECORD,,
+hte_cli-0.2.4.dist-info/METADATA,sha256=sXaeCU9qbni0H7YxOQtGGxxaK0TyaPFT3TGrDurFcjE,3767
+hte_cli-0.2.4.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+hte_cli-0.2.4.dist-info/entry_points.txt,sha256=XbyEEi1H14DFAt0Kdl22e_IRVEGzimSzYSh5HlhKlFA,41
+hte_cli-0.2.4.dist-info/RECORD,,