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

cfg: Adjust max context size based on injected prompt

Browse Source 
Close #2424
This commit is contained in:
Cohee
2024-12-27 23:43:16 +02:00
parent 39cfb35c1a
commit c4f119ebf9
2 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
public/script.js
View File

@@ -3792,6 +3792,23 @@ export async function Generate(type, { automatic_trigger, force_name2, quiet_pro
} }
} }
// Fetches the combined prompt for both negative and positive prompts
const cfgGuidanceScale = getGuidanceScale();
const useCfgPrompt = cfgGuidanceScale && cfgGuidanceScale.value !== 1;
// Adjust max context based on CFG prompt to prevent overfitting
if (useCfgPrompt) {
const negativePrompt = getCfgPrompt(cfgGuidanceScale, true, true)?.value || '';
const positivePrompt = getCfgPrompt(cfgGuidanceScale, false, true)?.value || '';
if (negativePrompt || positivePrompt) {
const previousMaxContext = this_max_context;
const [negativePromptTokenCount, positivePromptTokenCount] = await Promise.all([getTokenCountAsync(negativePrompt), getTokenCountAsync(positivePrompt)]);
const decrement = Math.max(negativePromptTokenCount, positivePromptTokenCount);
this_max_context -= decrement;
console.log(`Max context reduced by ${decrement} tokens of CFG prompt (${previousMaxContext} -> ${this_max_context})`);
}
}
console.log(`Core/all messages: ${coreChat.length}/${chat.length}`); console.log(`Core/all messages: ${coreChat.length}/${chat.length}`);
// kingbri MARK: - Make sure the prompt bias isn't the same as the user bias // kingbri MARK: - Make sure the prompt bias isn't the same as the user bias
@@ -4299,10 +4316,6 @@ export async function Generate(type, { automatic_trigger, force_name2, quiet_pro
setPromptString(); setPromptString();
} }
// Fetches the combined prompt for both negative and positive prompts
const cfgGuidanceScale = getGuidanceScale();
const useCfgPrompt = cfgGuidanceScale && cfgGuidanceScale.value !== 1;
// For prompt bit itemization // For prompt bit itemization
let mesSendString = ''; let mesSendString = '';

12
public/scripts/cfg-scale.js
View File

@@ -451,8 +451,14 @@ function getCustomSeparator() {
} }
} }
// Gets the CFG prompt /**
export function getCfgPrompt(guidanceScale, isNegative) { * Gets the CFG prompt based on the guidance scale.
* @param {{type: number, value: number}} guidanceScale The CFG guidance scale
* @param {boolean} isNegative Whether to get the negative prompt
* @param {boolean} quiet Whether to suppress console output
* @returns {{value: string, depth: number}} The CFG prompt and insertion depth
*/
export function getCfgPrompt(guidanceScale, isNegative, quiet = false) {
let splitCfgPrompt = []; let splitCfgPrompt = [];
const cfgPromptCombine = chat_metadata[metadataKeys.prompt_combine] ?? []; const cfgPromptCombine = chat_metadata[metadataKeys.prompt_combine] ?? [];
@@ -484,7 +490,7 @@ export function getCfgPrompt(guidanceScale, isNegative) {
const customSeparator = getCustomSeparator(); const customSeparator = getCustomSeparator();
const combinedCfgPrompt = splitCfgPrompt.filter((e) => e.length > 0).join(customSeparator); const combinedCfgPrompt = splitCfgPrompt.filter((e) => e.length > 0).join(customSeparator);
const insertionDepth = chat_metadata[metadataKeys.prompt_insertion_depth] ?? 1; const insertionDepth = chat_metadata[metadataKeys.prompt_insertion_depth] ?? 1;
console.log(`Setting CFG with guidance scale: ${guidanceScale.value}, negatives: ${combinedCfgPrompt}`); !quiet && console.log(`Setting CFG with guidance scale: ${guidanceScale.value}, negatives: ${combinedCfgPrompt}`);
return { return {
value: combinedCfgPrompt, value: combinedCfgPrompt,