promptfoo 0.121.3 → 0.121.5

package/dist/src/{otlpReceiver-CavGAA6k.js → otlpReceiver-UYMQx3sy.js}

@@ -1,9 +1,7 @@
 #!/usr/bin/env node
-import { s as logger } from "./logger-BcJBzSSA.js";
-import "./types-CIhFeUC4.js";
-import { t as getDirectory } from "./esm-7UIl0pPM.js";
-import "./tables-DmzvLbeZ.js";
-import { n as getTraceStore } from "./store-P8OKm19S.js";
+import { s as logger } from "./logger-BbY6ypFL.js";
+import { t as getDirectory } from "./esm-BX8fwlAO.js";
+import { n as getTraceStore } from "./store-CPh25336.js";
 import path from "path";
 import express from "express";
 import protobuf from "protobufjs";
@@ -93,28 +91,57 @@ const SPAN_KIND_MAP = {
 	4: "producer",
 	5: "consumer"
 };
+const DEFAULT_ACCEPT_FORMATS = ["json", "protobuf"];
+const OTLP_CONTENT_TYPES = {
+	json: "application/json",
+	protobuf: "application/x-protobuf"
+};
+function normalizeAcceptFormats(acceptFormats) {
+	const normalized = [...new Set(acceptFormats ?? DEFAULT_ACCEPT_FORMATS)];
+	return normalized.length > 0 ? normalized : [...DEFAULT_ACCEPT_FORMATS];
+}
+function getRequestFormat(contentType) {
+	const mimeType = (Array.isArray(contentType) ? contentType[0] : contentType)?.split(";", 1)[0]?.trim().toLowerCase();
+	if (mimeType === OTLP_CONTENT_TYPES.json) return "json";
+	if (mimeType === OTLP_CONTENT_TYPES.protobuf) return "protobuf";
+	return null;
+}
 var OTLPReceiver = class {
 	app;
+	acceptFormats;
 	traceStore;
 	port;
 	server;
-	constructor() {
+	constructor(options = {}) {
 		this.app = express();
+		this.acceptFormats = normalizeAcceptFormats(options.acceptFormats);
 		this.traceStore = getTraceStore();
 		logger.debug("[OtlpReceiver] Initializing OTLP receiver");
 		this.setupMiddleware();
 		this.setupRoutes();
 	}
 	setupMiddleware() {
-		this.app.use(express.json({
+		this.app.use("/v1/traces", (req, res, next) => {
+			if (req.method !== "POST") {
+				next();
+				return;
+			}
+			const format = getRequestFormat(req.headers["content-type"]);
+			if (!format || !this.acceptFormats.includes(format)) {
+				res.status(415).json({ error: "Unsupported content type" });
+				return;
+			}
+			next();
+		});
+		this.app.use("/v1/traces", express.json({
 			limit: "10mb",
-			type: "application/json"
+			type: (req) => this.acceptFormats.includes("json") && getRequestFormat(req.headers["content-type"]) === "json"
 		}));
-		this.app.use(express.raw({
-			type: "application/x-protobuf",
-			limit: "10mb"
+		this.app.use("/v1/traces", express.raw({
+			limit: "10mb",
+			type: (req) => this.acceptFormats.includes("protobuf") && getRequestFormat(req.headers["content-type"]) === "protobuf"
 		}));
-		logger.debug("[OtlpReceiver] Middleware configured for JSON and protobuf");
+		logger.debug("[OtlpReceiver] Middleware configured for accepted OTLP formats");
 	}
 	setupRoutes() {
 		this.app.post("/v1/traces", async (req, res) => {
@@ -122,64 +149,19 @@ var OTLPReceiver = class {
 			const bodySize = req.body ? JSON.stringify(req.body).length : 0;
 			logger.debug(`[OtlpReceiver] Received trace request: ${req.headers["content-type"]} with ${bodySize} bytes`);
 			logger.debug("[OtlpReceiver] Starting to process traces");
-			const isJson = contentType === "application/json";
-			const isProtobuf = contentType === "application/x-protobuf";
-			if (!isJson && !isProtobuf) {
+			const format = getRequestFormat(contentType);
+			if (!format || !this.acceptFormats.includes(format)) {
 				res.status(415).json({ error: "Unsupported content type" });
 				return;
 			}
 			try {
-				let traces = [];
-				if (isJson) {
-					logger.debug("[OtlpReceiver] Parsing OTLP JSON request");
-					logger.debug(`[OtlpReceiver] Request body: ${JSON.stringify(req.body).substring(0, 500)}...`);
-					traces = this.parseOTLPJSONRequest(req.body);
-				} else if (isProtobuf) {
-					logger.debug("[OtlpReceiver] Parsing OTLP protobuf request");
-					logger.debug(`[OtlpReceiver] Request body size: ${req.body?.length || 0} bytes`);
-					traces = await this.parseOTLPProtobufRequest(req.body);
-				}
+				const traces = await this.parseIncomingRequest(format, req.body);
 				logger.debug(`[OtlpReceiver] Parsed ${traces.length} traces from request`);
-				const spansByTrace = /* @__PURE__ */ new Map();
-				const traceInfoById = /* @__PURE__ */ new Map();
-				for (const trace of traces) {
-					if (!spansByTrace.has(trace.traceId)) {
-						spansByTrace.set(trace.traceId, []);
-						const evaluationId = trace.span.attributes?.["evaluation.id"];
-						const testCaseId = trace.span.attributes?.["test.case.id"];
-						const info = traceInfoById.get(trace.traceId) ?? {};
-						if (evaluationId) info.evaluationId = evaluationId;
-						if (testCaseId) info.testCaseId = testCaseId;
-						traceInfoById.set(trace.traceId, info);
-					}
-					spansByTrace.get(trace.traceId).push(trace.span);
-				}
-				logger.debug(`[OtlpReceiver] Grouped spans into ${spansByTrace.size} traces`);
-				for (const [traceId, info] of traceInfoById) try {
-					logger.debug(`[OtlpReceiver] Creating trace record for ${traceId}`);
-					await this.traceStore.createTrace({
-						traceId,
-						evaluationId: info.evaluationId || "",
-						testCaseId: info.testCaseId || ""
-					});
-				} catch (error) {
-					logger.debug(`[OtlpReceiver] Trace ${traceId} may already exist: ${error}`);
-				}
-				for (const [traceId, spans] of spansByTrace) {
-					logger.debug(`[OtlpReceiver] Storing ${spans.length} spans for trace ${traceId}`);
-					await this.traceStore.addSpans(traceId, spans, { skipTraceCheck: true });
-				}
+				await this.persistTraces(this.groupTraces(traces));
 				res.status(200).json({ partialSuccess: {} });
 				logger.debug("[OtlpReceiver] Successfully processed traces");
 			} catch (error) {
-				logger.error(`[OtlpReceiver] Failed to process OTLP traces: ${error}`);
-				logger.error(`[OtlpReceiver] Error stack: ${error instanceof Error ? error.stack : "No stack"}`);
-				const errorMessage = error instanceof Error ? error.message : String(error);
-				if (errorMessage.toLowerCase().includes("invalid protobuf")) {
-					res.status(400).json({ error: errorMessage });
-					return;
-				}
-				res.status(500).json({ error: "Internal server error" });
+				this.handleProcessingError(error, res);
 			}
 		});
 		this.app.get("/health", (_req, res) => {
@@ -190,7 +172,7 @@ var OTLPReceiver = class {
 			res.status(200).json({
 				service: "promptfoo-otlp-receiver",
 				version: "1.0.0",
-				supported_formats: ["json", "protobuf"]
+				supported_formats: this.acceptFormats
 			});
 		});
 		this.app.get("/debug/status", async (_req, res) => {
@@ -211,6 +193,71 @@ var OTLPReceiver = class {
 			res.status(500).json({ error: "Internal server error" });
 		});
 	}
+	async parseIncomingRequest(format, body) {
+		if (format === "json") {
+			logger.debug("[OtlpReceiver] Parsing OTLP JSON request");
+			logger.debug(`[OtlpReceiver] Request body: ${JSON.stringify(body).substring(0, 500)}...`);
+			return this.parseOTLPJSONRequest(body);
+		}
+		logger.debug("[OtlpReceiver] Parsing OTLP protobuf request");
+		logger.debug(`[OtlpReceiver] Request body size: ${body?.length || 0} bytes`);
+		return this.parseOTLPProtobufRequest(body);
+	}
+	groupTraces(traces) {
+		const spansByTrace = /* @__PURE__ */ new Map();
+		const traceInfoById = /* @__PURE__ */ new Map();
+		for (const trace of traces) {
+			const spans = spansByTrace.get(trace.traceId) ?? [];
+			spans.push(trace.span);
+			spansByTrace.set(trace.traceId, spans);
+			this.recordTraceInfo(traceInfoById, trace);
+		}
+		logger.debug(`[OtlpReceiver] Grouped spans into ${spansByTrace.size} traces`);
+		return {
+			spansByTrace,
+			traceInfoById
+		};
+	}
+	recordTraceInfo(traceInfoById, trace) {
+		const evaluationId = trace.span.attributes?.["evaluation.id"];
+		const testCaseId = trace.span.attributes?.["test.case.id"];
+		const info = traceInfoById.get(trace.traceId) ?? {};
+		if (evaluationId) info.evaluationId = evaluationId;
+		if (testCaseId) info.testCaseId = testCaseId;
+		traceInfoById.set(trace.traceId, info);
+	}
+	async persistTraces({ spansByTrace, traceInfoById }) {
+		await this.createTraceRecords(traceInfoById);
+		await this.storeSpans(spansByTrace);
+	}
+	async createTraceRecords(traceInfoById) {
+		for (const [traceId, info] of traceInfoById) try {
+			logger.debug(`[OtlpReceiver] Creating trace record for ${traceId}`);
+			await this.traceStore.createTrace({
+				traceId,
+				evaluationId: info.evaluationId || "",
+				testCaseId: info.testCaseId || ""
+			});
+		} catch (error) {
+			logger.debug(`[OtlpReceiver] Trace ${traceId} may already exist: ${error}`);
+		}
+	}
+	async storeSpans(spansByTrace) {
+		for (const [traceId, spans] of spansByTrace) {
+			logger.debug(`[OtlpReceiver] Storing ${spans.length} spans for trace ${traceId}`);
+			await this.traceStore.addSpans(traceId, spans, { skipTraceCheck: true });
+		}
+	}
+	handleProcessingError(error, res) {
+		logger.error(`[OtlpReceiver] Failed to process OTLP traces: ${error}`);
+		logger.error(`[OtlpReceiver] Error stack: ${error instanceof Error ? error.stack : "No stack"}`);
+		const errorMessage = error instanceof Error ? error.message : String(error);
+		if (errorMessage.toLowerCase().includes("invalid protobuf")) {
+			res.status(400).json({ error: errorMessage });
+			return;
+		}
+		res.status(500).json({ error: "Internal server error" });
+	}
 	parseOTLPJSONRequest(body) {
 		const traces = [];
 		logger.debug(`[OtlpReceiver] Parsing request with ${body.resourceSpans?.length || 0} resource spans`);
@@ -249,44 +296,42 @@ var OTLPReceiver = class {
 		return traces;
 	}
 	async parseOTLPProtobufRequest(body) {
-		const traces = [];
 		const decoded = await decodeExportTraceServiceRequest(body);
 		logger.debug(`[OtlpReceiver] Parsing protobuf request with ${decoded.resourceSpans?.length || 0} resource spans`);
-		for (const resourceSpan of decoded.resourceSpans || []) {
-			const resourceAttributes = this.parseDecodedAttributes(resourceSpan.resource?.attributes);
-			logger.debug(`[OtlpReceiver] Parsed ${Object.keys(resourceAttributes).length} resource attributes from protobuf`);
-			for (const scopeSpan of resourceSpan.scopeSpans || []) for (const span of scopeSpan.spans || []) {
-				const traceId = bytesToHex(span.traceId, 32);
-				const spanId = bytesToHex(span.spanId, 16);
-				const parentSpanId = span.parentSpanId?.length ? bytesToHex(span.parentSpanId, 16) : void 0;
-				logger.debug(`[OtlpReceiver] Processing protobuf span: ${span.name} (${spanId}) in trace ${traceId}`);
-				const spanKindName = SPAN_KIND_MAP[span.kind ?? 0] ?? "unspecified";
-				const attributes = {
+		return (decoded.resourceSpans || []).flatMap((resourceSpan) => this.parseDecodedResourceSpan(resourceSpan));
+	}
+	parseDecodedResourceSpan(resourceSpan) {
+		const resourceAttributes = this.parseDecodedAttributes(resourceSpan.resource?.attributes);
+		logger.debug(`[OtlpReceiver] Parsed ${Object.keys(resourceAttributes).length} resource attributes from protobuf`);
+		return (resourceSpan.scopeSpans || []).flatMap((scopeSpan) => (scopeSpan.spans || []).map((span) => this.createDecodedParsedTrace(resourceAttributes, scopeSpan, span)));
+	}
+	createDecodedParsedTrace(resourceAttributes, scopeSpan, span) {
+		const traceId = bytesToHex(span.traceId, 32);
+		const spanId = bytesToHex(span.spanId, 16);
+		const parentSpanId = span.parentSpanId?.length ? bytesToHex(span.parentSpanId, 16) : void 0;
+		logger.debug(`[OtlpReceiver] Processing protobuf span: ${span.name} (${spanId}) in trace ${traceId}`);
+		const spanKindCode = span.kind ?? 0;
+		const spanKindName = SPAN_KIND_MAP[spanKindCode] ?? "unspecified";
+		return {
+			traceId,
+			span: {
+				spanId,
+				parentSpanId,
+				name: span.name,
+				startTime: this.toMilliseconds(span.startTimeUnixNano) ?? 0,
+				endTime: this.toMilliseconds(span.endTimeUnixNano),
+				attributes: {
 					...resourceAttributes,
 					...this.parseDecodedAttributes(span.attributes),
 					"otel.scope.name": scopeSpan.scope?.name,
 					"otel.scope.version": scopeSpan.scope?.version,
 					"otel.span.kind": spanKindName,
-					"otel.span.kind_code": span.kind ?? 0
-				};
-				const startTimeNano = typeof span.startTimeUnixNano === "number" ? span.startTimeUnixNano : Number(span.startTimeUnixNano);
-				const endTimeNano = span.endTimeUnixNano ? typeof span.endTimeUnixNano === "number" ? span.endTimeUnixNano : Number(span.endTimeUnixNano) : void 0;
-				traces.push({
-					traceId,
-					span: {
-						spanId,
-						parentSpanId,
-						name: span.name,
-						startTime: startTimeNano / 1e6,
-						endTime: endTimeNano ? endTimeNano / 1e6 : void 0,
-						attributes,
-						statusCode: span.status?.code,
-						statusMessage: span.status?.message
-					}
-				});
+					"otel.span.kind_code": spanKindCode
+				},
+				statusCode: span.status?.code,
+				statusMessage: span.status?.message
 			}
-		}
-		return traces;
+		};
 	}
 	parseDecodedAttributes(attributes) {
 		if (!attributes) return {};
@@ -387,15 +432,26 @@ var OTLPReceiver = class {
 	getApp() {
 		return this.app;
 	}
+	setAcceptFormats(acceptFormats) {
+		this.acceptFormats = normalizeAcceptFormats(acceptFormats);
+	}
+	toMilliseconds(value) {
+		if (value === void 0) return;
+		return Number(value) / 1e6;
+	}
 };
 let otlpReceiver = null;
-function getOTLPReceiver() {
-	if (!otlpReceiver) otlpReceiver = new OTLPReceiver();
+function getOTLPReceiver(options) {
+	if (otlpReceiver) {
+		otlpReceiver.setAcceptFormats(options?.acceptFormats);
+		return otlpReceiver;
+	}
+	otlpReceiver = new OTLPReceiver(options);
 	return otlpReceiver;
 }
-async function startOTLPReceiver(port, host) {
+async function startOTLPReceiver(port, host, acceptFormats) {
 	logger.debug("[OtlpReceiver] Starting receiver through startOTLPReceiver function");
-	await getOTLPReceiver().listen(port, host);
+	await getOTLPReceiver({ acceptFormats }).listen(port, host);
 }
 async function stopOTLPReceiver() {
 	logger.debug("[OtlpReceiver] Stopping receiver through stopOTLPReceiver function");
@@ -407,4 +463,4 @@ async function stopOTLPReceiver() {
 //#endregion
 export { startOTLPReceiver, stopOTLPReceiver };
 
-//# sourceMappingURL=otlpReceiver-CavGAA6k.js.map
+//# sourceMappingURL=otlpReceiver-UYMQx3sy.js.map

package/dist/src/{providerRegistry-BkzVH5Ba.js → providerRegistry-1gB5vtzQ.js}

@@ -1,4 +1,4 @@
-import { a as logger } from "./logger-BnkjG2jt.js";
+import { a as logger } from "./logger-KD8JjCRJ.js";
 //#region src/providers/providerRegistry.ts
 /**
 * Global registry of Python providers for cleanup on process exit.
@@ -42,4 +42,4 @@ const providerRegistry = new ProviderRegistry();
 //#endregion
 export { providerRegistry as t };
 
-//# sourceMappingURL=providerRegistry-BkzVH5Ba.js.map
+//# sourceMappingURL=providerRegistry-1gB5vtzQ.js.map

package/dist/src/{providerRegistry-BTDgfV5h.cjs → providerRegistry-BESeALrr.cjs}

@@ -1,4 +1,4 @@
-const require_logger = require("./logger-D5iKBpu_.cjs");
+const require_logger = require("./logger-COuQb2xB.cjs");
 //#region src/providers/providerRegistry.ts
 /**
 * Global registry of Python providers for cleanup on process exit.
@@ -47,4 +47,4 @@ Object.defineProperty(exports, "providerRegistry", {
 	}
 });
 
-//# sourceMappingURL=providerRegistry-BTDgfV5h.cjs.map
+//# sourceMappingURL=providerRegistry-BESeALrr.cjs.map

package/dist/src/{providerRegistry-CUWki5mQ.js → providerRegistry-DoACwqhD.js}

@@ -1,4 +1,4 @@
-import { a as logger } from "./logger-DO8_zM18.js";
+import { a as logger } from "./logger-Ct2S6Yx-.js";
 //#region src/providers/providerRegistry.ts
 /**
 * Global registry of Python providers for cleanup on process exit.
@@ -42,4 +42,4 @@ const providerRegistry = new ProviderRegistry();
 //#endregion
 export { providerRegistry as t };
 
-//# sourceMappingURL=providerRegistry-CUWki5mQ.js.map
+//# sourceMappingURL=providerRegistry-DoACwqhD.js.map

package/dist/src/{providerRegistry-B9lh-_tx.js → providerRegistry-PMsleEzs.js}

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { s as logger } from "./logger-BcJBzSSA.js";
+import { s as logger } from "./logger-BbY6ypFL.js";
 //#region src/providers/providerRegistry.ts
 /**
 * Global registry of Python providers for cleanup on process exit.
@@ -43,4 +43,4 @@ const providerRegistry = new ProviderRegistry();
 //#endregion
 export { providerRegistry as t };
 
-//# sourceMappingURL=providerRegistry-B9lh-_tx.js.map
+//# sourceMappingURL=providerRegistry-PMsleEzs.js.map

package/dist/src/providers-BuyzKt7C.js

@@ -0,0 +1,2 @@
+import { n as loadApiProvider, r as loadApiProviders } from "./providers-DRrerKra.js";
+export { loadApiProvider, loadApiProviders };

package/dist/src/providers-C7lNVBjX.cjs

@@ -0,0 +1,3 @@
+const require_providers = require("./providers-eDShy16E.cjs");
+exports.loadApiProvider = require_providers.loadApiProvider;
+exports.loadApiProviders = require_providers.loadApiProviders;

package/dist/src/providers-CCE2COJi2.js

@@ -0,0 +1,2 @@
+import { n as loadApiProvider, r as loadApiProviders } from "./providers-CJh7iriU.js";
+export { loadApiProvider, loadApiProviders };