tasktree 0.0.9__py3-none-any.whl → 0.0.11__py3-none-any.whl

tasktree/cli.py

@@ -192,10 +192,12 @@ tasks:
   # deploy:
   #   desc: Deploy to environment
   #   deps: [build]
-  #   args: [environment, region=eu-west-1]
+  #   args:
+  #     - environment
+  #     - region: { default: eu-west-1 }
   #   cmd: |
-  #     echo "Deploying to {{environment}} in {{region}}"
-  #     ./deploy.sh {{environment}} {{region}}
+  #     echo "Deploying to {{ arg.environment }} in {{ arg.region }}"
+  #     ./deploy.sh {{ arg.environment }} {{ arg.region }}
 
 # Uncomment and modify the examples above to define your tasks
 """

tasktree/docker.py

@@ -87,16 +87,24 @@ class DockerManager:
 
         # Build the image
         try:
+            docker_build_cmd = [
+                "docker",
+                "build",
+                "-t",
+                image_tag,
+                "-f",
+                str(dockerfile_path),
+            ]
+
+            # Add build args if environment has them (docker environments use dict for args)
+            if isinstance(env.args, dict):
+                for arg_name, arg_value in env.args.items():
+                    docker_build_cmd.extend(["--build-arg", f"{arg_name}={arg_value}"])
+
+            docker_build_cmd.append(str(context_path))
+
             subprocess.run(
-                [
-                    "docker",
-                    "build",
-                    "-t",
-                    image_tag,
-                    "-f",
-                    str(dockerfile_path),
-                    str(context_path),
-                ],
+                docker_build_cmd,
                 check=True,
                 capture_output=False,  # Show build output to user
             )

tasktree/hasher.py

@@ -104,9 +104,16 @@ def hash_environment_definition(env) -> str:
     # Import inside function to avoid circular dependency
     from tasktree.parser import Environment
 
+    # Handle args - can be list (shell args) or dict (docker build args)
+    args_value = env.args
+    if isinstance(env.args, dict):
+        args_value = dict(sorted(env.args.items()))  # Sort dict for determinism
+    elif isinstance(env.args, list):
+        args_value = sorted(env.args)  # Sort list for determinism
+
     data = {
         "shell": env.shell,
-        "args": sorted(env.args),  # Sort for determinism
+        "args": args_value,
         "preamble": env.preamble,
         "dockerfile": env.dockerfile,
         "context": env.context,

tasktree/parser.py

@@ -31,7 +31,7 @@ class Environment:
 
     name: str
     shell: str = ""  # Path to shell (required for shell envs, optional for Docker)
-    args: list[str] = field(default_factory=list)
+    args: list[str] | dict[str, str] = field(default_factory=list)  # Shell args (list) or Docker build args (dict)
     preamble: str = ""
     # Docker-specific fields (presence of dockerfile indicates Docker environment)
     dockerfile: str = ""  # Path to Dockerfile
@@ -44,7 +44,7 @@ class Environment:
     run_as_root: bool = False  # If True, skip user mapping (run as root in container)
 
     def __post_init__(self):
-        """Ensure args is always a list."""
+        """Ensure args is in the correct format."""
         if isinstance(self.args, str):
             self.args = [self.args]
 
@@ -60,7 +60,7 @@ class Task:
     inputs: list[str] = field(default_factory=list)
     outputs: list[str] = field(default_factory=list)
     working_dir: str = ""
-    args: list[str] = field(default_factory=list)
+    args: list[str | dict[str, Any]] = field(default_factory=list)  # Can be strings or dicts (each dict has single key: arg name)
     source_file: str = ""  # Track which file defined this task
     env: str = ""  # Environment name to use for execution
 
@@ -75,6 +75,19 @@ class Task:
         if isinstance(self.args, str):
             self.args = [self.args]
 
+        # Validate args is not a dict (common YAML mistake)
+        if isinstance(self.args, dict):
+            raise ValueError(
+                f"Task '{self.name}' has invalid 'args' syntax.\n\n"
+                f"Found dictionary syntax (without dashes):\n"
+                f"  args:\n"
+                f"    {list(self.args.keys())[0] if self.args else 'key'}: ...\n\n"
+                f"Correct syntax uses list format (with dashes):\n"
+                f"  args:\n"
+                f"    - {list(self.args.keys())[0] if self.args else 'key'}: ...\n\n"
+                f"Arguments must be defined as a list, not a dictionary."
+            )
+
 
 @dataclass
 class DependencyInvocation:
@@ -1246,18 +1259,16 @@ def parse_arg_spec(arg_spec: str | dict) -> ArgSpec:
 
     Supports both string format and dictionary format:
 
-    String format:
+    String format (simple names only):
         - Simple name: "argname"
         - Exported (becomes env var): "$argname"
-        - With default: "argname=value" or "$argname=value"
-        - Legacy type syntax: "argname:type=value" (for backwards compat)
 
     Dictionary format:
         - argname: { default: "value" }
         - argname: { type: int, default: 42 }
         - argname: { type: int, min: 1, max: 100 }
         - argname: { type: str, choices: ["dev", "staging", "prod"] }
-        - $argname: { default: "value" }  # Exported
+        - $argname: { default: "value" }  # Exported (type not allowed)
 
     Args:
         arg_spec: Argument specification (string or dict with single key)
@@ -1315,34 +1326,24 @@ def parse_arg_spec(arg_spec: str | dict) -> ArgSpec:
     if is_exported:
         arg_spec = arg_spec[1:]  # Remove $ prefix
 
-    # Split on = to separate name:type from default
-    if "=" in arg_spec:
-        name_type, default = arg_spec.split("=", 1)
-    else:
-        name_type = arg_spec
-        default = None
-
-    # Split on : to separate name from type
-    if ":" in name_type:
-        name, arg_type = name_type.split(":", 1)
+    # String format only supports simple names (no = or :)
+    if "=" in arg_spec or ":" in arg_spec:
+        raise ValueError(
+            f"Invalid argument syntax: {'$' if is_exported else ''}{arg_spec}\n\n"
+            f"String format only supports simple argument names.\n"
+            f"Use YAML dict format for type annotations, defaults, or constraints:\n"
+            f"  args:\n"
+            f"    - {'$' if is_exported else ''}{arg_spec.split('=')[0].split(':')[0]}: {{ default: value }}"
+        )
 
-        # Exported arguments cannot have type annotations
-        if is_exported:
-            raise ValueError(
-                f"Type annotations not allowed on exported arguments\n"
-                f"In argument: ${name}:{arg_type}\n\n"
-                f"Exported arguments are always strings. Remove the type annotation:\n"
-                f"  args: [${name}]"
-            )
-    else:
-        name = name_type
-        arg_type = "str"
+    name = arg_spec
+    arg_type = "str"
 
-    # String format doesn't support min/max/choices
+    # String format doesn't support min/max/choices/defaults
     return ArgSpec(
         name=name,
         arg_type=arg_type,
-        default=default,
+        default=None,
         is_exported=is_exported,
         min_val=None,
         max_val=None,
@@ -1390,6 +1391,15 @@ def _parse_arg_dict(arg_name: str, config: dict, is_exported: bool) -> ArgSpec:
             f"Exported arguments are always strings. Remove the 'type' field"
         )
 
+    # Exported arguments must have string defaults (if any default is provided)
+    if is_exported and default is not None and not isinstance(default, str):
+        raise ValueError(
+            f"Exported argument '${arg_name}' must have a string default value.\n"
+            f"Got: {default!r} (type: {type(default).__name__})\n"
+            f"Exported arguments become environment variables, which are always strings.\n"
+            f"Use a quoted string: ${arg_name}: {{ default: \"{default}\" }}"
+        )
+
     # Validate choices
     if choices is not None:
         # Validate choices is a list

{tasktree-0.0.9.dist-info → tasktree-0.0.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tasktree
-Version: 0.0.9
+Version: 0.0.11
 Summary: A task automation tool with incremental execution
 Requires-Python: >=3.11
 Requires-Dist: click>=8.1.0
@@ -604,7 +604,9 @@ Dependencies can invoke tasks with specific arguments, enabling flexible and reu
 tasks:
   # Task with parameters
   process:
-    args: [mode, verbose=false]
+    args:
+      - mode
+      - verbose: { default: false }
     cmd: echo "mode={{arg.mode}} verbose={{arg.verbose}}"
 
   # Simple dependency (uses defaults)

tasktree-0.0.11.dist-info/RECORD

@@ -0,0 +1,15 @@
+tasktree/__init__.py,sha256=MVmdvKb3JdqLlo0x2_TPGMfgFC0HsDnP79HAzGnFnjI,1081
+tasktree/cli.py,sha256=uL4RGap1U7-_4mcdEGbsELR4cvm1aUaqbvnX8XJFNKc,17652
+tasktree/docker.py,sha256=qvja8G63uAcC73YMVY739egda1_CcBtoqzm0qIJU_Q8,14443
+tasktree/executor.py,sha256=Q7Bks5B88i-IyZDpxGSps9MM3uflz0U3yn4Rtq_uHMM,42266
+tasktree/graph.py,sha256=oXLxX0Ix4zSkVBg8_3x9K7WxSFpg136sp4MF-d2mDEQ,9682
+tasktree/hasher.py,sha256=0GrnCfwAXnwq_kpnHFFb12B5_2VFNXx6Ng7hTdcCyXo,4415
+tasktree/parser.py,sha256=rHJuYMM4AUjM1E-Jh3SpUpBRKGkciYOvgfgERoXylSE,67364
+tasktree/state.py,sha256=Cktl4D8iDZVd55aO2LqVyPrc-BnljkesxxkcMcdcfOY,3541
+tasktree/substitution.py,sha256=M_qcP0NKJATrKcNShSqHJatneuth1RVwTk1ci8-ZuxQ,6473
+tasktree/tasks.py,sha256=2QdQZtJAX2rSGbyXKG1z9VF_siz1DUzdvzCgPkykxtU,173
+tasktree/types.py,sha256=R_YAyO5bMLB6XZnkMRT7VAtlkA_Xx6xu0aIpzQjrBXs,4357
+tasktree-0.0.11.dist-info/METADATA,sha256=a41OmLVRm4BbIpZT4e7v-l3g3gmw3DD1Eg0OXnrVsYA,37151
+tasktree-0.0.11.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+tasktree-0.0.11.dist-info/entry_points.txt,sha256=lQINlvRYnimvteBbnhH84A9clTg8NnpEjCWqWkqg8KE,40
+tasktree-0.0.11.dist-info/RECORD,,

tasktree-0.0.9.dist-info/RECORD

@@ -1,15 +0,0 @@
-tasktree/__init__.py,sha256=MVmdvKb3JdqLlo0x2_TPGMfgFC0HsDnP79HAzGnFnjI,1081
-tasktree/cli.py,sha256=H5T8wOxLBGx-ZTQEnkoJrX3srgD5b_7BLf1IWl18M2M,17597
-tasktree/docker.py,sha256=R69NcZw4MyaxEXyJAwniYCm877iaI10jRhxlLmkA6Fs,14119
-tasktree/executor.py,sha256=Q7Bks5B88i-IyZDpxGSps9MM3uflz0U3yn4Rtq_uHMM,42266
-tasktree/graph.py,sha256=oXLxX0Ix4zSkVBg8_3x9K7WxSFpg136sp4MF-d2mDEQ,9682
-tasktree/hasher.py,sha256=C8oN-K6dtL3vLHSPhKR7uu5c1d4vplGSAMZUq5M4scw,4125
-tasktree/parser.py,sha256=DjdfsKErdBggqS8Tw_mwuMvMSavIJqq2BCdsh1O82CY,66333
-tasktree/state.py,sha256=Cktl4D8iDZVd55aO2LqVyPrc-BnljkesxxkcMcdcfOY,3541
-tasktree/substitution.py,sha256=M_qcP0NKJATrKcNShSqHJatneuth1RVwTk1ci8-ZuxQ,6473
-tasktree/tasks.py,sha256=2QdQZtJAX2rSGbyXKG1z9VF_siz1DUzdvzCgPkykxtU,173
-tasktree/types.py,sha256=R_YAyO5bMLB6XZnkMRT7VAtlkA_Xx6xu0aIpzQjrBXs,4357
-tasktree-0.0.9.dist-info/METADATA,sha256=VBgQ1ZF2hacw1CajhxcjkrGTyygnf-uWxiZm7H92AyE,37123
-tasktree-0.0.9.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-tasktree-0.0.9.dist-info/entry_points.txt,sha256=lQINlvRYnimvteBbnhH84A9clTg8NnpEjCWqWkqg8KE,40
-tasktree-0.0.9.dist-info/RECORD,,