Prompt Manager: forbid overrides if a prompt is disabled

e773678f2db75d5bb938e5aa4cb7524907a054fd

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

Parents: bcfb07de5ece5b370958d7f9b115ce160a7c59bb
1 files changed, +4 -2Showing whitespace changes
public/scripts/openai.js+4 -2
@@ -1178,7 +1178,8 @@ function preparePromptsForChatCompletion({ Scenario, charPersonality, name2, wor
11781178
1179 // Apply character-specific main prompt1179 // Apply character-specific main prompt
1180 const systemPrompt = prompts.get('main') ?? null;1180 const systemPrompt = prompts.get('main') ?? null;
1181 if (systemPromptOverride && systemPrompt && systemPrompt.forbid_overrides !== true) {1181 const isSystemPromptDisabled = promptManager.isPromptDisabledForActiveCharacter('main');
1182 if (systemPromptOverride && systemPrompt && systemPrompt.forbid_overrides !== true && !isSystemPromptDisabled) {
1182 const mainOriginalContent = systemPrompt.content;1183 const mainOriginalContent = systemPrompt.content;
1183 systemPrompt.content = systemPromptOverride;1184 systemPrompt.content = systemPromptOverride;
1184 const mainReplacement = promptManager.preparePrompt(systemPrompt, mainOriginalContent);1185 const mainReplacement = promptManager.preparePrompt(systemPrompt, mainOriginalContent);
@@ -1187,7 +1188,8 @@ function preparePromptsForChatCompletion({ Scenario, charPersonality, name2, wor
11871188
1188 // Apply character-specific jailbreak1189 // Apply character-specific jailbreak
1189 const jailbreakPrompt = prompts.get('jailbreak') ?? null;1190 const jailbreakPrompt = prompts.get('jailbreak') ?? null;
1190 if (jailbreakPromptOverride && jailbreakPrompt && jailbreakPrompt.forbid_overrides !== true) {1191 const isJailbreakPromptDisabled = promptManager.isPromptDisabledForActiveCharacter('jailbreak');
1192 if (jailbreakPromptOverride && jailbreakPrompt && jailbreakPrompt.forbid_overrides !== true && !isJailbreakPromptDisabled) {
1191 const jbOriginalContent = jailbreakPrompt.content;1193 const jbOriginalContent = jailbreakPrompt.content;
1192 jailbreakPrompt.content = jailbreakPromptOverride;1194 jailbreakPrompt.content = jailbreakPromptOverride;
1193 const jbReplacement = promptManager.preparePrompt(jailbreakPrompt, jbOriginalContent);1195 const jbReplacement = promptManager.preparePrompt(jailbreakPrompt, jbOriginalContent);