inspect-ai 0.3.80__py3-none-any.whl → 0.3.82__py3-none-any.whl

inspect_ai/_view/www/src/workspace/tabs/grouping.ts

@@ -1,12 +1,16 @@
 import { SampleSummary } from "../../api/types";
 import { SamplesDescriptor } from "../../samples/descriptor/samplesDescriptor";
+import { ScoreLabel } from "../../types";
+import { Epochs } from "../../types/log";
 import { ListItem, SampleListItem, SeparatorListItem } from "./types";
 
 export const getSampleProcessor = (
   samples: SampleSummary[],
+  epochs: Epochs,
   groupBy: "sample" | "epoch" | "none",
   groupByOrder: "asc" | "desc",
   sampleDescriptor: SamplesDescriptor,
+  score?: ScoreLabel,
 ): ((
   sample: SampleSummary,
   index: number,
@@ -14,11 +18,17 @@ export const getSampleProcessor = (
 ) => ListItem[]) => {
   // Perform grouping if there are epochs
   if (groupBy == "epoch") {
-    return groupByEpoch(samples, sampleDescriptor, groupByOrder);
+    return groupByEpoch(samples, epochs, sampleDescriptor, groupByOrder, score);
   } else if (groupBy === "sample") {
-    return groupBySample(samples, sampleDescriptor, groupByOrder);
+    return groupBySample(
+      samples,
+      epochs,
+      sampleDescriptor,
+      groupByOrder,
+      score,
+    );
   } else {
-    return noGrouping(samples, groupByOrder);
+    return noGrouping(samples, groupByOrder, sampleDescriptor, score);
   }
 };
 
@@ -28,6 +38,8 @@ export const getSampleProcessor = (
 const noGrouping = (
   samples: SampleSummary[],
   order: "asc" | "desc",
+  sampleDescriptor: SamplesDescriptor,
+  score?: ScoreLabel,
 ): ((sample: SampleSummary, index: number) => ListItem[]) => {
   const counter = getCounter(samples.length, 1, order);
   return (sample: SampleSummary, index: number) => {
@@ -40,6 +52,12 @@ const noGrouping = (
         index: index,
         data: sample,
         type: "sample",
+        answer:
+          sampleDescriptor.selectedScorerDescriptor(sample)?.answer() || "",
+        scoreRendered: sampleDescriptor.evalDescriptor
+          .score(sample, score)
+          ?.render(),
+        completed: sample.completed !== undefined ? sample.completed : true,
       },
     ];
   };
@@ -50,8 +68,10 @@ const noGrouping = (
  */
 const groupBySample = (
   samples: SampleSummary[],
+  epochs: Epochs,
   sampleDescriptor: SamplesDescriptor,
   order: "asc" | "desc",
+  score?: ScoreLabel,
 ): ((
   sample: SampleSummary,
   index: number,
@@ -73,7 +93,7 @@ const groupBySample = (
       }
     }
   });
-  const groupCount = samples.length / sampleDescriptor.evalDescriptor.epochs;
+  const groupCount = samples.length / (epochs || 1);
   const itemCount = samples.length / groupCount;
   const counter = getCounter(itemCount, groupCount, order);
   return (
@@ -103,6 +123,11 @@ const groupBySample = (
       index: index,
       data: sample,
       type: "sample",
+      answer: sampleDescriptor.selectedScorerDescriptor(sample)?.answer() || "",
+      scoreRendered: sampleDescriptor.evalDescriptor
+        .score(sample, score)
+        ?.render(),
+      completed: sample.completed !== undefined ? sample.completed : true,
     } as SampleListItem);
 
     return results;
@@ -114,14 +139,16 @@ const groupBySample = (
  */
 const groupByEpoch = (
   samples: SampleSummary[],
+  epochs: Epochs,
   sampleDescriptor: SamplesDescriptor,
   order: "asc" | "desc",
+  score?: ScoreLabel,
 ): ((
   sample: SampleSummary,
   index: number,
   previousSample?: SampleSummary,
 ) => ListItem[]) => {
-  const groupCount = sampleDescriptor.evalDescriptor.epochs;
+  const groupCount = epochs || 1;
   const itemCount = samples.length / groupCount;
   const counter = getCounter(itemCount, groupCount, order);
 
@@ -153,6 +180,11 @@ const groupByEpoch = (
       index: index,
       data: sample,
       type: "sample",
+      answer: sampleDescriptor.selectedScorerDescriptor(sample)?.answer() || "",
+      scoreRendered: sampleDescriptor.evalDescriptor
+        .score(sample, score)
+        ?.render(),
+      completed: sample.completed !== undefined ? sample.completed : true,
     } as SampleListItem);
 
     return results;

inspect_ai/_view/www/src/workspace/tabs/types.ts

@@ -1,11 +1,15 @@
+import { ReactNode } from "react";
 import { SampleSummary } from "../../api/types";
 
 export interface SampleListItem {
   label: string;
   index: number;
   number: number;
+  answer: string;
+  scoreRendered: ReactNode;
   data: SampleSummary;
   type: "sample";
+  completed: boolean;
 }
 
 export interface SeparatorListItem {

inspect_ai/_view/www/src/workspace/types.ts

@@ -1,10 +1,11 @@
-import { ReactNode, RefObject } from "react";
+import { ComponentType, ReactNode, RefObject } from "react";
 
-export interface TabDescriptor {
+export interface TabDescriptor<P> {
   id: string;
   scrollable: boolean;
   scrollRef?: RefObject<HTMLDivElement | null>;
   label: string;
-  content: () => ReactNode;
+  component: ComponentType<P>;
+  componentProps: P;
   tools?: () => ReactNode[] | undefined;
 }

inspect_ai/_view/www/src/workspace/utils.ts

@@ -1,6 +1,6 @@
-import { EvalMetric } from "../types/log";
+import { ResultsMetric } from "./navbar/ResultsPanel";
 
-export const metricDisplayName = (metric: EvalMetric): string => {
+export const metricDisplayName = (metric: ResultsMetric): string => {
   let modifier = undefined;
   for (const metricModifier of metricModifiers) {
     modifier = metricModifier(metric);
@@ -13,10 +13,10 @@ export const metricDisplayName = (metric: EvalMetric): string => {
   return metricName;
 };
 
-type MetricModifier = (metric: EvalMetric) => string | undefined;
+type MetricModifier = (metric: ResultsMetric) => string | undefined;
 
 const clusterMetricModifier: MetricModifier = (
-  metric: EvalMetric,
+  metric: ResultsMetric,
 ): string | undefined => {
   if (metric.name !== "stderr") {
     return undefined;

inspect_ai/_view/www/vite.config.js

@@ -24,4 +24,10 @@ export default defineConfig({
   resolve: {
     dedupe: ["react", "react-dom"],
   },
+  define: {
+    __DEV_WATCH__: JSON.stringify(process.env.DEV_LOGGING === "true"),
+    __LOGGING_FILTER__: JSON.stringify(
+      process.env.DEV_LOGGING_NAMESPACES || "*",
+    ),
+  },
 });