Emil_Shanaty/open-webui-ai4me
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refac

Browse Source
This commit is contained in:
Timothy Jaeryang Baek
2025-08-13 18:18:30 +04:00
parent 20101579e0
commit e7d9755d97
1 changed files with 34 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/open_webui/main.py
+34 -22
View File
@@ -1321,7 +1321,10 @@ async def get_models(
model_order_dict = {model_id: i for i, model_id in enumerate(model_order_list)} model_order_dict = {model_id: i for i, model_id in enumerate(model_order_list)}
# Sort models by order list priority, with fallback for those not in the list # Sort models by order list priority, with fallback for those not in the list
models.sort( models.sort(
key=lambda x: (model_order_dict.get(x["id"], float("inf")), x.get("name")) key=lambda model: (
model_order_dict.get(model.get("id"), float("inf")),
model.get("name"),
)
) )
# Filter out models that the user does not have access to # Filter out models that the user does not have access to
@@ -1467,13 +1470,16 @@ async def chat_completion(
log.debug(f"Error processing chat payload: {e}") log.debug(f"Error processing chat payload: {e}")
if metadata.get("chat_id") and metadata.get("message_id"): if metadata.get("chat_id") and metadata.get("message_id"):
# Update the chat message with the error # Update the chat message with the error
Chats.upsert_message_to_chat_by_id_and_message_id( try:
metadata["chat_id"], Chats.upsert_message_to_chat_by_id_and_message_id(
metadata["message_id"], metadata["chat_id"],
{ metadata["message_id"],
"error": {"content": str(e)}, {
}, "error": {"content": str(e)},
) },
)
except:
pass
raise HTTPException( raise HTTPException(
status_code=status.HTTP_400_BAD_REQUEST, status_code=status.HTTP_400_BAD_REQUEST,
@@ -1483,13 +1489,16 @@ async def chat_completion(
try: try:
response = await chat_completion_handler(request, form_data, user) response = await chat_completion_handler(request, form_data, user)
if metadata.get("chat_id") and metadata.get("message_id"): if metadata.get("chat_id") and metadata.get("message_id"):
Chats.upsert_message_to_chat_by_id_and_message_id( try:
metadata["chat_id"], Chats.upsert_message_to_chat_by_id_and_message_id(
metadata["message_id"], metadata["chat_id"],
{ metadata["message_id"],
"model": model_id, {
}, "model": model_id,
) },
)
except:
pass
return await process_chat_response( return await process_chat_response(
request, response, form_data, user, metadata, model, events, tasks request, response, form_data, user, metadata, model, events, tasks
@@ -1498,13 +1507,16 @@ async def chat_completion(
log.debug(f"Error in chat completion: {e}") log.debug(f"Error in chat completion: {e}")
if metadata.get("chat_id") and metadata.get("message_id"): if metadata.get("chat_id") and metadata.get("message_id"):
# Update the chat message with the error # Update the chat message with the error
Chats.upsert_message_to_chat_by_id_and_message_id( try:
metadata["chat_id"], Chats.upsert_message_to_chat_by_id_and_message_id(
metadata["message_id"], metadata["chat_id"],
{ metadata["message_id"],
"error": {"content": str(e)}, {
}, "error": {"content": str(e)},
) },
)
except:
pass
raise HTTPException( raise HTTPException(
status_code=status.HTTP_400_BAD_REQUEST, status_code=status.HTTP_400_BAD_REQUEST,