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

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

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

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

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

@@ -281,26 +281,63 @@ def session_join(ctx, session_id: str, force_setup: bool):
 
     # Step 3: Run setup (skip if reconnecting without force)
     setup_start_time = time.monotonic()
-    if not is_reconnect or force_setup:
-        # Send setup_started event
-        events.setup_started({"cli_version": __version__, "task_id": assignment["task_id"]})
+    images = []
+    pulled_images = []
+    cached_images = []
+    failed_images = []
 
-        # Pull images if we have compose
+    if not is_reconnect or force_setup:
+        # Extract images from compose
         if compose_yaml:
             images = extract_images_from_compose(compose_yaml)
-            if images:
-                console.print(f"[bold]Pulling {len(images)} Docker image(s)...[/bold]")
-                events.image_pull_started({})
-                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)
-                    if success:
-                        console.print(f"  [green]✓[/green] {short_name}")
-                    else:
-                        console.print(f"  [red]✗[/red] {short_name} (failed)")
-                events.image_pull_completed({})
-                console.print()
+
+        # Send setup_started event
+        events.setup_started(images=images)
+
+        # Pull images if we have any
+        if images:
+            from hte_cli.image_utils import check_image_exists_locally
+
+            console.print(f"[bold]Pulling {len(images)} Docker image(s)...[/bold]")
+            pull_start = time.monotonic()
+
+            for img in images:
+                short_name = img.split("/")[-1][:40]
+
+                # 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} [dim](downloaded)[/dim]")
+                    pulled_images.append(img)
+                else:
+                    console.print(f"  [red]✗[/red] {short_name} [dim](failed)[/dim]")
+                    failed_images.append(img)
+
+            pull_duration = time.monotonic() - pull_start
+            events.image_pull_completed(
+                duration_seconds=pull_duration,
+                pulled=pulled_images,
+                cached=cached_images,
+                failed=failed_images,
+            )
+            console.print()
 
         # Send setup_completed - THIS STARTS THE TIMER ON SERVER
         total_setup = time.monotonic() - setup_start_time