refac
This commit is contained in:
@@ -1020,6 +1020,8 @@ class ChatMessage(BaseModel):
|
|||||||
tool_calls: Optional[list[dict]] = None
|
tool_calls: Optional[list[dict]] = None
|
||||||
images: Optional[list[str]] = None
|
images: Optional[list[str]] = None
|
||||||
|
|
||||||
|
model_config = ConfigDict(extra='allow')
|
||||||
|
|
||||||
@validator('content', pre=True)
|
@validator('content', pre=True)
|
||||||
@classmethod
|
@classmethod
|
||||||
def check_at_least_one_field(cls, field_value, values, **kwargs):
|
def check_at_least_one_field(cls, field_value, values, **kwargs):
|
||||||
|
|||||||
@@ -204,6 +204,11 @@ def convert_messages_openai_to_ollama(messages: list[dict]) -> list[dict]:
|
|||||||
# Initialize the new message structure with the role
|
# Initialize the new message structure with the role
|
||||||
new_message = {'role': message['role']}
|
new_message = {'role': message['role']}
|
||||||
|
|
||||||
|
# Preserve Ollama-native 'thinking' field (used by reasoning models,
|
||||||
|
# may be injected by filter inlet functions).
|
||||||
|
if 'thinking' in message:
|
||||||
|
new_message['thinking'] = message['thinking']
|
||||||
|
|
||||||
content = message.get('content', [])
|
content = message.get('content', [])
|
||||||
tool_calls = message.get('tool_calls', None)
|
tool_calls = message.get('tool_calls', None)
|
||||||
tool_call_id = message.get('tool_call_id', None)
|
tool_call_id = message.get('tool_call_id', None)
|
||||||
|
|||||||
Reference in New Issue
Block a user