@m4trix/evals 0.16.0 → 0.18.0

package/dist/cli.js

@@ -1051,20 +1051,70 @@ function getMetricById(id) {
 
 // src/evals/score.ts
 var registry2 = /* @__PURE__ */ new Map();
+function formatScoreData(def, data, options) {
+  return options?.isAggregated ? def.formatAggregate(data) : def.formatValue(data);
+}
+var ScoreAggregate = {
+  /** Average numeric fields. Use for scores like { value, delta }. */
+  averageFields(fields) {
+    return (values) => {
+      const count = values.length || 1;
+      const result = {};
+      for (const field of fields) {
+        result[field] = values.reduce((s, v) => s + (v[field] ?? 0), 0) / count;
+      }
+      return result;
+    };
+  },
+  /** Average `value` with sample std dev. Use for percent-style scores. */
+  averageWithVariance(values) {
+    if (values.length === 0) {
+      return { value: 0, stdDev: void 0, count: 0 };
+    }
+    const sum = values.reduce((s, v) => s + v.value, 0);
+    const sumSq = values.reduce((s, v) => s + v.value * v.value, 0);
+    const mean = sum / values.length;
+    let stdDev;
+    if (values.length >= 2) {
+      const variance = (sumSq - values.length * mean * mean) / (values.length - 1);
+      stdDev = variance > 0 ? Math.sqrt(variance) : 0;
+    }
+    return { ...values[0], value: mean, stdDev, count: values.length };
+  },
+  /** All runs must pass. Use for binary scores. */
+  all(values) {
+    const total = values.length;
+    const passedCount = values.filter((v) => v.passed).length;
+    return {
+      ...values[0],
+      passed: total > 0 && values.every((v) => v.passed),
+      passedCount,
+      totalCount: total
+    };
+  },
+  /** Take last value (no aggregation). Use when aggregation is not meaningful. */
+  last(values) {
+    return values[values.length - 1] ?? {};
+  }
+};
 var Score = {
+  aggregate: ScoreAggregate,
   of(config) {
     const def = {
       id: config.id,
       name: config.name,
       displayStrategy: config.displayStrategy,
-      aggregate: config.aggregate,
-      format: config.format,
+      formatValue: config.formatValue,
+      formatAggregate: config.formatAggregate,
+      aggregateValues: config.aggregateValues,
       make: (data, options) => {
         const passed = options?.definePassed !== void 0 ? options.definePassed(data) : void 0;
         return {
           id: config.id,
           data,
-          ...passed !== void 0 && { passed }
+          ...passed !== void 0 && { passed },
+          def
+          // Attach def so rendering/aggregation works without registry lookup
         };
       }
     };
@@ -1077,29 +1127,6 @@ function getScoreById(id) {
 }
 
 // src/evals/aggregators.ts
-function aggregateAverageWithVariance(values) {
-  if (values.length === 0) {
-    return { value: 0, count: 0 };
-  }
-  const sum = values.reduce((s, v) => s + v.value, 0);
-  const sumSq = values.reduce((s, v) => s + v.value * v.value, 0);
-  const mean = sum / values.length;
-  let stdDev;
-  if (values.length >= 2) {
-    const variance = (sumSq - values.length * mean * mean) / (values.length - 1);
-    stdDev = variance > 0 ? Math.sqrt(variance) : 0;
-  }
-  return { value: mean, stdDev, count: values.length };
-}
-function aggregateAll(values) {
-  const total = values.length;
-  const passedCount = values.filter((v) => v.passed).length;
-  return {
-    passed: total > 0 && values.every((v) => v.passed),
-    passedCount,
-    totalCount: total
-  };
-}
 function aggregateTokenCountSum(values) {
   const initial = {
     input: 0,
@@ -1152,35 +1179,40 @@ Score.of({
   id: "percent",
   name: "Score",
   displayStrategy: "bar",
-  format: (data, options) => {
-    if (options?.isAggregated) {
-      return data.stdDev != null ? `Avg: ${data.value.toFixed(2)} \xB1 ${data.stdDev.toFixed(2)}` : `Avg: ${data.value.toFixed(2)}`;
-    }
-    return data.value.toFixed(2);
-  },
-  aggregate: aggregateAverageWithVariance
+  formatValue: (data) => data.value.toFixed(2),
+  formatAggregate: (data) => data.stdDev != null ? `Avg: ${data.value.toFixed(2)} \xB1 ${data.stdDev.toFixed(2)}` : `Avg: ${data.value.toFixed(2)}`,
+  aggregateValues: Score.aggregate.averageWithVariance
+});
+Score.of({
+  id: "delta",
+  name: "Delta",
+  displayStrategy: "number",
+  formatValue: (data) => `${data.value.toFixed(2)} (${data.delta >= 0 ? "+" : ""}${data.delta.toFixed(2)} vs baseline)`,
+  formatAggregate: (data) => `Avg: ${data.value.toFixed(2)} (Delta: ${data.delta >= 0 ? "+" : ""}${data.delta.toFixed(2)})`,
+  aggregateValues: Score.aggregate.averageFields(["value", "delta"])
 });
 Score.of({
   id: "binary",
   name: "Result",
   displayStrategy: "passFail",
-  format: (data, options) => {
-    if (options?.isAggregated) {
-      const base = data.passed ? "All: PASSED" : "Some: FAILED";
-      if (data.passedCount != null && data.totalCount != null && data.totalCount > 1) {
-        return `${base} (${data.passedCount}/${data.totalCount})`;
-      }
-      return base;
+  formatValue: (data) => data.passed ? "PASSED" : "NOT PASSED",
+  formatAggregate: (data) => {
+    const base = data.passed ? "All: PASSED" : "Some: FAILED";
+    if (data.passedCount != null && data.totalCount != null && data.totalCount > 1) {
+      return `${base} (${data.passedCount}/${data.totalCount})`;
     }
-    return data.passed ? "PASSED" : "NOT PASSED";
+    return base;
   },
-  aggregate: aggregateAll
+  aggregateValues: Score.aggregate.all
 });
 
 // src/runner/score-utils.ts
+function getScoreDef(item) {
+  return item.def ?? getScoreById(item.id);
+}
 function toNumericScoreFromScores(scores) {
   for (const item of scores) {
-    const def = getScoreById(item.id);
+    const def = getScoreDef(item);
     if (def && def.displayStrategy === "bar" && typeof item.data === "object" && item.data !== null && "value" in item.data) {
       const value = item.data.value;
       if (typeof value === "number" && Number.isFinite(value)) {
@@ -1261,6 +1293,7 @@ function processOneTestCase(task, testCaseItem, totalEvaluations, publishEvent,
     const reruns = typeof testCaseItem.testCase.getReruns === "function" ? testCaseItem.testCase.getReruns() : 1;
     const rerunPassed = [];
     for (let r = 0; r < reruns; r++) {
+      const evaluatorRunId = `run-${randomUUID()}`;
       const started = Date.now();
       const evaluatorScores = [];
       let testCaseError;
@@ -1287,6 +1320,11 @@ function processOneTestCase(task, testCaseItem, totalEvaluations, publishEvent,
                 input: testCaseItem.testCase.getInput(),
                 ctx,
                 output,
+                meta: {
+                  triggerId: task.triggerId,
+                  runId: evaluatorRunId,
+                  datasetId: task.datasetId
+                },
                 logDiff,
                 log
               })
@@ -1592,7 +1630,7 @@ var createPersistenceWorker = (queue) => Effect.forever(
       () => appendJsonLine(message.artifactPath, {
         runId: message.runId,
         ts: Date.now(),
-        ...message.payload
+        ...typeof message.payload === "object" && message.payload !== null && !Array.isArray(message.payload) ? message.payload : {}
       })
     );
   })
@@ -1776,6 +1814,7 @@ var EffectRunner = class {
       (sum, tc) => sum + (typeof tc.testCase.getReruns === "function" ? tc.testCase.getReruns() : 1),
       0
     );
+    const triggerId = request.triggerId ?? `trg-${randomUUID()}`;
     const runId = `run-${randomUUID()}`;
     const artifactPath = createArtifactPath(
       this.config.artifactDirectory,
@@ -1817,6 +1856,7 @@ var EffectRunner = class {
     await Effect.runPromise(
       Queue.offer(this.runQueue, {
         runId,
+        triggerId,
         datasetId: request.datasetId,
         dataset: dataset.dataset,
         evaluators: selectedEvaluators,
@@ -2132,12 +2172,12 @@ function scoreColor(score) {
   return "red";
 }
 function formatScorePart(item) {
-  const def = getScoreById(item.id);
+  const def = item.def ?? getScoreById(item.id);
   if (!def) {
     const numeric = toNumericScore(item.data);
     return numeric !== void 0 ? `${numeric.toFixed(2)}` : "n/a";
   }
-  const formatted = def.format(item.data);
+  const formatted = formatScoreData(def, item.data);
   if (def.displayStrategy === "bar") {
     const numeric = typeof item.data === "object" && item.data !== null && "value" in item.data ? item.data.value : toNumericScore(item.data);
     if (typeof numeric === "number" && Number.isFinite(numeric)) {
@@ -2311,7 +2351,7 @@ function buildDetailRows(run, testCases, evaluatorNameById) {
         if (item.scores.length > 0) {
           for (let sIdx = 0; sIdx < item.scores.length; sIdx++) {
             const s = item.scores[sIdx];
-            const def = getScoreById(s.id);
+            const def = s.def ?? getScoreById(s.id);
             const scoreLabel = def ? def.name ?? def.id : s.id;
             rows.push(
               /* @__PURE__ */ jsxs(