Skip to content

Commit 6f83dda

Browse files
authored
More import aliases in airflow.sdk (apache#46889)
I also removed MappedOperator and ParamsDict since I don't think in any case the user would want to instantiate them directly, or even for type hints.
1 parent 8d3c8bf commit 6f83dda

File tree

3 files changed

+28
-14
lines changed

3 files changed

+28
-14
lines changed

airflow/example_dags/example_params_trigger_ui.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
from airflow.decorators import task
2929
from airflow.models.dag import DAG
30-
from airflow.sdk import Param, ParamsDict
30+
from airflow.sdk import Param
3131
from airflow.utils.trigger_rule import TriggerRule
3232

3333
# [START params_trigger]
@@ -56,15 +56,15 @@
5656

5757
@task(task_id="get_names", task_display_name="Get names")
5858
def get_names(**kwargs) -> list[str]:
59-
params: ParamsDict = kwargs["params"]
59+
params = kwargs["params"]
6060
if "names" not in params:
6161
print("Uuups, no names given, was no UI used to trigger?")
6262
return []
6363
return params["names"]
6464

6565
@task.branch(task_id="select_languages", task_display_name="Select languages")
6666
def select_languages(**kwargs) -> list[str]:
67-
params: ParamsDict = kwargs["params"]
67+
params = kwargs["params"]
6868
selected_languages = []
6969
for lang in ["english", "german", "french"]:
7070
if params[lang]:

airflow/example_dags/example_params_ui_tutorial.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
from airflow.decorators import task
3131
from airflow.models.dag import DAG
32-
from airflow.sdk import Param, ParamsDict
32+
from airflow.sdk import Param
3333

3434
with (
3535
DAG(
@@ -253,7 +253,7 @@
253253
# [START section_3]
254254
@task(task_display_name="Show used parameters")
255255
def show_params(**kwargs) -> None:
256-
params: ParamsDict = kwargs["params"]
256+
params = kwargs["params"]
257257
print(f"This DAG was triggered with the following parameters:\n\n{json.dumps(params, indent=4)}\n")
258258

259259
show_params()

task_sdk/src/airflow/sdk/__init__.py

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,52 +21,66 @@
2121
__all__ = [
2222
"__version__",
2323
"Asset",
24+
"AssetAlias",
25+
"AssetAll",
26+
"AssetAny",
2427
"AssetWatcher",
2528
"BaseOperator",
2629
"Connection",
30+
"Context",
2731
"DAG",
2832
"EdgeModifier",
2933
"Label",
30-
"MappedOperator",
34+
"Metadata",
35+
"Param",
3136
"TaskGroup",
3237
"Variable",
3338
"XComArg",
39+
"asset",
3440
"dag",
3541
"get_current_context",
3642
"get_parsing_context",
43+
"literal",
3744
]
3845

3946
__version__ = "1.0.0.alpha1"
4047

4148
if TYPE_CHECKING:
42-
from airflow.sdk.definitions.asset import Asset, AssetWatcher
49+
from airflow.sdk.definitions.asset import Asset, AssetAlias, AssetAll, AssetAny, AssetWatcher
50+
from airflow.sdk.definitions.assets.decorators import asset
51+
from airflow.sdk.definitions.assets.metadata import Metadata
4352
from airflow.sdk.definitions.baseoperator import BaseOperator
4453
from airflow.sdk.definitions.connection import Connection
45-
from airflow.sdk.definitions.context import get_current_context, get_parsing_context
54+
from airflow.sdk.definitions.context import Context, get_current_context, get_parsing_context
4655
from airflow.sdk.definitions.dag import DAG, dag
4756
from airflow.sdk.definitions.edges import EdgeModifier, Label
48-
from airflow.sdk.definitions.mappedoperator import MappedOperator
57+
from airflow.sdk.definitions.param import Param
4958
from airflow.sdk.definitions.taskgroup import TaskGroup
59+
from airflow.sdk.definitions.template import literal
5060
from airflow.sdk.definitions.variable import Variable
5161
from airflow.sdk.definitions.xcom_arg import XComArg
5262

5363
__lazy_imports: dict[str, str] = {
64+
"Asset": ".definitions.asset",
65+
"AssetAlias": ".definitions.asset",
66+
"AssetAll": ".definitions.asset",
67+
"AssetAny": ".definitions.asset",
68+
"AssetWatcher": ".definitions.asset",
5469
"BaseOperator": ".definitions.baseoperator",
5570
"Connection": ".definitions.connection",
56-
"Param": ".definitions.param",
57-
"ParamsDict": ".definitions.param",
71+
"Context": ".definitions.context",
5872
"DAG": ".definitions.dag",
5973
"EdgeModifier": ".definitions.edges",
6074
"Label": ".definitions.edges",
61-
"MappedOperator": ".definitions.mappedoperator",
75+
"Metadata": ".definitions.asset.metadata",
76+
"Param": ".definitions.param",
6277
"TaskGroup": ".definitions.taskgroup",
6378
"Variable": ".definitions.variable",
6479
"XComArg": ".definitions.xcom_arg",
80+
"asset": ".definitions.asset.decorators",
6581
"dag": ".definitions.dag",
6682
"get_current_context": ".definitions.context",
6783
"get_parsing_context": ".definitions.context",
68-
"Asset": ".definitions.asset",
69-
"AssetWatcher": ".definitions.asset",
7084
}
7185

7286

0 commit comments

Comments
 (0)