Skip to content

Commit a385e61

Browse files
committed
Replace external_trigger check with DagRunType
- Fix test_handle_multiple_columns_unique_constraint_error - Resolve ashb code review - Add newsfragment
1 parent 1adbca5 commit a385e61

63 files changed

Lines changed: 334 additions & 382 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
@@ -141,7 +141,7 @@ def find_task_relatives(tasks, downstream, upstream):
141141
@provide_session
142142
def get_run_ids(dag: DAG, run_id: str, future: bool, past: bool, session: SASession = NEW_SESSION):
143143
"""Return DAG executions' run_ids."""
144-
last_dagrun = dag.get_last_dagrun(include_externally_triggered=True, session=session)
144+
last_dagrun = dag.get_last_dagrun(include_manually_triggered=True, session=session)
145145
current_dagrun = dag.get_dagrun(run_id=run_id, session=session)
146146
first_dagrun = session.scalar(
147147
select(DagRun).filter(DagRun.dag_id == dag.dag_id).order_by(DagRun.logical_date.asc()).limit(1)

airflow/api/common/trigger_dag.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ def _trigger_dag(
105105
conf=run_conf,
106106
run_type=DagRunType.MANUAL,
107107
triggered_by=triggered_by,
108-
external_trigger=True,
109108
dag_version=dag_version,
110109
state=DagRunState.QUEUED,
111110
session=session,

airflow/api_connexion/endpoints/dag_run_endpoint.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,6 @@ def _fetch_dag_runs(
186186
"start_date",
187187
"end_date",
188188
"updated_at",
189-
"external_trigger",
190189
"conf",
191190
]
192191
query = apply_sorting(query, order_by, to_replace, allowed_sort_attrs)
@@ -354,7 +353,6 @@ def post_dag_run(*, dag_id: str, session: Session = NEW_SESSION) -> APIResponse:
354353
conf=post_body.get("conf"),
355354
run_type=DagRunType.MANUAL,
356355
triggered_by=DagRunTriggeredByType.REST_API,
357-
external_trigger=True,
358356
dag_version=DagVersion.get_latest_version(dag.dag_id),
359357
state=DagRunState.QUEUED,
360358
session=session,

airflow/api_connexion/schemas/dag_run_schema.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ class Meta:
6767
start_date = auto_field(dump_only=True)
6868
end_date = auto_field(dump_only=True)
6969
state = DagStateField(dump_only=True)
70-
external_trigger = auto_field(dump_default=True, dump_only=True)
7170
conf = ConfObject()
7271
data_interval_start = auto_field(validate=validate_istimezone)
7372
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
@@ -65,7 +65,6 @@ class DAGRunResponse(BaseModel):
6565
last_scheduling_decision: datetime | None
6666
run_type: DagRunType
6767
state: DagRunState
68-
external_trigger: bool
6968
triggered_by: DagRunTriggeredByType
7069
conf: dict
7170
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
@@ -7988,9 +7988,6 @@ components:
79887988
$ref: '#/components/schemas/DagRunType'
79897989
state:
79907990
$ref: '#/components/schemas/DagRunState'
7991-
external_trigger:
7992-
type: boolean
7993-
title: External Trigger
79947991
triggered_by:
79957992
$ref: '#/components/schemas/DagRunTriggeredByType'
79967993
conf:
@@ -8014,7 +8011,6 @@ components:
80148011
- last_scheduling_decision
80158012
- run_type
80168013
- state
8017-
- external_trigger
80188014
- triggered_by
80198015
- conf
80208016
- note

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,6 @@ def get_dag_runs(
283283
"start_date",
284284
"end_date",
285285
"updated_at",
286-
"external_trigger",
287286
"conf",
288287
],
289288
DagRun,
@@ -380,7 +379,6 @@ def trigger_dag_run(
380379
conf=body.conf,
381380
run_type=DagRunType.MANUAL,
382381
triggered_by=DagRunTriggeredByType.REST_API,
383-
external_trigger=True,
384382
dag_version=DagVersion.get_latest_version(dag.dag_id),
385383
state=DagRunState.QUEUED,
386384
session=session,
@@ -429,7 +427,6 @@ def get_list_dag_runs_batch(
429427
"start_date",
430428
"end_date",
431429
"updated_at",
432-
"external_trigger",
433430
"conf",
434431
],
435432
DagRun,

airflow/api_fastapi/execution_api/datamodels/taskinstance.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,6 @@ class DagRun(BaseModel):
223223
end_date: UtcDateTime | None
224224
run_type: DagRunType
225225
conf: Annotated[dict[str, Any], Field(default_factory=dict)]
226-
external_trigger: bool = False
227226

228227

229228
class TIRunContext(BaseModel):

airflow/cli/commands/remote_commands/task_command.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,6 @@ def _get_dag_run(
174174
dag_id=dag.dag_id,
175175
run_id=logical_date_or_run_id,
176176
run_type=DagRunType.MANUAL,
177-
external_trigger=True,
178177
logical_date=dag_run_logical_date,
179178
data_interval=dag.timetable.infer_manual_data_interval(run_after=dag_run_logical_date),
180179
triggered_by=DagRunTriggeredByType.CLI,

0 commit comments

Comments
 (0)