promptfoo 0.120.27 → 0.121.2

package/dist/src/{chat-CcUCysjU.js → chat-DqxYYtWA.js}

@@ -1,16 +1,15 @@
-import { _ as getEnvBool, b as getEnvString, i as logger_default, v as getEnvFloat, w as cliState_default, y as getEnvInt } from "./logger-CG1uZPbQ.js";
-import { r as importModule } from "./esm-D2pZ87fL.js";
-import { i as isJavascriptFile } from "./fileExtensions-ePDqouxn.js";
-import { d as maybeLoadToolsFromExternalFile, g as renderVarsInObject, l as maybeLoadFromExternalFileWithVars, u as maybeLoadResponseFormatFromExternalFile } from "./util-DQ984syk.js";
-import { S as parseChatPrompt, T as transformTools, h as REQUEST_TIMEOUT_MS, w as transformToolChoice } from "./fetch-D3OHf-lV.js";
-import { a as fetchWithCache } from "./cache-CIpsoBZR.js";
-import { n as withGenAISpan } from "./genaiTracer-Ce19n68P.js";
-import { C as applyQueryParams, D as renderAuthVars, E as getOAuthTokenWithExpiry, O as TOKEN_REFRESH_BUFFER_MS, T as getAuthQueryParams, i as transformMCPToolsToOpenAi, w as getAuthHeaders } from "./transform-Dfl89yi4.js";
-import { t as OpenAiGenericProvider } from "./openai-PblZ3jUE.js";
-import { a as calculateOpenAICost, c as getTokenUsage, t as OPENAI_CHAT_MODELS } from "./util-D9eLdGfa.js";
+import { _ as getEnvBool, b as getEnvString, i as logger, v as getEnvFloat, w as state, y as getEnvInt } from "./logger-CT3IKMKA.js";
+import { r as importModule } from "./esm-Cd1AjG1D.js";
+import { i as isJavascriptFile } from "./fileExtensions-DnqA1y9x.js";
+import { d as maybeLoadToolsFromExternalFile, g as renderVarsInObject, l as maybeLoadFromExternalFileWithVars, u as maybeLoadResponseFormatFromExternalFile } from "./util-BRYkYPTd.js";
+import { C as transformTools, S as transformToolChoice, b as parseChatPrompt, p as REQUEST_TIMEOUT_MS } from "./fetch-Cwxnd8zz.js";
+import { r as fetchWithCache } from "./cache-C4Nxf52C.js";
+import { n as withGenAISpan } from "./genaiTracer-D3fD9dNV.js";
+import { C as applyQueryParams, D as renderAuthVars, E as getOAuthTokenWithExpiry, T as getAuthQueryParams, i as transformMCPToolsToOpenAi, w as getAuthHeaders } from "./transform-vNucnNr0.js";
+import { t as OpenAiGenericProvider } from "./openai-DElQ-fPX.js";
+import { a as calculateOpenAICost, c as getTokenUsage, t as OPENAI_CHAT_MODELS } from "./util-Dnmk2mBQ.js";
 import path from "path";
 import { Client } from "@modelcontextprotocol/sdk/client/index.js";
-
 //#region src/util/finishReason.ts
 /**
 * Mapping of provider-specific finish/stop reasons to standardized OpenAI-compatible values.
@@ -79,7 +78,6 @@ function normalizeFinishReason(raw) {
 	const key = trimmed.toLowerCase();
 	return FINISH_REASON_MAP[key] ?? key;
 }
-
 //#endregion
 //#region src/providers/mcp/client.ts
 /**
@@ -128,7 +126,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) {
-			logger_default.info(`connecting to server ${server.name || server.url || server.path || "default"}`);
+			logger.info(`connecting to server ${server.name || server.url || server.path || "default"}`);
 			await this.connectToServer(server);
 		}
 	}
@@ -167,7 +165,7 @@ var MCPClient = class {
 				let authHeaders = {};
 				if (renderedServer.auth?.type === "oauth") {
 					const oauthAuth = renderedServer.auth;
-					logger_default.debug("[MCP] Fetching OAuth token");
+					logger.debug("[MCP] Fetching OAuth token");
 					const { accessToken, expiresAt } = await getOAuthTokenWithExpiry(oauthAuth, server.url);
 					authHeaders = { Authorization: `Bearer ${accessToken}` };
 					this.oauthConfigs.set(serverKey, {
@@ -190,18 +188,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);
-					logger_default.debug("Connected using Streamable HTTP transport");
+					logger.debug("Connected using Streamable HTTP transport");
 				} catch (error) {
-					logger_default.debug(`Failed to connect to MCP server with Streamable HTTP transport ${serverKey}: ${error}`);
+					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);
-					logger_default.debug("Connected using SSE transport");
+					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);
-				logger_default.debug(`MCP server ${serverKey} ping successful`);
+				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}`);
@@ -220,7 +218,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) logger_default.error(`Failed to connect to MCP server ${serverKey}: ${errorMessage}`);
+			if (this.isDebugEnabled) logger.error(`Failed to connect to MCP server ${serverKey}: ${errorMessage}`);
 			throw new Error(`Failed to connect to MCP server ${serverKey}: ${errorMessage}`);
 		}
 	}
@@ -236,23 +234,23 @@ var MCPClient = class {
 		if (!oauthConfig) return;
 		const now = Date.now();
 		const expiresAt = this.tokenExpiresAt.get(serverKey);
-		if (expiresAt && now + TOKEN_REFRESH_BUFFER_MS < expiresAt) {
-			logger_default.debug(`[MCP] Token for ${serverKey} still valid, no refresh needed`);
+		if (expiresAt && now + 6e4 < expiresAt) {
+			logger.debug(`[MCP] Token for ${serverKey} still valid, no refresh needed`);
 			return;
 		}
 		const existingRefresh = this.tokenRefreshPromise.get(serverKey);
 		if (existingRefresh) {
-			logger_default.debug(`[MCP] Token refresh already in progress for ${serverKey}, waiting...`);
+			logger.debug(`[MCP] Token refresh already in progress for ${serverKey}, waiting...`);
 			try {
 				await existingRefresh;
 				const newExpiresAt = this.tokenExpiresAt.get(serverKey);
-				if (newExpiresAt && Date.now() + TOKEN_REFRESH_BUFFER_MS < newExpiresAt) return;
-				logger_default.debug(`[MCP] Token expired while waiting for ${serverKey}, refreshing again...`);
+				if (newExpiresAt && Date.now() + 6e4 < newExpiresAt) return;
+				logger.debug(`[MCP] Token expired while waiting for ${serverKey}, refreshing again...`);
 			} catch {
-				logger_default.debug(`[MCP] Previous token refresh failed for ${serverKey}, retrying...`);
+				logger.debug(`[MCP] Previous token refresh failed for ${serverKey}, retrying...`);
 			}
 		}
-		logger_default.debug(`[MCP] Proactively refreshing OAuth token for server ${serverKey}`);
+		logger.debug(`[MCP] Proactively refreshing OAuth token for server ${serverKey}`);
 		const refreshPromise = this.performTokenRefresh(serverKey, oauthConfig);
 		this.tokenRefreshPromise.set(serverKey, refreshPromise);
 		try {
@@ -272,7 +270,7 @@ var MCPClient = class {
 		this.clients.delete(serverKey);
 		this.transports.delete(serverKey);
 		await this.connectToServer(oauthConfig.serverConfig);
-		logger_default.debug(`[MCP] Successfully refreshed OAuth token for server ${serverKey}`);
+		logger.debug(`[MCP] Successfully refreshed OAuth token for server ${serverKey}`);
 	}
 	async callTool(name, args) {
 		const requestOptions = getEffectiveRequestOptions(this.config);
@@ -300,7 +298,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) {
-					logger_default.debug(`[MCP] Auth error for ${serverKey}, attempting reactive token refresh`);
+					logger.debug(`[MCP] Auth error for ${serverKey}, attempting reactive token refresh`);
 					retried = true;
 					try {
 						await this.performTokenRefresh(serverKey, oauthConfig);
@@ -311,10 +309,10 @@ var MCPClient = class {
 						}
 					} catch (refreshError) {
 						const refreshErrorMsg = refreshError instanceof Error ? refreshError.message : String(refreshError);
-						logger_default.error(`[MCP] Token refresh failed for ${serverKey}: ${refreshErrorMsg}`);
+						logger.error(`[MCP] Token refresh failed for ${serverKey}: ${refreshErrorMsg}`);
 					}
 				}
-				if (this.isDebugEnabled) logger_default.error(`Error calling tool ${name}: ${errorMessage}`);
+				if (this.isDebugEnabled) logger.error(`Error calling tool ${name}: ${errorMessage}`);
 				return {
 					content: "",
 					error: errorMessage
@@ -329,7 +327,7 @@ var MCPClient = class {
 			if (transport) await transport.close();
 			await client.close();
 		} catch (error) {
-			if (this.isDebugEnabled) logger_default.error(`Error during cleanup: ${error instanceof Error ? error.message : String(error)}`);
+			if (this.isDebugEnabled) logger.error(`Error during cleanup: ${error instanceof Error ? error.message : String(error)}`);
 		}
 		this.clients.clear();
 		this.transports.clear();
@@ -339,7 +337,6 @@ var MCPClient = class {
 		this.tokenRefreshPromise.clear();
 	}
 };
-
 //#endregion
 //#region src/providers/openai/chat.ts
 var OpenAiChatCompletionProvider = class OpenAiChatCompletionProvider extends OpenAiGenericProvider {
@@ -350,7 +347,7 @@ var OpenAiChatCompletionProvider = class OpenAiChatCompletionProvider extends Op
 	initializationPromise = null;
 	loadedFunctionCallbacks = {};
 	constructor(modelName, options = {}) {
-		if (!OpenAiChatCompletionProvider.OPENAI_CHAT_MODEL_NAMES.includes(modelName)) logger_default.debug(`Using unknown chat model: ${modelName}`);
+		if (!OpenAiChatCompletionProvider.OPENAI_CHAT_MODEL_NAMES.includes(modelName)) logger.debug(`Using unknown chat model: ${modelName}`);
 		super(modelName, options);
 		this.config = options.config || {};
 		if (this.config.mcp?.enabled) this.initializationPromise = this.initializeMCP();
@@ -379,8 +376,8 @@ var OpenAiChatCompletionProvider = class OpenAiChatCompletionProvider extends Op
 			if (splits[0] && isJavascriptFile(splits[0])) [filePath, functionName] = splits;
 		}
 		try {
-			const resolvedPath = path.resolve(cliState_default.basePath || "", filePath);
-			logger_default.debug(`Loading function from ${resolvedPath}${functionName ? `:${functionName}` : ""}`);
+			const resolvedPath = path.resolve(state.basePath || "", filePath);
+			logger.debug(`Loading function from ${resolvedPath}${functionName ? `:${functionName}` : ""}`);
 			const requiredModule = await importModule(resolvedPath, functionName);
 			if (typeof requiredModule === "function") return requiredModule;
 			else if (requiredModule && typeof requiredModule === "object" && functionName && functionName in requiredModule) {
@@ -411,18 +408,18 @@ var OpenAiChatCompletionProvider = class OpenAiChatCompletionProvider extends Op
 				}
 			}
 			if (!callback) throw new Error(`No callback found for function '${functionName}'`);
-			logger_default.debug(`Executing function '${functionName}' with args: ${args}`);
+			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) {
-				logger_default.warn(`Error stringifying result from function '${functionName}': ${error}`);
+				logger.warn(`Error stringifying result from function '${functionName}': ${error}`);
 				return String(result);
 			}
 			else return String(result);
 		} catch (error) {
-			logger_default.error(`Error executing function '${functionName}': ${error.message || String(error)}`);
+			logger.error(`Error executing function '${functionName}': ${error.message || String(error)}`);
 			throw error;
 		}
 	}
@@ -447,8 +444,10 @@ var OpenAiChatCompletionProvider = class OpenAiChatCompletionProvider extends Op
 		const isReasoningModel = this.isReasoningModel();
 		const isGPT5Model = this.isGPT5Model();
 		const maxCompletionTokens = isReasoningModel ? config.max_completion_tokens ?? getEnvInt("OPENAI_MAX_COMPLETION_TOKENS") : void 0;
-		const maxTokens = isReasoningModel || isGPT5Model ? void 0 : config.max_tokens ?? getEnvInt("OPENAI_MAX_TOKENS", 1024);
-		const temperature = this.supportsTemperature() ? config.temperature ?? getEnvFloat("OPENAI_TEMPERATURE", 0) : void 0;
+		const maxTokensDefault = config.omitDefaults ? getEnvString("OPENAI_MAX_TOKENS") !== void 0 ? getEnvInt("OPENAI_MAX_TOKENS") : void 0 : getEnvInt("OPENAI_MAX_TOKENS", 1024);
+		const maxTokens = isReasoningModel || isGPT5Model ? void 0 : config.max_tokens ?? maxTokensDefault;
+		const temperatureDefault = config.omitDefaults ? getEnvString("OPENAI_TEMPERATURE") !== void 0 ? getEnvFloat("OPENAI_TEMPERATURE") : void 0 : getEnvFloat("OPENAI_TEMPERATURE", 0);
+		const temperature = this.supportsTemperature() ? config.temperature ?? temperatureDefault : void 0;
 		const reasoningEffort = isReasoningModel ? renderVarsInObject(config.reasoning_effort, context?.vars) : void 0;
 		const mcpTools = this.mcpClient ? transformMCPToolsToOpenAi(this.mcpClient.getAllTools()) : [];
 		const fileTools = transformTools(config.tools ? await maybeLoadToolsFromExternalFile(config.tools, context?.vars) || [] : [], "openai");
@@ -582,7 +581,7 @@ var OpenAiChatCompletionProvider = class OpenAiChatCompletionProvider extends Op
 				};
 			}
 		} catch (err) {
-			logger_default.error(`API call error: ${String(err)}`);
+			logger.error(`API call error: ${String(err)}`);
 			await deleteFromCache?.();
 			return {
 				error: `API call error: ${String(err)}`,
@@ -638,7 +637,7 @@ var OpenAiChatCompletionProvider = class OpenAiChatCompletionProvider extends Op
 			if (config.response_format?.type === "json_schema" && typeof output === "string") try {
 				output = JSON.parse(output);
 			} catch (error) {
-				logger_default.error(`Failed to parse JSON output: ${error}`);
+				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;
@@ -675,7 +674,7 @@ var OpenAiChatCompletionProvider = class OpenAiChatCompletionProvider extends Op
 							hasSuccessfulCallback = true;
 							continue;
 						} catch (error) {
-							logger_default.debug(`MCP tool execution failed for ${functionName}: ${error}`);
+							logger.debug(`MCP tool execution failed for ${functionName}: ${error}`);
 							results.push(`MCP Tool Error (${functionName}): ${error}`);
 							hasSuccessfulCallback = true;
 							continue;
@@ -686,7 +685,7 @@ var OpenAiChatCompletionProvider = class OpenAiChatCompletionProvider extends Op
 						results.push(functionResult);
 						hasSuccessfulCallback = true;
 					} catch (error) {
-						logger_default.debug(`Function callback failed for ${functionName} with error ${error}, falling back to original output`);
+						logger.debug(`Function callback failed for ${functionName} with error ${error}, falling back to original output`);
 						hasSuccessfulCallback = false;
 						break;
 					}
@@ -761,7 +760,7 @@ var OpenAiChatCompletionProvider = class OpenAiChatCompletionProvider extends Op
 		}
 	}
 };
-
 //#endregion
 export { normalizeFinishReason as i, MCPClient as n, FINISH_REASON_MAP as r, OpenAiChatCompletionProvider as t };
-//# sourceMappingURL=chat-CcUCysjU.js.map
+
+//# sourceMappingURL=chat-DqxYYtWA.js.map

package/dist/src/{chat-DZM2GUHO.js → chat-qmatte1u.js}

@@ -1,20 +1,18 @@
 #!/usr/bin/env node
-import "./chunk-DHDDz29n.js";
-import { o as logger_default } from "./logger-LSBxlt7a.js";
-import "./fetch-CXZI9RRr.js";
-import { t as invariant } from "./invariant-DT20jrBd.js";
-import "./cloud-CZ-q9Ier.js";
-import "./types-CXQduE9o.js";
-import "./cache-jsiwsAJv.js";
-import "./util-_h4pVqrz.js";
-import "./esm-B9dPm_BF.js";
-import "./pythonUtils-CcT5LH1M.js";
-import "./genaiTracer-CqNnnXrE.js";
-import { t as OpenAiChatCompletionProvider } from "./chat-BcPjZXIp.js";
-import "./transform-DeGlxb0D.js";
-import "./openai-CcN1B8Sb.js";
-import "./util-Bm_-UMD_.js";
-
+import { o as logger } from "./logger-KkObSCzq.js";
+import "./fetch-Dxpd4_sr.js";
+import { t as invariant } from "./invariant-BtWWVVhl.js";
+import "./cloud-C0dlstV_.js";
+import "./types-Cbd8uOMq.js";
+import "./cache-BVeDlD87.js";
+import "./util-C1CeHl-P.js";
+import "./esm-C03C-mv3.js";
+import "./pythonUtils-C3py6GC1.js";
+import "./genaiTracer-C1rxGO8Q.js";
+import { t as OpenAiChatCompletionProvider } from "./chat-BiKyneZl.js";
+import "./transform-D5HsjduX.js";
+import "./openai-DhbB7eWK.js";
+import "./util-CMy69ZgQ.js";
 //#region src/providers/hyperbolic/chat.ts
 const HYPERBOLIC_CHAT_MODELS = [
 	{
@@ -203,7 +201,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 {
@@ -260,11 +258,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;
@@ -278,7 +276,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}`);
 					}
 				}
 			}
@@ -287,7 +285,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;
 	}
@@ -297,7 +295,7 @@ function createHyperbolicProvider(providerPath, options = {}) {
 	invariant(modelName, "Model name is required");
 	return new HyperbolicProvider(modelName, options);
 }
-
 //#endregion
 export { createHyperbolicProvider };
-//# sourceMappingURL=chat-DZM2GUHO.js.map
+
+//# sourceMappingURL=chat-qmatte1u.js.map