rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-02-02 20:36:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix instruct system sequence missing + {{original}}

Browse Source
This commit is contained in:
Cohee 2023-08-23 18:04:22 +03:00
parent fad6c164cb
commit 2c2a68ef76
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/script.js
View File

@ -165,6 +165,7 @@ import {
formatInstructModeExamples, formatInstructModeExamples,
getInstructStoppingSequences, getInstructStoppingSequences,
autoSelectInstructPreset, autoSelectInstructPreset,
formatInstructModeSystemPrompt,
} from "./scripts/instruct-mode.js"; } from "./scripts/instruct-mode.js";
import { applyLocale } from "./scripts/i18n.js"; import { applyLocale } from "./scripts/i18n.js";
import { getTokenCount, getTokenizerModel, saveTokenCache } from "./scripts/tokenizers.js"; import { getTokenCount, getTokenizerModel, saveTokenCache } from "./scripts/tokenizers.js";
@ -2360,6 +2361,7 @@ async function Generate(type, { automatic_trigger, force_name2, resolve, reject,
if (isInstruct) { if (isInstruct) {
systemPrompt = power_user.prefer_character_prompt && systemPrompt ? systemPrompt : baseChatReplace(power_user.instruct.system_prompt, name1, name2); systemPrompt = power_user.prefer_character_prompt && systemPrompt ? systemPrompt : baseChatReplace(power_user.instruct.system_prompt, name1, name2);
systemPrompt = formatInstructModeSystemPrompt(substituteParams(systemPrompt, name1, name2, power_user.instruct.system_prompt));
} }
// Parse example messages // Parse example messages

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

@ -189,6 +189,20 @@ export function formatInstructModeChat(name, mes, isUser, isNarrator, forceAvata
return text; return text;
} }
/**
* Formats instruct mode system prompt.
* @param {string} systemPrompt System prompt string.
* @returns {string} Formatted instruct mode system prompt.
*/
export function formatInstructModeSystemPrompt(systemPrompt){
if (power_user.instruct.system_sequence) {
const separator = power_user.instruct.wrap ? '\n' : '';
return power_user.instruct.system_sequence + separator + systemPrompt;
}
return systemPrompt;
}
/** /**
* Formats example messages according to instruct mode settings. * Formats example messages according to instruct mode settings.
* @param {string} mesExamples Example messages string. * @param {string} mesExamples Example messages string.