community[patch]: fix errors introduced by pydantic 2.10 (#28297)

This commit is contained in:
ccurme
2024-11-22 17:50:13 -05:00
committed by GitHub
parent aa7fa80e1e
commit 203d20caa5
23 changed files with 164 additions and 162 deletions

View File

@@ -38,7 +38,7 @@ class _KdtSuggestContext(BaseModel):
table: Optional[str] = Field(default=None, title="Name of table")
description: Optional[str] = Field(default=None, title="Table description")
columns: List[str] = Field(default=None, title="Table columns list")
columns: List[str] = Field(default=[], title="Table columns list")
rules: Optional[List[str]] = Field(
default=None, title="Rules that apply to the table."
)
@@ -121,7 +121,7 @@ class _KdtoSuggestRequest(BaseModel):
class _KdtMessage(BaseModel):
"""pydantic API response type"""
role: str = Field(default=None, title="One of [user|assistant|system]")
role: str = Field(default="", title="One of [user|assistant|system]")
content: str
@@ -129,7 +129,7 @@ class _KdtChoice(BaseModel):
"""pydantic API response type"""
index: int
message: _KdtMessage = Field(default=None, title="The generated SQL")
message: Optional[_KdtMessage] = Field(default=None, title="The generated SQL")
finish_reason: str
@@ -150,7 +150,7 @@ class _KdtSqlResponse(BaseModel):
model: str
choices: List[_KdtChoice]
usage: _KdtUsage
prompt: str = Field(default=None, title="The input question")
prompt: str = Field(default="", title="The input question")
class _KdtCompletionResponse(BaseModel):
@@ -376,9 +376,8 @@ class ChatKinetica(BaseChatModel):
dict_messages = [self._convert_message_to_dict(m) for m in messages]
sql_response = self._submit_completion(dict_messages)
response_message = sql_response.choices[0].message
# generated_dict = response_message.model_dump() # pydantic v2
generated_dict = response_message.dict()
response_message = cast(_KdtMessage, sql_response.choices[0].message)
generated_dict = response_message.model_dump()
generated_message = self._convert_message_from_dict(generated_dict)
@@ -539,7 +538,7 @@ class KineticaSqlResponse(BaseModel):
the generated SQL and related Pandas Dataframe fetched from the database.
"""
sql: str = Field(default=None)
sql: str = Field(default="")
"""The generated SQL."""
# dataframe: "pd.DataFrame" = Field(default=None)