f6d0f758 · permissionBRICK/SillyTavern

 import { Popper } from '../../../lib.js';
 import {
-    saveSettingsDebounced,
+    animation_duration,
-    systemUserName,
+    appendMediaToMessage,
-    getRequestHeaders,
     event_types,
     eventSource,
+    formatCharacterAvatar,
     generateQuietPrompt,
-    this_chid,
+    getCharacterAvatar,
     getCurrentChatId,
-    animation_duration,
+    getRequestHeaders,
-    appendMediaToMessage,
     getUserAvatar,
-    user_avatar,
+    saveSettingsDebounced,
-    getCharacterAvatar,
-    formatCharacterAvatar,
     substituteParams,
     substituteParamsExtended,
+    systemUserName,
+    this_chid,
+    user_avatar,
 } from '../../../script.js';
-import { getApiUrl, getContext, extension_settings, doExtrasFetch, modules, renderExtensionTemplateAsync, writeExtensionField } from '../../extensions.js';
+import {
+    doExtrasFetch,
+    extension_settings,
+    getApiUrl,
+    getContext,
+    modules,
+    renderExtensionTemplateAsync,
+    writeExtensionField,
+} from '../../extensions.js';
 import { selected_group } from '../../group-chats.js';
-import { stringFormat, initScrollHeight, resetScrollHeight, getCharaFilename, saveBase64AsFile, getBase64Async, delay, isTrueBoolean, debounce, isFalseBoolean, deepMerge } from '../../utils.js';
+import {
+    debounce,
+    deepMerge,
+    delay,
+    getBase64Async,
+    getCharaFilename,
+    initScrollHeight,
+    isFalseBoolean,
+    isTrueBoolean,
+    resetScrollHeight,
+    saveBase64AsFile,
+    stringFormat,
+} from '../../utils.js';
 import { getMessageTimeStamp, humanizedDateTime } from '../../RossAscends-mods.js';
 import { SECRET_KEYS, secret_state, writeSecret } from '../../secrets.js';
-import { getNovelUnlimitedImageGeneration, getNovelAnlas, loadNovelSubscriptionData } from '../../nai-settings.js';
+import { getNovelAnlas, getNovelUnlimitedImageGeneration, loadNovelSubscriptionData } from '../../nai-settings.js';
 import { getMultimodalCaption } from '../shared.js';
 import { SlashCommandParser } from '../../slash-commands/SlashCommandParser.js';
 import { SlashCommand } from '../../slash-commands/SlashCommand.js';
-import { ARGUMENT_TYPE, SlashCommandArgument, SlashCommandNamedArgument } from '../../slash-commands/SlashCommandArgument.js';
+import {
+    ARGUMENT_TYPE,
+    SlashCommandArgument,
+    SlashCommandNamedArgument,
+} from '../../slash-commands/SlashCommandArgument.js';
 import { debounce_timeout } from '../../constants.js';
 import { SlashCommandEnumValue } from '../../slash-commands/SlashCommandEnumValue.js';
-import { POPUP_RESULT, POPUP_TYPE, Popup, callGenericPopup } from '../../popup.js';
+import { callGenericPopup, Popup, POPUP_RESULT, POPUP_TYPE } from '../../popup.js';
 import { commonEnumProviders } from '../../slash-commands/SlashCommandCommonEnumsProvider.js';
 import { ToolManager } from '../../tool-calling.js';
 export { MODULE_NAME };
 const MODULE_NAME = 'sd';

 };
 const messageTrigger = {
-    activationRegex: /\b(send|mail|imagine|generate|make|create|draw|paint|render|show)\b.{0,10}\b(pic|picture|image|drawing|painting|photo|photograph)\b(?:\s+of)?(?:\s+(?:a|an|the|this|that|those|your)?)?(.+)/i,
+    activationRegex: /\b(send|mail|imagine|generate|make|create|draw|paint|render|show)\b.{0,10}\b(pic|picture|image|drawing|painting|photo|photograph)\b(?:\s+of)?(?:\s+(?:a|an|the|this|that|those|your)?\s+)?(.+)/i,
     specialCases: {
         [generationMode.CHARACTER]: ['you', 'yourself'],
         [generationMode.USER]: ['me', 'myself'],
         [generationMode.SCENARIO]: ['story', 'scenario', 'whole story'],
         [generationMode.NOW]: ['last message'],
-        [generationMode.FACE]: ['your face', 'your portrait', 'your selfie'],
+        [generationMode.FACE]: ['face', 'portrait', 'selfie'],
         [generationMode.BACKGROUND]: ['background', 'scene background', 'scene', 'scenery', 'surroundings', 'environment'],
     },
 };

             return;
+        }
-        console.log(`SD: Triggered by "${message}", detected subject: ${subject}"`);
+        console.log(`SD: Triggered by "${message}", detected subject: "${subject}"`);
         outer: for (const [specialMode, triggers] of Object.entries(messageTrigger.specialCases)) {
             for (const trigger of triggers) {

@@ -359,7 +384,6 @@ function processTriggers(chat, _, abort) {
359	setTimeout(() => generatePicture(initiators.interactive, {}, subject, message), 1);	384	setTimeout(() => generatePicture(initiators.interactive, {}, subject, message), 1);
360	} catch {	385	} catch {
361	console.log('SD: Failed to process triggers.');	386	console.log('SD: Failed to process triggers.');
362	return;
363	}	387	}
364	}	388	}
365		389

     return prompt;
+}
-function onChatChanged() {
+async function onChatChanged() {
     if (this_chid === undefined || selected_group) {
         $('#sd_character_prompt_block').hide();
         return;

     $('#sd_character_prompt').val(characterPrompt);
     $('#sd_character_negative_prompt').val(negativePrompt);
     $('#sd_character_prompt_share').prop('checked', hasSharedData);
-    adjustElementScrollHeight();
+    await adjustElementScrollHeight();
+}
 async function adjustElementScrollHeight() {

             throw new Error('SD WebUI returned an error.');
+        }
-        const data = await result.text();
+        return await result.text();
-        return data;
     } catch (error) {
         console.error(error);
         return null;

             throw new Error('SD DrawThings API returned an error.');
+        }
-        const data = await result.text();
+        return await result.text();
-        return data;
     } catch (error) {
         console.error(error);
         return null;

             throw new Error('SD WebUI returned an error.');
+        }
-        const data = await result.json();
+        return await result.json();
-        return data;
     } catch (error) {
         console.error(error);
         return [extension_settings.sd.hr_upscaler];

             throw new Error('SD WebUI returned an error.');
+        }
-        const data = await result.json();
+        return await result.json();
-        return data;
     } catch (error) {
         console.error(error);
         return ['N/A'];

             throw new Error('SD.Next returned an error.');
+        }
-        const data = await result.json();
+        return await result.json();
-        return data;
     } catch (error) {
         console.error(error);
         return [extension_settings.sd.hr_upscaler];

     });
     if (result.ok) {
-        const data = await result.json();
+        return await result.json();
-        return data;
+    }
     return [];

@@ -1544,8 +1561,7 @@ async function loadAutoSamplers() {
1544	throw new Error('SD WebUI returned an error.');	1561	throw new Error('SD WebUI returned an error.');
1545	}	1562	}
1546		1563
1547	const data = await result.json();	1564	return await result.json();
1548	return data;
1549	} catch (error) {	1565	} catch (error) {
1550	return [];	1566	return [];
1551	}	1567	}

@@ -1583,8 +1599,7 @@ async function loadVladSamplers() {
1583	throw new Error('SD.Next returned an error.');	1599	throw new Error('SD.Next returned an error.');
1584	}	1600	}
1585		1601
1586	const data = await result.json();	1602	return await result.json();
1587	return data;
1588	} catch (error) {	1603	} catch (error) {
1589	return [];	1604	return [];
1590	}	1605	}

     });
     if (result.ok) {
-        const data = await result.json();
+        return await result.json();
-        return data;
+    }
     return [];

     });
     if (result.ok) {
-        const data = await result.json();
+        return await result.json();
-        return data;
+    }
     return [];

     });
     if (result.ok) {
-        const data = await result.json();
+        return await result.json();
-        return data;
+    }
     return [];

     if (result.ok) {
         const data = await result.json();
         data.sort((a, b) => b.count - a.count);
-        const models = data.map(x => ({ value: x.name, text: `${x.name} (ETA: ${x.eta}s, Queue: ${x.queued}, Workers: ${x.count})` }));
+        return data.map(x => ({
-        return models;
+            value: x.name,
+            text: `${x.name} (ETA: ${x.eta}s, Queue: ${x.queued}, Workers: ${x.count})`,
+        }));
+    }
     return [];

     if (getModelsResult.ok) {
         const data = await getModelsResult.json();
-        const view_models = data.models.map(x => ({ value: x, text: x }));
+        return data.models.map(x => ({ value: x, text: x }));
-        return view_models;
+    }
     return [];

@@ -1867,8 +1880,7 @@ async function loadAutoModels() {
1867	}	1880	}
1868	}	1881	}
1869		1882
1870	const data = await result.json();	1883	return await result.json();
1871	return data;
1872	} catch (error) {	1884	} catch (error) {
1873	return [];	1885	return [];
1874	}	1886	}

@@ -1953,8 +1965,7 @@ async function loadVladModels() {
1953	}	1965	}
1954	}	1966	}
1955		1967
1956	const data = await result.json();	1968	return await result.json();
1957	return data;
1958	} catch (error) {	1969	} catch (error) {
1959	return [];	1970	return [];
1960	}	1971	}

@@ -2242,7 +2253,7 @@ async function loadComfyWorkflows() {
2242	$('#sd_comfy_workflow').append(option);	2253	$('#sd_comfy_workflow').append(option);
2243	}	2254	}
2244	} catch (error) {	2255	} catch (error) {
2245	return;	2256	console.error(`Could not load ComfyUI workflows: ${error.message}`);
2246	}	2257	}
2247	}	2258	}
2248		2259

  * @param {string} trigger Subject trigger word
  * @param {string} [message] Chat message
  * @param {function} [callback] Callback function
- * @returns {Promise<string>} Image path
+ * @returns {Promise<string|undefined>} Image path
  */
 async function generatePicture(initiator, args, trigger, message, callback) {
     if (!trigger || trigger.trim().length === 0) {

     trigger = trigger.trim();
     const generationType = getGenerationType(trigger);
-    console.log('Generation mode', generationType, 'triggered with', trigger);
+    const generationTypeKey = Object.keys(generationMode).find(key => generationMode[key] === generationType);
+    console.log(`Generation mode ${generationTypeKey} triggered with "${trigger}"`);
     const quietPrompt = getQuietPrompt(generationType, trigger);
     const context = getContext();

         ? context.groups[Object.keys(context.groups).filter(x => context.groups[x].id === context.groupId)[0]]?.id?.toString()
         : context.characters[context.characterId]?.name;
-    if (generationType == generationMode.BACKGROUND) {
+    if (generationType === generationMode.BACKGROUND) {
         const callbackOriginal = callback;
         callback = async function (prompt, imagePath, generationType, _negativePromptPrefix, _initiator, prefixedPrompt) {
             const imgUrl = `url("${encodeURI(imagePath)}")`;
-            eventSource.emit(event_types.FORCE_SET_BACKGROUND, { url: imgUrl, path: imagePath });
+            await eventSource.emit(event_types.FORCE_SET_BACKGROUND, { url: imgUrl, path: imagePath });
             if (typeof callbackOriginal === 'function') {
                 await callbackOriginal(prompt, imagePath, generationType, negativePromptPrefix, initiator, prefixedPrompt);

     const aspectRatio = extension_settings.sd.width / extension_settings.sd.height;
     // Face images are always portrait (pun intended)
-    if ((generationType == generationMode.FACE || generationType == generationMode.FACE_MULTIMODAL) && aspectRatio >= 1) {
+    if ((generationType === generationMode.FACE || generationType === generationMode.FACE_MULTIMODAL) && aspectRatio >= 1) {
         // Round to nearest multiple of 64
         extension_settings.sd.height = Math.round(extension_settings.sd.width * 1.5 / 64) * 64;
+    }
-    if (generationType == generationMode.BACKGROUND) {
+    if (generationType === generationMode.BACKGROUND) {
         // Background images are always landscape
         if (aspectRatio <= 1) {
             // Round to nearest multiple of 64

  */
 function generateFreeModePrompt(trigger, combineNegatives) {
     return trigger
-        .replace(/(?:^char(\s|,)|\{\{charPrefix\}\})/gi, (_, suffix) => {
+        .replace(/^char(\s|,)|{{charPrefix}}/gi, (_, suffix) => {
             const getLastCharacterKey = () => {
                 if (typeof this_chid !== 'undefined') {
                     return getCharaFilename(this_chid);

@@ -2545,9 +2558,7 @@ function generateFreeModePrompt(trigger, combineNegatives) {
2545	const context = getContext();	2558	const context = getContext();
2546	for (let i = context.chat.length - 1; i >= 0; i--) {	2559	for (let i = context.chat.length - 1; i >= 0; i--) {
2547	const message = context.chat[i];	2560	const message = context.chat[i];
2548	if (message.is_user \|\| message.is_system) {	2561	if (!message.is_user && !message.is_system && typeof message.original_avatar === 'string') {
2549	continue;
2550	} else if (typeof message.original_avatar === 'string') {
2551	return message.original_avatar.replace(/\.[^/.]+$/, '');	2562	return message.original_avatar.replace(/\.[^/.]+$/, '');
2552	}	2563	}
2553	}	2564	}

@@ -2570,11 +2581,11 @@ function generateFreeModePrompt(trigger, combineNegatives) {
2570	async function generateMultimodalPrompt(generationType, quietPrompt) {	2581	async function generateMultimodalPrompt(generationType, quietPrompt) {
2571	let avatarUrl;	2582	let avatarUrl;
2572		2583
2573	if (generationType == generationMode.USER_MULTIMODAL) {	2584	if (generationType === generationMode.USER_MULTIMODAL) {
2574	avatarUrl = getUserAvatarUrl();	2585	avatarUrl = getUserAvatarUrl();
2575	}	2586	}
2576		2587
2577	if (generationType == generationMode.CHARACTER_MULTIMODAL \|\| generationType === generationMode.FACE_MULTIMODAL) {	2588	if (generationType === generationMode.CHARACTER_MULTIMODAL \|\| generationType === generationMode.FACE_MULTIMODAL) {
2578	avatarUrl = getCharacterAvatarUrl();	2589	avatarUrl = getCharacterAvatarUrl();
2579	}	2590	}
2580		2591

         const ratio = Math.sqrt(MAX_PIXELS / (width * height));
         // Calculate new width and height while maintaining aspect ratio.
-        var newWidth = Math.round(width * ratio);
+        let newWidth = Math.round(width * ratio);
-        var newHeight = Math.round(height * ratio);
+        let newHeight = Math.round(height * ratio);
         // Ensure new dimensions are multiples of 64. If not, reduce accordingly.
         if (newWidth % 64 !== 0) {

     const popupResult = popup.show();
     const checkPlaceholders = () => {
         workflow = $('#sd_comfy_workflow_editor_workflow').val().toString();
-        $('.sd_comfy_workflow_editor_placeholder_list > li[data-placeholder]').each(function (idx) {
+        $('.sd_comfy_workflow_editor_placeholder_list > li[data-placeholder]').each(function () {
             const key = this.getAttribute('data-placeholder');
-            const found = workflow.search(`"%${key}%"`) != -1;
+            const found = workflow.search(`"%${key}%"`) !== -1;
             this.classList[found ? 'remove' : 'add']('sd_comfy_workflow_editor_not_found');
         });
     };

         swipes.push(image);
         // If already contains an image and it's not inline - leave it as is
-        message.extra.inline_image = message.extra.image && !message.extra.inline_image ? false : true;
+        message.extra.inline_image = !(message.extra.image && !message.extra.inline_image);
         message.extra.image = image;
         message.extra.title = prompt;
         message.extra.generationType = generationType;

Merge pull request #3102 from ceruleandeep/fix/sdInteractiveYour Fix "send a photo of yourself" etc in SD interactive mode