promptfoo 0.121.1 → 0.121.2

package/dist/src/{cache-8XhNqPKW.js → cache-C4Nxf52C.js}

@@ -1,6 +1,6 @@
 import { t as __exportAll } from "./chunk-DEq-mXcV.js";
 import { _ as getEnvBool, b as getEnvString, g as getConfigDirectoryPath, i as logger, y as getEnvInt } from "./logger-CT3IKMKA.js";
-import { d as sleep, n as fetchWithRetries, p as REQUEST_TIMEOUT_MS } from "./fetch-60Gzydls.js";
+import { d as sleep, n as fetchWithRetries, p as REQUEST_TIMEOUT_MS } from "./fetch-Cwxnd8zz.js";
 import fs from "fs";
 import path from "path";
 import { createCache } from "cache-manager";
@@ -607,6 +607,31 @@ function getCache() {
 	}
 	return cacheInstance;
 }
+const inflightFetchResponses = /* @__PURE__ */ new Map();
+function serializeFetchResponse(data, status, statusText, headers, latencyMs) {
+	return JSON.stringify({
+		data,
+		status,
+		statusText,
+		headers,
+		latencyMs
+	});
+}
+function deserializeFetchResponse(response, cached, cache, cacheKey) {
+	const parsedResponse = JSON.parse(response);
+	return {
+		cached,
+		data: parsedResponse.data,
+		status: parsedResponse.status,
+		statusText: parsedResponse.statusText,
+		headers: parsedResponse.headers,
+		latencyMs: parsedResponse.latencyMs,
+		deleteFromCache: async () => {
+			await cache.del(cacheKey);
+			logger.debug(`Evicted from cache: ${cacheKey}`);
+		}
+	};
+}
 async function fetchAndReadBody(url, options, timeout, maxRetries, isIdempotent) {
 	const maxBodyRetries = isIdempotent ? 2 : 0;
 	for (let bodyAttempt = 0; bodyAttempt <= maxBodyRetries; bodyAttempt++) {
@@ -636,6 +661,35 @@ async function fetchAndReadBody(url, options, timeout, maxRetries, isIdempotent)
 	}
 	throw new Error("Exhausted body retries without returning or throwing");
 }
+async function prepareFetchResponse(url, options, timeout, maxRetries, isIdempotent, format) {
+	const result = await fetchAndReadBody(url, options, timeout, maxRetries, isIdempotent);
+	const response = result.resp;
+	const responseText = result.respText;
+	const fetchLatencyMs = result.fetchLatencyMs;
+	const headers = Object.fromEntries(response.headers.entries());
+	try {
+		const parsedData = format === "json" ? JSON.parse(responseText) : responseText;
+		const serializedResponse = serializeFetchResponse(parsedData, response.status, response.statusText, headers, fetchLatencyMs);
+		if (!response.ok) return {
+			response: responseText === "" ? serializeFetchResponse(`Empty Response: ${response.status}: ${response.statusText}`, response.status, response.statusText, headers, fetchLatencyMs) : serializedResponse,
+			cacheable: false
+		};
+		if (format === "json" && parsedData?.error) {
+			logger.debug(`Not caching ${url} because it contains an 'error' key: ${parsedData.error}`);
+			return {
+				response: serializedResponse,
+				cacheable: false
+			};
+		}
+		logger.debug(`Storing ${url} response in cache with latencyMs=${fetchLatencyMs}: ${serializedResponse}`);
+		return {
+			response: serializedResponse,
+			cacheable: true
+		};
+	} catch (err) {
+		throw new Error(`Error parsing response from ${url}: ${err.message}. Received text: ${responseText}`);
+	}
+}
 async function fetchWithCache(url, options = {}, timeout = REQUEST_TIMEOUT_MS, format = "json", bust = false, maxRetries) {
 	const method = (options.method ?? (url instanceof Request ? url.method : "GET")).toUpperCase();
 	const isIdempotent = [
@@ -665,61 +719,23 @@ async function fetchWithCache(url, options = {}, timeout = REQUEST_TIMEOUT_MS, f
 	delete copy.headers;
 	const cacheKey = `fetch:v2:${url}:${JSON.stringify(copy)}`;
 	const cache = await getCache();
-	let cached = true;
-	let errorResponse = null;
-	let fetchLatencyMs;
-	const cachedResponse = await cache.wrap(cacheKey, async () => {
-		cached = false;
-		const result = await fetchAndReadBody(url, options, timeout, maxRetries, isIdempotent);
-		const response = result.resp;
-		const responseText = result.respText;
-		fetchLatencyMs = result.fetchLatencyMs;
-		const headers = Object.fromEntries(response.headers.entries());
-		try {
-			const parsedData = format === "json" ? JSON.parse(responseText) : responseText;
-			const data = JSON.stringify({
-				data: parsedData,
-				status: response.status,
-				statusText: response.statusText,
-				headers,
-				latencyMs: fetchLatencyMs
-			});
-			if (!response.ok) {
-				if (responseText == "") errorResponse = JSON.stringify({
-					data: `Empty Response: ${response.status}: ${response.statusText}`,
-					status: response.status,
-					statusText: response.statusText,
-					headers,
-					latencyMs: fetchLatencyMs
-				});
-				else errorResponse = data;
-				return;
-			}
-			if (!data) return;
-			if (format === "json" && parsedData?.error) {
-				logger.debug(`Not caching ${url} because it contains an 'error' key: ${parsedData.error}`);
-				return data;
-			}
-			logger.debug(`Storing ${url} response in cache with latencyMs=${fetchLatencyMs}: ${data}`);
-			return data;
-		} catch (err) {
-			throw new Error(`Error parsing response from ${url}: ${err.message}. Received text: ${responseText}`);
-		}
-	});
-	if (cached && cachedResponse) logger.debug(`Returning cached response for ${url}: ${cachedResponse}`);
-	const parsedResponse = JSON.parse(cachedResponse ?? errorResponse);
-	return {
-		cached,
-		data: parsedResponse.data,
-		status: parsedResponse.status,
-		statusText: parsedResponse.statusText,
-		headers: parsedResponse.headers,
-		latencyMs: parsedResponse.latencyMs,
-		deleteFromCache: async () => {
-			await cache.del(cacheKey);
-			logger.debug(`Evicted from cache: ${cacheKey}`);
-		}
-	};
+	const cachedResponse = await cache.get(cacheKey);
+	if (cachedResponse != null) {
+		logger.debug(`Returning cached response for ${url}: ${cachedResponse}`);
+		return deserializeFetchResponse(cachedResponse, true, cache, cacheKey);
+	}
+	let inflightResponse = inflightFetchResponses.get(cacheKey);
+	if (!inflightResponse) {
+		inflightResponse = (async () => {
+			const preparedResponse = await prepareFetchResponse(url, options, timeout, maxRetries, isIdempotent, format);
+			if (preparedResponse.cacheable) await cache.set(cacheKey, preparedResponse.response);
+			return preparedResponse.response;
+		})().finally(() => {
+			inflightFetchResponses.delete(cacheKey);
+		});
+		inflightFetchResponses.set(cacheKey, inflightResponse);
+	}
+	return deserializeFetchResponse(await inflightResponse, false, cache, cacheKey);
 }
 function enableCache() {
 	enabled = true;
@@ -728,6 +744,7 @@ function disableCache() {
 	enabled = false;
 }
 async function clearCache() {
+	inflightFetchResponses.clear();
 	return getCache().clear();
 }
 function isCacheEnabled() {
@@ -736,4 +753,4 @@ function isCacheEnabled() {
 //#endregion
 export { isCacheEnabled as a, isTransientConnectionError as c, getCache as i, disableCache as n, NON_TRANSIENT_HTTP_STATUSES as o, fetchWithCache as r, isNonTransientHttpStatus as s, cache_exports as t };
 
-//# sourceMappingURL=cache-8XhNqPKW.js.map
+//# sourceMappingURL=cache-C4Nxf52C.js.map

package/dist/src/{cache-Bbn1Nyrd.cjs → cache-CeUpFm3M.cjs}

@@ -1,5 +1,5 @@
 require("./logger-Cp1GPUjj.cjs");
-require("./fetch-BxUk8odA.cjs");
-const require_cache = require("./cache-COish3-W.cjs");
+require("./fetch-BPkYtG8K.cjs");
+const require_cache = require("./cache-Dh5WtQps.cjs");
 exports.getCache = require_cache.getCache;
 exports.isCacheEnabled = require_cache.isCacheEnabled;

package/dist/src/{cache-COish3-W.cjs → cache-Dh5WtQps.cjs}

@@ -1,5 +1,5 @@
 const require_logger = require("./logger-Cp1GPUjj.cjs");
-const require_fetch = require("./fetch-BxUk8odA.cjs");
+const require_fetch = require("./fetch-BPkYtG8K.cjs");
 let fs = require("fs");
 fs = require_logger.__toESM(fs);
 let path = require("path");
@@ -608,6 +608,31 @@ function getCache() {
 	}
 	return cacheInstance;
 }
+const inflightFetchResponses = /* @__PURE__ */ new Map();
+function serializeFetchResponse(data, status, statusText, headers, latencyMs) {
+	return JSON.stringify({
+		data,
+		status,
+		statusText,
+		headers,
+		latencyMs
+	});
+}
+function deserializeFetchResponse(response, cached, cache, cacheKey) {
+	const parsedResponse = JSON.parse(response);
+	return {
+		cached,
+		data: parsedResponse.data,
+		status: parsedResponse.status,
+		statusText: parsedResponse.statusText,
+		headers: parsedResponse.headers,
+		latencyMs: parsedResponse.latencyMs,
+		deleteFromCache: async () => {
+			await cache.del(cacheKey);
+			require_logger.logger.debug(`Evicted from cache: ${cacheKey}`);
+		}
+	};
+}
 async function fetchAndReadBody(url, options, timeout, maxRetries, isIdempotent) {
 	const maxBodyRetries = isIdempotent ? 2 : 0;
 	for (let bodyAttempt = 0; bodyAttempt <= maxBodyRetries; bodyAttempt++) {
@@ -637,6 +662,35 @@ async function fetchAndReadBody(url, options, timeout, maxRetries, isIdempotent)
 	}
 	throw new Error("Exhausted body retries without returning or throwing");
 }
+async function prepareFetchResponse(url, options, timeout, maxRetries, isIdempotent, format) {
+	const result = await fetchAndReadBody(url, options, timeout, maxRetries, isIdempotent);
+	const response = result.resp;
+	const responseText = result.respText;
+	const fetchLatencyMs = result.fetchLatencyMs;
+	const headers = Object.fromEntries(response.headers.entries());
+	try {
+		const parsedData = format === "json" ? JSON.parse(responseText) : responseText;
+		const serializedResponse = serializeFetchResponse(parsedData, response.status, response.statusText, headers, fetchLatencyMs);
+		if (!response.ok) return {
+			response: responseText === "" ? serializeFetchResponse(`Empty Response: ${response.status}: ${response.statusText}`, response.status, response.statusText, headers, fetchLatencyMs) : serializedResponse,
+			cacheable: false
+		};
+		if (format === "json" && parsedData?.error) {
+			require_logger.logger.debug(`Not caching ${url} because it contains an 'error' key: ${parsedData.error}`);
+			return {
+				response: serializedResponse,
+				cacheable: false
+			};
+		}
+		require_logger.logger.debug(`Storing ${url} response in cache with latencyMs=${fetchLatencyMs}: ${serializedResponse}`);
+		return {
+			response: serializedResponse,
+			cacheable: true
+		};
+	} catch (err) {
+		throw new Error(`Error parsing response from ${url}: ${err.message}. Received text: ${responseText}`);
+	}
+}
 async function fetchWithCache(url, options = {}, timeout = require_fetch.REQUEST_TIMEOUT_MS, format = "json", bust = false, maxRetries) {
 	const method = (options.method ?? (url instanceof Request ? url.method : "GET")).toUpperCase();
 	const isIdempotent = [
@@ -666,61 +720,23 @@ async function fetchWithCache(url, options = {}, timeout = require_fetch.REQUEST
 	delete copy.headers;
 	const cacheKey = `fetch:v2:${url}:${JSON.stringify(copy)}`;
 	const cache = await getCache();
-	let cached = true;
-	let errorResponse = null;
-	let fetchLatencyMs;
-	const cachedResponse = await cache.wrap(cacheKey, async () => {
-		cached = false;
-		const result = await fetchAndReadBody(url, options, timeout, maxRetries, isIdempotent);
-		const response = result.resp;
-		const responseText = result.respText;
-		fetchLatencyMs = result.fetchLatencyMs;
-		const headers = Object.fromEntries(response.headers.entries());
-		try {
-			const parsedData = format === "json" ? JSON.parse(responseText) : responseText;
-			const data = JSON.stringify({
-				data: parsedData,
-				status: response.status,
-				statusText: response.statusText,
-				headers,
-				latencyMs: fetchLatencyMs
-			});
-			if (!response.ok) {
-				if (responseText == "") errorResponse = JSON.stringify({
-					data: `Empty Response: ${response.status}: ${response.statusText}`,
-					status: response.status,
-					statusText: response.statusText,
-					headers,
-					latencyMs: fetchLatencyMs
-				});
-				else errorResponse = data;
-				return;
-			}
-			if (!data) return;
-			if (format === "json" && parsedData?.error) {
-				require_logger.logger.debug(`Not caching ${url} because it contains an 'error' key: ${parsedData.error}`);
-				return data;
-			}
-			require_logger.logger.debug(`Storing ${url} response in cache with latencyMs=${fetchLatencyMs}: ${data}`);
-			return data;
-		} catch (err) {
-			throw new Error(`Error parsing response from ${url}: ${err.message}. Received text: ${responseText}`);
-		}
-	});
-	if (cached && cachedResponse) require_logger.logger.debug(`Returning cached response for ${url}: ${cachedResponse}`);
-	const parsedResponse = JSON.parse(cachedResponse ?? errorResponse);
-	return {
-		cached,
-		data: parsedResponse.data,
-		status: parsedResponse.status,
-		statusText: parsedResponse.statusText,
-		headers: parsedResponse.headers,
-		latencyMs: parsedResponse.latencyMs,
-		deleteFromCache: async () => {
-			await cache.del(cacheKey);
-			require_logger.logger.debug(`Evicted from cache: ${cacheKey}`);
-		}
-	};
+	const cachedResponse = await cache.get(cacheKey);
+	if (cachedResponse != null) {
+		require_logger.logger.debug(`Returning cached response for ${url}: ${cachedResponse}`);
+		return deserializeFetchResponse(cachedResponse, true, cache, cacheKey);
+	}
+	let inflightResponse = inflightFetchResponses.get(cacheKey);
+	if (!inflightResponse) {
+		inflightResponse = (async () => {
+			const preparedResponse = await prepareFetchResponse(url, options, timeout, maxRetries, isIdempotent, format);
+			if (preparedResponse.cacheable) await cache.set(cacheKey, preparedResponse.response);
+			return preparedResponse.response;
+		})().finally(() => {
+			inflightFetchResponses.delete(cacheKey);
+		});
+		inflightFetchResponses.set(cacheKey, inflightResponse);
+	}
+	return deserializeFetchResponse(await inflightResponse, false, cache, cacheKey);
 }
 function enableCache() {
 	enabled = true;
@@ -729,6 +745,7 @@ function disableCache() {
 	enabled = false;
 }
 async function clearCache() {
+	inflightFetchResponses.clear();
 	return getCache().clear();
 }
 function isCacheEnabled() {
@@ -796,4 +813,4 @@ Object.defineProperty(exports, "isTransientConnectionError", {
 	}
 });
 
-//# sourceMappingURL=cache-COish3-W.cjs.map
+//# sourceMappingURL=cache-Dh5WtQps.cjs.map

package/dist/src/{cache-D3eqDYGU.js → cache-i1P6crbO.js}

@@ -1,6 +1,6 @@
 import { t as __exportAll } from "./chunk-DEq-mXcV.js";
 import { _ as getEnvBool, b as getEnvString, g as getConfigDirectoryPath, i as logger, y as getEnvInt } from "./logger-DLcq4dWf.js";
-import { d as sleep, n as fetchWithRetries, p as REQUEST_TIMEOUT_MS } from "./fetch-4M3YRaqL.js";
+import { d as sleep, n as fetchWithRetries, p as REQUEST_TIMEOUT_MS } from "./fetch-HaqdX7U1.js";
 import fs from "fs";
 import path from "path";
 import { randomBytes } from "crypto";
@@ -607,6 +607,31 @@ function getCache() {
 	}
 	return cacheInstance;
 }
+const inflightFetchResponses = /* @__PURE__ */ new Map();
+function serializeFetchResponse(data, status, statusText, headers, latencyMs) {
+	return JSON.stringify({
+		data,
+		status,
+		statusText,
+		headers,
+		latencyMs
+	});
+}
+function deserializeFetchResponse(response, cached, cache, cacheKey) {
+	const parsedResponse = JSON.parse(response);
+	return {
+		cached,
+		data: parsedResponse.data,
+		status: parsedResponse.status,
+		statusText: parsedResponse.statusText,
+		headers: parsedResponse.headers,
+		latencyMs: parsedResponse.latencyMs,
+		deleteFromCache: async () => {
+			await cache.del(cacheKey);
+			logger.debug(`Evicted from cache: ${cacheKey}`);
+		}
+	};
+}
 async function fetchAndReadBody(url, options, timeout, maxRetries, isIdempotent) {
 	const maxBodyRetries = isIdempotent ? 2 : 0;
 	for (let bodyAttempt = 0; bodyAttempt <= maxBodyRetries; bodyAttempt++) {
@@ -636,6 +661,35 @@ async function fetchAndReadBody(url, options, timeout, maxRetries, isIdempotent)
 	}
 	throw new Error("Exhausted body retries without returning or throwing");
 }
+async function prepareFetchResponse(url, options, timeout, maxRetries, isIdempotent, format) {
+	const result = await fetchAndReadBody(url, options, timeout, maxRetries, isIdempotent);
+	const response = result.resp;
+	const responseText = result.respText;
+	const fetchLatencyMs = result.fetchLatencyMs;
+	const headers = Object.fromEntries(response.headers.entries());
+	try {
+		const parsedData = format === "json" ? JSON.parse(responseText) : responseText;
+		const serializedResponse = serializeFetchResponse(parsedData, response.status, response.statusText, headers, fetchLatencyMs);
+		if (!response.ok) return {
+			response: responseText === "" ? serializeFetchResponse(`Empty Response: ${response.status}: ${response.statusText}`, response.status, response.statusText, headers, fetchLatencyMs) : serializedResponse,
+			cacheable: false
+		};
+		if (format === "json" && parsedData?.error) {
+			logger.debug(`Not caching ${url} because it contains an 'error' key: ${parsedData.error}`);
+			return {
+				response: serializedResponse,
+				cacheable: false
+			};
+		}
+		logger.debug(`Storing ${url} response in cache with latencyMs=${fetchLatencyMs}: ${serializedResponse}`);
+		return {
+			response: serializedResponse,
+			cacheable: true
+		};
+	} catch (err) {
+		throw new Error(`Error parsing response from ${url}: ${err.message}. Received text: ${responseText}`);
+	}
+}
 async function fetchWithCache(url, options = {}, timeout = REQUEST_TIMEOUT_MS, format = "json", bust = false, maxRetries) {
 	const method = (options.method ?? (url instanceof Request ? url.method : "GET")).toUpperCase();
 	const isIdempotent = [
@@ -665,61 +719,23 @@ async function fetchWithCache(url, options = {}, timeout = REQUEST_TIMEOUT_MS, f
 	delete copy.headers;
 	const cacheKey = `fetch:v2:${url}:${JSON.stringify(copy)}`;
 	const cache = await getCache();
-	let cached = true;
-	let errorResponse = null;
-	let fetchLatencyMs;
-	const cachedResponse = await cache.wrap(cacheKey, async () => {
-		cached = false;
-		const result = await fetchAndReadBody(url, options, timeout, maxRetries, isIdempotent);
-		const response = result.resp;
-		const responseText = result.respText;
-		fetchLatencyMs = result.fetchLatencyMs;
-		const headers = Object.fromEntries(response.headers.entries());
-		try {
-			const parsedData = format === "json" ? JSON.parse(responseText) : responseText;
-			const data = JSON.stringify({
-				data: parsedData,
-				status: response.status,
-				statusText: response.statusText,
-				headers,
-				latencyMs: fetchLatencyMs
-			});
-			if (!response.ok) {
-				if (responseText == "") errorResponse = JSON.stringify({
-					data: `Empty Response: ${response.status}: ${response.statusText}`,
-					status: response.status,
-					statusText: response.statusText,
-					headers,
-					latencyMs: fetchLatencyMs
-				});
-				else errorResponse = data;
-				return;
-			}
-			if (!data) return;
-			if (format === "json" && parsedData?.error) {
-				logger.debug(`Not caching ${url} because it contains an 'error' key: ${parsedData.error}`);
-				return data;
-			}
-			logger.debug(`Storing ${url} response in cache with latencyMs=${fetchLatencyMs}: ${data}`);
-			return data;
-		} catch (err) {
-			throw new Error(`Error parsing response from ${url}: ${err.message}. Received text: ${responseText}`);
-		}
-	});
-	if (cached && cachedResponse) logger.debug(`Returning cached response for ${url}: ${cachedResponse}`);
-	const parsedResponse = JSON.parse(cachedResponse ?? errorResponse);
-	return {
-		cached,
-		data: parsedResponse.data,
-		status: parsedResponse.status,
-		statusText: parsedResponse.statusText,
-		headers: parsedResponse.headers,
-		latencyMs: parsedResponse.latencyMs,
-		deleteFromCache: async () => {
-			await cache.del(cacheKey);
-			logger.debug(`Evicted from cache: ${cacheKey}`);
-		}
-	};
+	const cachedResponse = await cache.get(cacheKey);
+	if (cachedResponse != null) {
+		logger.debug(`Returning cached response for ${url}: ${cachedResponse}`);
+		return deserializeFetchResponse(cachedResponse, true, cache, cacheKey);
+	}
+	let inflightResponse = inflightFetchResponses.get(cacheKey);
+	if (!inflightResponse) {
+		inflightResponse = (async () => {
+			const preparedResponse = await prepareFetchResponse(url, options, timeout, maxRetries, isIdempotent, format);
+			if (preparedResponse.cacheable) await cache.set(cacheKey, preparedResponse.response);
+			return preparedResponse.response;
+		})().finally(() => {
+			inflightFetchResponses.delete(cacheKey);
+		});
+		inflightFetchResponses.set(cacheKey, inflightResponse);
+	}
+	return deserializeFetchResponse(await inflightResponse, false, cache, cacheKey);
 }
 function enableCache() {
 	enabled = true;
@@ -728,6 +744,7 @@ function disableCache() {
 	enabled = false;
 }
 async function clearCache() {
+	inflightFetchResponses.clear();
 	return getCache().clear();
 }
 function isCacheEnabled() {
@@ -736,4 +753,4 @@ function isCacheEnabled() {
 //#endregion
 export { isCacheEnabled as a, isTransientConnectionError as c, getCache as i, disableCache as n, NON_TRANSIENT_HTTP_STATUSES as o, fetchWithCache as r, isNonTransientHttpStatus as s, cache_exports as t };
 
-//# sourceMappingURL=cache-D3eqDYGU.js.map
+//# sourceMappingURL=cache-i1P6crbO.js.map

package/dist/src/cache-n-RCJ-hL.js

@@ -0,0 +1,6 @@
+#!/usr/bin/env node
+import "./logger-KkObSCzq.js";
+import "./fetch-Dxpd4_sr.js";
+import "./cloud-C0dlstV_.js";
+import { o as getCache, s as isCacheEnabled } from "./cache-BVeDlD87.js";
+export { getCache, isCacheEnabled };

package/dist/src/{chat-CRWNNq73.js → chat-BiKyneZl.js}

@@ -1,14 +1,14 @@
 #!/usr/bin/env node
 import { C as getEnvString, O as state, S as getEnvInt, b as getEnvBool, o as logger, x as getEnvFloat } from "./logger-KkObSCzq.js";
-import { S as transformTools, f as REQUEST_TIMEOUT_MS, x as transformToolChoice, y as parseChatPrompt } from "./fetch-BMv0O527.js";
-import { a as fetchWithCache } from "./cache-CG0SlR1d.js";
+import { S as transformTools, f as REQUEST_TIMEOUT_MS, x as transformToolChoice, y as parseChatPrompt } from "./fetch-Dxpd4_sr.js";
+import { a as fetchWithCache } from "./cache-BVeDlD87.js";
 import { i as isJavascriptFile } from "./fileExtensions-Ds-foDzt.js";
-import { g as maybeLoadToolsFromExternalFile, h as maybeLoadResponseFormatFromExternalFile, m as maybeLoadFromExternalFileWithVars, x as renderVarsInObject } from "./util-YT5HPZaS.js";
+import { g as maybeLoadToolsFromExternalFile, h as maybeLoadResponseFormatFromExternalFile, m as maybeLoadFromExternalFileWithVars, x as renderVarsInObject } from "./util-C1CeHl-P.js";
 import { r as importModule } from "./esm-C03C-mv3.js";
 import { n as withGenAISpan } from "./genaiTracer-C1rxGO8Q.js";
-import { C as applyQueryParams, D as renderAuthVars, E as getOAuthTokenWithExpiry, T as getAuthQueryParams, i as transformMCPToolsToOpenAi, w as getAuthHeaders } from "./transform-Cgi24fJ7.js";
+import { C as applyQueryParams, D as renderAuthVars, E as getOAuthTokenWithExpiry, T as getAuthQueryParams, i as transformMCPToolsToOpenAi, w as getAuthHeaders } from "./transform-D5HsjduX.js";
 import { t as OpenAiGenericProvider } from "./openai-DhbB7eWK.js";
-import { a as calculateOpenAICost, c as getTokenUsage, t as OPENAI_CHAT_MODELS } from "./util-C-PPYSMq.js";
+import { a as calculateOpenAICost, c as getTokenUsage, t as OPENAI_CHAT_MODELS } from "./util-CMy69ZgQ.js";
 import path from "path";
 import { Client } from "@modelcontextprotocol/sdk/client/index.js";
 //#region src/util/finishReason.ts
@@ -445,8 +445,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");
@@ -762,4 +764,4 @@ var OpenAiChatCompletionProvider = class OpenAiChatCompletionProvider extends Op
 //#endregion
 export { normalizeFinishReason as i, MCPClient as n, FINISH_REASON_MAP as r, OpenAiChatCompletionProvider as t };
 
-//# sourceMappingURL=chat-CRWNNq73.js.map
+//# sourceMappingURL=chat-BiKyneZl.js.map

package/dist/src/{chat-2K608PeQ.cjs → chat-C1Qst7jL.cjs}

@@ -2,15 +2,15 @@ const require_logger = require("./logger-Cp1GPUjj.cjs");
 const require_invariant = require("./invariant-kfQ8Bu82.cjs");
 require("./esm-CnNt7sI4.cjs");
 require("./pythonUtils-CTU3Y3lw.cjs");
-require("./types-LJ0r3wbR.cjs");
-require("./util-Yz-1aEhW.cjs");
-require("./fetch-BxUk8odA.cjs");
-require("./cache-COish3-W.cjs");
+require("./types-C_7nyzr1.cjs");
+require("./util-B9vlHIIh.cjs");
+require("./fetch-BPkYtG8K.cjs");
+require("./cache-Dh5WtQps.cjs");
 require("./genaiTracer-DN4dQywX.cjs");
-const require_chat = require("./chat-DaqekjFr.cjs");
-require("./transform-DOcQeLld.cjs");
+const require_chat = require("./chat-CgF-J-Jj.cjs");
+require("./transform-DuHvhZpj.cjs");
 require("./openai-Cuif0GEt.cjs");
-require("./util-Db0a0AFH.cjs");
+require("./util-BzMcevZc.cjs");
 //#region src/providers/hyperbolic/chat.ts
 const HYPERBOLIC_CHAT_MODELS = [
 	{
@@ -296,4 +296,4 @@ function createHyperbolicProvider(providerPath, options = {}) {
 //#endregion
 exports.createHyperbolicProvider = createHyperbolicProvider;
 
-//# sourceMappingURL=chat-2K608PeQ.cjs.map
+//# sourceMappingURL=chat-C1Qst7jL.cjs.map

package/dist/src/{chat-CM_kyI8B.js → chat-C2jrdPMx.js}

@@ -1,16 +1,16 @@
 import { i as logger } from "./logger-DLcq4dWf.js";
-import "./fetch-4M3YRaqL.js";
+import "./fetch-HaqdX7U1.js";
 import { t as invariant } from "./invariant-vgHWClmd.js";
 import "./esm-CaIwzWR5.js";
-import "./types-CN_TZ2GJ.js";
-import "./cache-D3eqDYGU.js";
+import "./types-CzW2QFyi.js";
+import "./cache-i1P6crbO.js";
 import "./genaiTracer-70Z8BIuV.js";
 import "./pythonUtils-D6fwaDSg.js";
-import "./util-5cB-L7U3.js";
-import { t as OpenAiChatCompletionProvider } from "./chat-BKm79wib.js";
-import "./transform-DGxXocjk.js";
+import "./util-ZzmqNPlg.js";
+import { t as OpenAiChatCompletionProvider } from "./chat-DJIw17u0.js";
+import "./transform-uAytVuyX.js";
 import "./openai-j-sE2O7r.js";
-import "./util-6-GqIvzS.js";
+import "./util-BV4XUC0n.js";
 //#region src/providers/hyperbolic/chat.ts
 const HYPERBOLIC_CHAT_MODELS = [
 	{
@@ -296,4 +296,4 @@ function createHyperbolicProvider(providerPath, options = {}) {
 //#endregion
 export { createHyperbolicProvider };
 
-//# sourceMappingURL=chat-CM_kyI8B.js.map
+//# sourceMappingURL=chat-C2jrdPMx.js.map

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

@@ -1,13 +1,13 @@
 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-Yz-1aEhW.cjs");
-const require_fetch = require("./fetch-BxUk8odA.cjs");
-const require_cache = require("./cache-COish3-W.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-DOcQeLld.cjs");
+const require_transform = require("./transform-DuHvhZpj.cjs");
 const require_openai = require("./openai-Cuif0GEt.cjs");
-const require_util$1 = require("./util-Db0a0AFH.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");
@@ -445,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");
@@ -785,4 +787,4 @@ Object.defineProperty(exports, "normalizeFinishReason", {
 	}
 });
 
-//# sourceMappingURL=chat-DaqekjFr.cjs.map
+//# sourceMappingURL=chat-CgF-J-Jj.cjs.map