add macro support for image caption extension prompt (multimodal) (#5527) * added macro processing to caption ext added `prompt = substituteParamsExtended(prompt);` to the captionmultimodal function (so it can use macros and stuff) * caption ext updated from old substituteparams * removed comment

0a493cad89969edfadb4c9a174eb0c58045675f1

feg <58643807+f-eg@users.noreply.github.com>

Signed

public/scripts/extensions/caption/index.js+4 -2 Viewed

 import { ensureImageFormatSupported, getBase64Async, getFileExtension, isTrueBoolean, saveBase64AsFile } from '../../utils.js';
 import { getContext, getApiUrl, doExtrasFetch, extension_settings, modules, renderExtensionTemplateAsync } from '../../extensions.js';
-import { appendMediaToMessage, chat_metadata, eventSource, event_types, getRequestHeaders, saveChatConditional, saveSettingsDebounced, substituteParamsExtended } from '../../../script.js';
+import { appendMediaToMessage, chat_metadata, eventSource, event_types, getRequestHeaders, saveChatConditional, saveSettingsDebounced, substituteParams } from '../../../script.js';
 import { getMessageTimeStamp } from '../../RossAscends-mods.js';
 import { SECRET_KEYS, secret_state } from '../../secrets.js';
 import { oai_settings } from '../../openai.js';

         template += ' {{caption}}';
+    }
-    let messageText = substituteParamsExtended(template, { caption: caption });
+    let messageText = substituteParams(template, { dynamicMacros: { caption: caption } });
     if (extension_settings.caption.refine_mode) {
         messageText = await Popup.show.input(

@@ -322,6 +322,8 @@ async function captionMultimodal(base64Img, externalPrompt) {
322	prompt = String(customPrompt).trim();	322	prompt = String(customPrompt).trim();
323	}	323	}
324		324
		325	prompt = substituteParams(prompt);
		326
325	const caption = await getMultimodalCaption(base64Img, prompt);	327	const caption = await getMultimodalCaption(base64Img, prompt);
326	return { caption };	328	return { caption };
327	}	329	}