feat(core): Upgrade pydantic to 2.x (#1428)

This commit is contained in:
Fangyin Cheng
2024-04-20 09:41:16 +08:00
committed by GitHub
parent baa1e3f9f6
commit 57be1ece18
103 changed files with 1146 additions and 534 deletions

View File

@@ -1,16 +1,15 @@
# Define your Pydantic schemas here
from typing import Optional
from dbgpt._private.pydantic import BaseModel, Field
from dbgpt._private.pydantic import BaseModel, ConfigDict, Field
from ..config import SERVE_APP_NAME_HUMP
class ServeRequest(BaseModel):
"""Prompt request model"""
"""Prompt request model."""
class Config:
title = f"ServeRequest for {SERVE_APP_NAME_HUMP}"
model_config = ConfigDict(title=f"ServeRequest for {SERVE_APP_NAME_HUMP}")
chat_scene: Optional[str] = Field(
None,
@@ -69,8 +68,7 @@ class ServeRequest(BaseModel):
class ServerResponse(ServeRequest):
"""Prompt response model"""
class Config:
title = f"ServerResponse for {SERVE_APP_NAME_HUMP}"
model_config = ConfigDict(title=f"ServerResponse for {SERVE_APP_NAME_HUMP}")
id: Optional[int] = Field(
None,

View File

@@ -6,6 +6,7 @@ from typing import Any, Dict, Union
from sqlalchemy import Column, DateTime, Index, Integer, String, Text, UniqueConstraint
from dbgpt._private.pydantic import model_to_dict
from dbgpt.storage.metadata import BaseDao, Model, db
from ..api.schemas import ServeRequest, ServerResponse
@@ -78,7 +79,9 @@ class ServeDao(BaseDao[ServeEntity, ServeRequest, ServerResponse]):
Returns:
T: The entity
"""
request_dict = request.dict() if isinstance(request, ServeRequest) else request
request_dict = (
model_to_dict(request) if isinstance(request, ServeRequest) else request
)
entity = ServeEntity(**request_dict)
return entity

View File

@@ -8,7 +8,7 @@ from dbgpt.storage.metadata import db
from dbgpt.util import PaginationResult
from ..api.endpoints import init_endpoints, router
from ..api.schemas import ServeRequest, ServerResponse
from ..api.schemas import ServerResponse
from ..config import SERVE_CONFIG_KEY_PREFIX