Merge branch 'main' into fix/chore-fix

This commit is contained in:
Yeuoly
2024-11-15 15:43:32 +08:00
114 changed files with 4193 additions and 220 deletions

View File

@ -1,6 +1,7 @@
from typing import Literal, Optional
from pydantic import BaseModel, Field
from pydantic import BaseModel, Field, field_validator
from core.model_runtime.utils.encoders import jsonable_encoder
from core.tools.__base.tool import ToolParameter
@ -37,6 +38,11 @@ class ToolProviderApiEntity(BaseModel):
tools: list[ToolApiEntity] = Field(default_factory=list)
labels: list[str] = Field(default_factory=list)
@field_validator("tools", mode="before")
@classmethod
def convert_none_to_empty_list(cls, v):
return v if v is not None else []
def to_dict(self) -> dict:
# -------------
# overwrite tool parameter types for temp fix