Skip to content

Fixing bad cadwyn migration for upstream map indexes #52797

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Jul 3, 2025
Merged

Fixing bad cadwyn migration for upstream map indexes #52797

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 5 additions & 4 deletions airflow-core/src/airflow/api_fastapi/execution_api/versions/v2025_05_20.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class DowngradeUpstreamMapIndexes(VersionChange):
description = __doc__

instructions_to_migrate_to_previous_version = (
schema(TIRunContext).field("upstream_map_indexes").had(type=dict[str, int] | None), # type: ignore
schema(TIRunContext).field("upstream_map_indexes").had(type=dict[str, int | None] | None),
)

@convert_response_to_previous_version_for(TIRunContext) # type: ignore[arg-type]
Expand All @@ -40,13 +40,14 @@ def downgrade_upstream_map_indexes(response: ResponseInfo = None) -> None: # ty
"""
resp = response.body.get("upstream_map_indexes")
if isinstance(resp, dict):
downgraded = {}
downgraded: dict[str, int | list | None] = {}
for k, v in resp.items():
if isinstance(v, int):
downgraded[k] = v
elif isinstance(v, list) and v and all(isinstance(i, int) for i in v):
downgraded[k] = v[0]
else:
# for cases like None, make it -1
downgraded[k] = -1
# Keep values like None as is — the Task SDK expects them unchanged during mapped task expansion,
# and modifying them can cause unexpected failures.
downgraded[k] = None
response.body["upstream_map_indexes"] = downgraded
9 changes: 8 additions & 1 deletion ...low-core/tests/unit/api_fastapi/execution_api/versions/v2025_04_28/test_task_instances.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,16 @@ def teardown_method(self):
{"task_a": 3, "task_b": 9},
id="list of ints",
),
pytest.param(
[
("task_a", None),
],
{"task_a": None},
id="task has no upstreams",
),
pytest.param(
[("task_a", None), ("task_b", [6, 7]), ("task_c", 2)],
{"task_a": -1, "task_b": 6, "task_c": 2},
{"task_a": None, "task_b": 6, "task_c": 2},
id="mixed types",
),
],
Expand Down