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

Move main and jailbreak override from manager into openai script.

Browse Source 
Makes the code clearer and easier to understand
This commit is contained in:
maver
2023-07-20 19:17:47 +02:00
parent 075c0c29f0
commit 9d6cf017d2
2 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
public/scripts/openai.js
View File

@ -682,6 +682,22 @@ function preparePromptsForChatCompletion(Scenario, charPersonality, name2, world
else prompts.add(newPrompt);
});
// Apply character-specific main prompt
const systemPromptOverride = promptManager.activeCharacter.data?.system_prompt ?? null;
const systemPrompt = prompts.get('main') ?? null;
if (systemPromptOverride) {
systemPrompt.content = systemPromptOverride;
prompts.set(systemPrompt, prompts.index('main'));
}
// Apply character-specific jailbreak
const jailbreakPromptOverride = promptManager.activeCharacter.data?.post_history_instructions ?? null;
const jailbreakPrompt = prompts.get('jailbreak') ?? null;
if (jailbreakPromptOverride && jailbreakPrompt) {
jailbreakPrompt.content = jailbreakPromptOverride;
prompts.set(jailbreakPrompt, prompts.index('jailbreak'));
}
// Replace {{original}} placeholder for supported prompts
const originalReplacements = {
main: default_main_prompt,