Fix sysprompt dependency on instruct

462b2ea7b27c05f09bcf1b5eb9e186055d42d893

Cohee <18619528+Cohee1207@users.noreply.github.com>

Parents: 392edfaca161d7e9d02d184e0088efaa916300cb
1 files changed, +4 -1Showing whitespace changes
public/script.js+4 -1
@@ -3522,6 +3522,9 @@ export async function Generate(type, { automatic_trigger, force_name2, quiet_pro
3522 if (power_user.sysprompt.enabled) {3522 if (power_user.sysprompt.enabled) {
3523 system = power_user.prefer_character_prompt && system ? system : baseChatReplace(power_user.sysprompt.content, name1, name2);3523 system = power_user.prefer_character_prompt && system ? system : baseChatReplace(power_user.sysprompt.content, name1, name2);
3524 system = isInstruct ? formatInstructModeSystemPrompt(substituteParams(system, name1, name2, power_user.sysprompt.content)) : system;3524 system = isInstruct ? formatInstructModeSystemPrompt(substituteParams(system, name1, name2, power_user.sysprompt.content)) : system;
3525 } else {
3526 // Nullify if it's not enabled
3527 system = '';
3525 }3528 }
35263529
3527 // Depth prompt (character-specific A/N)3530 // Depth prompt (character-specific A/N)
@@ -3774,7 +3777,7 @@ export async function Generate(type, { automatic_trigger, force_name2, quiet_pro
3774 personality: personality,3777 personality: personality,
3775 persona: power_user.persona_description_position == persona_description_positions.IN_PROMPT ? persona : '',3778 persona: power_user.persona_description_position == persona_description_positions.IN_PROMPT ? persona : '',
3776 scenario: scenario,3779 scenario: scenario,
3777 system: isInstruct ? system : '',3780 system: system,
3778 char: name2,3781 char: name2,
3779 user: name1,3782 user: name1,
3780 wiBefore: worldInfoBefore,3783 wiBefore: worldInfoBefore,