mirror of
https://github.com/SillyTavern/SillyTavern.git
synced 2024-12-14 02:16:14 +01:00
Rework character-prefixed free-mode to support macro
This commit is contained in:
parent
8aa1814287
commit
14400b05f9
@ -58,7 +58,6 @@ const generationMode = {
|
||||
CHARACTER_MULTIMODAL: 8,
|
||||
USER_MULTIMODAL: 9,
|
||||
FACE_MULTIMODAL: 10,
|
||||
CHARACTER_FREE: 11,
|
||||
};
|
||||
|
||||
const multimodalMap = {
|
||||
@ -1564,10 +1563,6 @@ function getGenerationType(prompt) {
|
||||
mode = multimodalMap[mode];
|
||||
}
|
||||
|
||||
if (mode === generationMode.FREE && /^char\s/.test(prompt)) {
|
||||
mode = generationMode.CHARACTER_FREE;
|
||||
}
|
||||
|
||||
return mode;
|
||||
}
|
||||
|
||||
@ -1716,16 +1711,13 @@ async function getPrompt(generationType, message, trigger, quietPrompt) {
|
||||
prompt = message || getRawLastMessage();
|
||||
break;
|
||||
case generationMode.FREE:
|
||||
prompt = trigger.trim();
|
||||
prompt = generateFreeModePrompt(trigger.trim());
|
||||
break;
|
||||
case generationMode.FACE_MULTIMODAL:
|
||||
case generationMode.CHARACTER_MULTIMODAL:
|
||||
case generationMode.USER_MULTIMODAL:
|
||||
prompt = await generateMultimodalPrompt(generationType, quietPrompt);
|
||||
break;
|
||||
case generationMode.CHARACTER_FREE:
|
||||
prompt = generateFreeCharacterPrompt(trigger);
|
||||
break;
|
||||
default:
|
||||
prompt = await generatePrompt(quietPrompt);
|
||||
break;
|
||||
@ -1739,23 +1731,18 @@ async function getPrompt(generationType, message, trigger, quietPrompt) {
|
||||
}
|
||||
|
||||
/**
|
||||
* Generates a free prompt with a character-specific prompt prefix.
|
||||
* Generates a free prompt with a character-specific prompt prefix support.
|
||||
* @param {string} trigger - The prompt to use for the image generation.
|
||||
* @returns {string}
|
||||
*/
|
||||
function generateFreeCharacterPrompt(trigger) {
|
||||
const context = getContext();
|
||||
|
||||
const getCharacterPrefix = () => {
|
||||
const key = getLastCharacterKey();
|
||||
const value = (extension_settings.sd.character_prompts[key] || '').trim();
|
||||
return value ? value + ' ' : '';
|
||||
};
|
||||
|
||||
function generateFreeModePrompt(trigger) {
|
||||
return trigger
|
||||
.replace(/(?:^char(\s)|\{\{charPrefix\}\})/gi, (_, suffix) => {
|
||||
const getLastCharacterKey = () => {
|
||||
if (typeof this_chid !== 'undefined') {
|
||||
return getCharaFilename(this_chid);
|
||||
}
|
||||
const context = getContext();
|
||||
for (let i = context.chat.length - 1; i >= 0; i--) {
|
||||
const message = context.chat[i];
|
||||
if (message.is_user || message.is_system) {
|
||||
@ -1767,10 +1754,10 @@ function generateFreeCharacterPrompt(trigger) {
|
||||
throw new Error('No usable messages found.');
|
||||
};
|
||||
|
||||
const prefix = getCharacterPrefix();
|
||||
const pieces = trigger.split(/\s+/g);
|
||||
const prompt = pieces.slice(1).join(' ');
|
||||
return (prefix + prompt).trim();
|
||||
const key = getLastCharacterKey();
|
||||
const value = (extension_settings.sd.character_prompts[key] || '').trim();
|
||||
return value ? value + (suffix || '') : '';
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
|
Loading…
Reference in New Issue
Block a user