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

Change all TTS providers loading to async

Browse Source
This commit is contained in:
Cohee
2023-08-28 21:58:46 +03:00
parent b51511b99f
commit ac78d51d59
7 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -125,7 +125,7 @@ class CoquiTtsProvider {
return html return html
} }
loadSettings(settings) { async loadSettings(settings) {
// Only accept keys defined in defaultSettings // Only accept keys defined in defaultSettings
this.settings = this.defaultSettings this.settings = this.defaultSettings
@ -137,7 +137,7 @@ class CoquiTtsProvider {
} }
} }
initLocalModels(); await initLocalModels();
this.updateCustomVoices(); // Overide any manual modification this.updateCustomVoices(); // Overide any manual modification
$("#coqui_api_model_div").hide(); $("#coqui_api_model_div").hide();
@ -158,7 +158,7 @@ class CoquiTtsProvider {
$("#coqui_add_voiceId_mapping").on("click", function () { that.onAddClick() }); $("#coqui_add_voiceId_mapping").on("click", function () { that.onAddClick() });
// Load coqui-api settings from json file // 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(response => response.json())
.then(json => { .then(json => {
coquiApiModels = json; coquiApiModels = json;
@ -178,7 +178,7 @@ class CoquiTtsProvider {
}); });
// Load coqui-api FULL settings from json file // 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(response => response.json())
.then(json => { .then(json => {
coquiApiModelsFull = json; coquiApiModelsFull = json;

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

@ -34,7 +34,7 @@ class EdgeTtsProvider {
saveTtsProviderSettings() saveTtsProviderSettings()
} }
loadSettings(settings) { async loadSettings(settings) {
// Pupulate Provider UI given input settings // Pupulate Provider UI given input settings
if (Object.keys(settings).length == 0) { if (Object.keys(settings).length == 0) {
console.info("Using default TTS Provider settings") console.info("Using default TTS Provider settings")
@ -54,7 +54,7 @@ class EdgeTtsProvider {
$('#edge_tts_rate').val(this.settings.rate || 0); $('#edge_tts_rate').val(this.settings.rate || 0);
$('#edge_tts_rate_output').text(this.settings.rate || 0); $('#edge_tts_rate_output').text(this.settings.rate || 0);
$('#edge_tts_rate').on("input", () => {this.onSettingsChange()}) $('#edge_tts_rate').on("input", () => {this.onSettingsChange()})
this.checkReady() await this.checkReady()
console.info("Settings loaded") console.info("Settings loaded")
} }

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

@ -50,7 +50,7 @@ class ElevenLabsTtsProvider {
} }
loadSettings(settings) { async loadSettings(settings) {
// Pupulate Provider UI given input settings // Pupulate Provider UI given input settings
if (Object.keys(settings).length == 0) { if (Object.keys(settings).length == 0) {
console.info("Using default TTS Provider settings") console.info("Using default TTS Provider settings")
@ -73,7 +73,7 @@ class ElevenLabsTtsProvider {
$('#eleven_labs_connect').on('click', () => {this.onConnectClick()}) $('#eleven_labs_connect').on('click', () => {this.onConnectClick()})
$('#elevenlabs_tts_settings').on('input',this.onSettingsChange) $('#elevenlabs_tts_settings').on('input',this.onSettingsChange)
this.checkReady() await this.checkReady()
console.info("Settings loaded") console.info("Settings loaded")
} }

4
public/scripts/extensions/tts/index.js
View File

@ -592,8 +592,8 @@ async function loadTtsProvider(provider) {
console.warn(`Provider ${ttsProviderName} not in Extension Settings, initiatilizing provider in settings`) console.warn(`Provider ${ttsProviderName} not in Extension Settings, initiatilizing provider in settings`)
extension_settings.tts[ttsProviderName] = {} extension_settings.tts[ttsProviderName] = {}
} }
ttsProvider.loadSettings(extension_settings.tts[ttsProviderName]) await ttsProvider.loadSettings(extension_settings.tts[ttsProviderName])
initVoiceMap() await initVoiceMap()
} }
function onTtsProviderChange() { function onTtsProviderChange() {

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

@ -71,7 +71,7 @@ class NovelTtsProvider {
}) })
} }
loadSettings(settings) { async loadSettings(settings) {
// Populate Provider UI given input settings // Populate Provider UI given input settings
if (Object.keys(settings).length == 0) { if (Object.keys(settings).length == 0) {
console.info("Using default TTS Provider settings") console.info("Using default TTS Provider settings")
@ -91,7 +91,7 @@ class NovelTtsProvider {
} }
this.populateCustomVoices() this.populateCustomVoices()
this.checkReady() await this.checkReady()
console.info("Settings loaded") console.info("Settings loaded")
} }

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

@ -34,7 +34,7 @@ class SileroTtsProvider {
saveTtsProviderSettings() saveTtsProviderSettings()
} }
loadSettings(settings) { async loadSettings(settings) {
// Pupulate Provider UI given input settings // Pupulate Provider UI given input settings
if (Object.keys(settings).length == 0) { if (Object.keys(settings).length == 0) {
console.info("Using default TTS Provider settings") console.info("Using default TTS Provider settings")
@ -65,7 +65,7 @@ class SileroTtsProvider {
$('#silero_tts_endpoint').val(this.settings.provider_endpoint) $('#silero_tts_endpoint').val(this.settings.provider_endpoint)
$('#silero_tts_endpoint').on("input", () => {this.onSettingsChange()}) $('#silero_tts_endpoint').on("input", () => {this.onSettingsChange()})
this.checkReady() await this.checkReady()
console.info("Settings loaded") console.info("Settings loaded")
} }

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

@ -110,7 +110,7 @@ class SystemTtsProvider {
saveTtsProviderSettings() saveTtsProviderSettings()
} }
loadSettings(settings) { async loadSettings(settings) {
// Populate Provider UI given input settings // Populate Provider UI given input settings
if (Object.keys(settings).length == 0) { if (Object.keys(settings).length == 0) {
console.info("Using default TTS Provider settings"); console.info("Using default TTS Provider settings");