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

Merge branch 'release' into staging

Browse Source
This commit is contained in:
Cohee
2025-01-30 21:06:40 +02:00
parent 1df209c284 44343e8ec9
commit 3a6d5faa8a
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
public/scripts/extensions/tts/alltalk.js
View File

@@ -388,7 +388,7 @@ class AllTalkTtsProvider {
} }
async fetchRvcVoiceObjects() { async fetchRvcVoiceObjects() {
if (this.settings.server_version == 'v2') { if (this.settings.server_version == 'v1') {
console.log('Skipping RVC voices fetch for V1 server'); console.log('Skipping RVC voices fetch for V1 server');
return []; return [];
} }
@@ -1031,14 +1031,18 @@ class AllTalkTtsProvider {
console.error('fetchTtsGeneration Error Response Text:', errorText); console.error('fetchTtsGeneration Error Response Text:', errorText);
throw new Error(`HTTP ${response.status}: ${errorText}`); throw new Error(`HTTP ${response.status}: ${errorText}`);
} }
const data = await response.json(); const data = await response.json();
// Handle V1/V2 URL differences // V1 returns a complete URL, V2 returns a relative path
const outputUrl = this.settings.server_version === 'v1' if (this.settings.server_version === 'v1') {
? data.output_file_url // V1 returns full URL // V1: Use the complete URL directly from the response
: `${this.settings.provider_endpoint}${data.output_file_url}`; // V2 returns relative path return data.output_file_url;
} else {
// V2: Combine the endpoint with the relative path
return `${this.settings.provider_endpoint}${data.output_file_url}`;
}
return outputUrl;
} catch (error) { } catch (error) {
console.error('[fetchTtsGeneration] Exception caught:', error); console.error('[fetchTtsGeneration] Exception caught:', error);
throw error; throw error;