oh-my-batch 0.4.0__py3-none-any.whl → 0.4.2__py3-none-any.whl

oh_my_batch/combo.py

@@ -4,7 +4,7 @@ import random
 import json
 import os
 
-from .util import expand_globs, mode_translate, ensure_dir
+from .util import expand_globs, mode_translate, ensure_dir, shell_run
 
 class ComboMaker:
 
@@ -85,13 +85,13 @@ class ComboMaker:
         self.add_var(key, *args)
         return self
 
-    def add_files_as_one(self, key: str, *path: str, format=None,
+    def add_file_set(self, key: str, *path: str, format=None,
                          sep=' ', abs=False, raise_invalid=False):
         """
         Add a variable with files by glob pattern as one string
         Unlike add_files, this function joins the files with a delimiter.
         For example, suppose there are 1.txt, 2.txt, 3.txt in data directory,
-        then calling add_files_as_one('DATA_FILE', 'data/*.txt') will add string "data/1.txt data/2.txt data/3.txt"
+        then calling add_file_set('DATA_FILE', 'data/*.txt') will add string "data/1.txt data/2.txt data/3.txt"
         to the variable DATA_FILE.
 
         :param key: Variable name
@@ -144,7 +144,7 @@ class ComboMaker:
             else:
                 raise ValueError(f"Variable {key} not found")
         return self
-    
+
     def set_broadcast(self, *keys: str):
         """
         Specify variables use broadcast strategy instead of cartesian product
@@ -215,6 +215,28 @@ class ComboMaker:
             print(out)
         return self
 
+    def run_cmd(self, cmd: str):
+        """
+        Run command against each combo
+
+        For example,
+
+        run_cmd "cp {DATA_FIEL} ./path/to/workdir/{i}/data.txt"
+
+        will copy each file in DATA_FILE to ./path/to/workdir/{i}/data.txt
+
+        :param cmd: Command to run, can include format style variables, e.g. {i}, {i:03d}, {TEMP}
+        """
+        combos = self._make_combos()
+        for i, combo in enumerate(combos):
+            _cmd = cmd.format(i=i, **combo)
+            cp = shell_run(_cmd)
+            if cp.returncode != 0:
+                print(cp.stdout.decode('utf-8'))
+                print(cp.stderr.decode('utf-8'))
+                raise RuntimeError(f"Failed to run command: {_cmd}")
+        return self
+
     def done(self):
         """
         End of command chain
@@ -224,13 +246,13 @@ class ComboMaker:
     def _make_combos(self):
         if not self._vars:
             return self._combos
-        
+
         broadcast_vars = {}
-        
+
         for k in self._broadcast_keys:
             broadcast_vars[k] = self._vars[k]
             del self._vars[k]
-            
+
         keys = self._vars.keys()
         values_list = product(*self._vars.values())
 

{oh_my_batch-0.4.0.dist-info → oh_my_batch-0.4.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: oh-my-batch
-Version: 0.4.0
+Version: 0.4.2
 Summary: 
 License: GPL
 Author: weihong.xu
@@ -13,7 +13,6 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: fire (>=0.7.0,<0.8.0)
 Description-Content-Type: text/markdown
 
@@ -86,9 +85,9 @@ omb combo \
     add_files DATA_FILE tmp/*.data - \
     add_var TEMP 300 400 500 - \
     add_randint RANDOM -n 3 -a 1 -b 1000 - \
+    set_broadcast RANDOM - \
     make_files tmp/tasks/{i}-T-{TEMP}/in.lmp --template tmp/in.lmp.tmp - \
     make_files tmp/tasks/{i}-T-{TEMP}/run.sh --template tmp/run.sh.tmp --mode 755 - \
-    set_broadcast RANDOM - \
     done
 ```
 

{oh_my_batch-0.4.0.dist-info → oh_my_batch-0.4.2.dist-info}/RECORD

@@ -4,12 +4,12 @@ oh_my_batch/assets/__init__.py,sha256=Exub46UbQaz2V2eXpQeiVfnThQpXaNeuyjlGY6gBSZ
 oh_my_batch/assets/functions.sh,sha256=LaiavZBu84D7C1r-dWhf91vPTuHXCMV1DQZUIPVQnjE,1001
 oh_my_batch/batch.py,sha256=6qnaXEVyA493heGzzbCrdZXCcnYk8zgl7WP0rmo7KlU,3690
 oh_my_batch/cli.py,sha256=Jyz8q2pUYke3mfJS6F_G9S9hApddgXxQw1BsN6Kfkjc,553
-oh_my_batch/combo.py,sha256=63F6plpGcVjKwdKCQ8b0dQhNCjHwXVirfnHPZDLe49U,8598
+oh_my_batch/combo.py,sha256=XK1t3rOQozf9oBYPr_CER7jhCMYpqJaZo0ke4ctK7t0,9307
 oh_my_batch/job.py,sha256=Uk0E-WxnexBu9wuUV3uc1aAwVF_5rWdNdLEOB8Y9B-U,6252
 oh_my_batch/misc.py,sha256=G_iOovRCrShBJJCc82QLN0CvMqW4adOefEoY1GedEiw,452
 oh_my_batch/util.py,sha256=5ve2QcviuF0UHFLrsXmjMTj0ogXJ4g05q1y-yWCFuOk,2409
-oh_my_batch-0.4.0.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-oh_my_batch-0.4.0.dist-info/METADATA,sha256=cOScID0UVLkM7O2Y8D4bBOTUWVqwxHss-DpN1ZH1Ctg,5560
-oh_my_batch-0.4.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-oh_my_batch-0.4.0.dist-info/entry_points.txt,sha256=ZY2GutSoNjjSyJ4qO2pTeseKUFgoTYdvmgkuZZkwi68,77
-oh_my_batch-0.4.0.dist-info/RECORD,,
+oh_my_batch-0.4.2.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+oh_my_batch-0.4.2.dist-info/METADATA,sha256=VrGmQGhqGB3RGqy8E5sxS4o288Ddd-uNqjTKnZmtAts,5509
+oh_my_batch-0.4.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+oh_my_batch-0.4.2.dist-info/entry_points.txt,sha256=ZY2GutSoNjjSyJ4qO2pTeseKUFgoTYdvmgkuZZkwi68,77
+oh_my_batch-0.4.2.dist-info/RECORD,,

{oh_my_batch-0.4.0.dist-info → oh_my_batch-0.4.2.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.9.1
+Generator: poetry-core 1.9.0
 Root-Is-Purelib: true
 Tag: py3-none-any