hte-cli 0.1.22__tar.gz → 0.1.24__tar.gz

{hte_cli-0.1.22 → hte_cli-0.1.24}/PKG-INFO

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

{hte_cli-0.1.22 → hte_cli-0.1.24}/pyproject.toml

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

{hte_cli-0.1.22 → hte_cli-0.1.24}/src/hte_cli/cli.py

@@ -448,34 +448,48 @@ def tasks_run(ctx, task_id: str | None):
             def get_progress_summary(image: str) -> str:
                 """Get a human-readable progress summary for an image with MB counts."""
                 if image not in image_layers or not image_layers[image]:
-                    return "Starting..."
+                    return "connecting..."
 
                 layers = image_layers[image]
                 total_layers = len(layers)
-                complete = sum(1 for s, _, _ in layers.values() if "complete" in s.lower())
 
-                # Sum up download progress
+                # Count layers in different states
+                complete = 0
+                downloading = 0
+                waiting = 0
                 total_downloaded_mb = 0
                 total_size_mb = 0
+
                 for status, downloaded, total in layers.values():
-                    if "complete" in status.lower():
-                        # Completed layers: use total as both downloaded and total
+                    status_lower = status.lower()
+                    if "complete" in status_lower:
+                        complete += 1
                         total_downloaded_mb += total
                         total_size_mb += total
-                    elif total > 0:
+                    elif "downloading" in status_lower:
+                        downloading += 1
                         total_downloaded_mb += downloaded
                         total_size_mb += total
+                    elif "waiting" in status_lower:
+                        waiting += 1
 
+                # Choose the most informative display
                 if complete == total_layers and total_layers > 0:
                     if total_size_mb > 0:
-                        return f"Done ({total_size_mb:.0f}MB)"
-                    return f"Done ({total_layers} layers)"
+                        return f"done ({total_size_mb:.0f}MB)"
+                    return f"done ({total_layers} layers)"
                 elif total_size_mb > 0:
-                    return f"{total_downloaded_mb:.0f}MB / {total_size_mb:.0f}MB"
+                    # Show MB progress when available
+                    pct = int(100 * total_downloaded_mb / total_size_mb) if total_size_mb > 0 else 0
+                    return f"{total_downloaded_mb:.0f}/{total_size_mb:.0f}MB ({pct}%)"
+                elif downloading > 0:
+                    return f"downloading ({complete}/{total_layers} done)"
                 elif complete > 0:
-                    return f"Pulling ({complete}/{total_layers} layers)"
+                    return f"extracting ({complete}/{total_layers} done)"
+                elif waiting > 0:
+                    return f"queued ({total_layers} layers)"
                 else:
-                    return f"Preparing ({total_layers} layers)"
+                    return f"preparing ({total_layers} layers)"
 
             def on_image_progress(image: str, line: str):
                 """Track layer-level progress with size info."""
@@ -499,30 +513,23 @@ def tasks_run(ctx, task_id: str | None):
                     results.append((img, True, "cached"))
                     continue
 
-                # Need to pull - show live progress
-                console.print(f"  [yellow]↓[/yellow] {short_name} [dim]pulling...[/dim]", end="")
-
-                # Clear the line and show progress updates
+                # Need to pull - use Rich Status for live updates
                 image_layers[img] = {}
-                last_summary = ""
 
-                def show_progress(image: str, line: str):
-                    nonlocal last_summary
-                    on_image_progress(image, line)
-                    summary = get_progress_summary(image)
-                    if summary != last_summary:
-                        # Clear line and rewrite
-                        console.print(f"\r  [yellow]↓[/yellow] {short_name} [dim]{summary}[/dim]" + " " * 20, end="")
-                        last_summary = summary
+                with console.status(f"[yellow]↓[/yellow] {short_name} [dim]connecting...[/dim]") as status:
+                    def show_progress(image: str, line: str):
+                        on_image_progress(image, line)
+                        summary = get_progress_summary(image)
+                        status.update(f"[yellow]↓[/yellow] {short_name} [dim]{summary}[/dim]")
 
-                success = pull_image_with_progress(img, on_progress=show_progress)
+                    success = pull_image_with_progress(img, on_progress=show_progress)
 
-                # Final status
+                # Final status (printed after status context exits)
                 if success:
-                    console.print(f"\r  [green]✓[/green] {short_name} [dim](downloaded)[/dim]" + " " * 30)
+                    console.print(f"  [green]✓[/green] {short_name} [dim](downloaded)[/dim]")
                     results.append((img, True, "pulled"))
                 else:
-                    console.print(f"\r  [red]✗[/red] {short_name} [dim](failed)[/dim]" + " " * 30)
+                    console.print(f"  [red]✗[/red] {short_name} [dim](failed)[/dim]")
                     results.append((img, False, "failed"))
 
             failed = sum(1 for _, ok, _ in results if not ok)