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

Extract CFG check

Browse Source
This commit is contained in:
valadaptive
2024-04-25 08:48:34 -04:00
parent 80a6406062
commit 8ca83bb255
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
public/script.js
View File

@ -3780,6 +3780,7 @@ async function Generate(type, { automatic_trigger, force_name2, quiet_prompt, qu
// 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();
const useCfgPrompt = cfgGuidanceScale && cfgGuidanceScale.value !== 1;
// For prompt bit itemization // For prompt bit itemization
let mesSendString = ''; let mesSendString = '';
@ -3787,7 +3788,7 @@ async function Generate(type, { automatic_trigger, force_name2, quiet_prompt, qu
function getCombinedPrompt(isNegative) { function getCombinedPrompt(isNegative) {
// Only return if the guidance scale doesn't exist or the value is 1 // Only return if the guidance scale doesn't exist or the value is 1
// Also don't return if constructing the neutral prompt // Also don't return if constructing the neutral prompt
if (isNegative && (!cfgGuidanceScale || cfgGuidanceScale?.value === 1)) { if (isNegative && !useCfgPrompt) {
return; return;
} }
@ -3800,7 +3801,7 @@ async function Generate(type, { automatic_trigger, force_name2, quiet_prompt, qu
let finalMesSend = structuredClone(mesSend); let finalMesSend = structuredClone(mesSend);
let cfgPrompt = {}; let cfgPrompt = {};
if (cfgGuidanceScale && cfgGuidanceScale?.value !== 1) { if (useCfgPrompt) {
cfgPrompt = getCfgPrompt(cfgGuidanceScale, isNegative); cfgPrompt = getCfgPrompt(cfgGuidanceScale, isNegative);
} }
@ -3900,7 +3901,7 @@ async function Generate(type, { automatic_trigger, force_name2, quiet_prompt, qu
let finalPrompt = getCombinedPrompt(false); let finalPrompt = getCombinedPrompt(false);
// Include the entire guidance scale object // Include the entire guidance scale object
const cfgValues = cfgGuidanceScale && cfgGuidanceScale?.value !== 1 ? ({ guidanceScale: cfgGuidanceScale, negativePrompt: negativePrompt }) : null; const cfgValues = useCfgPrompt ? { guidanceScale: cfgGuidanceScale, negativePrompt: negativePrompt } : null;
let maxLength = Number(amount_gen); // how many tokens the AI will be requested to generate let maxLength = Number(amount_gen); // how many tokens the AI will be requested to generate
let thisPromptBits = []; let thisPromptBits = [];