promptfoo 0.121.5 → 0.121.8

package/dist/src/{fetch-D9xxyC1p.js → fetch-Doks14zQ.js}

@@ -1,11 +1,12 @@
 import { t as __exportAll } from "./chunk-DEq-mXcV.js";
 import { S as getEnvBool, T as getEnvString, a as logger, i as logRequestResponse, k as state, p as sanitizeUrl, w as getEnvInt, x as getConfigDirectoryPath } from "./logger-Ct2S6Yx-.js";
 import { t as invariant } from "./invariant-Ddh24eXh.js";
-import { n as VERSION } from "./version-CbuBKu2U.js";
+import { n as VERSION } from "./version-qVEN5qCm.js";
 import * as fs$2 from "fs";
 import * as path$1 from "path";
 import path from "path";
 import yaml from "js-yaml";
+import { AsyncLocalStorage } from "node:async_hooks";
 import * as fsPromises from "fs/promises";
 import { getProxyForUrl } from "proxy-from-env";
 import { Agent, ProxyAgent } from "undici";
@@ -72,7 +73,10 @@ function writeGlobalConfigPartial(partialConfig) {
 	});
 	writeGlobalConfig(updatedConfig);
 }
-const API_HOST = getEnvString("API_HOST", "https://api.promptfoo.app");
+//#endregion
+//#region src/globalConfig/cloud.ts
+const CLOUD_API_HOST = "https://api.promptfoo.app";
+const API_HOST = getEnvString("API_HOST", CLOUD_API_HOST);
 const SHARING_CUTOFF_DATE = /* @__PURE__ */ new Date("2026-03-09T00:00:00Z");
 var CloudConfig = class {
 	config;
@@ -272,8 +276,8 @@ function calculateCost(modelName, config, promptTokens, completionTokens, models
 	const model = models.find((m) => m.id === modelName);
 	if (!model || !model.cost) return;
 	const longContextCost = model.cost.longContext && promptTokens > model.cost.longContext.threshold ? model.cost.longContext : void 0;
-	const inputCost = config.cost ?? longContextCost?.input ?? model.cost.input;
-	const outputCost = config.cost ?? longContextCost?.output ?? model.cost.output;
+	const inputCost = config.inputCost ?? config.cost ?? longContextCost?.input ?? model.cost.input;
+	const outputCost = config.outputCost ?? config.cost ?? longContextCost?.output ?? model.cost.output;
 	return inputCost * promptTokens + outputCost * completionTokens;
 }
 /**
@@ -649,6 +653,14 @@ function isConnectionError(error) {
 /**
 * Enhanced fetch wrapper that adds logging, authentication, error handling, and optional compression
 */
+function isPromptfooCloudApiHost(url) {
+	try {
+		const targetUrl = url instanceof Request ? url.url : url.toString();
+		return new URL(targetUrl).origin === CLOUD_API_HOST;
+	} catch {
+		return false;
+	}
+}
 async function monkeyPatchFetch(url, options) {
 	const NO_LOG_URLS = [
 		R_ENDPOINT,
@@ -668,7 +680,7 @@ async function monkeyPatchFetch(url, options) {
 	} catch (e) {
 		logger.warn(`Failed to compress request body: ${e}`);
 	}
-	if (typeof url === "string" && url.startsWith("https://api.promptfoo.app") || url instanceof URL && url.host === "https://api.promptfoo.app".replace(/^https?:\/\//, "")) {
+	if (isPromptfooCloudApiHost(url)) {
 		const token = cloudConfig.getApiKey();
 		opts.headers = {
 			...opts.headers || {},
@@ -702,11 +714,31 @@ async function monkeyPatchFetch(url, options) {
 	}
 }
 //#endregion
+//#region src/util/fetch/retryContext.ts
+const fetchRetryContext = new AsyncLocalStorage();
+/**
+* Run `fn` with a fetch retry context so nested `fetchWithRetries` /
+* `fetchWithProxy` calls inherit the provider's configured `maxRetries`.
+*
+* When `maxRetries` is `undefined`, the new scope deliberately shadows any
+* outer provider context so providers without an override fall back to defaults.
+*/
+function withFetchRetryContext(maxRetries, fn) {
+	return fetchRetryContext.run({ maxRetries }, fn);
+}
+/**
+* Read the active context's `maxRetries`, or `undefined` when none is set.
+*/
+function getFetchRetryContextMaxRetries() {
+	return fetchRetryContext.getStore()?.maxRetries;
+}
+//#endregion
 //#region src/util/fetch/index.ts
 var fetch_exports = /* @__PURE__ */ __exportAll({
 	fetchWithProxy: () => fetchWithProxy,
 	fetchWithRetries: () => fetchWithRetries,
 	fetchWithTimeout: () => fetchWithTimeout,
+	getFetchWithProxyHeaders: () => getFetchWithProxyHeaders,
 	handleRateLimit: () => handleRateLimit,
 	isRateLimited: () => isRateLimited,
 	isTransientError: () => isTransientError
@@ -761,20 +793,44 @@ function getOrCreateProxyAgent(proxyUrl, tlsOptions) {
 	cachedProxyAgents.set(cacheKey, agent);
 	return agent;
 }
+/**
+* Resolve whether to disable transient-error retries. An explicit caller flag
+* always wins (a caller may opt back in even when the provider set
+* `maxRetries: 0`); otherwise we disable only when the retry context carries
+* `maxRetries === 0`.
+*/
+function resolveTransientRetryDisabled(explicit) {
+	if (explicit !== void 0) return explicit;
+	return getFetchRetryContextMaxRetries() === 0;
+}
+function headersInitToRecord(headers) {
+	if (!headers) return {};
+	if (headers instanceof Headers) return Object.fromEntries(headers.entries());
+	if (Array.isArray(headers)) return Object.fromEntries(new Headers(headers).entries());
+	return { ...headers };
+}
+function getFetchWithProxyHeaders(url, options) {
+	const requestHeaders = url instanceof Request && options.headers === void 0 ? headersInitToRecord(url.headers) : {};
+	const optionHeaders = headersInitToRecord(options.headers);
+	return {
+		...requestHeaders,
+		...optionHeaders,
+		"x-promptfoo-version": VERSION
+	};
+}
+function getFetchUrlString(url) {
+	if (typeof url === "string") return url;
+	if (url instanceof URL) return url.toString();
+	if (url instanceof Request) return url.url;
+}
 async function fetchWithProxy(url, options = {}, abortSignal) {
 	let finalUrl = url;
-	let finalUrlString;
-	if (typeof url === "string") finalUrlString = url;
-	else if (url instanceof URL) finalUrlString = url.toString();
-	else if (url instanceof Request) finalUrlString = url.url;
+	let finalUrlString = getFetchUrlString(url);
 	if (!finalUrlString) throw new Error("Invalid URL");
 	const combinedSignal = abortSignal ? options.signal ? AbortSignal.any([options.signal, abortSignal]) : abortSignal : options.signal;
 	const finalOptions = {
 		...options,
-		headers: {
-			...options.headers,
-			"x-promptfoo-version": VERSION
-		},
+		headers: getFetchWithProxyHeaders(url, options),
 		signal: combinedSignal
 	};
 	if (typeof url === "string") try {
@@ -812,10 +868,11 @@ async function fetchWithProxy(url, options = {}, abortSignal) {
 		logger.debug(`Using proxy: ${sanitizeUrl(proxyUrl)}`);
 		finalOptions.dispatcher = getOrCreateProxyAgent(proxyUrl, tlsOptions);
 	} else finalOptions.dispatcher = getOrCreateAgent(tlsOptions);
-	const maxTransientRetries = options.disableTransientRetries ? 0 : 3;
+	const disableTransientRetries = resolveTransientRetryDisabled(options.disableTransientRetries);
+	const maxTransientRetries = disableTransientRetries ? 0 : 3;
 	for (let attempt = 0; attempt <= maxTransientRetries; attempt++) {
 		const response = await monkeyPatchFetch(finalUrl, finalOptions);
-		if (!options.disableTransientRetries && isTransientError(response) && attempt < maxTransientRetries) {
+		if (!disableTransientRetries && isTransientError(response) && attempt < maxTransientRetries) {
 			const backoffMs = Math.pow(2, attempt) * 1e3;
 			logger.debug(`Transient error (${response.status} ${response.statusText}), retry ${attempt + 1}/${maxTransientRetries} after ${backoffMs}ms`);
 			await sleep(backoffMs);
@@ -888,8 +945,17 @@ function isTransientError(response) {
 		default: return false;
 	}
 }
+function formatFetchErrorMessage(error) {
+	if (!(error instanceof Error)) return String(error);
+	const typedError = error;
+	let message = `${typedError.name}: ${typedError.message}`;
+	if (typedError.cause) message += ` (Cause: ${typedError.cause})`;
+	if (typedError.code) message += ` (Code: ${typedError.code})`;
+	return message;
+}
 async function fetchWithRetries(url, options = {}, timeout, maxRetries) {
-	maxRetries = Math.max(0, maxRetries ?? 4);
+	const contextMaxRetries = getFetchRetryContextMaxRetries();
+	maxRetries = Math.max(0, maxRetries ?? contextMaxRetries ?? 4);
 	let lastErrorMessage;
 	const backoff = getEnvInt("PROMPTFOO_REQUEST_BACKOFF_MS", 5e3);
 	for (let i = 0; i <= maxRetries; i++) {
@@ -901,21 +967,19 @@ async function fetchWithRetries(url, options = {}, timeout, maxRetries) {
 			}, timeout);
 			if (getEnvBool("PROMPTFOO_RETRY_5XX") && response.status >= 500 && response.status < 600) throw new Error(`Internal Server Error: ${response.status} ${response.statusText}`);
 			if (response && isRateLimited(response)) {
-				logger.debug(`Rate limited on URL ${url}: ${response.status} ${response.statusText}, attempt ${i + 1}/${maxRetries + 1}, waiting before retry...`);
 				lastErrorMessage = `Rate limited: ${response.status} ${response.statusText}`;
+				if (i >= maxRetries) {
+					logger.debug(`Rate limited on URL ${url}: ${response.status} ${response.statusText}, attempt ${i + 1}/${maxRetries + 1}, no retries remain.`);
+					break;
+				}
+				logger.debug(`Rate limited on URL ${url}: ${response.status} ${response.statusText}, attempt ${i + 1}/${maxRetries + 1}, waiting before retry...`);
 				await handleRateLimit(response);
 				continue;
 			}
 			return response;
 		} catch (error) {
 			if (error instanceof Error && error.name === "AbortError") throw error;
-			let errorMessage;
-			if (error instanceof Error) {
-				const typedError = error;
-				errorMessage = `${typedError.name}: ${typedError.message}`;
-				if (typedError.cause) errorMessage += ` (Cause: ${typedError.cause})`;
-				if (typedError.code) errorMessage += ` (Code: ${typedError.code})`;
-			} else errorMessage = String(error);
+			const errorMessage = formatFetchErrorMessage(error);
 			logger.debug(`Request to ${url} failed (attempt #${i + 1}), retrying: ${errorMessage}`);
 			if (i < maxRetries) await sleep(Math.pow(2, i) * (backoff + 1e3 * Math.random()));
 			lastErrorMessage = errorMessage;
@@ -924,6 +988,6 @@ async function fetchWithRetries(url, options = {}, timeout, maxRetries) {
 	throw new Error(`Request failed after ${maxRetries} retries: ${lastErrorMessage}`);
 }
 //#endregion
-export { TERMINAL_MAX_WIDTH as A, readGlobalConfig as C, CONSENT_ENDPOINT as D, CLOUD_PROVIDER_PREFIX as E, HUMAN_ASSERTION_TYPE as F, getShareApiBaseUrl as M, getShareViewBaseUrl as N, EVENTS_ENDPOINT as O, FILE_METADATA_KEY as P, cloudConfig as S, writeGlobalConfigPartial as T, parseChatPrompt as _, getCurrentTimestamp as a, transformTools as b, parseRetryAfter as c, calculateCost as d, isOpenAIToolArray as f, openaiToolsToBedrock as g, openaiToolChoiceToBedrock as h, fetch_exports as i, getDefaultShareViewBaseUrl as j, R_ENDPOINT as k, LONG_RUNNING_MODEL_TIMEOUT_MS as l, isPromptfooSampleTarget as m, fetchWithRetries as n, sleep as o, isOpenAIToolChoice as p, fetchWithTimeout as r, parseRateLimitHeaders as s, fetchWithProxy as t, REQUEST_TIMEOUT_MS as u, toTitleCase as v, writeGlobalConfig as w, CloudConfig as x, transformToolChoice as y };
+export { CONSENT_ENDPOINT as A, transformTools as C, writeGlobalConfig as D, readGlobalConfig as E, getShareApiBaseUrl as F, getShareViewBaseUrl as I, FILE_METADATA_KEY as L, R_ENDPOINT as M, TERMINAL_MAX_WIDTH as N, writeGlobalConfigPartial as O, getDefaultShareViewBaseUrl as P, HUMAN_ASSERTION_TYPE as R, transformToolChoice as S, cloudConfig as T, isPromptfooSampleTarget as _, getFetchWithProxyHeaders as a, parseChatPrompt as b, getCurrentTimestamp as c, parseRetryAfter as d, LONG_RUNNING_MODEL_TIMEOUT_MS as f, isOpenAIToolChoice as g, isOpenAIToolArray as h, fetch_exports as i, EVENTS_ENDPOINT as j, CLOUD_PROVIDER_PREFIX as k, sleep as l, calculateCost as m, fetchWithRetries as n, withFetchRetryContext as o, REQUEST_TIMEOUT_MS as p, fetchWithTimeout as r, isPromptfooCloudApiHost as s, fetchWithProxy as t, parseRateLimitHeaders as u, openaiToolChoiceToBedrock as v, CloudConfig as w, toTitleCase as x, openaiToolsToBedrock as y };
 
-//# sourceMappingURL=fetch-D9xxyC1p.js.map
+//# sourceMappingURL=fetch-Doks14zQ.js.map

package/dist/src/{fileExtensions-D9h-8Wxg.cjs → fileExtensions-BhdwzYaD.cjs}

@@ -1,3 +1,14 @@
+require("./rolldown-runtime-D_mwlA32.cjs");
+let zod = require("zod");
+//#region src/validators/shared.ts
+const NunjucksFilterMapSchema = zod.z.record(zod.z.string(), zod.z.custom((v) => typeof v === "function"));
+/**
+* Zod schema accepting a string or a function.
+* Used for transform fields that accept inline JS expressions, file:// references,
+* or direct functions when using the Node.js package.
+*/
+const StringOrFunctionSchema = zod.z.union([zod.z.string(), zod.z.custom((val) => typeof val === "function", { message: "Transform must be a string expression, file:// path, or a function (Node.js package)" })]);
+//#endregion
 //#region src/util/fileExtensions.ts
 /**
 * Array of supported JavaScript and TypeScript file extensions
@@ -86,6 +97,18 @@ Object.defineProperty(exports, "JAVASCRIPT_EXTENSIONS", {
 		return JAVASCRIPT_EXTENSIONS;
 	}
 });
+Object.defineProperty(exports, "NunjucksFilterMapSchema", {
+	enumerable: true,
+	get: function() {
+		return NunjucksFilterMapSchema;
+	}
+});
+Object.defineProperty(exports, "StringOrFunctionSchema", {
+	enumerable: true,
+	get: function() {
+		return StringOrFunctionSchema;
+	}
+});
 Object.defineProperty(exports, "isAudioFile", {
 	enumerable: true,
 	get: function() {
@@ -111,4 +134,4 @@ Object.defineProperty(exports, "isVideoFile", {
 	}
 });
 
-//# sourceMappingURL=fileExtensions-D9h-8Wxg.cjs.map
+//# sourceMappingURL=fileExtensions-BhdwzYaD.cjs.map

package/dist/src/{fileExtensions-BGh-W-HT.js → fileExtensions-CXRfY3Ss.js}

@@ -1,3 +1,13 @@
+import { z } from "zod";
+//#region src/validators/shared.ts
+const NunjucksFilterMapSchema = z.record(z.string(), z.custom((v) => typeof v === "function"));
+/**
+* Zod schema accepting a string or a function.
+* Used for transform fields that accept inline JS expressions, file:// references,
+* or direct functions when using the Node.js package.
+*/
+const StringOrFunctionSchema = z.union([z.string(), z.custom((val) => typeof val === "function", { message: "Transform must be a string expression, file:// path, or a function (Node.js package)" })]);
+//#endregion
 //#region src/util/fileExtensions.ts
 /**
 * Array of supported JavaScript and TypeScript file extensions
@@ -80,6 +90,6 @@ function isAudioFile(filePath) {
 	return audioExtensions.includes(fileExtension);
 }
 //#endregion
-export { isVideoFile as a, isJavascriptFile as i, isAudioFile as n, isImageFile as r, JAVASCRIPT_EXTENSIONS as t };
+export { isVideoFile as a, isJavascriptFile as i, isAudioFile as n, NunjucksFilterMapSchema as o, isImageFile as r, StringOrFunctionSchema as s, JAVASCRIPT_EXTENSIONS as t };
 
-//# sourceMappingURL=fileExtensions-BGh-W-HT.js.map
+//# sourceMappingURL=fileExtensions-CXRfY3Ss.js.map

package/dist/src/{fileExtensions-DysCsxNG.js → fileExtensions-D4GCJ67J.js}

@@ -1,4 +1,14 @@
 #!/usr/bin/env node
+import { z } from "zod";
+//#region src/validators/shared.ts
+const NunjucksFilterMapSchema = z.record(z.string(), z.custom((v) => typeof v === "function"));
+/**
+* Zod schema accepting a string or a function.
+* Used for transform fields that accept inline JS expressions, file:// references,
+* or direct functions when using the Node.js package.
+*/
+const StringOrFunctionSchema = z.union([z.string(), z.custom((val) => typeof val === "function", { message: "Transform must be a string expression, file:// path, or a function (Node.js package)" })]);
+//#endregion
 //#region src/util/fileExtensions.ts
 /**
 * Array of supported JavaScript and TypeScript file extensions
@@ -81,6 +91,6 @@ function isAudioFile(filePath) {
 	return audioExtensions.includes(fileExtension);
 }
 //#endregion
-export { isVideoFile as a, isJavascriptFile as i, isAudioFile as n, isImageFile as r, JAVASCRIPT_EXTENSIONS as t };
+export { isVideoFile as a, isJavascriptFile as i, isAudioFile as n, NunjucksFilterMapSchema as o, isImageFile as r, StringOrFunctionSchema as s, JAVASCRIPT_EXTENSIONS as t };
 
-//# sourceMappingURL=fileExtensions-DysCsxNG.js.map
+//# sourceMappingURL=fileExtensions-D4GCJ67J.js.map

package/dist/src/{formatDuration-Ch4A7G3o.js → formatDuration-CMVNrYvE.js}

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

package/dist/src/{genaiTracer-BokHC-MW.cjs → genaiTracer-14nugQQx.cjs}

@@ -1,4 +1,4 @@
-require("./logger-COuQb2xB.cjs");
+require("./rolldown-runtime-D_mwlA32.cjs");
 let _opentelemetry_api = require("@opentelemetry/api");
 //#region src/tracing/genaiTracer.ts
 const TRACER_NAME = "promptfoo.providers";
@@ -256,12 +256,24 @@ function getTraceparent() {
 	return `00-${ctx.traceId}-${ctx.spanId}-${traceFlags}`;
 }
 //#endregion
+Object.defineProperty(exports, "getGenAITracer", {
+	enumerable: true,
+	get: function() {
+		return getGenAITracer;
+	}
+});
 Object.defineProperty(exports, "getTraceparent", {
 	enumerable: true,
 	get: function() {
 		return getTraceparent;
 	}
 });
+Object.defineProperty(exports, "sanitizeBody", {
+	enumerable: true,
+	get: function() {
+		return sanitizeBody;
+	}
+});
 Object.defineProperty(exports, "withGenAISpan", {
 	enumerable: true,
 	get: function() {
@@ -269,4 +281,4 @@ Object.defineProperty(exports, "withGenAISpan", {
 	}
 });
 
-//# sourceMappingURL=genaiTracer-BokHC-MW.cjs.map
+//# sourceMappingURL=genaiTracer-14nugQQx.cjs.map

package/dist/src/{genaiTracer-C3ZPQU60.js → genaiTracer-BPVvltoW.js}

@@ -256,6 +256,6 @@ function getTraceparent() {
 	return `00-${ctx.traceId}-${ctx.spanId}-${traceFlags}`;
 }
 //#endregion
-export { withGenAISpan as n, getTraceparent as t };
+export { withGenAISpan as i, getTraceparent as n, sanitizeBody as r, getGenAITracer as t };
 
-//# sourceMappingURL=genaiTracer-C3ZPQU60.js.map
+//# sourceMappingURL=genaiTracer-BPVvltoW.js.map

package/dist/src/{genaiTracer-DxODqT9e.js → genaiTracer-D18lYzhB.js}

@@ -255,6 +255,6 @@ function getTraceparent() {
 	return `00-${ctx.traceId}-${ctx.spanId}-${traceFlags}`;
 }
 //#endregion
-export { withGenAISpan as n, getTraceparent as t };
+export { withGenAISpan as i, getTraceparent as n, sanitizeBody as r, getGenAITracer as t };
 
-//# sourceMappingURL=genaiTracer-DxODqT9e.js.map
+//# sourceMappingURL=genaiTracer-D18lYzhB.js.map

package/dist/src/{genaiTracer-CFny3gOy.js → genaiTracer-jJKYsnjc.js}

@@ -255,6 +255,6 @@ function getTraceparent() {
 	return `00-${ctx.traceId}-${ctx.spanId}-${traceFlags}`;
 }
 //#endregion
-export { withGenAISpan as n, getTraceparent as t };
+export { withGenAISpan as i, getTraceparent as n, sanitizeBody as r, getGenAITracer as t };
 
-//# sourceMappingURL=genaiTracer-CFny3gOy.js.map
+//# sourceMappingURL=genaiTracer-jJKYsnjc.js.map