fix: error message persistence issue

This commit is contained in:
Timothy Jaeryang Baek 2025-03-28 00:25:00 -07:00
parent 2070d1096b
commit 2fc8ace46d
2 changed files with 18 additions and 3 deletions

View File

@ -281,10 +281,10 @@ async def chat_completion_tools_handler(
await tool_call_handler(result) await tool_call_handler(result)
except Exception as e: except Exception as e:
log.exception(f"Error: {e}") log.debug(f"Error: {e}")
content = None content = None
except Exception as e: except Exception as e:
log.exception(f"Error: {e}") log.debug(f"Error: {e}")
content = None content = None
log.debug(f"tool_contexts: {sources}") log.debug(f"tool_contexts: {sources}")
@ -1539,6 +1539,8 @@ async def process_chat_response(
try: try:
data = json.loads(data) data = json.loads(data)
print(data)
data, _ = await process_filter_functions( data, _ = await process_filter_functions(
request=request, request=request,
filter_functions=filter_functions, filter_functions=filter_functions,
@ -1560,6 +1562,16 @@ async def process_chat_response(
else: else:
choices = data.get("choices", []) choices = data.get("choices", [])
if not choices: if not choices:
error = data.get("error", {})
if error:
await event_emitter(
{
"type": "chat:completion",
"data": {
"error": error,
},
}
)
usage = data.get("usage", {}) usage = data.get("usage", {})
if usage: if usage:
await event_emitter( await event_emitter(

View File

@ -1626,7 +1626,7 @@
: {}) : {})
}, },
`${WEBUI_BASE_URL}/api` `${WEBUI_BASE_URL}/api`
).catch((error) => { ).catch(async (error) => {
toast.error(`${error}`); toast.error(`${error}`);
responseMessage.error = { responseMessage.error = {
@ -1659,9 +1659,11 @@
console.error(innerError); console.error(innerError);
if ('detail' in innerError) { if ('detail' in innerError) {
// FastAPI error
toast.error(innerError.detail); toast.error(innerError.detail);
errorMessage = innerError.detail; errorMessage = innerError.detail;
} else if ('error' in innerError) { } else if ('error' in innerError) {
// OpenAI error
if ('message' in innerError.error) { if ('message' in innerError.error) {
toast.error(innerError.error.message); toast.error(innerError.error.message);
errorMessage = innerError.error.message; errorMessage = innerError.error.message;
@ -1670,6 +1672,7 @@
errorMessage = innerError.error; errorMessage = innerError.error;
} }
} else if ('message' in innerError) { } else if ('message' in innerError) {
// OpenAI error
toast.error(innerError.message); toast.error(innerError.message);
errorMessage = innerError.message; errorMessage = innerError.message;
} }