mirror of
https://github.com/open-webui/open-webui
synced 2025-05-25 07:14:43 +00:00
enh: kokorojs call support
This commit is contained in:
parent
205ce635f6
commit
d95e5e0ba5
@ -16,7 +16,8 @@
|
|||||||
showCallOverlay,
|
showCallOverlay,
|
||||||
tools,
|
tools,
|
||||||
user as _user,
|
user as _user,
|
||||||
showControls
|
showControls,
|
||||||
|
TTSWorker
|
||||||
} from '$lib/stores';
|
} from '$lib/stores';
|
||||||
|
|
||||||
import { blobToFile, compressImage, createMessagesList, findWordIndices } from '$lib/utils';
|
import { blobToFile, compressImage, createMessagesList, findWordIndices } from '$lib/utils';
|
||||||
@ -43,6 +44,7 @@
|
|||||||
import PhotoSolid from '../icons/PhotoSolid.svelte';
|
import PhotoSolid from '../icons/PhotoSolid.svelte';
|
||||||
import Photo from '../icons/Photo.svelte';
|
import Photo from '../icons/Photo.svelte';
|
||||||
import CommandLine from '../icons/CommandLine.svelte';
|
import CommandLine from '../icons/CommandLine.svelte';
|
||||||
|
import { KokoroWorker } from '$lib/workers/KokoroWorker';
|
||||||
|
|
||||||
const i18n = getContext('i18n');
|
const i18n = getContext('i18n');
|
||||||
|
|
||||||
@ -1281,6 +1283,16 @@
|
|||||||
|
|
||||||
stream = null;
|
stream = null;
|
||||||
|
|
||||||
|
if (!$TTSWorker) {
|
||||||
|
await TTSWorker.set(
|
||||||
|
new KokoroWorker({
|
||||||
|
dtype: $settings.audio?.tts?.engineConfig?.dtype ?? 'fp32'
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
await $TTSWorker.init();
|
||||||
|
}
|
||||||
|
|
||||||
showCallOverlay.set(true);
|
showCallOverlay.set(true);
|
||||||
showControls.set(true);
|
showControls.set(true);
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { config, models, settings, showCallOverlay } from '$lib/stores';
|
import { config, models, settings, showCallOverlay, TTSWorker } from '$lib/stores';
|
||||||
import { onMount, tick, getContext, onDestroy, createEventDispatcher } from 'svelte';
|
import { onMount, tick, getContext, onDestroy, createEventDispatcher } from 'svelte';
|
||||||
|
|
||||||
const dispatch = createEventDispatcher();
|
const dispatch = createEventDispatcher();
|
||||||
@ -12,6 +12,7 @@
|
|||||||
|
|
||||||
import Tooltip from '$lib/components/common/Tooltip.svelte';
|
import Tooltip from '$lib/components/common/Tooltip.svelte';
|
||||||
import VideoInputMenu from './CallOverlay/VideoInputMenu.svelte';
|
import VideoInputMenu from './CallOverlay/VideoInputMenu.svelte';
|
||||||
|
import { KokoroWorker } from '$lib/workers/KokoroWorker';
|
||||||
|
|
||||||
const i18n = getContext('i18n');
|
const i18n = getContext('i18n');
|
||||||
|
|
||||||
@ -459,7 +460,21 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($config.audio.tts.engine !== '') {
|
if ($settings.audio?.tts?.engine === 'browser-kokoro') {
|
||||||
|
const blob = await $TTSWorker
|
||||||
|
.generate({
|
||||||
|
text: content,
|
||||||
|
voice: $settings?.audio?.tts?.voice ?? $config?.audio?.tts?.voice
|
||||||
|
})
|
||||||
|
.catch((error) => {
|
||||||
|
console.error(error);
|
||||||
|
toast.error(`${error}`);
|
||||||
|
});
|
||||||
|
|
||||||
|
if (blob) {
|
||||||
|
audioCache.set(content, new Audio(blob));
|
||||||
|
}
|
||||||
|
} else if ($config.audio.tts.engine !== '') {
|
||||||
const res = await synthesizeOpenAISpeech(
|
const res = await synthesizeOpenAISpeech(
|
||||||
localStorage.token,
|
localStorage.token,
|
||||||
$settings?.audio?.tts?.defaultVoice === $config.audio.tts.voice
|
$settings?.audio?.tts?.defaultVoice === $config.audio.tts.voice
|
||||||
|
@ -269,8 +269,6 @@
|
|||||||
await $TTSWorker.init();
|
await $TTSWorker.init();
|
||||||
}
|
}
|
||||||
|
|
||||||
console.log($TTSWorker);
|
|
||||||
|
|
||||||
for (const [idx, sentence] of messageContentParts.entries()) {
|
for (const [idx, sentence] of messageContentParts.entries()) {
|
||||||
const blob = await $TTSWorker
|
const blob = await $TTSWorker
|
||||||
.generate({
|
.generate({
|
||||||
|
@ -4,6 +4,13 @@ export class KokoroWorker {
|
|||||||
private worker: Worker | null = null;
|
private worker: Worker | null = null;
|
||||||
private initialized: boolean = false;
|
private initialized: boolean = false;
|
||||||
private dtype: string;
|
private dtype: string;
|
||||||
|
private requestQueue: Array<{
|
||||||
|
text: string;
|
||||||
|
voice: string;
|
||||||
|
resolve: (value: string) => void;
|
||||||
|
reject: (reason: any) => void;
|
||||||
|
}> = [];
|
||||||
|
private processing = false; // To track if a request is being processed
|
||||||
|
|
||||||
constructor(dtype: string = 'fp32') {
|
constructor(dtype: string = 'fp32') {
|
||||||
this.dtype = dtype;
|
this.dtype = dtype;
|
||||||
@ -17,24 +24,49 @@ export class KokoroWorker {
|
|||||||
|
|
||||||
this.worker = new WorkerInstance();
|
this.worker = new WorkerInstance();
|
||||||
|
|
||||||
return new Promise<void>((resolve, reject) => {
|
// Handle worker messages
|
||||||
this.worker!.onmessage = (event) => {
|
this.worker.onmessage = (event) => {
|
||||||
const { status, error } = event.data;
|
const { status, error, audioUrl } = event.data;
|
||||||
|
|
||||||
if (status === 'init:complete') {
|
if (status === 'init:complete') {
|
||||||
this.initialized = true;
|
this.initialized = true;
|
||||||
resolve();
|
} else if (status === 'init:error') {
|
||||||
} else if (status === 'init:error') {
|
console.error(error);
|
||||||
console.error(error);
|
this.initialized = false;
|
||||||
this.initialized = false;
|
} else if (status === 'generate:complete') {
|
||||||
reject(new Error(error));
|
// Resolve promise from queue
|
||||||
|
const request = this.requestQueue.shift();
|
||||||
|
if (request) {
|
||||||
|
request.resolve(audioUrl);
|
||||||
|
this.processNextRequest(); // Process next request in queue
|
||||||
}
|
}
|
||||||
};
|
} else if (status === 'generate:error') {
|
||||||
|
const request = this.requestQueue.shift();
|
||||||
|
if (request) {
|
||||||
|
request.reject(new Error(error));
|
||||||
|
this.processNextRequest(); // Continue processing next in queue
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
return new Promise<void>((resolve, reject) => {
|
||||||
this.worker!.postMessage({
|
this.worker!.postMessage({
|
||||||
type: 'init',
|
type: 'init',
|
||||||
payload: { dtype: this.dtype }
|
payload: { dtype: this.dtype }
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const handleMessage = (event: MessageEvent) => {
|
||||||
|
if (event.data.status === 'init:complete') {
|
||||||
|
this.worker!.removeEventListener('message', handleMessage);
|
||||||
|
this.initialized = true;
|
||||||
|
resolve();
|
||||||
|
} else if (event.data.status === 'init:error') {
|
||||||
|
this.worker!.removeEventListener('message', handleMessage);
|
||||||
|
reject(new Error(event.data.error));
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
this.worker!.addEventListener('message', handleMessage);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -44,27 +76,31 @@ export class KokoroWorker {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return new Promise<string>((resolve, reject) => {
|
return new Promise<string>((resolve, reject) => {
|
||||||
this.worker.postMessage({ type: 'generate', payload: { text, voice } });
|
this.requestQueue.push({ text, voice, resolve, reject });
|
||||||
|
if (!this.processing) {
|
||||||
const handleMessage = (event: MessageEvent) => {
|
this.processNextRequest();
|
||||||
if (event.data.status === 'generate:complete') {
|
}
|
||||||
this.worker!.removeEventListener('message', handleMessage);
|
|
||||||
resolve(event.data.audioUrl);
|
|
||||||
} else if (event.data.status === 'generate:error') {
|
|
||||||
this.worker!.removeEventListener('message', handleMessage);
|
|
||||||
reject(new Error(event.data.error));
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
this.worker.addEventListener('message', handleMessage);
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private processNextRequest() {
|
||||||
|
if (this.requestQueue.length === 0) {
|
||||||
|
this.processing = false;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.processing = true;
|
||||||
|
const { text, voice } = this.requestQueue[0]; // Get first request but don't remove yet
|
||||||
|
this.worker!.postMessage({ type: 'generate', payload: { text, voice } });
|
||||||
|
}
|
||||||
|
|
||||||
public terminate() {
|
public terminate() {
|
||||||
if (this.worker) {
|
if (this.worker) {
|
||||||
this.worker.terminate();
|
this.worker.terminate();
|
||||||
this.worker = null;
|
this.worker = null;
|
||||||
this.initialized = false;
|
this.initialized = false;
|
||||||
|
this.requestQueue = [];
|
||||||
|
this.processing = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user