Skip to content

Commit d69f748

Browse files
committed
Replace external_trigger check with DagRunType
- Fix test_handle_multiple_columns_unique_constraint_error - Resolve ashb code review - Add newsfragment - Replace external_trigger is False logic with run_type is SCHEDULED - Fix _emit_true_scheduling_delay_stats_for_finished_state - Fix migrations fix after rebasing to latest main Fix test_exceptions and static check after rebasing Fix test_dag_run and erd static check
1 parent f0abca1 commit d69f748

66 files changed

Lines changed: 1210 additions & 1265 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

airflow/api/client/local_client.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ def trigger_dag(
5454
"data_interval_start": dag_run.data_interval_start,
5555
"data_interval_end": dag_run.data_interval_end,
5656
"end_date": dag_run.end_date,
57-
"external_trigger": dag_run.external_trigger,
5857
"last_scheduling_decision": dag_run.last_scheduling_decision,
5958
"logical_date": dag_run.logical_date,
6059
"run_type": dag_run.run_type,

airflow/api/common/mark_tasks.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ def get_run_ids(dag: DAG, run_id: str, future: bool, past: bool, session: SASess
145145
if current_dagrun.logical_date is None:
146146
return [run_id]
147147

148-
last_dagrun = dag.get_last_dagrun(include_externally_triggered=True, session=session)
148+
last_dagrun = dag.get_last_dagrun(include_manually_triggered=True, session=session)
149149
first_dagrun = session.scalar(
150150
select(DagRun)
151151
.where(DagRun.dag_id == dag.dag_id, DagRun.logical_date.is_not(None))

airflow/api/common/trigger_dag.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@ def _trigger_dag(
112112
conf=run_conf,
113113
run_type=DagRunType.MANUAL,
114114
triggered_by=triggered_by,
115-
external_trigger=True,
116115
dag_version=dag_version,
117116
state=DagRunState.QUEUED,
118117
session=session,

airflow/api_connexion/endpoints/dag_run_endpoint.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,6 @@ def _fetch_dag_runs(
185185
"start_date",
186186
"end_date",
187187
"updated_at",
188-
"external_trigger",
189188
"conf",
190189
]
191190
query = apply_sorting(query, order_by, to_replace, allowed_sort_attrs)
@@ -365,7 +364,6 @@ def post_dag_run(*, dag_id: str, session: Session = NEW_SESSION) -> APIResponse:
365364
conf=post_body.get("conf"),
366365
run_type=DagRunType.MANUAL,
367366
triggered_by=DagRunTriggeredByType.REST_API,
368-
external_trigger=True,
369367
dag_version=DagVersion.get_latest_version(dag.dag_id),
370368
state=DagRunState.QUEUED,
371369
session=session,

airflow/api_connexion/schemas/dag_run_schema.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ class Meta:
6868
start_date = auto_field(dump_only=True)
6969
end_date = auto_field(dump_only=True)
7070
state = DagStateField(dump_only=True)
71-
external_trigger = auto_field(dump_default=True, dump_only=True)
7271
conf = ConfObject()
7372
data_interval_start = auto_field(validate=validate_istimezone)
7473
data_interval_end = auto_field(validate=validate_istimezone)

airflow/api_fastapi/core_api/datamodels/dag_run.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ class DAGRunResponse(BaseModel):
6666
last_scheduling_decision: datetime | None
6767
run_type: DagRunType
6868
state: DagRunState
69-
external_trigger: bool
7069
triggered_by: DagRunTriggeredByType
7170
conf: dict
7271
note: str | None

airflow/api_fastapi/core_api/openapi/v1-generated.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8506,9 +8506,6 @@ components:
85068506
$ref: '#/components/schemas/DagRunType'
85078507
state:
85088508
$ref: '#/components/schemas/DagRunState'
8509-
external_trigger:
8510-
type: boolean
8511-
title: External Trigger
85128509
triggered_by:
85138510
$ref: '#/components/schemas/DagRunTriggeredByType'
85148511
conf:
@@ -8533,7 +8530,6 @@ components:
85338530
- last_scheduling_decision
85348531
- run_type
85358532
- state
8536-
- external_trigger
85378533
- triggered_by
85388534
- conf
85398535
- note

airflow/api_fastapi/core_api/routes/public/assets.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,6 @@ def materialize_asset(
296296
run_after=run_after,
297297
run_type=DagRunType.MANUAL,
298298
triggered_by=DagRunTriggeredByType.REST_API,
299-
external_trigger=True,
300299
dag_version=DagVersion.get_latest_version(dag_id, session=session),
301300
state=DagRunState.QUEUED,
302301
session=session,

airflow/api_fastapi/core_api/routes/public/dag_run.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,6 @@ def get_dag_runs(
289289
"start_date",
290290
"end_date",
291291
"updated_at",
292-
"external_trigger",
293292
"conf",
294293
],
295294
DagRun,
@@ -392,7 +391,6 @@ def trigger_dag_run(
392391
conf=body.conf,
393392
run_type=DagRunType.MANUAL,
394393
triggered_by=DagRunTriggeredByType.REST_API,
395-
external_trigger=True,
396394
dag_version=DagVersion.get_latest_version(dag.dag_id),
397395
state=DagRunState.QUEUED,
398396
session=session,
@@ -446,7 +444,6 @@ def get_list_dag_runs_batch(
446444
"start_date",
447445
"end_date",
448446
"updated_at",
449-
"external_trigger",
450447
"conf",
451448
],
452449
DagRun,

airflow/api_fastapi/execution_api/datamodels/taskinstance.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,6 @@ class DagRun(StrictBaseModel):
230230
clear_number: int
231231
run_type: DagRunType
232232
conf: Annotated[dict[str, Any], Field(default_factory=dict)]
233-
external_trigger: bool = False
234233

235234

236235
class TIRunContext(BaseModel):

0 commit comments

Comments
 (0)