Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
chenpangpang
open-webui
Commits
cb5520c5
Unverified
Commit
cb5520c5
authored
Feb 09, 2024
by
Timothy Jaeryang Baek
Committed by
GitHub
Feb 09, 2024
Browse files
Merge pull request #689 from ollama-webui/tts-playback
feat: tts automatic playback
parents
ab3e0635
40d8605f
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
100 additions
and
47 deletions
+100
-47
src/lib/components/chat/Messages/ResponseMessage.svelte
src/lib/components/chat/Messages/ResponseMessage.svelte
+1
-0
src/lib/components/chat/Settings/Interface.svelte
src/lib/components/chat/Settings/Interface.svelte
+4
-29
src/lib/components/chat/Settings/Voice.svelte
src/lib/components/chat/Settings/Voice.svelte
+75
-18
src/routes/(app)/+page.svelte
src/routes/(app)/+page.svelte
+10
-0
src/routes/(app)/c/[id]/+page.svelte
src/routes/(app)/c/[id]/+page.svelte
+10
-0
No files found.
src/lib/components/chat/Messages/ResponseMessage.svelte
View file @
cb5520c5
...
@@ -458,6 +458,7 @@
...
@@ -458,6 +458,7 @@
</button>
</button>
<button
<button
id="speak-button-{message.id}"
class="{isLastMessage
class="{isLastMessage
? 'visible'
? 'visible'
: 'invisible group-hover:visible'} p-1 rounded dark:hover:text-white transition"
: 'invisible group-hover:visible'} p-1 rounded dark:hover:text-white transition"
...
...
src/lib/components/chat/Settings/Interface.svelte
View file @
cb5520c5
...
@@ -10,7 +10,6 @@
...
@@ -10,7 +10,6 @@
// Addons
// Addons
let titleAutoGenerate = true;
let titleAutoGenerate = true;
let speechAutoSend = false;
let responseAutoCopy = false;
let responseAutoCopy = false;
let titleAutoGenerateModel = '';
let titleAutoGenerateModel = '';
...
@@ -23,12 +22,6 @@
...
@@ -23,12 +22,6 @@
saveSettings({ showUsername: showUsername });
saveSettings({ showUsername: showUsername });
};
};
const toggleSpeechAutoSend = async () => {
speechAutoSend = !speechAutoSend;
saveSettings({ speechAutoSend: speechAutoSend });
};
const toggleTitleAutoGenerate = async () => {
const toggleTitleAutoGenerate = async () => {
titleAutoGenerate = !titleAutoGenerate;
titleAutoGenerate = !titleAutoGenerate;
saveSettings({ titleAutoGenerate: titleAutoGenerate });
saveSettings({ titleAutoGenerate: titleAutoGenerate });
...
@@ -69,7 +62,6 @@
...
@@ -69,7 +62,6 @@
let settings = JSON.parse(localStorage.getItem('settings') ?? '{}');
let settings = JSON.parse(localStorage.getItem('settings') ?? '{}');
titleAutoGenerate = settings.titleAutoGenerate ?? true;
titleAutoGenerate = settings.titleAutoGenerate ?? true;
speechAutoSend = settings.speechAutoSend ?? false;
responseAutoCopy = settings.responseAutoCopy ?? false;
responseAutoCopy = settings.responseAutoCopy ?? false;
showUsername = settings.showUsername ?? false;
showUsername = settings.showUsername ?? false;
titleAutoGenerateModel = settings.titleAutoGenerateModel ?? '';
titleAutoGenerateModel = settings.titleAutoGenerateModel ?? '';
...
@@ -107,26 +99,6 @@
...
@@ -107,26 +99,6 @@
</div>
</div>
</div>
</div>
<div>
<div class=" py-0.5 flex w-full justify-between">
<div class=" self-center text-xs font-medium">Voice Input Auto-Send</div>
<button
class="p-1 px-3 text-xs flex rounded transition"
on:click={() => {
toggleSpeechAutoSend();
}}
type="button"
>
{#if speechAutoSend === true}
<span class="ml-2 self-center">On</span>
{:else}
<span class="ml-2 self-center">Off</span>
{/if}
</button>
</div>
</div>
<div>
<div>
<div class=" py-0.5 flex w-full justify-between">
<div class=" py-0.5 flex w-full justify-between">
<div class=" self-center text-xs font-medium">Response AutoCopy to Clipboard</div>
<div class=" self-center text-xs font-medium">Response AutoCopy to Clipboard</div>
...
@@ -146,9 +118,12 @@
...
@@ -146,9 +118,12 @@
</button>
</button>
</div>
</div>
</div>
</div>
<div>
<div>
<div class=" py-0.5 flex w-full justify-between">
<div class=" py-0.5 flex w-full justify-between">
<div class=" self-center text-xs font-medium">Display the username instead of "You" in the Chat</div>
<div class=" self-center text-xs font-medium">
Display the username instead of "You" in the Chat
</div>
<button
<button
class="p-1 px-3 text-xs flex rounded transition"
class="p-1 px-3 text-xs flex rounded transition"
...
...
src/lib/components/chat/Settings/Voice.svelte
View file @
cb5520c5
...
@@ -5,6 +5,10 @@
...
@@ -5,6 +5,10 @@
export let saveSettings: Function;
export let saveSettings: Function;
// Voice
// Voice
let speechAutoSend = false;
let responseAutoPlayback = false;
let engines = ['', 'openai'];
let engines = ['', 'openai'];
let engine = '';
let engine = '';
...
@@ -33,9 +37,22 @@
...
@@ -33,9 +37,22 @@
}, 100);
}, 100);
};
};
const toggleResponseAutoPlayback = async () => {
responseAutoPlayback = !responseAutoPlayback;
saveSettings({ responseAutoPlayback: responseAutoPlayback });
};
const toggleSpeechAutoSend = async () => {
speechAutoSend = !speechAutoSend;
saveSettings({ speechAutoSend: speechAutoSend });
};
onMount(async () => {
onMount(async () => {
let settings = JSON.parse(localStorage.getItem('settings') ?? '{}');
let settings = JSON.parse(localStorage.getItem('settings') ?? '{}');
speechAutoSend = settings.speechAutoSend ?? false;
responseAutoPlayback = settings.responseAutoPlayback ?? false;
engine = settings?.speech?.engine ?? '';
engine = settings?.speech?.engine ?? '';
speaker = settings?.speech?.speaker ?? '';
speaker = settings?.speech?.speaker ?? '';
...
@@ -60,11 +77,14 @@
...
@@ -60,11 +77,14 @@
}}
}}
>
>
<div class=" space-y-3">
<div class=" space-y-3">
<div>
<div class=" mb-1 text-sm font-medium">TTS Settings</div>
<div class=" py-0.5 flex w-full justify-between">
<div class=" py-0.5 flex w-full justify-between">
<div class=" self-center text-s
m
font-medium">Speech Engine</div>
<div class=" self-center text-
x
s font-medium">Speech Engine</div>
<div class="flex items-center relative">
<div class="flex items-center relative">
<select
<select
class="w-fit pr-8 rounded p
y
-2 p
x-2
text-xs bg-transparent outline-none text-right"
class="w-fit pr-8 rounded p
x
-2 p
-1
text-xs bg-transparent outline-none text-right"
bind:value={engine}
bind:value={engine}
placeholder="Select a mode"
placeholder="Select a mode"
on:change={(e) => {
on:change={(e) => {
...
@@ -83,6 +103,43 @@
...
@@ -83,6 +103,43 @@
</div>
</div>
</div>
</div>
<div class=" py-0.5 flex w-full justify-between">
<div class=" self-center text-xs font-medium">Voice Input Auto-Send</div>
<button
class="p-1 px-3 text-xs flex rounded transition"
on:click={() => {
toggleSpeechAutoSend();
}}
type="button"
>
{#if speechAutoSend === true}
<span class="ml-2 self-center">On</span>
{:else}
<span class="ml-2 self-center">Off</span>
{/if}
</button>
</div>
<div class=" py-0.5 flex w-full justify-between">
<div class=" self-center text-xs font-medium">TTS Automatic Playback</div>
<button
class="p-1 px-3 text-xs flex rounded transition"
on:click={() => {
toggleResponseAutoPlayback();
}}
type="button"
>
{#if responseAutoPlayback === true}
<span class="ml-2 self-center">On</span>
{:else}
<span class="ml-2 self-center">Off</span>
{/if}
</button>
</div>
</div>
<hr class=" dark:border-gray-700" />
<hr class=" dark:border-gray-700" />
{#if engine === ''}
{#if engine === ''}
...
...
src/routes/(app)/+page.svelte
View file @
cb5520c5
...
@@ -448,6 +448,11 @@
...
@@ -448,6 +448,11 @@
if ($settings.responseAutoCopy) {
if ($settings.responseAutoCopy) {
copyToClipboard(responseMessage.content);
copyToClipboard(responseMessage.content);
}
}
if ($settings.responseAutoPlayback) {
await tick();
document.getElementById(`speak-button-${responseMessage.id}`)?.click();
}
}
}
}
}
}
}
...
@@ -633,6 +638,11 @@
...
@@ -633,6 +638,11 @@
copyToClipboard(responseMessage.content);
copyToClipboard(responseMessage.content);
}
}
if ($settings.responseAutoPlayback) {
await tick();
document.getElementById(`speak-button-${responseMessage.id}`)?.click();
}
if (autoScroll) {
if (autoScroll) {
window.scrollTo({ top: document.body.scrollHeight });
window.scrollTo({ top: document.body.scrollHeight });
}
}
...
...
src/routes/(app)/c/[id]/+page.svelte
View file @
cb5520c5
...
@@ -462,6 +462,11 @@
...
@@ -462,6 +462,11 @@
if ($settings.responseAutoCopy) {
if ($settings.responseAutoCopy) {
copyToClipboard(responseMessage.content);
copyToClipboard(responseMessage.content);
}
}
if ($settings.responseAutoPlayback) {
await tick();
document.getElementById(`speak-button-${responseMessage.id}`)?.click();
}
}
}
}
}
}
}
...
@@ -647,6 +652,11 @@
...
@@ -647,6 +652,11 @@
copyToClipboard(responseMessage.content);
copyToClipboard(responseMessage.content);
}
}
if ($settings.responseAutoPlayback) {
await tick();
document.getElementById(`speak-button-${responseMessage.id}`)?.click();
}
if (autoScroll) {
if (autoScroll) {
window.scrollTo({ top: document.body.scrollHeight });
window.scrollTo({ top: document.body.scrollHeight });
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment