From c108d863f63b2a1cd56926a8c8783f001a300cbe Mon Sep 17 00:00:00 2001 From: Jannik Streidl Date: Wed, 5 Jun 2024 20:42:41 +0200 Subject: [PATCH 001/125] added missing i18n keys + german locales --- .../components/admin/Settings/Banners.svelte | 2 +- .../chat/Settings/Personalization.svelte | 7 +-- .../Personalization/ManageModal.svelte | 4 +- .../documents/Settings/WebParams.svelte | 4 +- .../components/layout/Sidebar/UserMenu.svelte | 2 +- src/lib/i18n/locales/de-DE/translation.json | 46 +++++++++++-------- src/routes/(app)/admin/+page.svelte | 2 +- 7 files changed, 38 insertions(+), 29 deletions(-) diff --git a/src/lib/components/admin/Settings/Banners.svelte b/src/lib/components/admin/Settings/Banners.svelte index e69a8ebb1..418edc9a5 100644 --- a/src/lib/components/admin/Settings/Banners.svelte +++ b/src/lib/components/admin/Settings/Banners.svelte @@ -96,7 +96,7 @@ />
- +
diff --git a/src/lib/components/chat/Settings/Personalization.svelte b/src/lib/components/chat/Settings/Personalization.svelte index e1f0a1e27..892788255 100644 --- a/src/lib/components/chat/Settings/Personalization.svelte +++ b/src/lib/components/chat/Settings/Personalization.svelte @@ -57,8 +57,9 @@
- You can personalize your interactions with LLMs by adding memories through the 'Manage' - button below, making them more helpful and tailored to you. + {$i18n.t( + "You can personalize your interactions with LLMs by adding memories through the 'Manage' button below, making them more helpful and tailored to you." + )}
+
+ +
+
+
+ +
+
+ +
+ +
Listening...
+ +
+ +
+
+
+ + diff --git a/src/lib/stores/index.ts b/src/lib/stores/index.ts index 9815f04de..781529f02 100644 --- a/src/lib/stores/index.ts +++ b/src/lib/stores/index.ts @@ -50,6 +50,7 @@ export const showSidebar = writable(false); export const showSettings = writable(false); export const showArchivedChats = writable(false); export const showChangelog = writable(false); +export const showCallOverlay = writable(false); export type Model = OpenAIModel | OllamaModel; diff --git a/src/routes/(app)/+layout.svelte b/src/routes/(app)/+layout.svelte index 5427b8295..f677098a2 100644 --- a/src/routes/(app)/+layout.svelte +++ b/src/routes/(app)/+layout.svelte @@ -24,7 +24,8 @@ tags, banners, showChangelog, - config + config, + showCallOverlay } from '$lib/stores'; import { REQUIRED_OLLAMA_VERSION, WEBUI_API_BASE_URL } from '$lib/constants'; import { compareVersion } from '$lib/utils'; @@ -39,6 +40,7 @@ import Help from '$lib/components/layout/Help.svelte'; import AccountPending from '$lib/components/layout/Overlay/AccountPending.svelte'; import { error } from '@sveltejs/kit'; + import CallOverlay from '$lib/components/chat/MessageInput/CallOverlay.svelte'; const i18n = getContext('i18n'); @@ -190,6 +192,10 @@ class=" text-gray-700 dark:text-gray-100 bg-white dark:bg-gray-900 h-screen max-h-[100dvh] overflow-auto flex flex-row" > {#if loaded} + {#if $showCallOverlay} + + {/if} + {#if !['user', 'admin'].includes($user.role)} {:else if localDBChats.length > 0} From 4f19a92dc54b4d0b179f2a9d3c6fa2c2d8482bc5 Mon Sep 17 00:00:00 2001 From: "Timothy J. Baek" Date: Thu, 6 Jun 2024 23:29:08 -0700 Subject: [PATCH 021/125] refac --- src/lib/components/chat/Chat.svelte | 6 +- .../chat/MessageInput/CallOverlay.svelte | 345 +++++++++++++++--- .../chat/MessageInput/VoiceRecording.svelte | 2 + src/routes/(app)/+layout.svelte | 4 - 4 files changed, 295 insertions(+), 62 deletions(-) diff --git a/src/lib/components/chat/Chat.svelte b/src/lib/components/chat/Chat.svelte index 5d2f860a8..3b51c034a 100644 --- a/src/lib/components/chat/Chat.svelte +++ b/src/lib/components/chat/Chat.svelte @@ -19,7 +19,8 @@ WEBUI_NAME, banners, user, - socket + socket, + showCallOverlay } from '$lib/stores'; import { convertMessagesToHistory, @@ -57,6 +58,7 @@ import Banner from '../common/Banner.svelte'; import { getUserSettings } from '$lib/apis/users'; import { chatCompleted } from '$lib/apis'; + import CallOverlay from './MessageInput/CallOverlay.svelte'; const i18n: Writable = getContext('i18n'); @@ -1193,6 +1195,8 @@ + + {#if !chatIdProp || (loaded && chatIdProp)}
-
-
-
- -
- -
-
-
- -
+{#if $showCallOverlay} +
+
+
- +
-
Listening...
- -
- + {:else} +
+ {/if} +
+ +
+
+ +
+ +
+ +
+ +
+ +
-
+{/if} diff --git a/src/lib/components/chat/MessageInput/VoiceRecording.svelte b/src/lib/components/chat/MessageInput/VoiceRecording.svelte index d588d6038..64a444e74 100644 --- a/src/lib/components/chat/MessageInput/VoiceRecording.svelte +++ b/src/lib/components/chat/MessageInput/VoiceRecording.svelte @@ -90,6 +90,8 @@ const detectSound = () => { const processFrame = () => { + if (!recording || loading) return; + if (recording && !loading) { analyser.getByteTimeDomainData(timeDomainData); analyser.getByteFrequencyData(domainData); diff --git a/src/routes/(app)/+layout.svelte b/src/routes/(app)/+layout.svelte index f677098a2..58da2a170 100644 --- a/src/routes/(app)/+layout.svelte +++ b/src/routes/(app)/+layout.svelte @@ -192,10 +192,6 @@ class=" text-gray-700 dark:text-gray-100 bg-white dark:bg-gray-900 h-screen max-h-[100dvh] overflow-auto flex flex-row" > {#if loaded} - {#if $showCallOverlay} - - {/if} - {#if !['user', 'admin'].includes($user.role)} {:else if localDBChats.length > 0} From eacce66a82dfd0f632b2909720a02d4ef90c807b Mon Sep 17 00:00:00 2001 From: "Timothy J. Baek" Date: Thu, 6 Jun 2024 23:36:47 -0700 Subject: [PATCH 022/125] refac --- .../chat/MessageInput/CallOverlay.svelte | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/lib/components/chat/MessageInput/CallOverlay.svelte b/src/lib/components/chat/MessageInput/CallOverlay.svelte index 7c58ac124..a7d0eb1dd 100644 --- a/src/lib/components/chat/MessageInput/CallOverlay.svelte +++ b/src/lib/components/chat/MessageInput/CallOverlay.svelte @@ -12,6 +12,7 @@ let confirmed = false; let rmsLevel = 0; + let hasStartedSpeaking = false; let audioContext; let analyser; @@ -82,7 +83,7 @@ const timeDomainData = new Uint8Array(analyser.fftSize); let lastSoundTime = Date.now(); - let hasStartedSpeaking = false; + hasStartedSpeaking = false; const detectSound = () => { const processFrame = () => { @@ -162,7 +163,11 @@ audioChunks = []; analyseAudio(stream); }; - mediaRecorder.ondataavailable = (event) => audioChunks.push(event.data); + mediaRecorder.ondataavailable = (event) => { + if (hasStartedSpeaking) { + audioChunks.push(event.data); + } + }; mediaRecorder.onstop = async () => { console.log('Recording stopped'); @@ -227,12 +232,12 @@ {:else}
{/if}
From 404bb3fd6778c9b1dc9e1dad23355b1627245ea2 Mon Sep 17 00:00:00 2001 From: "Timothy J. Baek" Date: Thu, 6 Jun 2024 23:42:31 -0700 Subject: [PATCH 023/125] refac: call overlay --- .../chat/MessageInput/CallOverlay.svelte | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/lib/components/chat/MessageInput/CallOverlay.svelte b/src/lib/components/chat/MessageInput/CallOverlay.svelte index a7d0eb1dd..436a03936 100644 --- a/src/lib/components/chat/MessageInput/CallOverlay.svelte +++ b/src/lib/components/chat/MessageInput/CallOverlay.svelte @@ -87,7 +87,13 @@ const detectSound = () => { const processFrame = () => { - if (!mediaRecorder || !$showCallOverlay) return; + if (!mediaRecorder || !$showCallOverlay) { + if (mediaRecorder) { + mediaRecorder.stop(); + } + + return; + } analyser.getByteTimeDomainData(timeDomainData); analyser.getByteFrequencyData(domainData); @@ -137,7 +143,7 @@ } }; - const stopRecordingHandler = async () => { + const stopRecordingCallback = async () => { if ($showCallOverlay) { if (confirmed) { loading = true; @@ -152,6 +158,9 @@ mediaRecorder = false; startRecording(); + } else { + audioChunks = []; + mediaRecorder = false; } }; @@ -171,7 +180,7 @@ mediaRecorder.onstop = async () => { console.log('Recording stopped'); - await stopRecordingHandler(); + await stopRecordingCallback(); }; mediaRecorder.start(); }; From 4e640daf83ef7648cf53abb582b667cc42829757 Mon Sep 17 00:00:00 2001 From: "Timothy J. Baek" Date: Fri, 7 Jun 2024 00:04:47 -0700 Subject: [PATCH 024/125] feat: submit prompt integration --- src/lib/components/chat/Chat.svelte | 27 +++++++++++-- src/lib/components/chat/MessageInput.svelte | 6 ++- .../chat/MessageInput/CallOverlay.svelte | 38 +++++++++++++++---- 3 files changed, 59 insertions(+), 12 deletions(-) diff --git a/src/lib/components/chat/Chat.svelte b/src/lib/components/chat/Chat.svelte index 3b51c034a..ffaa2baf9 100644 --- a/src/lib/components/chat/Chat.svelte +++ b/src/lib/components/chat/Chat.svelte @@ -298,6 +298,7 @@ ////////////////////////// const submitPrompt = async (userPrompt, _user = null) => { + let _responses = []; console.log('submitPrompt', $chatId); selectedModels = selectedModels.map((modelId) => @@ -379,11 +380,14 @@ files = []; // Send prompt - await sendPrompt(userPrompt, userMessageId); + _responses = await sendPrompt(userPrompt, userMessageId); } + + return _responses; }; const sendPrompt = async (prompt, parentId, modelId = null) => { + let _responses = []; const _chatId = JSON.parse(JSON.stringify($chatId)); await Promise.all( @@ -470,11 +474,14 @@ await getWebSearchResults(model.id, parentId, responseMessageId); } + let _response = null; + if (model?.owned_by === 'openai') { - await sendPromptOpenAI(model, prompt, responseMessageId, _chatId); + _response = await sendPromptOpenAI(model, prompt, responseMessageId, _chatId); } else if (model) { - await sendPromptOllama(model, prompt, responseMessageId, _chatId); + _response = await sendPromptOllama(model, prompt, responseMessageId, _chatId); } + _responses.push(_response); console.log('chatEventEmitter', chatEventEmitter); @@ -486,6 +493,8 @@ ); await chats.set(await getChatList(localStorage.token)); + + return _responses; }; const getWebSearchResults = async (model: string, parentId: string, responseId: string) => { @@ -560,6 +569,8 @@ }; const sendPromptOllama = async (model, userPrompt, responseMessageId, _chatId) => { + let _response = null; + model = model.id; const responseMessage = history.messages[responseMessageId]; @@ -670,6 +681,7 @@ await chatCompletedHandler(model, messages); } + _response = responseMessage.content; break; } @@ -806,9 +818,12 @@ const _title = await generateChatTitle(userPrompt); await setChatTitle(_chatId, _title); } + + return _response; }; const sendPromptOpenAI = async (model, userPrompt, responseMessageId, _chatId) => { + let _response = null; const responseMessage = history.messages[responseMessageId]; const docs = messages @@ -925,6 +940,8 @@ await chatCompletedHandler(model.id, messages); } + _response = responseMessage.content; + break; } @@ -1000,6 +1017,8 @@ const _title = await generateChatTitle(userPrompt); await setChatTitle(_chatId, _title); } + + return _response; }; const handleOpenAIError = async (error, res: Response | null, model, responseMessage) => { @@ -1195,7 +1214,7 @@ - + {#if !chatIdProp || (loaded && chatIdProp)}
{ - showCallOverlay.set(true); + if (selectedModels.length > 1) { + toast.error($i18n.t('Select only one model to call')); + } else { + showCallOverlay.set(true); + } }} > diff --git a/src/lib/components/chat/MessageInput/CallOverlay.svelte b/src/lib/components/chat/MessageInput/CallOverlay.svelte index 436a03936..89283b84b 100644 --- a/src/lib/components/chat/MessageInput/CallOverlay.svelte +++ b/src/lib/components/chat/MessageInput/CallOverlay.svelte @@ -1,5 +1,5 @@ {#if $showCallOverlay} +