oh-my-batch 0.5.6__py3-none-any.whl → 0.6.0__py3-none-any.whl

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/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.dist-info → oh_my_batch-0.6.0.dist-info}/METADATA

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

@@ -2,14 +2,14 @@ oh_my_batch/__init__.py,sha256=BsRNxZbqDWfaIZJGxzIDqCubRWztMGFDceW08TECuFs,98
 oh_my_batch/__main__.py,sha256=sWyFZMwWNvhkanwZSJRGfBBDoIevhC028dTSB67i6yI,61
 oh_my_batch/assets/__init__.py,sha256=Exub46UbQaz2V2eXpQeiVfnThQpXaNeuyjlGY6gBSZc,130
 oh_my_batch/assets/functions.sh,sha256=LaiavZBu84D7C1r-dWhf91vPTuHXCMV1DQZUIPVQnjE,1001
-oh_my_batch/batch.py,sha256=i3q1zY2li-YyN_99zjlpNJlZqqF5PSO3hwW1e0_N2VE,3958
+oh_my_batch/batch.py,sha256=AXVHZUxU0cJVWvqZQkqGDkNdAIQSPgwIoU9aFP46gzE,4692
 oh_my_batch/cli.py,sha256=Jyz8q2pUYke3mfJS6F_G9S9hApddgXxQw1BsN6Kfkjc,553
 oh_my_batch/combo.py,sha256=Twtzbv3hQUCNzwLjtbhmXJ_De5YNlL1mSzK-Zqejh7Y,11423
-oh_my_batch/job.py,sha256=Va-l24R6GxyqX2Ca5w6tr7hWgmJgQQRMHLjnlPAWkR4,7224
+oh_my_batch/job.py,sha256=fFoyLd0rKilV979ovEf0Y3iXgpyyDmHIfkMSZBaAX4Q,7446
 oh_my_batch/misc.py,sha256=G_iOovRCrShBJJCc82QLN0CvMqW4adOefEoY1GedEiw,452
 oh_my_batch/util.py,sha256=5ve2QcviuF0UHFLrsXmjMTj0ogXJ4g05q1y-yWCFuOk,2409
-oh_my_batch-0.5.6.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-oh_my_batch-0.5.6.dist-info/METADATA,sha256=y1j9wr06o4eXbYpuxxZZsivSK9TyofvKpKpxNnItRf0,5468
-oh_my_batch-0.5.6.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-oh_my_batch-0.5.6.dist-info/entry_points.txt,sha256=ZY2GutSoNjjSyJ4qO2pTeseKUFgoTYdvmgkuZZkwi68,77
-oh_my_batch-0.5.6.dist-info/RECORD,,
+oh_my_batch-0.6.0.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+oh_my_batch-0.6.0.dist-info/METADATA,sha256=2TyqwLxPUXk4O22-1k9Ngx-5E5zYkSl2uGgtcKznhdQ,5468
+oh_my_batch-0.6.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+oh_my_batch-0.6.0.dist-info/entry_points.txt,sha256=ZY2GutSoNjjSyJ4qO2pTeseKUFgoTYdvmgkuZZkwi68,77
+oh_my_batch-0.6.0.dist-info/RECORD,,