UniqAI/open-webui
1
0
Fork 0
mirror of https://github.com/open-webui/open-webui synced 2025-02-21 12:29:29 +00:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

refac

Browse Source
This commit is contained in:
Timothy J. Baek 2024-06-18 10:26:53 -07:00
parent 19b67f4975
commit 453f9be16c
2 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/apps/ollama/main.py
View File

@ -889,10 +889,11 @@ class OpenAIChatCompletionForm(BaseModel):
@app.post("/v1/chat/completions") @app.post("/v1/chat/completions")
@app.post("/v1/chat/completions/{url_idx}") @app.post("/v1/chat/completions/{url_idx}")
async def generate_openai_chat_completion( async def generate_openai_chat_completion(
form_data: OpenAIChatCompletionForm, form_data: dict,
url_idx: Optional[int] = None, url_idx: Optional[int] = None,
user=Depends(get_verified_user), user=Depends(get_verified_user),
): ):
form_data = OpenAIChatCompletionForm(**form_data)
payload = { payload = {
**form_data.model_dump(exclude_none=True), **form_data.model_dump(exclude_none=True),

20
backend/main.py
View File

@ -206,9 +206,7 @@ async def get_function_call_response(messages, tool_id, template, task_model_id,
response = None response = None
try: try:
if model["owned_by"] == "ollama": if model["owned_by"] == "ollama":
response = await generate_ollama_chat_completion( response = await generate_ollama_chat_completion(payload, user=user)
OpenAIChatCompletionForm(**payload), user=user
)
else: else:
response = await generate_openai_chat_completion(payload, user=user) response = await generate_openai_chat_completion(payload, user=user)
@ -798,9 +796,7 @@ async def generate_title(form_data: dict, user=Depends(get_verified_user)):
) )
if model["owned_by"] == "ollama": if model["owned_by"] == "ollama":
return await generate_ollama_chat_completion( return await generate_ollama_chat_completion(payload, user=user)
OpenAIChatCompletionForm(**payload), user=user
)
else: else:
return await generate_openai_chat_completion(payload, user=user) return await generate_openai_chat_completion(payload, user=user)
@ -863,9 +859,7 @@ async def generate_search_query(form_data: dict, user=Depends(get_verified_user)
) )
if model["owned_by"] == "ollama": if model["owned_by"] == "ollama":
return await generate_ollama_chat_completion( return await generate_ollama_chat_completion(payload, user=user)
OpenAIChatCompletionForm(**payload), user=user
)
else: else:
return await generate_openai_chat_completion(payload, user=user) return await generate_openai_chat_completion(payload, user=user)
@ -932,9 +926,7 @@ Message: """{{prompt}}"""
) )
if model["owned_by"] == "ollama": if model["owned_by"] == "ollama":
return await generate_ollama_chat_completion( return await generate_ollama_chat_completion(payload, user=user)
OpenAIChatCompletionForm(**payload), user=user
)
else: else:
return await generate_openai_chat_completion(payload, user=user) return await generate_openai_chat_completion(payload, user=user)
@ -991,9 +983,7 @@ async def generate_chat_completions(form_data: dict, user=Depends(get_verified_u
print(model) print(model)
if model["owned_by"] == "ollama": if model["owned_by"] == "ollama":
return await generate_ollama_chat_completion( return await generate_ollama_chat_completion(form_data, user=user)
OpenAIChatCompletionForm(**form_data), user=user
)
else: else:
return await generate_openai_chat_completion(form_data, user=user) return await generate_openai_chat_completion(form_data, user=user)