hpcflow-new2 0.2.0a153__tar.gz → 0.2.0a156__tar.gz

{hpcflow_new2-0.2.0a153 → hpcflow_new2-0.2.0a156}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hpcflow-new2
-Version: 0.2.0a153
+Version: 0.2.0a156
 Summary: Computational workflow management
 License: MIT
 Author: aplowman

hpcflow_new2-0.2.0a156/hpcflow/_version.py

@@ -0,0 +1 @@
+__version__ = "0.2.0a156"

{hpcflow_new2-0.2.0a153 → hpcflow_new2-0.2.0a156}/hpcflow/sdk/app.py

@@ -822,12 +822,12 @@ class BaseApp(metaclass=Singleton):
             # load the file, modify, then dump to temp location:
             if builtin_path.suffix in (".yaml", ".yml"):
                 # use round-trip loader to preserve comments:
-                data = read_YAML_file(builtin_path, typ="rt")
+                data = read_YAML_file(builtin_path, typ="rt", variables=False)
                 data.pop("doc", None)
                 write_YAML_file(data, path, typ="rt")
 
             elif builtin_path.suffix in (".json", ".jsonc"):
-                data = read_JSON_file(builtin_path)
+                data = read_JSON_file(builtin_path, variables=False)
                 data.pop("doc", None)
                 write_JSON_file(data, path)
 

{hpcflow_new2-0.2.0a153 → hpcflow_new2-0.2.0a156}/hpcflow/sdk/core/utils.py

@@ -387,22 +387,36 @@ def check_in_object_list(spec_name, spec_pos=1, obj_list_pos=2):
     return decorator
 
 
+@TimeIt.decorator
 def substitute_string_vars(string, variables: Dict[str, str] = None):
     variables = variables or {}
 
     def var_repl(match_obj):
-        var_name = match_obj.group(1)
+        kwargs = {}
+        var_name, kwargs_str = match_obj.groups()
+        if kwargs_str:
+            kwargs_lst = kwargs_str.split(",")
+            for i in kwargs_lst:
+                k, v = i.strip().split("=")
+                kwargs[k.strip()] = v.strip()
         try:
             out = str(variables[var_name])
         except KeyError:
-            raise MissingVariableSubstitutionError(
-                f"The variable {var_name!r} referenced in the string does not match any "
-                f"of the provided variables: {list(variables)!r}."
-            )
+            if "default" in kwargs:
+                out = kwargs["default"]
+                print(
+                    f"Using default value ({out!r}) for workflow template string "
+                    f"variable {var_name!r}."
+                )
+            else:
+                raise MissingVariableSubstitutionError(
+                    f"The variable {var_name!r} referenced in the string does not match "
+                    f"any of the provided variables: {list(variables)!r}."
+                )
         return out
 
     new_str = re.sub(
-        pattern=r"\<\<var:(.*?)\>\>",
+        pattern=r"\<\<var:(.*?)(?:\[(.*)\])?\>\>",
         repl=var_repl,
         string=string,
     )
@@ -412,7 +426,7 @@ def substitute_string_vars(string, variables: Dict[str, str] = None):
 @TimeIt.decorator
 def read_YAML_str(yaml_str, typ="safe", variables: Dict[str, str] = None):
     """Load a YAML string."""
-    if variables:
+    if variables is not False and "<<var:" in yaml_str:
         yaml_str = substitute_string_vars(yaml_str, variables=variables)
     yaml = YAML(typ=typ)
     return yaml.load(yaml_str)
@@ -432,7 +446,7 @@ def write_YAML_file(obj, path: PathLike, typ="safe"):
 
 
 def read_JSON_string(json_str: str, variables: Dict[str, str] = None):
-    if variables:
+    if variables is not False and "<<var:" in json_str:
         json_str = substitute_string_vars(json_str, variables=variables)
     return json.loads(json_str)
 

{hpcflow_new2-0.2.0a153 → hpcflow_new2-0.2.0a156}/hpcflow/sdk/demo/cli.py

@@ -120,7 +120,7 @@ def get_demo_workflow_CLI(app):
             store=store,
             ts_fmt=ts_fmt,
             ts_name_fmt=ts_name_fmt,
-            variables=variables,
+            variables=dict(variables),
         )
         click.echo(wk.path)
 
@@ -164,7 +164,7 @@ def get_demo_workflow_CLI(app):
             store=store,
             ts_fmt=ts_fmt,
             ts_name_fmt=ts_name_fmt,
-            variables=variables,
+            variables=dict(variables),
             JS_parallelism=js_parallelism,
             wait=wait,
             add_to_known=add_to_known,

{hpcflow_new2-0.2.0a153 → hpcflow_new2-0.2.0a156}/hpcflow/tests/unit/test_utils.py

@@ -515,3 +515,16 @@ def test_substitute_string_vars_raise_missing():
 
 def test_substitute_string_vars_non_str():
     assert substitute_string_vars("<<var:a>>", variables={"a": 2}) == "2"
+
+
+def test_substitute_string_vars_default_value():
+    assert substitute_string_vars("hello <<var:my_name[default=bill]>>!") == "hello bill!"
+
+
+def test_substitute_string_vars_default_value_with_specified():
+    assert (
+        substitute_string_vars(
+            "hello <<var:my_name[default=bill]>>!", variables={"my_name": "bob"}
+        )
+        == "hello bob!"
+    )

{hpcflow_new2-0.2.0a153 → hpcflow_new2-0.2.0a156}/pyproject.toml

@@ -1,7 +1,7 @@
 
 [tool.poetry]
 name = "hpcflow-new2"
-version = "0.2.0a153"
+version = "0.2.0a156"
 
 description = "Computational workflow management"
 authors = ["aplowman <adam.plowman@manchester.ac.uk>"]
@@ -77,7 +77,7 @@ hook-dirs = "hpcflow.__pyinstaller:get_hook_dirs"
 
 [tool.commitizen]
 name = "cz_conventional_commits"
-version = "0.2.0a153"
+version = "0.2.0a156"
 tag_format = "v$version"
 version_files = [ 
     "pyproject.toml:version",

hpcflow_new2-0.2.0a153/hpcflow/_version.py

@@ -1 +0,0 @@
-__version__ = "0.2.0a153"