mirror of
https://github.com/SillyTavern/SillyTavern.git
synced 2025-06-05 21:59:27 +02:00
Change all TTS providers loading to async
This commit is contained in:
@ -125,7 +125,7 @@ class CoquiTtsProvider {
|
||||
return html
|
||||
}
|
||||
|
||||
loadSettings(settings) {
|
||||
async loadSettings(settings) {
|
||||
// Only accept keys defined in defaultSettings
|
||||
this.settings = this.defaultSettings
|
||||
|
||||
@ -137,7 +137,7 @@ class CoquiTtsProvider {
|
||||
}
|
||||
}
|
||||
|
||||
initLocalModels();
|
||||
await initLocalModels();
|
||||
this.updateCustomVoices(); // Overide any manual modification
|
||||
|
||||
$("#coqui_api_model_div").hide();
|
||||
@ -158,7 +158,7 @@ class CoquiTtsProvider {
|
||||
$("#coqui_add_voiceId_mapping").on("click", function () { that.onAddClick() });
|
||||
|
||||
// Load coqui-api settings from json file
|
||||
fetch("/scripts/extensions/tts/coqui_api_models_settings.json")
|
||||
await fetch("/scripts/extensions/tts/coqui_api_models_settings.json")
|
||||
.then(response => response.json())
|
||||
.then(json => {
|
||||
coquiApiModels = json;
|
||||
@ -178,7 +178,7 @@ class CoquiTtsProvider {
|
||||
});
|
||||
|
||||
// Load coqui-api FULL settings from json file
|
||||
fetch("/scripts/extensions/tts/coqui_api_models_settings_full.json")
|
||||
await fetch("/scripts/extensions/tts/coqui_api_models_settings_full.json")
|
||||
.then(response => response.json())
|
||||
.then(json => {
|
||||
coquiApiModelsFull = json;
|
||||
|
@ -34,7 +34,7 @@ class EdgeTtsProvider {
|
||||
saveTtsProviderSettings()
|
||||
}
|
||||
|
||||
loadSettings(settings) {
|
||||
async loadSettings(settings) {
|
||||
// Pupulate Provider UI given input settings
|
||||
if (Object.keys(settings).length == 0) {
|
||||
console.info("Using default TTS Provider settings")
|
||||
@ -54,7 +54,7 @@ class EdgeTtsProvider {
|
||||
$('#edge_tts_rate').val(this.settings.rate || 0);
|
||||
$('#edge_tts_rate_output').text(this.settings.rate || 0);
|
||||
$('#edge_tts_rate').on("input", () => {this.onSettingsChange()})
|
||||
this.checkReady()
|
||||
await this.checkReady()
|
||||
|
||||
console.info("Settings loaded")
|
||||
}
|
||||
|
@ -50,7 +50,7 @@ class ElevenLabsTtsProvider {
|
||||
}
|
||||
|
||||
|
||||
loadSettings(settings) {
|
||||
async loadSettings(settings) {
|
||||
// Pupulate Provider UI given input settings
|
||||
if (Object.keys(settings).length == 0) {
|
||||
console.info("Using default TTS Provider settings")
|
||||
@ -73,7 +73,7 @@ class ElevenLabsTtsProvider {
|
||||
$('#eleven_labs_connect').on('click', () => {this.onConnectClick()})
|
||||
$('#elevenlabs_tts_settings').on('input',this.onSettingsChange)
|
||||
|
||||
this.checkReady()
|
||||
await this.checkReady()
|
||||
console.info("Settings loaded")
|
||||
}
|
||||
|
||||
|
@ -592,8 +592,8 @@ async function loadTtsProvider(provider) {
|
||||
console.warn(`Provider ${ttsProviderName} not in Extension Settings, initiatilizing provider in settings`)
|
||||
extension_settings.tts[ttsProviderName] = {}
|
||||
}
|
||||
ttsProvider.loadSettings(extension_settings.tts[ttsProviderName])
|
||||
initVoiceMap()
|
||||
await ttsProvider.loadSettings(extension_settings.tts[ttsProviderName])
|
||||
await initVoiceMap()
|
||||
}
|
||||
|
||||
function onTtsProviderChange() {
|
||||
|
@ -71,7 +71,7 @@ class NovelTtsProvider {
|
||||
})
|
||||
}
|
||||
|
||||
loadSettings(settings) {
|
||||
async loadSettings(settings) {
|
||||
// Populate Provider UI given input settings
|
||||
if (Object.keys(settings).length == 0) {
|
||||
console.info("Using default TTS Provider settings")
|
||||
@ -91,7 +91,7 @@ class NovelTtsProvider {
|
||||
}
|
||||
|
||||
this.populateCustomVoices()
|
||||
this.checkReady()
|
||||
await this.checkReady()
|
||||
console.info("Settings loaded")
|
||||
}
|
||||
|
||||
|
@ -34,7 +34,7 @@ class SileroTtsProvider {
|
||||
saveTtsProviderSettings()
|
||||
}
|
||||
|
||||
loadSettings(settings) {
|
||||
async loadSettings(settings) {
|
||||
// Pupulate Provider UI given input settings
|
||||
if (Object.keys(settings).length == 0) {
|
||||
console.info("Using default TTS Provider settings")
|
||||
@ -65,7 +65,7 @@ class SileroTtsProvider {
|
||||
$('#silero_tts_endpoint').val(this.settings.provider_endpoint)
|
||||
$('#silero_tts_endpoint').on("input", () => {this.onSettingsChange()})
|
||||
|
||||
this.checkReady()
|
||||
await this.checkReady()
|
||||
|
||||
console.info("Settings loaded")
|
||||
}
|
||||
|
@ -110,7 +110,7 @@ class SystemTtsProvider {
|
||||
saveTtsProviderSettings()
|
||||
}
|
||||
|
||||
loadSettings(settings) {
|
||||
async loadSettings(settings) {
|
||||
// Populate Provider UI given input settings
|
||||
if (Object.keys(settings).length == 0) {
|
||||
console.info("Using default TTS Provider settings");
|
||||
|
Reference in New Issue
Block a user