oh-my-batch 0.4.7__tar.gz → 0.4.8__tar.gz

{oh_my_batch-0.4.7 → oh_my_batch-0.4.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: oh-my-batch
-Version: 0.4.7
+Version: 0.4.8
 Summary: 
 License: GPL
 Author: weihong.xu
@@ -44,16 +44,6 @@ To make the best use of `oh-my-batch`, you need to know some shell tips.
 * [Run multiple line shell script with ssh](https://stackoverflow.com/a/32082912/3099733)
 
 ## Use cases
-### Load functions in shell script
-You can load useful functions from `oh-my-batch` this way:
-
-```bash
-eval "$(omb misc export-shell-func)"
-# or
-omb misc export-shell-func > omb-func.sh && source omb-func.sh
-```
-
-This will load extra functions to your shell script, for example, `checkpoint`.
 
 ### Generate files from different combinations of parameters
 

{oh_my_batch-0.4.7 → oh_my_batch-0.4.8}/README.md

@@ -25,16 +25,6 @@ To make the best use of `oh-my-batch`, you need to know some shell tips.
 * [Run multiple line shell script with ssh](https://stackoverflow.com/a/32082912/3099733)
 
 ## Use cases
-### Load functions in shell script
-You can load useful functions from `oh-my-batch` this way:
-
-```bash
-eval "$(omb misc export-shell-func)"
-# or
-omb misc export-shell-func > omb-func.sh && source omb-func.sh
-```
-
-This will load extra functions to your shell script, for example, `checkpoint`.
 
 ### Generate files from different combinations of parameters
 

{oh_my_batch-0.4.7 → oh_my_batch-0.4.8}/oh_my_batch/job.py

@@ -94,6 +94,25 @@ class BaseJobManager:
                 error = True
         if error:
             raise RuntimeError('Some jobs failed')
+    
+    def wait(self, *job_ids, timeout=None, interval=10):
+        """
+        Wait for jobs to finish
+
+        :param job_ids: Job ids to wait for
+        :param timeout: Timeout in seconds
+        :param interval: Interval in seconds for checking job status
+        """
+        current = time.time()
+        while True:
+            jobs = [{'id': j, 'state': JobState.NULL} for j in job_ids]
+            jobs = self._update_state(jobs)
+            if all(JobState.is_terminal(j['state']) for j in jobs):
+                break
+            if timeout and time.time() - current > timeout:
+                logger.error('Timeout, current state: %s', jobs)
+                break
+            time.sleep(interval)
 
     def _update_jobs(self, jobs: List[dict], max_tries: int, submit_opts: str):
         jobs = self._update_state(jobs)
@@ -135,7 +154,7 @@ class Slurm(BaseJobManager):
                 logger.error('Failed to query job status: %s', log_cp(cp))
                 return jobs
             out = cp.stdout.decode('utf-8')
-            logger.info('Job status:\n%s', out)
+            logger.debug('Job status:\n%s', out)
             new_state = parse_csv(out)
         else:
             new_state = []

{oh_my_batch-0.4.7 → oh_my_batch-0.4.8}/pyproject.toml

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