promptfoo 0.120.27 → 0.121.1

package/dist/src/{logger-CG1uZPbQ.js → logger-CT3IKMKA.js}

@@ -1,4 +1,4 @@
-import { t as invariant } from "./invariant-1pAf2CD1.js";
+import { t as invariant } from "./invariant-Ddh24eXh.js";
 import fs from "fs";
 import * as path$1 from "path";
 import path from "path";
@@ -10,17 +10,14 @@ import * as os$1 from "os";
 import Ajv from "ajv";
 import addFormats from "ajv-formats";
 import safeStringify from "fast-safe-stringify";
-
 //#region src/cliState.ts
 const state = {};
-var cliState_default = state;
-
 //#endregion
 //#region src/envars.ts
 dotenv.config({ quiet: true });
 function getEnvString(key, defaultValue) {
-	if (cliState_default.config?.env && typeof cliState_default.config.env === "object") {
-		const envValue = cliState_default.config.env[key];
+	if (state.config?.env && typeof state.config.env === "object") {
+		const envValue = state.config.env[key];
 		if (envValue !== void 0) return String(envValue);
 	}
 	const value = process.env[key];
@@ -88,7 +85,6 @@ function getMaxEvalTimeMs(defaultValue = 0) {
 function isCI() {
 	return getEnvBool("CI") || getEnvBool("GITHUB_ACTIONS") || getEnvBool("TRAVIS") || getEnvBool("CIRCLECI") || getEnvBool("JENKINS") || getEnvBool("GITLAB_CI") || getEnvBool("APPVEYOR") || getEnvBool("CODEBUILD_BUILD_ID") || getEnvBool("TF_BUILD") || getEnvBool("BITBUCKET_COMMIT") || getEnvBool("BUDDY") || getEnvBool("BUILDKITE") || getEnvBool("TEAMCITY_VERSION");
 }
-
 //#endregion
 //#region src/util/config/manage.ts
 let configDirectoryPath = getEnvString("PROMPTFOO_CONFIG_DIR");
@@ -100,7 +96,6 @@ function getConfigDirectoryPath(createIfNotExists = false) {
 	} catch {}
 	return p;
 }
-
 //#endregion
 //#region src/util/json.ts
 let ajvInstance = null;
@@ -334,7 +329,6 @@ function summarizeEvaluateResultForLogging(result, maxOutputLength = 500, includ
 	};
 	return summary;
 }
-
 //#endregion
 //#region src/util/sanitizer.ts
 /**
@@ -528,14 +522,12 @@ function sanitizeUrl(url) {
 		return url;
 	}
 }
-
 //#endregion
 //#region src/logger.ts
 let globalLogCallback = null;
 function setLogCallback(callback) {
 	globalLogCallback = callback;
 }
-let useStructuredLogging = false;
 const LOG_LEVELS = {
 	error: 0,
 	warn: 1,
@@ -543,7 +535,6 @@ const LOG_LEVELS = {
 	debug: 3
 };
 let sourceMapSupportInitialized = false;
-let isLoggerShuttingDown = false;
 async function initializeSourceMapSupport() {
 	if (!sourceMapSupportInitialized) try {
 		(await import("source-map-support")).install();
@@ -587,7 +578,7 @@ const consoleFormatter = winston.format.printf((info) => {
 	else if (info.level === "debug") return `${chalk.cyan(location)}${message}`;
 	throw new Error(`Invalid log level: ${info.level}`);
 });
-const fileFormatter = winston.format.printf((info) => {
+winston.format.printf((info) => {
 	const timestamp = (/* @__PURE__ */ new Date()).toISOString();
 	const location = info.location ? ` ${info.location}` : "";
 	const message = extractMessage(info);
@@ -659,17 +650,12 @@ function sanitizeContext(context) {
 */
 function createLogMethodWithContext(level) {
 	return (message, context) => {
-		if (isLoggerShuttingDown) return;
 		if (!context) {
 			internalLogger[level](message);
 			return;
 		}
 		const sanitized = sanitizeContext(context);
-		if (useStructuredLogging) internalLogger[level]({
-			message,
-			...sanitized
-		});
-		else {
+		{
 			const contextStr = safeJsonStringify(sanitized, true);
 			internalLogger[level](`${message}\n${contextStr}`);
 		}
@@ -708,7 +694,7 @@ async function logRequestResponse(options) {
 	} catch {
 		responseText = "Unable to read response";
 	}
-	const logObject = {
+	logMethod("Api Request", {
 		message: "API request",
 		url: sanitizeUrl(url),
 		method: requestMethod,
@@ -718,15 +704,10 @@ async function logRequestResponse(options) {
 			statusText: response.statusText
 		},
 		...responseText && { response: responseText }
-	};
-	if (useStructuredLogging) {
-		const { message, ...context } = logObject;
-		logMethod(message, context);
-	} else logMethod("Api Request", logObject);
+	});
 }
 if (getEnvString("LOG_LEVEL", "info") === "debug") initializeSourceMapSupport();
-var logger_default = logger;
-
 //#endregion
-export { isCI as C, getMaxEvalTimeMs as S, getEnvBool as _, setLogCallback as a, getEnvString as b, sanitizeUrl as c, getAjv as d, isValidJson as f, getConfigDirectoryPath as g, summarizeEvaluateResultForLogging as h, logger_default as i, extractFirstJsonObject as l, safeJsonStringify as m, isDebugEnabled as n, setLogLevel as o, orderKeys as p, logRequestResponse as r, sanitizeObject as s, getLogLevel as t, extractJsonObjects as u, getEnvFloat as v, cliState_default as w, getEvalTimeoutMs as x, getEnvInt as y };
-//# sourceMappingURL=logger-CG1uZPbQ.js.map
+export { isCI as C, getMaxEvalTimeMs as S, getEnvBool as _, setLogCallback as a, getEnvString as b, sanitizeUrl as c, getAjv as d, isValidJson as f, getConfigDirectoryPath as g, summarizeEvaluateResultForLogging as h, logger as i, extractFirstJsonObject as l, safeJsonStringify as m, isDebugEnabled as n, setLogLevel as o, orderKeys as p, logRequestResponse as r, sanitizeObject as s, getLogLevel as t, extractJsonObjects as u, getEnvFloat as v, state as w, getEvalTimeoutMs as x, getEnvInt as y };
+
+//# sourceMappingURL=logger-CT3IKMKA.js.map

package/dist/src/{logger-B7sBeGa0.cjs → logger-Cp1GPUjj.cjs}

@@ -1,34 +1,26 @@
-//#region rolldown:runtime
+//#region \0rolldown/runtime.js
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __exportAll = (all, symbols) => {
+var __exportAll = (all, no_symbols) => {
 	let target = {};
-	for (var name in all) {
-		__defProp(target, name, {
-			get: all[name],
-			enumerable: true
-		});
-	}
-	if (symbols) {
-		__defProp(target, Symbol.toStringTag, { value: "Module" });
-	}
+	for (var name in all) __defProp(target, name, {
+		get: all[name],
+		enumerable: true
+	});
+	if (!no_symbols) __defProp(target, Symbol.toStringTag, { value: "Module" });
 	return target;
 };
 var __copyProps = (to, from, except, desc) => {
-	if (from && typeof from === "object" || typeof from === "function") {
-		for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
-			key = keys[i];
-			if (!__hasOwnProp.call(to, key) && key !== except) {
-				__defProp(to, key, {
-					get: ((k) => from[k]).bind(null, key),
-					enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
-				});
-			}
-		}
+	if (from && typeof from === "object" || typeof from === "function") for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
+		key = keys[i];
+		if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
+			get: ((k) => from[k]).bind(null, key),
+			enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+		});
 	}
 	return to;
 };
@@ -36,9 +28,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 	value: mod,
 	enumerable: true
 }) : target, mod));
-
 //#endregion
-const require_invariant = require('./invariant-CKcJAQ6M.cjs');
+const require_invariant = require("./invariant-kfQ8Bu82.cjs");
 let fs = require("fs");
 fs = __toESM(fs);
 let path = require("path");
@@ -59,17 +50,14 @@ let ajv_formats = require("ajv-formats");
 ajv_formats = __toESM(ajv_formats);
 let fast_safe_stringify = require("fast-safe-stringify");
 fast_safe_stringify = __toESM(fast_safe_stringify);
-
 //#region src/cliState.ts
 const state = {};
-var cliState_default = state;
-
 //#endregion
 //#region src/envars.ts
 dotenv.default.config({ quiet: true });
 function getEnvString(key, defaultValue) {
-	if (cliState_default.config?.env && typeof cliState_default.config.env === "object") {
-		const envValue = cliState_default.config.env[key];
+	if (state.config?.env && typeof state.config.env === "object") {
+		const envValue = state.config.env[key];
 		if (envValue !== void 0) return String(envValue);
 	}
 	const value = process.env[key];
@@ -137,7 +125,6 @@ function getMaxEvalTimeMs(defaultValue = 0) {
 function isCI() {
 	return getEnvBool("CI") || getEnvBool("GITHUB_ACTIONS") || getEnvBool("TRAVIS") || getEnvBool("CIRCLECI") || getEnvBool("JENKINS") || getEnvBool("GITLAB_CI") || getEnvBool("APPVEYOR") || getEnvBool("CODEBUILD_BUILD_ID") || getEnvBool("TF_BUILD") || getEnvBool("BITBUCKET_COMMIT") || getEnvBool("BUDDY") || getEnvBool("BUILDKITE") || getEnvBool("TEAMCITY_VERSION");
 }
-
 //#endregion
 //#region src/util/config/manage.ts
 let configDirectoryPath = getEnvString("PROMPTFOO_CONFIG_DIR");
@@ -149,7 +136,6 @@ function getConfigDirectoryPath(createIfNotExists = false) {
 	} catch {}
 	return p;
 }
-
 //#endregion
 //#region src/util/json.ts
 let ajvInstance = null;
@@ -383,7 +369,6 @@ function summarizeEvaluateResultForLogging(result, maxOutputLength = 500, includ
 	};
 	return summary;
 }
-
 //#endregion
 //#region src/util/sanitizer.ts
 /**
@@ -577,14 +562,12 @@ function sanitizeUrl(url) {
 		return url;
 	}
 }
-
 //#endregion
 //#region src/logger.ts
 let globalLogCallback = null;
 function setLogCallback(callback) {
 	globalLogCallback = callback;
 }
-let useStructuredLogging = false;
 const LOG_LEVELS = {
 	error: 0,
 	warn: 1,
@@ -592,7 +575,6 @@ const LOG_LEVELS = {
 	debug: 3
 };
 let sourceMapSupportInitialized = false;
-let isLoggerShuttingDown = false;
 async function initializeSourceMapSupport() {
 	if (!sourceMapSupportInitialized) try {
 		(await import("source-map-support")).install();
@@ -636,7 +618,7 @@ const consoleFormatter = winston.default.format.printf((info) => {
 	else if (info.level === "debug") return `${chalk.default.cyan(location)}${message}`;
 	throw new Error(`Invalid log level: ${info.level}`);
 });
-const fileFormatter = winston.default.format.printf((info) => {
+winston.default.format.printf((info) => {
 	const timestamp = (/* @__PURE__ */ new Date()).toISOString();
 	const location = info.location ? ` ${info.location}` : "";
 	const message = extractMessage(info);
@@ -708,17 +690,12 @@ function sanitizeContext(context) {
 */
 function createLogMethodWithContext(level) {
 	return (message, context) => {
-		if (isLoggerShuttingDown) return;
 		if (!context) {
 			internalLogger[level](message);
 			return;
 		}
 		const sanitized = sanitizeContext(context);
-		if (useStructuredLogging) internalLogger[level]({
-			message,
-			...sanitized
-		});
-		else {
+		{
 			const contextStr = safeJsonStringify(sanitized, true);
 			internalLogger[level](`${message}\n${contextStr}`);
 		}
@@ -757,7 +734,7 @@ async function logRequestResponse(options) {
 	} catch {
 		responseText = "Unable to read response";
 	}
-	const logObject = {
+	logMethod("Api Request", {
 		message: "API request",
 		url: sanitizeUrl(url),
 		method: requestMethod,
@@ -767,170 +744,165 @@ async function logRequestResponse(options) {
 			statusText: response.statusText
 		},
 		...responseText && { response: responseText }
-	};
-	if (useStructuredLogging) {
-		const { message, ...context } = logObject;
-		logMethod(message, context);
-	} else logMethod("Api Request", logObject);
+	});
 }
 if (getEnvString("LOG_LEVEL", "info") === "debug") initializeSourceMapSupport();
-var logger_default = logger;
-
 //#endregion
-Object.defineProperty(exports, '__exportAll', {
-  enumerable: true,
-  get: function () {
-    return __exportAll;
-  }
+Object.defineProperty(exports, "__exportAll", {
+	enumerable: true,
+	get: function() {
+		return __exportAll;
+	}
 });
-Object.defineProperty(exports, '__toESM', {
-  enumerable: true,
-  get: function () {
-    return __toESM;
-  }
+Object.defineProperty(exports, "__toESM", {
+	enumerable: true,
+	get: function() {
+		return __toESM;
+	}
 });
-Object.defineProperty(exports, 'cliState_default', {
-  enumerable: true,
-  get: function () {
-    return cliState_default;
-  }
+Object.defineProperty(exports, "extractFirstJsonObject", {
+	enumerable: true,
+	get: function() {
+		return extractFirstJsonObject;
+	}
 });
-Object.defineProperty(exports, 'extractFirstJsonObject', {
-  enumerable: true,
-  get: function () {
-    return extractFirstJsonObject;
-  }
+Object.defineProperty(exports, "extractJsonObjects", {
+	enumerable: true,
+	get: function() {
+		return extractJsonObjects;
+	}
 });
-Object.defineProperty(exports, 'extractJsonObjects', {
-  enumerable: true,
-  get: function () {
-    return extractJsonObjects;
-  }
+Object.defineProperty(exports, "getAjv", {
+	enumerable: true,
+	get: function() {
+		return getAjv;
+	}
 });
-Object.defineProperty(exports, 'getAjv', {
-  enumerable: true,
-  get: function () {
-    return getAjv;
-  }
+Object.defineProperty(exports, "getConfigDirectoryPath", {
+	enumerable: true,
+	get: function() {
+		return getConfigDirectoryPath;
+	}
 });
-Object.defineProperty(exports, 'getConfigDirectoryPath', {
-  enumerable: true,
-  get: function () {
-    return getConfigDirectoryPath;
-  }
+Object.defineProperty(exports, "getEnvBool", {
+	enumerable: true,
+	get: function() {
+		return getEnvBool;
+	}
 });
-Object.defineProperty(exports, 'getEnvBool', {
-  enumerable: true,
-  get: function () {
-    return getEnvBool;
-  }
+Object.defineProperty(exports, "getEnvFloat", {
+	enumerable: true,
+	get: function() {
+		return getEnvFloat;
+	}
 });
-Object.defineProperty(exports, 'getEnvFloat', {
-  enumerable: true,
-  get: function () {
-    return getEnvFloat;
-  }
+Object.defineProperty(exports, "getEnvInt", {
+	enumerable: true,
+	get: function() {
+		return getEnvInt;
+	}
 });
-Object.defineProperty(exports, 'getEnvInt', {
-  enumerable: true,
-  get: function () {
-    return getEnvInt;
-  }
+Object.defineProperty(exports, "getEnvString", {
+	enumerable: true,
+	get: function() {
+		return getEnvString;
+	}
 });
-Object.defineProperty(exports, 'getEnvString', {
-  enumerable: true,
-  get: function () {
-    return getEnvString;
-  }
+Object.defineProperty(exports, "getEvalTimeoutMs", {
+	enumerable: true,
+	get: function() {
+		return getEvalTimeoutMs;
+	}
 });
-Object.defineProperty(exports, 'getEvalTimeoutMs', {
-  enumerable: true,
-  get: function () {
-    return getEvalTimeoutMs;
-  }
+Object.defineProperty(exports, "getLogLevel", {
+	enumerable: true,
+	get: function() {
+		return getLogLevel;
+	}
 });
-Object.defineProperty(exports, 'getLogLevel', {
-  enumerable: true,
-  get: function () {
-    return getLogLevel;
-  }
+Object.defineProperty(exports, "getMaxEvalTimeMs", {
+	enumerable: true,
+	get: function() {
+		return getMaxEvalTimeMs;
+	}
 });
-Object.defineProperty(exports, 'getMaxEvalTimeMs', {
-  enumerable: true,
-  get: function () {
-    return getMaxEvalTimeMs;
-  }
+Object.defineProperty(exports, "isCI", {
+	enumerable: true,
+	get: function() {
+		return isCI;
+	}
 });
-Object.defineProperty(exports, 'isCI', {
-  enumerable: true,
-  get: function () {
-    return isCI;
-  }
+Object.defineProperty(exports, "isDebugEnabled", {
+	enumerable: true,
+	get: function() {
+		return isDebugEnabled;
+	}
 });
-Object.defineProperty(exports, 'isDebugEnabled', {
-  enumerable: true,
-  get: function () {
-    return isDebugEnabled;
-  }
+Object.defineProperty(exports, "isValidJson", {
+	enumerable: true,
+	get: function() {
+		return isValidJson;
+	}
 });
-Object.defineProperty(exports, 'isValidJson', {
-  enumerable: true,
-  get: function () {
-    return isValidJson;
-  }
+Object.defineProperty(exports, "logRequestResponse", {
+	enumerable: true,
+	get: function() {
+		return logRequestResponse;
+	}
 });
-Object.defineProperty(exports, 'logRequestResponse', {
-  enumerable: true,
-  get: function () {
-    return logRequestResponse;
-  }
+Object.defineProperty(exports, "logger", {
+	enumerable: true,
+	get: function() {
+		return logger;
+	}
 });
-Object.defineProperty(exports, 'logger_default', {
-  enumerable: true,
-  get: function () {
-    return logger_default;
-  }
+Object.defineProperty(exports, "orderKeys", {
+	enumerable: true,
+	get: function() {
+		return orderKeys;
+	}
 });
-Object.defineProperty(exports, 'orderKeys', {
-  enumerable: true,
-  get: function () {
-    return orderKeys;
-  }
+Object.defineProperty(exports, "safeJsonStringify", {
+	enumerable: true,
+	get: function() {
+		return safeJsonStringify;
+	}
 });
-Object.defineProperty(exports, 'safeJsonStringify', {
-  enumerable: true,
-  get: function () {
-    return safeJsonStringify;
-  }
+Object.defineProperty(exports, "sanitizeObject", {
+	enumerable: true,
+	get: function() {
+		return sanitizeObject;
+	}
 });
-Object.defineProperty(exports, 'sanitizeObject', {
-  enumerable: true,
-  get: function () {
-    return sanitizeObject;
-  }
+Object.defineProperty(exports, "sanitizeUrl", {
+	enumerable: true,
+	get: function() {
+		return sanitizeUrl;
+	}
 });
-Object.defineProperty(exports, 'sanitizeUrl', {
-  enumerable: true,
-  get: function () {
-    return sanitizeUrl;
-  }
+Object.defineProperty(exports, "setLogCallback", {
+	enumerable: true,
+	get: function() {
+		return setLogCallback;
+	}
 });
-Object.defineProperty(exports, 'setLogCallback', {
-  enumerable: true,
-  get: function () {
-    return setLogCallback;
-  }
+Object.defineProperty(exports, "setLogLevel", {
+	enumerable: true,
+	get: function() {
+		return setLogLevel;
+	}
 });
-Object.defineProperty(exports, 'setLogLevel', {
-  enumerable: true,
-  get: function () {
-    return setLogLevel;
-  }
+Object.defineProperty(exports, "state", {
+	enumerable: true,
+	get: function() {
+		return state;
+	}
 });
-Object.defineProperty(exports, 'summarizeEvaluateResultForLogging', {
-  enumerable: true,
-  get: function () {
-    return summarizeEvaluateResultForLogging;
-  }
+Object.defineProperty(exports, "summarizeEvaluateResultForLogging", {
+	enumerable: true,
+	get: function() {
+		return summarizeEvaluateResultForLogging;
+	}
 });
-//# sourceMappingURL=logger-B7sBeGa0.cjs.map
+
+//# sourceMappingURL=logger-Cp1GPUjj.cjs.map