hte-cli 0.2.8__tar.gz → 0.2.9__tar.gz

{hte_cli-0.2.8 → hte_cli-0.2.9}/PKG-INFO

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

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

{hte_cli-0.2.8 → hte_cli-0.2.9}/src/hte_cli/image_utils.py

@@ -1,6 +1,10 @@
 """Docker image utilities for pre-pulling compose images."""
 
 import logging
+import os
+import pty
+import re
+import select
 import subprocess
 from collections.abc import Callable
 
@@ -61,32 +65,77 @@ def pull_image_with_progress(
     on_complete: Callable[[str, bool], None] | None = None,
 ) -> bool:
     """
-    Pull a Docker image with progress callbacks.
+    Pull a Docker image with progress callbacks using PTY for real progress output.
 
     Args:
         image: Image name to pull
-        on_progress: Callback(image, status_line) called for each line of output
+        on_progress: Callback(image, status_line) called for each progress update
         on_complete: Callback(image, success) called when pull completes
 
     Returns:
         True if pull succeeded, False otherwise
     """
     try:
+        # Use PTY to get real progress output from docker
+        master_fd, slave_fd = pty.openpty()
+
         process = subprocess.Popen(
             ["docker", "pull", image],
-            stdout=subprocess.PIPE,
-            stderr=subprocess.STDOUT,
-            text=True,
-            bufsize=1,
+            stdout=slave_fd,
+            stderr=slave_fd,
+            stdin=slave_fd,
+            close_fds=True,
         )
 
-        # Stream output line by line
-        for line in iter(process.stdout.readline, ""):
-            line = line.strip()
-            if line and on_progress:
-                on_progress(image, line)
+        os.close(slave_fd)  # Close slave in parent
+
+        # Read output from master with timeout
+        output_buffer = ""
+        # Regex to parse docker progress: "abc123: Downloading [===>  ] 10.5MB/50MB"
+        progress_pattern = re.compile(
+            r"([a-f0-9]+):\s*(Downloading|Extracting|Verifying Checksum|Download complete|Pull complete|Already exists|Waiting)(?:\s+\[.*?\]\s+)?(\d+\.?\d*\s*[kMG]?B)?(?:/(\d+\.?\d*\s*[kMG]?B))?"
+        )
 
-        process.wait()
+        while True:
+            # Check if process is done
+            ret = process.poll()
+            if ret is not None:
+                # Read any remaining output
+                try:
+                    while True:
+                        ready, _, _ = select.select([master_fd], [], [], 0.1)
+                        if not ready:
+                            break
+                        chunk = os.read(master_fd, 4096)
+                        if not chunk:
+                            break
+                except OSError:
+                    pass
+                break
+
+            # Read available output
+            try:
+                ready, _, _ = select.select([master_fd], [], [], 0.1)
+                if ready:
+                    chunk = os.read(master_fd, 4096)
+                    if chunk:
+                        output_buffer += chunk.decode("utf-8", errors="replace")
+
+                        # Parse and report progress
+                        # Docker uses carriage returns to update lines in place
+                        lines = output_buffer.replace("\r", "\n").split("\n")
+                        output_buffer = lines[-1]  # Keep incomplete line
+
+                        for line in lines[:-1]:
+                            line = line.strip()
+                            # Strip ANSI escape codes
+                            line = re.sub(r"\x1b\[[0-9;]*[a-zA-Z]", "", line)
+                            if line and on_progress:
+                                on_progress(image, line)
+            except OSError:
+                break
+
+        os.close(master_fd)
         success = process.returncode == 0
 
         if on_complete:
@@ -94,7 +143,7 @@ def pull_image_with_progress(
 
         return success
 
-    except (subprocess.TimeoutExpired, FileNotFoundError, OSError) as e:
+    except (FileNotFoundError, OSError) as e:
         logger.error(f"Failed to pull {image}: {e}")
         if on_complete:
             on_complete(image, False)