oh-my-batch 0.2.1__tar.gz → 0.2.2__tar.gz

{oh_my_batch-0.2.1 → oh_my_batch-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: oh-my-batch
-Version: 0.2.1
+Version: 0.2.2
 Summary: 
 License: GPL
 Author: weihong.xu
@@ -13,6 +13,7 @@ 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
 
@@ -28,27 +29,29 @@ A toolkit to manipulate batch tasks with command line. Designed for scientific c
 * `omb combo`: generate folders/files from different combinations of parameters
 * `omb batch`: generate batch scripts from multiple working directories
 * `omb job`: track the state of job in job schedular
-
-## Shell Tips
-`oh-my-batch` is intended to help you implement computational workflows with shell scripts.
-To make the best use of `oh-my-batch`, you need to know some shell tips.
-
-* [Retry commands until success in shell script](https://stackoverflow.com/a/79191004/3099733)
+* `omb misc`: miscellaneous commands
 
 ## Install
 ```bash
 pip install oh-my-batch
 ```
 
+## Shell tips
+`oh-my-batch` is intended to help you implement computational workflows with shell scripts.
+To make the best use of `oh-my-batch`, you need to know some shell tips.
+
+* [Retry commands until success in shell script](https://stackoverflow.com/a/79191004/3099733)
+* [Run multiple line shell script with ssh](https://stackoverflow.com/a/32082912/3099733)
+
 ## Use cases
-### Load useful functions to your shell script
+### Load functions in shell script
 You can load useful functions from `oh-my-batch` this way:
 
 ```bash
-omb misc export-shell-func > omb-func.sh && source omb-func.sh
+omb misc export-shell-func > omb-func.sh && source omb-func.sh && rm omb-func.sh
 ```
 
-This will load some useful functions to your shell script, for example, `checkpoint` function.
+This will load some functions to your shell script, for example, `checkpoint`.
 
 ### Generate files from different combinations of parameters
 
@@ -66,8 +69,8 @@ touch tmp/1.data tmp/2.data tmp/3.data
 
 # prepare a lammps input file template
 cat > tmp/in.lmp.tmp <<EOF
-read_data $DATA_FILE
-velocity all create $TEMP $RANDOM
+read_data @DATA_FILE
+velocity all create @TEMP @RANDOM
 run 1000
 EOF
 

{oh_my_batch-0.2.1 → oh_my_batch-0.2.2}/README.md

@@ -10,27 +10,29 @@ A toolkit to manipulate batch tasks with command line. Designed for scientific c
 * `omb combo`: generate folders/files from different combinations of parameters
 * `omb batch`: generate batch scripts from multiple working directories
 * `omb job`: track the state of job in job schedular
-
-## Shell Tips
-`oh-my-batch` is intended to help you implement computational workflows with shell scripts.
-To make the best use of `oh-my-batch`, you need to know some shell tips.
-
-* [Retry commands until success in shell script](https://stackoverflow.com/a/79191004/3099733)
+* `omb misc`: miscellaneous commands
 
 ## Install
 ```bash
 pip install oh-my-batch
 ```
 
+## Shell tips
+`oh-my-batch` is intended to help you implement computational workflows with shell scripts.
+To make the best use of `oh-my-batch`, you need to know some shell tips.
+
+* [Retry commands until success in shell script](https://stackoverflow.com/a/79191004/3099733)
+* [Run multiple line shell script with ssh](https://stackoverflow.com/a/32082912/3099733)
+
 ## Use cases
-### Load useful functions to your shell script
+### Load functions in shell script
 You can load useful functions from `oh-my-batch` this way:
 
 ```bash
-omb misc export-shell-func > omb-func.sh && source omb-func.sh
+omb misc export-shell-func > omb-func.sh && source omb-func.sh && rm omb-func.sh
 ```
 
-This will load some useful functions to your shell script, for example, `checkpoint` function.
+This will load some functions to your shell script, for example, `checkpoint`.
 
 ### Generate files from different combinations of parameters
 
@@ -48,8 +50,8 @@ touch tmp/1.data tmp/2.data tmp/3.data
 
 # prepare a lammps input file template
 cat > tmp/in.lmp.tmp <<EOF
-read_data $DATA_FILE
-velocity all create $TEMP $RANDOM
+read_data @DATA_FILE
+velocity all create @TEMP @RANDOM
 run 1000
 EOF
 

{oh_my_batch-0.2.1 → oh_my_batch-0.2.2}/oh_my_batch/combo.py

@@ -1,6 +1,7 @@
 from itertools import product
 from string import Template
 import random
+import json
 import os
 
 from .util import expand_globs, mode_translate
@@ -67,7 +68,7 @@ class ComboMaker:
         self.add_var(key, *args, broadcast=broadcast)
         return self
 
-    def add_files(self, key: str, *path: str, broadcast=False, abs=False):
+    def add_files(self, key: str, *path: str, broadcast=False, abs=False, raise_invalid=False):
         """
         Add a variable with files by glob pattern
         For example, suppose there are 3 files named 1.txt, 2.txt, 3.txt in data directory,
@@ -78,8 +79,9 @@ class ComboMaker:
         :param path: Path to files, can include glob pattern
         :param broadcast: If True, values are broadcasted, otherwise they are producted when making combos
         :param abs: If True, path will be turned into absolute path
+        :param raise_invalid: If True, will raise error if no file found for a glob pattern
         """
-        args = expand_globs(path, raise_invalid=True)
+        args = expand_globs(path, raise_invalid=raise_invalid)
         if not args:
             raise ValueError(f"No files found for {path}")
         if abs:
@@ -87,7 +89,8 @@ class ComboMaker:
         self.add_var(key, *args, broadcast=broadcast)
         return self
 
-    def add_files_as_one(self, key: str, path: str, broadcast=False, sep=' ', abs=False):
+    def add_files_as_one(self, key: str, *path: str, broadcast=False, 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.
@@ -98,15 +101,25 @@ class ComboMaker:
         :param key: Variable name
         :param path: Path to files, can include glob pattern
         :param broadcast: If True, values are broadcasted, otherwise they are producted when making combos
+        :param format: the way to format the files, can be None, 'json-list','json-item'
         :param sep: Separator to join files
         :param abs: If True, path will be turned into absolute path
+        :param raise_invalid: If True, will raise error if no file found for a glob pattern
         """
-        args = expand_globs(path, raise_invalid=True)
+        args = expand_globs(path, raise_invalid=raise_invalid)
         if not args:
             raise ValueError(f"No files found for {path}")
         if abs:
             args = [os.path.abspath(p) for p in args]
-        self.add_var(key, sep.join(args), broadcast=broadcast)
+        if format is None:
+            value = sep.join(args)
+        elif format == 'json-list':
+            value = json.dumps(args)
+        elif format == 'json-item':
+            value = json.dumps(args).strip('[]')
+        else:
+            raise ValueError(f"Invalid format: {format}")
+        self.add_var(key, value, broadcast=broadcast)
         return self
 
     def add_var(self, key: str, *args, broadcast=False):
@@ -148,19 +161,20 @@ class ComboMaker:
                 raise ValueError(f"Variable {key} not found")
         return self
 
-    def make_files(self, template: str, dest: str, delimiter='$', mode=None):
+    def make_files(self, template: str, dest: str, delimiter='@', mode=None):
         """
         Make files from template
         The template file can include variables with delimiter.
-        For example, if delimiter is '$', then the template file can include $var1, $var2, ...
+        For example, if delimiter is '@', then the template file can include @var1, @var2, ...
 
         The destination can also include variables in string format style.
-        For example, if dest is 'output/{i}.txt', then files are saved as output/0.txt, output/1.txt, ...
+        For example, if dest is 'output/{i}-{TEMP}.txt', 
+        then files are saved as output/0-300K.txt, output/1-400K.txt, ...
 
         :param template: Path to template file
         :param dest: Path pattern to destination file
-        :param delimiter: Delimiter for variables in template, default is '$',
-        can be changed to other character, e.g $$, @, ...
+        :param delimiter: Delimiter for variables in template, default is '@', as '$' is popular in shell scripts
+        can be changed to other character, e.g $, $$, ...
         """
         _delimiter = delimiter
 

{oh_my_batch-0.2.1 → oh_my_batch-0.2.2}/pyproject.toml

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