UniqAI/open-webui
1
0
Fork 0
mirror of https://github.com/open-webui/open-webui synced 2025-02-23 05:38:41 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

refac: chat

Browse Source
This commit is contained in:
Timothy Jaeryang Baek 2025-02-04 20:56:13 -08:00
parent a4ea2e0996
commit 2e61ea7cc9
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/lib/components/chat/Chat.svelte
View File

@ -1317,13 +1317,13 @@
}; };
const sendPrompt = async ( const sendPrompt = async (
history, _history,
prompt: string, prompt: string,
parentId: string, parentId: string,
{ modelId = null, modelIdx = null, newChat = false } = {} { modelId = null, modelIdx = null, newChat = false } = {}
) => { ) => {
let _chatId = JSON.parse(JSON.stringify($chatId)); let _chatId = JSON.parse(JSON.stringify($chatId));
const _history = JSON.parse(JSON.stringify(history)); _history = JSON.parse(JSON.stringify(_history));
const responseMessageIds: Record<PropertyKey, string> = {}; const responseMessageIds: Record<PropertyKey, string> = {};
// If modelId is provided, use it, else use selected model // If modelId is provided, use it, else use selected model
@ -1373,13 +1373,13 @@
// Create new chat if newChat is true and first user message // Create new chat if newChat is true and first user message
if (newChat && _history.messages[_history.currentId].parentId === null) { if (newChat && _history.messages[_history.currentId].parentId === null) {
_chatId = await initChatHandler(_history); _chatId = await initChatHandler(_history);
} else {
await saveChatHandler(_chatId, _history);
} }
await tick(); await tick();
_history = JSON.parse(JSON.stringify(history));
// Save chat after all messages have been created // Save chat after all messages have been created
await saveChatHandler(_chatId, history); await saveChatHandler(_chatId, _history);
await Promise.all( await Promise.all(
selectedModelIds.map(async (modelId, _modelIdx) => { selectedModelIds.map(async (modelId, _modelIdx) => {
@ -1387,7 +1387,7 @@
const model = $models.filter((m) => m.id === modelId).at(0); const model = $models.filter((m) => m.id === modelId).at(0);
if (model) { if (model) {
const messages = createMessagesList(history, parentId); const messages = createMessagesList(_history, parentId);
// If there are image files, check if model is vision capable // If there are image files, check if model is vision capable
const hasImages = messages.some((message) => const hasImages = messages.some((message) =>
message.files?.some((file) => file.type === 'image') message.files?.some((file) => file.type === 'image')
@ -1403,7 +1403,7 @@
let responseMessageId = let responseMessageId =
responseMessageIds[`${modelId}-${modelIdx ? modelIdx : _modelIdx}`]; responseMessageIds[`${modelId}-${modelIdx ? modelIdx : _modelIdx}`];
let responseMessage = history.messages[responseMessageId]; let responseMessage = _history.messages[responseMessageId];
let userContext = null; let userContext = null;
if ($settings?.memory ?? false) { if ($settings?.memory ?? false) {
@ -1432,7 +1432,7 @@
const chatEventEmitter = await getChatEventEmitter(model.id, _chatId); const chatEventEmitter = await getChatEventEmitter(model.id, _chatId);
scrollToBottom(); scrollToBottom();
await sendPromptSocket(history, model, responseMessageId, _chatId); await sendPromptSocket(_history, model, responseMessageId, _chatId);
if (chatEventEmitter) clearInterval(chatEventEmitter); if (chatEventEmitter) clearInterval(chatEventEmitter);
} else { } else {
@ -1445,9 +1445,9 @@
chats.set(await getChatList(localStorage.token, $currentChatPage)); chats.set(await getChatList(localStorage.token, $currentChatPage));
}; };
const sendPromptSocket = async (history, model, responseMessageId, _chatId) => { const sendPromptSocket = async (_history, model, responseMessageId, _chatId) => {
const responseMessage = history.messages[responseMessageId]; const responseMessage = _history.messages[responseMessageId];
const userMessage = history.messages[responseMessage.parentId]; const userMessage = _history.messages[responseMessage.parentId];
let files = JSON.parse(JSON.stringify(chatFiles)); let files = JSON.parse(JSON.stringify(chatFiles));
files.push( files.push(
@ -1495,7 +1495,7 @@
}` }`
} }
: undefined, : undefined,
...createMessagesList(history, responseMessageId).map((message) => ({ ...createMessagesList(_history, responseMessageId).map((message) => ({
...message, ...message,
content: removeDetails(message.content, ['reasoning', 'code_interpreter']) content: removeDetails(message.content, ['reasoning', 'code_interpreter'])
})) }))
@ -1589,12 +1589,15 @@
}, },
`${WEBUI_BASE_URL}/api` `${WEBUI_BASE_URL}/api`
).catch((error) => { ).catch((error) => {
console.log(error); toast.error(`${error}`);
responseMessage.error = { responseMessage.error = {
content: error content: error
}; };
responseMessage.done = true; responseMessage.done = true;
history.messages[responseMessageId] = responseMessage; history.messages[responseMessageId] = responseMessage;
history.currentId = responseMessageId;
return null; return null;
}); });