@m4trix/evals 0.20.0 → 0.21.0

package/dist/cli-simple.cjs

@@ -14,8 +14,6 @@ var ink = require('ink');
 var jsxRuntime = require('react/jsx-runtime');
 
 var _documentCurrentScript = typeof document !== 'undefined' ? document.currentScript : null;
-function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
-
 function _interopNamespace(e) {
   if (e && e.__esModule) return e;
   var n = Object.create(null);
@@ -35,7 +33,7 @@ function _interopNamespace(e) {
 }
 
 var jitiModule__namespace = /*#__PURE__*/_interopNamespace(jitiModule);
-var React2__default = /*#__PURE__*/_interopDefault(React2);
+var React2__namespace = /*#__PURE__*/_interopNamespace(React2);
 
 // src/runner/config.ts
 var defaultRunnerConfig = {
@@ -677,13 +675,27 @@ function createArtifactPath(artifactDirectory, datasetId, runId) {
     `${datasetId}_${runId}_${nowIsoForFile()}.jsonl`
   );
 }
-function processOneTestCase(task, testCaseItem, totalEvaluations, publishEvent, persistenceQueue, updateSnapshot, completedRef, passedRef, failedRef) {
+function processOneTestCase(task, testCaseItem, totalEvaluations, publishEvent, persistenceQueue, updateSnapshot, startedRef, completedRef, passedRef, failedRef) {
   return effect.Effect.gen(function* () {
     const reruns = typeof testCaseItem.testCase.getReruns === "function" ? testCaseItem.testCase.getReruns() : 1;
     const rerunPassed = [];
     for (let r = 0; r < reruns; r++) {
       const evaluatorRunId = `run-${crypto.randomUUID()}`;
       const started = Date.now();
+      const startedEvaluations = yield* effect.Ref.modify(startedRef, (n) => [
+        n + 1,
+        n + 1
+      ]);
+      yield* publishEvent({
+        type: "TestCaseStarted",
+        runId: task.runId,
+        testCaseId: testCaseItem.id,
+        testCaseName: testCaseItem.testCase.getName(),
+        startedTestCases: startedEvaluations,
+        totalTestCases: totalEvaluations,
+        rerunIndex: r + 1,
+        rerunTotal: reruns
+      });
       const evaluatorScores = [];
       let testCaseError;
       const output = readOutput(testCaseItem.testCase);
@@ -829,6 +841,7 @@ var executeRunTask = (task, publishEvent, persistenceQueue, updateSnapshot) => e
   );
   const maxConcurrency = Math.max(1, task.maxConcurrency ?? 1);
   const completedRef = yield* effect.Ref.make(0);
+  const startedRef = yield* effect.Ref.make(0);
   const passedRef = yield* effect.Ref.make(0);
   const failedRef = yield* effect.Ref.make(0);
   const processTestCase = (testCaseItem) => processOneTestCase(
@@ -838,6 +851,7 @@ var executeRunTask = (task, publishEvent, persistenceQueue, updateSnapshot) => e
     publishEvent,
     persistenceQueue,
     updateSnapshot,
+    startedRef,
     completedRef,
     passedRef,
     failedRef
@@ -1489,7 +1503,7 @@ async function generateDatasetJsonCommandPlain(runner, datasetName) {
 async function generateDatasetJsonCommandInk(runner, datasetName) {
   return new Promise((resolve5, reject) => {
     const app = ink.render(
-      React2__default.default.createElement(GenerateView, {
+      React2__namespace.default.createElement(GenerateView, {
         runner,
         datasetName,
         onComplete: (err) => {
@@ -1646,7 +1660,9 @@ function RunView({
   );
   const [runInfo, setRunInfo] = React2.useState(null);
   const [testCases, setTestCases] = React2.useState([]);
+  const [startedEvaluations, setStartedEvaluations] = React2.useState(0);
   const [completedEvaluations, setCompletedEvaluations] = React2.useState(0);
+  const [runningEvaluations, setRunningEvaluations] = React2.useState([]);
   const [summary, setSummary] = React2.useState(null);
   const [evaluatorNameById, setEvaluatorNameById] = React2.useState(/* @__PURE__ */ new Map());
   const runEval = React2.useCallback(async () => {
@@ -1683,6 +1699,25 @@ function RunView({
     let overallScoreCount = 0;
     const done = new Promise((resolve5) => {
       const unsubscribe = runner.subscribeRunEvents((event) => {
+        if (event.type === "TestCaseStarted") {
+          setStartedEvaluations(event.startedTestCases);
+          setRunningEvaluations((prev) => {
+            const withoutDuplicate = prev.filter(
+              (item) => !(item.testCaseId === event.testCaseId && item.rerunIndex === event.rerunIndex)
+            );
+            return [
+              ...withoutDuplicate,
+              {
+                testCaseId: event.testCaseId,
+                name: event.testCaseName,
+                rerunIndex: event.rerunIndex,
+                rerunTotal: event.rerunTotal,
+                startedTestCases: event.startedTestCases,
+                totalTestCases: event.totalTestCases
+              }
+            ];
+          });
+        }
         if (event.type === "TestCaseProgress") {
           for (const item of event.evaluatorScores) {
             const numeric = toNumericScoreFromScores(item.scores);
@@ -1749,6 +1784,11 @@ function RunView({
             };
             byId.set(event.testCaseId, merged);
             setCompletedEvaluations(event.completedTestCases);
+            setRunningEvaluations(
+              (running) => running.filter(
+                (item) => !(item.testCaseId === event.testCaseId && item.rerunIndex === event.rerunIndex)
+              )
+            );
             return Array.from(byId.values());
           });
         }
@@ -1824,12 +1864,30 @@ function RunView({
         runInfo.totalTestCases
       ] })
     ] }),
-    phase === "running" && /* @__PURE__ */ jsxRuntime.jsx(ink.Box, { marginBottom: 1, children: /* @__PURE__ */ jsxRuntime.jsx(
-      Spinner,
-      {
-        label: `Evaluations ${completedEvaluations}/${runInfo?.totalTestCases ?? 0}`
-      }
-    ) }),
+    phase === "running" && /* @__PURE__ */ jsxRuntime.jsxs(ink.Box, { flexDirection: "column", marginBottom: 1, children: [
+      /* @__PURE__ */ jsxRuntime.jsx(
+        Spinner,
+        {
+          label: `Evaluations ${completedEvaluations}/${runInfo?.totalTestCases ?? 0} completed \u2022 ${startedEvaluations}/${runInfo?.totalTestCases ?? 0} started`
+        }
+      ),
+      runningEvaluations.length > 0 && /* @__PURE__ */ jsxRuntime.jsx(ink.Box, { flexDirection: "column", marginTop: 1, children: runningEvaluations.map((item) => /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { color: "yellow", children: [
+        "[running ",
+        item.startedTestCases,
+        "/",
+        item.totalTestCases,
+        "] ",
+        item.name,
+        " ",
+        /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { color: "gray", children: [
+          "(",
+          item.rerunIndex,
+          "/",
+          item.rerunTotal,
+          ")"
+        ] })
+      ] }, `${item.testCaseId}:${item.rerunIndex}`)) })
+    ] }),
     testCases.length > 0 && /* @__PURE__ */ jsxRuntime.jsx(ink.Box, { flexDirection: "column", marginBottom: 1, children: testCases.map((tc) => /* @__PURE__ */ jsxRuntime.jsxs(ink.Box, { flexDirection: "column", marginBottom: 0, children: [
       /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { children: [
         /* @__PURE__ */ jsxRuntime.jsxs(ink.Text, { color: "cyan", children: [
@@ -2304,9 +2362,11 @@ async function runSimpleEvalCommandPlain(runner, datasetName, evaluatorPattern)
   let overallScoreTotal = 0;
   let overallScoreSumSq = 0;
   let overallScoreCount = 0;
+  let startedCount = 0;
   let completedCount = 0;
   let totalCount = 0;
   let runFinished = false;
+  const inFlightReruns = /* @__PURE__ */ new Set();
   const spinnerFrames = ["\u280B", "\u2819", "\u2838", "\u2834", "\u2826", "\u2807"];
   let spinnerIndex = 0;
   function clearLine() {
@@ -2330,7 +2390,7 @@ async function runSimpleEvalCommandPlain(runner, datasetName, evaluatorPattern)
       `\r${colorize(frame, ansi2.cyan)} Running evaluations ${colorize(
         `${completedCount}/${totalCount}`,
         ansi2.bold
-      )} ${colorize("(live)", ansi2.dim)}`
+      )} completed ${colorize(`${startedCount}/${totalCount}`, ansi2.bold)} started ${colorize(`(${inFlightReruns.size} running)`, ansi2.dim)}`
     );
   }
   let lastPrintedTestCaseId = null;
@@ -2338,8 +2398,19 @@ async function runSimpleEvalCommandPlain(runner, datasetName, evaluatorPattern)
   let spinnerTimer;
   const done = new Promise((resolve5) => {
     const unsubscribe = runner.subscribeRunEvents((event) => {
+      if (event.type === "TestCaseStarted") {
+        startedCount = event.startedTestCases;
+        inFlightReruns.add(`${event.testCaseId}:${event.rerunIndex}`);
+        clearLine();
+        process.stdout.write(
+          `${colorize(`[started ${event.startedTestCases}/${event.totalTestCases}]`, ansi2.cyan)} ${event.testCaseName} ${colorize(`(${event.rerunIndex}/${event.rerunTotal})`, ansi2.cyan)} ${colorize("(running)", ansi2.dim)}
+`
+        );
+        drawSpinner();
+      }
       if (event.type === "TestCaseProgress") {
         completedCount = event.completedTestCases;
+        inFlightReruns.delete(`${event.testCaseId}:${event.rerunIndex}`);
         const numericScores = event.evaluatorScores.map((item) => toNumericScoreFromScores(item.scores)).filter((item) => item !== void 0);
         const averageScore = numericScores.length > 0 ? numericScores.reduce((sum, value) => sum + value, 0) / numericScores.length : void 0;
         const testCaseId = event.testCaseId;
@@ -2547,7 +2618,7 @@ async function runSimpleEvalCommandPlain(runner, datasetName, evaluatorPattern)
 async function runSimpleEvalCommandInk(runner, datasetName, evaluatorPattern) {
   return new Promise((resolve5, reject) => {
     const app = ink.render(
-      React2__default.default.createElement(RunView, {
+      React2__namespace.createElement(RunView, {
         runner,
         datasetName,
         evaluatorPattern,