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 @@ -39,7 +39,7 @@ class DeadlineResponse(BaseModel):
)


class DealineCollectionResponse(BaseModel):
class DeadlineCollectionResponse(BaseModel):
"""Deadline Collection serializer for responses."""

deadlines: Iterable[DeadlineResponse]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -615,7 +615,7 @@ paths:
content:
application/json:
schema:
$ref: '#/components/schemas/DealineCollectionResponse'
$ref: '#/components/schemas/DeadlineCollectionResponse'
'404':
content:
application/json:
Expand Down Expand Up @@ -2076,6 +2076,22 @@ components:
- queued_dag_count
title: DashboardDagStatsResponse
description: Dashboard DAG Stats serializer for responses.
DeadlineCollectionResponse:
properties:
deadlines:
items:
$ref: '#/components/schemas/DeadlineResponse'
type: array
title: Deadlines
total_entries:
type: integer
title: Total Entries
type: object
required:
- deadlines
- total_entries
title: DeadlineCollectionResponse
description: Deadline Collection serializer for responses.
DeadlineResponse:
properties:
id:
Expand Down Expand Up @@ -2111,22 +2127,6 @@ components:
- created_at
title: DeadlineResponse
description: Deadline serializer for responses.
DealineCollectionResponse:
properties:
deadlines:
items:
$ref: '#/components/schemas/DeadlineResponse'
type: array
title: Deadlines
total_entries:
type: integer
title: Total Entries
type: object
required:
- deadlines
- total_entries
title: DealineCollectionResponse
description: Deadline Collection serializer for responses.
EdgeResponse:
properties:
source_id:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
from airflow.api_fastapi.common.db.common import SessionDep, paginated_select
from airflow.api_fastapi.common.parameters import QueryLimit, QueryOffset, SortParam
from airflow.api_fastapi.common.router import AirflowRouter
from airflow.api_fastapi.core_api.datamodels.ui.deadline import DealineCollectionResponse
from airflow.api_fastapi.core_api.datamodels.ui.deadline import DeadlineCollectionResponse
from airflow.api_fastapi.core_api.openapi.exceptions import create_openapi_http_exception_doc
from airflow.api_fastapi.core_api.security import requires_access_dag
from airflow.models.dagrun import DagRun
Expand Down Expand Up @@ -71,7 +71,7 @@ def get_dag_run_deadlines(
).dynamic_depends(default="deadline_time")
),
],
) -> DealineCollectionResponse:
) -> DeadlineCollectionResponse:
"""Get all deadlines for a specific DAG run."""
dag_run = session.scalar(select(DagRun).where(DagRun.dag_id == dag_id, DagRun.run_id == dag_run_id))

Expand Down Expand Up @@ -101,4 +101,4 @@ def get_dag_run_deadlines(

deadlines = session.scalars(deadlines_select)

return DealineCollectionResponse(deadlines=deadlines, total_entries=total_entries)
return DeadlineCollectionResponse(deadlines=deadlines, total_entries=total_entries)
Original file line number Diff line number Diff line change
Expand Up @@ -1566,7 +1566,7 @@ export const ensureUseDashboardServiceDagStatsData = (queryClient: QueryClient)
* @param data.limit
* @param data.offset
* @param data.orderBy Attributes to order by, multi criteria sort is supported. Prefix with `-` for descending order. Supported attributes: `id, deadline_time, created_at, alert_name`
* @returns DealineCollectionResponse Successful Response
* @returns DeadlineCollectionResponse Successful Response
* @throws ApiError
*/
export const ensureUseDeadlinesServiceGetDagRunDeadlinesData = (queryClient: QueryClient, { dagId, dagRunId, limit, offset, orderBy }: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1566,7 +1566,7 @@ export const prefetchUseDashboardServiceDagStats = (queryClient: QueryClient) =>
* @param data.limit
* @param data.offset
* @param data.orderBy Attributes to order by, multi criteria sort is supported. Prefix with `-` for descending order. Supported attributes: `id, deadline_time, created_at, alert_name`
* @returns DealineCollectionResponse Successful Response
* @returns DeadlineCollectionResponse Successful Response
* @throws ApiError
*/
export const prefetchUseDeadlinesServiceGetDagRunDeadlines = (queryClient: QueryClient, { dagId, dagRunId, limit, offset, orderBy }: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1566,7 +1566,7 @@ export const useDashboardServiceDagStats = <TData = Common.DashboardServiceDagSt
* @param data.limit
* @param data.offset
* @param data.orderBy Attributes to order by, multi criteria sort is supported. Prefix with `-` for descending order. Supported attributes: `id, deadline_time, created_at, alert_name`
* @returns DealineCollectionResponse Successful Response
* @returns DeadlineCollectionResponse Successful Response
* @throws ApiError
*/
export const useDeadlinesServiceGetDagRunDeadlines = <TData = Common.DeadlinesServiceGetDagRunDeadlinesDefaultResponse, TError = unknown, TQueryKey extends Array<unknown> = unknown[]>({ dagId, dagRunId, limit, offset, orderBy }: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1566,7 +1566,7 @@ export const useDashboardServiceDagStatsSuspense = <TData = Common.DashboardServ
* @param data.limit
* @param data.offset
* @param data.orderBy Attributes to order by, multi criteria sort is supported. Prefix with `-` for descending order. Supported attributes: `id, deadline_time, created_at, alert_name`
* @returns DealineCollectionResponse Successful Response
* @returns DeadlineCollectionResponse Successful Response
* @throws ApiError
*/
export const useDeadlinesServiceGetDagRunDeadlinesSuspense = <TData = Common.DeadlinesServiceGetDagRunDeadlinesDefaultResponse, TError = unknown, TQueryKey extends Array<unknown> = unknown[]>({ dagId, dagRunId, limit, offset, orderBy }: {
Expand Down
40 changes: 20 additions & 20 deletions airflow-core/src/airflow/ui/openapi-gen/requests/schemas.gen.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7850,6 +7850,26 @@ export const $DashboardDagStatsResponse = {
description: 'Dashboard DAG Stats serializer for responses.'
} as const;

export const $DeadlineCollectionResponse = {
properties: {
deadlines: {
items: {
'$ref': '#/components/schemas/DeadlineResponse'
},
type: 'array',
title: 'Deadlines'
},
total_entries: {
type: 'integer',
title: 'Total Entries'
}
},
type: 'object',
required: ['deadlines', 'total_entries'],
title: 'DeadlineCollectionResponse',
description: 'Deadline Collection serializer for responses.'
} as const;

export const $DeadlineResponse = {
properties: {
id: {
Expand Down Expand Up @@ -7900,26 +7920,6 @@ export const $DeadlineResponse = {
description: 'Deadline serializer for responses.'
} as const;

export const $DealineCollectionResponse = {
properties: {
deadlines: {
items: {
'$ref': '#/components/schemas/DeadlineResponse'
},
type: 'array',
title: 'Deadlines'
},
total_entries: {
type: 'integer',
title: 'Total Entries'
}
},
type: 'object',
required: ['deadlines', 'total_entries'],
title: 'DealineCollectionResponse',
description: 'Deadline Collection serializer for responses.'
} as const;

export const $EdgeResponse = {
properties: {
source_id: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3976,7 +3976,7 @@ export class DeadlinesService {
* @param data.limit
* @param data.offset
* @param data.orderBy Attributes to order by, multi criteria sort is supported. Prefix with `-` for descending order. Supported attributes: `id, deadline_time, created_at, alert_name`
* @returns DealineCollectionResponse Successful Response
* @returns DeadlineCollectionResponse Successful Response
* @throws ApiError
*/
public static getDagRunDeadlines(data: GetDagRunDeadlinesData): CancelablePromise<GetDagRunDeadlinesResponse> {
Expand Down
20 changes: 10 additions & 10 deletions airflow-core/src/airflow/ui/openapi-gen/requests/types.gen.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1927,6 +1927,14 @@ export type DashboardDagStatsResponse = {
queued_dag_count: number;
};

/**
* Deadline Collection serializer for responses.
*/
export type DeadlineCollectionResponse = {
deadlines: Array<DeadlineResponse>;
total_entries: number;
};

/**
* Deadline serializer for responses.
*/
Expand All @@ -1939,14 +1947,6 @@ export type DeadlineResponse = {
alert_description?: string | null;
};

/**
* Deadline Collection serializer for responses.
*/
export type DealineCollectionResponse = {
deadlines: Array<DeadlineResponse>;
total_entries: number;
};

/**
* Edge serializer for responses.
*/
Expand Down Expand Up @@ -3568,7 +3568,7 @@ export type GetDagRunDeadlinesData = {
orderBy?: Array<(string)>;
};

export type GetDagRunDeadlinesResponse = DealineCollectionResponse;
export type GetDagRunDeadlinesResponse = DeadlineCollectionResponse;

export type StructureDataData = {
dagId: string;
Expand Down Expand Up @@ -6821,7 +6821,7 @@ export type $OpenApiTs = {
/**
* Successful Response
*/
200: DealineCollectionResponse;
200: DeadlineCollectionResponse;
/**
* Not Found
*/
Expand Down
Loading