pybiolib 1.2.874__py3-none-any.whl → 1.2.878__py3-none-any.whl

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.dist-info → pybiolib-1.2.878.dist-info}/METADATA

@@ -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.dist-info → pybiolib-1.2.878.dist-info}/RECORD

@@ -21,7 +21,7 @@ biolib/_internal/llm_instructions/.github/instructions/style-react-ts.instructio
 biolib/_internal/llm_instructions/.github/prompts/biolib_app_inputs.prompt.md,sha256=SMzXZImdID0yKjhE1fG54VrHdD8IVuwRxRKsMF-KjWs,697
 biolib/_internal/llm_instructions/.github/prompts/biolib_run_apps.prompt.md,sha256=-t1bmGr3zEFa6lKHaLcI98yq4Sg1TCMW8xbelNSHaOA,696
 biolib/_internal/llm_instructions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-biolib/_internal/push_application.py,sha256=TaARo11N8oLsH0ptAepQ_8sqKrtr6dEg3ipItDNT7oo,15082
+biolib/_internal/push_application.py,sha256=nyZ8vd4nMAqySYRBDfzCa1vAB1S2DU7sOt7H22Ph1Ss,17464
 biolib/_internal/runtime.py,sha256=BiHl4klUHr36MCpqKaUso4idHeBZfPAahLYRQrabFqA,486
 biolib/_internal/templates/__init__.py,sha256=NVbhLUMC8HITzkLvP88Qu7FHaL-SvQord-DX3gh1Ykk,24
 biolib/_internal/templates/init_template/.biolib/config.yml,sha256=y4ndTgbFvUE1UiGcIOqogT2Wm8jahGffeyU5rlCEltQ,427
@@ -140,8 +140,8 @@ biolib/utils/cache_state.py,sha256=u256F37QSRIVwqKlbnCyzAX4EMI-kl6Dwu6qwj-Qmag,3
 biolib/utils/multipart_uploader.py,sha256=XvGP1I8tQuKhAH-QugPRoEsCi9qvbRk-DVBs5PNwwJo,8452
 biolib/utils/seq_util.py,sha256=Ozk0blGtPur_D9MwShD02r_mphyQmgZkx-lOHOwnlIM,6730
 biolib/utils/zip/remote_zip.py,sha256=0wErYlxir5921agfFeV1xVjf29l9VNgGQvNlWOlj2Yc,23232
-pybiolib-1.2.874.dist-info/LICENSE,sha256=F2h7gf8i0agDIeWoBPXDMYScvQOz02pAWkKhTGOHaaw,1067
-pybiolib-1.2.874.dist-info/METADATA,sha256=2q9W-fdI4BFUX-RmWJDc48jXb3efsQuHhzrBcYy-yu8,1570
-pybiolib-1.2.874.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-pybiolib-1.2.874.dist-info/entry_points.txt,sha256=p6DyaP_2kctxegTX23WBznnrDi4mz6gx04O5uKtRDXg,42
-pybiolib-1.2.874.dist-info/RECORD,,
+pybiolib-1.2.878.dist-info/LICENSE,sha256=F2h7gf8i0agDIeWoBPXDMYScvQOz02pAWkKhTGOHaaw,1067
+pybiolib-1.2.878.dist-info/METADATA,sha256=KbuzZ2QK3MdPKoTdKfS_BzHc-jp-OBMB2fty1BKNadg,1570
+pybiolib-1.2.878.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+pybiolib-1.2.878.dist-info/entry_points.txt,sha256=p6DyaP_2kctxegTX23WBznnrDi4mz6gx04O5uKtRDXg,42
+pybiolib-1.2.878.dist-info/RECORD,,