mirror of
https://github.com/open-webui/open-webui.git
synced 2025-12-12 04:15:25 +00:00
Merge fa8580f594 into 8e661a4e73
This commit is contained in:
commit
3aaf5027e0
1 changed files with 7 additions and 4 deletions
|
|
@ -286,7 +286,9 @@ def convert_payload_openai_to_ollama(openai_payload: dict) -> dict:
|
||||||
Returns:
|
Returns:
|
||||||
dict: A modified payload compatible with the Ollama API.
|
dict: A modified payload compatible with the Ollama API.
|
||||||
"""
|
"""
|
||||||
ollama_payload = {}
|
# Start by copying all fields from the original payload to preserve unknown/Ollama-specific fields
|
||||||
|
# This is important for preserving parameters across tool calling loops
|
||||||
|
ollama_payload = {**openai_payload}
|
||||||
|
|
||||||
# Mapping basic model and message details
|
# Mapping basic model and message details
|
||||||
ollama_payload["model"] = openai_payload.get("model")
|
ollama_payload["model"] = openai_payload.get("model")
|
||||||
|
|
@ -299,12 +301,13 @@ def convert_payload_openai_to_ollama(openai_payload: dict) -> dict:
|
||||||
|
|
||||||
if "max_tokens" in openai_payload:
|
if "max_tokens" in openai_payload:
|
||||||
ollama_payload["num_predict"] = openai_payload["max_tokens"]
|
ollama_payload["num_predict"] = openai_payload["max_tokens"]
|
||||||
del openai_payload["max_tokens"]
|
del ollama_payload["max_tokens"]
|
||||||
|
|
||||||
# If there are advanced parameters in the payload, format them in Ollama's options field
|
# If there are advanced parameters in the payload, format them in Ollama's options field
|
||||||
if openai_payload.get("options"):
|
if openai_payload.get("options"):
|
||||||
ollama_payload["options"] = openai_payload["options"]
|
# Create a copy of options to avoid mutating the original
|
||||||
ollama_options = openai_payload["options"]
|
ollama_options = dict(openai_payload["options"])
|
||||||
|
ollama_payload["options"] = ollama_options
|
||||||
|
|
||||||
def parse_json(value: str) -> dict:
|
def parse_json(value: str) -> dict:
|
||||||
"""
|
"""
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue