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

Add macro for charDepthPrompt

Browse Source
This commit is contained in:
Cohee
2025-03-18 20:27:15 +02:00
parent 3c61074d78
commit 4df98b0341
2 changed files with 32 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
public/script.js
View File

@ -2746,6 +2746,7 @@ export function substituteParams(content, _name1, _name2, _original, _group, _re
environment.mesExamplesRaw = fields.mesExamples || '';
environment.charVersion = fields.version || '';
environment.char_version = fields.version || '';
environment.charDepthPrompt = fields.charDepthPrompt || '';
}
// Must be substituted last so that they're replaced inside {{description}}
@ -3097,10 +3098,30 @@ export function baseChatReplace(value, name1, name2) {
/**
* Returns the character card fields for the current character.
* @returns {{system: string, mesExamples: string, description: string, personality: string, persona: string, scenario: string, jailbreak: string, version: string}}
* @typedef {object} CharacterCardFields
* @property {string} system System prompt
* @property {string} mesExamples Message examples
* @property {string} description Description
* @property {string} personality Personality
* @property {string} persona Persona
* @property {string} scenario Scenario
* @property {string} jailbreak Jailbreak instructions
* @property {string} version Character version
* @property {string} charDepthPrompt Character depth note
* @returns {CharacterCardFields} Character card fields
*/
export function getCharacterCardFields() {
const result = { system: '', mesExamples: '', description: '', personality: '', persona: '', scenario: '', jailbreak: '', version: '' };
const result = {
system: '',
mesExamples: '',
description: '',
personality: '',
persona: '',
scenario: '',
jailbreak: '',
version: '',
charDepthPrompt: '',
};
result.persona = baseChatReplace(power_user.persona_description?.trim(), name1, name2);
const character = characters[this_chid];
@ -3117,6 +3138,7 @@ export function getCharacterCardFields() {
result.system = power_user.prefer_character_prompt ? baseChatReplace(character.data?.system_prompt?.trim(), name1, name2) : '';
result.jailbreak = power_user.prefer_character_jailbreak ? baseChatReplace(character.data?.post_history_instructions?.trim(), name1, name2) : '';
result.version = character.data?.character_version ?? '';
result.charDepthPrompt = baseChatReplace(character.data?.extensions?.depth_prompt?.prompt?.trim(), name1, name2);
if (selected_group) {
const groupCards = getGroupCharacterCards(selected_group, Number(this_chid));
@ -3612,7 +3634,8 @@ export async function generateRaw(prompt, api, instructOverride, quietToLoud, sy
throw new Error(data.response);
}
const message = cleanUpMessage(extractMessageFromData(data), false, false, true);
// format result, exclude user prompt bias
const message = cleanUpMessage(extractMessageFromData(data), false, false, true, null, false);
if (!message) {
throw new Error('No message generated');
@ -3921,6 +3944,7 @@ export async function Generate(type, { automatic_trigger, force_name2, quiet_pro
mesExamples,
system,
jailbreak,
charDepthPrompt,
} = getCharacterCardFields();
if (main_api !== 'openai') {
@ -3943,7 +3967,7 @@ export async function Generate(type, { automatic_trigger, force_name2, quiet_pro
setExtensionPrompt('DEPTH_PROMPT_' + index, value.text, extension_prompt_types.IN_CHAT, value.depth, extension_settings.note.allowWIScan, role);
});
} else {
const depthPromptText = baseChatReplace(characters[this_chid]?.data?.extensions?.depth_prompt?.prompt?.trim(), name1, name2) || '';
const depthPromptText = charDepthPrompt || '';
const depthPromptDepth = characters[this_chid]?.data?.extensions?.depth_prompt?.depth ?? depth_prompt_depth_default;
const depthPromptRole = getExtensionPromptRoleByName(characters[this_chid]?.data?.extensions?.depth_prompt?.role ?? depth_prompt_role_default);
setExtensionPrompt('DEPTH_PROMPT', depthPromptText, extension_prompt_types.IN_CHAT, depthPromptDepth, extension_settings.note.allowWIScan, depthPromptRole);
@ -5884,13 +5908,14 @@ function extractMultiSwipes(data, type) {
return swipes;
}
export function cleanUpMessage(getMessage, isImpersonate, isContinue, displayIncompleteSentences = false, stoppingStrings = null) {
export function cleanUpMessage(getMessage, isImpersonate, isContinue, displayIncompleteSentences = false, stoppingStrings = null, includeUserPromptBias = true) {
if (!getMessage) {
return '';
}
// Add the prompt bias before anything else
if (
includeUserPromptBias &&
power_user.user_prompt_bias &&
!isImpersonate &&
!isContinue &&