rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

More unified TTS error messages

Browse Source
This commit is contained in:
Cohee
2023-06-05 17:01:59 +03:00
parent fdaf58061f
commit b3ec66faa7
4 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
public/scripts/extensions/tts/edge.js
View File

@ -84,7 +84,7 @@ class EdgeTtsProvider {
url.pathname = `/api/edge-tts/list` url.pathname = `/api/edge-tts/list`
const response = await doExtrasFetch(url) const response = await doExtrasFetch(url)
if (!response.ok) { if (!response.ok) {
throw new Error(`HTTP ${response.status}: ${await response.json()}`) throw new Error(`HTTP ${response.status}: ${await response.text()}`)
} }
let responseJson = await response.json() let responseJson = await response.json()
responseJson = responseJson responseJson = responseJson
@ -101,7 +101,7 @@ class EdgeTtsProvider {
const text = getPreviewString(voice.lang); const text = getPreviewString(voice.lang);
const response = await this.fetchTtsGeneration(text, id) const response = await this.fetchTtsGeneration(text, id)
if (!response.ok) { if (!response.ok) {
throw new Error(`HTTP ${response.status}: ${await response.json()}`) throw new Error(`HTTP ${response.status}: ${await response.text()}`)
} }
const audio = await response.blob(); const audio = await response.blob();
@ -127,8 +127,8 @@ class EdgeTtsProvider {
} }
) )
if (!response.ok) { if (!response.ok) {
toastr.error(response.statusText); toastr.error(response.statusText, 'TTS Generation Failed');
throw new Error(`HTTP ${response.status}`) throw new Error(`HTTP ${response.status}: ${await response.text()}`);
} }
return response return response
} }

25
public/scripts/extensions/tts/elevenlabs.js
View File

@ -8,7 +8,7 @@ class ElevenLabsTtsProvider {
settings settings
voices = [] voices = []
separator = ' ... ... ... ' separator = ' ... ... ... '
get settings() { get settings() {
return this.settings return this.settings
} }
@ -43,7 +43,7 @@ class ElevenLabsTtsProvider {
this.settings.similarity_boost = $('#elevenlabs_tts_similarity_boost').val() this.settings.similarity_boost = $('#elevenlabs_tts_similarity_boost').val()
this.settings.multilingual = $('#elevenlabs_tts_multilingual').prop('checked') this.settings.multilingual = $('#elevenlabs_tts_multilingual').prop('checked')
} }
loadSettings(settings) { loadSettings(settings) {
// Pupulate Provider UI given input settings // Pupulate Provider UI given input settings
@ -75,8 +75,8 @@ class ElevenLabsTtsProvider {
throw error throw error
}) })
} }
async updateApiKey() { async updateApiKey() {
// Using this call to validate API key // Using this call to validate API key
this.settings.apiKey = $('#elevenlabs_tts_api_key').val() this.settings.apiKey = $('#elevenlabs_tts_api_key').val()
@ -108,7 +108,7 @@ class ElevenLabsTtsProvider {
async generateTts(text, voiceId){ async generateTts(text, voiceId){
const historyId = await this.findTtsGenerationInHistory(text, voiceId) const historyId = await this.findTtsGenerationInHistory(text, voiceId)
let response let response
if (historyId) { if (historyId) {
console.debug(`Found existing TTS generation with id ${historyId}`) console.debug(`Found existing TTS generation with id ${historyId}`)
@ -119,11 +119,11 @@ class ElevenLabsTtsProvider {
} }
return response return response
} }
//###################// //###################//
// Helper Functions // // Helper Functions //
//###################// //###################//
async findTtsGenerationInHistory(message, voiceId) { async findTtsGenerationInHistory(message, voiceId) {
const ttsHistory = await this.fetchTtsHistory() const ttsHistory = await this.fetchTtsHistory()
for (const history of ttsHistory) { for (const history of ttsHistory) {
@ -149,7 +149,7 @@ class ElevenLabsTtsProvider {
headers: headers headers: headers
}) })
if (!response.ok) { if (!response.ok) {
throw new Error(`HTTP ${response.status}: ${await response.json()}`) throw new Error(`HTTP ${response.status}: ${await response.text()}`)
} }
const responseJson = await response.json() const responseJson = await response.json()
return responseJson.voices return responseJson.voices
@ -166,7 +166,7 @@ class ElevenLabsTtsProvider {
} }
) )
if (!response.ok) { if (!response.ok) {
throw new Error(`HTTP ${response.status}: ${await response.json()}`) throw new Error(`HTTP ${response.status}: ${await response.text()}`)
} }
return response.json() return response.json()
} }
@ -193,7 +193,8 @@ class ElevenLabsTtsProvider {
} }
) )
if (!response.ok) { if (!response.ok) {
throw new Error(`HTTP ${response.status}: ${await response.json()}`) toastr.error(response.statusText, 'TTS Generation Failed');
throw new Error(`HTTP ${response.status}: ${await response.text()}`);
} }
return response return response
} }
@ -209,7 +210,7 @@ class ElevenLabsTtsProvider {
} }
) )
if (!response.ok) { if (!response.ok) {
throw new Error(`HTTP ${response.status}: ${await response.json()}`) throw new Error(`HTTP ${response.status}: ${await response.text()}`)
} }
return response return response
} }
@ -222,7 +223,7 @@ class ElevenLabsTtsProvider {
headers: headers headers: headers
}) })
if (!response.ok) { if (!response.ok) {
throw new Error(`HTTP ${response.status}: ${await response.json()}`) throw new Error(`HTTP ${response.status}: ${await response.text()}`)
} }
const responseJson = await response.json() const responseJson = await response.json()
return responseJson.history return responseJson.history

2
public/scripts/extensions/tts/novel.js
View File

@ -123,7 +123,7 @@ class NovelTtsProvider {
) )
if (!response.ok) { if (!response.ok) {
toastr.error(response.statusText, 'TTS Generation Failed'); toastr.error(response.statusText, 'TTS Generation Failed');
throw new Error(`HTTP ${response.status}`); throw new Error(`HTTP ${response.status}: ${await response.text()}`);
} }
return response return response
} }

3
public/scripts/extensions/tts/silerotts.js
View File

@ -118,7 +118,8 @@ class SileroTtsProvider {
} }
) )
if (!response.ok) { if (!response.ok) {
throw new Error(`HTTP ${response.status}: ${await response.json()}`) toastr.error(response.statusText, 'TTS Generation Failed');
throw new Error(`HTTP ${response.status}: ${await response.text()}`);
} }
return response return response
} }