refac
This commit is contained in:
1 parent
fa2abe4cb6
commit
4351c78b1e
3 files changed
+142
-2
No files matched your search
@@ -20,7 +20,7 @@ from sqlalchemy.ext.asyncio import AsyncSession
|
||||
|
||||
from open_webui.config import UPLOAD_DIR
|
||||
from open_webui.constants import ERROR_MESSAGES
|
||||
from open_webui.events import EVENTS, publish_event
|
||||
from open_webui.events import EVENTS, publish_event, publish_model_provider_request_failed
|
||||
from open_webui.env import (
|
||||
AIOHTTP_CLIENT_SESSION_SSL,
|
||||
AIOHTTP_CLIENT_TIMEOUT,
|
||||
@@ -133,12 +133,27 @@ async def send_request(
|
||||
if not r.ok:
|
||||
try:
|
||||
res = await r.json()
|
||||
await publish_model_provider_request_failed(
|
||||
request,
|
||||
actor=user,
|
||||
provider='ollama',
|
||||
base_url=url,
|
||||
status=r.status,
|
||||
upstream_error=res,
|
||||
)
|
||||
if 'error' in res:
|
||||
raise HTTPException(status_code=r.status, detail=res['error'])
|
||||
except HTTPException:
|
||||
raise
|
||||
except Exception as e:
|
||||
log.error(f'Failed to parse error response: {e}')
|
||||
await publish_model_provider_request_failed(
|
||||
request,
|
||||
actor=user,
|
||||
provider='ollama',
|
||||
base_url=url,
|
||||
status=r.status,
|
||||
)
|
||||
raise HTTPException(
|
||||
status_code=r.status,
|
||||
detail=ERROR_MESSAGES.SERVER_CONNECTION_ERROR,
|
||||
|
||||
@@ -22,7 +22,7 @@ from open_webui.config import (
|
||||
CACHE_DIR,
|
||||
)
|
||||
from open_webui.constants import ERROR_MESSAGES
|
||||
from open_webui.events import EVENTS, publish_event
|
||||
from open_webui.events import EVENTS, publish_event, publish_model_provider_request_failed
|
||||
from open_webui.env import (
|
||||
AIOHTTP_CLIENT_SESSION_SSL,
|
||||
AIOHTTP_CLIENT_TIMEOUT,
|
||||
@@ -1236,6 +1236,7 @@ async def generate_chat_completion(
|
||||
request_url = f'{url}/responses'
|
||||
else:
|
||||
request_url = f'{url}/chat/completions'
|
||||
requested_model = payload.get('model')
|
||||
# For Chat Completions, strip image parts from multimodal tool messages
|
||||
# (Chat Completions doesn't support images in tool content).
|
||||
if not is_responses and 'messages' in payload:
|
||||
@@ -1278,8 +1279,28 @@ async def generate_chat_completion(
|
||||
)
|
||||
try:
|
||||
error_json = json.loads(error_body)
|
||||
await publish_model_provider_request_failed(
|
||||
request,
|
||||
actor=user,
|
||||
provider='openai-compatible',
|
||||
base_url=url,
|
||||
api_key=key,
|
||||
status=r.status,
|
||||
requested_model=requested_model,
|
||||
upstream_error=error_json,
|
||||
)
|
||||
return JSONResponse(status_code=r.status, content=error_json)
|
||||
except json.JSONDecodeError:
|
||||
await publish_model_provider_request_failed(
|
||||
request,
|
||||
actor=user,
|
||||
provider='openai-compatible',
|
||||
base_url=url,
|
||||
api_key=key,
|
||||
status=r.status,
|
||||
requested_model=requested_model,
|
||||
upstream_error=error_body,
|
||||
)
|
||||
return JSONResponse(
|
||||
status_code=r.status,
|
||||
content={'error': {'message': error_body, 'code': r.status}},
|
||||
@@ -1299,6 +1320,16 @@ async def generate_chat_completion(
|
||||
response = await r.text()
|
||||
|
||||
if r.status >= 400:
|
||||
await publish_model_provider_request_failed(
|
||||
request,
|
||||
actor=user,
|
||||
provider='openai-compatible',
|
||||
base_url=url,
|
||||
api_key=key,
|
||||
status=r.status,
|
||||
requested_model=requested_model,
|
||||
upstream_error=response,
|
||||
)
|
||||
if isinstance(response, (dict, list)):
|
||||
return JSONResponse(status_code=r.status, content=response)
|
||||
else:
|
||||
@@ -1372,6 +1403,7 @@ async def embeddings(request: Request, form_data: dict, user):
|
||||
headers['api-version'] = api_version
|
||||
else:
|
||||
embeddings_url = f'{url}/embeddings'
|
||||
requested_model = form_data.get('model')
|
||||
|
||||
try:
|
||||
session = await get_session()
|
||||
@@ -1399,6 +1431,16 @@ async def embeddings(request: Request, form_data: dict, user):
|
||||
response_data = await r.text()
|
||||
|
||||
if r.status >= 400:
|
||||
await publish_model_provider_request_failed(
|
||||
request,
|
||||
actor=user,
|
||||
provider='openai-compatible',
|
||||
base_url=url,
|
||||
api_key=key,
|
||||
status=r.status,
|
||||
requested_model=requested_model,
|
||||
upstream_error=response_data,
|
||||
)
|
||||
if isinstance(response_data, (dict, list)):
|
||||
return JSONResponse(status_code=r.status, content=response_data)
|
||||
else:
|
||||
@@ -1515,6 +1557,16 @@ async def responses(
|
||||
response_data = await r.text()
|
||||
|
||||
if r.status >= 400:
|
||||
await publish_model_provider_request_failed(
|
||||
request,
|
||||
actor=user,
|
||||
provider='openai-compatible',
|
||||
base_url=url,
|
||||
api_key=key,
|
||||
status=r.status,
|
||||
requested_model=payload.get('model'),
|
||||
upstream_error=response_data,
|
||||
)
|
||||
if isinstance(response_data, (dict, list)):
|
||||
return JSONResponse(status_code=r.status, content=response_data)
|
||||
else:
|
||||
@@ -1569,6 +1621,7 @@ async def proxy(path: str, request: Request, user=Depends(get_verified_user)):
|
||||
idx = models[model_id]['urlIdx']
|
||||
|
||||
url, key, api_config = await get_openai_connection(idx)
|
||||
base_url = url
|
||||
|
||||
r = None
|
||||
streaming = False
|
||||
@@ -1625,6 +1678,16 @@ async def proxy(path: str, request: Request, user=Depends(get_verified_user)):
|
||||
response_data = await r.text()
|
||||
|
||||
if r.status >= 400:
|
||||
await publish_model_provider_request_failed(
|
||||
request,
|
||||
actor=user,
|
||||
provider='openai-compatible',
|
||||
base_url=base_url,
|
||||
api_key=key,
|
||||
status=r.status,
|
||||
requested_model=model_id,
|
||||
upstream_error=response_data,
|
||||
)
|
||||
if isinstance(response_data, (dict, list)):
|
||||
return JSONResponse(status_code=r.status, content=response_data)
|
||||
else:
|
||||
|
||||
Reference in new issue
Block a user