diff --git a/endpoints/OAI/types/chat_completion.py b/endpoints/OAI/types/chat_completion.py index 03e69de..5252314 100644 --- a/endpoints/OAI/types/chat_completion.py +++ b/endpoints/OAI/types/chat_completion.py @@ -1,5 +1,4 @@ from pydantic import AliasChoices, BaseModel, Field, field_validator -from pydantic.json_schema import SkipJsonSchema from time import time from typing import Literal, Union, List, Optional, Dict from uuid import uuid4 @@ -32,7 +31,7 @@ class ChatCompletionMessage(BaseModel): role: str = "user" content: Optional[Union[str, List[ChatCompletionMessagePart]]] = None tool_calls: Optional[List[ToolCall]] = None - tool_calls_json: SkipJsonSchema[Optional[str]] = None + tool_call_id: Optional[str] = None class ChatCompletionRespChoice(BaseModel): diff --git a/endpoints/OAI/utils/chat_completion.py b/endpoints/OAI/utils/chat_completion.py index 10d3aec..5cd144d 100644 --- a/endpoints/OAI/utils/chat_completion.py +++ b/endpoints/OAI/utils/chat_completion.py @@ -237,9 +237,6 @@ async def format_messages_with_template( # Convert the message content into a concatenated string message.content = concatenated_content - if message.tool_calls: - message.tool_calls_json = ToolCallProcessor.to_json(message.tool_calls) - message_dicts.append(message.model_dump(exclude_none=True)) # Get all special tokens