shaw/SillyTavern
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

add macro support for image caption extension prompt (multimodal) (#5527)

Browse Source 
* 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
This commit is contained in:
feg
2026-04-25 10:14:45 -07:00
committed by GitHub
parent 29e3136473
commit 0a493cad89
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/scripts/extensions/caption/index.js
+4 -2
View File
@@ -1,6 +1,6 @@
import { ensureImageFormatSupported, getBase64Async, getFileExtension, isTrueBoolean, saveBase64AsFile } from '../../utils.js'; import { ensureImageFormatSupported, getBase64Async, getFileExtension, isTrueBoolean, saveBase64AsFile } from '../../utils.js';
import { getContext, getApiUrl, doExtrasFetch, extension_settings, modules, renderExtensionTemplateAsync } from '../../extensions.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 { getMessageTimeStamp } from '../../RossAscends-mods.js';
import { SECRET_KEYS, secret_state } from '../../secrets.js'; import { SECRET_KEYS, secret_state } from '../../secrets.js';
import { oai_settings } from '../../openai.js'; import { oai_settings } from '../../openai.js';
@@ -100,7 +100,7 @@ async function wrapCaptionTemplate(caption) {
template += ' {{caption}}'; template += ' {{caption}}';
} }
let messageText = substituteParamsExtended(template, { caption: caption }); let messageText = substituteParams(template, { dynamicMacros: { caption: caption } });
if (extension_settings.caption.refine_mode) { if (extension_settings.caption.refine_mode) {
messageText = await Popup.show.input( messageText = await Popup.show.input(
@@ -322,6 +322,8 @@ async function captionMultimodal(base64Img, externalPrompt) {
prompt = String(customPrompt).trim(); prompt = String(customPrompt).trim();
} }
prompt = substituteParams(prompt);
const caption = await getMultimodalCaption(base64Img, prompt); const caption = await getMultimodalCaption(base64Img, prompt);
return { caption }; return { caption };
} }