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

8
public/script.js
View File

@ -2748,6 +2748,12 @@ async function Generate(type, { automatic_trigger, force_name2, resolve, reject,
// Fetches the combined prompt for both negative and positive prompts // Fetches the combined prompt for both negative and positive prompts
const cfgGuidanceScale = getGuidanceScale(); const cfgGuidanceScale = getGuidanceScale();
function getCombinedPrompt(isNegative) { function getCombinedPrompt(isNegative) {
// Only return if the guidance scale doesn't exist or the value is 1
// Also don't return if constructing the neutral prompt
if (isNegative && (!cfgGuidanceScale || cfgGuidanceScale?.value === 1)) {
return;
}
let finalMesSend = [...mesSend]; let finalMesSend = [...mesSend];
let cfgPrompt = {}; let cfgPrompt = {};
if (cfgGuidanceScale && cfgGuidanceScale?.value !== 1) { if (cfgGuidanceScale && cfgGuidanceScale?.value !== 1) {
@ -2761,7 +2767,7 @@ async function Generate(type, { automatic_trigger, force_name2, resolve, reject,
? cfgPrompt.value ? cfgPrompt.value
: ` ${cfgPrompt.value}`; : ` ${cfgPrompt.value}`;
} else { } else {
// TODO: Switch from splice method to insertion depth method // TODO: Make all extension prompts use an array/splice method
finalMesSend.splice(mesSend.length - cfgPrompt.depth, 0, `${cfgPrompt.value}\n`); finalMesSend.splice(mesSend.length - cfgPrompt.depth, 0, `${cfgPrompt.value}\n`);
} }
} }

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

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

2
public/scripts/extensions/cfg/util.js
View File

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