oh-my-promptfoo 1.17.0 → 1.18.0

package/dist/assertions.cjs

@@ -84,7 +84,6 @@ function prepareRubric(output, context2, workspace = false) {
   const config = context2?.config;
   const components = config?.components;
   const scoring = config?.scoring ?? "graded";
-  const threshold = scoring === "binary" ? 1 : config?.threshold;
   if (config && Object.hasOwn(config, "rubric")) {
     throw new Error("LLM assertion config.rubric was renamed to config.rubricPrompt");
   }
@@ -100,9 +99,11 @@ function prepareRubric(output, context2, workspace = false) {
   }
   if (!config || !Array.isArray(components) || components.length === 0 || !components.every(
     (component) => component && typeof component.metric === "string" && component.metric.trim() && typeof component.value === "string" && component.value.trim() && (component.weight === void 0 || typeof component.weight === "number" && Number.isFinite(component.weight) && component.weight > 0)
-  ) || new Set(components.map(({ metric }) => metric)).size !== components.length || threshold !== void 0 && (typeof threshold !== "number" || !Number.isFinite(threshold) || threshold < 0 || threshold > 1) || config.rubricPrompt !== void 0 && !config.rubricPrompt.trim() || config.scoring !== void 0 && config.scoring !== "graded" && config.scoring !== "binary" || scoring === "binary" && config.threshold !== void 0 && config.threshold !== 1) {
+  ) || new Set(components.map(({ metric }) => metric)).size !== components.length || ![config.threshold, ...components.map(({ threshold }) => threshold)].every(
+    (threshold) => threshold === void 0 || typeof threshold === "number" && Number.isFinite(threshold) && threshold >= 0 && threshold <= 1 && (scoring !== "binary" || threshold === 1)
+  ) || config.rubricPrompt !== void 0 && !config.rubricPrompt.trim() || config.scoring !== void 0 && config.scoring !== "graded" && config.scoring !== "binary") {
     throw new Error(
-      "LLM assertion requires unique named components with nonempty criteria, positive weights, a threshold between 0 and 1, a nonempty string rubricPrompt, and scoring of 'graded' or 'binary' without a conflicting threshold"
+      "LLM assertion requires unique named components with nonempty criteria, positive weights, a config.threshold and component thresholds between 0 and 1, a nonempty string rubricPrompt, and scoring of 'graded' or 'binary' without a conflicting config.threshold or component threshold"
     );
   }
   if (components.some(({ metric }) => Object.hasOwn(Object.prototype, metric))) {
@@ -130,7 +131,15 @@ ${answer}
 <Rubric>
 ${criteria.map(({ metric, value }) => `- ${metric}: ${value}`).join("\n")}
 </Rubric>`;
-  return { components, threshold, totalWeight, system, user };
+  return {
+    components: components.map((component) => ({
+      ...component,
+      threshold: scoring === "binary" ? 1 : component.threshold ?? config.threshold
+    })),
+    totalWeight,
+    system,
+    user
+  };
 }
 function parseVerdict(text) {
   try {
@@ -219,13 +228,13 @@ function gradingFailure(error, usages) {
     metadata: { graderError: true }
   };
 }
-function rubricResult({ components, threshold, totalWeight }, grades, usages, renderedGradingPrompt) {
+function rubricResult({ components, totalWeight }, grades, usages, renderedGradingPrompt) {
   const namedScores = {};
   const namedScoreWeights = {};
   let weightedScore = 0;
   let allPassed = true;
   let reason = "";
-  const componentResults = components.map(({ metric, value, weight }) => {
+  const componentResults = components.map(({ metric, value, weight, threshold }) => {
     const grade = grades.get(metric);
     if (!grade) throw new Error(`LLM grader did not score component: ${metric}`);
     const effectiveWeight = weight ?? 1;