Merge branch 'main' into issue-221

Author: abhishekmadan30

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## [15.1.2] - 2025-09-04
+
+### Fixed
+
+- make `task_context` transforms really work without a `task-context` (#761)
+- set continuation token correctly in `find_task_id_batched` (#760)
+
 ## [15.1.1] - 2025-09-02
 
 ### Fixed

pyproject.toml

@@ -1,7 +1,7 @@
 ### Project
 [project]
 name = "taskcluster-taskgraph"
-version = "15.1.1"
+version = "15.1.2"
 description = "Build taskcluster taskgraphs"
 readme = "README.rst"
 authors = [

src/taskgraph/config.py

@@ -148,7 +148,9 @@ def register(self):
         sys.path.insert(0, self.root_dir)
         register_path = self["taskgraph"].get("register")
         if register_path:
-            find_object(register_path)(self)
+            register = find_object(register_path)
+            assert callable(register)
+            register(self)
 
     @property
     def vcs_root(self):

src/taskgraph/decision.py

@@ -263,9 +263,9 @@ def get_decision_parameters(graph_config, options):
         parameters["optimize_target_tasks"] = options["optimize_target_tasks"]
 
     if "decision-parameters" in graph_config["taskgraph"]:
-        find_object(graph_config["taskgraph"]["decision-parameters"])(
-            graph_config, parameters
-        )
+        decision_params = find_object(graph_config["taskgraph"]["decision-parameters"])
+        assert callable(decision_params)
+        decision_params(graph_config, parameters)
 
     if options.get("try_task_config_file"):
         task_config_file = os.path.abspath(options.get("try_task_config_file"))

src/taskgraph/generator.py

@@ -37,12 +37,14 @@ class Kind:
     config: Dict
     graph_config: GraphConfig
 
-    def _get_loader(self):
+    def _get_loader(self) -> Callable:
         try:
-            loader = self.config["loader"]
+            loader_path = self.config["loader"]
         except KeyError:
-            loader = "taskgraph.loader.default:loader"
-        return find_object(loader)
+            loader_path = "taskgraph.loader.default:loader"
+        loader = find_object(loader_path)
+        assert callable(loader)
+        return loader
 
     def load_tasks(self, parameters, loaded_tasks, write_artifacts):
         loader = self._get_loader()

src/taskgraph/transforms/task_context.py

@@ -85,7 +85,10 @@
 @transforms.add
 def render_task(config, tasks):
     for task in tasks:
-        sub_config = task.pop("task-context")
+        sub_config = task.pop("task-context", None)
+        if sub_config is None:
+            yield task
+            continue
         params_context = {}
         for var, path in sub_config.pop("from-parameters", {}).items():
             if isinstance(path, str):

src/taskgraph/util/python_path.py

@@ -2,11 +2,12 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+import importlib
 import inspect
 import os
 
 
-def find_object(path):
+def find_object(path: str):
     """
     Find a Python object given a path of the form <modulepath>:<objectpath>.
     Conceptually equivalent to
@@ -19,11 +20,10 @@ def find_object(modulepath, objectpath):
         raise ValueError(f'python path {path!r} does not have the form "module:object"')
 
     modulepath, objectpath = path.split(":")
-    obj = __import__(modulepath)
-    for a in modulepath.split(".")[1:]:
-        obj = getattr(obj, a)
+    obj = importlib.import_module(modulepath)
     for a in objectpath.split("."):
         obj = getattr(obj, a)
+
     return obj
 
 

test/test_transform_task_context.py

@@ -6,6 +6,7 @@
 from copy import deepcopy
 from pprint import pprint
 
+import pytest
 from pytest_taskgraph import FakeParameters
 
 from taskgraph.transforms import task_context
@@ -14,7 +15,7 @@
 here = os.path.abspath(os.path.dirname(__file__))
 
 TASK_DEFAULTS = {
-    "description": "fake description {object} {file} {param} {object_and_file}"
+    "description": "fake description {object} {file} {param} {object_and_file} "
     "{object_and_param} {file_and_param} {object_file_and_param} {param_fallback} {name}",
     "name": "fake-task-name",
     "task-context": {
@@ -37,11 +38,24 @@
         ],
     },
 }
+EXPECTED_DESCRIPTION = (
+    "fake description object file param object-overrides-file "
+    "param-overrides-object param-overrides-file param-overrides-all default fake-task-name"
+)
+NO_CONTEXT = deepcopy(TASK_DEFAULTS)
+del NO_CONTEXT["task-context"]
 
 
-def test_transforms(request, run_transform, graph_config):
-    task = deepcopy(TASK_DEFAULTS)
-
+@pytest.mark.parametrize(
+    "task,description",
+    (
+        pytest.param(deepcopy(TASK_DEFAULTS), EXPECTED_DESCRIPTION, id="with-context"),
+        pytest.param(
+            deepcopy(NO_CONTEXT), TASK_DEFAULTS["description"], id="no-context"
+        ),
+    ),
+)
+def test_transforms(request, run_transform, graph_config, task, description):
     params = FakeParameters(
         {
             "param": "param",
@@ -77,8 +91,4 @@ def test_transforms(request, run_transform, graph_config):
     print("Dumping task:")
     pprint(task, indent=2)
 
-    assert (
-        task["description"]
-        == "fake description object file param object-overrides-file"
-        "param-overrides-object param-overrides-file param-overrides-all default fake-task-name"
-    )
+    assert task["description"] == description