UniqAI/open-webui
1
0
Fork 0
mirror of https://github.com/open-webui/open-webui synced 2024-11-27 06:20:01 +00:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity

fix: resolve undefined names 'call_next' and 'response' in handle_nonstreaming_response

Browse Source
This commit is contained in:
smonux (aider) 2024-10-06 11:11:00 +02:00
parent 2a51781633
commit 6bcfdaaaf0
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
backend/open_webui/main.py
View File

@ -432,6 +432,9 @@ def update_body_request(request: Request,
] ]
return None return None
from starlette.middleware import Middleware
from starlette.middleware.base import BaseHTTPMiddleware, RequestResponseEndpoint
async def handle_nonstreaming_response(request: Request, response: Response, tools: dict) -> Response: async def handle_nonstreaming_response(request: Request, response: Response, tools: dict) -> Response:
response_dict = json.loads(response) response_dict = json.loads(response)
body = json.loads(request._body) body = json.loads(request._body)
@ -721,14 +724,14 @@ class ChatCompletionMiddleware(BaseHTTPMiddleware):
update_body_request(request, body) update_body_request(request, body)
first_response = await call_next(request) first_response = await call_next(request)
if not isinstance(first_response, StreamingResponse): if not isinstance(first_response, StreamingResponse):
response = await handle_nonstreaming_response(request, response, tools) response = await handle_nonstreaming_response(request, first_response, tools)
return response return response
content_type = first_response.headers["Content-Type"] content_type = first_response.headers["Content-Type"]
is_openai = "text/event-stream" in content_type is_openai = "text/event-stream" in content_type
is_ollama = "application/x-ndjson" in content_type is_ollama = "application/x-ndjson" in content_type
if not is_openai and not is_ollama: if not is_openai and not is_ollama:
return response return first_response
def wrap_item(item): def wrap_item(item):
return f"data: {item}\n\n" if is_openai else f"{item}\n" return f"data: {item}\n\n" if is_openai else f"{item}\n"