promptfoo 0.120.26 → 0.121.1

package/dist/src/{image-BiEVdpdP.js → image-BmEZqVmk.js}

@@ -1,10 +1,9 @@
-import { i as logger_default } from "./logger-w8Ozp0Td.js";
-import { h as REQUEST_TIMEOUT_MS } from "./fetch-18MuNu9i.js";
-import { a as fetchWithCache } from "./cache-BLLayYEN.js";
-import { t as OpenAiGenericProvider } from "./openai-Dz3surb_.js";
-import { s as formatOpenAiError } from "./util-Cl0zfT3V.js";
-import { t as ellipsize } from "./text-Dm78AVGG.js";
-
+import { i as logger } from "./logger-CT3IKMKA.js";
+import { p as REQUEST_TIMEOUT_MS } from "./fetch-60Gzydls.js";
+import { r as fetchWithCache } from "./cache-8XhNqPKW.js";
+import { t as OpenAiGenericProvider } from "./openai-DElQ-fPX.js";
+import { s as formatOpenAiError } from "./util-Betm42rL.js";
+import { t as ellipsize } from "./text-B_UCRPp2.js";
 //#region src/providers/openai/image.ts
 const DALLE2_VALID_SIZES = [
 	"256x256",
@@ -101,10 +100,48 @@ function validateSizeForModel(size, model) {
 	}
 	return { valid: true };
 }
-function formatOutput(data, prompt, responseFormat) {
+function getMimeTypeForOutputFormat(outputFormat) {
+	switch (outputFormat) {
+		case "jpeg": return "image/jpeg";
+		case "webp": return "image/webp";
+		default: return "image/png";
+	}
+}
+function inferMimeTypeFromUrl(url) {
+	try {
+		const pathname = new URL(url).pathname.toLowerCase();
+		if (pathname.endsWith(".jpg") || pathname.endsWith(".jpeg")) return "image/jpeg";
+		if (pathname.endsWith(".webp")) return "image/webp";
+		if (pathname.endsWith(".gif")) return "image/gif";
+		if (pathname.endsWith(".svg")) return "image/svg+xml";
+		if (pathname.endsWith(".png")) return "image/png";
+	} catch {}
+}
+function buildStructuredImageOutputs(data, outputFormat) {
+	if (!Array.isArray(data.data) || data.data.length === 0) return;
+	return data.data.map((item) => {
+		if (item.b64_json) {
+			const mimeType = getMimeTypeForOutputFormat(outputFormat);
+			return {
+				data: `data:${mimeType};base64,${item.b64_json}`,
+				mimeType
+			};
+		}
+		if (item.url) {
+			const mimeType = inferMimeTypeFromUrl(item.url);
+			return mimeType ? {
+				data: item.url,
+				mimeType
+			} : { data: item.url };
+		}
+		return null;
+	}).filter((item) => item !== null);
+}
+function formatOutput(data, prompt, responseFormat, outputFormat) {
 	if (responseFormat === "b64_json") {
-		if (!data.data[0].b64_json) return { error: `No base64 image data found in response: ${JSON.stringify(data)}` };
-		return JSON.stringify(data);
+		const b64Json = data.data[0].b64_json;
+		if (!b64Json) return { error: `No base64 image data found in response: ${JSON.stringify(data)}` };
+		return `data:${getMimeTypeForOutputFormat(outputFormat)};base64,${b64Json}`;
 	} else {
 		const url = data.data[0].url;
 		if (!url) return { error: `No image URL found in response: ${JSON.stringify(data)}` };
@@ -148,19 +185,21 @@ async function callOpenAiImageApi(url, body, headers, timeout) {
 		body: JSON.stringify(body)
 	}, timeout);
 }
-async function processApiResponse(data, prompt, responseFormat, cached, model, size, latencyMs, quality, n = 1) {
+async function processApiResponse(data, prompt, responseFormat, cached, model, size, latencyMs, quality, n = 1, outputFormat) {
 	if (data.error) {
 		await data?.deleteFromCache?.();
 		return { error: formatOpenAiError(data) };
 	}
 	try {
-		const formattedOutput = formatOutput(data, prompt, responseFormat);
+		const formattedOutput = formatOutput(data, prompt, responseFormat, outputFormat);
 		if (typeof formattedOutput === "object") return formattedOutput;
+		const cost = cached ? 0 : calculateImageCost(model, size, quality, n);
 		return {
 			output: formattedOutput,
+			images: buildStructuredImageOutputs(data, outputFormat),
 			cached,
 			latencyMs,
-			cost: cached ? 0 : calculateImageCost(model, size, quality, n),
+			cost,
 			...responseFormat === "b64_json" ? {
 				isBase64: true,
 				format: "json"
@@ -205,14 +244,14 @@ var OpenAiImageProvider = class extends OpenAiGenericProvider {
 			({data, cached, status, statusText, latencyMs} = await callOpenAiImageApi(`${this.getApiUrl()}${endpoint}`, body, headers, REQUEST_TIMEOUT_MS));
 			if (status < 200 || status >= 300) return { error: `API error: ${status} ${statusText}\n${typeof data === "string" ? data : JSON.stringify(data)}` };
 		} catch (err) {
-			logger_default.error(`API call error: ${String(err)}`);
+			logger.error(`API call error: ${String(err)}`);
 			await data?.deleteFromCache?.();
 			return { error: `API call error: ${String(err)}` };
 		}
-		return processApiResponse(data, prompt, responseFormat, cached, model, size, latencyMs, config.quality, config.n || 1);
+		return processApiResponse(data, prompt, responseFormat, cached, model, size, latencyMs, config.quality, config.n || 1, "output_format" in config ? config.output_format : void 0);
 	}
 };
-
 //#endregion
-export { callOpenAiImageApi as n, formatOutput as r, OpenAiImageProvider as t };
-//# sourceMappingURL=image-BiEVdpdP.js.map
+export { formatOutput as i, buildStructuredImageOutputs as n, callOpenAiImageApi as r, OpenAiImageProvider as t };
+
+//# sourceMappingURL=image-BmEZqVmk.js.map

package/dist/src/{image-mhAGP07h.js → image-CBBVXWuT.js}

@@ -1,11 +1,10 @@
 #!/usr/bin/env node
-import { o as logger_default } from "./logger-BotXmWKW.js";
-import { d as REQUEST_TIMEOUT_MS } from "./fetch-SRsE6Ctl.js";
-import { a as fetchWithCache } from "./cache-mIszOnuz.js";
-import { t as OpenAiGenericProvider } from "./openai-CT5fwbve.js";
-import { s as formatOpenAiError } from "./util-CUEt0Vum.js";
-import { t as ellipsize } from "./text-DgMr_tiM.js";
-
+import { o as logger } from "./logger-KkObSCzq.js";
+import { f as REQUEST_TIMEOUT_MS } from "./fetch-BMv0O527.js";
+import { a as fetchWithCache } from "./cache-CG0SlR1d.js";
+import { t as OpenAiGenericProvider } from "./openai-DhbB7eWK.js";
+import { s as formatOpenAiError } from "./util-C-PPYSMq.js";
+import { t as ellipsize } from "./text-Db-Wt2u2.js";
 //#region src/providers/openai/image.ts
 const DALLE2_VALID_SIZES = [
 	"256x256",
@@ -102,10 +101,48 @@ function validateSizeForModel(size, model) {
 	}
 	return { valid: true };
 }
-function formatOutput(data, prompt, responseFormat) {
+function getMimeTypeForOutputFormat(outputFormat) {
+	switch (outputFormat) {
+		case "jpeg": return "image/jpeg";
+		case "webp": return "image/webp";
+		default: return "image/png";
+	}
+}
+function inferMimeTypeFromUrl(url) {
+	try {
+		const pathname = new URL(url).pathname.toLowerCase();
+		if (pathname.endsWith(".jpg") || pathname.endsWith(".jpeg")) return "image/jpeg";
+		if (pathname.endsWith(".webp")) return "image/webp";
+		if (pathname.endsWith(".gif")) return "image/gif";
+		if (pathname.endsWith(".svg")) return "image/svg+xml";
+		if (pathname.endsWith(".png")) return "image/png";
+	} catch {}
+}
+function buildStructuredImageOutputs(data, outputFormat) {
+	if (!Array.isArray(data.data) || data.data.length === 0) return;
+	return data.data.map((item) => {
+		if (item.b64_json) {
+			const mimeType = getMimeTypeForOutputFormat(outputFormat);
+			return {
+				data: `data:${mimeType};base64,${item.b64_json}`,
+				mimeType
+			};
+		}
+		if (item.url) {
+			const mimeType = inferMimeTypeFromUrl(item.url);
+			return mimeType ? {
+				data: item.url,
+				mimeType
+			} : { data: item.url };
+		}
+		return null;
+	}).filter((item) => item !== null);
+}
+function formatOutput(data, prompt, responseFormat, outputFormat) {
 	if (responseFormat === "b64_json") {
-		if (!data.data[0].b64_json) return { error: `No base64 image data found in response: ${JSON.stringify(data)}` };
-		return JSON.stringify(data);
+		const b64Json = data.data[0].b64_json;
+		if (!b64Json) return { error: `No base64 image data found in response: ${JSON.stringify(data)}` };
+		return `data:${getMimeTypeForOutputFormat(outputFormat)};base64,${b64Json}`;
 	} else {
 		const url = data.data[0].url;
 		if (!url) return { error: `No image URL found in response: ${JSON.stringify(data)}` };
@@ -149,19 +186,21 @@ async function callOpenAiImageApi(url, body, headers, timeout) {
 		body: JSON.stringify(body)
 	}, timeout);
 }
-async function processApiResponse(data, prompt, responseFormat, cached, model, size, latencyMs, quality, n = 1) {
+async function processApiResponse(data, prompt, responseFormat, cached, model, size, latencyMs, quality, n = 1, outputFormat) {
 	if (data.error) {
 		await data?.deleteFromCache?.();
 		return { error: formatOpenAiError(data) };
 	}
 	try {
-		const formattedOutput = formatOutput(data, prompt, responseFormat);
+		const formattedOutput = formatOutput(data, prompt, responseFormat, outputFormat);
 		if (typeof formattedOutput === "object") return formattedOutput;
+		const cost = cached ? 0 : calculateImageCost(model, size, quality, n);
 		return {
 			output: formattedOutput,
+			images: buildStructuredImageOutputs(data, outputFormat),
 			cached,
 			latencyMs,
-			cost: cached ? 0 : calculateImageCost(model, size, quality, n),
+			cost,
 			...responseFormat === "b64_json" ? {
 				isBase64: true,
 				format: "json"
@@ -206,14 +245,14 @@ var OpenAiImageProvider = class extends OpenAiGenericProvider {
 			({data, cached, status, statusText, latencyMs} = await callOpenAiImageApi(`${this.getApiUrl()}${endpoint}`, body, headers, REQUEST_TIMEOUT_MS));
 			if (status < 200 || status >= 300) return { error: `API error: ${status} ${statusText}\n${typeof data === "string" ? data : JSON.stringify(data)}` };
 		} catch (err) {
-			logger_default.error(`API call error: ${String(err)}`);
+			logger.error(`API call error: ${String(err)}`);
 			await data?.deleteFromCache?.();
 			return { error: `API call error: ${String(err)}` };
 		}
-		return processApiResponse(data, prompt, responseFormat, cached, model, size, latencyMs, config.quality, config.n || 1);
+		return processApiResponse(data, prompt, responseFormat, cached, model, size, latencyMs, config.quality, config.n || 1, "output_format" in config ? config.output_format : void 0);
 	}
 };
-
 //#endregion
-export { callOpenAiImageApi as n, formatOutput as r, OpenAiImageProvider as t };
-//# sourceMappingURL=image-mhAGP07h.js.map
+export { formatOutput as i, buildStructuredImageOutputs as n, callOpenAiImageApi as r, OpenAiImageProvider as t };
+
+//# sourceMappingURL=image-CBBVXWuT.js.map

package/dist/src/{image-D10zEe1f.cjs → image-CDLQOcqT.cjs}

@@ -1,7 +1,6 @@
-const require_logger = require('./logger-BdZ-IqBc.cjs');
-const require_fetch = require('./fetch-ZMn_oemb.cjs');
-const require_cache = require('./cache-7xULbvt3.cjs');
-
+const require_logger = require("./logger-Cp1GPUjj.cjs");
+const require_fetch = require("./fetch-BxUk8odA.cjs");
+const require_cache = require("./cache-COish3-W.cjs");
 //#region src/providers/hyperbolic/image.ts
 const HYPERBOLIC_IMAGE_MODELS = [
 	{
@@ -132,7 +131,7 @@ var HyperbolicImageProvider = class {
 			}, require_fetch.REQUEST_TIMEOUT_MS));
 			if (status < 200 || status >= 300) return { error: `API error: ${status} ${statusText}\n${typeof data === "string" ? data : JSON.stringify(data)}` };
 		} catch (err) {
-			require_logger.logger_default.error(`API call error: ${String(err)}`);
+			require_logger.logger.error(`API call error: ${String(err)}`);
 			return { error: `API call error: ${String(err)}` };
 		}
 		if (data.error) return { error: typeof data.error === "string" ? data.error : JSON.stringify(data.error) };
@@ -158,7 +157,7 @@ var HyperbolicImageProvider = class {
 function createHyperbolicImageProvider(providerPath, options = {}) {
 	return new HyperbolicImageProvider(providerPath.split(":").slice(2).join(":") || "SDXL1.0-base", options);
 }
-
 //#endregion
 exports.createHyperbolicImageProvider = createHyperbolicImageProvider;
-//# sourceMappingURL=image-D10zEe1f.cjs.map
+
+//# sourceMappingURL=image-CDLQOcqT.cjs.map

package/dist/src/{image-COCWy5dX.js → image-DJEvKveK.js}

@@ -1,5 +1,6 @@
-import { I as getEnvString, _ as fetchWithCache, j as logger_default, k as REQUEST_TIMEOUT_MS } from "./server/index.js";
-
+import { b as getEnvString, i as logger } from "./logger-CT3IKMKA.js";
+import { p as REQUEST_TIMEOUT_MS } from "./fetch-60Gzydls.js";
+import { r as fetchWithCache } from "./cache-8XhNqPKW.js";
 //#region src/providers/hyperbolic/image.ts
 const HYPERBOLIC_IMAGE_MODELS = [
 	{
@@ -130,7 +131,7 @@ var HyperbolicImageProvider = class {
 			}, REQUEST_TIMEOUT_MS));
 			if (status < 200 || status >= 300) return { error: `API error: ${status} ${statusText}\n${typeof data === "string" ? data : JSON.stringify(data)}` };
 		} catch (err) {
-			logger_default.error(`API call error: ${String(err)}`);
+			logger.error(`API call error: ${String(err)}`);
 			return { error: `API call error: ${String(err)}` };
 		}
 		if (data.error) return { error: typeof data.error === "string" ? data.error : JSON.stringify(data.error) };
@@ -156,7 +157,7 @@ var HyperbolicImageProvider = class {
 function createHyperbolicImageProvider(providerPath, options = {}) {
 	return new HyperbolicImageProvider(providerPath.split(":").slice(2).join(":") || "SDXL1.0-base", options);
 }
-
 //#endregion
 export { createHyperbolicImageProvider };
-//# sourceMappingURL=image-COCWy5dX.js.map
+
+//# sourceMappingURL=image-DJEvKveK.js.map

package/dist/src/{image-C3BjJUAU.cjs → image-DTedmQPg.cjs}

@@ -1,10 +1,9 @@
-const require_logger = require('./logger-BdZ-IqBc.cjs');
-const require_fetch = require('./fetch-ZMn_oemb.cjs');
-const require_cache = require('./cache-7xULbvt3.cjs');
-const require_openai = require('./openai-Bigwjgo1.cjs');
-const require_util = require('./util-C08Kns6-.cjs');
-const require_text = require('./text-DF2hMKdg.cjs');
-
+const require_logger = require("./logger-Cp1GPUjj.cjs");
+const require_fetch = require("./fetch-BxUk8odA.cjs");
+const require_cache = require("./cache-COish3-W.cjs");
+const require_openai = require("./openai-Cuif0GEt.cjs");
+const require_util = require("./util-Db0a0AFH.cjs");
+const require_text = require("./text-CW1cyrwj.cjs");
 //#region src/providers/openai/image.ts
 const DALLE2_VALID_SIZES = [
 	"256x256",
@@ -101,10 +100,48 @@ function validateSizeForModel(size, model) {
 	}
 	return { valid: true };
 }
-function formatOutput(data, prompt, responseFormat) {
+function getMimeTypeForOutputFormat(outputFormat) {
+	switch (outputFormat) {
+		case "jpeg": return "image/jpeg";
+		case "webp": return "image/webp";
+		default: return "image/png";
+	}
+}
+function inferMimeTypeFromUrl(url) {
+	try {
+		const pathname = new URL(url).pathname.toLowerCase();
+		if (pathname.endsWith(".jpg") || pathname.endsWith(".jpeg")) return "image/jpeg";
+		if (pathname.endsWith(".webp")) return "image/webp";
+		if (pathname.endsWith(".gif")) return "image/gif";
+		if (pathname.endsWith(".svg")) return "image/svg+xml";
+		if (pathname.endsWith(".png")) return "image/png";
+	} catch {}
+}
+function buildStructuredImageOutputs(data, outputFormat) {
+	if (!Array.isArray(data.data) || data.data.length === 0) return;
+	return data.data.map((item) => {
+		if (item.b64_json) {
+			const mimeType = getMimeTypeForOutputFormat(outputFormat);
+			return {
+				data: `data:${mimeType};base64,${item.b64_json}`,
+				mimeType
+			};
+		}
+		if (item.url) {
+			const mimeType = inferMimeTypeFromUrl(item.url);
+			return mimeType ? {
+				data: item.url,
+				mimeType
+			} : { data: item.url };
+		}
+		return null;
+	}).filter((item) => item !== null);
+}
+function formatOutput(data, prompt, responseFormat, outputFormat) {
 	if (responseFormat === "b64_json") {
-		if (!data.data[0].b64_json) return { error: `No base64 image data found in response: ${JSON.stringify(data)}` };
-		return JSON.stringify(data);
+		const b64Json = data.data[0].b64_json;
+		if (!b64Json) return { error: `No base64 image data found in response: ${JSON.stringify(data)}` };
+		return `data:${getMimeTypeForOutputFormat(outputFormat)};base64,${b64Json}`;
 	} else {
 		const url = data.data[0].url;
 		if (!url) return { error: `No image URL found in response: ${JSON.stringify(data)}` };
@@ -148,19 +185,21 @@ async function callOpenAiImageApi(url, body, headers, timeout) {
 		body: JSON.stringify(body)
 	}, timeout);
 }
-async function processApiResponse(data, prompt, responseFormat, cached, model, size, latencyMs, quality, n = 1) {
+async function processApiResponse(data, prompt, responseFormat, cached, model, size, latencyMs, quality, n = 1, outputFormat) {
 	if (data.error) {
 		await data?.deleteFromCache?.();
 		return { error: require_util.formatOpenAiError(data) };
 	}
 	try {
-		const formattedOutput = formatOutput(data, prompt, responseFormat);
+		const formattedOutput = formatOutput(data, prompt, responseFormat, outputFormat);
 		if (typeof formattedOutput === "object") return formattedOutput;
+		const cost = cached ? 0 : calculateImageCost(model, size, quality, n);
 		return {
 			output: formattedOutput,
+			images: buildStructuredImageOutputs(data, outputFormat),
 			cached,
 			latencyMs,
-			cost: cached ? 0 : calculateImageCost(model, size, quality, n),
+			cost,
 			...responseFormat === "b64_json" ? {
 				isBase64: true,
 				format: "json"
@@ -205,31 +244,37 @@ var OpenAiImageProvider = class extends require_openai.OpenAiGenericProvider {
 			({data, cached, status, statusText, latencyMs} = await callOpenAiImageApi(`${this.getApiUrl()}${endpoint}`, body, headers, require_fetch.REQUEST_TIMEOUT_MS));
 			if (status < 200 || status >= 300) return { error: `API error: ${status} ${statusText}\n${typeof data === "string" ? data : JSON.stringify(data)}` };
 		} catch (err) {
-			require_logger.logger_default.error(`API call error: ${String(err)}`);
+			require_logger.logger.error(`API call error: ${String(err)}`);
 			await data?.deleteFromCache?.();
 			return { error: `API call error: ${String(err)}` };
 		}
-		return processApiResponse(data, prompt, responseFormat, cached, model, size, latencyMs, config.quality, config.n || 1);
+		return processApiResponse(data, prompt, responseFormat, cached, model, size, latencyMs, config.quality, config.n || 1, "output_format" in config ? config.output_format : void 0);
 	}
 };
-
 //#endregion
-Object.defineProperty(exports, 'OpenAiImageProvider', {
-  enumerable: true,
-  get: function () {
-    return OpenAiImageProvider;
-  }
+Object.defineProperty(exports, "OpenAiImageProvider", {
+	enumerable: true,
+	get: function() {
+		return OpenAiImageProvider;
+	}
 });
-Object.defineProperty(exports, 'callOpenAiImageApi', {
-  enumerable: true,
-  get: function () {
-    return callOpenAiImageApi;
-  }
+Object.defineProperty(exports, "buildStructuredImageOutputs", {
+	enumerable: true,
+	get: function() {
+		return buildStructuredImageOutputs;
+	}
 });
-Object.defineProperty(exports, 'formatOutput', {
-  enumerable: true,
-  get: function () {
-    return formatOutput;
-  }
+Object.defineProperty(exports, "callOpenAiImageApi", {
+	enumerable: true,
+	get: function() {
+		return callOpenAiImageApi;
+	}
 });
-//# sourceMappingURL=image-C3BjJUAU.cjs.map
+Object.defineProperty(exports, "formatOutput", {
+	enumerable: true,
+	get: function() {
+		return formatOutput;
+	}
+});
+
+//# sourceMappingURL=image-DTedmQPg.cjs.map

package/dist/src/{image-DB4sHxdJ.js → image-gvmivTEe.js}

@@ -1,10 +1,8 @@
 #!/usr/bin/env node
-import "./chunk-DHDDz29n.js";
-import { C as getEnvString, o as logger_default } from "./logger-BotXmWKW.js";
-import { d as REQUEST_TIMEOUT_MS } from "./fetch-SRsE6Ctl.js";
-import "./cloud-BMbRVJFw.js";
-import { a as fetchWithCache } from "./cache-mIszOnuz.js";
-
+import { C as getEnvString, o as logger } from "./logger-KkObSCzq.js";
+import { f as REQUEST_TIMEOUT_MS } from "./fetch-BMv0O527.js";
+import "./cloud-Bc9526yV.js";
+import { a as fetchWithCache } from "./cache-CG0SlR1d.js";
 //#region src/providers/hyperbolic/image.ts
 const HYPERBOLIC_IMAGE_MODELS = [
 	{
@@ -135,7 +133,7 @@ var HyperbolicImageProvider = class {
 			}, REQUEST_TIMEOUT_MS));
 			if (status < 200 || status >= 300) return { error: `API error: ${status} ${statusText}\n${typeof data === "string" ? data : JSON.stringify(data)}` };
 		} catch (err) {
-			logger_default.error(`API call error: ${String(err)}`);
+			logger.error(`API call error: ${String(err)}`);
 			return { error: `API call error: ${String(err)}` };
 		}
 		if (data.error) return { error: typeof data.error === "string" ? data.error : JSON.stringify(data.error) };
@@ -161,7 +159,7 @@ var HyperbolicImageProvider = class {
 function createHyperbolicImageProvider(providerPath, options = {}) {
 	return new HyperbolicImageProvider(providerPath.split(":").slice(2).join(":") || "SDXL1.0-base", options);
 }
-
 //#endregion
 export { createHyperbolicImageProvider };
-//# sourceMappingURL=image-DB4sHxdJ.js.map
+
+//# sourceMappingURL=image-gvmivTEe.js.map