promptfoo 0.120.27 → 0.121.2

package/dist/src/{chat-BE44YOc6.cjs → chat-CgF-J-Jj.cjs}

@@ -1,17 +1,16 @@
-const require_logger = require('./logger-B7sBeGa0.cjs');
-const require_esm = require('./esm-Ct-Joyue.cjs');
-const require_fileExtensions = require('./fileExtensions-DkJYkWUy.cjs');
-const require_util = require('./util-aLhtl3fe.cjs');
-const require_fetch = require('./fetch-BmbD-v1L.cjs');
-const require_cache = require('./cache-BTVYfbka.cjs');
-const require_genaiTracer = require('./genaiTracer-Dres3qrN.cjs');
-const require_transform = require('./transform-D5PjiWiZ.cjs');
-const require_openai = require('./openai-DUFopMrH.cjs');
-const require_util$1 = require('./util-1wWM599Z.cjs');
+const require_logger = require("./logger-Cp1GPUjj.cjs");
+const require_esm = require("./esm-CnNt7sI4.cjs");
+const require_fileExtensions = require("./fileExtensions-bYh77CN8.cjs");
+const require_util = require("./util-B9vlHIIh.cjs");
+const require_fetch = require("./fetch-BPkYtG8K.cjs");
+const require_cache = require("./cache-Dh5WtQps.cjs");
+const require_genaiTracer = require("./genaiTracer-DN4dQywX.cjs");
+const require_transform = require("./transform-DuHvhZpj.cjs");
+const require_openai = require("./openai-Cuif0GEt.cjs");
+const require_util$1 = require("./util-BzMcevZc.cjs");
 let path = require("path");
 path = require_logger.__toESM(path);
 let _modelcontextprotocol_sdk_client_index_js = require("@modelcontextprotocol/sdk/client/index.js");
-
 //#region src/util/finishReason.ts
 /**
 * Mapping of provider-specific finish/stop reasons to standardized OpenAI-compatible values.
@@ -80,7 +79,6 @@ function normalizeFinishReason(raw) {
 	const key = trimmed.toLowerCase();
 	return FINISH_REASON_MAP[key] ?? key;
 }
-
 //#endregion
 //#region src/providers/mcp/client.ts
 /**
@@ -129,7 +127,7 @@ var MCPClient = class {
 		if (!this.config.enabled) return;
 		const servers = this.config.servers || (this.config.server ? [this.config.server] : []);
 		for (const server of servers) {
-			require_logger.logger_default.info(`connecting to server ${server.name || server.url || server.path || "default"}`);
+			require_logger.logger.info(`connecting to server ${server.name || server.url || server.path || "default"}`);
 			await this.connectToServer(server);
 		}
 	}
@@ -168,7 +166,7 @@ var MCPClient = class {
 				let authHeaders = {};
 				if (renderedServer.auth?.type === "oauth") {
 					const oauthAuth = renderedServer.auth;
-					require_logger.logger_default.debug("[MCP] Fetching OAuth token");
+					require_logger.logger.debug("[MCP] Fetching OAuth token");
 					const { accessToken, expiresAt } = await require_transform.getOAuthTokenWithExpiry(oauthAuth, server.url);
 					authHeaders = { Authorization: `Bearer ${accessToken}` };
 					this.oauthConfigs.set(serverKey, {
@@ -191,18 +189,18 @@ var MCPClient = class {
 					const { StreamableHTTPClientTransport } = await import("@modelcontextprotocol/sdk/client/streamableHttp.js");
 					transport = new StreamableHTTPClientTransport(new URL(serverUrl), hasOptions ? transportOptions : void 0);
 					await client.connect(transport, requestOptions);
-					require_logger.logger_default.debug("Connected using Streamable HTTP transport");
+					require_logger.logger.debug("Connected using Streamable HTTP transport");
 				} catch (error) {
-					require_logger.logger_default.debug(`Failed to connect to MCP server with Streamable HTTP transport ${serverKey}: ${error}`);
+					require_logger.logger.debug(`Failed to connect to MCP server with Streamable HTTP transport ${serverKey}: ${error}`);
 					const { SSEClientTransport } = await import("@modelcontextprotocol/sdk/client/sse.js");
 					transport = new SSEClientTransport(new URL(serverUrl), hasOptions ? transportOptions : void 0);
 					await client.connect(transport, requestOptions);
-					require_logger.logger_default.debug("Connected using SSE transport");
+					require_logger.logger.debug("Connected using SSE transport");
 				}
 			} else throw new Error("Either command+args or path or url must be specified for MCP server");
 			if (this.config.pingOnConnect) try {
 				await client.ping(requestOptions);
-				require_logger.logger_default.debug(`MCP server ${serverKey} ping successful`);
+				require_logger.logger.debug(`MCP server ${serverKey} ping successful`);
 			} catch (pingError) {
 				const pingErrorMessage = pingError instanceof Error ? pingError.message : String(pingError);
 				throw new Error(`MCP server ${serverKey} ping failed: ${pingErrorMessage}`);
@@ -221,7 +219,7 @@ var MCPClient = class {
 			if (this.isVerboseEnabled) console.log(`Connected to MCP server ${serverKey} with tools:`, filteredTools.map((tool) => tool.name));
 		} catch (error) {
 			const errorMessage = error instanceof Error ? error.message : String(error);
-			if (this.isDebugEnabled) require_logger.logger_default.error(`Failed to connect to MCP server ${serverKey}: ${errorMessage}`);
+			if (this.isDebugEnabled) require_logger.logger.error(`Failed to connect to MCP server ${serverKey}: ${errorMessage}`);
 			throw new Error(`Failed to connect to MCP server ${serverKey}: ${errorMessage}`);
 		}
 	}
@@ -237,23 +235,23 @@ var MCPClient = class {
 		if (!oauthConfig) return;
 		const now = Date.now();
 		const expiresAt = this.tokenExpiresAt.get(serverKey);
-		if (expiresAt && now + require_transform.TOKEN_REFRESH_BUFFER_MS < expiresAt) {
-			require_logger.logger_default.debug(`[MCP] Token for ${serverKey} still valid, no refresh needed`);
+		if (expiresAt && now + 6e4 < expiresAt) {
+			require_logger.logger.debug(`[MCP] Token for ${serverKey} still valid, no refresh needed`);
 			return;
 		}
 		const existingRefresh = this.tokenRefreshPromise.get(serverKey);
 		if (existingRefresh) {
-			require_logger.logger_default.debug(`[MCP] Token refresh already in progress for ${serverKey}, waiting...`);
+			require_logger.logger.debug(`[MCP] Token refresh already in progress for ${serverKey}, waiting...`);
 			try {
 				await existingRefresh;
 				const newExpiresAt = this.tokenExpiresAt.get(serverKey);
-				if (newExpiresAt && Date.now() + require_transform.TOKEN_REFRESH_BUFFER_MS < newExpiresAt) return;
-				require_logger.logger_default.debug(`[MCP] Token expired while waiting for ${serverKey}, refreshing again...`);
+				if (newExpiresAt && Date.now() + 6e4 < newExpiresAt) return;
+				require_logger.logger.debug(`[MCP] Token expired while waiting for ${serverKey}, refreshing again...`);
 			} catch {
-				require_logger.logger_default.debug(`[MCP] Previous token refresh failed for ${serverKey}, retrying...`);
+				require_logger.logger.debug(`[MCP] Previous token refresh failed for ${serverKey}, retrying...`);
 			}
 		}
-		require_logger.logger_default.debug(`[MCP] Proactively refreshing OAuth token for server ${serverKey}`);
+		require_logger.logger.debug(`[MCP] Proactively refreshing OAuth token for server ${serverKey}`);
 		const refreshPromise = this.performTokenRefresh(serverKey, oauthConfig);
 		this.tokenRefreshPromise.set(serverKey, refreshPromise);
 		try {
@@ -273,7 +271,7 @@ var MCPClient = class {
 		this.clients.delete(serverKey);
 		this.transports.delete(serverKey);
 		await this.connectToServer(oauthConfig.serverConfig);
-		require_logger.logger_default.debug(`[MCP] Successfully refreshed OAuth token for server ${serverKey}`);
+		require_logger.logger.debug(`[MCP] Successfully refreshed OAuth token for server ${serverKey}`);
 	}
 	async callTool(name, args) {
 		const requestOptions = getEffectiveRequestOptions(this.config);
@@ -301,7 +299,7 @@ var MCPClient = class {
 				const isAuthError = errorMessage.includes("401") || errorMessage.includes("Unauthorized") || errorMessage.includes("authorization_endpoint") || errorMessage.includes("token");
 				const oauthConfig = this.oauthConfigs.get(serverKey);
 				if (!retried && isAuthError && oauthConfig) {
-					require_logger.logger_default.debug(`[MCP] Auth error for ${serverKey}, attempting reactive token refresh`);
+					require_logger.logger.debug(`[MCP] Auth error for ${serverKey}, attempting reactive token refresh`);
 					retried = true;
 					try {
 						await this.performTokenRefresh(serverKey, oauthConfig);
@@ -312,10 +310,10 @@ var MCPClient = class {
 						}
 					} catch (refreshError) {
 						const refreshErrorMsg = refreshError instanceof Error ? refreshError.message : String(refreshError);
-						require_logger.logger_default.error(`[MCP] Token refresh failed for ${serverKey}: ${refreshErrorMsg}`);
+						require_logger.logger.error(`[MCP] Token refresh failed for ${serverKey}: ${refreshErrorMsg}`);
 					}
 				}
-				if (this.isDebugEnabled) require_logger.logger_default.error(`Error calling tool ${name}: ${errorMessage}`);
+				if (this.isDebugEnabled) require_logger.logger.error(`Error calling tool ${name}: ${errorMessage}`);
 				return {
 					content: "",
 					error: errorMessage
@@ -330,7 +328,7 @@ var MCPClient = class {
 			if (transport) await transport.close();
 			await client.close();
 		} catch (error) {
-			if (this.isDebugEnabled) require_logger.logger_default.error(`Error during cleanup: ${error instanceof Error ? error.message : String(error)}`);
+			if (this.isDebugEnabled) require_logger.logger.error(`Error during cleanup: ${error instanceof Error ? error.message : String(error)}`);
 		}
 		this.clients.clear();
 		this.transports.clear();
@@ -340,7 +338,6 @@ var MCPClient = class {
 		this.tokenRefreshPromise.clear();
 	}
 };
-
 //#endregion
 //#region src/providers/openai/chat.ts
 var OpenAiChatCompletionProvider = class OpenAiChatCompletionProvider extends require_openai.OpenAiGenericProvider {
@@ -351,7 +348,7 @@ var OpenAiChatCompletionProvider = class OpenAiChatCompletionProvider extends re
 	initializationPromise = null;
 	loadedFunctionCallbacks = {};
 	constructor(modelName, options = {}) {
-		if (!OpenAiChatCompletionProvider.OPENAI_CHAT_MODEL_NAMES.includes(modelName)) require_logger.logger_default.debug(`Using unknown chat model: ${modelName}`);
+		if (!OpenAiChatCompletionProvider.OPENAI_CHAT_MODEL_NAMES.includes(modelName)) require_logger.logger.debug(`Using unknown chat model: ${modelName}`);
 		super(modelName, options);
 		this.config = options.config || {};
 		if (this.config.mcp?.enabled) this.initializationPromise = this.initializeMCP();
@@ -380,8 +377,8 @@ var OpenAiChatCompletionProvider = class OpenAiChatCompletionProvider extends re
 			if (splits[0] && require_fileExtensions.isJavascriptFile(splits[0])) [filePath, functionName] = splits;
 		}
 		try {
-			const resolvedPath = path.default.resolve(require_logger.cliState_default.basePath || "", filePath);
-			require_logger.logger_default.debug(`Loading function from ${resolvedPath}${functionName ? `:${functionName}` : ""}`);
+			const resolvedPath = path.default.resolve(require_logger.state.basePath || "", filePath);
+			require_logger.logger.debug(`Loading function from ${resolvedPath}${functionName ? `:${functionName}` : ""}`);
 			const requiredModule = await require_esm.importModule(resolvedPath, functionName);
 			if (typeof requiredModule === "function") return requiredModule;
 			else if (requiredModule && typeof requiredModule === "object" && functionName && functionName in requiredModule) {
@@ -412,18 +409,18 @@ var OpenAiChatCompletionProvider = class OpenAiChatCompletionProvider extends re
 				}
 			}
 			if (!callback) throw new Error(`No callback found for function '${functionName}'`);
-			require_logger.logger_default.debug(`Executing function '${functionName}' with args: ${args}`);
+			require_logger.logger.debug(`Executing function '${functionName}' with args: ${args}`);
 			const result = await callback(args);
 			if (result === void 0 || result === null) return "";
 			else if (typeof result === "object") try {
 				return JSON.stringify(result);
 			} catch (error) {
-				require_logger.logger_default.warn(`Error stringifying result from function '${functionName}': ${error}`);
+				require_logger.logger.warn(`Error stringifying result from function '${functionName}': ${error}`);
 				return String(result);
 			}
 			else return String(result);
 		} catch (error) {
-			require_logger.logger_default.error(`Error executing function '${functionName}': ${error.message || String(error)}`);
+			require_logger.logger.error(`Error executing function '${functionName}': ${error.message || String(error)}`);
 			throw error;
 		}
 	}
@@ -448,8 +445,10 @@ var OpenAiChatCompletionProvider = class OpenAiChatCompletionProvider extends re
 		const isReasoningModel = this.isReasoningModel();
 		const isGPT5Model = this.isGPT5Model();
 		const maxCompletionTokens = isReasoningModel ? config.max_completion_tokens ?? require_logger.getEnvInt("OPENAI_MAX_COMPLETION_TOKENS") : void 0;
-		const maxTokens = isReasoningModel || isGPT5Model ? void 0 : config.max_tokens ?? require_logger.getEnvInt("OPENAI_MAX_TOKENS", 1024);
-		const temperature = this.supportsTemperature() ? config.temperature ?? require_logger.getEnvFloat("OPENAI_TEMPERATURE", 0) : void 0;
+		const maxTokensDefault = config.omitDefaults ? require_logger.getEnvString("OPENAI_MAX_TOKENS") !== void 0 ? require_logger.getEnvInt("OPENAI_MAX_TOKENS") : void 0 : require_logger.getEnvInt("OPENAI_MAX_TOKENS", 1024);
+		const maxTokens = isReasoningModel || isGPT5Model ? void 0 : config.max_tokens ?? maxTokensDefault;
+		const temperatureDefault = config.omitDefaults ? require_logger.getEnvString("OPENAI_TEMPERATURE") !== void 0 ? require_logger.getEnvFloat("OPENAI_TEMPERATURE") : void 0 : require_logger.getEnvFloat("OPENAI_TEMPERATURE", 0);
+		const temperature = this.supportsTemperature() ? config.temperature ?? temperatureDefault : void 0;
 		const reasoningEffort = isReasoningModel ? require_util.renderVarsInObject(config.reasoning_effort, context?.vars) : void 0;
 		const mcpTools = this.mcpClient ? require_transform.transformMCPToolsToOpenAi(this.mcpClient.getAllTools()) : [];
 		const fileTools = require_fetch.transformTools(config.tools ? await require_util.maybeLoadToolsFromExternalFile(config.tools, context?.vars) || [] : [], "openai");
@@ -583,7 +582,7 @@ var OpenAiChatCompletionProvider = class OpenAiChatCompletionProvider extends re
 				};
 			}
 		} catch (err) {
-			require_logger.logger_default.error(`API call error: ${String(err)}`);
+			require_logger.logger.error(`API call error: ${String(err)}`);
 			await deleteFromCache?.();
 			return {
 				error: `API call error: ${String(err)}`,
@@ -639,7 +638,7 @@ var OpenAiChatCompletionProvider = class OpenAiChatCompletionProvider extends re
 			if (config.response_format?.type === "json_schema" && typeof output === "string") try {
 				output = JSON.parse(output);
 			} catch (error) {
-				require_logger.logger_default.error(`Failed to parse JSON output: ${error}`);
+				require_logger.logger.error(`Failed to parse JSON output: ${error}`);
 			}
 			if (reasoning && (this.config.showThinking ?? true)) output = `Thinking: ${reasoning}\n\n${output}`;
 			const functionCalls = message.function_call ? [message.function_call] : message.tool_calls;
@@ -676,7 +675,7 @@ var OpenAiChatCompletionProvider = class OpenAiChatCompletionProvider extends re
 							hasSuccessfulCallback = true;
 							continue;
 						} catch (error) {
-							require_logger.logger_default.debug(`MCP tool execution failed for ${functionName}: ${error}`);
+							require_logger.logger.debug(`MCP tool execution failed for ${functionName}: ${error}`);
 							results.push(`MCP Tool Error (${functionName}): ${error}`);
 							hasSuccessfulCallback = true;
 							continue;
@@ -687,7 +686,7 @@ var OpenAiChatCompletionProvider = class OpenAiChatCompletionProvider extends re
 						results.push(functionResult);
 						hasSuccessfulCallback = true;
 					} catch (error) {
-						require_logger.logger_default.debug(`Function callback failed for ${functionName} with error ${error}, falling back to original output`);
+						require_logger.logger.debug(`Function callback failed for ${functionName} with error ${error}, falling back to original output`);
 						hasSuccessfulCallback = false;
 						break;
 					}
@@ -762,30 +761,30 @@ var OpenAiChatCompletionProvider = class OpenAiChatCompletionProvider extends re
 		}
 	}
 };
-
 //#endregion
-Object.defineProperty(exports, 'FINISH_REASON_MAP', {
-  enumerable: true,
-  get: function () {
-    return FINISH_REASON_MAP;
-  }
+Object.defineProperty(exports, "FINISH_REASON_MAP", {
+	enumerable: true,
+	get: function() {
+		return FINISH_REASON_MAP;
+	}
 });
-Object.defineProperty(exports, 'MCPClient', {
-  enumerable: true,
-  get: function () {
-    return MCPClient;
-  }
+Object.defineProperty(exports, "MCPClient", {
+	enumerable: true,
+	get: function() {
+		return MCPClient;
+	}
 });
-Object.defineProperty(exports, 'OpenAiChatCompletionProvider', {
-  enumerable: true,
-  get: function () {
-    return OpenAiChatCompletionProvider;
-  }
+Object.defineProperty(exports, "OpenAiChatCompletionProvider", {
+	enumerable: true,
+	get: function() {
+		return OpenAiChatCompletionProvider;
+	}
 });
-Object.defineProperty(exports, 'normalizeFinishReason', {
-  enumerable: true,
-  get: function () {
-    return normalizeFinishReason;
-  }
+Object.defineProperty(exports, "normalizeFinishReason", {
+	enumerable: true,
+	get: function() {
+		return normalizeFinishReason;
+	}
 });
-//# sourceMappingURL=chat-BE44YOc6.cjs.map
+
+//# sourceMappingURL=chat-CgF-J-Jj.cjs.map

package/dist/src/{chat-DwWifjxi.js → chat-CzkrVDfz.js}

@@ -1,18 +1,16 @@
-import "./chunk-FhC4c-0y.js";
-import { i as logger_default } from "./logger-CG1uZPbQ.js";
-import { t as invariant } from "./invariant-1pAf2CD1.js";
-import "./esm-D2pZ87fL.js";
-import "./pythonUtils-hZ8LeQLv.js";
-import "./types-C5hEkb-x.js";
-import "./util-DQ984syk.js";
-import "./fetch-D3OHf-lV.js";
-import "./cache-CIpsoBZR.js";
-import "./genaiTracer-Ce19n68P.js";
-import { t as OpenAiChatCompletionProvider } from "./chat-CcUCysjU.js";
-import "./transform-Dfl89yi4.js";
-import "./openai-PblZ3jUE.js";
-import "./util-D9eLdGfa.js";
-
+import { i as logger } from "./logger-CT3IKMKA.js";
+import { t as invariant } from "./invariant-Ddh24eXh.js";
+import "./esm-Cd1AjG1D.js";
+import "./pythonUtils-D5nxkQ0P.js";
+import "./types-DmyIJ-sR.js";
+import "./util-BRYkYPTd.js";
+import "./fetch-Cwxnd8zz.js";
+import "./cache-C4Nxf52C.js";
+import "./genaiTracer-D3fD9dNV.js";
+import { t as OpenAiChatCompletionProvider } from "./chat-DqxYYtWA.js";
+import "./transform-vNucnNr0.js";
+import "./openai-DElQ-fPX.js";
+import "./util-Dnmk2mBQ.js";
 //#region src/providers/hyperbolic/chat.ts
 const HYPERBOLIC_CHAT_MODELS = [
 	{
@@ -201,7 +199,7 @@ function calculateHyperbolicCost(modelName, config, promptTokens, completionToke
 	const outputCost = config.cost ?? model.cost.output;
 	const inputCostTotal = inputCost * promptTokens;
 	const outputCostTotal = outputCost * completionTokens;
-	logger_default.debug(`Hyperbolic cost calculation for ${modelName}: promptTokens=${promptTokens}, completionTokens=${completionTokens}, reasoningTokens=${reasoningTokens || "N/A"}, inputCost=${inputCostTotal}, outputCost=${outputCostTotal}`);
+	logger.debug(`Hyperbolic cost calculation for ${modelName}: promptTokens=${promptTokens}, completionTokens=${completionTokens}, reasoningTokens=${reasoningTokens || "N/A"}, inputCost=${inputCostTotal}, outputCost=${outputCostTotal}`);
 	return inputCostTotal + outputCostTotal;
 }
 var HyperbolicProvider = class extends OpenAiChatCompletionProvider {
@@ -258,11 +256,11 @@ var HyperbolicProvider = class extends OpenAiChatCompletionProvider {
 							acceptedPrediction: acceptedPredictions,
 							rejectedPrediction: rejectedPredictions
 						};
-						logger_default.debug(`Hyperbolic reasoning token details for ${this.modelName}: reasoning=${reasoningTokens}, accepted=${acceptedPredictions}, rejected=${rejectedPredictions}`);
+						logger.debug(`Hyperbolic reasoning token details for ${this.modelName}: reasoning=${reasoningTokens}, accepted=${acceptedPredictions}, rejected=${rejectedPredictions}`);
 					}
 				}
 			} catch (err) {
-				logger_default.error(`Failed to parse raw response JSON: ${err}`);
+				logger.error(`Failed to parse raw response JSON: ${err}`);
 			}
 			else if (typeof response.raw === "object" && response.raw !== null) {
 				const rawData = response.raw;
@@ -276,7 +274,7 @@ var HyperbolicProvider = class extends OpenAiChatCompletionProvider {
 							acceptedPrediction: acceptedPredictions,
 							rejectedPrediction: rejectedPredictions
 						};
-						logger_default.debug(`Hyperbolic reasoning token details for ${this.modelName}: reasoning=${reasoningTokens}, accepted=${acceptedPredictions}, rejected=${rejectedPredictions}`);
+						logger.debug(`Hyperbolic reasoning token details for ${this.modelName}: reasoning=${reasoningTokens}, accepted=${acceptedPredictions}, rejected=${rejectedPredictions}`);
 					}
 				}
 			}
@@ -285,7 +283,7 @@ var HyperbolicProvider = class extends OpenAiChatCompletionProvider {
 				response.cost = calculateHyperbolicCost(this.modelName, this.config || {}, response.tokenUsage.prompt, response.tokenUsage.completion, reasoningTokens);
 			}
 		} catch (err) {
-			logger_default.error(`Error processing Hyperbolic response: ${err}`);
+			logger.error(`Error processing Hyperbolic response: ${err}`);
 		}
 		return response;
 	}
@@ -295,7 +293,7 @@ function createHyperbolicProvider(providerPath, options = {}) {
 	invariant(modelName, "Model name is required");
 	return new HyperbolicProvider(modelName, options);
 }
-
 //#endregion
 export { createHyperbolicProvider };
-//# sourceMappingURL=chat-DwWifjxi.js.map
+
+//# sourceMappingURL=chat-CzkrVDfz.js.map