promptfoo 0.120.26 → 0.121.1

package/dist/src/base-fEDN28WM.js

@@ -0,0 +1,193 @@
+import { b as getEnvString, i as logger, y as getEnvInt } from "./logger-DLcq4dWf.js";
+import { n as telemetry } from "./telemetry-DMb2Mpfm.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-fEDN28WM.js.map

package/dist/src/{blobs-kt8v3UyH.js → blobs-BAU-dXan.js}

@@ -1,18 +1,16 @@
 #!/usr/bin/env node
-import { o as logger_default, v as getConfigDirectoryPath } from "./logger-BotXmWKW.js";
-import { g as getDb, n as blobReferencesTable, t as blobAssetsTable } from "./tables-C7TT2XVn.js";
+import { o as logger, v as getConfigDirectoryPath } from "./logger-KkObSCzq.js";
+import { g as getDb, n as blobReferencesTable, t as blobAssetsTable } from "./tables-D36WTqKX.js";
 import * as fs$1 from "node:fs";
 import * as path$1 from "node:path";
 import * as fsPromises$1 from "node:fs/promises";
 import { createHash, randomUUID } from "node:crypto";
 import { and, eq } from "drizzle-orm";
-
 //#region src/blobs/constants.ts
 const BLOB_MIN_SIZE = 1024;
 const BLOB_MAX_SIZE = 52428800;
 const BLOB_SCHEME = "promptfoo://blob/";
 const DEFAULT_FILESYSTEM_SUBDIR = "blobs";
-
 //#endregion
 //#region src/blobs/filesystemProvider.ts
 const BLOB_HASH_REGEX = /^[a-f0-9]{64}$/i;
@@ -33,7 +31,7 @@ var FilesystemBlobStorageProvider = class {
 	ensureDirectory() {
 		if (!fs$1.existsSync(this.basePath)) {
 			fs$1.mkdirSync(this.basePath, { recursive: true });
-			logger_default.debug("[BlobFS] Created blob directory", { basePath: this.basePath });
+			logger.debug("[BlobFS] Created blob directory", { basePath: this.basePath });
 		}
 	}
 	assertValidHash(hash) {
@@ -152,12 +150,11 @@ var FilesystemBlobStorageProvider = class {
 			return JSON.parse(raw);
 		} catch (error) {
 			if (error.code === "ENOENT") return null;
-			logger_default.warn("[BlobFS] Failed to read metadata", { error });
+			logger.warn("[BlobFS] Failed to read metadata", { error });
 			return null;
 		}
 	}
 };
-
 //#endregion
 //#region src/blobs/index.ts
 let defaultProvider = null;
@@ -167,7 +164,7 @@ function createDefaultProvider() {
 function getBlobStorageProvider() {
 	if (!defaultProvider) {
 		defaultProvider = createDefaultProvider();
-		logger_default.debug("[BlobStorage] Initialized provider", { provider: defaultProvider.providerId });
+		logger.debug("[BlobStorage] Initialized provider", { provider: defaultProvider.providerId });
 	}
 	return defaultProvider;
 }
@@ -197,7 +194,7 @@ async function storeBlob(data, mimeType, refContext) {
 		try {
 			await provider.deleteByHash(result.ref.hash);
 		} catch (cleanupError) {
-			logger_default.warn("[BlobStorage] Failed to rollback blob after DB error", {
+			logger.warn("[BlobStorage] Failed to rollback blob after DB error", {
 				error: cleanupError,
 				hash: result.ref.hash
 			});
@@ -215,7 +212,7 @@ async function getBlobUrl(hash, expiresInSeconds) {
 async function recordBlobReference(hash, refContext) {
 	if (!refContext.evalId) return;
 	if (!await getBlobStorageProvider().exists(hash).catch(() => false)) {
-		logger_default.debug("[BlobStorage] Attempted to record reference for missing blob", {
+		logger.debug("[BlobStorage] Attempted to record reference for missing blob", {
 			hash,
 			evalId: refContext.evalId,
 			location: refContext.location
@@ -234,7 +231,7 @@ async function recordBlobReference(hash, refContext) {
 		kind: refContext.kind
 	}).run();
 }
-
 //#endregion
 export { BLOB_MAX_SIZE as a, storeBlob as i, getBlobUrl as n, BLOB_MIN_SIZE as o, recordBlobReference as r, getBlobByHash as t };
-//# sourceMappingURL=blobs-kt8v3UyH.js.map
+
+//# sourceMappingURL=blobs-BAU-dXan.js.map

package/dist/src/{blobs-C9J2mVgo.js → blobs-Bpg5rH6i.js}

@@ -1,17 +1,15 @@
-import { g as getConfigDirectoryPath, i as logger_default } from "./logger-w8Ozp0Td.js";
-import { n as blobReferencesTable, p as getDb, t as blobAssetsTable } from "./tables-D-NSwNIb.js";
+import { g as getConfigDirectoryPath, i as logger } from "./logger-CT3IKMKA.js";
+import { n as blobReferencesTable, p as getDb, t as blobAssetsTable } from "./tables-5EvT_Bwn.js";
 import * as path$1 from "node:path";
 import * as fs$1 from "node:fs";
 import * as fsPromises$1 from "node:fs/promises";
 import { createHash, randomUUID } from "node:crypto";
 import { and, eq } from "drizzle-orm";
-
 //#region src/blobs/constants.ts
 const BLOB_MIN_SIZE = 1024;
 const BLOB_MAX_SIZE = 52428800;
 const BLOB_SCHEME = "promptfoo://blob/";
 const DEFAULT_FILESYSTEM_SUBDIR = "blobs";
-
 //#endregion
 //#region src/blobs/filesystemProvider.ts
 const BLOB_HASH_REGEX = /^[a-f0-9]{64}$/i;
@@ -32,7 +30,7 @@ var FilesystemBlobStorageProvider = class {
 	ensureDirectory() {
 		if (!fs$1.existsSync(this.basePath)) {
 			fs$1.mkdirSync(this.basePath, { recursive: true });
-			logger_default.debug("[BlobFS] Created blob directory", { basePath: this.basePath });
+			logger.debug("[BlobFS] Created blob directory", { basePath: this.basePath });
 		}
 	}
 	assertValidHash(hash) {
@@ -151,12 +149,11 @@ var FilesystemBlobStorageProvider = class {
 			return JSON.parse(raw);
 		} catch (error) {
 			if (error.code === "ENOENT") return null;
-			logger_default.warn("[BlobFS] Failed to read metadata", { error });
+			logger.warn("[BlobFS] Failed to read metadata", { error });
 			return null;
 		}
 	}
 };
-
 //#endregion
 //#region src/blobs/index.ts
 let defaultProvider = null;
@@ -166,7 +163,7 @@ function createDefaultProvider() {
 function getBlobStorageProvider() {
 	if (!defaultProvider) {
 		defaultProvider = createDefaultProvider();
-		logger_default.debug("[BlobStorage] Initialized provider", { provider: defaultProvider.providerId });
+		logger.debug("[BlobStorage] Initialized provider", { provider: defaultProvider.providerId });
 	}
 	return defaultProvider;
 }
@@ -196,7 +193,7 @@ async function storeBlob(data, mimeType, refContext) {
 		try {
 			await provider.deleteByHash(result.ref.hash);
 		} catch (cleanupError) {
-			logger_default.warn("[BlobStorage] Failed to rollback blob after DB error", {
+			logger.warn("[BlobStorage] Failed to rollback blob after DB error", {
 				error: cleanupError,
 				hash: result.ref.hash
 			});
@@ -211,7 +208,7 @@ async function getBlobByHash(hash) {
 async function recordBlobReference(hash, refContext) {
 	if (!refContext.evalId) return;
 	if (!await getBlobStorageProvider().exists(hash).catch(() => false)) {
-		logger_default.debug("[BlobStorage] Attempted to record reference for missing blob", {
+		logger.debug("[BlobStorage] Attempted to record reference for missing blob", {
 			hash,
 			evalId: refContext.evalId,
 			location: refContext.location
@@ -230,7 +227,7 @@ async function recordBlobReference(hash, refContext) {
 		kind: refContext.kind
 	}).run();
 }
-
 //#endregion
 export { BLOB_MIN_SIZE as a, BLOB_MAX_SIZE as i, recordBlobReference as n, storeBlob as r, getBlobByHash as t };
-//# sourceMappingURL=blobs-C9J2mVgo.js.map
+
+//# sourceMappingURL=blobs-Bpg5rH6i.js.map

package/dist/src/{blobs-673H0jCl.cjs → blobs-DvS-O6be.cjs}

@@ -1,5 +1,5 @@
-const require_logger = require('./logger-BdZ-IqBc.cjs');
-const require_tables = require('./tables-B9E1kRp-.cjs');
+const require_logger = require("./logger-Cp1GPUjj.cjs");
+const require_tables = require("./tables-C7K-XKWp.cjs");
 let node_fs = require("node:fs");
 node_fs = require_logger.__toESM(node_fs);
 let node_fs_promises = require("node:fs/promises");
@@ -8,13 +8,11 @@ let node_path = require("node:path");
 node_path = require_logger.__toESM(node_path);
 let node_crypto = require("node:crypto");
 let drizzle_orm = require("drizzle-orm");
-
 //#region src/blobs/constants.ts
 const BLOB_MIN_SIZE = 1024;
 const BLOB_MAX_SIZE = 52428800;
 const BLOB_SCHEME = "promptfoo://blob/";
 const DEFAULT_FILESYSTEM_SUBDIR = "blobs";
-
 //#endregion
 //#region src/blobs/filesystemProvider.ts
 const BLOB_HASH_REGEX = /^[a-f0-9]{64}$/i;
@@ -35,7 +33,7 @@ var FilesystemBlobStorageProvider = class {
 	ensureDirectory() {
 		if (!node_fs.existsSync(this.basePath)) {
 			node_fs.mkdirSync(this.basePath, { recursive: true });
-			require_logger.logger_default.debug("[BlobFS] Created blob directory", { basePath: this.basePath });
+			require_logger.logger.debug("[BlobFS] Created blob directory", { basePath: this.basePath });
 		}
 	}
 	assertValidHash(hash) {
@@ -154,12 +152,11 @@ var FilesystemBlobStorageProvider = class {
 			return JSON.parse(raw);
 		} catch (error) {
 			if (error.code === "ENOENT") return null;
-			require_logger.logger_default.warn("[BlobFS] Failed to read metadata", { error });
+			require_logger.logger.warn("[BlobFS] Failed to read metadata", { error });
 			return null;
 		}
 	}
 };
-
 //#endregion
 //#region src/blobs/index.ts
 let defaultProvider = null;
@@ -169,7 +166,7 @@ function createDefaultProvider() {
 function getBlobStorageProvider() {
 	if (!defaultProvider) {
 		defaultProvider = createDefaultProvider();
-		require_logger.logger_default.debug("[BlobStorage] Initialized provider", { provider: defaultProvider.providerId });
+		require_logger.logger.debug("[BlobStorage] Initialized provider", { provider: defaultProvider.providerId });
 	}
 	return defaultProvider;
 }
@@ -199,7 +196,7 @@ async function storeBlob(data, mimeType, refContext) {
 		try {
 			await provider.deleteByHash(result.ref.hash);
 		} catch (cleanupError) {
-			require_logger.logger_default.warn("[BlobStorage] Failed to rollback blob after DB error", {
+			require_logger.logger.warn("[BlobStorage] Failed to rollback blob after DB error", {
 				error: cleanupError,
 				hash: result.ref.hash
 			});
@@ -214,7 +211,7 @@ async function getBlobByHash(hash) {
 async function recordBlobReference(hash, refContext) {
 	if (!refContext.evalId) return;
 	if (!await getBlobStorageProvider().exists(hash).catch(() => false)) {
-		require_logger.logger_default.debug("[BlobStorage] Attempted to record reference for missing blob", {
+		require_logger.logger.debug("[BlobStorage] Attempted to record reference for missing blob", {
 			hash,
 			evalId: refContext.evalId,
 			location: refContext.location
@@ -233,36 +230,36 @@ async function recordBlobReference(hash, refContext) {
 		kind: refContext.kind
 	}).run();
 }
-
 //#endregion
-Object.defineProperty(exports, 'BLOB_MAX_SIZE', {
-  enumerable: true,
-  get: function () {
-    return BLOB_MAX_SIZE;
-  }
+Object.defineProperty(exports, "BLOB_MAX_SIZE", {
+	enumerable: true,
+	get: function() {
+		return BLOB_MAX_SIZE;
+	}
 });
-Object.defineProperty(exports, 'BLOB_MIN_SIZE', {
-  enumerable: true,
-  get: function () {
-    return BLOB_MIN_SIZE;
-  }
+Object.defineProperty(exports, "BLOB_MIN_SIZE", {
+	enumerable: true,
+	get: function() {
+		return BLOB_MIN_SIZE;
+	}
 });
-Object.defineProperty(exports, 'getBlobByHash', {
-  enumerable: true,
-  get: function () {
-    return getBlobByHash;
-  }
+Object.defineProperty(exports, "getBlobByHash", {
+	enumerable: true,
+	get: function() {
+		return getBlobByHash;
+	}
 });
-Object.defineProperty(exports, 'recordBlobReference', {
-  enumerable: true,
-  get: function () {
-    return recordBlobReference;
-  }
+Object.defineProperty(exports, "recordBlobReference", {
+	enumerable: true,
+	get: function() {
+		return recordBlobReference;
+	}
 });
-Object.defineProperty(exports, 'storeBlob', {
-  enumerable: true,
-  get: function () {
-    return storeBlob;
-  }
+Object.defineProperty(exports, "storeBlob", {
+	enumerable: true,
+	get: function() {
+		return storeBlob;
+	}
 });
-//# sourceMappingURL=blobs-673H0jCl.cjs.map
+
+//# sourceMappingURL=blobs-DvS-O6be.cjs.map