Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix overriding default_args in nested task groups #31608

Merged
merged 3 commits into from
May 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions airflow/utils/task_group.py
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ def __init__(

if parent_group:
parent_group.add(self)
self._update_default_args(parent_group)

self.used_group_ids.add(self.group_id)
if self.group_id:
Expand Down Expand Up @@ -176,6 +177,10 @@ def _check_for_group_id_collisions(self, add_suffix_on_collision: bool):
else:
self._group_id = f"{base}__{suffixes[-1] + 1}"

def _update_default_args(self, parent_group: TaskGroup):
if parent_group.default_args:
self.default_args = {**self.default_args, **parent_group.default_args}
pierrejeambrun marked this conversation as resolved.
Show resolved Hide resolved

@classmethod
def create_root(cls, dag: DAG) -> TaskGroup:
"""Create a root TaskGroup with no group_id or parent."""
Expand Down
74 changes: 74 additions & 0 deletions tests/decorators/test_task_group.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,14 @@
# under the License.
from __future__ import annotations

from datetime import timedelta

import pendulum
import pytest

from airflow.decorators import dag, task_group
from airflow.models.expandinput import DictOfListsExpandInput, ListOfDictsExpandInput, MappedArgument
from airflow.operators.empty import EmptyOperator
from airflow.utils.task_group import MappedTaskGroup


Expand Down Expand Up @@ -186,3 +189,74 @@ def tg(a, b):
assert tg._expand_input == ListOfDictsExpandInput([{"b": "x"}, {"b": None}])

assert saved == {"a": 1, "b": MappedArgument(input=tg._expand_input, key="b")}


def test_override_dag_default_args():
@dag(
dag_id="test_dag",
start_date=pendulum.parse("20200101"),
default_args={
"retries": 1,
"owner": "x",
},
)
def pipeline():
@task_group(
group_id="task_group",
default_args={
"owner": "y",
"execution_timeout": timedelta(seconds=10),
},
)
def tg():
EmptyOperator(task_id="task")

tg()

test_dag = pipeline()
test_task = test_dag.task_group_dict["task_group"].children["task_group.task"]
assert test_task.retries == 1
assert test_task.owner == "y"
assert test_task.execution_timeout == timedelta(seconds=10)


def test_override_dag_default_args_nested_tg():
@dag(
dag_id="test_dag",
start_date=pendulum.parse("20200101"),
default_args={
"retries": 1,
"owner": "x",
},
)
def pipeline():
@task_group(
group_id="task_group",
default_args={
"owner": "y",
"execution_timeout": timedelta(seconds=10),
},
)
def tg():
@task_group(group_id="nested_task_group")
def nested_tg():
@task_group(group_id="another_task_group")
def another_tg():
EmptyOperator(task_id="task")

another_tg()

nested_tg()

tg()

test_dag = pipeline()
test_task = (
test_dag.task_group_dict["task_group"]
.children["task_group.nested_task_group"]
.children["task_group.nested_task_group.another_task_group"]
.children["task_group.nested_task_group.another_task_group.task"]
)
assert test_task.retries == 1
assert test_task.owner == "y"
assert test_task.execution_timeout == timedelta(seconds=10)
75 changes: 75 additions & 0 deletions tests/utils/test_task_group.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
# under the License.
from __future__ import annotations

from datetime import timedelta

import pendulum
import pytest

Expand Down Expand Up @@ -1301,3 +1303,76 @@ def test_iter_tasks():
"section_2.task3",
"section_2.bash_task",
]


def test_override_dag_default_args():
with DAG(
dag_id="test_dag",
start_date=pendulum.parse("20200101"),
default_args={
"retries": 1,
"owner": "x",
},
):
with TaskGroup(
group_id="task_group",
default_args={
"owner": "y",
"execution_timeout": timedelta(seconds=10),
},
):
task = EmptyOperator(task_id="task")

assert task.retries == 1
assert task.owner == "y"
assert task.execution_timeout == timedelta(seconds=10)


def test_override_dag_default_args_in_nested_tg():
with DAG(
dag_id="test_dag",
start_date=pendulum.parse("20200101"),
default_args={
"retries": 1,
"owner": "x",
},
):
with TaskGroup(
group_id="task_group",
default_args={
"owner": "y",
"execution_timeout": timedelta(seconds=10),
},
):
with TaskGroup(group_id="nested_task_group"):
task = EmptyOperator(task_id="task")

assert task.retries == 1
assert task.owner == "y"
assert task.execution_timeout == timedelta(seconds=10)


def test_override_dag_default_args_in_multi_level_nested_tg():
with DAG(
dag_id="test_dag",
start_date=pendulum.parse("20200101"),
default_args={
"retries": 1,
"owner": "x",
},
):
with TaskGroup(
group_id="task_group",
default_args={
"owner": "y",
"execution_timeout": timedelta(seconds=10),
},
):
with TaskGroup(group_id="first_nested_task_group"):
with TaskGroup(group_id="second_nested_task_group"):
with TaskGroup(group_id="third_nested_task_group"):
task = EmptyOperator(task_id="task")

assert task.retries == 1
assert task.owner == "y"
assert task.execution_timeout == timedelta(seconds=10)