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

[skip ci] Lint fix

Browse Source
This commit is contained in:
Cohee
2024-01-20 20:40:40 +02:00
parent 3cb9413541
commit 570d5a30bd
3 changed files with 835 additions and 835 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
import { doExtrasFetch, getApiUrl, modules } from '../../extensions.js'; import { doExtrasFetch } from '../../extensions.js';
import { saveTtsProviderSettings } from './index.js'; import { saveTtsProviderSettings } from './index.js';
export { AllTalkTtsProvider }; export { AllTalkTtsProvider };
@ -19,7 +19,7 @@ class AllTalkTtsProvider {
narrator_enabled: this.settings.narrator_enabled || 'false', narrator_enabled: this.settings.narrator_enabled || 'false',
at_narrator_text_not_inside: this.settings.at_narrator_text_not_inside || 'narrator', at_narrator_text_not_inside: this.settings.at_narrator_text_not_inside || 'narrator',
narrator_voice_gen: this.settings.narrator_voice_gen || 'female_01.wav', narrator_voice_gen: this.settings.narrator_voice_gen || 'female_01.wav',
finetuned_model: this.settings.finetuned_model || 'false' finetuned_model: this.settings.finetuned_model || 'false',
}; };
// Separate property for dynamically updated settings from the server // Separate property for dynamically updated settings from the server
this.dynamicSettings = { this.dynamicSettings = {
@ -56,7 +56,7 @@ class AllTalkTtsProvider {
}; };
get settingsHtml() { get settingsHtml() {
let html = `<div class="at-settings-separator">AllTalk Settings</div>`; let html = '<div class="at-settings-separator">AllTalk Settings</div>';
html += `<div class="at-settings-row"> html += `<div class="at-settings-row">
@ -207,7 +207,7 @@ class AllTalkTtsProvider {
this.applySettingsToHTML(); this.applySettingsToHTML();
updateStatus('Ready'); updateStatus('Ready');
} catch (error) { } catch (error) {
console.error("Error loading settings:", error); console.error('Error loading settings:', error);
updateStatus('Offline'); updateStatus('Offline');
} }
} }
@ -332,7 +332,7 @@ class AllTalkTtsProvider {
name: voiceName, name: voiceName,
voice_id: voiceName, voice_id: voiceName,
preview_url: null, // Preview URL will be dynamically generated preview_url: null, // Preview URL will be dynamically generated
lang: 'en' // Default language lang: 'en', // Default language
}; };
}); });
this.voices = voices; // Assign to the class property this.voices = voices; // Assign to the class property
@ -357,7 +357,7 @@ class AllTalkTtsProvider {
this.settings.deepspeed_available = currentSettings.deepspeed_available; this.settings.deepspeed_available = currentSettings.deepspeed_available;
this.settings.deepSpeedEnabled = currentSettings.deepspeed_status; this.settings.deepSpeedEnabled = currentSettings.deepspeed_status;
this.settings.lowVramEnabled = currentSettings.low_vram_status; this.settings.lowVramEnabled = currentSettings.low_vram_status;
this.settings.finetuned_model = currentSettings.finetuned_model this.settings.finetuned_model = currentSettings.finetuned_model;
// Update HTML elements // Update HTML elements
this.updateModelDropdown(); this.updateModelDropdown();
this.updateCheckboxes(); this.updateCheckboxes();
@ -451,24 +451,24 @@ class AllTalkTtsProvider {
// Define the event handler function // Define the event handler function
const onModelSelectChange = async (event) => { const onModelSelectChange = async (event) => {
console.log("Model select change event triggered"); // Debugging statement console.log('Model select change event triggered'); // Debugging statement
const selectedModel = event.target.value; const selectedModel = event.target.value;
console.log(`Selected model: ${selectedModel}`); // Debugging statement console.log(`Selected model: ${selectedModel}`); // Debugging statement
// Set status to Processing // Set status to Processing
updateStatus('Processing'); updateStatus('Processing');
try { try {
const response = await fetch(`${this.settings.provider_endpoint}/api/reload?tts_method=${encodeURIComponent(selectedModel)}`, { const response = await fetch(`${this.settings.provider_endpoint}/api/reload?tts_method=${encodeURIComponent(selectedModel)}`, {
method: 'POST' method: 'POST',
}); });
if (!response.ok) { if (!response.ok) {
throw new Error(`HTTP Error: ${response.status}`); throw new Error(`HTTP Error: ${response.status}`);
} }
const data = await response.json(); const data = await response.json();
console.log("POST response data:", data); // Debugging statement console.log('POST response data:', data); // Debugging statement
// Set status to Ready if successful // Set status to Ready if successful
updateStatus('Ready'); updateStatus('Ready');
} catch (error) { } catch (error) {
console.error("POST request error:", error); // Debugging statement console.error('POST request error:', error); // Debugging statement
// Set status to Error in case of failure // Set status to Error in case of failure
updateStatus('Error'); updateStatus('Error');
} }
@ -501,17 +501,17 @@ class AllTalkTtsProvider {
updateStatus('Processing'); updateStatus('Processing');
try { try {
const response = await fetch(`${this.settings.provider_endpoint}/api/deepspeed?new_deepspeed_value=${deepSpeedValue}`, { const response = await fetch(`${this.settings.provider_endpoint}/api/deepspeed?new_deepspeed_value=${deepSpeedValue}`, {
method: 'POST' method: 'POST',
}); });
if (!response.ok) { if (!response.ok) {
throw new Error(`HTTP Error: ${response.status}`); throw new Error(`HTTP Error: ${response.status}`);
} }
const data = await response.json(); const data = await response.json();
console.log("POST response data:", data); // Debugging statement console.log('POST response data:', data); // Debugging statement
// Set status to Ready if successful // Set status to Ready if successful
updateStatus('Ready'); updateStatus('Ready');
} catch (error) { } catch (error) {
console.error("POST request error:", error); // Debugging statement console.error('POST request error:', error); // Debugging statement
// Set status to Error in case of failure // Set status to Error in case of failure
updateStatus('Error'); updateStatus('Error');
} }
@ -527,17 +527,17 @@ class AllTalkTtsProvider {
updateStatus('Processing'); updateStatus('Processing');
try { try {
const response = await fetch(`${this.settings.provider_endpoint}/api/lowvramsetting?new_low_vram_value=${lowVramValue}`, { const response = await fetch(`${this.settings.provider_endpoint}/api/lowvramsetting?new_low_vram_value=${lowVramValue}`, {
method: 'POST' method: 'POST',
}); });
if (!response.ok) { if (!response.ok) {
throw new Error(`HTTP Error: ${response.status}`); throw new Error(`HTTP Error: ${response.status}`);
} }
const data = await response.json(); const data = await response.json();
console.log("POST response data:", data); // Debugging statement console.log('POST response data:', data); // Debugging statement
// Set status to Ready if successful // Set status to Ready if successful
updateStatus('Ready'); updateStatus('Ready');
} catch (error) { } catch (error) {
console.error("POST request error:", error); // Debugging statement console.error('POST request error:', error); // Debugging statement
// Set status to Error in case of failure // Set status to Error in case of failure
updateStatus('Error'); updateStatus('Error');
} }
@ -677,18 +677,18 @@ class AllTalkTtsProvider {
try { try {
// Prepare data for POST request // Prepare data for POST request
const postData = new URLSearchParams(); const postData = new URLSearchParams();
postData.append("voice", `${voiceName}.wav`); postData.append('voice', `${voiceName}.wav`);
// Making the POST request // Making the POST request
const response = await fetch(`${this.settings.provider_endpoint}/api/previewvoice/`, { const response = await fetch(`${this.settings.provider_endpoint}/api/previewvoice/`, {
method: "POST", method: 'POST',
headers: { headers: {
'Content-Type': 'application/x-www-form-urlencoded' 'Content-Type': 'application/x-www-form-urlencoded',
}, },
body: postData, body: postData,
}); });
if (!response.ok) { if (!response.ok) {
const errorText = await response.text(); const errorText = await response.text();
console.error(`[previewTtsVoice] Error Response Text:`, errorText); console.error('[previewTtsVoice] Error Response Text:', errorText);
throw new Error(`HTTP ${response.status}: ${errorText}`); throw new Error(`HTTP ${response.status}: ${errorText}`);
} }
// Assuming the server returns a URL to the .wav file // Assuming the server returns a URL to the .wav file
@ -696,14 +696,14 @@ class AllTalkTtsProvider {
if (data.output_file_url) { if (data.output_file_url) {
// Use an audio element to play the .wav file // Use an audio element to play the .wav file
const audioElement = new Audio(data.output_file_url); const audioElement = new Audio(data.output_file_url);
audioElement.play().catch(e => console.error("Error playing audio:", e)); audioElement.play().catch(e => console.error('Error playing audio:', e));
} else { } else {
console.warn("[previewTtsVoice] No output file URL received in the response"); console.warn('[previewTtsVoice] No output file URL received in the response');
throw new Error("No output file URL received in the response"); throw new Error('No output file URL received in the response');
} }
} catch (error) { } catch (error) {
console.error("[previewTtsVoice] Exception caught during preview generation:", error); console.error('[previewTtsVoice] Exception caught during preview generation:', error);
throw error; throw error;
} }
} }
@ -738,7 +738,7 @@ class AllTalkTtsProvider {
if (this.settings.at_generation_method === 'streaming_enabled') { if (this.settings.at_generation_method === 'streaming_enabled') {
// Construct the streaming URL // Construct the streaming URL
const streamingUrl = `${this.settings.provider_endpoint}/api/tts-generate-streaming?text=${encodeURIComponent(inputText)}&voice=${encodeURIComponent(voiceId)}.wav&language=${encodeURIComponent(this.settings.language)}&output_file=stream_output.wav`; const streamingUrl = `${this.settings.provider_endpoint}/api/tts-generate-streaming?text=${encodeURIComponent(inputText)}&voice=${encodeURIComponent(voiceId)}.wav&language=${encodeURIComponent(this.settings.language)}&output_file=stream_output.wav`;
console.log("Streaming URL:", streamingUrl); console.log('Streaming URL:', streamingUrl);
// Return the streaming URL directly // Return the streaming URL directly
return streamingUrl; return streamingUrl;
@ -752,7 +752,7 @@ class AllTalkTtsProvider {
return audioResponse; // Return the fetch response directly return audioResponse; // Return the fetch response directly
} }
} catch (error) { } catch (error) {
console.error("Error in generateTts:", error); console.error('Error in generateTts:', error);
throw error; throw error;
} }
} }
@ -766,16 +766,16 @@ class AllTalkTtsProvider {
// Prepare the request payload // Prepare the request payload
const requestBody = new URLSearchParams({ const requestBody = new URLSearchParams({
'text_input': inputText, 'text_input': inputText,
'text_filtering': "standard", 'text_filtering': 'standard',
'character_voice_gen': voiceId + ".wav", 'character_voice_gen': voiceId + '.wav',
'narrator_enabled': this.settings.narrator_enabled, 'narrator_enabled': this.settings.narrator_enabled,
'narrator_voice_gen': this.settings.narrator_voice_gen + ".wav", 'narrator_voice_gen': this.settings.narrator_voice_gen + '.wav',
'text_not_inside': this.settings.at_narrator_text_not_inside, 'text_not_inside': this.settings.at_narrator_text_not_inside,
'language': this.settings.language, 'language': this.settings.language,
'output_file_name': "st_output", 'output_file_name': 'st_output',
'output_file_timestamp': "true", 'output_file_timestamp': 'true',
'autoplay': "false", 'autoplay': 'false',
'autoplay_volume': "0.8" 'autoplay_volume': '0.8',
}).toString(); }).toString();
try { try {
@ -787,13 +787,13 @@ class AllTalkTtsProvider {
'Content-Type': 'application/x-www-form-urlencoded', 'Content-Type': 'application/x-www-form-urlencoded',
'Cache-Control': 'no-cache', 'Cache-Control': 'no-cache',
}, },
body: requestBody body: requestBody,
} },
); );
if (!response.ok) { if (!response.ok) {
const errorText = await response.text(); const errorText = await response.text();
console.error(`[fetchTtsGeneration] Error Response Text:`, errorText); console.error('[fetchTtsGeneration] Error Response Text:', errorText);
// toastr.error(response.statusText, 'TTS Generation Failed'); // toastr.error(response.statusText, 'TTS Generation Failed');
throw new Error(`HTTP ${response.status}: ${errorText}`); throw new Error(`HTTP ${response.status}: ${errorText}`);
} }
@ -801,7 +801,7 @@ class AllTalkTtsProvider {
const outputUrl = data.output_file_url; const outputUrl = data.output_file_url;
return outputUrl; // Return only the output_file_url return outputUrl; // Return only the output_file_url
} catch (error) { } catch (error) {
console.error("[fetchTtsGeneration] Exception caught:", error); console.error('[fetchTtsGeneration] Exception caught:', error);
throw error; // Rethrow the error for further handling throw error; // Rethrow the error for further handling
} }
} }

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

@ -676,7 +676,7 @@ function onSkipCodeblocksClick() {
function onPassAsterisksClick() { function onPassAsterisksClick() {
extension_settings.tts.pass_asterisks = !!$('#tts_pass_asterisks').prop('checked'); extension_settings.tts.pass_asterisks = !!$('#tts_pass_asterisks').prop('checked');
saveSettingsDebounced(); saveSettingsDebounced();
console.log("setting pass asterisks", extension_settings.tts.pass_asterisks) console.log('setting pass asterisks', extension_settings.tts.pass_asterisks);
} }
//##############// //##############//

2
public/scripts/textgen-settings.js
View File

@ -547,7 +547,7 @@ jQuery(function () {
inputElement.val(value).trigger('input'); inputElement.val(value).trigger('input');
if (power_user.enableZenSliders) { if (power_user.enableZenSliders) {
let masterElementID = inputElement.prop('id'); let masterElementID = inputElement.prop('id');
console.log(masterElementID) console.log(masterElementID);
let zenSlider = $(`#${masterElementID}_zenslider`).slider(); let zenSlider = $(`#${masterElementID}_zenslider`).slider();
zenSlider.slider('option', 'value', value); zenSlider.slider('option', 'value', value);
zenSlider.slider('option', 'slide') zenSlider.slider('option', 'slide')