From 4eeb669ac301176f655f215d9a7964125d86049c Mon Sep 17 00:00:00 2001 From: "Timothy J. Baek" Date: Thu, 26 Sep 2024 03:21:37 +0200 Subject: [PATCH] refac --- src/lib/components/chat/Chat.svelte | 40 ++++++++++++++++++----------- src/lib/stores/index.ts | 2 ++ 2 files changed, 27 insertions(+), 15 deletions(-) diff --git a/src/lib/components/chat/Chat.svelte b/src/lib/components/chat/Chat.svelte index b5db7d078..38987a1e1 100644 --- a/src/lib/components/chat/Chat.svelte +++ b/src/lib/components/chat/Chat.svelte @@ -31,7 +31,8 @@ currentChatPage, temporaryChatEnabled, mobile, - showOverview + showOverview, + chatTitle } from '$lib/stores'; import { convertMessagesToHistory, @@ -102,7 +103,6 @@ let chat = null; let tags = []; - let title = ''; let history = { messages: {}, currentId: null @@ -296,6 +296,8 @@ const chatInput = document.getElementById('chat-textarea'); chatInput?.focus(); + + chats.subscribe(() => {}); }); onDestroy(() => { @@ -313,10 +315,11 @@ window.history.replaceState(history.state, '', `/`); } - await chatId.set(''); autoScroll = true; - title = ''; + await chatId.set(''); + await chatTitle.set(''); + history = { messages: {}, currentId: null @@ -398,7 +401,8 @@ (chatContent?.history ?? undefined) !== undefined ? chatContent.history : convertMessagesToHistory(chatContent.messages); - title = chatContent.title; + + chatTitle.set(chatContent.title); const userSettings = await getUserSettings(localStorage.token); @@ -1207,8 +1211,8 @@ const messages = createMessagesList(responseMessageId); if (messages.length == 2 && messages.at(-1).content !== '' && selectedModels[0] === model.id) { window.history.replaceState(history.state, '', `/c/${_chatId}`); - const _title = await generateChatTitle(userPrompt); - await setChatTitle(_chatId, _title); + const title = await generateChatTitle(userPrompt); + await setChatTitle(_chatId, title); } return _response; @@ -1497,8 +1501,8 @@ const messages = createMessagesList(responseMessageId); if (messages.length == 2 && selectedModels[0] === model.id) { window.history.replaceState(history.state, '', `/c/${_chatId}`); - const _title = await generateChatTitle(userPrompt); - await setChatTitle(_chatId, _title); + const title = await generateChatTitle(userPrompt); + await setChatTitle(_chatId, title); } return _response; @@ -1672,13 +1676,13 @@ } }; - const setChatTitle = async (_chatId, _title) => { + const setChatTitle = async (_chatId, title) => { if (_chatId === $chatId) { - title = _title; + chatTitle.set(title); } if (!$temporaryChatEnabled) { - chat = await updateChatById(localStorage.token, _chatId, { title: _title }); + chat = await updateChatById(localStorage.token, _chatId, { title: title }); currentChatPage.set(1); await chats.set(await getChatList(localStorage.token, $currentChatPage)); @@ -1817,8 +1821,8 @@ - {title - ? `${title.length > 30 ? `${title.slice(0, 30)}...` : title} | ${$WEBUI_NAME}` + {$chatTitle + ? `${$chatTitle.length > 30 ? `${$chatTitle.slice(0, 30)}...` : $chatTitle} | ${$WEBUI_NAME}` : `${$WEBUI_NAME}`} @@ -1863,7 +1867,13 @@ /> {/if} - + diff --git a/src/lib/stores/index.ts b/src/lib/stores/index.ts index 5fe44edc0..b96bf4a98 100644 --- a/src/lib/stores/index.ts +++ b/src/lib/stores/index.ts @@ -19,7 +19,9 @@ export const activeUserCount: Writable = writable(null); export const USAGE_POOL: Writable = writable(null); export const theme = writable('system'); + export const chatId = writable(''); +export const chatTitle = writable(''); export const chats = writable([]); export const pinnedChats = writable([]);