mirror of
https://github.com/SillyTavern/SillyTavern.git
synced 2025-06-05 21:59:27 +02:00
Merge pull request #1548 from Deathspike/release
Add SD character-specific prompt prefix options to free-mode
This commit is contained in:
@ -1711,7 +1711,7 @@ async function getPrompt(generationType, message, trigger, quietPrompt) {
|
|||||||
prompt = message || getRawLastMessage();
|
prompt = message || getRawLastMessage();
|
||||||
break;
|
break;
|
||||||
case generationMode.FREE:
|
case generationMode.FREE:
|
||||||
prompt = trigger.trim();
|
prompt = generateFreeModePrompt(trigger.trim());
|
||||||
break;
|
break;
|
||||||
case generationMode.FACE_MULTIMODAL:
|
case generationMode.FACE_MULTIMODAL:
|
||||||
case generationMode.CHARACTER_MULTIMODAL:
|
case generationMode.CHARACTER_MULTIMODAL:
|
||||||
@ -1730,6 +1730,36 @@ async function getPrompt(generationType, message, trigger, quietPrompt) {
|
|||||||
return prompt;
|
return prompt;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 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 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) {
|
||||||
|
continue;
|
||||||
|
} else if (typeof message.original_avatar === 'string') {
|
||||||
|
return message.original_avatar.replace(/\.[^/.]+$/, '');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
throw new Error('No usable messages found.');
|
||||||
|
};
|
||||||
|
|
||||||
|
const key = getLastCharacterKey();
|
||||||
|
const value = (extension_settings.sd.character_prompts[key] || '').trim();
|
||||||
|
return value ? value + (suffix || '') : '';
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Generates a prompt using multimodal captioning.
|
* Generates a prompt using multimodal captioning.
|
||||||
* @param {number} generationType - The type of image generation to perform.
|
* @param {number} generationType - The type of image generation to perform.
|
||||||
|
Reference in New Issue
Block a user