ti.sil/open-webui
1
0
Fork 0
mirror of https://github.com/open-webui/open-webui.git synced 2025-12-12 04:15:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

refac: ollama response

Browse source
This commit is contained in:
Timothy Jaeryang Baek 2025-06-10 13:10:31 +04:00
parent 2ccc441b41
commit b7a91b1963
3 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
backend/open_webui/utils/middleware.py
View file

@ -1866,9 +1866,11 @@ async def process_chat_response(
value = delta.get("content") value = delta.get("content")
reasoning_content = delta.get( reasoning_content = (
"reasoning_content" delta.get("reasoning_content")
) or delta.get("reasoning") or delta.get("reasoning")
or delta.get("thinking")
)
if reasoning_content: if reasoning_content:
if ( if (
not content_blocks not content_blocks

8
backend/open_webui/utils/misc.py
View file

@ -208,6 +208,7 @@ def openai_chat_message_template(model: str):
def openai_chat_chunk_message_template( def openai_chat_chunk_message_template(
model: str, model: str,
content: Optional[str] = None, content: Optional[str] = None,
reasoning_content: Optional[str] = None,
tool_calls: Optional[list[dict]] = None, tool_calls: Optional[list[dict]] = None,
usage: Optional[dict] = None, usage: Optional[dict] = None,
) -> dict: ) -> dict:
@ -220,6 +221,9 @@ def openai_chat_chunk_message_template(
if content: if content:
template["choices"][0]["delta"]["content"] = content template["choices"][0]["delta"]["content"] = content
if reasoning_content:
template["choices"][0]["delta"]["reasonsing_content"] = reasoning_content
if tool_calls: if tool_calls:
template["choices"][0]["delta"]["tool_calls"] = tool_calls template["choices"][0]["delta"]["tool_calls"] = tool_calls
@ -234,6 +238,7 @@ def openai_chat_chunk_message_template(
def openai_chat_completion_message_template( def openai_chat_completion_message_template(
model: str, model: str,
message: Optional[str] = None, message: Optional[str] = None,
reasoning_content: Optional[str] = None,
tool_calls: Optional[list[dict]] = None, tool_calls: Optional[list[dict]] = None,
usage: Optional[dict] = None, usage: Optional[dict] = None,
) -> dict: ) -> dict:
@ -241,8 +246,9 @@ def openai_chat_completion_message_template(
template["object"] = "chat.completion" template["object"] = "chat.completion"
if message is not None: if message is not None:
template["choices"][0]["message"] = { template["choices"][0]["message"] = {
"content": message,
"role": "assistant", "role": "assistant",
"content": message,
**({"reasoning_content": reasoning_content} if reasoning_content else {}),
**({"tool_calls": tool_calls} if tool_calls else {}), **({"tool_calls": tool_calls} if tool_calls else {}),
} }

3
backend/open_webui/utils/response.py
View file

@ -105,6 +105,7 @@ async def convert_streaming_response_ollama_to_openai(ollama_streaming_response)
model = data.get("model", "ollama") model = data.get("model", "ollama")
message_content = data.get("message", {}).get("content", None) message_content = data.get("message", {}).get("content", None)
reasoning_content = data.get("message", {}).get("thinking", None)
tool_calls = data.get("message", {}).get("tool_calls", None) tool_calls = data.get("message", {}).get("tool_calls", None)
openai_tool_calls = None openai_tool_calls = None
@ -118,7 +119,7 @@ async def convert_streaming_response_ollama_to_openai(ollama_streaming_response)
usage = convert_ollama_usage_to_openai(data) usage = convert_ollama_usage_to_openai(data)
data = openai_chat_chunk_message_template( data = openai_chat_chunk_message_template(
model, message_content, openai_tool_calls, usage model, message_content, reasoning_content, openai_tool_calls, usage
) )
line = f"data: {json.dumps(data)}\n\n" line = f"data: {json.dumps(data)}\n\n"