libre-webui 0.15.1 → 0.16.0

package/backend/dist/services/pluginEmbeddingService.js

@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 import axios from 'axios';
-import { validatePluginModel } from '../utils/pluginValidation.js';
+import { assertSafePluginEndpoint, applyModelEndpointTemplate, resolvePluginOperationEndpoint, validatePluginModel, } from '../utils/pluginValidation.js';
 export class PluginEmbeddingService {
     constructor(deps) {
         this.deps = deps;
     }
     getPluginForEmbedding(model, pluginId, userId) {
-        const allPlugins = this.deps.getAllPlugins();
+        const allPlugins = this.deps.getAllPlugins(userId);
         for (const plugin of allPlugins) {
             if (pluginId && plugin.id !== pluginId) {
                 continue;
@@ -46,7 +46,7 @@ export class PluginEmbeddingService {
     }
     getAvailableEmbeddingModels(userId) {
         const models = [];
-        const allPlugins = this.deps.getAllPlugins();
+        const allPlugins = this.deps.getAllPlugins(userId);
         for (const plugin of allPlugins) {
             const embeddingCapability = this.getEmbeddingCapability(plugin);
             const noAuthRequired = embeddingCapability?.config
@@ -87,15 +87,28 @@ export class PluginEmbeddingService {
         const embeddingCapability = this.getEmbeddingCapability(plugin);
         const noAuthRequired = embeddingCapability?.config
             ?.no_auth_required === true;
+        const pluginVars = this.deps.getPluginVariables(plugin, userId);
+        const endpointVariable = embeddingCapability?.config?.endpoint_variable ||
+            (embeddingCapability && plugin.type !== 'embedding'
+                ? 'embedding_endpoint'
+                : 'endpoint');
+        const endpointOverride = pluginVars[endpointVariable];
+        let effectiveEndpoint = embeddingCapability?.endpoint || plugin.endpoint;
+        if (endpointVariable === 'endpoint') {
+            effectiveEndpoint = resolvePluginOperationEndpoint(effectiveEndpoint, pluginVars);
+        }
+        else if (typeof endpointOverride === 'string' &&
+            endpointOverride.trim().length > 0) {
+            effectiveEndpoint = this.deps.validateEndpointUrl(endpointOverride.trim());
+        }
+        const processedEndpoint = plugin.id === 'huggingface'
+            ? applyModelEndpointTemplate(effectiveEndpoint, model)
+            : getEmbeddingEndpoint(effectiveEndpoint);
+        assertSafePluginEndpoint(processedEndpoint, 'embedding endpoint');
         const apiKey = this.deps.getApiKey(plugin, userId);
         if (!apiKey && !noAuthRequired) {
-            throw new Error(`API key not found for plugin ${plugin.id} (set via Settings or ${plugin.auth.key_env} env var)`);
+            throw new Error(`API key not found for plugin ${plugin.id} (save a provider credential in Settings)`);
         }
-        const pluginVars = this.deps.getPluginVariables(plugin, userId);
-        const endpointOverride = pluginVars.endpoint;
-        const effectiveEndpoint = (endpointOverride && this.deps.validateEndpointUrl(endpointOverride)) ||
-            embeddingCapability?.endpoint ||
-            plugin.endpoint;
         const headers = {
             'Content-Type': 'application/json',
         };
@@ -105,13 +118,20 @@ export class PluginEmbeddingService {
                 : apiKey;
             headers[plugin.auth.header] = authValue;
         }
-        const response = await axios.post(getEmbeddingEndpoint(effectiveEndpoint), {
-            model,
-            input,
-        }, {
+        const response = await axios.post(processedEndpoint, plugin.id === 'huggingface' ? { inputs: input } : { model, input }, {
             headers,
             timeout: 60000,
+            maxRedirects: 0,
         });
+        if (Array.isArray(response.data) &&
+            response.data.every(value => typeof value === 'number')) {
+            return { embeddings: [response.data] };
+        }
+        if (Array.isArray(response.data) &&
+            response.data.every(value => Array.isArray(value) &&
+                value.every(component => typeof component === 'number'))) {
+            return { embeddings: response.data };
+        }
         if (Array.isArray(response.data?.embeddings)) {
             return {
                 embeddings: response.data.embeddings,

package/backend/dist/services/pluginEmbeddingService.js.map

@@ -1 +1 @@
-{"version":3,"file":"pluginEmbeddingService.js","sourceRoot":"","sources":["../../src/services/pluginEmbeddingService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"pluginEmbeddingService.js","sourceRoot":"","sources":["../../src/services/pluginEmbeddingService.ts"],"names":[],"mappings":"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"}

package/backend/dist/services/pluginImageGenerationService.d.ts

@@ -1,29 +1,33 @@
 import { ImageGenConfig, ImageGenResponse, Plugin } from '../types/index.js';
 type PluginVariables = Record<string, string | number | boolean>;
+type ImageGenImage = ImageGenResponse['images'][number];
 export interface PluginImageGenerationServiceDependencies {
-    getAllPlugins(): Plugin[];
-    getPlugin(id: string): Plugin | null;
+    getAllPlugins(userId?: string): Plugin[];
+    getPlugin(id: string, userId?: string): Plugin | null;
     getApiKey(plugin: Plugin, userId?: string): string | null;
     getPluginVariables(plugin: Plugin, userId?: string): PluginVariables;
-    validateEndpointUrl(endpoint: string): string | null;
+    validateEndpointUrl(endpoint: string): string;
 }
 export declare class PluginImageGenerationService {
     private readonly deps;
     constructor(deps: PluginImageGenerationServiceDependencies);
-    getPluginForImageGen(model: string): Plugin | null;
-    getAvailableImageGenModels(): {
+    getPluginForImageGen(model: string, pluginId: string, userId?: string): Plugin | null;
+    getAvailableImageGenModels(userId?: string): {
         model: string;
         plugin: string;
         config?: ImageGenConfig;
     }[];
-    executeImageGenRequest(model: string, prompt: string, options?: {
+    executeImageGenRequest(model: string, prompt: string, options: {
         size?: string;
         quality?: string;
         style?: string;
         n?: number;
         response_format?: 'url' | 'b64_json';
+        pluginId: string;
+        userId?: string;
     }): Promise<ImageGenResponse>;
-    getImageGenConfig(pluginId: string): ImageGenConfig | null;
+    getImageGenConfig(pluginId: string, userId?: string): ImageGenConfig | null;
 }
+export declare function normalizeImageGenerationResponse(responseData: unknown): ImageGenImage[];
 export {};
 //# sourceMappingURL=pluginImageGenerationService.d.ts.map

package/backend/dist/services/pluginImageGenerationService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pluginImageGenerationService.d.ts","sourceRoot":"","sources":["../../src/services/pluginImageGenerationService.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAG7E,KAAK,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,CAAC;AAEjE,MAAM,WAAW,wCAAwC;IACvD,aAAa,IAAI,MAAM,EAAE,CAAC;IAC1B,SAAS,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;IACrC,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;IAC1D,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,eAAe,CAAC;IACrE,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;CACtD;AAED,qBAAa,4BAA4B;IAErC,OAAO,CAAC,QAAQ,CAAC,IAAI;gBAAJ,IAAI,EAAE,wCAAwC;IAGjE,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAmBlD,0BAA0B,IAAI;QAC5B,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;QACf,MAAM,CAAC,EAAE,cAAc,CAAC;KACzB,EAAE;IAuCG,sBAAsB,CAC1B,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,EACd,OAAO,GAAE;QACP,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,CAAC,CAAC,EAAE,MAAM,CAAC;QACX,eAAe,CAAC,EAAE,KAAK,GAAG,UAAU,CAAC;KACjC,GACL,OAAO,CAAC,gBAAgB,CAAC;IAyH5B,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,cAAc,GAAG,IAAI;CAU3D"}
+{"version":3,"file":"pluginImageGenerationService.d.ts","sourceRoot":"","sources":["../../src/services/pluginImageGenerationService.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAY7E,KAAK,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,CAAC;AACjE,KAAK,aAAa,GAAG,gBAAgB,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC;AAExD,MAAM,WAAW,wCAAwC;IACvD,aAAa,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACzC,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;IACtD,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;IAC1D,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,eAAe,CAAC;IACrE,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAC;CAC/C;AAED,qBAAa,4BAA4B;IAErC,OAAO,CAAC,QAAQ,CAAC,IAAI;gBAAJ,IAAI,EAAE,wCAAwC;IAGjE,oBAAoB,CAClB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,MAAM,CAAC,EAAE,MAAM,GACd,MAAM,GAAG,IAAI;IAchB,0BAA0B,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG;QAC3C,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;QACf,MAAM,CAAC,EAAE,cAAc,CAAC;KACzB,EAAE;IAiCG,sBAAsB,CAC1B,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,EACd,OAAO,EAAE;QACP,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,CAAC,CAAC,EAAE,MAAM,CAAC;QACX,eAAe,CAAC,EAAE,KAAK,GAAG,UAAU,CAAC;QACrC,QAAQ,EAAE,MAAM,CAAC;QACjB,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,GACA,OAAO,CAAC,gBAAgB,CAAC;IA8L5B,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,cAAc,GAAG,IAAI;CAU5E;AAED,wBAAgB,gCAAgC,CAC9C,YAAY,EAAE,OAAO,GACpB,aAAa,EAAE,CAYjB"}

package/backend/dist/services/pluginImageGenerationService.js

@@ -15,67 +15,58 @@
  * limitations under the License.
  */
 import axios from 'axios';
-import { validatePluginModel } from '../utils/pluginValidation.js';
+import { normalizeImageGenerationCount, normalizeImageMediaType, } from '../utils/imageGenerationValidation.js';
+import { assertSafePluginEndpoint, applyModelEndpointTemplate, resolvePluginOperationEndpoint, validatePluginModel, } from '../utils/pluginValidation.js';
 export class PluginImageGenerationService {
     constructor(deps) {
         this.deps = deps;
     }
-    getPluginForImageGen(model) {
-        const allPlugins = this.deps.getAllPlugins();
-        for (const plugin of allPlugins) {
-            if (plugin.capabilities?.image) {
-                const imageCapability = plugin.capabilities.image;
-                if (imageCapability.model_map.includes(model)) {
-                    return plugin;
-                }
-            }
-            if (plugin.type === 'image' && plugin.model_map.includes(model)) {
-                return plugin;
-            }
+    getPluginForImageGen(model, pluginId, userId) {
+        const plugin = this.deps.getPlugin(pluginId, userId);
+        if (!plugin?.active)
+            return null;
+        const supportedModels = plugin.capabilities?.image?.model_map ??
+            (plugin.type === 'image' ? plugin.model_map : []);
+        if (supportedModels.includes(model)) {
+            return plugin;
         }
         return null;
     }
-    getAvailableImageGenModels() {
+    getAvailableImageGenModels(userId) {
         const models = [];
-        const allPlugins = this.deps.getAllPlugins();
+        const allPlugins = this.deps.getAllPlugins(userId);
         for (const plugin of allPlugins) {
-            if (plugin.capabilities?.image) {
-                const imageCapability = plugin.capabilities.image;
-                const noAuthRequired = imageCapability.config
-                    ?.no_auth_required === true;
-                const apiKey = this.deps.getApiKey(plugin);
-                if (apiKey || noAuthRequired) {
-                    for (const model of imageCapability.model_map) {
-                        models.push({
-                            model,
-                            plugin: plugin.id,
-                            config: imageCapability.config,
-                        });
-                    }
-                }
+            if (!plugin.active)
+                continue;
+            const imageCapability = plugin.capabilities?.image;
+            const supportedModels = imageCapability?.model_map ??
+                (plugin.type === 'image' ? plugin.model_map : []);
+            if (supportedModels.length === 0) {
+                continue;
             }
-            if (plugin.type === 'image') {
-                const apiKey = this.deps.getApiKey(plugin);
-                if (apiKey) {
-                    for (const model of plugin.model_map) {
-                        models.push({
-                            model,
-                            plugin: plugin.id,
-                        });
-                    }
+            const noAuthRequired = imageCapability?.config
+                ?.no_auth_required === true;
+            const apiKey = this.deps.getApiKey(plugin, userId);
+            if (apiKey || noAuthRequired) {
+                for (const model of supportedModels) {
+                    models.push({
+                        model,
+                        plugin: plugin.id,
+                        config: imageCapability?.config,
+                    });
                 }
             }
         }
         return models;
     }
-    async executeImageGenRequest(model, prompt, options = {}) {
+    async executeImageGenRequest(model, prompt, options) {
         validatePluginModel(model);
         if (!prompt || typeof prompt !== 'string') {
             throw new Error('Invalid prompt: must be a non-empty string');
         }
-        const plugin = this.getPluginForImageGen(model);
+        const plugin = this.getPluginForImageGen(model, options.pluginId, options.userId);
         if (!plugin) {
-            throw new Error(`No image generation plugin found for model: ${model}`);
+            throw new Error(`No image generation plugin found for model: ${model} in plugin ${options.pluginId}`);
         }
         let endpoint;
         let imageConfig;
@@ -86,22 +77,45 @@ export class PluginImageGenerationService {
         else {
             endpoint = plugin.endpoint;
         }
-        const imageVars = this.deps.getPluginVariables(plugin);
-        if (imageVars.endpoint && typeof imageVars.endpoint === 'string') {
-            const validated = this.deps.validateEndpointUrl(imageVars.endpoint);
-            if (validated)
-                endpoint = validated;
+        const imageVars = this.deps.getPluginVariables(plugin, options.userId);
+        const imageCount = normalizeImageGenerationCount(options.n);
+        const endpointVariable = imageConfig?.endpoint_variable ||
+            (plugin.type === 'image' ? 'endpoint' : 'image_endpoint');
+        const endpointOverride = imageVars[endpointVariable];
+        if (endpointVariable === 'endpoint') {
+            endpoint = resolvePluginOperationEndpoint(endpoint, imageVars);
+        }
+        else if (typeof endpointOverride === 'string' &&
+            endpointOverride.trim().length > 0) {
+            const validatedEndpoint = this.deps.validateEndpointUrl(endpointOverride.trim());
+            if (!validatedEndpoint) {
+                throw new Error(`Invalid image endpoint override configured for plugin ${plugin.id}`);
+            }
+            endpoint = validatedEndpoint;
         }
+        endpoint =
+            plugin.id === 'huggingface'
+                ? applyModelEndpointTemplate(endpoint, model)
+                : endpoint;
+        const baseUrl = parseImageEndpoint(endpoint);
         const noAuthRequired = imageConfig?.no_auth_required ===
             true;
-        const apiKey = this.deps.getApiKey(plugin);
+        const apiKey = this.deps.getApiKey(plugin, options.userId);
         if (!apiKey && !noAuthRequired) {
-            throw new Error(`API key not found for plugin ${plugin.id} (set via Settings or ${plugin.auth.key_env} env var)`);
+            throw new Error(`API key not found for plugin ${plugin.id} (save a provider credential in Settings)`);
         }
         if (imageConfig?.max_prompt_length &&
             prompt.length > imageConfig.max_prompt_length) {
             throw new Error(`Prompt exceeds maximum length of ${imageConfig.max_prompt_length} characters`);
         }
+        if (imageCount !== undefined) {
+            if (imageConfig?.supports_n === false && imageCount !== 1) {
+                throw new Error(`Plugin ${plugin.id} supports only one image per request`);
+            }
+            if (imageConfig?.max_n && imageCount > imageConfig.max_n) {
+                throw new Error(`Image count exceeds maximum of ${imageConfig.max_n} for plugin ${plugin.id}`);
+            }
+        }
         const headers = {
             'Content-Type': 'application/json',
         };
@@ -118,38 +132,65 @@ export class PluginImageGenerationService {
             prompt,
             size: options.size || imageConfig?.default_size || '1024x1024',
             quality: options.quality || imageConfig?.default_quality || 'standard',
-            n: options.n || 1,
-            response_format: options.response_format || 'url',
         };
+        if (imageConfig?.supports_n !== false) {
+            payload.n = imageCount ?? 1;
+        }
+        if (imageConfig?.supports_response_format !== false) {
+            payload.response_format =
+                options.response_format ||
+                    imageConfig?.default_response_format ||
+                    'url';
+        }
         if (options.style || imageConfig?.default_style) {
             payload.style = options.style || imageConfig?.default_style;
         }
-        const baseUrl = parseImageEndpoint(endpoint);
-        if (plugin.id === 'comfyui' || endpoint.includes('/prompt')) {
+        if (plugin.id === 'comfyui') {
             return executeComfyUIRequest(baseUrl, prompt, {
                 ...options,
+                headers,
                 model,
-                pluginVars: this.deps.getPluginVariables(plugin),
+                pluginId: plugin.id,
+                pluginVars: imageVars,
             });
         }
         try {
-            const response = await axios.post(endpoint, payload, {
-                headers,
-                timeout: 120000,
-            });
-            if (response.data?.data) {
+            if (plugin.id === 'huggingface') {
+                const [width, height] = String(payload.size)
+                    .split('x')
+                    .map(value => Number.parseInt(value, 10));
+                const response = await axios.post(endpoint, {
+                    inputs: prompt,
+                    ...(Number.isInteger(width) && Number.isInteger(height)
+                        ? { parameters: { width, height } }
+                        : {}),
+                }, {
+                    headers,
+                    timeout: 120000,
+                    responseType: 'arraybuffer',
+                    maxRedirects: 0,
+                });
+                const mimeType = normalizeImageMediaType(response.headers['content-type']);
                 return {
-                    images: response.data.data.map((img) => ({
-                        url: img.url,
-                        b64_json: img.b64_json,
-                        revised_prompt: img.revised_prompt,
-                    })),
+                    images: [
+                        {
+                            b64_json: Buffer.from(response.data).toString('base64'),
+                            ...(mimeType ? { mime_type: mimeType } : {}),
+                        },
+                    ],
                     model,
+                    pluginId: plugin.id,
                 };
             }
+            const response = await axios.post(endpoint, payload, {
+                headers,
+                timeout: 120000,
+                maxRedirects: 0,
+            });
             return {
-                images: Array.isArray(response.data) ? response.data : [response.data],
+                images: normalizeImageGenerationResponse(response.data),
                 model,
+                pluginId: plugin.id,
             };
         }
         catch (error) {
@@ -162,9 +203,9 @@ export class PluginImageGenerationService {
             throw error;
         }
     }
-    getImageGenConfig(pluginId) {
-        const plugin = this.deps.getPlugin(pluginId);
-        if (!plugin)
+    getImageGenConfig(pluginId, userId) {
+        const plugin = this.deps.getPlugin(pluginId, userId);
+        if (!plugin?.active)
             return null;
         if (plugin.capabilities?.image?.config) {
             return plugin.capabilities.image.config;
@@ -172,20 +213,134 @@ export class PluginImageGenerationService {
         return null;
     }
 }
-function parseImageEndpoint(endpoint) {
+export function normalizeImageGenerationResponse(responseData) {
+    const candidates = getImageCandidates(responseData);
+    const images = candidates.flatMap(candidate => {
+        const image = normalizeImageCandidate(candidate);
+        return image ? [image] : [];
+    });
+    if (images.length === 0) {
+        throw new Error('Image provider returned no usable image data');
+    }
+    return images;
+}
+function getImageCandidates(responseData) {
+    if (Array.isArray(responseData)) {
+        return responseData;
+    }
+    if (!isRecord(responseData)) {
+        return [responseData];
+    }
+    if ('data' in responseData) {
+        return Array.isArray(responseData.data)
+            ? responseData.data
+            : [responseData.data];
+    }
+    if ('images' in responseData) {
+        return Array.isArray(responseData.images)
+            ? responseData.images
+            : [responseData.images];
+    }
+    return [responseData];
+}
+function normalizeImageCandidate(candidate) {
+    if (typeof candidate === 'string') {
+        const dataUrl = normalizeImageDataUrl(candidate);
+        if (dataUrl) {
+            return {
+                b64_json: dataUrl.b64Json,
+                mime_type: dataUrl.mimeType,
+            };
+        }
+        const url = normalizeHttpImageUrl(candidate);
+        if (url) {
+            return { url };
+        }
+        const b64Json = normalizeCanonicalBase64(candidate);
+        return b64Json ? { b64_json: b64Json } : null;
+    }
+    if (!isRecord(candidate)) {
+        return null;
+    }
+    const normalized = {};
+    const b64DataUrl = normalizeImageDataUrl(candidate.b64_json);
+    const b64Json = b64DataUrl?.b64Json || normalizeCanonicalBase64(candidate.b64_json);
+    if (b64Json) {
+        normalized.b64_json = b64Json;
+        const mimeType = b64DataUrl?.mimeType || normalizeImageMediaType(candidate.mime_type);
+        if (mimeType) {
+            normalized.mime_type = mimeType;
+        }
+    }
+    const urlData = normalizeImageDataUrl(candidate.url);
+    if (urlData && !normalized.b64_json) {
+        normalized.b64_json = urlData.b64Json;
+        normalized.mime_type = urlData.mimeType;
+    }
+    else if (!urlData) {
+        const url = normalizeHttpImageUrl(candidate.url);
+        if (url) {
+            normalized.url = url;
+        }
+    }
+    if (!normalized.url && !normalized.b64_json) {
+        return null;
+    }
+    if (typeof candidate.revised_prompt === 'string') {
+        normalized.revised_prompt = candidate.revised_prompt;
+    }
+    return normalized;
+}
+function normalizeImageDataUrl(value) {
+    if (typeof value !== 'string') {
+        return null;
+    }
+    const match = /^data:(image\/[a-z0-9.+-]+)(?:;[a-z0-9!#$&^_.+-]+=[^;,]*)*;base64,([a-z0-9+/]+={0,2})$/i.exec(value.trim());
+    if (!match) {
+        return null;
+    }
+    const b64Json = normalizeCanonicalBase64(match[2]);
+    const mimeType = normalizeImageMediaType(match[1]);
+    return b64Json && mimeType ? { b64Json, mimeType } : null;
+}
+function normalizeCanonicalBase64(value) {
+    if (typeof value !== 'string') {
+        return null;
+    }
+    const normalized = value.trim();
+    if (normalized.length === 0 ||
+        normalized.length % 4 !== 0 ||
+        !/^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$/.test(normalized)) {
+        return null;
+    }
+    const decoded = Buffer.from(normalized, 'base64');
+    if (decoded.length === 0 || decoded.toString('base64') !== normalized) {
+        return null;
+    }
+    return normalized;
+}
+function normalizeHttpImageUrl(value) {
+    if (typeof value !== 'string') {
+        return null;
+    }
     try {
-        const baseUrl = new URL(endpoint);
-        const isLocalhost = ['localhost', '127.0.0.1', '[::1]'].includes(baseUrl.hostname);
-        const isPrivateNetwork = /^(192\.168\.|10\.|172\.(1[6-9]|2[0-9]|3[01])\.)/.test(baseUrl.hostname);
-        if (baseUrl.protocol !== 'https:' && !isLocalhost && !isPrivateNetwork) {
-            throw new Error(`Insecure endpoint protocol: ${baseUrl.protocol}. Only HTTPS is allowed for remote endpoints.`);
+        const url = new URL(value.trim());
+        if (url.protocol !== 'http:' && url.protocol !== 'https:') {
+            return null;
         }
-        return baseUrl;
+        return url.toString();
     }
     catch (_error) {
-        throw new Error(`Invalid endpoint URL: ${endpoint}`);
+        return null;
     }
 }
+function isRecord(value) {
+    return typeof value === 'object' && value !== null;
+}
+function parseImageEndpoint(endpoint) {
+    assertSafePluginEndpoint(endpoint, 'image generation endpoint');
+    return new URL(endpoint);
+}
 const fluxModelConfigs = {
     'flux1-dev': {
         unetFile: 'flux1-dev.safetensors',
@@ -210,7 +365,23 @@ const fluxModelConfigs = {
     },
 };
 async function executeComfyUIRequest(baseUrl, prompt, options = {}) {
-    const comfyBaseUrl = `${baseUrl.protocol}//${baseUrl.host}`;
+    const promptEndpoint = new URL(baseUrl);
+    promptEndpoint.hash = '';
+    const configuredPath = promptEndpoint.pathname.replace(/\/+$/, '');
+    const apiRootPath = configuredPath.endsWith('/prompt')
+        ? configuredPath.slice(0, -'/prompt'.length)
+        : configuredPath;
+    promptEndpoint.pathname = `${apiRootPath}/prompt`;
+    const createOperationUrl = (operationPath) => {
+        const operationUrl = new URL(promptEndpoint);
+        operationUrl.search = '';
+        operationUrl.hash = '';
+        operationUrl.pathname = `${apiRootPath}/${operationPath}`;
+        return operationUrl;
+    };
+    const requestHeaders = options.headers || {
+        'Content-Type': 'application/json',
+    };
     const size = options.size || '1024x1024';
     const [width, height] = size.split('x').map(Number);
     const model = options.model || 'flux1-dev';
@@ -338,12 +509,13 @@ async function executeComfyUIRequest(baseUrl, prompt, options = {}) {
     }
     try {
         const clientId = `libre-webui-${Date.now()}`;
-        const promptResponse = await axios.post(`${comfyBaseUrl}/prompt`, {
+        const promptResponse = await axios.post(promptEndpoint.toString(), {
             prompt: workflow,
             client_id: clientId,
         }, {
-            headers: { 'Content-Type': 'application/json' },
+            headers: requestHeaders,
             timeout: 10000,
+            maxRedirects: 0,
         });
         const promptId = promptResponse.data.prompt_id;
         if (!promptId) {
@@ -355,7 +527,11 @@ async function executeComfyUIRequest(baseUrl, prompt, options = {}) {
         while (!completed && attempts < maxAttempts) {
             await new Promise(resolve => setTimeout(resolve, 1000));
             attempts++;
-            const historyResponse = await axios.get(`${comfyBaseUrl}/history/${promptId}`, { timeout: 5000 });
+            const historyResponse = await axios.get(createOperationUrl(`history/${encodeURIComponent(String(promptId))}`).toString(), {
+                headers: requestHeaders,
+                timeout: 5000,
+                maxRedirects: 0,
+            });
             if (historyResponse.data[promptId]) {
                 const outputs = historyResponse.data[promptId].outputs;
                 if (outputs && Object.keys(outputs).length > 0) {
@@ -364,20 +540,28 @@ async function executeComfyUIRequest(baseUrl, prompt, options = {}) {
                         const nodeOutput = outputs[nodeId];
                         if (nodeOutput.images && nodeOutput.images.length > 0) {
                             const imageInfo = nodeOutput.images[0];
-                            const imageUrl = `${comfyBaseUrl}/view?filename=${encodeURIComponent(imageInfo.filename)}&subfolder=${encodeURIComponent(imageInfo.subfolder || '')}&type=${encodeURIComponent(imageInfo.type || 'output')}`;
-                            const imageResponse = await axios.get(imageUrl, {
+                            const imageUrl = createOperationUrl('view');
+                            imageUrl.searchParams.set('filename', imageInfo.filename);
+                            imageUrl.searchParams.set('subfolder', imageInfo.subfolder || '');
+                            imageUrl.searchParams.set('type', imageInfo.type || 'output');
+                            const imageResponse = await axios.get(imageUrl.toString(), {
+                                headers: requestHeaders,
                                 responseType: 'arraybuffer',
                                 timeout: 30000,
+                                maxRedirects: 0,
                             });
                             const base64Image = Buffer.from(imageResponse.data).toString('base64');
+                            const mimeType = normalizeImageMediaType(imageResponse.headers['content-type']);
                             return {
                                 images: [
                                     {
                                         b64_json: base64Image,
+                                        ...(mimeType ? { mime_type: mimeType } : {}),
                                         revised_prompt: prompt,
                                     },
                                 ],
                                 model,
+                                pluginId: options.pluginId,
                             };
                         }
                     }