Merge branch 'staging' into send-commands-return-value

89642f217d06b1644f223d61d83dbace6e04315d

Cohee <18619528+Cohee1207@users.noreply.github.com>

Parents: f6726db9fb87efe785c57e2d8a32b6a97faee117 4eee1cb2d0ac1ec59bb5c0f4aa61c82ad19419b9
9 files changed, +354 -156Showing whitespace changes
UpdateAndStart.bat+12 -3
@@ -2,17 +2,26 @@
22pushd %~dp0
33git --version > nul 2>&1
44if %errorlevel% neq 0 (
55 echo GitGit is not installed on this system. Skipping update.
6- echo If you installed with a zip file, you will need to download the new zip and install it manually.
6+ echo Install it from https://git-scm.com/downloads
7+ goto end
78) else (
9+ if not exist .git (
10+ echo Not running from a Git repository. Reinstall using an officially supported method to get updates.
11+ echo See: https://docs.sillytavern.app/installation/windows/
12+ goto end
13+ )
814 call git pull --rebase --autostash
915 if %errorlevel% neq 0 (
1016 REM incase there is still something wrong
1117 echo ThereThere were errors while updating. Please download the latest version manually.
18+ echo See the update FAQ at https://docs.sillytavern.app/usage/update/#common-update-problems
19+ goto end
1220 )
1321)
1422set NODE_ENV=production
1523call npm install --no-audit --no-fund --loglevel=error --no-progress --omit=dev
1624node server.js %*
25+:end
1726pause
1827popd
UpdateForkAndStart.bat+10 -3
@@ -5,8 +5,14 @@ pushd %~dp0
55echo Checking Git installation
66git --version > nul 2>&1
77if %errorlevel% neq 0 (
88 echo GitGit is not installed on this system. Skipping update.
9- echo If you installed with a zip file, you will need to download the new zip and install it manually.
9+ echo Install it from https://git-scm.com/downloads
10+ goto end
11+)
12+
13+if not exist .git (
14+ echo Not running from a Git repository. Reinstall using an officially supported method to get updates.
15+ echo See: https://docs.sillytavern.app/installation/windows/
1016 goto end
1117)
1218
@@ -89,7 +95,8 @@ git pull --rebase --autostash origin %TARGET_BRANCH%
8995
9096:install
9197if %errorlevel% neq 0 (
9298 echo ThereThere were errors while updating. Please check manually.
99+ echo See the update FAQ at https://docs.sillytavern.app/usage/update/#common-update-problems
93100 goto end
94101)
95102
default/config.yaml+0 -1
@@ -118,7 +118,6 @@ extras:
118118 classificationModel: Cohee/distilbert-base-uncased-go-emotions-onnx
119119 captioningModel: Xenova/vit-gpt2-image-captioning
120120 embeddingModel: Cohee/jina-embeddings-v2-base-en
121- promptExpansionModel: Cohee/fooocus_expansion-onnx
122121 speechToTextModel: Xenova/whisper-small
123122 textToSpeechModel: Xenova/speecht5_tts
124123# -- OPENAI CONFIGURATION --
public/scripts/extensions/stable-diffusion/index.js+326 -59
@@ -20,7 +20,7 @@ import {
2020} from '../../../script.js';
2121import { getApiUrl, getContext, extension_settings, doExtrasFetch, modules, renderExtensionTemplateAsync, writeExtensionField } from '../../extensions.js';
2222import { selected_group } from '../../group-chats.js';
2323import { stringFormat, initScrollHeight, resetScrollHeight, getCharaFilename, saveBase64AsFile, getBase64Async, delay, isTrueBoolean, debounce, isFalseBoolean } from '../../utils.js';
2424import { getMessageTimeStamp, humanizedDateTime } from '../../RossAscends-mods.js';
2525import { SECRET_KEYS, secret_state, writeSecret } from '../../secrets.js';
2626import { getNovelUnlimitedImageGeneration, getNovelAnlas, loadNovelSubscriptionData } from '../../nai-settings.js';
@@ -31,6 +31,7 @@ import { ARGUMENT_TYPE, SlashCommandArgument, SlashCommandNamedArgument } from '
3131import { debounce_timeout } from '../../constants.js';
3232import { SlashCommandEnumValue } from '../../slash-commands/SlashCommandEnumValue.js';
3333import { POPUP_RESULT, POPUP_TYPE, Popup, callGenericPopup } from '../../popup.js';
34+import { commonEnumProviders } from '../../slash-commands/SlashCommandCommonEnumsProvider.js';
3435export { MODULE_NAME };
3536
3637const MODULE_NAME = 'sd';
@@ -221,7 +222,6 @@ const defaultSettings = {
221222
222223 // Refine mode
223224 refine_mode: false,
224- expand: false,
225225 interactive_mode: false,
226226 multimodal_captioning: false,
227227 snap: false,
@@ -240,7 +240,7 @@ const defaultSettings = {
240240 drawthings_auth: '',
241241
242242 hr_upscaler: 'Latent',
243243 hr_scale: 21.0,
244244 hr_scale_min: 1.0,
245245 hr_scale_max: 4.0,
246246 hr_scale_step: 0.1,
@@ -260,10 +260,6 @@ const defaultSettings = {
260260 clip_skip: 1,
261261
262262 // NovelAI settings
263- novel_upscale_ratio_min: 1.0,
264- novel_upscale_ratio_max: 4.0,
265- novel_upscale_ratio_step: 0.1,
266- novel_upscale_ratio: 1.0,
267263 novel_anlas_guard: false,
268264 novel_sm: false,
269265 novel_sm_dyn: false,
@@ -416,7 +412,6 @@ async function loadSettings() {
416412 $('#sd_hr_scale').val(extension_settings.sd.hr_scale).trigger('input');
417413 $('#sd_denoising_strength').val(extension_settings.sd.denoising_strength).trigger('input');
418414 $('#sd_hr_second_pass_steps').val(extension_settings.sd.hr_second_pass_steps).trigger('input');
419- $('#sd_novel_upscale_ratio').val(extension_settings.sd.novel_upscale_ratio).trigger('input');
420415 $('#sd_novel_anlas_guard').prop('checked', extension_settings.sd.novel_anlas_guard);
421416 $('#sd_novel_sm').prop('checked', extension_settings.sd.novel_sm);
422417 $('#sd_novel_sm_dyn').prop('checked', extension_settings.sd.novel_sm_dyn);
@@ -430,7 +425,6 @@ async function loadSettings() {
430425 $('#sd_restore_faces').prop('checked', extension_settings.sd.restore_faces);
431426 $('#sd_enable_hr').prop('checked', extension_settings.sd.enable_hr);
432427 $('#sd_refine_mode').prop('checked', extension_settings.sd.refine_mode);
433- $('#sd_expand').prop('checked', extension_settings.sd.expand);
434428 $('#sd_multimodal_captioning').prop('checked', extension_settings.sd.multimodal_captioning);
435429 $('#sd_auto_url').val(extension_settings.sd.auto_url);
436430 $('#sd_auto_auth').val(extension_settings.sd.auto_auth);
@@ -644,37 +638,13 @@ async function onSaveStyleClick() {
644638 saveSettingsDebounced();
645639}
646640
647-async function expandPrompt(prompt) {
648- try {
649- const response = await fetch('/api/sd/expand', {
650- method: 'POST',
651- headers: getRequestHeaders(),
652- body: JSON.stringify({ prompt: prompt }),
653- });
654-
655- if (!response.ok) {
656- throw new Error('API returned an error.');
657- }
658-
659- const data = await response.json();
660- return data.prompt;
661- } catch {
662- return prompt;
663- }
664-}
665-
666641/**
667642 * Modifies prompt based on auto-expansion and user inputs.
668643 * @param {string} prompt Prompt to refine
669- * @param {boolean} allowExpand Whether to allow auto-expansion
670644 * @param {boolean} isNegative Whether the prompt is a negative one
671645 * @returns {Promise<string>} Refined prompt
672646 */
673647async function refinePrompt(prompt, allowExpand, isNegative = false) {
674- if (allowExpand && extension_settings.sd.expand) {
675- prompt = await expandPrompt(prompt);
676- }
677-
678648 if (extension_settings.sd.refine_mode) {
679649 const text = isNegative ? '<h3>Review and edit the <i>negative</i> prompt:</h3>' : '<h3>Review and edit the prompt:</h3>';
680650 const refinedPrompt = await callGenericPopup(text + 'Press "Cancel" to abort the image generation.', POPUP_TYPE.INPUT, prompt.trim(), { rows: 5, okButton: 'Continue' });
@@ -800,11 +770,6 @@ function combinePrefixes(str1, str2, macro = '') {
800770 return process(result);
801771}
802772
803-function onExpandInput() {
804- extension_settings.sd.expand = !!$(this).prop('checked');
805- saveSettingsDebounced();
806-}
807-
808773function onRefineModeInput() {
809774 extension_settings.sd.refine_mode = !!$('#sd_refine_mode').prop('checked');
810775 saveSettingsDebounced();
@@ -969,12 +934,6 @@ async function onViewAnlasClick() {
969934 toastr.info(`Free image generation: ${unlimitedGeneration ? 'Yes' : 'No'}`, `Anlas: ${anlas}`);
970935}
971936
972-function onNovelUpscaleRatioInput() {
973- extension_settings.sd.novel_upscale_ratio = Number($('#sd_novel_upscale_ratio').val());
974- $('#sd_novel_upscale_ratio_value').val(extension_settings.sd.novel_upscale_ratio.toFixed(1));
975- saveSettingsDebounced();
976-}
977-
978937function onNovelAnlasGuardInput() {
979938 extension_settings.sd.novel_anlas_guard = !!$('#sd_novel_anlas_guard').prop('checked');
980939 saveSettingsDebounced();
@@ -2273,6 +2232,25 @@ function getRawLastMessage() {
22732232}
22742233
22752234/**
2235+ * Ensure that the selected option exists in the dropdown.
2236+ * @param {string} setting Setting key
2237+ * @param {string} selector Dropdown selector
2238+ * @returns {void}
2239+ */
2240+function ensureSelectionExists(setting, selector) {
2241+ /** @type {HTMLSelectElement} */
2242+ const selectElement = document.querySelector(selector);
2243+ if (!selectElement) {
2244+ return;
2245+ }
2246+ const options = Array.from(selectElement.options);
2247+ const value = extension_settings.sd[setting];
2248+ if (selectElement.selectedOptions.length && !options.some(option => option.value === value)) {
2249+ extension_settings.sd[setting] = selectElement.selectedOptions[0].value;
2250+ }
2251+}
2252+
2253+/**
22762254 * Generates an image based on the given trigger word.
22772255 * @param {string} initiator The initiator of the image generation
22782256 * @param {Record<string, object>} args Command arguments
@@ -2292,8 +2270,8 @@ async function generatePicture(initiator, args, trigger, message, callback) {
22922270 return;
22932271 }
22942272
2295- extension_settings.sd.sampler = $('#sd_sampler').find(':selected').val();
2273+ ensureSelectionExists('sampler', '#sd_sampler');
2296- extension_settings.sd.model = $('#sd_model').find(':selected').val();
2274+ ensureSelectionExists('model', '#sd_model');
22972275
22982276 trigger = trigger.trim();
22992277 const generationType = getGenerationType(trigger);
@@ -2441,7 +2419,7 @@ async function getPrompt(generationType, message, trigger, quietPrompt, combineN
24412419 }
24422420
24432421 if (generationType !== generationMode.FREE) {
24442422 prompt = await refinePrompt(prompt, truefalse);
24452423 }
24462424
24472425 return prompt;
@@ -2469,7 +2447,7 @@ function generateFreeModePrompt(trigger, combineNegatives) {
24692447 return message.original_avatar.replace(/\.[^/.]+$/, '');
24702448 }
24712449 }
2472- throw new Error('No usable messages found.');
2450+ return '';
24732451 };
24742452
24752453 const key = getLastCharacterKey();
@@ -3031,7 +3009,7 @@ async function generateNovelImage(prompt, negativePrompt, signal) {
30313009 width: width,
30323010 height: height,
30333011 negative_prompt: negativePrompt,
30343012 upscale_ratio: extension_settings.sd.novel_upscale_ratiohr_scale,
30353013 decrisper: extension_settings.sd.novel_decrisper,
30363014 sm: sm,
30373015 sm_dyn: sm_dyn,
@@ -3613,8 +3591,8 @@ async function sdMessageButton(e) {
36133591 try {
36143592 setBusyIcon(true);
36153593 if (hasSavedImage) {
36163594 const prompt = await refinePrompt(message.extra.title, false, false);
36173595 const negative = hasSavedNegative ? await refinePrompt(message.extra.negative, false, true) : '';
36183596 message.extra.title = prompt;
36193597
36203598 const generationType = message?.extra?.generationType ?? generationMode.FREE;
@@ -3756,8 +3734,8 @@ async function onImageSwiped({ message, element, direction }) {
37563734 eventSource.once(CUSTOM_STOP_EVENT, stopListener);
37573735 const callback = () => { };
37583736 const hasNegative = message.extra.negative;
37593737 const prompt = await refinePrompt(message.extra.title, false, false);
37603738 const negativePromptPrefix = hasNegative ? await refinePrompt(message.extra.negative, false, true) : '';
37613739 const characterName = context.groupId
37623740 ? context.groups[Object.keys(context.groups).filter(x => context.groups[x].id === context.groupId)[0]]?.id?.toString()
37633741 : context.characters[context.characterId]?.name;
@@ -3788,12 +3766,85 @@ async function onImageSwiped({ message, element, direction }) {
37883766 await context.saveChat();
37893767}
37903768
3769+/**
3770+ * Applies the command arguments to the extension settings.
3771+ * @typedef {import('../../slash-commands/SlashCommand.js').NamedArguments} NamedArguments
3772+ * @typedef {import('../../slash-commands/SlashCommand.js').NamedArgumentsCapture} NamedArgumentsCapture
3773+ * @param {NamedArguments | NamedArgumentsCapture} args - Command arguments
3774+ * @returns {Record<string, any>} - Current settings before applying the command arguments
3775+ */
3776+function applyCommandArguments(args) {
3777+ const overrideSettings = {};
3778+ const currentSettings = {};
3779+ const settingMap = {
3780+ 'edit': 'refine_mode',
3781+ 'extend': 'free_extend',
3782+ 'multimodal': 'multimodal_captioning',
3783+ 'seed': 'seed',
3784+ 'width': 'width',
3785+ 'height': 'height',
3786+ 'steps': 'steps',
3787+ 'cfg': 'scale',
3788+ 'skip': 'clip_skip',
3789+ 'model': 'model',
3790+ 'sampler': 'sampler',
3791+ 'scheduler': 'scheduler',
3792+ 'vae': 'vae',
3793+ 'upscaler': 'hr_upscaler',
3794+ 'scale': 'hr_scale',
3795+ 'hires': 'enable_hr',
3796+ 'denoise': 'denoising_strength',
3797+ '2ndpass': 'hr_second_pass_steps',
3798+ 'faces': 'restore_faces',
3799+ };
3800+
3801+ for (const [param, setting] of Object.entries(settingMap)) {
3802+ if (args[param] === undefined || defaultSettings[setting] === undefined) {
3803+ continue;
3804+ }
3805+ currentSettings[setting] = extension_settings.sd[setting];
3806+ const value = String(args[param]);
3807+ const type = typeof defaultSettings[setting];
3808+ switch (type) {
3809+ case 'boolean':
3810+ overrideSettings[setting] = isTrueBoolean(value) || !isFalseBoolean(value);
3811+ break;
3812+ case 'number':
3813+ overrideSettings[setting] = Number(value);
3814+ break;
3815+ default:
3816+ overrideSettings[setting] = value;
3817+ break;
3818+ }
3819+ }
3820+
3821+ Object.assign(extension_settings.sd, overrideSettings);
3822+ return currentSettings;
3823+}
3824+
37913825jQuery(async () => {
37923826 await addSDGenButtons();
37933827
3828+ const getSelectEnumProvider = (id, text) => () => Array.from(document.querySelectorAll(`#${id} > [value]`)).map(x => new SlashCommandEnumValue(x.getAttribute('value'), text ? x.textContent : null));
3829+
37943830 SlashCommandParser.addCommandObject(SlashCommand.fromProps({
37953831 name: 'imagine',
3796- callback: (args, trigger) => generatePicture(initiators.command, args, String(trigger)),
3832+ returns: 'URL of the generated image, or an empty string if the generation failed',
3833+ callback: async (args, trigger) => {
3834+ const currentSettings = applyCommandArguments(args);
3835+
3836+ try {
3837+ return await generatePicture(initiators.command, args, String(trigger));
3838+ } catch (error) {
3839+ console.error('Failed to generate image:', error);
3840+ return '';
3841+ } finally {
3842+ if (Object.keys(currentSettings).length) {
3843+ Object.assign(extension_settings.sd, currentSettings);
3844+ saveSettingsDebounced();
3845+ }
3846+ }
3847+ },
37973848 aliases: ['sd', 'img', 'image'],
37983849 namedArgumentList: [
37993850 new SlashCommandNamedArgument(
@@ -3803,6 +3854,164 @@ jQuery(async () => {
38033854 name: 'negative',
38043855 description: 'negative prompt prefix',
38053856 typeList: [ARGUMENT_TYPE.STRING],
3857+ isRequired: false,
3858+ acceptsMultiple: false,
3859+ }),
3860+ SlashCommandNamedArgument.fromProps({
3861+ name: 'extend',
3862+ description: 'auto-extend free mode prompts with the LLM',
3863+ typeList: [ARGUMENT_TYPE.BOOLEAN],
3864+ enumProvider: commonEnumProviders.boolean('trueFalse'),
3865+ isRequired: false,
3866+ acceptsMultiple: false,
3867+ }),
3868+ SlashCommandNamedArgument.fromProps({
3869+ name: 'edit',
3870+ description: 'edit the prompt before generation',
3871+ typeList: [ARGUMENT_TYPE.BOOLEAN],
3872+ enumProvider: commonEnumProviders.boolean('trueFalse'),
3873+ isRequired: false,
3874+ acceptsMultiple: false,
3875+ }),
3876+ SlashCommandNamedArgument.fromProps({
3877+ name: 'multimodal',
3878+ description: 'use multimodal captioning (for portraits only)',
3879+ typeList: [ARGUMENT_TYPE.BOOLEAN],
3880+ enumProvider: commonEnumProviders.boolean('trueFalse'),
3881+ isRequired: false,
3882+ acceptsMultiple: false,
3883+ }),
3884+ SlashCommandNamedArgument.fromProps({
3885+ name: 'snap',
3886+ description: 'snap auto-adjusted dimensions to the nearest known resolution (portraits and backgrounds only)',
3887+ typeList: [ARGUMENT_TYPE.BOOLEAN],
3888+ enumProvider: commonEnumProviders.boolean('trueFalse'),
3889+ isRequired: false,
3890+ acceptsMultiple: false,
3891+ }),
3892+ SlashCommandNamedArgument.fromProps({
3893+ name: 'seed',
3894+ description: 'random seed',
3895+ isRequired: false,
3896+ typeList: [ARGUMENT_TYPE.NUMBER],
3897+ acceptsMultiple: false,
3898+ }),
3899+ SlashCommandNamedArgument.fromProps({
3900+ name: 'width',
3901+ description: 'image width',
3902+ isRequired: false,
3903+ typeList: [ARGUMENT_TYPE.NUMBER],
3904+ acceptsMultiple: false,
3905+ }),
3906+ SlashCommandNamedArgument.fromProps({
3907+ name: 'height',
3908+ description: 'image height',
3909+ isRequired: false,
3910+ typeList: [ARGUMENT_TYPE.NUMBER],
3911+ acceptsMultiple: false,
3912+ }),
3913+ SlashCommandNamedArgument.fromProps({
3914+ name: 'steps',
3915+ description: 'number of steps',
3916+ isRequired: false,
3917+ typeList: [ARGUMENT_TYPE.NUMBER],
3918+ acceptsMultiple: false,
3919+ }),
3920+ SlashCommandNamedArgument.fromProps({
3921+ name: 'cfg',
3922+ description: 'CFG scale',
3923+ isRequired: false,
3924+ typeList: [ARGUMENT_TYPE.NUMBER],
3925+ acceptsMultiple: false,
3926+ }),
3927+ SlashCommandNamedArgument.fromProps({
3928+ name: 'skip',
3929+ description: 'CLIP skip layers',
3930+ isRequired: false,
3931+ typeList: [ARGUMENT_TYPE.NUMBER],
3932+ acceptsMultiple: false,
3933+ }),
3934+ SlashCommandNamedArgument.fromProps({
3935+ name: 'model',
3936+ description: 'model override',
3937+ isRequired: false,
3938+ typeList: [ARGUMENT_TYPE.STRING],
3939+ acceptsMultiple: false,
3940+ forceEnum: true,
3941+ enumProvider: getSelectEnumProvider('sd_model', true),
3942+ }),
3943+ SlashCommandNamedArgument.fromProps({
3944+ name: 'sampler',
3945+ description: 'sampler override',
3946+ isRequired: false,
3947+ typeList: [ARGUMENT_TYPE.STRING],
3948+ acceptsMultiple: false,
3949+ forceEnum: true,
3950+ enumProvider: getSelectEnumProvider('sd_sampler', false),
3951+ }),
3952+ SlashCommandNamedArgument.fromProps({
3953+ name: 'scheduler',
3954+ description: 'scheduler override',
3955+ isRequired: false,
3956+ typeList: [ARGUMENT_TYPE.STRING],
3957+ acceptsMultiple: false,
3958+ forceEnum: true,
3959+ enumProvider: getSelectEnumProvider('sd_scheduler', false),
3960+ }),
3961+ SlashCommandNamedArgument.fromProps({
3962+ name: 'vae',
3963+ description: 'VAE name override',
3964+ isRequired: false,
3965+ typeList: [ARGUMENT_TYPE.STRING],
3966+ acceptsMultiple: false,
3967+ forceEnum: true,
3968+ enumProvider: getSelectEnumProvider('sd_vae', false),
3969+ }),
3970+ SlashCommandNamedArgument.fromProps({
3971+ name: 'upscaler',
3972+ description: 'upscaler override',
3973+ isRequired: false,
3974+ typeList: [ARGUMENT_TYPE.STRING],
3975+ acceptsMultiple: false,
3976+ forceEnum: true,
3977+ enumProvider: getSelectEnumProvider('sd_hr_upscaler', false),
3978+ }),
3979+ SlashCommandNamedArgument.fromProps({
3980+ name: 'hires',
3981+ description: 'enable high-res fix',
3982+ isRequired: false,
3983+ typeList: [ARGUMENT_TYPE.BOOLEAN],
3984+ acceptsMultiple: false,
3985+ enumProvider: commonEnumProviders.boolean('trueFalse'),
3986+ }),
3987+ SlashCommandNamedArgument.fromProps({
3988+ name: 'scale',
3989+ description: 'upscale amount',
3990+ isRequired: false,
3991+ typeList: [ARGUMENT_TYPE.NUMBER],
3992+ acceptsMultiple: false,
3993+ }),
3994+ SlashCommandNamedArgument.fromProps({
3995+ name: 'denoise',
3996+ description: 'denoising strength',
3997+ isRequired: false,
3998+ typeList: [ARGUMENT_TYPE.NUMBER],
3999+ acceptsMultiple: false,
4000+ }),
4001+ SlashCommandNamedArgument.fromProps({
4002+ name: '2ndpass',
4003+ description: 'second pass steps',
4004+ isRequired: false,
4005+ typeList: [ARGUMENT_TYPE.NUMBER],
4006+ acceptsMultiple: false,
4007+ }),
4008+ SlashCommandNamedArgument.fromProps({
4009+ name: 'faces',
4010+ description: 'restore faces',
4011+ isRequired: false,
4012+ typeList: [ARGUMENT_TYPE.BOOLEAN],
4013+ acceptsMultiple: false,
4014+ enumProvider: commonEnumProviders.boolean('trueFalse'),
38064015 }),
38074016 ],
38084017 unnamedArgumentList: [
@@ -3824,6 +4033,66 @@ jQuery(async () => {
38244033 }));
38254034
38264035 SlashCommandParser.addCommandObject(SlashCommand.fromProps({
4036+ name: 'imagine-source',
4037+ aliases: ['sd-source', 'img-source'],
4038+ returns: 'a name of the current generation source',
4039+ unnamedArgumentList: [
4040+ SlashCommandArgument.fromProps({
4041+ description: 'source name',
4042+ typeList: [ARGUMENT_TYPE.STRING],
4043+ isRequired: false,
4044+ forceEnum: true,
4045+ enumProvider: getSelectEnumProvider('sd_source', true),
4046+ }),
4047+ ],
4048+ helpString: 'If an argument is provided, change the source of the image generation, e.g. <code>/imagine-source comfy</code>. Returns the current source.',
4049+ callback: async (_args, name) => {
4050+ if (!name) {
4051+ return extension_settings.sd.source;
4052+ }
4053+ const isKnownSource = Object.keys(sources).includes(String(name));
4054+ if (!isKnownSource) {
4055+ throw new Error('The value provided is not a valid image generation source.');
4056+ }
4057+ const option = document.querySelector(`#sd_source [value="${name}"]`);
4058+ if (!(option instanceof HTMLOptionElement)) {
4059+ throw new Error('Could not find the source option in the dropdown.');
4060+ }
4061+ option.selected = true;
4062+ await onSourceChange();
4063+ return extension_settings.sd.source;
4064+ },
4065+ }));
4066+
4067+ SlashCommandParser.addCommandObject(SlashCommand.fromProps({
4068+ name: 'imagine-style',
4069+ aliases: ['sd-style', 'img-style'],
4070+ returns: 'a name of the current style',
4071+ unnamedArgumentList: [
4072+ SlashCommandArgument.fromProps({
4073+ description: 'style name',
4074+ typeList: [ARGUMENT_TYPE.STRING],
4075+ isRequired: false,
4076+ forceEnum: true,
4077+ enumProvider: getSelectEnumProvider('sd_style', false),
4078+ }),
4079+ ],
4080+ helpString: 'If an argument is provided, change the style of the image generation, e.g. <code>/imagine-style MyStyle</code>. Returns the current style.',
4081+ callback: async (_args, name) => {
4082+ if (!name) {
4083+ return extension_settings.sd.style;
4084+ }
4085+ const option = document.querySelector(`#sd_style [value="${name}"]`);
4086+ if (!(option instanceof HTMLOptionElement)) {
4087+ throw new Error('Could not find the style option in the dropdown.');
4088+ }
4089+ option.selected = true;
4090+ onStyleSelect();
4091+ return extension_settings.sd.style;
4092+ },
4093+ }));
4094+
4095+ SlashCommandParser.addCommandObject(SlashCommand.fromProps({
38274096 name: 'imagine-comfy-workflow',
38284097 callback: changeComfyWorkflow,
38294098 aliases: ['icw'],
@@ -3832,7 +4101,7 @@ jQuery(async () => {
38324101 description: 'workflow name',
38334102 typeList: [ARGUMENT_TYPE.STRING],
38344103 isRequired: true,
3835- enumProvider: () => Array.from(document.querySelectorAll('#sd_comfy_workflow > [value]')).map(x => x.getAttribute('value')).map(workflow => new SlashCommandEnumValue(workflow)),
4104+ enumProvider: getSelectEnumProvider('sd_comfy_workflow', false),
38364105 }),
38374106 ],
38384107 helpString: '(workflowName) - change the workflow to be used for image generation with ComfyUI, e.g. <pre><code>/imagine-comfy-workflow MyWorkflow</code></pre>',
@@ -3874,7 +4143,6 @@ jQuery(async () => {
38744143 $('#sd_hr_scale').on('input', onHrScaleInput);
38754144 $('#sd_denoising_strength').on('input', onDenoisingStrengthInput);
38764145 $('#sd_hr_second_pass_steps').on('input', onHrSecondPassStepsInput);
3877- $('#sd_novel_upscale_ratio').on('input', onNovelUpscaleRatioInput);
38784146 $('#sd_novel_anlas_guard').on('input', onNovelAnlasGuardInput);
38794147 $('#sd_novel_view_anlas').on('click', onViewAnlasClick);
38804148 $('#sd_novel_sm').on('input', onNovelSmInput);
@@ -3887,7 +4155,6 @@ jQuery(async () => {
38874155 $('#sd_comfy_open_workflow_editor').on('click', onComfyOpenWorkflowEditorClick);
38884156 $('#sd_comfy_new_workflow').on('click', onComfyNewWorkflowClick);
38894157 $('#sd_comfy_delete_workflow').on('click', onComfyDeleteWorkflowClick);
3890- $('#sd_expand').on('input', onExpandInput);
38914158 $('#sd_style').on('change', onStyleSelect);
38924159 $('#sd_save_style').on('click', onSaveStyleClick);
38934160 $('#sd_delete_style').on('click', onDeleteStyleClick);
public/scripts/extensions/stable-diffusion/settings.html+1 -14
@@ -27,11 +27,6 @@
2727 <span data-i18n="sd_free_extend_txt">Extend free mode prompts</span>
2828 <small data-i18n="sd_free_extend_small">(interactive/commands)</small>
2929 </label>
30- <label for="sd_expand" class="checkbox_label" data-i18n="[title]sd_expand" title="Automatically extend prompts using text generation model">
31- <input id="sd_expand" type="checkbox" />
32- <span data-i18n="sd_expand_txt">Auto-extend prompts</span>
33- <span class="right_menu_button fa-solid fa-triangle-exclamation" data-i18n="[title]sd_expand_warning" title="May produce unexpected results. Manual prompt editing is recommended."></span>
34- </label>
3530 <label for="sd_snap" class="checkbox_label" data-i18n="[title]sd_snap" title="Snap generation requests with a forced aspect ratio (portraits, backgrounds) to the nearest known resolution, while trying to preserve the absolute pixel counts (recommended for SDXL).">
3631 <input id="sd_snap" type="checkbox" />
3732 <span data-i18n="sd_snap_txt">Snap auto-adjusted resolutions</span>
@@ -308,7 +303,7 @@
308303 </div>
309304
310305 <div class="flex-container">
311306 <div class="alignitemscenter flex-container flexFlowColumn flexGrow flexShrink gap0 flexBasis48p" data-sd-source="auto,vlad,drawthings,novel">
312307 <small>
313308 <span data-i18n="Upscale by">Upscale by</span>
314309 </small>
@@ -332,14 +327,6 @@
332327 <input class="neo-range-input" type="number" id="sd_hr_second_pass_steps_value" data-for="sd_hr_second_pass_steps" max="{{hr_second_pass_steps_max}}" step="{{hr_second_pass_steps_step}}" value="{{hr_second_pass_steps}}" >
333328 </div>
334329
335- <div class="alignitemscenter flex-container flexFlowColumn flexGrow flexShrink gap0 flexBasis48p" data-sd-source="novel">
336- <small>
337- <span data-i18n="Upscale by">Upscale by</span>
338- </small>
339- <input class="neo-range-slider" type="range" id="sd_novel_upscale_ratio" name="sd_novel_upscale_ratio" min="{{novel_upscale_ratio_min}}" max="{{novel_upscale_ratio_max}}" step="{{novel_upscale_ratio_step}}" value="{{novel_upscale_ratio}}" >
340- <input class="neo-range-input" type="number" id="sd_novel_upscale_ratio_value" data-for="sd_novel_upscale_ratio" min="{{novel_upscale_ratio_min}}" max="{{novel_upscale_ratio_max}}" step="{{novel_upscale_ratio_step}}" value="{{novel_upscale_ratio}}" >
341- </div>
342-
343330 <div class="alignitemscenter flex-container flexFlowColumn flexGrow flexShrink gap0 flexBasis48p" data-sd-source="auto,vlad,comfy,horde,drawthings,extras">
344331 <small>
345332 <span data-i18n="CLIP Skip">CLIP Skip</span>
public/scripts/instruct-mode.js+4 -0
@@ -384,6 +384,10 @@ export function formatInstructModeChat(name, mes, isUser, isNarrator, forceAvata
384384 * @returns {string} Formatted instruct mode system prompt.
385385 */
386386export function formatInstructModeSystemPrompt(systemPrompt) {
387+ if (!systemPrompt) {
388+ return '';
389+ }
390+
387391 const separator = power_user.instruct.wrap ? '\n' : '';
388392
389393 if (power_user.instruct.system_sequence_prefix) {
public/scripts/slash-commands.js+1 -1
@@ -3090,7 +3090,7 @@ async function continueChatCallback(args, prompt) {
30903090 resolve();
30913091 } catch (error) {
30923092 console.error('Error running /continue command:', error);
30933093 reject(error);
30943094 }
30953095 });
30963096
src/endpoints/stable-diffusion.js+0 -69
@@ -10,41 +10,6 @@ const { readSecret, SECRET_KEYS } = require('./secrets.js');
1010const FormData = require('form-data');
1111
1212/**
13- * Sanitizes a string.
14- * @param {string} x String to sanitize
15- * @returns {string} Sanitized string
16- */
17-function safeStr(x) {
18- x = String(x);
19- x = x.replace(/ +/g, ' ');
20- x = x.trim();
21- x = x.replace(/^[\s,.]+|[\s,.]+$/g, '');
22- return x;
23-}
24-
25-const splitStrings = [
26- ', extremely',
27- ', intricate,',
28-];
29-
30-const dangerousPatterns = '[]【】()（）|:：';
31-
32-/**
33- * Removes patterns from a string.
34- * @param {string} x String to sanitize
35- * @param {string} pattern Pattern to remove
36- * @returns {string} Sanitized string
37- */
38-function removePattern(x, pattern) {
39- for (let i = 0; i < pattern.length; i++) {
40- let p = pattern[i];
41- let regex = new RegExp('\\' + p, 'g');
42- x = x.replace(regex, '');
43- }
44- return x;
45-}
46-
47-/**
4813 * Gets the comfy workflows.
4914 * @param {import('../users.js').UserDirectoryList} directories
5015 * @returns {string[]} List of comfy workflows
@@ -391,40 +356,6 @@ router.post('/sd-next/upscalers', jsonParser, async (request, response) => {
391356 }
392357});
393358
394-/**
395- * SD prompt expansion using GPT-2 text generation model.
396- * Adapted from: https://github.com/lllyasviel/Fooocus/blob/main/modules/expansion.py
397- */
398-router.post('/expand', jsonParser, async (request, response) => {
399- const originalPrompt = request.body.prompt;
400-
401- if (!originalPrompt) {
402- console.warn('No prompt provided for SD expansion.');
403- return response.send({ prompt: '' });
404- }
405-
406- console.log('Refine prompt input:', originalPrompt);
407- const splitString = splitStrings[Math.floor(Math.random() * splitStrings.length)];
408- let prompt = safeStr(originalPrompt) + splitString;
409-
410- try {
411- const task = 'text-generation';
412- const module = await import('../transformers.mjs');
413- const pipe = await module.default.getPipeline(task);
414-
415- const result = await pipe(prompt, { num_beams: 1, max_new_tokens: 256, do_sample: true });
416-
417- const newText = result[0].generated_text;
418- const newPrompt = safeStr(removePattern(newText, dangerousPatterns));
419- console.log('Refine prompt output:', newPrompt);
420-
421- return response.send({ prompt: newPrompt });
422- } catch {
423- console.warn('Failed to load transformers.js pipeline.');
424- return response.send({ prompt: originalPrompt });
425- }
426-});
427-
428359const comfy = express.Router();
429360
430361comfy.post('/ping', jsonParser, async (request, response) => {
src/transformers.mjs+0 -6
@@ -31,12 +31,6 @@ const tasks = {
3131 configField: 'extras.embeddingModel',
3232 quantized: true,
3333 },
34- 'text-generation': {
35- defaultModel: 'Cohee/fooocus_expansion-onnx',
36- pipeline: null,
37- configField: 'extras.promptExpansionModel',
38- quantized: false,
39- },
4034 'automatic-speech-recognition': {
4135 defaultModel: 'Xenova/whisper-small',
4236 pipeline: null,