UniqAI/open-webui
1
0
Fork 0
mirror of https://github.com/open-webui/open-webui synced 2024-11-22 08:07:55 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #6380 from open-webui/dev

Browse Source 
fix: arena model exclude filter
This commit is contained in:
Timothy Jaeryang Baek 2024-10-24 14:23:26 -07:00 committed by GitHub
commit 9b12b75df6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -761,6 +761,7 @@ async def generate_chat_completion(
form_data: GenerateChatCompletionForm,
url_idx: Optional[int] = None,
user=Depends(get_verified_user),
bypass_filter: Optional[bool] = False,
):
payload = {**form_data.model_dump(exclude_none=True)}
log.debug(f"generate_chat_completion() - 1.payload = {payload}")
@ -769,7 +770,7 @@ async def generate_chat_completion(
model_id = form_data.model
if app.state.config.ENABLE_MODEL_FILTER:
if not bypass_filter and app.state.config.ENABLE_MODEL_FILTER:
if user.role == "user" and model_id not in app.state.config.MODEL_FILTER_LIST:
raise HTTPException(
status_code=403,

4
backend/open_webui/main.py
View File

@ -1154,7 +1154,9 @@ async def generate_chat_completions(
# Using /ollama/api/chat endpoint
form_data = convert_payload_openai_to_ollama(form_data)
form_data = GenerateChatCompletionForm(**form_data)
response = await generate_ollama_chat_completion(form_data=form_data, user=user)
response = await generate_ollama_chat_completion(
form_data=form_data, user=user, bypass_filter=True
)
if form_data.stream:
response.headers["content-type"] = "text/event-stream"
return StreamingResponse(