Return character prefixes to brush image generation (#4833)
* Return character prompt prefixes to brush image generation Before [#4719](https://github.com/SillyTavern/SillyTavern/pull/4719), the brush tool would generate an image using the character specific prompt prefixes. This returns that functionality. * eslint fix --------- Co-authored-by: Cohee <18619528+Cohee1207@users.noreply.github.com>
This commit is contained in:
@@ -2907,10 +2907,16 @@ async function generatePrompt(quietPrompt) {
|
||||
*/
|
||||
async function sendGenerationRequest(generationType, prompt, additionalNegativePrefix, characterName, callback, initiator, signal) {
|
||||
const noCharPrefix = [generationMode.FREE, generationMode.BACKGROUND, generationMode.USER, generationMode.USER_MULTIMODAL, generationMode.FREE_EXTENDED];
|
||||
const prefix = noCharPrefix.includes(generationType)
|
||||
const isCharChat = this_chid !== undefined && !selected_group;
|
||||
const ignoreNoCharForSwipe = initiator === initiators.swipe && isCharChat;
|
||||
|
||||
const skipCharPrefix = !ignoreNoCharForSwipe && noCharPrefix.includes(generationType);
|
||||
|
||||
const prefix = skipCharPrefix
|
||||
? extension_settings.sd.prompt_prefix
|
||||
: combinePrefixes(extension_settings.sd.prompt_prefix, getCharacterPrefix());
|
||||
const negativePrefix = noCharPrefix.includes(generationType)
|
||||
|
||||
const negativePrefix = skipCharPrefix
|
||||
? extension_settings.sd.negative_prompt
|
||||
: combinePrefixes(extension_settings.sd.negative_prompt, getCharacterNegativePrefix());
|
||||
|
||||
|
||||
Reference in New Issue
Block a user