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

Fix user jb/main not replacing original placeholder in character main/jb

This commit is contained in:
maver 2023-08-14 18:15:19 +02:00
parent edcce96a6e
commit 9543f54f8c
1 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
public/scripts/openai.js
View File

@ -726,33 +726,23 @@ function preparePromptsForChatCompletion(Scenario, charPersonality, name2, world
// Apply character-specific main prompt
const systemPromptOverride = promptManager.activeCharacter.data?.system_prompt ?? null;
const systemPrompt = prompts.get('main') ?? null;
if (systemPromptOverride) {
if (systemPromptOverride && systemPrompt) {
const mainOriginalContent = systemPrompt.content;
systemPrompt.content = systemPromptOverride;
prompts.set(systemPrompt, prompts.index('main'));
const mainReplacement = promptManager.preparePrompt(systemPrompt, mainOriginalContent);
prompts.set(mainReplacement, 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) {
const jbOriginalContent = jailbreakPrompt.content;
jailbreakPrompt.content = jailbreakPromptOverride;
prompts.set(jailbreakPrompt, prompts.index('jailbreak'));
const jbReplacement = promptManager.preparePrompt(jailbreakPrompt, jbOriginalContent);
prompts.set(jbReplacement, prompts.index('jailbreak'));
}
// Replace {{original}} placeholder for supported prompts
const originalReplacements = {
main: default_main_prompt,
nsfw: default_nsfw_prompt,
jailbreak: default_jailbreak_prompt
}
prompts.collection.forEach(prompt => {
if (originalReplacements.hasOwnProperty(prompt.identifier)) {
const original = originalReplacements[prompt.identifier];
prompt.content = promptManager.preparePrompt(prompt, original)?.content;
}
});
// Allow subscribers to manipulate the prompts object
eventSource.emit(event_types.OAI_BEFORE_CHATCOMPLETION, prompts);