pybiolib 1.2.1304__tar.gz → 1.2.1310__tar.gz

{pybiolib-1.2.1304 → pybiolib-1.2.1310}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pybiolib
-Version: 1.2.1304
+Version: 1.2.1310
 Summary: BioLib Python Client
 License: MIT
 License-File: LICENSE

{pybiolib-1.2.1304 → pybiolib-1.2.1310}/biolib/_internal/push_application.py

@@ -21,7 +21,7 @@ from biolib.biolib_api_client.biolib_app_api import BiolibAppApi
 from biolib.biolib_docker_client import BiolibDockerClient
 from biolib.biolib_errors import BioLibError
 from biolib.biolib_logging import logger
-from biolib.typing_utils import Iterable, Optional, Set, TypedDict
+from biolib.typing_utils import Dict, Iterable, Optional, Set, TypedDict
 from biolib.utils.app_uri import parse_app_uri
 
 REGEX_MARKDOWN_INLINE_IMAGE = re.compile(r'!\[(?P<alt>.*)\]\((?P<src>.*)\)')
@@ -109,8 +109,10 @@ def _process_docker_status_updates_with_progress_bar(status_updates: Iterable[Do
 
 
 def _process_docker_status_updates_with_logging(status_updates: Iterable[DockerStatusUpdate], action: str) -> None:
-    layer_progress = {}
-    layer_status = {}
+    layer_progress: Dict[str, float] = {}
+    layer_status: Dict[str, str] = {}
+    layer_details: Dict[str, Dict[str, int]] = {}
+    layer_bytes_at_last_log: Dict[str, int] = {}
     last_log_time = time.time()
 
     logger.info(f'{action} Docker image...')
@@ -128,6 +130,7 @@ def _process_docker_status_updates_with_logging(status_updates: Iterable[DockerS
                 percentage = (current / total * 100) if total > 0 else 0
                 layer_progress[layer_id] = percentage
                 layer_status[layer_id] = f'{action.lower()}'
+                layer_details[layer_id] = {'current': current, 'total': total}
             elif update.get('status') == 'Layer already exists':
                 layer_progress[layer_id] = 100
                 layer_status[layer_id] = 'already exists'
@@ -146,16 +149,33 @@ def _process_docker_status_updates_with_logging(status_updates: Iterable[DockerS
                 logger.info(f'{action} Docker image - {status}')
 
         if current_time - last_log_time >= 10.0:
-            _log_progress_summary(action, layer_progress, layer_status)
+            _log_progress_summary(
+                action,
+                layer_progress,
+                layer_status,
+                layer_details,
+                layer_bytes_at_last_log,
+                current_time - last_log_time,
+            )
+            layer_bytes_at_last_log = {lid: details['current'] for lid, details in layer_details.items()}
             last_log_time = current_time
 
-    _log_progress_summary(action, layer_progress, layer_status)
+    _log_progress_summary(
+        action, layer_progress, layer_status, layer_details, layer_bytes_at_last_log, time.time() - last_log_time
+    )
     if action == 'Pushing':
         logger.info('Pushing final image manifest...')
     logger.info(f'{action} Docker image completed')
 
 
-def _log_progress_summary(action: str, layer_progress: dict, layer_status: dict) -> None:
+def _log_progress_summary(
+    action: str,
+    layer_progress: Dict[str, float],
+    layer_status: Dict[str, str],
+    layer_details: Dict[str, Dict[str, int]],
+    layer_bytes_at_last_log: Dict[str, int],
+    time_delta: float,
+) -> None:
     if not layer_progress and not layer_status:
         return
 
@@ -174,7 +194,36 @@ def _log_progress_summary(action: str, layer_progress: dict, layer_status: dict)
         if status in ['preparing', 'waiting', 'pushing', 'uploading'] and layer_progress.get(layer_id, 0) < 100
     ]
 
-    if active_layers:
+    if active_layers and layer_details:
+        total_bytes_transferred = 0
+        layer_info_parts = []
+
+        for layer_id in active_layers[:5]:
+            if layer_id in layer_details:
+                details = layer_details[layer_id]
+                current = details['current']
+                total = details['total']
+                percentage = layer_progress.get(layer_id, 0)
+
+                bytes_since_last = current - layer_bytes_at_last_log.get(layer_id, 0)
+                total_bytes_transferred += bytes_since_last
+
+                current_mb = current / (1024 * 1024)
+                total_mb = total / (1024 * 1024)
+                layer_info_parts.append(f'{layer_id}: {current_mb:.1f}/{total_mb:.1f} MB ({percentage:.1f}%)')
+
+        speed_info = ''
+        if time_delta > 0 and total_bytes_transferred > 0:
+            speed_mbps = (total_bytes_transferred / (1024 * 1024)) / time_delta
+            speed_info = f' @ {speed_mbps:.2f} MB/s'
+
+        more_layers_info = ''
+        if len(active_layers) > 5:
+            more_layers_info = f' (+ {len(active_layers) - 5} more)'
+
+        if layer_info_parts:
+            logger.info(f'Active layers: {", ".join(layer_info_parts)}{speed_info}{more_layers_info}')
+    elif active_layers:
         logger.info(f'Active layers: {", ".join(active_layers[:5])}{"..." if len(active_layers) > 5 else ""}')
 
 

{pybiolib-1.2.1304 → pybiolib-1.2.1310}/biolib/jobs/job.py

@@ -498,11 +498,11 @@ class Result:
             stdout_and_stderr_package = base64.b64decode(stdout_and_stderr_package_b64)
             stdout_and_stderr = StdoutAndStderr(stdout_and_stderr_package).deserialize()
 
-            sys.stdout.write(stdout_and_stderr.decode())
+            sys.stdout.buffer.write(stdout_and_stderr)
             if not IS_RUNNING_IN_NOTEBOOK:  # for some reason flushing in jupyter notebooks breaks \r handling
-                sys.stdout.flush()
+                sys.stdout.buffer.flush()
         # flush after having processed all packages
-        sys.stdout.flush()
+        sys.stdout.buffer.flush()
 
     def show(self) -> None:
         self._refetch_job_dict()
@@ -522,11 +522,11 @@ class Result:
             logger.info(f'--- The result {self.id} has already completed (no streaming will take place) ---')
             logger.info('--- The stdout log is printed below: ---')
             sys.stdout.flush()
-            print(self.get_stdout().decode(), file=sys.stdout)
-            sys.stdout.flush()
+            sys.stdout.buffer.write(self.get_stdout())
+            sys.stdout.buffer.flush()
             logger.info('--- The stderr log is printed below: ---')
-            print(self.get_stderr().decode(), file=sys.stderr)
-            sys.stderr.flush()
+            sys.stderr.buffer.write(self.get_stderr())
+            sys.stderr.buffer.flush()
             logger.info(f'--- The job {self.id} has already completed. Its output was printed above. ---')
             return
 

{pybiolib-1.2.1304 → pybiolib-1.2.1310}/pyproject.toml

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