jyapayne/dify
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

improve: mordernizing validation by migrating pydantic from 1.x to 2.x (#4592)

Browse source
This commit is contained in:
Bowen Liang 2024-06-14 01:05:37 +08:00 • committed by GitHub
commit f976740b57
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
87 changed files with 697 additions and 300 deletions
Download patch file Download diff file Expand all files Collapse all files

10
api/services/entities/model_provider_entities.py
View file

@ -2,7 +2,7 @@ from enum import Enum
from typing import Optional
from flask import current_app
from pydantic import BaseModel
from pydantic import BaseModel, ConfigDict
from core.entities.model_entities import ModelWithProviderEntity, ProviderModelWithStatusEntity
from core.entities.provider_entities import QuotaConfiguration
@ -61,6 +61,9 @@ class ProviderResponse(BaseModel):
custom_configuration: CustomConfigurationResponse
system_configuration: SystemConfigurationResponse
# pydantic configs
model_config = ConfigDict(protected_namespaces=())
def __init__(self, **data) -> None:
super().__init__(**data)
@ -139,6 +142,9 @@ class DefaultModelResponse(BaseModel):
model_type: ModelType
provider: SimpleProviderEntityResponse
# pydantic configs
model_config = ConfigDict(protected_namespaces=())
class ModelWithProviderEntityResponse(ModelWithProviderEntity):
"""
@ -147,4 +153,4 @@ class ModelWithProviderEntityResponse(ModelWithProviderEntity):
provider: SimpleProviderEntityResponse
def __init__(self, model: ModelWithProviderEntity) -> None:
super().__init__(**model.dict())
super().__init__(**model.model_dump())