Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
from airflow.api_fastapi.core_api.base import BaseModel, StrictBaseModel
from airflow.api_fastapi.core_api.datamodels.dag_tags import DagTagResponse
from airflow.api_fastapi.core_api.datamodels.dag_versions import DagVersionResponse
from airflow.api_fastapi.core_api.datamodels.deadline import DeadlineAlertResponse
from airflow.configuration import conf
from airflow.models.dag_version import DagVersion

Expand Down Expand Up @@ -67,6 +68,7 @@ class DAGResponse(BaseModel):
relative_fileloc: str | None
fileloc: str
description: str | None
deadline: list[DeadlineAlertResponse] | None
timetable_summary: str | None
timetable_description: str | None
tags: list[DagTagResponse]
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
from __future__ import annotations

from datetime import timedelta

from airflow.api_fastapi.core_api.base import BaseModel


class DeadlineAlertResponse(BaseModel):
"""Deadline alert serializer for responses."""

reference: str
interval: timedelta
callback: str
callback_kwargs: dict | None = None
Original file line number Diff line number Diff line change
Expand Up @@ -1090,6 +1090,13 @@ components:
- type: string
- type: 'null'
title: Description
deadline:
anyOf:
- items:
$ref: '#/components/schemas/DeadlineAlertResponse'
type: array
- type: 'null'
title: Deadline
timetable_summary:
anyOf:
- type: string
Expand Down Expand Up @@ -1180,6 +1187,7 @@ components:
- relative_fileloc
- fileloc
- description
- deadline
- timetable_summary
- timetable_description
- tags
Expand Down Expand Up @@ -1319,6 +1327,31 @@ components:
- queued_dag_count
title: DashboardDagStatsResponse
description: Dashboard DAG Stats serializer for responses.
DeadlineAlertResponse:
properties:
reference:
type: string
title: Reference
interval:
type: string
format: duration
title: Interval
callback:
type: string
title: Callback
callback_kwargs:
anyOf:
- additionalProperties: true
type: object
- type: 'null'
title: Callback Kwargs
type: object
required:
- reference
- interval
- callback
title: DeadlineAlertResponse
description: Deadline alert serializer for responses.
EdgeResponse:
properties:
source_id:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8171,6 +8171,13 @@ components:
- type: string
- type: 'null'
title: Description
deadline:
anyOf:
- items:
$ref: '#/components/schemas/DeadlineAlertResponse'
type: array
- type: 'null'
title: Deadline
timetable_summary:
anyOf:
- type: string
Expand Down Expand Up @@ -8338,6 +8345,7 @@ components:
- relative_fileloc
- fileloc
- description
- deadline
- timetable_summary
- timetable_description
- tags
Expand Down Expand Up @@ -8429,6 +8437,13 @@ components:
- type: string
- type: 'null'
title: Description
deadline:
anyOf:
- items:
$ref: '#/components/schemas/DeadlineAlertResponse'
type: array
- type: 'null'
title: Deadline
timetable_summary:
anyOf:
- type: string
Expand Down Expand Up @@ -8508,6 +8523,7 @@ components:
- relative_fileloc
- fileloc
- description
- deadline
- timetable_summary
- timetable_description
- tags
Expand Down Expand Up @@ -9120,6 +9136,31 @@ components:
This is the set of allowable values for the ``warning_type`` field

in the DagWarning model.'
DeadlineAlertResponse:
properties:
reference:
type: string
title: Reference
interval:
type: string
format: duration
title: Interval
callback:
type: string
title: Callback
callback_kwargs:
anyOf:
- additionalProperties: true
type: object
- type: 'null'
title: Callback Kwargs
type: object
required:
- reference
- interval
- callback
title: DeadlineAlertResponse
description: Deadline alert serializer for responses.
DryRunBackfillCollectionResponse:
properties:
backfills:
Expand Down
1 change: 1 addition & 0 deletions airflow-core/src/airflow/cli/commands/dag_command.py
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,7 @@ def _get_dagbag_dag_details(dag: DAG) -> dict:
"next_dagrun_data_interval_end": None,
"next_dagrun_logical_date": None,
"next_dagrun_run_after": None,
"deadline": None,
}


Expand Down
79 changes: 79 additions & 0 deletions airflow-core/src/airflow/ui/openapi-gen/requests/schemas.gen.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1677,6 +1677,20 @@ export const $DAGDetailsResponse = {
],
title: "Description",
},
deadline: {
anyOf: [
{
items: {
$ref: "#/components/schemas/DeadlineAlertResponse",
},
type: "array",
},
{
type: "null",
},
],
title: "Deadline",
},
timetable_summary: {
anyOf: [
{
Expand Down Expand Up @@ -1979,6 +1993,7 @@ export const $DAGDetailsResponse = {
"relative_fileloc",
"fileloc",
"description",
"deadline",
"timetable_summary",
"timetable_description",
"tags",
Expand Down Expand Up @@ -2117,6 +2132,20 @@ export const $DAGResponse = {
],
title: "Description",
},
deadline: {
anyOf: [
{
items: {
$ref: "#/components/schemas/DeadlineAlertResponse",
},
type: "array",
},
{
type: "null",
},
],
title: "Deadline",
},
timetable_summary: {
anyOf: [
{
Expand Down Expand Up @@ -2248,6 +2277,7 @@ export const $DAGResponse = {
"relative_fileloc",
"fileloc",
"description",
"deadline",
"timetable_summary",
"timetable_description",
"tags",
Expand Down Expand Up @@ -3150,6 +3180,40 @@ This is the set of allowable values for the \`\`warning_type\`\` field
in the DagWarning model.`,
} as const;

export const $DeadlineAlertResponse = {
properties: {
reference: {
type: "string",
title: "Reference",
},
interval: {
type: "string",
format: "duration",
title: "Interval",
},
callback: {
type: "string",
title: "Callback",
},
callback_kwargs: {
anyOf: [
{
additionalProperties: true,
type: "object",
},
{
type: "null",
},
],
title: "Callback Kwargs",
},
},
type: "object",
required: ["reference", "interval", "callback"],
title: "DeadlineAlertResponse",
description: "Deadline alert serializer for responses.",
} as const;

export const $DryRunBackfillCollectionResponse = {
properties: {
backfills: {
Expand Down Expand Up @@ -6608,6 +6672,20 @@ export const $DAGWithLatestDagRunsResponse = {
],
title: "Description",
},
deadline: {
anyOf: [
{
items: {
$ref: "#/components/schemas/DeadlineAlertResponse",
},
type: "array",
},
{
type: "null",
},
],
title: "Deadline",
},
timetable_summary: {
anyOf: [
{
Expand Down Expand Up @@ -6758,6 +6836,7 @@ export const $DAGWithLatestDagRunsResponse = {
"relative_fileloc",
"fileloc",
"description",
"deadline",
"timetable_summary",
"timetable_description",
"tags",
Expand Down
15 changes: 15 additions & 0 deletions airflow-core/src/airflow/ui/openapi-gen/requests/types.gen.ts
Original file line number Diff line number Diff line change
Expand Up @@ -497,6 +497,7 @@ export type DAGDetailsResponse = {
relative_fileloc: string | null;
fileloc: string;
description: string | null;
deadline: Array<DeadlineAlertResponse> | null;
timetable_summary: string | null;
timetable_description: string | null;
tags: Array<DagTagResponse>;
Expand Down Expand Up @@ -568,6 +569,7 @@ export type DAGResponse = {
relative_fileloc: string | null;
fileloc: string;
description: string | null;
deadline: Array<DeadlineAlertResponse> | null;
timetable_summary: string | null;
timetable_description: string | null;
tags: Array<DagTagResponse>;
Expand Down Expand Up @@ -818,6 +820,18 @@ export type DagVersionResponse = {
*/
export type DagWarningType = "asset conflict" | "non-existent pool";

/**
* Deadline alert serializer for responses.
*/
export type DeadlineAlertResponse = {
reference: string;
interval: string;
callback: string;
callback_kwargs?: {
[key: string]: unknown;
} | null;
};

/**
* Backfill collection serializer for responses in dry-run mode.
*/
Expand Down Expand Up @@ -1654,6 +1668,7 @@ export type DAGWithLatestDagRunsResponse = {
relative_fileloc: string | null;
fileloc: string;
description: string | null;
deadline: Array<DeadlineAlertResponse> | null;
timetable_summary: string | null;
timetable_description: string | null;
tags: Array<DagTagResponse>;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ const mockDag = {
bundle_version: "1",
dag_display_name: "nested_groups",
dag_id: "nested_groups",
deadline: null,
description: null,
file_token: "Ii9maWxlcy9kYWdzL25lc3RlZF90YXNrX2dyb3Vwcy5weSI.G3EkdxmDUDQsVb7AIZww1TSGlFE",
fileloc: "/files/dags/nested_task_groups.py",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -439,6 +439,7 @@ def test_dag_details(
},
"description": None,
"doc_md": "details",
"deadline": None,
"end_date": None,
"fileloc": __file__,
"file_token": file_token,
Expand Down Expand Up @@ -527,6 +528,7 @@ def test_get_dag(self, test_client, query_params, dag_id, expected_status_code,
"is_stale": False,
"owners": ["airflow"],
"timetable_summary": None,
"deadline": None,
"tags": [],
"has_task_concurrency_limits": True,
"next_dagrun_data_interval_start": None,
Expand Down
Loading