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 49661dfd5db0a..eb3898f955e00 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 5eead52583dd4..c59d75f0f5d94 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 @@ -934,8 +934,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/v1-rest-api-generated.yaml b/airflow-core/src/airflow/api_fastapi/core_api/openapi/v1-rest-api-generated.yaml index b596b3f9fabb8..fd9889d4bcd49 100644 --- a/airflow-core/src/airflow/api_fastapi/core_api/openapi/v1-rest-api-generated.yaml +++ b/airflow-core/src/airflow/api_fastapi/core_api/openapi/v1-rest-api-generated.yaml @@ -8231,8 +8231,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 71358efef679e..809715e9037f1 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 @@ -2247,8 +2247,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 ba8bbb28d2de0..d3dccd5f90233 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 @@ -577,7 +577,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 44b1035cbfa81..43140625fbea6 100644 --- a/airflow-core/src/airflow/ui/src/pages/Run/Details.tsx +++ b/airflow-core/src/airflow/ui/src/pages/Run/Details.tsx @@ -145,7 +145,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 81c1066495dfd..4c790551c7804 100644 --- a/airflow-ctl/src/airflowctl/api/datamodels/generated.py +++ b/airflow-ctl/src/airflowctl/api/datamodels/generated.py @@ -1219,7 +1219,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