This is an automated email from the ASF dual-hosted git repository.
dstandish pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push:
new c3861e794aa Ensure that both public and ui dags endpoints map to
DagService (#51226)
c3861e794aa is described below
commit c3861e794aa8e4cfe76e28be19eca1e5a5a797e7
Author: Daniel Standish <[email protected]>
AuthorDate: Fri May 30 07:48:18 2025 -0700
Ensure that both public and ui dags endpoints map to DagService (#51226)
Previously the dags router in ui endpoint was `Dags` while public was
`DAG`. This resulted in the service being generated as DagsService for UI and
DagService for public. But, probably better to have them generated under same
service, and not just differ by the one letter.
---
.../api_fastapi/core_api/openapi/_private_ui.yaml | 2 +-
.../airflow/api_fastapi/core_api/routes/ui/dags.py | 2 +-
.../src/airflow/ui/openapi-gen/queries/common.ts | 109 +++++++------
.../ui/openapi-gen/queries/ensureQueryData.ts | 161 +++++++++---------
.../src/airflow/ui/openapi-gen/queries/prefetch.ts | 161 +++++++++---------
.../src/airflow/ui/openapi-gen/queries/queries.ts | 179 ++++++++++-----------
.../src/airflow/ui/openapi-gen/queries/suspense.ts | 179 ++++++++++-----------
.../ui/openapi-gen/requests/services.gen.ts | 92 ++++++-----
.../airflow/ui/openapi-gen/requests/types.gen.ts | 76 ++++-----
.../ui/src/pages/Asset/CreateAssetEventModal.tsx | 4 +-
airflow-core/src/airflow/ui/src/pages/Dag/Dag.tsx | 4 +-
.../src/airflow/ui/src/queries/useDags.tsx | 4 +-
.../ui/src/queries/useRefreshOnNewDagRuns.ts | 4 +-
.../src/airflow/ui/src/queries/useTogglePause.ts | 4 +-
.../src/airflow/ui/src/queries/useTrigger.ts | 4 +-
15 files changed, 489 insertions(+), 496 deletions(-)
diff --git
a/airflow-core/src/airflow/api_fastapi/core_api/openapi/_private_ui.yaml
b/airflow-core/src/airflow/api_fastapi/core_api/openapi/_private_ui.yaml
index d6f35c2cde3..dd466d317fe 100644
--- a/airflow-core/src/airflow/api_fastapi/core_api/openapi/_private_ui.yaml
+++ b/airflow-core/src/airflow/api_fastapi/core_api/openapi/_private_ui.yaml
@@ -97,7 +97,7 @@ paths:
/ui/dags/recent_dag_runs:
get:
tags:
- - Dags
+ - DAG
summary: Recent Dag Runs
description: Get recent DAG runs.
operationId: recent_dag_runs
diff --git a/airflow-core/src/airflow/api_fastapi/core_api/routes/ui/dags.py
b/airflow-core/src/airflow/api_fastapi/core_api/routes/ui/dags.py
index da57a6fc02f..6e2640ca186 100644
--- a/airflow-core/src/airflow/api_fastapi/core_api/routes/ui/dags.py
+++ b/airflow-core/src/airflow/api_fastapi/core_api/routes/ui/dags.py
@@ -54,7 +54,7 @@ from airflow.api_fastapi.core_api.security import (
)
from airflow.models import DagModel, DagRun
-dags_router = AirflowRouter(prefix="/dags", tags=["Dags"])
+dags_router = AirflowRouter(prefix="/dags", tags=["DAG"])
@dags_router.get(
diff --git a/airflow-core/src/airflow/ui/openapi-gen/queries/common.ts
b/airflow-core/src/airflow/ui/openapi-gen/queries/common.ts
index f2402d30c93..8e52f120bde 100644
--- a/airflow-core/src/airflow/ui/openapi-gen/queries/common.ts
+++ b/airflow-core/src/airflow/ui/openapi-gen/queries/common.ts
@@ -15,7 +15,6 @@ import {
DagStatsService,
DagVersionService,
DagWarningService,
- DagsService,
DashboardService,
DependenciesService,
EventLogService,
@@ -690,6 +689,60 @@ export const UseDagServiceGetDagTagsKeyFn = (
} = {},
queryKey?: Array<unknown>,
) => [useDagServiceGetDagTagsKey, ...(queryKey ?? [{ limit, offset, orderBy,
tagNamePattern }])];
+export type DagServiceRecentDagRunsDefaultResponse = Awaited<ReturnType<typeof
DagService.recentDagRuns>>;
+export type DagServiceRecentDagRunsQueryResult<
+ TData = DagServiceRecentDagRunsDefaultResponse,
+ TError = unknown,
+> = UseQueryResult<TData, TError>;
+export const useDagServiceRecentDagRunsKey = "DagServiceRecentDagRuns";
+export const UseDagServiceRecentDagRunsKeyFn = (
+ {
+ dagDisplayNamePattern,
+ dagIdPattern,
+ dagIds,
+ dagRunsLimit,
+ excludeStale,
+ lastDagRunState,
+ limit,
+ offset,
+ owners,
+ paused,
+ tags,
+ tagsMatchMode,
+ }: {
+ dagDisplayNamePattern?: string;
+ dagIdPattern?: string;
+ dagIds?: string[];
+ dagRunsLimit?: number;
+ excludeStale?: boolean;
+ lastDagRunState?: DagRunState;
+ limit?: number;
+ offset?: number;
+ owners?: string[];
+ paused?: boolean;
+ tags?: string[];
+ tagsMatchMode?: "any" | "all";
+ } = {},
+ queryKey?: Array<unknown>,
+) => [
+ useDagServiceRecentDagRunsKey,
+ ...(queryKey ?? [
+ {
+ dagDisplayNamePattern,
+ dagIdPattern,
+ dagIds,
+ dagRunsLimit,
+ excludeStale,
+ lastDagRunState,
+ limit,
+ offset,
+ owners,
+ paused,
+ tags,
+ tagsMatchMode,
+ },
+ ]),
+];
export type EventLogServiceGetEventLogDefaultResponse = Awaited<
ReturnType<typeof EventLogService.getEventLog>
>;
@@ -1660,60 +1713,6 @@ export const UseAuthLinksServiceGetAuthMenusKeyFn =
(queryKey?: Array<unknown>)
useAuthLinksServiceGetAuthMenusKey,
...(queryKey ?? []),
];
-export type DagsServiceRecentDagRunsDefaultResponse =
Awaited<ReturnType<typeof DagsService.recentDagRuns>>;
-export type DagsServiceRecentDagRunsQueryResult<
- TData = DagsServiceRecentDagRunsDefaultResponse,
- TError = unknown,
-> = UseQueryResult<TData, TError>;
-export const useDagsServiceRecentDagRunsKey = "DagsServiceRecentDagRuns";
-export const UseDagsServiceRecentDagRunsKeyFn = (
- {
- dagDisplayNamePattern,
- dagIdPattern,
- dagIds,
- dagRunsLimit,
- excludeStale,
- lastDagRunState,
- limit,
- offset,
- owners,
- paused,
- tags,
- tagsMatchMode,
- }: {
- dagDisplayNamePattern?: string;
- dagIdPattern?: string;
- dagIds?: string[];
- dagRunsLimit?: number;
- excludeStale?: boolean;
- lastDagRunState?: DagRunState;
- limit?: number;
- offset?: number;
- owners?: string[];
- paused?: boolean;
- tags?: string[];
- tagsMatchMode?: "any" | "all";
- } = {},
- queryKey?: Array<unknown>,
-) => [
- useDagsServiceRecentDagRunsKey,
- ...(queryKey ?? [
- {
- dagDisplayNamePattern,
- dagIdPattern,
- dagIds,
- dagRunsLimit,
- excludeStale,
- lastDagRunState,
- limit,
- offset,
- owners,
- paused,
- tags,
- tagsMatchMode,
- },
- ]),
-];
export type DependenciesServiceGetDependenciesDefaultResponse = Awaited<
ReturnType<typeof DependenciesService.getDependencies>
>;
diff --git a/airflow-core/src/airflow/ui/openapi-gen/queries/ensureQueryData.ts
b/airflow-core/src/airflow/ui/openapi-gen/queries/ensureQueryData.ts
index 07994c99a8f..ecec8ec7011 100644
--- a/airflow-core/src/airflow/ui/openapi-gen/queries/ensureQueryData.ts
+++ b/airflow-core/src/airflow/ui/openapi-gen/queries/ensureQueryData.ts
@@ -14,7 +14,6 @@ import {
DagStatsService,
DagVersionService,
DagWarningService,
- DagsService,
DashboardService,
DependenciesService,
EventLogService,
@@ -924,6 +923,86 @@ export const ensureUseDagServiceGetDagTagsData = (
queryKey: Common.UseDagServiceGetDagTagsKeyFn({ limit, offset, orderBy,
tagNamePattern }),
queryFn: () => DagService.getDagTags({ limit, offset, orderBy,
tagNamePattern }),
});
+/**
+ * Recent Dag Runs
+ * Get recent DAG runs.
+ * @param data The data for the request.
+ * @param data.dagRunsLimit
+ * @param data.limit
+ * @param data.offset
+ * @param data.tags
+ * @param data.tagsMatchMode
+ * @param data.owners
+ * @param data.dagIds
+ * @param data.dagIdPattern SQL LIKE expression — use `%` / `_` wildcards
(e.g. `%customer_%`). Regular expressions are **not** supported.
+ * @param data.dagDisplayNamePattern SQL LIKE expression — use `%` / `_`
wildcards (e.g. `%customer_%`). Regular expressions are **not** supported.
+ * @param data.excludeStale
+ * @param data.paused
+ * @param data.lastDagRunState
+ * @returns DAGWithLatestDagRunsCollectionResponse Successful Response
+ * @throws ApiError
+ */
+export const ensureUseDagServiceRecentDagRunsData = (
+ queryClient: QueryClient,
+ {
+ dagDisplayNamePattern,
+ dagIdPattern,
+ dagIds,
+ dagRunsLimit,
+ excludeStale,
+ lastDagRunState,
+ limit,
+ offset,
+ owners,
+ paused,
+ tags,
+ tagsMatchMode,
+ }: {
+ dagDisplayNamePattern?: string;
+ dagIdPattern?: string;
+ dagIds?: string[];
+ dagRunsLimit?: number;
+ excludeStale?: boolean;
+ lastDagRunState?: DagRunState;
+ limit?: number;
+ offset?: number;
+ owners?: string[];
+ paused?: boolean;
+ tags?: string[];
+ tagsMatchMode?: "any" | "all";
+ } = {},
+) =>
+ queryClient.ensureQueryData({
+ queryKey: Common.UseDagServiceRecentDagRunsKeyFn({
+ dagDisplayNamePattern,
+ dagIdPattern,
+ dagIds,
+ dagRunsLimit,
+ excludeStale,
+ lastDagRunState,
+ limit,
+ offset,
+ owners,
+ paused,
+ tags,
+ tagsMatchMode,
+ }),
+ queryFn: () =>
+ DagService.recentDagRuns({
+ dagDisplayNamePattern,
+ dagIdPattern,
+ dagIds,
+ dagRunsLimit,
+ excludeStale,
+ lastDagRunState,
+ limit,
+ offset,
+ owners,
+ paused,
+ tags,
+ tagsMatchMode,
+ }),
+ });
/**
* Get Event Log
* @param data The data for the request.
@@ -2307,86 +2386,6 @@ export const ensureUseAuthLinksServiceGetAuthMenusData =
(queryClient: QueryClie
queryKey: Common.UseAuthLinksServiceGetAuthMenusKeyFn(),
queryFn: () => AuthLinksService.getAuthMenus(),
});
-/**
- * Recent Dag Runs
- * Get recent DAG runs.
- * @param data The data for the request.
- * @param data.dagRunsLimit
- * @param data.limit
- * @param data.offset
- * @param data.tags
- * @param data.tagsMatchMode
- * @param data.owners
- * @param data.dagIds
- * @param data.dagIdPattern SQL LIKE expression — use `%` / `_` wildcards
(e.g. `%customer_%`). Regular expressions are **not** supported.
- * @param data.dagDisplayNamePattern SQL LIKE expression — use `%` / `_`
wildcards (e.g. `%customer_%`). Regular expressions are **not** supported.
- * @param data.excludeStale
- * @param data.paused
- * @param data.lastDagRunState
- * @returns DAGWithLatestDagRunsCollectionResponse Successful Response
- * @throws ApiError
- */
-export const ensureUseDagsServiceRecentDagRunsData = (
- queryClient: QueryClient,
- {
- dagDisplayNamePattern,
- dagIdPattern,
- dagIds,
- dagRunsLimit,
- excludeStale,
- lastDagRunState,
- limit,
- offset,
- owners,
- paused,
- tags,
- tagsMatchMode,
- }: {
- dagDisplayNamePattern?: string;
- dagIdPattern?: string;
- dagIds?: string[];
- dagRunsLimit?: number;
- excludeStale?: boolean;
- lastDagRunState?: DagRunState;
- limit?: number;
- offset?: number;
- owners?: string[];
- paused?: boolean;
- tags?: string[];
- tagsMatchMode?: "any" | "all";
- } = {},
-) =>
- queryClient.ensureQueryData({
- queryKey: Common.UseDagsServiceRecentDagRunsKeyFn({
- dagDisplayNamePattern,
- dagIdPattern,
- dagIds,
- dagRunsLimit,
- excludeStale,
- lastDagRunState,
- limit,
- offset,
- owners,
- paused,
- tags,
- tagsMatchMode,
- }),
- queryFn: () =>
- DagsService.recentDagRuns({
- dagDisplayNamePattern,
- dagIdPattern,
- dagIds,
- dagRunsLimit,
- excludeStale,
- lastDagRunState,
- limit,
- offset,
- owners,
- paused,
- tags,
- tagsMatchMode,
- }),
- });
/**
* Get Dependencies
* Dependencies graph.
diff --git a/airflow-core/src/airflow/ui/openapi-gen/queries/prefetch.ts
b/airflow-core/src/airflow/ui/openapi-gen/queries/prefetch.ts
index fa4e7bdf6b3..1fc14a9e11e 100644
--- a/airflow-core/src/airflow/ui/openapi-gen/queries/prefetch.ts
+++ b/airflow-core/src/airflow/ui/openapi-gen/queries/prefetch.ts
@@ -14,7 +14,6 @@ import {
DagStatsService,
DagVersionService,
DagWarningService,
- DagsService,
DashboardService,
DependenciesService,
EventLogService,
@@ -924,6 +923,86 @@ export const prefetchUseDagServiceGetDagTags = (
queryKey: Common.UseDagServiceGetDagTagsKeyFn({ limit, offset, orderBy,
tagNamePattern }),
queryFn: () => DagService.getDagTags({ limit, offset, orderBy,
tagNamePattern }),
});
+/**
+ * Recent Dag Runs
+ * Get recent DAG runs.
+ * @param data The data for the request.
+ * @param data.dagRunsLimit
+ * @param data.limit
+ * @param data.offset
+ * @param data.tags
+ * @param data.tagsMatchMode
+ * @param data.owners
+ * @param data.dagIds
+ * @param data.dagIdPattern SQL LIKE expression — use `%` / `_` wildcards
(e.g. `%customer_%`). Regular expressions are **not** supported.
+ * @param data.dagDisplayNamePattern SQL LIKE expression — use `%` / `_`
wildcards (e.g. `%customer_%`). Regular expressions are **not** supported.
+ * @param data.excludeStale
+ * @param data.paused
+ * @param data.lastDagRunState
+ * @returns DAGWithLatestDagRunsCollectionResponse Successful Response
+ * @throws ApiError
+ */
+export const prefetchUseDagServiceRecentDagRuns = (
+ queryClient: QueryClient,
+ {
+ dagDisplayNamePattern,
+ dagIdPattern,
+ dagIds,
+ dagRunsLimit,
+ excludeStale,
+ lastDagRunState,
+ limit,
+ offset,
+ owners,
+ paused,
+ tags,
+ tagsMatchMode,
+ }: {
+ dagDisplayNamePattern?: string;
+ dagIdPattern?: string;
+ dagIds?: string[];
+ dagRunsLimit?: number;
+ excludeStale?: boolean;
+ lastDagRunState?: DagRunState;
+ limit?: number;
+ offset?: number;
+ owners?: string[];
+ paused?: boolean;
+ tags?: string[];
+ tagsMatchMode?: "any" | "all";
+ } = {},
+) =>
+ queryClient.prefetchQuery({
+ queryKey: Common.UseDagServiceRecentDagRunsKeyFn({
+ dagDisplayNamePattern,
+ dagIdPattern,
+ dagIds,
+ dagRunsLimit,
+ excludeStale,
+ lastDagRunState,
+ limit,
+ offset,
+ owners,
+ paused,
+ tags,
+ tagsMatchMode,
+ }),
+ queryFn: () =>
+ DagService.recentDagRuns({
+ dagDisplayNamePattern,
+ dagIdPattern,
+ dagIds,
+ dagRunsLimit,
+ excludeStale,
+ lastDagRunState,
+ limit,
+ offset,
+ owners,
+ paused,
+ tags,
+ tagsMatchMode,
+ }),
+ });
/**
* Get Event Log
* @param data The data for the request.
@@ -2307,86 +2386,6 @@ export const prefetchUseAuthLinksServiceGetAuthMenus =
(queryClient: QueryClient
queryKey: Common.UseAuthLinksServiceGetAuthMenusKeyFn(),
queryFn: () => AuthLinksService.getAuthMenus(),
});
-/**
- * Recent Dag Runs
- * Get recent DAG runs.
- * @param data The data for the request.
- * @param data.dagRunsLimit
- * @param data.limit
- * @param data.offset
- * @param data.tags
- * @param data.tagsMatchMode
- * @param data.owners
- * @param data.dagIds
- * @param data.dagIdPattern SQL LIKE expression — use `%` / `_` wildcards
(e.g. `%customer_%`). Regular expressions are **not** supported.
- * @param data.dagDisplayNamePattern SQL LIKE expression — use `%` / `_`
wildcards (e.g. `%customer_%`). Regular expressions are **not** supported.
- * @param data.excludeStale
- * @param data.paused
- * @param data.lastDagRunState
- * @returns DAGWithLatestDagRunsCollectionResponse Successful Response
- * @throws ApiError
- */
-export const prefetchUseDagsServiceRecentDagRuns = (
- queryClient: QueryClient,
- {
- dagDisplayNamePattern,
- dagIdPattern,
- dagIds,
- dagRunsLimit,
- excludeStale,
- lastDagRunState,
- limit,
- offset,
- owners,
- paused,
- tags,
- tagsMatchMode,
- }: {
- dagDisplayNamePattern?: string;
- dagIdPattern?: string;
- dagIds?: string[];
- dagRunsLimit?: number;
- excludeStale?: boolean;
- lastDagRunState?: DagRunState;
- limit?: number;
- offset?: number;
- owners?: string[];
- paused?: boolean;
- tags?: string[];
- tagsMatchMode?: "any" | "all";
- } = {},
-) =>
- queryClient.prefetchQuery({
- queryKey: Common.UseDagsServiceRecentDagRunsKeyFn({
- dagDisplayNamePattern,
- dagIdPattern,
- dagIds,
- dagRunsLimit,
- excludeStale,
- lastDagRunState,
- limit,
- offset,
- owners,
- paused,
- tags,
- tagsMatchMode,
- }),
- queryFn: () =>
- DagsService.recentDagRuns({
- dagDisplayNamePattern,
- dagIdPattern,
- dagIds,
- dagRunsLimit,
- excludeStale,
- lastDagRunState,
- limit,
- offset,
- owners,
- paused,
- tags,
- tagsMatchMode,
- }),
- });
/**
* Get Dependencies
* Dependencies graph.
diff --git a/airflow-core/src/airflow/ui/openapi-gen/queries/queries.ts
b/airflow-core/src/airflow/ui/openapi-gen/queries/queries.ts
index eb7f09a8b33..695aedfdc9e 100644
--- a/airflow-core/src/airflow/ui/openapi-gen/queries/queries.ts
+++ b/airflow-core/src/airflow/ui/openapi-gen/queries/queries.ts
@@ -15,7 +15,6 @@ import {
DagStatsService,
DagVersionService,
DagWarningService,
- DagsService,
DashboardService,
DependenciesService,
EventLogService,
@@ -1147,6 +1146,95 @@ export const useDagServiceGetDagTags = <
queryFn: () => DagService.getDagTags({ limit, offset, orderBy,
tagNamePattern }) as TData,
...options,
});
+/**
+ * Recent Dag Runs
+ * Get recent DAG runs.
+ * @param data The data for the request.
+ * @param data.dagRunsLimit
+ * @param data.limit
+ * @param data.offset
+ * @param data.tags
+ * @param data.tagsMatchMode
+ * @param data.owners
+ * @param data.dagIds
+ * @param data.dagIdPattern SQL LIKE expression — use `%` / `_` wildcards
(e.g. `%customer_%`). Regular expressions are **not** supported.
+ * @param data.dagDisplayNamePattern SQL LIKE expression — use `%` / `_`
wildcards (e.g. `%customer_%`). Regular expressions are **not** supported.
+ * @param data.excludeStale
+ * @param data.paused
+ * @param data.lastDagRunState
+ * @returns DAGWithLatestDagRunsCollectionResponse Successful Response
+ * @throws ApiError
+ */
+export const useDagServiceRecentDagRuns = <
+ TData = Common.DagServiceRecentDagRunsDefaultResponse,
+ TError = unknown,
+ TQueryKey extends Array<unknown> = unknown[],
+>(
+ {
+ dagDisplayNamePattern,
+ dagIdPattern,
+ dagIds,
+ dagRunsLimit,
+ excludeStale,
+ lastDagRunState,
+ limit,
+ offset,
+ owners,
+ paused,
+ tags,
+ tagsMatchMode,
+ }: {
+ dagDisplayNamePattern?: string;
+ dagIdPattern?: string;
+ dagIds?: string[];
+ dagRunsLimit?: number;
+ excludeStale?: boolean;
+ lastDagRunState?: DagRunState;
+ limit?: number;
+ offset?: number;
+ owners?: string[];
+ paused?: boolean;
+ tags?: string[];
+ tagsMatchMode?: "any" | "all";
+ } = {},
+ queryKey?: TQueryKey,
+ options?: Omit<UseQueryOptions<TData, TError>, "queryKey" | "queryFn">,
+) =>
+ useQuery<TData, TError>({
+ queryKey: Common.UseDagServiceRecentDagRunsKeyFn(
+ {
+ dagDisplayNamePattern,
+ dagIdPattern,
+ dagIds,
+ dagRunsLimit,
+ excludeStale,
+ lastDagRunState,
+ limit,
+ offset,
+ owners,
+ paused,
+ tags,
+ tagsMatchMode,
+ },
+ queryKey,
+ ),
+ queryFn: () =>
+ DagService.recentDagRuns({
+ dagDisplayNamePattern,
+ dagIdPattern,
+ dagIds,
+ dagRunsLimit,
+ excludeStale,
+ lastDagRunState,
+ limit,
+ offset,
+ owners,
+ paused,
+ tags,
+ tagsMatchMode,
+ }) as TData,
+ ...options,
+ });
/**
* Get Event Log
* @param data The data for the request.
@@ -2771,95 +2859,6 @@ export const useAuthLinksServiceGetAuthMenus = <
queryFn: () => AuthLinksService.getAuthMenus() as TData,
...options,
});
-/**
- * Recent Dag Runs
- * Get recent DAG runs.
- * @param data The data for the request.
- * @param data.dagRunsLimit
- * @param data.limit
- * @param data.offset
- * @param data.tags
- * @param data.tagsMatchMode
- * @param data.owners
- * @param data.dagIds
- * @param data.dagIdPattern SQL LIKE expression — use `%` / `_` wildcards
(e.g. `%customer_%`). Regular expressions are **not** supported.
- * @param data.dagDisplayNamePattern SQL LIKE expression — use `%` / `_`
wildcards (e.g. `%customer_%`). Regular expressions are **not** supported.
- * @param data.excludeStale
- * @param data.paused
- * @param data.lastDagRunState
- * @returns DAGWithLatestDagRunsCollectionResponse Successful Response
- * @throws ApiError
- */
-export const useDagsServiceRecentDagRuns = <
- TData = Common.DagsServiceRecentDagRunsDefaultResponse,
- TError = unknown,
- TQueryKey extends Array<unknown> = unknown[],
->(
- {
- dagDisplayNamePattern,
- dagIdPattern,
- dagIds,
- dagRunsLimit,
- excludeStale,
- lastDagRunState,
- limit,
- offset,
- owners,
- paused,
- tags,
- tagsMatchMode,
- }: {
- dagDisplayNamePattern?: string;
- dagIdPattern?: string;
- dagIds?: string[];
- dagRunsLimit?: number;
- excludeStale?: boolean;
- lastDagRunState?: DagRunState;
- limit?: number;
- offset?: number;
- owners?: string[];
- paused?: boolean;
- tags?: string[];
- tagsMatchMode?: "any" | "all";
- } = {},
- queryKey?: TQueryKey,
- options?: Omit<UseQueryOptions<TData, TError>, "queryKey" | "queryFn">,
-) =>
- useQuery<TData, TError>({
- queryKey: Common.UseDagsServiceRecentDagRunsKeyFn(
- {
- dagDisplayNamePattern,
- dagIdPattern,
- dagIds,
- dagRunsLimit,
- excludeStale,
- lastDagRunState,
- limit,
- offset,
- owners,
- paused,
- tags,
- tagsMatchMode,
- },
- queryKey,
- ),
- queryFn: () =>
- DagsService.recentDagRuns({
- dagDisplayNamePattern,
- dagIdPattern,
- dagIds,
- dagRunsLimit,
- excludeStale,
- lastDagRunState,
- limit,
- offset,
- owners,
- paused,
- tags,
- tagsMatchMode,
- }) as TData,
- ...options,
- });
/**
* Get Dependencies
* Dependencies graph.
diff --git a/airflow-core/src/airflow/ui/openapi-gen/queries/suspense.ts
b/airflow-core/src/airflow/ui/openapi-gen/queries/suspense.ts
index a5ef317fa87..ce9e2ef4452 100644
--- a/airflow-core/src/airflow/ui/openapi-gen/queries/suspense.ts
+++ b/airflow-core/src/airflow/ui/openapi-gen/queries/suspense.ts
@@ -14,7 +14,6 @@ import {
DagStatsService,
DagVersionService,
DagWarningService,
- DagsService,
DashboardService,
DependenciesService,
EventLogService,
@@ -1123,6 +1122,95 @@ export const useDagServiceGetDagTagsSuspense = <
queryFn: () => DagService.getDagTags({ limit, offset, orderBy,
tagNamePattern }) as TData,
...options,
});
+/**
+ * Recent Dag Runs
+ * Get recent DAG runs.
+ * @param data The data for the request.
+ * @param data.dagRunsLimit
+ * @param data.limit
+ * @param data.offset
+ * @param data.tags
+ * @param data.tagsMatchMode
+ * @param data.owners
+ * @param data.dagIds
+ * @param data.dagIdPattern SQL LIKE expression — use `%` / `_` wildcards
(e.g. `%customer_%`). Regular expressions are **not** supported.
+ * @param data.dagDisplayNamePattern SQL LIKE expression — use `%` / `_`
wildcards (e.g. `%customer_%`). Regular expressions are **not** supported.
+ * @param data.excludeStale
+ * @param data.paused
+ * @param data.lastDagRunState
+ * @returns DAGWithLatestDagRunsCollectionResponse Successful Response
+ * @throws ApiError
+ */
+export const useDagServiceRecentDagRunsSuspense = <
+ TData = Common.DagServiceRecentDagRunsDefaultResponse,
+ TError = unknown,
+ TQueryKey extends Array<unknown> = unknown[],
+>(
+ {
+ dagDisplayNamePattern,
+ dagIdPattern,
+ dagIds,
+ dagRunsLimit,
+ excludeStale,
+ lastDagRunState,
+ limit,
+ offset,
+ owners,
+ paused,
+ tags,
+ tagsMatchMode,
+ }: {
+ dagDisplayNamePattern?: string;
+ dagIdPattern?: string;
+ dagIds?: string[];
+ dagRunsLimit?: number;
+ excludeStale?: boolean;
+ lastDagRunState?: DagRunState;
+ limit?: number;
+ offset?: number;
+ owners?: string[];
+ paused?: boolean;
+ tags?: string[];
+ tagsMatchMode?: "any" | "all";
+ } = {},
+ queryKey?: TQueryKey,
+ options?: Omit<UseQueryOptions<TData, TError>, "queryKey" | "queryFn">,
+) =>
+ useSuspenseQuery<TData, TError>({
+ queryKey: Common.UseDagServiceRecentDagRunsKeyFn(
+ {
+ dagDisplayNamePattern,
+ dagIdPattern,
+ dagIds,
+ dagRunsLimit,
+ excludeStale,
+ lastDagRunState,
+ limit,
+ offset,
+ owners,
+ paused,
+ tags,
+ tagsMatchMode,
+ },
+ queryKey,
+ ),
+ queryFn: () =>
+ DagService.recentDagRuns({
+ dagDisplayNamePattern,
+ dagIdPattern,
+ dagIds,
+ dagRunsLimit,
+ excludeStale,
+ lastDagRunState,
+ limit,
+ offset,
+ owners,
+ paused,
+ tags,
+ tagsMatchMode,
+ }) as TData,
+ ...options,
+ });
/**
* Get Event Log
* @param data The data for the request.
@@ -2747,95 +2835,6 @@ export const useAuthLinksServiceGetAuthMenusSuspense = <
queryFn: () => AuthLinksService.getAuthMenus() as TData,
...options,
});
-/**
- * Recent Dag Runs
- * Get recent DAG runs.
- * @param data The data for the request.
- * @param data.dagRunsLimit
- * @param data.limit
- * @param data.offset
- * @param data.tags
- * @param data.tagsMatchMode
- * @param data.owners
- * @param data.dagIds
- * @param data.dagIdPattern SQL LIKE expression — use `%` / `_` wildcards
(e.g. `%customer_%`). Regular expressions are **not** supported.
- * @param data.dagDisplayNamePattern SQL LIKE expression — use `%` / `_`
wildcards (e.g. `%customer_%`). Regular expressions are **not** supported.
- * @param data.excludeStale
- * @param data.paused
- * @param data.lastDagRunState
- * @returns DAGWithLatestDagRunsCollectionResponse Successful Response
- * @throws ApiError
- */
-export const useDagsServiceRecentDagRunsSuspense = <
- TData = Common.DagsServiceRecentDagRunsDefaultResponse,
- TError = unknown,
- TQueryKey extends Array<unknown> = unknown[],
->(
- {
- dagDisplayNamePattern,
- dagIdPattern,
- dagIds,
- dagRunsLimit,
- excludeStale,
- lastDagRunState,
- limit,
- offset,
- owners,
- paused,
- tags,
- tagsMatchMode,
- }: {
- dagDisplayNamePattern?: string;
- dagIdPattern?: string;
- dagIds?: string[];
- dagRunsLimit?: number;
- excludeStale?: boolean;
- lastDagRunState?: DagRunState;
- limit?: number;
- offset?: number;
- owners?: string[];
- paused?: boolean;
- tags?: string[];
- tagsMatchMode?: "any" | "all";
- } = {},
- queryKey?: TQueryKey,
- options?: Omit<UseQueryOptions<TData, TError>, "queryKey" | "queryFn">,
-) =>
- useSuspenseQuery<TData, TError>({
- queryKey: Common.UseDagsServiceRecentDagRunsKeyFn(
- {
- dagDisplayNamePattern,
- dagIdPattern,
- dagIds,
- dagRunsLimit,
- excludeStale,
- lastDagRunState,
- limit,
- offset,
- owners,
- paused,
- tags,
- tagsMatchMode,
- },
- queryKey,
- ),
- queryFn: () =>
- DagsService.recentDagRuns({
- dagDisplayNamePattern,
- dagIdPattern,
- dagIds,
- dagRunsLimit,
- excludeStale,
- lastDagRunState,
- limit,
- offset,
- owners,
- paused,
- tags,
- tagsMatchMode,
- }) as TData,
- ...options,
- });
/**
* Get Dependencies
* Dependencies graph.
diff --git a/airflow-core/src/airflow/ui/openapi-gen/requests/services.gen.ts
b/airflow-core/src/airflow/ui/openapi-gen/requests/services.gen.ts
index 53b10a7af65..ca1aa027578 100644
--- a/airflow-core/src/airflow/ui/openapi-gen/requests/services.gen.ts
+++ b/airflow-core/src/airflow/ui/openapi-gen/requests/services.gen.ts
@@ -106,6 +106,8 @@ import type {
GetDagDetailsResponse,
GetDagTagsData,
GetDagTagsResponse,
+ RecentDagRunsData,
+ RecentDagRunsResponse,
GetEventLogData,
GetEventLogResponse,
GetEventLogsData,
@@ -212,8 +214,6 @@ import type {
LogoutData,
LogoutResponse,
GetAuthMenusResponse,
- RecentDagRunsData,
- RecentDagRunsResponse,
GetDependenciesData,
GetDependenciesResponse,
HistoricalMetricsData,
@@ -1742,6 +1742,49 @@ export class DagService {
},
});
}
+
+ /**
+ * Recent Dag Runs
+ * Get recent DAG runs.
+ * @param data The data for the request.
+ * @param data.dagRunsLimit
+ * @param data.limit
+ * @param data.offset
+ * @param data.tags
+ * @param data.tagsMatchMode
+ * @param data.owners
+ * @param data.dagIds
+ * @param data.dagIdPattern SQL LIKE expression — use `%` / `_` wildcards
(e.g. `%customer_%`). Regular expressions are **not** supported.
+ * @param data.dagDisplayNamePattern SQL LIKE expression — use `%` / `_`
wildcards (e.g. `%customer_%`). Regular expressions are **not** supported.
+ * @param data.excludeStale
+ * @param data.paused
+ * @param data.lastDagRunState
+ * @returns DAGWithLatestDagRunsCollectionResponse Successful Response
+ * @throws ApiError
+ */
+ public static recentDagRuns(data: RecentDagRunsData = {}):
CancelablePromise<RecentDagRunsResponse> {
+ return __request(OpenAPI, {
+ method: "GET",
+ url: "/ui/dags/recent_dag_runs",
+ query: {
+ dag_runs_limit: data.dagRunsLimit,
+ limit: data.limit,
+ offset: data.offset,
+ tags: data.tags,
+ tags_match_mode: data.tagsMatchMode,
+ owners: data.owners,
+ dag_ids: data.dagIds,
+ dag_id_pattern: data.dagIdPattern,
+ dag_display_name_pattern: data.dagDisplayNamePattern,
+ exclude_stale: data.excludeStale,
+ paused: data.paused,
+ last_dag_run_state: data.lastDagRunState,
+ },
+ errors: {
+ 422: "Validation Error",
+ },
+ });
+ }
}
export class EventLogService {
@@ -3525,51 +3568,6 @@ export class AuthLinksService {
}
}
-export class DagsService {
- /**
- * Recent Dag Runs
- * Get recent DAG runs.
- * @param data The data for the request.
- * @param data.dagRunsLimit
- * @param data.limit
- * @param data.offset
- * @param data.tags
- * @param data.tagsMatchMode
- * @param data.owners
- * @param data.dagIds
- * @param data.dagIdPattern SQL LIKE expression — use `%` / `_` wildcards
(e.g. `%customer_%`). Regular expressions are **not** supported.
- * @param data.dagDisplayNamePattern SQL LIKE expression — use `%` / `_`
wildcards (e.g. `%customer_%`). Regular expressions are **not** supported.
- * @param data.excludeStale
- * @param data.paused
- * @param data.lastDagRunState
- * @returns DAGWithLatestDagRunsCollectionResponse Successful Response
- * @throws ApiError
- */
- public static recentDagRuns(data: RecentDagRunsData = {}):
CancelablePromise<RecentDagRunsResponse> {
- return __request(OpenAPI, {
- method: "GET",
- url: "/ui/dags/recent_dag_runs",
- query: {
- dag_runs_limit: data.dagRunsLimit,
- limit: data.limit,
- offset: data.offset,
- tags: data.tags,
- tags_match_mode: data.tagsMatchMode,
- owners: data.owners,
- dag_ids: data.dagIds,
- dag_id_pattern: data.dagIdPattern,
- dag_display_name_pattern: data.dagDisplayNamePattern,
- exclude_stale: data.excludeStale,
- paused: data.paused,
- last_dag_run_state: data.lastDagRunState,
- },
- errors: {
- 422: "Validation Error",
- },
- });
- }
-}
-
export class DependenciesService {
/**
* Get Dependencies
diff --git a/airflow-core/src/airflow/ui/openapi-gen/requests/types.gen.ts
b/airflow-core/src/airflow/ui/openapi-gen/requests/types.gen.ts
index fe91ba69aed..f89db98c062 100644
--- a/airflow-core/src/airflow/ui/openapi-gen/requests/types.gen.ts
+++ b/airflow-core/src/airflow/ui/openapi-gen/requests/types.gen.ts
@@ -2285,6 +2285,29 @@ export type GetDagTagsData = {
export type GetDagTagsResponse = DAGTagCollectionResponse;
+export type RecentDagRunsData = {
+ /**
+ * SQL LIKE expression — use `%` / `_` wildcards (e.g. `%customer_%`).
Regular expressions are **not** supported.
+ */
+ dagDisplayNamePattern?: string | null;
+ /**
+ * SQL LIKE expression — use `%` / `_` wildcards (e.g. `%customer_%`).
Regular expressions are **not** supported.
+ */
+ dagIdPattern?: string | null;
+ dagIds?: Array<string> | null;
+ dagRunsLimit?: number;
+ excludeStale?: boolean;
+ lastDagRunState?: DagRunState | null;
+ limit?: number;
+ offset?: number;
+ owners?: Array<string>;
+ paused?: boolean | null;
+ tags?: Array<string>;
+ tagsMatchMode?: "any" | "all" | null;
+};
+
+export type RecentDagRunsResponse = DAGWithLatestDagRunsCollectionResponse;
+
export type GetEventLogData = {
eventLogId: number;
};
@@ -2786,29 +2809,6 @@ export type LogoutResponse = unknown;
export type GetAuthMenusResponse = MenuItemCollectionResponse;
-export type RecentDagRunsData = {
- /**
- * SQL LIKE expression — use `%` / `_` wildcards (e.g. `%customer_%`).
Regular expressions are **not** supported.
- */
- dagDisplayNamePattern?: string | null;
- /**
- * SQL LIKE expression — use `%` / `_` wildcards (e.g. `%customer_%`).
Regular expressions are **not** supported.
- */
- dagIdPattern?: string | null;
- dagIds?: Array<string> | null;
- dagRunsLimit?: number;
- excludeStale?: boolean;
- lastDagRunState?: DagRunState | null;
- limit?: number;
- offset?: number;
- owners?: Array<string>;
- paused?: boolean | null;
- tags?: Array<string>;
- tagsMatchMode?: "any" | "all" | null;
-};
-
-export type RecentDagRunsResponse = DAGWithLatestDagRunsCollectionResponse;
-
export type GetDependenciesData = {
nodeId?: string | null;
};
@@ -4266,6 +4266,21 @@ export type $OpenApiTs = {
};
};
};
+ "/ui/dags/recent_dag_runs": {
+ get: {
+ req: RecentDagRunsData;
+ res: {
+ /**
+ * Successful Response
+ */
+ 200: DAGWithLatestDagRunsCollectionResponse;
+ /**
+ * Validation Error
+ */
+ 422: HTTPValidationError;
+ };
+ };
+ };
"/api/v2/eventLogs/{event_log_id}": {
get: {
req: GetEventLogData;
@@ -5679,21 +5694,6 @@ export type $OpenApiTs = {
};
};
};
- "/ui/dags/recent_dag_runs": {
- get: {
- req: RecentDagRunsData;
- res: {
- /**
- * Successful Response
- */
- 200: DAGWithLatestDagRunsCollectionResponse;
- /**
- * Validation Error
- */
- 422: HTTPValidationError;
- };
- };
- };
"/ui/dependencies": {
get: {
req: GetDependenciesData;
diff --git
a/airflow-core/src/airflow/ui/src/pages/Asset/CreateAssetEventModal.tsx
b/airflow-core/src/airflow/ui/src/pages/Asset/CreateAssetEventModal.tsx
index 71e6f542e46..c4f485a13d0 100644
--- a/airflow-core/src/airflow/ui/src/pages/Asset/CreateAssetEventModal.tsx
+++ b/airflow-core/src/airflow/ui/src/pages/Asset/CreateAssetEventModal.tsx
@@ -27,7 +27,7 @@ import {
useAssetServiceMaterializeAsset,
UseDagRunServiceGetDagRunsKeyFn,
useDagServiceGetDagDetails,
- useDagsServiceRecentDagRunsKey,
+ useDagServiceRecentDagRunsKey,
useDependenciesServiceGetDependencies,
UseGridServiceGridDataKeyFn,
UseTaskInstanceServiceGetTaskInstancesKeyFn,
@@ -100,7 +100,7 @@ export const CreateAssetEventModal = ({ asset, onClose,
open }: Props) => {
queryKeys = [
...queryKeys,
- [useDagsServiceRecentDagRunsKey],
+ [useDagServiceRecentDagRunsKey],
UseDagRunServiceGetDagRunsKeyFn({ dagId }, [{ dagId }]),
UseTaskInstanceServiceGetTaskInstancesKeyFn({ dagId, dagRunId: "~" },
[{ dagId, dagRunId: "~" }]),
UseGridServiceGridDataKeyFn({ dagId }, [{ dagId }]),
diff --git a/airflow-core/src/airflow/ui/src/pages/Dag/Dag.tsx
b/airflow-core/src/airflow/ui/src/pages/Dag/Dag.tsx
index 9d8e3ed403b..d68a1fa27ff 100644
--- a/airflow-core/src/airflow/ui/src/pages/Dag/Dag.tsx
+++ b/airflow-core/src/airflow/ui/src/pages/Dag/Dag.tsx
@@ -24,7 +24,7 @@ import { MdDetails, MdOutlineEventNote } from
"react-icons/md";
import { RiArrowGoBackFill } from "react-icons/ri";
import { useParams } from "react-router-dom";
-import { useDagServiceGetDagDetails, useDagsServiceRecentDagRuns } from
"openapi/queries";
+import { useDagServiceGetDagDetails, useDagServiceRecentDagRuns } from
"openapi/queries";
import type { DAGWithLatestDagRunsResponse } from "openapi/requests/types.gen";
import { TaskIcon } from "src/assets/TaskIcon";
import { DetailsLayout } from "src/layouts/Details/DetailsLayout";
@@ -62,7 +62,7 @@ export const Dag = () => {
data: runsData,
error: runsError,
isLoading: isLoadingRuns,
- } = useDagsServiceRecentDagRuns({ dagIds: [dagId], dagRunsLimit: 1 },
undefined, {
+ } = useDagServiceRecentDagRuns({ dagIds: [dagId], dagRunsLimit: 1 },
undefined, {
enabled: Boolean(dagId),
refetchInterval: (query) => {
setHasPendingRuns(
diff --git a/airflow-core/src/airflow/ui/src/queries/useDags.tsx
b/airflow-core/src/airflow/ui/src/queries/useDags.tsx
index de6d66c4c4f..109c85b5c81 100644
--- a/airflow-core/src/airflow/ui/src/queries/useDags.tsx
+++ b/airflow-core/src/airflow/ui/src/queries/useDags.tsx
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-import { useDagServiceGetDags, useDagsServiceRecentDagRuns } from
"openapi/queries";
+import { useDagServiceGetDags, useDagServiceRecentDagRuns } from
"openapi/queries";
import type { DagRunState, DAGWithLatestDagRunsResponse } from
"openapi/requests/types.gen";
import { isStatePending, useAutoRefresh } from "src/utils";
@@ -50,7 +50,7 @@ export const useDags = (
error: runsError,
isFetching: isRunsFetching,
isLoading: isRunsLoading,
- } = useDagsServiceRecentDagRuns(
+ } = useDagServiceRecentDagRuns(
{
...runsParams,
dagRunsLimit,
diff --git a/airflow-core/src/airflow/ui/src/queries/useRefreshOnNewDagRuns.ts
b/airflow-core/src/airflow/ui/src/queries/useRefreshOnNewDagRuns.ts
index 4c792993da5..ec7736824c1 100644
--- a/airflow-core/src/airflow/ui/src/queries/useRefreshOnNewDagRuns.ts
+++ b/airflow-core/src/airflow/ui/src/queries/useRefreshOnNewDagRuns.ts
@@ -24,7 +24,7 @@ import {
useDagServiceGetDagDetailsKey,
UseDagRunServiceGetDagRunsKeyFn,
UseDagServiceGetDagDetailsKeyFn,
- useDagsServiceRecentDagRunsKey,
+ useDagServiceRecentDagRunsKey,
UseGridServiceGridDataKeyFn,
UseTaskInstanceServiceGetTaskInstancesKeyFn,
} from "openapi/queries";
@@ -50,7 +50,7 @@ export const useRefreshOnNewDagRuns = (dagId: string,
hasPendingRuns: boolean |
previousDagRunIdRef.current = latestDagRunId;
const queryKeys = [
- [useDagsServiceRecentDagRunsKey],
+ [useDagServiceRecentDagRunsKey],
[useDagServiceGetDagDetailsKey],
UseDagServiceGetDagDetailsKeyFn({ dagId }, [{ dagId }]),
UseDagRunServiceGetDagRunsKeyFn({ dagId }, [{ dagId }]),
diff --git a/airflow-core/src/airflow/ui/src/queries/useTogglePause.ts
b/airflow-core/src/airflow/ui/src/queries/useTogglePause.ts
index c4e378e7932..eb4d751c522 100644
--- a/airflow-core/src/airflow/ui/src/queries/useTogglePause.ts
+++ b/airflow-core/src/airflow/ui/src/queries/useTogglePause.ts
@@ -24,7 +24,7 @@ import {
UseDagServiceGetDagKeyFn,
useDagServiceGetDagsKey,
useDagServicePatchDag,
- useDagsServiceRecentDagRunsKey,
+ useDagServiceRecentDagRunsKey,
UseTaskInstanceServiceGetTaskInstancesKeyFn,
} from "openapi/queries";
@@ -34,7 +34,7 @@ export const useTogglePause = ({ dagId }: { dagId: string })
=> {
const onSuccess = async () => {
const queryKeys = [
[useDagServiceGetDagsKey],
- [useDagsServiceRecentDagRunsKey],
+ [useDagServiceRecentDagRunsKey],
UseDagServiceGetDagKeyFn({ dagId }, [{ dagId }]),
UseDagServiceGetDagDetailsKeyFn({ dagId }, [{ dagId }]),
UseDagRunServiceGetDagRunsKeyFn({ dagId }, [{ dagId }]),
diff --git a/airflow-core/src/airflow/ui/src/queries/useTrigger.ts
b/airflow-core/src/airflow/ui/src/queries/useTrigger.ts
index a9aaf9f099d..cce546e0ad3 100644
--- a/airflow-core/src/airflow/ui/src/queries/useTrigger.ts
+++ b/airflow-core/src/airflow/ui/src/queries/useTrigger.ts
@@ -23,7 +23,7 @@ import {
UseDagRunServiceGetDagRunsKeyFn,
useDagRunServiceTriggerDagRun,
useDagServiceGetDagsKey,
- useDagsServiceRecentDagRunsKey,
+ useDagServiceRecentDagRunsKey,
UseGridServiceGridDataKeyFn,
UseTaskInstanceServiceGetTaskInstancesKeyFn,
} from "openapi/queries";
@@ -37,7 +37,7 @@ export const useTrigger = ({ dagId, onSuccessConfirm }: {
dagId: string; onSucce
const onSuccess = async () => {
const queryKeys = [
[useDagServiceGetDagsKey],
- [useDagsServiceRecentDagRunsKey],
+ [useDagServiceRecentDagRunsKey],
UseDagRunServiceGetDagRunsKeyFn({ dagId }, [{ dagId }]),
UseTaskInstanceServiceGetTaskInstancesKeyFn({ dagId, dagRunId: "~" }, [{
dagId, dagRunId: "~" }]),
UseGridServiceGridDataKeyFn({ dagId }, [{ dagId }]),
