UniqAI/open-webui
1
0
Fork 0
mirror of https://github.com/open-webui/open-webui synced 2025-01-18 00:30:51 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

refac: ollama non stream response

Browse Source
This commit is contained in:
Timothy J. Baek 2024-06-30 01:30:19 -07:00
parent bb53282cb0
commit f6efda9e2f
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -153,7 +153,7 @@ async def cleanup_response(
await session.close() await session.close()
async def post_streaming_url(url: str, payload: str): async def post_streaming_url(url: str, payload: str, stream: bool = True):
r = None r = None
try: try:
session = aiohttp.ClientSession( session = aiohttp.ClientSession(
@ -162,12 +162,20 @@ async def post_streaming_url(url: str, payload: str):
r = await session.post(url, data=payload) r = await session.post(url, data=payload)
r.raise_for_status() r.raise_for_status()
return StreamingResponse( if stream:
r.content, return StreamingResponse(
status_code=r.status, r.content,
headers=dict(r.headers), status_code=r.status,
background=BackgroundTask(cleanup_response, response=r, session=session), headers=dict(r.headers),
) background=BackgroundTask(
cleanup_response, response=r, session=session
),
)
else:
res = await r.json()
await cleanup_response(r, session)
return res
except Exception as e: except Exception as e:
error_detail = "Open WebUI: Server Connection Error" error_detail = "Open WebUI: Server Connection Error"
if r is not None: if r is not None:
@ -963,7 +971,11 @@ async def generate_openai_chat_completion(
url = app.state.config.OLLAMA_BASE_URLS[url_idx] url = app.state.config.OLLAMA_BASE_URLS[url_idx]
log.info(f"url: {url}") log.info(f"url: {url}")
return await post_streaming_url(f"{url}/v1/chat/completions", json.dumps(payload)) return await post_streaming_url(
f"{url}/v1/chat/completions",
json.dumps(payload),
stream=payload.get("stream", False),
)
@app.get("/v1/models") @app.get("/v1/models")