Skip to content

Commit cf80ae1

Browse files
nhuanthonhuan.bc
andauthored
Unified using BaseModel for api (apache#59894)
Co-authored-by: nhuan.bc <[email protected]>
1 parent 1585e45 commit cf80ae1

File tree

6 files changed

+10
-10
lines changed

6 files changed

+10
-10
lines changed

airflow-core/src/airflow/api_fastapi/core_api/datamodels/log.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@
1919
from datetime import datetime
2020
from typing import Annotated
2121

22-
from pydantic import BaseModel, ConfigDict, WithJsonSchema
22+
from pydantic import ConfigDict, WithJsonSchema
23+
24+
from airflow.api_fastapi.core_api.base import BaseModel
2325

2426

2527
class StructuredLogMessage(BaseModel):
@@ -33,7 +35,7 @@ class StructuredLogMessage(BaseModel):
3335
] = None
3436
event: str
3537

36-
model_config = ConfigDict(extra="allow")
38+
model_config = ConfigDict(extra="allow", from_attributes=True)
3739

3840

3941
class TaskInstancesLogResponse(BaseModel):

airflow-core/src/airflow/api_fastapi/core_api/datamodels/ui/calendar.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@
1919
from datetime import datetime
2020
from typing import Literal
2121

22-
from pydantic import BaseModel
23-
22+
from airflow.api_fastapi.core_api.base import BaseModel
2423
from airflow.utils.state import DagRunState
2524

2625

airflow-core/src/airflow/api_fastapi/core_api/datamodels/ui/config.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@
1616
# under the License.
1717
from __future__ import annotations
1818

19-
from pydantic import BaseModel
20-
2119
from airflow.api_fastapi.common.types import Theme, UIAlert
20+
from airflow.api_fastapi.core_api.base import BaseModel
2221

2322

2423
class ConfigResponse(BaseModel):

airflow-core/src/airflow/api_fastapi/core_api/datamodels/ui/grid.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@
1919

2020
from datetime import datetime
2121

22-
from pydantic import BaseModel
23-
22+
from airflow.api_fastapi.core_api.base import BaseModel
2423
from airflow.utils.state import TaskInstanceState
2524

2625

airflow-core/src/airflow/api_fastapi/core_api/openapi/exceptions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
from __future__ import annotations
1919

20-
from pydantic import BaseModel
20+
from airflow.api_fastapi.core_api.base import BaseModel
2121

2222

2323
class HTTPExceptionResponse(BaseModel):

airflow-core/src/airflow/api_fastapi/execution_api/routes/xcoms.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,12 @@
2121
from typing import Annotated
2222

2323
from fastapi import APIRouter, Body, Depends, HTTPException, Path, Query, Request, Response, status
24-
from pydantic import BaseModel, JsonValue
24+
from pydantic import JsonValue
2525
from sqlalchemy import delete
2626
from sqlalchemy.sql.selectable import Select
2727

2828
from airflow.api_fastapi.common.db.common import SessionDep
29+
from airflow.api_fastapi.core_api.base import BaseModel
2930
from airflow.api_fastapi.execution_api.datamodels.xcom import (
3031
XComResponse,
3132
XComSequenceIndexResponse,

0 commit comments

Comments
 (0)