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 'staging' of https://github.com/SillyTavern/SillyTavern into staging

Browse Source
This commit is contained in:
Cohee
2023-08-23 21:32:46 +03:00
parent 031a6cb2a4 2c58f9d903
commit 1d6b7c9947
3 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/scripts/extensions/cfg/index.js
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();

10
public/scripts/extensions/cfg/util.js
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