promptfoo 0.120.27 → 0.121.2

package/dist/src/{base-pGVmXNl4.cjs → base-CGrhspbK.cjs}

@@ -1,6 +1,5 @@
-const require_logger = require('./logger-B7sBeGa0.cjs');
-const require_telemetry = require('./telemetry-DQgVBCAb.cjs');
-
+const require_logger = require("./logger-Cp1GPUjj.cjs");
+const require_telemetry = require("./telemetry-DaX14Chu.cjs");
 //#region src/providers/bedrock/util.ts
 const REQUEST_TIMEOUT_MS = 3e5;
 function hasProxyEnv() {
@@ -102,7 +101,6 @@ function novaParseMessages(messages) {
 		extractedMessages
 	};
 }
-
 //#endregion
 //#region src/providers/bedrock/base.ts
 /**
@@ -122,7 +120,7 @@ var AwsBedrockGenericProvider = class {
 		this.modelName = modelName;
 		this.config = config || {};
 		this.id = id ? () => id : this.id;
-		if (this.config.guardrailIdentifier) require_telemetry.telemetry_default.record("feature_used", {
+		if (this.config.guardrailIdentifier) require_telemetry.telemetry.record("feature_used", {
 			feature: "guardrail",
 			provider: "bedrock"
 		});
@@ -141,7 +139,7 @@ var AwsBedrockGenericProvider = class {
 	}
 	async getCredentials() {
 		if (this.config.accessKeyId && this.config.secretAccessKey) {
-			require_logger.logger_default.debug(`Using credentials from config file`);
+			require_logger.logger.debug(`Using credentials from config file`);
 			return {
 				accessKeyId: this.config.accessKeyId,
 				secretAccessKey: this.config.secretAccessKey,
@@ -149,20 +147,20 @@ var AwsBedrockGenericProvider = class {
 			};
 		}
 		if (this.getApiKey()) {
-			require_logger.logger_default.debug(`Using Bedrock API key authentication`);
+			require_logger.logger.debug(`Using Bedrock API key authentication`);
 			return;
 		}
 		if (this.config.profile) {
-			require_logger.logger_default.debug(`Using SSO profile: ${this.config.profile}`);
+			require_logger.logger.debug(`Using SSO profile: ${this.config.profile}`);
 			try {
 				const { fromSSO } = await import("@aws-sdk/credential-provider-sso");
 				return fromSSO({ profile: this.config.profile });
 			} catch (err) {
-				require_logger.logger_default.error(`Error loading @aws-sdk/credential-provider-sso: ${err}`);
+				require_logger.logger.error(`Error loading @aws-sdk/credential-provider-sso: ${err}`);
 				throw new Error("The @aws-sdk/credential-provider-sso package is required for SSO profiles. Please install it: npm install @aws-sdk/credential-provider-sso");
 			}
 		}
-		require_logger.logger_default.debug(`No explicit credentials in config, falling back to AWS default chain`);
+		require_logger.logger.debug(`No explicit credentials in config, falling back to AWS default chain`);
 	}
 	async getBedrockInstance() {
 		if (!this.bedrock) {
@@ -179,7 +177,7 @@ var AwsBedrockGenericProvider = class {
 					...this.config.endpoint ? { endpoint: this.config.endpoint } : {}
 				});
 			} catch (err) {
-				require_logger.logger_default.error(`Error creating BedrockRuntime: ${err}`);
+				require_logger.logger.error(`Error creating BedrockRuntime: ${err}`);
 				throw new Error("The @aws-sdk/client-bedrock-runtime package is required as a peer dependency. Please install it in your project or globally.");
 			}
 		}
@@ -189,36 +187,36 @@ var AwsBedrockGenericProvider = class {
 		return this.config?.region || this.env?.AWS_BEDROCK_REGION || require_logger.getEnvString("AWS_BEDROCK_REGION") || "us-east-1";
 	}
 };
-
 //#endregion
-Object.defineProperty(exports, 'AwsBedrockGenericProvider', {
-  enumerable: true,
-  get: function () {
-    return AwsBedrockGenericProvider;
-  }
+Object.defineProperty(exports, "AwsBedrockGenericProvider", {
+	enumerable: true,
+	get: function() {
+		return AwsBedrockGenericProvider;
+	}
 });
-Object.defineProperty(exports, 'createBedrockRequestHandler', {
-  enumerable: true,
-  get: function () {
-    return createBedrockRequestHandler;
-  }
+Object.defineProperty(exports, "createBedrockRequestHandler", {
+	enumerable: true,
+	get: function() {
+		return createBedrockRequestHandler;
+	}
 });
-Object.defineProperty(exports, 'hasProxyEnv', {
-  enumerable: true,
-  get: function () {
-    return hasProxyEnv;
-  }
+Object.defineProperty(exports, "hasProxyEnv", {
+	enumerable: true,
+	get: function() {
+		return hasProxyEnv;
+	}
 });
-Object.defineProperty(exports, 'novaOutputFromMessage', {
-  enumerable: true,
-  get: function () {
-    return novaOutputFromMessage;
-  }
+Object.defineProperty(exports, "novaOutputFromMessage", {
+	enumerable: true,
+	get: function() {
+		return novaOutputFromMessage;
+	}
 });
-Object.defineProperty(exports, 'novaParseMessages', {
-  enumerable: true,
-  get: function () {
-    return novaParseMessages;
-  }
+Object.defineProperty(exports, "novaParseMessages", {
+	enumerable: true,
+	get: function() {
+		return novaParseMessages;
+	}
 });
-//# sourceMappingURL=base-pGVmXNl4.cjs.map
+
+//# sourceMappingURL=base-CGrhspbK.cjs.map

package/dist/src/{base-h961VXYk.js → base-CpjcHe4e.js}

@@ -1,6 +1,5 @@
-import { b as getEnvString, i as logger_default, y as getEnvInt } from "./logger-CG1uZPbQ.js";
-import { n as telemetry_default } from "./telemetry-BedSm-bZ.js";
-
+import { b as getEnvString, i as logger, y as getEnvInt } from "./logger-DLcq4dWf.js";
+import { n as telemetry } from "./telemetry-Cps3mIU-.js";
 //#region src/providers/bedrock/util.ts
 const REQUEST_TIMEOUT_MS = 3e5;
 function hasProxyEnv() {
@@ -102,7 +101,6 @@ function novaParseMessages(messages) {
 		extractedMessages
 	};
 }
-
 //#endregion
 //#region src/providers/bedrock/base.ts
 /**
@@ -122,7 +120,7 @@ var AwsBedrockGenericProvider = class {
 		this.modelName = modelName;
 		this.config = config || {};
 		this.id = id ? () => id : this.id;
-		if (this.config.guardrailIdentifier) telemetry_default.record("feature_used", {
+		if (this.config.guardrailIdentifier) telemetry.record("feature_used", {
 			feature: "guardrail",
 			provider: "bedrock"
 		});
@@ -141,7 +139,7 @@ var AwsBedrockGenericProvider = class {
 	}
 	async getCredentials() {
 		if (this.config.accessKeyId && this.config.secretAccessKey) {
-			logger_default.debug(`Using credentials from config file`);
+			logger.debug(`Using credentials from config file`);
 			return {
 				accessKeyId: this.config.accessKeyId,
 				secretAccessKey: this.config.secretAccessKey,
@@ -149,20 +147,20 @@ var AwsBedrockGenericProvider = class {
 			};
 		}
 		if (this.getApiKey()) {
-			logger_default.debug(`Using Bedrock API key authentication`);
+			logger.debug(`Using Bedrock API key authentication`);
 			return;
 		}
 		if (this.config.profile) {
-			logger_default.debug(`Using SSO profile: ${this.config.profile}`);
+			logger.debug(`Using SSO profile: ${this.config.profile}`);
 			try {
 				const { fromSSO } = await import("@aws-sdk/credential-provider-sso");
 				return fromSSO({ profile: this.config.profile });
 			} catch (err) {
-				logger_default.error(`Error loading @aws-sdk/credential-provider-sso: ${err}`);
+				logger.error(`Error loading @aws-sdk/credential-provider-sso: ${err}`);
 				throw new Error("The @aws-sdk/credential-provider-sso package is required for SSO profiles. Please install it: npm install @aws-sdk/credential-provider-sso");
 			}
 		}
-		logger_default.debug(`No explicit credentials in config, falling back to AWS default chain`);
+		logger.debug(`No explicit credentials in config, falling back to AWS default chain`);
 	}
 	async getBedrockInstance() {
 		if (!this.bedrock) {
@@ -179,7 +177,7 @@ var AwsBedrockGenericProvider = class {
 					...this.config.endpoint ? { endpoint: this.config.endpoint } : {}
 				});
 			} catch (err) {
-				logger_default.error(`Error creating BedrockRuntime: ${err}`);
+				logger.error(`Error creating BedrockRuntime: ${err}`);
 				throw new Error("The @aws-sdk/client-bedrock-runtime package is required as a peer dependency. Please install it in your project or globally.");
 			}
 		}
@@ -189,7 +187,7 @@ var AwsBedrockGenericProvider = class {
 		return this.config?.region || this.env?.AWS_BEDROCK_REGION || getEnvString("AWS_BEDROCK_REGION") || "us-east-1";
 	}
 };
-
 //#endregion
 export { novaParseMessages as a, novaOutputFromMessage as i, createBedrockRequestHandler as n, hasProxyEnv as r, AwsBedrockGenericProvider as t };
-//# sourceMappingURL=base-h961VXYk.js.map
+
+//# sourceMappingURL=base-CpjcHe4e.js.map

package/dist/src/base-DLKtKMFh.js

@@ -0,0 +1,193 @@
+import { b as getEnvString, i as logger, y as getEnvInt } from "./logger-CT3IKMKA.js";
+import { t as telemetry } from "./telemetry-Dthj_BbD.js";
+//#region src/providers/bedrock/util.ts
+const REQUEST_TIMEOUT_MS = 3e5;
+function hasProxyEnv() {
+	return Boolean(getEnvString("HTTP_PROXY") || getEnvString("HTTPS_PROXY"));
+}
+/**
+* Creates a NodeHttpHandler (HTTP/1.1) for Bedrock SDK clients.
+*
+* The @aws-sdk/client-bedrock-runtime package defaults to HTTP/2, which causes
+* "http2 request did not get a response" errors in many environments (see #7756).
+* This function forces HTTP/1.1 via NodeHttpHandler.
+*
+* For @aws-sdk/client-bedrock-agent-runtime (which already defaults to HTTP/1.1),
+* this is only needed when proxy or API key authentication is required.
+*/
+async function createBedrockRequestHandler(options) {
+	const hasProxy = hasProxyEnv();
+	try {
+		const { NodeHttpHandler } = await import("@smithy/node-http-handler");
+		let proxyAgent;
+		if (hasProxy) {
+			const { ProxyAgent } = await import("proxy-agent");
+			proxyAgent = new ProxyAgent();
+		}
+		const handler = new NodeHttpHandler({
+			...proxyAgent ? { httpsAgent: proxyAgent } : {},
+			requestTimeout: REQUEST_TIMEOUT_MS
+		});
+		if (options?.apiKey) {
+			const originalHandle = handler.handle.bind(handler);
+			handler.handle = async (request, handlerOptions) => {
+				request.headers = {
+					...request.headers,
+					Authorization: `Bearer ${options.apiKey}`
+				};
+				return originalHandle(request, handlerOptions);
+			};
+		}
+		return handler;
+	} catch {
+		const reason = options?.apiKey ? "API key authentication requires the @smithy/node-http-handler package" : hasProxy ? "Proxy configuration requires the @smithy/node-http-handler package" : "Bedrock provider requires the @smithy/node-http-handler package";
+		throw new Error(`${reason}. Please install it in your project or globally.`);
+	}
+}
+function novaOutputFromMessage(response) {
+	if (response.output?.message?.content.some((block) => block.toolUse?.toolUseId)) return response.output?.message?.content.map((block) => {
+		if (block.text) return null;
+		return JSON.stringify(block.toolUse);
+	}).filter((block) => block).join("\n\n");
+	return response.output?.message?.content.map((block) => {
+		return block.text;
+	}).join("\n\n");
+}
+function novaParseMessages(messages) {
+	try {
+		const parsed = JSON.parse(messages);
+		if (Array.isArray(parsed)) {
+			const systemMessage = parsed.find((msg) => msg.role === "system");
+			return {
+				extractedMessages: parsed.filter((msg) => msg.role !== "system").map((msg) => ({
+					role: msg.role,
+					content: Array.isArray(msg.content) ? msg.content : [{ text: msg.content }]
+				})),
+				system: systemMessage ? Array.isArray(systemMessage.content) ? systemMessage.content : [{ text: systemMessage.content }] : void 0
+			};
+		}
+	} catch {}
+	const lines = messages.split("\n").map((line) => line.trim()).filter((line) => line);
+	let system;
+	const extractedMessages = [];
+	let currentRole = null;
+	let currentContent = [];
+	const pushMessage = () => {
+		if (currentRole && currentContent.length > 0) {
+			extractedMessages.push({
+				role: currentRole,
+				content: [{ text: currentContent.join("\n") }]
+			});
+			currentContent = [];
+		}
+	};
+	for (const line of lines) if (line.startsWith("system:")) system = [{ text: line.slice(7).trim() }];
+	else if (line.startsWith("user:") || line.startsWith("assistant:")) {
+		pushMessage();
+		currentRole = line.startsWith("user:") ? "user" : "assistant";
+		currentContent.push(line.slice(line.indexOf(":") + 1).trim());
+	} else if (currentRole) currentContent.push(line);
+	else {
+		currentRole = "user";
+		currentContent.push(line);
+	}
+	pushMessage();
+	if (extractedMessages.length === 0 && !system) extractedMessages.push({
+		role: "user",
+		content: [{ text: messages.trim() }]
+	});
+	return {
+		system,
+		extractedMessages
+	};
+}
+//#endregion
+//#region src/providers/bedrock/base.ts
+/**
+* AWS Bedrock Base Provider
+*
+* Contains the abstract base class for all Bedrock providers.
+* This is extracted to avoid circular dependency issues.
+*/
+var AwsBedrockGenericProvider = class {
+	modelName;
+	env;
+	bedrock;
+	config;
+	constructor(modelName, options = {}) {
+		const { config, id, env } = options;
+		this.env = env;
+		this.modelName = modelName;
+		this.config = config || {};
+		this.id = id ? () => id : this.id;
+		if (this.config.guardrailIdentifier) telemetry.record("feature_used", {
+			feature: "guardrail",
+			provider: "bedrock"
+		});
+	}
+	id() {
+		return `bedrock:${this.modelName}`;
+	}
+	toString() {
+		return `[Amazon Bedrock Provider ${this.modelName}]`;
+	}
+	requiresApiKey() {
+		return false;
+	}
+	getApiKey() {
+		return this.config.apiKey || getEnvString("AWS_BEARER_TOKEN_BEDROCK");
+	}
+	async getCredentials() {
+		if (this.config.accessKeyId && this.config.secretAccessKey) {
+			logger.debug(`Using credentials from config file`);
+			return {
+				accessKeyId: this.config.accessKeyId,
+				secretAccessKey: this.config.secretAccessKey,
+				sessionToken: this.config.sessionToken
+			};
+		}
+		if (this.getApiKey()) {
+			logger.debug(`Using Bedrock API key authentication`);
+			return;
+		}
+		if (this.config.profile) {
+			logger.debug(`Using SSO profile: ${this.config.profile}`);
+			try {
+				const { fromSSO } = await import("@aws-sdk/credential-provider-sso");
+				return fromSSO({ profile: this.config.profile });
+			} catch (err) {
+				logger.error(`Error loading @aws-sdk/credential-provider-sso: ${err}`);
+				throw new Error("The @aws-sdk/credential-provider-sso package is required for SSO profiles. Please install it: npm install @aws-sdk/credential-provider-sso");
+			}
+		}
+		logger.debug(`No explicit credentials in config, falling back to AWS default chain`);
+	}
+	async getBedrockInstance() {
+		if (!this.bedrock) {
+			const handler = await createBedrockRequestHandler({ apiKey: this.getApiKey() });
+			try {
+				const { BedrockRuntime } = await import("@aws-sdk/client-bedrock-runtime");
+				const credentials = await this.getCredentials();
+				this.bedrock = new BedrockRuntime({
+					region: this.getRegion(),
+					maxAttempts: getEnvInt("AWS_BEDROCK_MAX_RETRIES", 10),
+					retryMode: "adaptive",
+					requestHandler: handler,
+					...credentials ? { credentials } : {},
+					...this.config.endpoint ? { endpoint: this.config.endpoint } : {}
+				});
+			} catch (err) {
+				logger.error(`Error creating BedrockRuntime: ${err}`);
+				throw new Error("The @aws-sdk/client-bedrock-runtime package is required as a peer dependency. Please install it in your project or globally.");
+			}
+		}
+		return this.bedrock;
+	}
+	getRegion() {
+		return this.config?.region || this.env?.AWS_BEDROCK_REGION || getEnvString("AWS_BEDROCK_REGION") || "us-east-1";
+	}
+};
+//#endregion
+export { novaParseMessages as a, novaOutputFromMessage as i, createBedrockRequestHandler as n, hasProxyEnv as r, AwsBedrockGenericProvider as t };
+
+//# sourceMappingURL=base-DLKtKMFh.js.map

package/dist/src/{base-XB2tDJrB.js → base-Dy1V8--Z.js}

@@ -1,7 +1,6 @@
 #!/usr/bin/env node
-import { C as getEnvString, S as getEnvInt, o as logger_default } from "./logger-LSBxlt7a.js";
-import { r as telemetry_default } from "./telemetry--WAdAfVi.js";
-
+import { C as getEnvString, S as getEnvInt, o as logger } from "./logger-KkObSCzq.js";
+import { r as telemetry } from "./telemetry-CMrFgtPB.js";
 //#region src/providers/bedrock/util.ts
 const REQUEST_TIMEOUT_MS = 3e5;
 function hasProxyEnv() {
@@ -103,7 +102,6 @@ function novaParseMessages(messages) {
 		extractedMessages
 	};
 }
-
 //#endregion
 //#region src/providers/bedrock/base.ts
 /**
@@ -123,7 +121,7 @@ var AwsBedrockGenericProvider = class {
 		this.modelName = modelName;
 		this.config = config || {};
 		this.id = id ? () => id : this.id;
-		if (this.config.guardrailIdentifier) telemetry_default.record("feature_used", {
+		if (this.config.guardrailIdentifier) telemetry.record("feature_used", {
 			feature: "guardrail",
 			provider: "bedrock"
 		});
@@ -142,7 +140,7 @@ var AwsBedrockGenericProvider = class {
 	}
 	async getCredentials() {
 		if (this.config.accessKeyId && this.config.secretAccessKey) {
-			logger_default.debug(`Using credentials from config file`);
+			logger.debug(`Using credentials from config file`);
 			return {
 				accessKeyId: this.config.accessKeyId,
 				secretAccessKey: this.config.secretAccessKey,
@@ -150,20 +148,20 @@ var AwsBedrockGenericProvider = class {
 			};
 		}
 		if (this.getApiKey()) {
-			logger_default.debug(`Using Bedrock API key authentication`);
+			logger.debug(`Using Bedrock API key authentication`);
 			return;
 		}
 		if (this.config.profile) {
-			logger_default.debug(`Using SSO profile: ${this.config.profile}`);
+			logger.debug(`Using SSO profile: ${this.config.profile}`);
 			try {
 				const { fromSSO } = await import("@aws-sdk/credential-provider-sso");
 				return fromSSO({ profile: this.config.profile });
 			} catch (err) {
-				logger_default.error(`Error loading @aws-sdk/credential-provider-sso: ${err}`);
+				logger.error(`Error loading @aws-sdk/credential-provider-sso: ${err}`);
 				throw new Error("The @aws-sdk/credential-provider-sso package is required for SSO profiles. Please install it: npm install @aws-sdk/credential-provider-sso");
 			}
 		}
-		logger_default.debug(`No explicit credentials in config, falling back to AWS default chain`);
+		logger.debug(`No explicit credentials in config, falling back to AWS default chain`);
 	}
 	async getBedrockInstance() {
 		if (!this.bedrock) {
@@ -180,7 +178,7 @@ var AwsBedrockGenericProvider = class {
 					...this.config.endpoint ? { endpoint: this.config.endpoint } : {}
 				});
 			} catch (err) {
-				logger_default.error(`Error creating BedrockRuntime: ${err}`);
+				logger.error(`Error creating BedrockRuntime: ${err}`);
 				throw new Error("The @aws-sdk/client-bedrock-runtime package is required as a peer dependency. Please install it in your project or globally.");
 			}
 		}
@@ -190,7 +188,7 @@ var AwsBedrockGenericProvider = class {
 		return this.config?.region || this.env?.AWS_BEDROCK_REGION || getEnvString("AWS_BEDROCK_REGION") || "us-east-1";
 	}
 };
-
 //#endregion
 export { novaParseMessages as a, novaOutputFromMessage as i, createBedrockRequestHandler as n, hasProxyEnv as r, AwsBedrockGenericProvider as t };
-//# sourceMappingURL=base-XB2tDJrB.js.map
+
+//# sourceMappingURL=base-Dy1V8--Z.js.map