Skip to content

Param argument accepts generic dict subtypes #29782

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
potiuk merged 1 commit into from
Mar 7, 2023
Merged

Param argument accepts generic dict subtypes #29782

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
6 changes: 3 additions & 3 deletions airflow/models/baseoperator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ def _get_parent_defaults(dag: DAG | None, task_group: TaskGroup | None) -> tuple
def get_merged_defaults(
dag: DAG | None,
task_group: TaskGroup | None,
task_params: dict | None,
task_params: collections.abc.MutableMapping | None,
task_default_args: dict | None,
) -> tuple[dict, ParamsDict]:
args, params = _get_parent_defaults(dag, task_group)
Expand Down Expand Up @@ -194,7 +194,7 @@ def partial(
end_date: datetime | None = None,
owner: str = DEFAULT_OWNER,
email: None | str | Iterable[str] = None,
params: dict | None = None,
params: collections.abc.MutableMapping | None = None,
resources: dict[str, Any] | None = None,
trigger_rule: str = DEFAULT_TRIGGER_RULE,
depends_on_past: bool = False,
Expand Down Expand Up @@ -704,7 +704,7 @@ def __init__(
wait_for_past_depends_before_skipping: bool = DEFAULT_WAIT_FOR_PAST_DEPENDS_BEFORE_SKIPPING,
wait_for_downstream: bool = False,
dag: DAG | None = None,
params: dict | None = None,
params: collections.abc.MutableMapping | None = None,
default_args: dict | None = None,
priority_weight: int = DEFAULT_PRIORITY_WEIGHT,
weight_rule: str = DEFAULT_WEIGHT_RULE,
Expand Down
5 changes: 3 additions & 2 deletions airflow/models/dag.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
from __future__ import annotations

import collections
import collections.abc
import copy
import functools
import itertools
Expand Down Expand Up @@ -403,7 +404,7 @@ def __init__(
on_success_callback: None | DagStateChangeCallback | list[DagStateChangeCallback] = None,
on_failure_callback: None | DagStateChangeCallback | list[DagStateChangeCallback] = None,
doc_md: str | None = None,
params: dict | None = None,
params: collections.abc.MutableMapping | None = None,
access_control: dict | None = None,
is_paused_upon_creation: bool | None = None,
jinja_environment_kwargs: dict | None = None,
Expand Down Expand Up @@ -3489,7 +3490,7 @@ def dag(
on_success_callback: None | DagStateChangeCallback | list[DagStateChangeCallback] = None,
on_failure_callback: None | DagStateChangeCallback | list[DagStateChangeCallback] = None,
doc_md: str | None = None,
params: dict | None = None,
params: collections.abc.MutableMapping | None = None,
access_control: dict | None = None,
is_paused_upon_creation: bool | None = None,
jinja_environment_kwargs: dict | None = None,
Expand Down
2 changes: 1 addition & 1 deletion airflow/models/param.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ class ParamsDict(MutableMapping[str, Any]):
__version__: ClassVar[int] = 1
__slots__ = ["__dict", "suppress_exception"]

def __init__(self, dict_obj: dict | None = None, suppress_exception: bool = False):
def __init__(self, dict_obj: MutableMapping | None = None, suppress_exception: bool = False):
"""
:param dict_obj: A dict or dict like object to init ParamsDict
:param suppress_exception: Flag to suppress value exceptions while initializing the ParamsDict
Expand Down