rixty
/
SillyTavern
mirror of https://github.com/SillyTavern/SillyTavern.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix sysprompt dependency on instruct

This commit is contained in:
Cohee 2024-09-20 21:27:04 +03:00
parent 392edfaca1
commit 462b2ea7b2
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
public/script.js
View File

@ -3522,6 +3522,9 @@ export async function Generate(type, { automatic_trigger, force_name2, quiet_pro
if (power_user.sysprompt.enabled) {
system = power_user.prefer_character_prompt && system ? system : baseChatReplace(power_user.sysprompt.content, name1, name2);
system = isInstruct ? formatInstructModeSystemPrompt(substituteParams(system, name1, name2, power_user.sysprompt.content)) : system;
} else {
// Nullify if it's not enabled
system = '';
}
// Depth prompt (character-specific A/N)
@ -3774,7 +3777,7 @@ export async function Generate(type, { automatic_trigger, force_name2, quiet_pro
personality: personality,
persona: power_user.persona_description_position == persona_description_positions.IN_PROMPT ? persona : '',
scenario: scenario,
system: isInstruct ? system : '',
system: system,
char: name2,
user: name1,
wiBefore: worldInfoBefore,