promptfoo 0.120.25 → 0.120.26

package/dist/src/{evaluator-1Tkdu8MK.js → evaluator-3EJCMTs0.js}

@@ -1,27 +1,28 @@
 #!/usr/bin/env node
 import { C as getEnvString, E as isCI, O as cliState_default, S as getEnvInt, T as getMaxEvalTimeMs, _ as summarizeEvaluateResultForLogging, b as getEnvBool, f as extractJsonObjects, g as safeJsonStringify, o as logger_default, p as getAjv, w as getEvalTimeoutMs } from "./logger-BotXmWKW.js";
-import { F as FILE_METADATA_KEY, P as VERSION, h as isPromptfooSampleTarget, l as sleep, r as fetchWithRetries, v as parseChatPrompt, w as DEFAULT_MAX_CONCURRENCY } from "./fetch-BuP-gm0E.js";
+import { F as FILE_METADATA_KEY, P as VERSION, h as isPromptfooSampleTarget, l as sleep, r as fetchWithRetries, v as parseChatPrompt, w as DEFAULT_MAX_CONCURRENCY } from "./fetch-SRsE6Ctl.js";
 import { t as invariant } from "./invariant-DT20jrBd.js";
-import { r as telemetry_default } from "./telemetry-wXyCQ1Nz.js";
-import { d as isGradingResult, p as isApiProvider, s as ResultFailureReason } from "./types-CMDs7Kzu.js";
-import { c as promptYesNo } from "./server-HQtz_gUy.js";
-import { A as renderPrompt, E as isBasicRefusal, F as TokenUsageTracker, G as VertexChatProvider, I as createRateLimitRegistry, K as AIStudioChatProvider, L as createProviderRateLimitOptions, M as isPackagePath, N as loadFromPackage, P as redteamProviderManager, j as runExtensionHook, k as collectFileMetadata, u as GoogleLiveProvider, v as checkExfilTracking, w as getSessionId } from "./providers-BOvl9qv5.js";
-import { o as getCache } from "./cache-Bg1Wpvzq.js";
-import { i as isJavascriptFile } from "./fileExtensions-CzcPkiKZ.js";
-import { E as parseFileUrl, F as isAnthropicProvider, I as isGoogleProvider, L as isOpenAiProvider, R as isProviderAllowed, T as loadFunction, g as maybeLoadToolsFromExternalFile, w as getNunjucksEngine } from "./util-BECSJ0T_.js";
-import { r as runPython } from "./pythonUtils-CUPlf1H0.js";
-import { n as transform, r as getProcessShim, t as TransformInputType } from "./transform-B86_0IIb.js";
-import { $ as matchesSearchRubric, B as getAndCheckProvider, G as matchesContextFaithfulness, H as matchesAnswerRelevance, J as matchesFactuality, K as matchesContextRecall, Q as matchesPiScore, R as callProviderWithContext, U as matchesClassification, V as loadRubricPrompt, W as matchesClosedQa, X as matchesLlmRubric, Y as matchesGEval, Z as matchesModeration, at as DefaultSuggestionsProvider, dt as getFinalTest, et as matchesSelectBest, ft as loadFromJavaScriptFile, it as getDefaultProviders, lt as SUGGEST_PROMPTS_SYSTEM_MESSAGE, mt as resolveContext, n as getGraderById, nt as selectMaxScore, pt as processFileReference, q as matchesContextRelevance, tt as matchesSimilarity, ut as coerceString, z as fail } from "./graders-DMAzEgEF.js";
-import { i as generateIdFromPrompt } from "./utils-ICP7kLcY.js";
-import { t as extractAndStoreBinaryData } from "./extractor-BFoThUOa.js";
-import { t as OpenAiChatCompletionProvider } from "./chat-D_cro0wd.js";
-import { a as createEmptyTokenUsage, i as createEmptyAssertions, n as accumulateResponseTokenUsage, o as normalizeTokenUsage, r as accumulateTokenUsage, t as accumulateAssertionTokenUsage } from "./tokenUsageUtils-D2ko2eFQ.js";
-import { p as validateFunctionCall } from "./transform-gpzlPrwG.js";
-import { l as validateFunctionCall$1 } from "./util-CttPoePn.js";
-import { n as getTraceStore } from "./store-rueRdzcm.js";
-import { t as providerRegistry } from "./providerRegistry-DAZoFmGv.js";
-import { n as runRuby } from "./rubyUtils-DYKoa7Ze.js";
-import { a as getActualPromptWithFallback, r as updateSignalFile } from "./signal-D4VhSJOY.js";
+import { r as telemetry_default } from "./telemetry-BXyVqyAg.js";
+import { d as isGradingResult, p as isApiProvider, s as ResultFailureReason } from "./types-t52w-XsS.js";
+import { c as promptYesNo } from "./server-DWmZLfCy.js";
+import { A as renderPrompt, E as isBasicRefusal, F as TokenUsageTracker, G as VertexChatProvider, I as createRateLimitRegistry, K as AIStudioChatProvider, L as createProviderRateLimitOptions, M as isPackagePath, N as loadFromPackage, P as redteamProviderManager, j as runExtensionHook, k as collectFileMetadata, u as GoogleLiveProvider, v as checkExfilTracking, w as getSessionId } from "./providers-BlEhY5mi.js";
+import { o as getCache } from "./cache-mIszOnuz.js";
+import { n as isNonTransientHttpStatus } from "./errors-DnGCbnx8.js";
+import { i as isJavascriptFile } from "./fileExtensions-BpuMmaFL.js";
+import { E as parseFileUrl, F as isAnthropicProvider, I as isGoogleProvider, L as isOpenAiProvider, R as isProviderAllowed, T as loadFunction, g as maybeLoadToolsFromExternalFile, w as getNunjucksEngine } from "./util-BSh4a_Q8.js";
+import { r as runPython } from "./pythonUtils-r1uBuA0n.js";
+import { n as transform, r as getProcessShim, t as TransformInputType } from "./transform-CqTFr7KR.js";
+import { $ as matchesSearchRubric, B as getAndCheckProvider, G as matchesContextFaithfulness, H as matchesAnswerRelevance, J as matchesFactuality, K as matchesContextRecall, Q as matchesPiScore, R as callProviderWithContext, U as matchesClassification, V as loadRubricPrompt, W as matchesClosedQa, X as matchesLlmRubric, Y as matchesGEval, Z as matchesModeration, at as DefaultSuggestionsProvider, dt as getFinalTest, et as matchesSelectBest, ft as loadFromJavaScriptFile, it as getDefaultProviders, lt as SUGGEST_PROMPTS_SYSTEM_MESSAGE, mt as resolveContext, n as getGraderById, nt as selectMaxScore, pt as processFileReference, q as matchesContextRelevance, tt as matchesSimilarity, ut as coerceString, z as fail } from "./graders-BaMCwIKp.js";
+import { i as generateIdFromPrompt } from "./utils-JaY9veb5.js";
+import { t as extractAndStoreBinaryData } from "./extractor-LSYjrhK0.js";
+import { t as OpenAiChatCompletionProvider } from "./chat-DIywASPG.js";
+import { a as createEmptyTokenUsage, i as createEmptyAssertions, n as accumulateResponseTokenUsage, o as normalizeTokenUsage, r as accumulateTokenUsage, t as accumulateAssertionTokenUsage } from "./tokenUsageUtils-DmZSD2eU.js";
+import { m as validateFunctionCall } from "./transform-CoP2bJ7P.js";
+import { l as validateFunctionCall$1 } from "./util-CUEt0Vum.js";
+import { n as getTraceStore } from "./store-D4gdn9ih.js";
+import { t as providerRegistry } from "./providerRegistry-Xf0qdqGQ.js";
+import { n as runRuby } from "./rubyUtils-BtjlqyXt.js";
+import { a as getActualPromptWithFallback, r as updateSignalFile } from "./signal-Bl32q42d.js";
 import chalk from "chalk";
 import fs, { createWriteStream } from "fs";
 import path from "path";
@@ -259,7 +260,7 @@ async function startOtlpReceiverIfNeeded(testSuite) {
 		telemetry_default.record("feature_used", { feature: "tracing" });
 		try {
 			logger_default.debug("[EvaluatorTracing] Tracing configuration detected, starting OTLP receiver");
-			const { startOTLPReceiver } = await import("./otlpReceiver-C-1cdVDr.js");
+			const { startOTLPReceiver } = await import("./otlpReceiver-Dg817agV.js");
 			const port = testSuite.tracing.otlp.http.port || 4318;
 			const host = testSuite.tracing.otlp.http.host || "127.0.0.1";
 			logger_default.debug(`[EvaluatorTracing] Starting OTLP receiver on ${host}:${port}`);
@@ -282,7 +283,7 @@ async function startOtlpReceiverIfNeeded(testSuite) {
 async function stopOtlpReceiverIfNeeded() {
 	if (otlpReceiverStarted) try {
 		logger_default.debug("[EvaluatorTracing] Stopping OTLP receiver");
-		const { stopOTLPReceiver } = await import("./otlpReceiver-C-1cdVDr.js");
+		const { stopOTLPReceiver } = await import("./otlpReceiver-Dg817agV.js");
 		await stopOTLPReceiver();
 		otlpReceiverStarted = false;
 		logger_default.info("[EvaluatorTracing] OTLP receiver stopped successfully");
@@ -317,7 +318,7 @@ async function generateTraceContextIfNeeded(test, evaluateOptions, testIdx, prom
 	}
 	if (!tracingEnabled) return null;
 	logger_default.debug("[EvaluatorTracing] Importing trace store");
-	const { getTraceStore } = await import("./store-CuDU_jDN.js");
+	const { getTraceStore } = await import("./store-5u2yriTV.js");
 	const traceStore = getTraceStore();
 	const traceId = generateTraceId();
 	const spanId = generateSpanId();
@@ -2685,7 +2686,7 @@ const ASSERTION_HANDLERS = {
 	"llm-rubric": handleLlmRubric,
 	meteor: async (params) => {
 		try {
-			const { handleMeteorAssertion } = await import("./meteor-DLCdreag.js");
+			const { handleMeteorAssertion } = await import("./meteor-P2rUE-Uz.js");
 			return handleMeteorAssertion(params);
 		} catch (error) {
 			if (error instanceof Error && (error.message.includes("Cannot find module") || error.message.includes("natural\" package is required"))) return {
@@ -2795,9 +2796,9 @@ async function runAssertion({ prompt, provider, assertion, test, vars, latencyMs
 		let filePath = fileRef;
 		let functionName;
 		if (fileRef.includes(":")) {
-			const [pathPart, funcPart] = fileRef.split(":");
-			filePath = pathPart;
-			functionName = funcPart;
+			const colonIndex = fileRef.indexOf(":");
+			filePath = fileRef.slice(0, colonIndex);
+			functionName = fileRef.slice(colonIndex + 1);
 		}
 		filePath = path.resolve(basePath, filePath);
 		if (isJavascriptFile(filePath)) {
@@ -2815,7 +2816,7 @@ async function runAssertion({ prompt, provider, assertion, test, vars, latencyMs
 			};
 		}
 		else if (filePath.endsWith(".rb")) try {
-			const { runRuby } = await import("./rubyUtils-BA4D4gMX.js");
+			const { runRuby } = await import("./rubyUtils-D7--T12C.js");
 			valueFromScript = await runRuby(filePath, functionName || "get_assert", [output, context]);
 			logger_default.debug(`Ruby script ${filePath} output: ${valueFromScript}`);
 		} catch (error) {
@@ -3805,7 +3806,7 @@ async function runEval({ provider, prompt, test, testSuite, delay, nunjucksFilte
 			promptIdx,
 			testIdx
 		});
-		logger_default.error("Provider call failed during eval", logContext);
+		if (!(err instanceof Error && err.name === "AbortError")) logger_default.error("Provider call failed during eval", logContext);
 		return [{
 			...setup,
 			error: errorWithStack,
@@ -3986,11 +3987,17 @@ var Evaluator = class {
 		let globalTimeout;
 		let globalAbortController;
 		const processedIndices = /* @__PURE__ */ new Set();
+		let targetUnavailable = false;
+		let targetErrorStatus;
+		const targetErrorAbortController = new AbortController();
 		let ciProgressReporter = null;
 		let progressBarManager = null;
+		let providerAbortSignal = options.abortSignal;
+		let combinedAbortSignal = options.abortSignal ? AbortSignal.any([options.abortSignal, targetErrorAbortController.signal]) : targetErrorAbortController.signal;
 		if (maxEvalTimeMs > 0) {
 			globalAbortController = new AbortController();
-			options.abortSignal = options.abortSignal ? AbortSignal.any([options.abortSignal, globalAbortController.signal]) : globalAbortController.signal;
+			providerAbortSignal = providerAbortSignal ? AbortSignal.any([providerAbortSignal, globalAbortController.signal]) : globalAbortController.signal;
+			combinedAbortSignal = AbortSignal.any([combinedAbortSignal, globalAbortController.signal]);
 			globalTimeout = setTimeout(() => {
 				evalTimedOut = true;
 				globalAbortController?.abort();
@@ -3998,7 +4005,7 @@ var Evaluator = class {
 		}
 		const vars = /* @__PURE__ */ new Set();
 		const checkAbort = () => {
-			if (options.abortSignal?.aborted) throw new Error("Operation cancelled");
+			if (combinedAbortSignal.aborted) throw new Error("Operation cancelled");
 		};
 		if (!options.silent) logger_default.info(`Starting evaluation ${this.evalRecord.id}`);
 		checkAbort();
@@ -4159,7 +4166,7 @@ var Evaluator = class {
 				const defaultProvider = testSuite.defaultTest.provider;
 				if (isApiProvider(defaultProvider)) testCase.provider = defaultProvider;
 				else if (typeof defaultProvider === "object" && defaultProvider.id) {
-					const { loadApiProvider } = await import("./providers-DVsoSup2.js");
+					const { loadApiProvider } = await import("./providers-Ck8HyrC-.js");
 					testCase.provider = await loadApiProvider(typeof defaultProvider.id === "function" ? defaultProvider.id() : defaultProvider.id, { options: defaultProvider });
 				} else testCase.provider = defaultProvider;
 			}
@@ -4229,7 +4236,7 @@ var Evaluator = class {
 							registers: this.registers,
 							isRedteam: testSuite.redteam != null,
 							concurrency,
-							abortSignal: options.abortSignal,
+							abortSignal: providerAbortSignal,
 							evalId: this.evalRecord.id,
 							rateLimitRegistry: this.rateLimitRegistry
 						});
@@ -4243,7 +4250,7 @@ var Evaluator = class {
 			if (evalOption.test.assert?.some((a) => a.type === "max-score")) rowsWithMaxScoreAssertion.add(evalOption.testIdx);
 		}
 		if (cliState_default.resume && this.evalRecord.persisted) try {
-			const { default: EvalResult } = await import("./evalResult-Boel8xoS.js");
+			const { default: EvalResult } = await import("./evalResult-CzLURDcP.js");
 			const completedPairs = await EvalResult.getCompletedIndexPairs(this.evalRecord.id, { excludeErrors: cliState_default.retryMode });
 			const originalCount = runEvalOptions.length;
 			for (let i = runEvalOptions.length - 1; i >= 0; i--) {
@@ -4296,6 +4303,14 @@ var Evaluator = class {
 					logger_default.error(`Error saving result: ${error} ${safeJsonStringify(resultSummary)}`);
 				}
 				for (const writer of this.fileWriters) await writer.write(row);
+				const httpStatus = row.response?.metadata?.http?.status;
+				if (typeof httpStatus === "number" && isNonTransientHttpStatus(httpStatus)) {
+					targetUnavailable = true;
+					targetErrorStatus = httpStatus;
+					logger_default.error(`Target returned HTTP ${httpStatus}. Aborting scan - this error will not resolve on retry.`);
+					targetErrorAbortController.abort();
+					break;
+				}
 				const { promptIdx } = row;
 				const metrics = prompts[promptIdx].metrics;
 				invariant(metrics, "Expected prompt.metrics to be set");
@@ -4459,6 +4474,7 @@ var Evaluator = class {
 		if (this.options.showProgressBar && progressBarManager) await progressBarManager.initialize(runEvalOptions, concurrency, 0);
 		try {
 			if (serialRunEvalOptions.length > 0) for (const evalStep of serialRunEvalOptions) {
+				checkAbort();
 				if (isWebUI) {
 					const provider = evalStep.provider.label || evalStep.provider.id();
 					const vars = formatVarsForDisplay(evalStep.test.vars || {}, 50);
@@ -4476,22 +4492,32 @@ var Evaluator = class {
 				await this.evalRecord.addPrompts(prompts);
 			});
 		} catch (err) {
-			if (options.abortSignal?.aborted) if (evalTimedOut) logger_default.warn(`Evaluation stopped after reaching max duration (${maxEvalTimeMs}ms)`);
-			else {
-				logger_default.info("Evaluation interrupted, saving progress...");
-				if (globalTimeout) clearTimeout(globalTimeout);
-				if (progressBarManager) progressBarManager.stop();
-				if (ciProgressReporter) ciProgressReporter.finish();
-				this.evalRecord.setVars(Array.from(vars));
-				await this.evalRecord.addPrompts(prompts);
-				updateSignalFile(this.evalRecord.id);
-				return this.evalRecord;
-			}
-			else {
+			if (combinedAbortSignal.aborted) {
+				if (evalTimedOut) logger_default.warn(`Evaluation stopped after reaching max duration (${maxEvalTimeMs}ms)`);
+				else if (!targetUnavailable) {
+					logger_default.info("Evaluation interrupted, saving progress...");
+					if (globalTimeout) clearTimeout(globalTimeout);
+					if (progressBarManager) progressBarManager.stop();
+					if (ciProgressReporter) ciProgressReporter.finish();
+					this.evalRecord.setVars(Array.from(vars));
+					await this.evalRecord.addPrompts(prompts);
+					updateSignalFile(this.evalRecord.id);
+					return this.evalRecord;
+				}
+			} else {
 				if (ciProgressReporter) ciProgressReporter.error(`Evaluation failed: ${String(err)}`);
 				throw err;
 			}
 		}
+		if (targetUnavailable) {
+			if (globalTimeout) clearTimeout(globalTimeout);
+			if (progressBarManager) progressBarManager.stop();
+			if (ciProgressReporter) ciProgressReporter.error(`Target unavailable (HTTP ${targetErrorStatus})`);
+			this.evalRecord.setVars(Array.from(vars));
+			await this.evalRecord.addPrompts(prompts);
+			updateSignalFile(this.evalRecord.id);
+			return this.evalRecord;
+		}
 		const compareRowsCount = rowsWithSelectBestAssertion.size + rowsWithMaxScoreAssertion.size;
 		if (progressBarManager) {
 			if (compareRowsCount > 0) progressBarManager.updateTotalCount(compareRowsCount);
@@ -4788,4 +4814,4 @@ function evaluate(testSuite, evalRecord, options) {
 
 //#endregion
 export { runEval as a, readAssertions as c, isAllowedPrompt as i, renderMetricName as l, formatVarsForDisplay as n, doesPromptRefMatch as o, generateVarCombinations as r, assertions_default as s, evaluate as t, runAssertions as u };
-//# sourceMappingURL=evaluator-1Tkdu8MK.js.map
+//# sourceMappingURL=evaluator-3EJCMTs0.js.map

package/dist/src/{extractor-BPBlLyOn.cjs → extractor-DbhlYEeo.cjs}

@@ -1,7 +1,7 @@
 const require_logger = require('./logger-BdZ-IqBc.cjs');
-const require_fetch = require('./fetch-Dy2YML9G.cjs');
-const require_accounts = require('./accounts-CwqY22lU.cjs');
-const require_blobs = require('./blobs-_kNRY6vU.cjs');
+const require_fetch = require('./fetch-ZMn_oemb.cjs');
+const require_accounts = require('./accounts-BzEY8H3v.cjs');
+const require_blobs = require('./blobs-673H0jCl.cjs');
 let crypto = require("crypto");
 
 //#region src/util/createHash.ts
@@ -39,7 +39,7 @@ async function uploadBlobRemote(buffer, mimeType, context) {
 	const apiKey = require_fetch.cloudConfig.getApiKey();
 	if (!url || !apiKey) return null;
 	try {
-		const { fetchWithProxy } = await Promise.resolve().then(() => require("./fetch-DwhKew9e.cjs"));
+		const { fetchWithProxy } = await Promise.resolve().then(() => require("./fetch-CMptBDVg.cjs"));
 		const response = await fetchWithProxy(url, {
 			method: "POST",
 			headers: {
@@ -254,6 +254,23 @@ async function extractAndStoreBinaryData(response, context) {
 			});
 		}
 	}
+	if (response.images?.length) next.images = await Promise.all(response.images.map(async (img, idx) => {
+		if (!img.data || typeof img.data !== "string" || !isDataUrl(img.data)) return img;
+		const stored = await maybeStore(img.data, img.mimeType || "image/png", blobContext, `response.images[${idx}].data`, "image");
+		if (stored) {
+			mutated = true;
+			require_logger.logger_default.debug("[BlobExtractor] Stored image blob", {
+				...context,
+				hash: stored.hash
+			});
+			return {
+				...img,
+				data: void 0,
+				blobRef: stored
+			};
+		}
+		return img;
+	}));
 	const turns = response.turns;
 	if (Array.isArray(turns)) next.turns = await Promise.all(turns.map(async (turn, idx) => {
 		if (turn?.audio?.data && typeof turn.audio.data === "string") {
@@ -398,4 +415,4 @@ Object.defineProperty(exports, 'shouldAttemptRemoteBlobUpload', {
     return shouldAttemptRemoteBlobUpload;
   }
 });
-//# sourceMappingURL=extractor-BPBlLyOn.cjs.map
+//# sourceMappingURL=extractor-DbhlYEeo.cjs.map

package/dist/src/{extractor-CuUWqwrE.js → extractor-Hs7la_19.js}

@@ -1,7 +1,7 @@
 import { _ as getEnvBool, i as logger_default } from "./logger-w8Ozp0Td.js";
-import { c as cloudConfig } from "./fetch-zJuFPxN1.js";
-import { o as isLoggedIntoCloud } from "./accounts-BSwMxhY3.js";
-import { a as BLOB_MIN_SIZE, i as BLOB_MAX_SIZE, n as recordBlobReference, r as storeBlob } from "./blobs-Dnt2rxpc.js";
+import { c as cloudConfig } from "./fetch-18MuNu9i.js";
+import { o as isLoggedIntoCloud } from "./accounts-R3gfCR_g.js";
+import { a as BLOB_MIN_SIZE, i as BLOB_MAX_SIZE, n as recordBlobReference, r as storeBlob } from "./blobs-C9J2mVgo.js";
 import { createHash } from "crypto";
 
 //#region src/util/createHash.ts
@@ -39,7 +39,7 @@ async function uploadBlobRemote(buffer, mimeType, context) {
 	const apiKey = cloudConfig.getApiKey();
 	if (!url || !apiKey) return null;
 	try {
-		const { fetchWithProxy } = await import("./fetch-BdiCecAv.js");
+		const { fetchWithProxy } = await import("./fetch-Bi0o-fdp.js");
 		const response = await fetchWithProxy(url, {
 			method: "POST",
 			headers: {
@@ -254,6 +254,23 @@ async function extractAndStoreBinaryData(response, context) {
 			});
 		}
 	}
+	if (response.images?.length) next.images = await Promise.all(response.images.map(async (img, idx) => {
+		if (!img.data || typeof img.data !== "string" || !isDataUrl(img.data)) return img;
+		const stored = await maybeStore(img.data, img.mimeType || "image/png", blobContext, `response.images[${idx}].data`, "image");
+		if (stored) {
+			mutated = true;
+			logger_default.debug("[BlobExtractor] Stored image blob", {
+				...context,
+				hash: stored.hash
+			});
+			return {
+				...img,
+				data: void 0,
+				blobRef: stored
+			};
+		}
+		return img;
+	}));
 	const turns = response.turns;
 	if (Array.isArray(turns)) next.turns = await Promise.all(turns.map(async (turn, idx) => {
 		if (turn?.audio?.data && typeof turn.audio.data === "string") {
@@ -369,4 +386,4 @@ async function recordExistingBlobReferences(value, context, location) {
 
 //#endregion
 export { sha256 as a, randomSequence as i, isBlobStorageEnabled as n, shouldAttemptRemoteBlobUpload as r, extractAndStoreBinaryData as t };
-//# sourceMappingURL=extractor-CuUWqwrE.js.map
+//# sourceMappingURL=extractor-Hs7la_19.js.map

package/dist/src/{extractor-BFoThUOa.js → extractor-LSYjrhK0.js}

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 import { b as getEnvBool, o as logger_default } from "./logger-BotXmWKW.js";
-import { c as isLoggedIntoCloud } from "./accounts-Bzx8GnL6.js";
-import { i as cloudConfig } from "./cloud-lRosK6Nk.js";
-import { a as BLOB_MAX_SIZE, i as storeBlob, o as BLOB_MIN_SIZE, r as recordBlobReference } from "./blobs-DlB5fwyF.js";
+import { c as isLoggedIntoCloud } from "./accounts-DHHiXsy6.js";
+import { i as cloudConfig } from "./cloud-BMbRVJFw.js";
+import { a as BLOB_MAX_SIZE, i as storeBlob, o as BLOB_MIN_SIZE, r as recordBlobReference } from "./blobs-kt8v3UyH.js";
 import { createHash } from "crypto";
 
 //#region src/util/createHash.ts
@@ -40,7 +40,7 @@ async function uploadBlobRemote(buffer, mimeType, context) {
 	const apiKey = cloudConfig.getApiKey();
 	if (!url || !apiKey) return null;
 	try {
-		const { fetchWithProxy } = await import("./fetch-BQgz6x7S.js");
+		const { fetchWithProxy } = await import("./fetch-DAZkv3gV.js");
 		const response = await fetchWithProxy(url, {
 			method: "POST",
 			headers: {
@@ -255,6 +255,23 @@ async function extractAndStoreBinaryData(response, context) {
 			});
 		}
 	}
+	if (response.images?.length) next.images = await Promise.all(response.images.map(async (img, idx) => {
+		if (!img.data || typeof img.data !== "string" || !isDataUrl(img.data)) return img;
+		const stored = await maybeStore(img.data, img.mimeType || "image/png", blobContext, `response.images[${idx}].data`, "image");
+		if (stored) {
+			mutated = true;
+			logger_default.debug("[BlobExtractor] Stored image blob", {
+				...context,
+				hash: stored.hash
+			});
+			return {
+				...img,
+				data: void 0,
+				blobRef: stored
+			};
+		}
+		return img;
+	}));
 	const turns = response.turns;
 	if (Array.isArray(turns)) next.turns = await Promise.all(turns.map(async (turn, idx) => {
 		if (turn?.audio?.data && typeof turn.audio.data === "string") {
@@ -370,4 +387,4 @@ async function recordExistingBlobReferences(value, context, location) {
 
 //#endregion
 export { sha256 as a, randomSequence as i, isBlobStorageEnabled as n, shouldAttemptRemoteBlobUpload as r, extractAndStoreBinaryData as t };
-//# sourceMappingURL=extractor-BFoThUOa.js.map
+//# sourceMappingURL=extractor-LSYjrhK0.js.map

package/dist/src/{fetch-zJuFPxN1.js → fetch-18MuNu9i.js}

@@ -24,7 +24,7 @@ const HUMAN_ASSERTION_TYPE = "human";
 * Application version from package.json.
 * Injected at build time, or read from npm environment in development.
 */
-const VERSION = "0.120.25";
+const VERSION = "0.120.26";
 /**
 * PostHog analytics key.
 * Only populated during production builds via PROMPTFOO_POSTHOG_KEY env var.
@@ -415,7 +415,7 @@ var CloudConfig = class {
 	}
 	async validateAndSetApiToken(token, apiHost) {
 		try {
-			const { fetchWithProxy } = await import("./fetch-BdiCecAv.js");
+			const { fetchWithProxy } = await import("./fetch-Bi0o-fdp.js");
 			const response = await fetchWithProxy(`${apiHost}/api/v1/users/me`, { headers: { Authorization: `Bearer ${token}` } });
 			if (!response.ok) {
 				const errorMessage = await response.text();
@@ -644,7 +644,7 @@ async function fetchWithProxy(url, options = {}, abortSignal) {
 		logger_default.warn(`Failed to read CA certificate from ${caCertPath}: ${e}`);
 	}
 	const proxyUrl = finalUrlString ? getProxyForUrl(finalUrlString) : "";
-	if (proxyUrl) {
+	if (!finalOptions.dispatcher) if (proxyUrl) {
 		logger_default.debug(`Using proxy: ${sanitizeUrl(proxyUrl)}`);
 		finalOptions.dispatcher = getOrCreateProxyAgent(proxyUrl, tlsOptions);
 	} else finalOptions.dispatcher = getOrCreateAgent(tlsOptions);
@@ -760,4 +760,4 @@ async function fetchWithRetries(url, options = {}, timeout, maxRetries) {
 
 //#endregion
 export { EVENTS_ENDPOINT as A, toTitleCase as C, CONSENT_ENDPOINT as D, CLOUD_PROVIDER_PREFIX as E, getShareViewBaseUrl as F, POSTHOG_KEY as I, VERSION as L, TERMINAL_MAX_WIDTH as M, getDefaultShareViewBaseUrl as N, DEFAULT_MAX_CONCURRENCY as O, getShareApiBaseUrl as P, FILE_METADATA_KEY as R, parseChatPrompt as S, transformTools as T, isOpenAIToolArray as _, isRateLimited as a, openaiToolChoiceToBedrock as b, cloudConfig as c, writeGlobalConfigPartial as d, getCurrentTimestamp as f, calculateCost as g, REQUEST_TIMEOUT_MS as h, handleRateLimit as i, R_ENDPOINT as j, DEFAULT_QUERY_LIMIT as k, readGlobalConfig as l, LONG_RUNNING_MODEL_TIMEOUT_MS as m, fetchWithRetries as n, isTransientError as o, sleep as p, fetchWithTimeout as r, CloudConfig as s, fetchWithProxy as t, writeGlobalConfig as u, isOpenAIToolChoice as v, transformToolChoice as w, openaiToolsToBedrock as x, isPromptfooSampleTarget as y, HUMAN_ASSERTION_TYPE as z };
-//# sourceMappingURL=fetch-zJuFPxN1.js.map
+//# sourceMappingURL=fetch-18MuNu9i.js.map

package/dist/src/{fetch-BdiCecAv.js → fetch-Bi0o-fdp.js}

@@ -1,4 +1,4 @@
 import "./logger-w8Ozp0Td.js";
-import { a as isRateLimited, i as handleRateLimit, n as fetchWithRetries, o as isTransientError, r as fetchWithTimeout, t as fetchWithProxy } from "./fetch-zJuFPxN1.js";
+import { a as isRateLimited, i as handleRateLimit, n as fetchWithRetries, o as isTransientError, r as fetchWithTimeout, t as fetchWithProxy } from "./fetch-18MuNu9i.js";
 
 export { fetchWithProxy };

package/dist/src/fetch-CMptBDVg.cjs

@@ -0,0 +1,4 @@
+require('./logger-BdZ-IqBc.cjs');
+const require_fetch = require('./fetch-ZMn_oemb.cjs');
+
+exports.fetchWithProxy = require_fetch.fetchWithProxy;

package/dist/src/{fetch-BQgz6x7S.js → fetch-DAZkv3gV.js}

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import "./logger-BotXmWKW.js";
-import { a as handleRateLimit, i as fetchWithTimeout, n as fetchWithProxy, o as isRateLimited, r as fetchWithRetries, s as isTransientError, t as clearAgentCache } from "./fetch-BuP-gm0E.js";
-import "./cloud-lRosK6Nk.js";
+import { a as handleRateLimit, i as fetchWithTimeout, n as fetchWithProxy, o as isRateLimited, r as fetchWithRetries, s as isTransientError, t as clearAgentCache } from "./fetch-SRsE6Ctl.js";
+import "./cloud-BMbRVJFw.js";
 
 export { fetchWithProxy };

package/dist/src/{fetch-BuP-gm0E.js → fetch-SRsE6Ctl.js}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { C as getEnvString, O as cliState_default, S as getEnvInt, a as logRequestResponse, b as getEnvBool, o as logger_default, u as sanitizeUrl } from "./logger-BotXmWKW.js";
 import { t as invariant } from "./invariant-DT20jrBd.js";
-import { i as cloudConfig, n as CLOUD_API_HOST } from "./cloud-lRosK6Nk.js";
+import { i as cloudConfig, n as CLOUD_API_HOST } from "./cloud-BMbRVJFw.js";
 import { Agent, ProxyAgent } from "undici";
 import path from "path";
 import yaml from "js-yaml";
@@ -24,7 +24,7 @@ const HUMAN_ASSERTION_TYPE = "human";
 * Application version from package.json.
 * Injected at build time, or read from npm environment in development.
 */
-const VERSION = "0.120.25";
+const VERSION = "0.120.26";
 /**
 * PostHog analytics key.
 * Only populated during production builds via PROMPTFOO_POSTHOG_KEY env var.
@@ -473,7 +473,7 @@ async function fetchWithProxy(url, options = {}, abortSignal) {
 		logger_default.warn(`Failed to read CA certificate from ${caCertPath}: ${e}`);
 	}
 	const proxyUrl = finalUrlString ? getProxyForUrl(finalUrlString) : "";
-	if (proxyUrl) {
+	if (!finalOptions.dispatcher) if (proxyUrl) {
 		logger_default.debug(`Using proxy: ${sanitizeUrl(proxyUrl)}`);
 		finalOptions.dispatcher = getOrCreateProxyAgent(proxyUrl, tlsOptions);
 	} else finalOptions.dispatcher = getOrCreateAgent(tlsOptions);
@@ -589,4 +589,4 @@ async function fetchWithRetries(url, options = {}, timeout, maxRetries) {
 
 //#endregion
 export { getDefaultShareViewBaseUrl as A, CONSENT_ENDPOINT as C, R_ENDPOINT as D, EVENTS_ENDPOINT as E, FILE_METADATA_KEY as F, HUMAN_ASSERTION_TYPE as I, getShareViewBaseUrl as M, POSTHOG_KEY as N, TERMINAL_MAX_WIDTH as O, VERSION as P, CLOUD_PROVIDER_PREFIX as S, DEFAULT_QUERY_LIMIT as T, openaiToolsToBedrock as _, handleRateLimit as a, transformToolChoice as b, getCurrentTimestamp as c, REQUEST_TIMEOUT_MS as d, calculateCost as f, openaiToolChoiceToBedrock as g, isPromptfooSampleTarget as h, fetchWithTimeout as i, getShareApiBaseUrl as j, getDefaultPort as k, sleep as l, isOpenAIToolChoice as m, fetchWithProxy as n, isRateLimited as o, isOpenAIToolArray as p, fetchWithRetries as r, isTransientError as s, clearAgentCache as t, LONG_RUNNING_MODEL_TIMEOUT_MS as u, parseChatPrompt as v, DEFAULT_MAX_CONCURRENCY as w, transformTools as x, toTitleCase as y };
-//# sourceMappingURL=fetch-BuP-gm0E.js.map
+//# sourceMappingURL=fetch-SRsE6Ctl.js.map

package/dist/src/{fetch-Dy2YML9G.cjs → fetch-ZMn_oemb.cjs}

@@ -27,7 +27,7 @@ const HUMAN_ASSERTION_TYPE = "human";
 * Application version from package.json.
 * Injected at build time, or read from npm environment in development.
 */
-const VERSION = "0.120.25";
+const VERSION = "0.120.26";
 /**
 * PostHog analytics key.
 * Only populated during production builds via PROMPTFOO_POSTHOG_KEY env var.
@@ -418,7 +418,7 @@ var CloudConfig = class {
 	}
 	async validateAndSetApiToken(token, apiHost) {
 		try {
-			const { fetchWithProxy } = await Promise.resolve().then(() => require("./fetch-DwhKew9e.cjs"));
+			const { fetchWithProxy } = await Promise.resolve().then(() => require("./fetch-CMptBDVg.cjs"));
 			const response = await fetchWithProxy(`${apiHost}/api/v1/users/me`, { headers: { Authorization: `Bearer ${token}` } });
 			if (!response.ok) {
 				const errorMessage = await response.text();
@@ -647,7 +647,7 @@ async function fetchWithProxy(url, options = {}, abortSignal) {
 		require_logger.logger_default.warn(`Failed to read CA certificate from ${caCertPath}: ${e}`);
 	}
 	const proxyUrl = finalUrlString ? (0, proxy_from_env.getProxyForUrl)(finalUrlString) : "";
-	if (proxyUrl) {
+	if (!finalOptions.dispatcher) if (proxyUrl) {
 		require_logger.logger_default.debug(`Using proxy: ${require_logger.sanitizeUrl(proxyUrl)}`);
 		finalOptions.dispatcher = getOrCreateProxyAgent(proxyUrl, tlsOptions);
 	} else finalOptions.dispatcher = getOrCreateAgent(tlsOptions);
@@ -996,4 +996,4 @@ Object.defineProperty(exports, 'writeGlobalConfigPartial', {
     return writeGlobalConfigPartial;
   }
 });
-//# sourceMappingURL=fetch-Dy2YML9G.cjs.map
+//# sourceMappingURL=fetch-ZMn_oemb.cjs.map

package/dist/src/{fileExtensions-CzcPkiKZ.js → fileExtensions-BpuMmaFL.js}

@@ -83,4 +83,4 @@ function isAudioFile(filePath) {
 
 //#endregion
 export { isVideoFile as a, isJavascriptFile as i, isAudioFile as n, isImageFile as r, JAVASCRIPT_EXTENSIONS as t };
-//# sourceMappingURL=fileExtensions-CzcPkiKZ.js.map
+//# sourceMappingURL=fileExtensions-BpuMmaFL.js.map

package/dist/src/{formatDuration-CGa0ZDQ8.js → formatDuration-Doo0xq-z.js}

@@ -20,4 +20,4 @@ function formatDuration(seconds) {
 
 //#endregion
 export { formatDuration as t };
-//# sourceMappingURL=formatDuration-CGa0ZDQ8.js.map
+//# sourceMappingURL=formatDuration-Doo0xq-z.js.map

package/dist/src/{genaiTracer-foKtbVa2.js → genaiTracer-CqNnnXrE.js}

@@ -255,4 +255,4 @@ function getTraceparent() {
 
 //#endregion
 export { withGenAISpan as n, getTraceparent as t };
-//# sourceMappingURL=genaiTracer-foKtbVa2.js.map
+//# sourceMappingURL=genaiTracer-CqNnnXrE.js.map

package/dist/src/graders-BCytzXrb.js

@@ -0,0 +1,34 @@
+import "./chunk-FhC4c-0y.js";
+import "./logger-w8Ozp0Td.js";
+import "./esm-rDtG_2rg.js";
+import "./pythonUtils-vMlk9Qp5.js";
+import "./transform-D8dILpfZ.js";
+import { n as getGraderById, t as GRADERS } from "./graders-QsALpIdy.js";
+import "./types-DMVjYLpx.js";
+import "./util-DiCePfDu.js";
+import "./fetch-18MuNu9i.js";
+import "./cache-BLLayYEN.js";
+import "./providers-BiNq_Iyc.js";
+import "./utils-CVzb4YiI.js";
+import "./extractor-Hs7la_19.js";
+import "./genaiTracer-Ce19n68P.js";
+import "./chat-C8Ei4f87.js";
+import "./transform-DMaxQwDx.js";
+import "./messages-CDZYGNlS.js";
+import "./util-mJ58qbbw.js";
+import "./responses-DLLjADw5.js";
+import "./openai-Dz3surb_.js";
+import "./util-Cl0zfT3V.js";
+import "./completion-D9_MDlnd.js";
+import "./accounts-R3gfCR_g.js";
+import "./server-CbMTRQkg.js";
+import "./blobs-C9J2mVgo.js";
+import "./tables-D-NSwNIb.js";
+import "./telemetry-DZ_7PaVq.js";
+import "./store-2ocbYY9D.js";
+import "./base-Dtp8b4_N.js";
+import "./image-BiEVdpdP.js";
+import "./providerRegistry-wCWd7sKQ.js";
+import "./rubyUtils-Cs35SDYa.js";
+
+export { getGraderById };