diff --git a/airflow-core/src/airflow/api_fastapi/core_api/datamodels/dag_run.py b/airflow-core/src/airflow/api_fastapi/core_api/datamodels/dag_run.py index 966de7e78f785..367547a8d8e09 100644 --- a/airflow-core/src/airflow/api_fastapi/core_api/datamodels/dag_run.py +++ b/airflow-core/src/airflow/api_fastapi/core_api/datamodels/dag_run.py @@ -73,7 +73,7 @@ class DAGRunResponse(BaseModel): run_type: DagRunType state: DagRunState triggered_by: DagRunTriggeredByType | None - conf: dict + conf: dict | None note: str | None dag_versions: list[DagVersionResponse] bundle_version: str | None 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 7f34ed7b3cb9a..4df5d890b469b 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 @@ -955,8 +955,10 @@ components: - $ref: '#/components/schemas/DagRunTriggeredByType' - type: 'null' conf: - additionalProperties: true - type: object + anyOf: + - additionalProperties: true + type: object + - type: 'null' title: Conf note: anyOf: diff --git a/airflow-core/src/airflow/api_fastapi/core_api/openapi/v2-rest-api-generated.yaml b/airflow-core/src/airflow/api_fastapi/core_api/openapi/v2-rest-api-generated.yaml index 2d8f43b62e09e..f6b7c8ce2c2e7 100644 --- a/airflow-core/src/airflow/api_fastapi/core_api/openapi/v2-rest-api-generated.yaml +++ b/airflow-core/src/airflow/api_fastapi/core_api/openapi/v2-rest-api-generated.yaml @@ -8464,8 +8464,10 @@ components: - $ref: '#/components/schemas/DagRunTriggeredByType' - type: 'null' conf: - additionalProperties: true - type: object + anyOf: + - additionalProperties: true + type: object + - type: 'null' title: Conf note: anyOf: diff --git a/airflow-core/src/airflow/ui/openapi-gen/requests/schemas.gen.ts b/airflow-core/src/airflow/ui/openapi-gen/requests/schemas.gen.ts index 8b3913a40844f..e11b1c29020e9 100644 --- a/airflow-core/src/airflow/ui/openapi-gen/requests/schemas.gen.ts +++ b/airflow-core/src/airflow/ui/openapi-gen/requests/schemas.gen.ts @@ -2275,8 +2275,15 @@ export const $DAGRunResponse = { ], }, conf: { - additionalProperties: true, - type: "object", + anyOf: [ + { + additionalProperties: true, + type: "object", + }, + { + type: "null", + }, + ], title: "Conf", }, note: { 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 3e5232ef9cd2b..77f26b12b5a07 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 @@ -582,7 +582,7 @@ export type DAGRunResponse = { triggered_by: DagRunTriggeredByType | null; conf: { [key: string]: unknown; - }; + } | null; note: string | null; dag_versions: Array; bundle_version: string | null; diff --git a/airflow-core/src/airflow/ui/src/pages/Run/Details.tsx b/airflow-core/src/airflow/ui/src/pages/Run/Details.tsx index f20ada8603517..8a65fcafe6761 100644 --- a/airflow-core/src/airflow/ui/src/pages/Run/Details.tsx +++ b/airflow-core/src/airflow/ui/src/pages/Run/Details.tsx @@ -151,7 +151,7 @@ export const Details = () => { Run Config - + diff --git a/airflow-ctl/src/airflowctl/api/datamodels/generated.py b/airflow-ctl/src/airflowctl/api/datamodels/generated.py index abc0ae5811b89..0bf806c8bc0f9 100644 --- a/airflow-ctl/src/airflowctl/api/datamodels/generated.py +++ b/airflow-ctl/src/airflowctl/api/datamodels/generated.py @@ -1245,7 +1245,7 @@ class DAGRunResponse(BaseModel): run_type: DagRunType state: DagRunState triggered_by: DagRunTriggeredByType | None = None - conf: Annotated[dict[str, Any], Field(title="Conf")] + conf: Annotated[dict[str, Any] | None, Field(title="Conf")] = None note: Annotated[str | None, Field(title="Note")] = None dag_versions: Annotated[list[DagVersionResponse], Field(title="Dag Versions")] bundle_version: Annotated[str | None, Field(title="Bundle Version")] = None