refactor: optimize pulling image progress print

Signed-off-by: thxCode <thxcode0824@gmail.com>

Author: thxCode

gpustack_runtime/deployer/__utils__.py

@@ -600,3 +600,32 @@ def fnv1a_64_hex(data: bytes | str) -> str:
     """
     hash_value = fnv1a_64(data)
     return f"{hash_value:016x}"
+
+
+_KiB = 1 << 10
+_MiB = 1 << 20
+_GiB = 1 << 30
+_TiB = 1 << 40
+
+
+def bytes_to_human_readable(size_in_bytes: int) -> str:
+    """
+    Convert bytes to a human-readable string.
+
+    Args:
+        size_in_bytes:
+            The size in bytes.
+
+    Returns:
+        The human-readable string.
+
+    """
+    if size_in_bytes >= _TiB:
+        return f"{size_in_bytes / _TiB:.2f} TiB"
+    if size_in_bytes >= _GiB:
+        return f"{size_in_bytes / _GiB:.2f} GiB"
+    if size_in_bytes >= _MiB:
+        return f"{size_in_bytes / _MiB:.2f} MiB"
+    if size_in_bytes >= _KiB:
+        return f"{size_in_bytes / _KiB:.2f} KiB"
+    return f"{size_in_bytes} B"

gpustack_runtime/deployer/docker.py

@@ -42,6 +42,7 @@
     WorkloadStatusOperation,
     WorkloadStatusStateEnum,
 )
+from .__utils__ import _MiB, bytes_to_human_readable
 
 if TYPE_CHECKING:
     from collections.abc import Callable, Generator
@@ -454,9 +455,12 @@ def _pull_image(self, image: str) -> docker.models.images.Image:
                 stream=True,
             )
 
+            progress_threshold = 1
             progress: int = 0
+            progress_current: int = 0
             layers: dict[str, int] = {}
             layer_progress: dict[str, int] = {}
+            layer_progress_current: dict[str, int] = {}
             is_raw = sys.stdout.isatty() and logger.isEnabledFor(logging.DEBUG)
             for line in pull_log:
                 line_str = (
@@ -476,6 +480,7 @@ def _pull_image(self, image: str) -> docker.models.images.Image:
                     if log_id not in layers:
                         layers[log_id] = len(layers)
                         layer_progress[log_id] = 0
+                        layer_progress_current[log_id] = 0
                     if is_raw:
                         print("\033[E", end="")
                         print(f"\033[{layers[log_id] + 1};0H", end="")
@@ -488,15 +493,29 @@ def _pull_image(self, image: str) -> docker.models.images.Image:
                             p_t = log.get("progressDetail", {}).get("total")
                             if p_c is not None and p_t is not None:
                                 layer_progress[log_id] = int(p_c * 100 // p_t)
-                            p_diff = (
-                                sum(layer_progress.values())
-                                * 100
-                                // (len(layer_progress) * 100)
-                                - progress
-                            )
-                            if p_diff >= 10:
-                                progress += 10
-                                logger.info(f"Pulling image {image}: {progress}%")
+                                p_diff = (
+                                    sum(layer_progress.values())
+                                    * 100
+                                    // (len(layer_progress) * 100)
+                                    - progress
+                                )
+                                if p_diff >= progress_threshold:
+                                    progress += progress_threshold
+                                    progress_threshold = min(5, progress_threshold + 1)
+                                    logger.info(f"Pulling image {image}: {progress}%")
+                            elif p_c is not None:
+                                layer_progress_current[log_id] = p_c
+                                p_c_total = sum(layer_progress_current.values())
+                                p_diff = p_c_total - progress_current
+                                if p_diff >= progress_threshold * _MiB:
+                                    progress_current = p_c_total
+                                    progress_threshold = min(
+                                        200,
+                                        progress_threshold + 2,
+                                    )
+                                    logger.info(
+                                        f"Pulling image {image}: {bytes_to_human_readable(p_c_total)}",
+                                    )
                     elif is_raw:
                         print(f"{log_id}: {log['status']}", flush=True)