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

Replace macros in example separator and chat start

This commit is contained in:
ThisIsPIRI 2023-09-08 19:25:17 +09:00
parent 3abee9e37a
commit 2688d980c1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/script.js
View File

@ -2440,7 +2440,7 @@ async function Generate(type, { automatic_trigger, force_name2, resolve, reject,
mesExamples = formatInstructModeExamples(mesExamples, name1, name2) mesExamples = formatInstructModeExamples(mesExamples, name1, name2)
} }
const exampleSeparator = power_user.context.example_separator ? `${power_user.context.example_separator}\n` : ''; const exampleSeparator = power_user.context.example_separator ? `${substituteParams(power_user.context.example_separator)}\n` : '';
const blockHeading = main_api === 'openai' ? '<START>\n' : exampleSeparator; const blockHeading = main_api === 'openai' ? '<START>\n' : exampleSeparator;
let mesExamplesArray = mesExamples.split(/<START>/gi).slice(1).map(block => `${blockHeading}${block.trim()}\n`); let mesExamplesArray = mesExamples.split(/<START>/gi).slice(1).map(block => `${blockHeading}${block.trim()}\n`);
@ -3422,7 +3422,7 @@ function addChatsPreamble(mesSendString) {
function addChatsSeparator(mesSendString) { function addChatsSeparator(mesSendString) {
if (power_user.context.chat_start) { if (power_user.context.chat_start) {
return power_user.context.chat_start + '\n' + mesSendString; return substituteParams(power_user.context.chat_start) + '\n' + mesSendString;
} }
else { else {