tdpeuter/open-webui
tdpeuter/open-webui
1
Fork 0
forked from open-webui/open-webui
Code Issues Pull requests 1 Releases 2 Packages Activity Actions

Merge pull request #397 from ollama-webui/logging

Browse source 
feat: proxy logging
This commit is contained in:
Timothy Jaeryang Baek 2024-01-05 18:52:43 -05:00 committed by GitHub
commit 439185be80
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
backend/apps/ollama/main.py
View file

@ -68,6 +68,7 @@ async def update_ollama_api_url(
@app.api_route("/{path:path}", methods=["GET", "POST", "PUT", "DELETE"]) @app.api_route("/{path:path}", methods=["GET", "POST", "PUT", "DELETE"])
async def proxy(path: str, request: Request, user=Depends(get_current_user)): async def proxy(path: str, request: Request, user=Depends(get_current_user)):
target_url = f"{app.state.OLLAMA_API_BASE_URL}/{path}" target_url = f"{app.state.OLLAMA_API_BASE_URL}/{path}"
print(target_url)
body = await request.body() body = await request.body()
headers = dict(request.headers) headers = dict(request.headers)
@ -93,6 +94,7 @@ async def proxy(path: str, request: Request, user=Depends(get_current_user)):
request.method, target_url, data=body, headers=headers request.method, target_url, data=body, headers=headers
) )
print(response)
if not response.ok: if not response.ok:
data = await response.json() data = await response.json()
print(data) print(data)
@ -100,6 +102,7 @@ async def proxy(path: str, request: Request, user=Depends(get_current_user)):
async def generate(): async def generate():
async for line in response.content: async for line in response.content:
print(line)
yield line yield line
await session.close() await session.close()
@ -118,7 +121,6 @@ async def proxy(path: str, request: Request, user=Depends(get_current_user)):
error_detail = f"Ollama: {e}" error_detail = f"Ollama: {e}"
await session.close() await session.close()
raise HTTPException( raise HTTPException(
status_code=response.status if response else 500, status_code=response.status if response else 500,
detail=error_detail, detail=error_detail,