pybiolib 1.2.874__tar.gz → 1.2.878__tar.gz

{pybiolib-1.2.874 → pybiolib-1.2.878}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pybiolib
-Version: 1.2.874
+Version: 1.2.878
 Summary: BioLib Python Client
 License: MIT
 Keywords: biolib

{pybiolib-1.2.874 → pybiolib-1.2.878}/biolib/_internal/push_application.py

@@ -1,11 +1,11 @@
 import os
 import re
 import sys
+import time
 from pathlib import Path
 
 import rich.progress
 import yaml
-from rich.console import Console
 
 from biolib import api, utils
 from biolib._internal.data_record.push_data import (
@@ -38,9 +38,14 @@ class DockerStatusUpdate(TypedDict, total=False):
 
 
 def process_docker_status_updates(status_updates: Iterable[DockerStatusUpdate], action: str) -> None:
-    console = Console(force_terminal=True, force_interactive=True, legacy_windows=False)
+    if sys.stdout.isatty():
+        _process_docker_status_updates_with_progress_bar(status_updates, action)
+    else:
+        _process_docker_status_updates_with_logging(status_updates, action)
 
-    with rich.progress.Progress(console=console, refresh_per_second=20, transient=False) as progress:
+
+def _process_docker_status_updates_with_progress_bar(status_updates: Iterable[DockerStatusUpdate], action: str) -> None:
+    with rich.progress.Progress() as progress:
         layer_id_to_task_id = {}
         overall_task_id = progress.add_task(description=f'[bold blue]{action} Docker image', total=None)
 
@@ -58,16 +63,12 @@ def process_docker_status_updates(status_updates: Iterable[DockerStatusUpdate],
                         completed=progress_detail['current'],
                         total=progress_detail['total'],
                     )
-                    progress.refresh()
-                    sys.stdout.flush()
                 elif update['status'] == 'Layer already exists':
                     progress.update(
                         completed=100,
                         task_id=layer_id_to_task_id[layer_id],
                         total=100,
                     )
-                    progress.refresh()
-                    sys.stdout.flush()
             elif 'status' in update and 'id' in update:
                 layer_id = update['id']
                 status = update['status']
@@ -79,14 +80,10 @@ def process_docker_status_updates(status_updates: Iterable[DockerStatusUpdate],
                     progress.update(
                         task_id=layer_id_to_task_id[layer_id], description=f'[yellow]{status} layer {layer_id}'
                     )
-                    progress.refresh()
-                    sys.stdout.flush()
                 elif status in ['Pushing', 'Uploading']:
                     progress.update(
                         task_id=layer_id_to_task_id[layer_id], description=f'[cyan]{status} layer {layer_id}'
                     )
-                    progress.refresh()
-                    sys.stdout.flush()
                 elif status in ['Pushed', 'Uploaded']:
                     progress.update(
                         task_id=layer_id_to_task_id[layer_id],
@@ -94,8 +91,6 @@ def process_docker_status_updates(status_updates: Iterable[DockerStatusUpdate],
                         completed=100,
                         total=100,
                     )
-                    progress.refresh()
-                    sys.stdout.flush()
                 elif status == 'Layer already exists':
                     progress.update(
                         task_id=layer_id_to_task_id[layer_id],
@@ -103,18 +98,82 @@ def process_docker_status_updates(status_updates: Iterable[DockerStatusUpdate],
                         completed=100,
                         total=100,
                     )
-                    progress.refresh()
-                    sys.stdout.flush()
             elif 'status' in update and update['status']:
                 status = update['status']
                 if status not in ['Preparing', 'Pushing', 'Pushed', 'Waiting', 'Layer already exists']:
                     progress.update(task_id=overall_task_id, description=f'[bold blue]{action} Docker image - {status}')
-                    progress.refresh()
-                    sys.stdout.flush()
             elif 'status' not in update and 'progressDetail' not in update:
                 print(update)
 
 
+def _process_docker_status_updates_with_logging(status_updates: Iterable[DockerStatusUpdate], action: str) -> None:
+    layer_progress = {}
+    layer_status = {}
+    last_log_time = time.time()
+
+    logger.info(f'{action} Docker image...')
+
+    for update in status_updates:
+        current_time = time.time()
+
+        if 'progressDetail' in update and 'id' in update:
+            layer_id = update['id']
+            progress_detail = update['progressDetail']
+
+            if progress_detail and 'current' in progress_detail and 'total' in progress_detail:
+                current = progress_detail['current']
+                total = progress_detail['total']
+                percentage = (current / total * 100) if total > 0 else 0
+                layer_progress[layer_id] = percentage
+                layer_status[layer_id] = f'{action.lower()}'
+            elif update.get('status') == 'Layer already exists':
+                layer_progress[layer_id] = 100
+                layer_status[layer_id] = 'already exists'
+
+        elif 'status' in update and 'id' in update:
+            layer_id = update['id']
+            status = update['status']
+            layer_status[layer_id] = status.lower()
+
+            if status in ['Pushed', 'Uploaded'] or status == 'Layer already exists':
+                layer_progress[layer_id] = 100
+
+        elif 'status' in update and update['status']:
+            status = update['status']
+            if status not in ['Preparing', 'Pushing', 'Pushed', 'Waiting', 'Layer already exists']:
+                logger.info(f'{action} Docker image - {status}')
+
+        if current_time - last_log_time >= 10.0:
+            _log_progress_summary(action, layer_progress, layer_status)
+            last_log_time = current_time
+
+    _log_progress_summary(action, layer_progress, layer_status)
+    logger.info(f'{action} Docker image completed')
+
+
+def _log_progress_summary(action: str, layer_progress: dict, layer_status: dict) -> None:
+    if not layer_progress and not layer_status:
+        return
+
+    completed_layers = sum(1 for progress in layer_progress.values() if progress >= 100)
+    total_layers = len(layer_progress) if layer_progress else len(layer_status)
+
+    if total_layers > 0:
+        overall_percentage = completed_layers / total_layers * 100
+        logger.info(
+            f'{action} progress: {completed_layers}/{total_layers} layers completed ({overall_percentage:.1f}%)'
+        )
+
+    active_layers = [
+        layer_id
+        for layer_id, status in layer_status.items()
+        if status in ['preparing', 'waiting', 'pushing', 'uploading'] and layer_progress.get(layer_id, 0) < 100
+    ]
+
+    if active_layers:
+        logger.info(f'Active layers: {", ".join(active_layers[:5])}{"..." if len(active_layers) > 5 else ""}')
+
+
 def set_app_version_as_active(
     app_version_uuid: str,
 ):

{pybiolib-1.2.874 → pybiolib-1.2.878}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pybiolib"
-version = "1.2.874"
+version = "1.2.878"
 description = "BioLib Python Client"
 readme = "PYPI_README.md"
 license = "MIT"