feat: per model tts voice
This commit is contained in:
@@ -363,6 +363,19 @@
|
|||||||
let currentMessageId = null;
|
let currentMessageId = null;
|
||||||
let currentUtterance = null;
|
let currentUtterance = null;
|
||||||
|
|
||||||
|
// Get voice: model-specific > user settings > config default
|
||||||
|
const getVoiceId = () => {
|
||||||
|
// Check for model-specific TTS voice first
|
||||||
|
if (model?.info?.meta?.tts?.voice) {
|
||||||
|
return model.info.meta.tts.voice;
|
||||||
|
}
|
||||||
|
// Fall back to user settings or config default
|
||||||
|
if ($settings?.audio?.tts?.defaultVoice === $config.audio.tts.voice) {
|
||||||
|
return $settings?.audio?.tts?.voice ?? $config?.audio?.tts?.voice;
|
||||||
|
}
|
||||||
|
return $config?.audio?.tts?.voice;
|
||||||
|
};
|
||||||
|
|
||||||
const speakSpeechSynthesisHandler = (content) => {
|
const speakSpeechSynthesisHandler = (content) => {
|
||||||
if ($showCallOverlay) {
|
if ($showCallOverlay) {
|
||||||
return new Promise((resolve) => {
|
return new Promise((resolve) => {
|
||||||
@@ -372,11 +385,10 @@
|
|||||||
if (voices.length > 0) {
|
if (voices.length > 0) {
|
||||||
clearInterval(getVoicesLoop);
|
clearInterval(getVoicesLoop);
|
||||||
|
|
||||||
|
const voiceId = getVoiceId();
|
||||||
const voice =
|
const voice =
|
||||||
voices
|
voices
|
||||||
?.filter(
|
?.filter((v) => v.voiceURI === voiceId)
|
||||||
(v) => v.voiceURI === ($settings?.audio?.tts?.voice ?? $config?.audio?.tts?.voice)
|
|
||||||
)
|
|
||||||
?.at(0) ?? undefined;
|
?.at(0) ?? undefined;
|
||||||
|
|
||||||
currentUtterance = new SpeechSynthesisUtterance(content);
|
currentUtterance = new SpeechSynthesisUtterance(content);
|
||||||
@@ -471,7 +483,7 @@
|
|||||||
const url = await $TTSWorker
|
const url = await $TTSWorker
|
||||||
.generate({
|
.generate({
|
||||||
text: content,
|
text: content,
|
||||||
voice: $settings?.audio?.tts?.voice ?? $config?.audio?.tts?.voice
|
voice: getVoiceId()
|
||||||
})
|
})
|
||||||
.catch((error) => {
|
.catch((error) => {
|
||||||
console.error(error);
|
console.error(error);
|
||||||
@@ -484,9 +496,7 @@
|
|||||||
} else if ($config.audio.tts.engine !== '') {
|
} 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
|
getVoiceId(),
|
||||||
? ($settings?.audio?.tts?.voice ?? $config?.audio?.tts?.voice)
|
|
||||||
: $config?.audio?.tts?.voice,
|
|
||||||
content
|
content
|
||||||
).catch((error) => {
|
).catch((error) => {
|
||||||
console.error(error);
|
console.error(error);
|
||||||
|
|||||||
@@ -207,6 +207,19 @@
|
|||||||
speaking = true;
|
speaking = true;
|
||||||
const content = removeAllDetails(message.content);
|
const content = removeAllDetails(message.content);
|
||||||
|
|
||||||
|
// Get voice: model-specific > user settings > config default
|
||||||
|
const getVoiceId = () => {
|
||||||
|
// Check for model-specific TTS voice first
|
||||||
|
if (model?.info?.meta?.tts?.voice) {
|
||||||
|
return model.info.meta.tts.voice;
|
||||||
|
}
|
||||||
|
// Fall back to user settings or config default
|
||||||
|
if ($settings?.audio?.tts?.defaultVoice === $config.audio.tts.voice) {
|
||||||
|
return $settings?.audio?.tts?.voice ?? $config?.audio?.tts?.voice;
|
||||||
|
}
|
||||||
|
return $config?.audio?.tts?.voice;
|
||||||
|
};
|
||||||
|
|
||||||
if ($config.audio.tts.engine === '') {
|
if ($config.audio.tts.engine === '') {
|
||||||
let voices = [];
|
let voices = [];
|
||||||
const getVoicesLoop = setInterval(() => {
|
const getVoicesLoop = setInterval(() => {
|
||||||
@@ -214,11 +227,10 @@
|
|||||||
if (voices.length > 0) {
|
if (voices.length > 0) {
|
||||||
clearInterval(getVoicesLoop);
|
clearInterval(getVoicesLoop);
|
||||||
|
|
||||||
|
const voiceId = getVoiceId();
|
||||||
const voice =
|
const voice =
|
||||||
voices
|
voices
|
||||||
?.filter(
|
?.filter((v) => v.voiceURI === voiceId)
|
||||||
(v) => v.voiceURI === ($settings?.audio?.tts?.voice ?? $config?.audio?.tts?.voice)
|
|
||||||
)
|
|
||||||
?.at(0) ?? undefined;
|
?.at(0) ?? undefined;
|
||||||
|
|
||||||
console.log(voice);
|
console.log(voice);
|
||||||
@@ -265,7 +277,9 @@
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
console.debug('Prepared message content for TTS', messageContentParts);
|
const voiceId = getVoiceId();
|
||||||
|
console.debug('Prepared message content for TTS', messageContentParts, 'voice:', voiceId);
|
||||||
|
|
||||||
if ($settings.audio?.tts?.engine === 'browser-kokoro') {
|
if ($settings.audio?.tts?.engine === 'browser-kokoro') {
|
||||||
if (!$TTSWorker) {
|
if (!$TTSWorker) {
|
||||||
await TTSWorker.set(
|
await TTSWorker.set(
|
||||||
@@ -281,7 +295,7 @@
|
|||||||
const url = await $TTSWorker
|
const url = await $TTSWorker
|
||||||
.generate({
|
.generate({
|
||||||
text: sentence,
|
text: sentence,
|
||||||
voice: $settings?.audio?.tts?.voice ?? $config?.audio?.tts?.voice
|
voice: voiceId
|
||||||
})
|
})
|
||||||
.catch((error) => {
|
.catch((error) => {
|
||||||
console.error(error);
|
console.error(error);
|
||||||
@@ -300,9 +314,7 @@
|
|||||||
for (const [idx, sentence] of messageContentParts.entries()) {
|
for (const [idx, sentence] of messageContentParts.entries()) {
|
||||||
const res = await synthesizeOpenAISpeech(
|
const res = await synthesizeOpenAISpeech(
|
||||||
localStorage.token,
|
localStorage.token,
|
||||||
$settings?.audio?.tts?.defaultVoice === $config.audio.tts.voice
|
voiceId,
|
||||||
? ($settings?.audio?.tts?.voice ?? $config?.audio?.tts?.voice)
|
|
||||||
: $config?.audio?.tts?.voice,
|
|
||||||
sentence
|
sentence
|
||||||
).catch((error) => {
|
).catch((error) => {
|
||||||
console.error(error);
|
console.error(error);
|
||||||
@@ -324,6 +336,7 @@
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
let preprocessedDetailsCache = [];
|
let preprocessedDetailsCache = [];
|
||||||
|
|
||||||
function preprocessForEditing(content: string): string {
|
function preprocessForEditing(content: string): string {
|
||||||
|
|||||||
@@ -107,6 +107,7 @@
|
|||||||
|
|
||||||
let actionIds = [];
|
let actionIds = [];
|
||||||
let accessControl = {};
|
let accessControl = {};
|
||||||
|
let tts = { voice: '' };
|
||||||
|
|
||||||
const submitHandler = async () => {
|
const submitHandler = async () => {
|
||||||
loading = true;
|
loading = true;
|
||||||
@@ -194,6 +195,18 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (tts.voice !== '') {
|
||||||
|
if (!info.meta.tts) info.meta.tts = {};
|
||||||
|
info.meta.tts.voice = tts.voice;
|
||||||
|
} else {
|
||||||
|
if (info.meta.tts?.voice) {
|
||||||
|
delete info.meta.tts.voice;
|
||||||
|
if (Object.keys(info.meta.tts).length === 0) {
|
||||||
|
delete info.meta.tts;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
info.params.system = system.trim() === '' ? null : system;
|
info.params.system = system.trim() === '' ? null : system;
|
||||||
info.params.stop = params.stop ? params.stop.split(',').filter((s) => s.trim()) : null;
|
info.params.stop = params.stop ? params.stop.split(',').filter((s) => s.trim()) : null;
|
||||||
Object.keys(info.params).forEach((key) => {
|
Object.keys(info.params).forEach((key) => {
|
||||||
@@ -275,6 +288,7 @@
|
|||||||
|
|
||||||
capabilities = { ...capabilities, ...(model?.meta?.capabilities ?? {}) };
|
capabilities = { ...capabilities, ...(model?.meta?.capabilities ?? {}) };
|
||||||
defaultFeatureIds = model?.meta?.defaultFeatureIds ?? [];
|
defaultFeatureIds = model?.meta?.defaultFeatureIds ?? [];
|
||||||
|
tts = { voice: model?.meta?.tts?.voice ?? '' };
|
||||||
|
|
||||||
if ('access_control' in model) {
|
if ('access_control' in model) {
|
||||||
accessControl = model.access_control;
|
accessControl = model.access_control;
|
||||||
@@ -766,6 +780,20 @@
|
|||||||
{/if}
|
{/if}
|
||||||
{/if}
|
{/if}
|
||||||
|
|
||||||
|
<div class="my-2">
|
||||||
|
<div class="flex w-full justify-between mb-1">
|
||||||
|
<div class="self-center text-xs font-medium text-gray-500">
|
||||||
|
{$i18n.t('TTS Voice')}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<input
|
||||||
|
class="w-full text-sm bg-transparent outline-hidden"
|
||||||
|
type="text"
|
||||||
|
bind:value={tts.voice}
|
||||||
|
placeholder={$i18n.t('e.g. alloy, echo, shimmer')}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
<hr class=" border-gray-100/30 dark:border-gray-850/30 my-2" />
|
<hr class=" border-gray-100/30 dark:border-gray-850/30 my-2" />
|
||||||
|
|
||||||
<div class="my-2 flex justify-end">
|
<div class="my-2 flex justify-end">
|
||||||
|
|||||||
Reference in New Issue
Block a user