Merge branch 'SillyTavern:staging' into staging

This commit is contained in:
Tony Ribeiro
2023-08-23 18:52:10 +02:00
committed by GitHub
14 changed files with 193 additions and 142 deletions

View File

@@ -348,7 +348,7 @@ jQuery(async () => {
.filter(":checked")
.map(function() { return parseInt($(this).val()) })
.get()
.filter((e) => e !== NaN) || [];
.filter((e) => !Number.isNaN(e)) || [];
chat_metadata[metadataKeys.prompt_combine] = values;
saveMetadataDebounced();

View File

@@ -39,10 +39,12 @@ export function getGuidanceScale() {
};
}
return {
type: cfgType.global,
value: extension_settings.cfg.global.guidance_scale
};
if (extension_settings.cfg.global && extension_settings.cfg.global?.guidance_scale !== 1) {
return {
type: cfgType.global,
value: extension_settings.cfg.global.guidance_scale
};
}
}
// Gets the CFG prompt

View File

@@ -217,6 +217,10 @@ async function translateProviderDeepl(text, lang) {
async function translate(text, lang) {
try {
if (text == '') {
return '';
}
switch (extension_settings.translate.provider) {
case 'google':
return await translateProviderGoogle(text, lang);