oh-my-batch 0.5.6__tar.gz → 0.6.0__tar.gz

{oh_my_batch-0.5.6 → oh_my_batch-0.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: oh-my-batch
-Version: 0.5.6
+Version: 0.6.0
 Summary: 
 License: GPL
 Author: weihong.xu

{oh_my_batch-0.5.6 → oh_my_batch-0.6.0}/oh_my_batch/batch.py

@@ -1,3 +1,4 @@
+from typing import Optional
 import shlex
 import os
 
@@ -25,6 +26,24 @@ class BatchMaker:
         self._work_dirs.extend(paths)
         return self
 
+    def filter(self, expr: str):
+        """
+        Filter working directories with a Python expression
+
+        :param expr: Python expression, the variable `{workdir} or {w}` is the directory path,
+                     `{index} or {i}` is the index of the directory
+
+        Example: if expr is 'os.path.exits("{workdir}/input.json")',
+        then only the directories containing 'input.json' will be kept.
+        """
+        filtered = []
+        for i, workdir in enumerate(self._work_dirs):
+            expr_eval = expr.format(workdir=workdir, w=workdir, index=i, i=i)
+            if eval(expr_eval):
+                filtered.append(workdir)
+        self._work_dirs = filtered
+        return self
+
     def add_header_files(self, *file: str, encoding='utf-8'):
         """
         Add script header from files

{oh_my_batch-0.5.6 → oh_my_batch-0.6.0}/oh_my_batch/job.py

@@ -88,13 +88,16 @@ class BaseJobManager:
 
             time.sleep(interval)
 
-        error = False
+        raise_err = False
         for job in jobs:
-            if not JobState.is_success(job['state']):
+            if not JobState.is_terminal(job['state']):
+                logger.warning('Job %s is running, current state: %s', job['script'], job['state'])
+                raise_err = True
+            elif not JobState.is_success(job['state']):
                 logger.error('Job %s failed', job['script'])
-                error = True
-        if error and wait:
-            raise RuntimeError('Some jobs failed')
+                raise_err = True
+        if raise_err and wait:
+            raise RuntimeError('Some jobs failed or not finished yet')
 
     def wait(self, *job_ids, timeout=None, interval=10):
         """

{oh_my_batch-0.5.6 → oh_my_batch-0.6.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "oh-my-batch"
-version = "0.5.6"
+version = "0.6.0"
 description = ""
 authors = ["weihong.xu <xuweihong.cn@gmail.com>"]
 license = "GPL"