rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2024-12-14 02:16:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rework character-prefixed free-mode to support macro

Browse Source
This commit is contained in:
Deathspike 2023-12-16 11:29:34 +01:00
parent 8aa1814287
commit 14400b05f9
1 changed files with 24 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
public/scripts/extensions/stable-diffusion/index.js
View File

@ -58,7 +58,6 @@ const generationMode = {
CHARACTER_MULTIMODAL: 8, CHARACTER_MULTIMODAL: 8,
USER_MULTIMODAL: 9, USER_MULTIMODAL: 9,
FACE_MULTIMODAL: 10, FACE_MULTIMODAL: 10,
CHARACTER_FREE: 11,
}; };
const multimodalMap = { const multimodalMap = {
@ -1564,10 +1563,6 @@ function getGenerationType(prompt) {
mode = multimodalMap[mode]; mode = multimodalMap[mode];
} }
if (mode === generationMode.FREE && /^char\s/.test(prompt)) {
mode = generationMode.CHARACTER_FREE;
}
return mode; return mode;
} }
@ -1716,16 +1711,13 @@ 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:
case generationMode.USER_MULTIMODAL: case generationMode.USER_MULTIMODAL:
prompt = await generateMultimodalPrompt(generationType, quietPrompt); prompt = await generateMultimodalPrompt(generationType, quietPrompt);
break; break;
case generationMode.CHARACTER_FREE:
prompt = generateFreeCharacterPrompt(trigger);
break;
default: default:
prompt = await generatePrompt(quietPrompt); prompt = await generatePrompt(quietPrompt);
break; break;
@ -1739,38 +1731,33 @@ 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. * @param {string} trigger - The prompt to use for the image generation.
* @returns {string} * @returns {string}
*/ */
function generateFreeCharacterPrompt(trigger) { function generateFreeModePrompt(trigger) {
const context = getContext(); 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 getCharacterPrefix = () => { const key = getLastCharacterKey();
const key = getLastCharacterKey(); const value = (extension_settings.sd.character_prompts[key] || '').trim();
const value = (extension_settings.sd.character_prompts[key] || '').trim(); return value ? value + (suffix || '') : '';
return value ? value + ' ' : ''; });
};
const getLastCharacterKey = () => {
if (typeof this_chid !== 'undefined') {
return getCharaFilename(this_chid);
}
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 prefix = getCharacterPrefix();
const pieces = trigger.split(/\s+/g);
const prompt = pieces.slice(1).join(' ');
return (prefix + prompt).trim();
} }
/** /**