tasktree 0.0.13__tar.gz → 0.0.14__tar.gz

{tasktree-0.0.13 → tasktree-0.0.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tasktree
-Version: 0.0.13
+Version: 0.0.14
 Summary: A task automation tool with incremental execution
 Requires-Python: >=3.11
 Requires-Dist: click>=8.1.0

{tasktree-0.0.13 → tasktree-0.0.14}/example/tasktree.yaml

@@ -1,9 +1,13 @@
+variables:
+  log_level: { env: LOG_LEVEL, default: "info" }
+
 tasks:
   build:
     desc: Building outputs (imagine this is a call to Cargo, or gcc, or something)
     args:
       - build_type:
-          choices: [ "debug", "release" ]
+          choices: [ "debug", "release", "{{ var.log_level }}" ]
+          default: "{{ var.log_level }}"
       - target:
            type: str
            choices:

{tasktree-0.0.13 → tasktree-0.0.14}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "tasktree"
-version = "0.0.13"
+version = "0.0.14"
 description = "A task automation tool with incremental execution"
 readme = "README.md"
 requires-python = ">=3.11"

{tasktree-0.0.13 → tasktree-0.0.14}/src/tasktree/substitution.py

@@ -5,6 +5,7 @@ and {{ env.NAME }} placeholders with their corresponding values.
 """
 
 import re
+from random import choice
 from typing import Any
 
 
@@ -15,11 +16,11 @@ PLACEHOLDER_PATTERN = re.compile(
 )
 
 
-def substitute_variables(text: str, variables: dict[str, str]) -> str:
+def substitute_variables(text: str | dict[str, Any], variables: dict[str, str]) -> str | dict[str, Any]:
     """Substitute {{ var.name }} placeholders with variable values.
 
     Args:
-        text: Text containing {{ var.name }} placeholders
+        text: Text containing {{ var.name }} placeholders, or an argument dict with elements to be substituted
         variables: Dictionary mapping variable names to their string values
 
     Returns:
@@ -28,23 +29,42 @@ def substitute_variables(text: str, variables: dict[str, str]) -> str:
     Raises:
         ValueError: If a referenced variable is not defined
     """
-    def replace_match(match: re.Match) -> str:
-        prefix = match.group(1)
-        name = match.group(2)
-
-        # Only substitute var: placeholders
-        if prefix != "var":
-            return match.group(0)  # Return unchanged
-
-        if name not in variables:
-            raise ValueError(
-                f"Variable '{name}' is not defined. "
-                f"Variables must be defined before use."
-            )
-
-        return variables[name]
-
-    return PLACEHOLDER_PATTERN.sub(replace_match, text)
+    if isinstance(text, dict):
+        # The dict will only contain a single key, the value of this key should also be a dictionary, which contains
+        # the actual details of the argument.
+        assert len(text.keys()) == 1
+
+        for arg_name in text.keys():
+            # Pull out and substitute the individual fields of an argument one at a time
+            for field in  [ "default", "min", "max" ]:
+                if field in text[arg_name]:
+                    text[arg_name][field] = substitute_variables(text[arg_name][field], variables)
+
+            # choices is a list of things
+            if "choices" in text[arg_name]:
+                text[arg_name]["choices"] = [substitute_variables(c, variables) for c in text[arg_name]["choices"]]
+
+            return text
+        else:
+            raise ValueError("Empty arg dictionary")
+    else:
+        def replace_match(match: re.Match) -> str:
+            prefix = match.group(1)
+            name = match.group(2)
+
+            # Only substitute var: placeholders
+            if prefix != "var":
+                return match.group(0)  # Return unchanged
+
+            if name not in variables:
+                raise ValueError(
+                    f"Variable '{name}' is not defined. "
+                    f"Variables must be defined before use."
+                )
+
+            return variables[name]
+
+        return PLACEHOLDER_PATTERN.sub(replace_match, text)
 
 
 def substitute_arguments(text: str, args: dict[str, Any], exported_args: set[str] | None = None) -> str: