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,6 +1,6 @@
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
@@ -23,6 +23,8 @@ class DatasourceServeRequest(BaseModel):
class DatasourceServeResponse(BaseModel):
"""Flow response model"""
model_config = ConfigDict(title=f"ServeResponse for {SERVE_APP_NAME_HUMP}")
"""name: knowledge space name"""
"""vector_type: vector type"""
@@ -35,7 +37,3 @@ class DatasourceServeResponse(BaseModel):
db_user: str = Field("", description="Database user.")
db_pwd: str = Field("", description="Database password.")
comment: str = Field("", description="Comment for the database.")
# TODO define your own fields here
class Config:
title = f"ServerResponse for {SERVE_APP_NAME_HUMP}"

View File

@@ -4,6 +4,7 @@ from typing import List, Optional
from fastapi import HTTPException
from dbgpt._private.config import Config
from dbgpt._private.pydantic import model_to_dict
from dbgpt.component import ComponentType, SystemApp
from dbgpt.core.awel.dag.dag_manager import DAGManager
from dbgpt.datasource.db_conn_info import DBConfig
@@ -129,9 +130,9 @@ class Service(
status_code=400,
detail=f"there is no datasource name:{request.db_name} exists",
)
db_config = DBConfig(**request.dict())
db_config = DBConfig(**model_to_dict(request))
if CFG.local_db_manager.edit_db(db_config):
return DatasourceServeResponse(**db_config.dict())
return DatasourceServeResponse(**model_to_dict(db_config))
else:
raise HTTPException(
status_code=400,