Stable Diffusion: fix image-prompt profile being ignored (exclude from presets; generate under the chosen profile with full context)

fec2f49e9803e457282f43757f59fac971229bea

permissionBRICK <permissionBRICK@gmail.com>

Parents: 0320ffda52ab4b428632179444577f043defcc1f

public/scripts/extensions/stable-diffusion/index.js+77 -15 Viewed

     'settings_preset_primary',
     'settings_preset_secondary',
     'settings_fallback_enabled',
 +    // The image-prompt LLM profile is independent of the image backend, so it must
 +    // never be captured/swapped by image-generation presets or the fallback retry.
 +    'prompt_generation_profile',
     'prompts',
     'character_prompts',
     'character_negative_prompts',

@@ -421,6 +424,11 @@ function applySdSettingsSnapshot(snapshot) {
421	424	return;
422	425	}
423	426	for (const key of Object.keys(snapshot)) {
	427	+ // Skip excluded keys so older presets that were saved before a key was
	428	+ // excluded (e.g. prompt_generation_profile) can't clobber it on load.
	429	+ if (PRESET_EXCLUDE_KEYS.includes(key)) {
	430	+ continue;
	431	+ }
424	432	extension_settings.sd[key] = structuredClone(snapshot[key]);
425	433	}
426	434	}

+}
 let promptGenerationProfileDropdownInitialized = false;
 +// Warn at most once per session if a prompt-gen profile is selected but cannot be
 +// applied because there is no active connection profile to restore afterward.
 +let promptProfileWarnedNoBaseProfile = false;
 /**
  * Populates the dedicated prompt-generation connection profile dropdown.

  */
 async function generatePrompt(quietPrompt) {
     const toast = toastr.info('Generating image prompt with an LLM...', 'Image Generation');
 -    let reply;
     const profileId = extension_settings.sd.prompt_generation_profile;
 +    let reply;
     if (profileId)try {
 -        try {
 +        reply = profileId
 -            // Use the chosen Connection Manager profile (non-streaming) regardless of the active model.
 +            ? await withConnectionProfile(profileId, () => generateQuietPrompt({ quietPrompt }))
 -            // 1024 tokens is a sensible default cap for an image-prompt description.
 +            : await generateQuietPrompt({ quietPrompt });
 -            const data = await ConnectionManagerRequestService.sendRequest(profileId, quietPrompt, 1024);
 +    } finally {
 -            // Non-streaming requests resolve to ExtractedData ({ content, reasoning }); extract the plain text.
 +        toastr.clear(toast);
 -            reply = typeof data === 'object' && data !== null ? String(data.content ?? '') : '';
 -        } catch (err) {
 -            console.warn('SD: prompt-generation profile failed, falling back to active model', err);
 -            reply = await generateQuietPrompt({ quietPrompt });
 -        }
 -    } else {
 -        reply = await generateQuietPrompt({ quietPrompt });
+    }
     const processedReply = processReply(reply);
 -    toastr.clear(toast);
     if (!processedReply) {
         toastr.error('Prompt generation produced no text. Make sure you\'re using a valid instruct template and try again', 'Image Generation');

+}
 /**
 + * Runs a callback with a specific Connection Manager profile temporarily active,
 + * then restores the previously active profile. This lets the image prompt be
 + * generated by the chosen LLM *with the full chat context* (via generateQuietPrompt),
 + * instead of a context-free one-off request.
 + *
 + * The switch is only performed when a real connection profile is currently active
 + * (so it can be reliably restored). When no profile is active — i.e. the user drives
 + * the API panel manually — switching to a profile could not be undone without
 + * clobbering those manual settings, so we leave the active model in place and warn once.
 + *
 + * @param {string} targetProfileId Profile to activate for the duration of the callback.
 + * @param {() => Promise<any>} callback Work to run while the target profile is active.
 + * @returns {Promise<any>} The callback's result.
 + */
 +async function withConnectionProfile(targetProfileId, callback) {
 +    const select = /** @type {HTMLSelectElement} */ (document.getElementById('connection_profiles'));
 +    const connectionManager = extension_settings.connectionManager;
 +    const currentProfileId = connectionManager?.selectedProfile;
++
 +    const canSwitch = !!select
 +        && !!connectionManager
 +        && Array.isArray(connectionManager.profiles)
 +        && connectionManager.profiles.some(p => p.id === targetProfileId)
 +        && Array.from(select.options).some(o => o.value === targetProfileId)
 +        && !!currentProfileId // a real profile is active, so it can be restored afterwards
 +        && currentProfileId !== targetProfileId;
++
 +    if (!canSwitch) {
 +        // Selected but no base profile to restore from -> use the active model and warn once.
 +        if (targetProfileId && !currentProfileId && !promptProfileWarnedNoBaseProfile) {
 +            promptProfileWarnedNoBaseProfile = true;
 +            toastr.info('The image-prompt LLM profile is only applied while a connection profile is active (so the original can be restored). Using the current model.', 'Image Generation');
 +        }
 +        return await callback();
 +    }
++
 +    const switchToProfile = async (profileId) => {
 +        const loaded = new Promise(resolve => eventSource.once(event_types.CONNECTION_PROFILE_LOADED, resolve));
 +        const timeout = new Promise(resolve => setTimeout(resolve, 10000));
 +        const index = Array.from(select.options).findIndex(o => o.value === profileId);
 +        select.selectedIndex = index >= 0 ? index : 0;
 +        select.dispatchEvent(new Event('change'));
 +        // Don't hang the image generation if the event never fires.
 +        await Promise.race([loaded, timeout]);
 +    };
++
 +    await switchToProfile(targetProfileId);
 +    try {
 +        return await callback();
 +    } finally {
 +        try {
 +            await switchToProfile(currentProfileId);
 +        } catch (err) {
 +            console.error('SD: failed to restore the previous connection profile after image-prompt generation', err);
 +        }
 +    }
 +}
++
 +/**
  * Sends a request to image generation endpoint and processes the result.
  * @param {number} generationType Type of image generation
  * @param {string} prompt Prompt to be used for image generation