libpipe 0.9__tar.gz → 0.9.1__tar.gz

{libpipe-0.9 → libpipe-0.9.1}/PKG-INFO

@@ -1,18 +1,17 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.3
 Name: libpipe
-Version: 0.9
+Version: 0.9.1
 Summary: Pipeline orchestration and node management utilities
-License-Expression: GPL-3.0-or-later
-License-File: LICENSE
+License: GPL-3.0-or-later
 Author: Florent Mertens
 Author-email: florent.mertens@gmail.com
 Requires-Python: >=3.10,<4.0
+Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
-Classifier: Programming Language :: Python :: 3.14
 Provides-Extra: dev
 Provides-Extra: docs
 Requires-Dist: asyncssh (>=2.0)

{libpipe-0.9 → libpipe-0.9.1}/libpipe/worker.py

@@ -693,6 +693,7 @@ class SlurmClient:
             text = line.decode(errors='replace')
             if task.slurm_job_id is None and text.startswith(SLURM_MARKER):
                 task.slurm_job_id = text[len(SLURM_MARKER):].split()[0]
+                task.start_time = time.time()
             task.log(line, self.host)
 
     async def execute(self, task):
@@ -705,6 +706,8 @@ class SlurmClient:
                 self.srun_command(task), stdout=asyncio.subprocess.PIPE,
                 stderr=asyncio.subprocess.PIPE, preexec_fn=os.setpgrp, env=self.env)
             task.set_process(Process(self, process))
+            # srun waits for the job or the step to start: running from the marker line
+            task.start_time = None
 
             await asyncio.gather(
                 self._log_stdout(task, process.stdout),
@@ -1096,6 +1099,7 @@ class WorkerPool:
                 tasks = self.get_all_tasks()
                 n_done = len(tasks[TaskStatus.SUCCESS])
                 n_todo = len(tasks[TaskStatus.WAITING]) + len(tasks[TaskStatus.RUNNING])
+                self._start_pbar_timer()
                 self.pbar.update(n_done)
 
                 if self.max_time is not None:
@@ -1104,6 +1108,15 @@ class WorkerPool:
         except asyncio.CancelledError:
             pass
 
+    def _start_pbar_timer(self):
+        """Time the pool from the first task start, without the wait for the Slurm jobs."""
+        if self.pbar_timed:
+            return
+        starts = [t.start_time for t in self.tasks if t.start_time is not None]
+        if starts:
+            self.pbar.start_time = datetime.datetime.fromtimestamp(min(starts))
+            self.pbar_timed = True
+
     async def _enforce_max_time(self):
         now = time.time()
         for worker in self.workers:
@@ -1150,6 +1163,7 @@ class WorkerPool:
         self.tasks.sort(key=lambda task: not task.run_on_host)
 
         self.pbar.start(max_value=len(self.tasks))
+        self.pbar_timed = False
 
         # An allocation no larger than the number of tasks
         for client in {w.client for w in self.workers}:

{libpipe-0.9 → libpipe-0.9.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [project]
 name = "libpipe"
-version = "0.9"
+version = "0.9.1"
 description = "Pipeline orchestration and node management utilities"
 readme = "README.md"
 license = "GPL-3.0-or-later"