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

DRY

This commit is contained in:
Cohee 2024-11-02 13:22:41 +02:00
parent 293d6ff60d
commit 48c3e81f42
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
public/scripts/instruct-mode.js
View File

@ -570,12 +570,8 @@ function selectMatchingContextTemplate(name) {
* @returns {import('./macros.js').Macro[]} Macro objects. * @returns {import('./macros.js').Macro[]} Macro objects.
*/ */
export function getInstructMacros(env) { export function getInstructMacros(env) {
const syspromptMacros = {
'systemPrompt': (power_user.prefer_character_prompt && env.charPrompt ? env.charPrompt : power_user.sysprompt.content),
'defaultSystemPrompt|instructSystem|instructSystemPrompt': power_user.sysprompt.content,
};
const instructMacros = { const instructMacros = {
// Instruct template macros
'instructSystemPromptPrefix': power_user.instruct.system_sequence_prefix, 'instructSystemPromptPrefix': power_user.instruct.system_sequence_prefix,
'instructSystemPromptSuffix': power_user.instruct.system_sequence_suffix, 'instructSystemPromptSuffix': power_user.instruct.system_sequence_suffix,
'instructInput|instructUserPrefix': power_user.instruct.input_sequence, 'instructInput|instructUserPrefix': power_user.instruct.input_sequence,
@ -591,6 +587,12 @@ export function getInstructMacros(env) {
'instructSystemInstructionPrefix': power_user.instruct.last_system_sequence, 'instructSystemInstructionPrefix': power_user.instruct.last_system_sequence,
'instructFirstInput|instructFirstUserPrefix': power_user.instruct.first_input_sequence || power_user.instruct.input_sequence, 'instructFirstInput|instructFirstUserPrefix': power_user.instruct.first_input_sequence || power_user.instruct.input_sequence,
'instructLastInput|instructLastUserPrefix': power_user.instruct.last_input_sequence || power_user.instruct.input_sequence, 'instructLastInput|instructLastUserPrefix': power_user.instruct.last_input_sequence || power_user.instruct.input_sequence,
// System prompt macros
'systemPrompt': (power_user.prefer_character_prompt && env.charPrompt ? env.charPrompt : power_user.sysprompt.content),
'defaultSystemPrompt|instructSystem|instructSystemPrompt': power_user.sysprompt.content,
// Context template macros
'chatSeparator': power_user.context.example_separator,
'chatStart': power_user.context.chat_start,
}; };
const macros = []; const macros = [];
@ -601,15 +603,6 @@ export function getInstructMacros(env) {
macros.push({ regex, replace }); macros.push({ regex, replace });
} }
for (const [placeholder, value] of Object.entries(syspromptMacros)) {
const regex = new RegExp(`{{(${placeholder})}}`, 'gi');
const replace = () => power_user.sysprompt.enabled ? value : '';
macros.push({ regex, replace });
}
macros.push({ regex: /{{exampleSeparator}}/gi, replace: () => power_user.context.example_separator });
macros.push({ regex: /{{chatStart}}/gi, replace: () => power_user.context.chat_start });
return macros; return macros;
} }