inspect-ai 0.3.94__py3-none-any.whl → 0.3.96__py3-none-any.whl

inspect_ai/_view/www/dist/assets/index.js

@@ -23080,7 +23080,8 @@ Please change the parent <Route path="${parentPath}"> to <Route path="${parentPa
       pendingSampleSummaries: void 0,
       loadedLog: void 0,
       // Filter state
-      filter: {},
+      filter: "",
+      filterError: void 0,
       epoch: "all",
       sort: kDefaultSort,
       score: void 0,
@@ -23115,6 +23116,14 @@ Please change the parent <Route path="${parentPath}"> to <Route path="${parentPa
           setFilter: (filter) => set2((state) => {
             state.log.filter = filter;
           }),
+          setFilterError: (error2) => set2((state) => {
+            state.log.filterError = error2;
+          }),
+          clearFilterError: () => {
+            set2((state) => {
+              state.log.filterError = void 0;
+            });
+          },
           setEpoch: (epoch) => set2((state) => {
             state.log.epoch = epoch;
           }),
@@ -23128,7 +23137,8 @@ Please change the parent <Route path="${parentPath}"> to <Route path="${parentPa
             state.log.scores = scores2;
           }),
           resetFiltering: () => set2((state) => {
-            state.log.filter = {};
+            state.log.filter = "";
+            state.log.filterError = void 0;
             state.log.epoch = "all";
             state.log.sort = kDefaultSort;
             state.log.score = void 0;
@@ -24422,12 +24432,12 @@ Please change the parent <Route path="${parentPath}"> to <Route path="${parentPa
       }, [callback]);
       return elementRef;
     };
-    const expandableBordered = "_expandableBordered_1wpxz_1";
-    const expandableCollapsed = "_expandableCollapsed_1wpxz_13";
-    const moreToggle = "_moreToggle_1wpxz_17";
-    const bordered = "_bordered_1wpxz_24";
-    const moreToggleContainer = "_moreToggleContainer_1wpxz_28";
-    const moreToggleButton = "_moreToggleButton_1wpxz_39";
+    const expandableBordered = "_expandableBordered_59eal_1";
+    const expandableCollapsed = "_expandableCollapsed_59eal_13";
+    const moreToggle = "_moreToggle_59eal_17";
+    const bordered = "_bordered_59eal_24";
+    const moreToggleContainer = "_moreToggleContainer_59eal_28";
+    const moreToggleButton = "_moreToggleButton_59eal_39";
     const styles$1j = {
       expandableBordered,
       expandableCollapsed,
@@ -24440,15 +24450,16 @@ Please change the parent <Route path="${parentPath}"> to <Route path="${parentPa
       ({ id, collapse, border, lines = 15, children: children2, className: className2 }) => {
         const [collapsed, setCollapsed] = useCollapsedState(id, collapse);
         const [showToggle, setShowToggle] = reactExports.useState(false);
-        const lineHeightRef = reactExports.useRef(0);
+        const baseFontSizeRef = reactExports.useRef(0);
         const checkOverflow = reactExports.useCallback(
           (entry2) => {
             const element = entry2.target;
-            if (!lineHeightRef.current) {
+            if (baseFontSizeRef.current === 0) {
               const computedStyle = window.getComputedStyle(element);
-              lineHeightRef.current = parseInt(computedStyle.lineHeight) || 16;
+              const rootFontSize = parseFloat(computedStyle.fontSize);
+              baseFontSizeRef.current = rootFontSize;
             }
-            const maxCollapsedHeight = lines * lineHeightRef.current;
+            const maxCollapsedHeight = baseFontSizeRef.current * lines;
             const contentHeight = element.scrollHeight;
             setShowToggle(contentHeight > maxCollapsedHeight);
           },
@@ -41943,7 +41954,7 @@ Please change the parent <Route path="${parentPath}"> to <Route path="${parentPa
         has_retries: sample2.retries !== void 0 && sample2.retries > 0
       };
     };
-    const scoreFilterItems = (evalDescriptor) => {
+    const sampleFilterItems = (evalDescriptor) => {
       const items = [];
       const bannedShortNames = bannedShortScoreNames(evalDescriptor.scores);
       const valueToString = (value2) => typeof value2 === "string" ? `"${value2}"` : String(value2);
@@ -42090,7 +42101,8 @@ categories: ${categories.join(" ")}`;
       }
     };
     const filterSamples = (evalDescriptor, samples, filterValue) => {
-      var error2 = void 0;
+      let error2 = void 0;
+      let errorCount = 0;
       const result2 = samples.filter((sample2) => {
         if (filterValue) {
           const { matches, error: sampleError } = filterExpression(
@@ -42099,12 +42111,15 @@ categories: ${categories.join(" ")}`;
             filterValue
           );
           error2 || (error2 = sampleError);
+          if (sampleError) {
+            errorCount++;
+          }
           return matches;
         } else {
           return true;
         }
       });
-      return { result: result2, error: error2 };
+      return { result: result2, error: error2, allErrors: errorCount === samples.length };
     };
     const flex$1 = "_flex_1kye9_1";
     const label$7 = "_label_1kye9_5";
@@ -42381,12 +42396,22 @@ categories: ${categories.join(" ")}`;
       const evalDescriptor = useEvalDescriptor();
       const sampleSummaries = useSampleSummaries();
       const filter = useStore((state) => state.log.filter);
+      const setFilterError = useStore((state) => state.logActions.setFilterError);
+      const clearFilterError = useStore(
+        (state) => state.logActions.clearFilterError
+      );
       const epoch = useStore((state) => state.log.epoch);
       const sort = useStore((state) => state.log.sort);
       const samplesDescriptor = useSampleDescriptor();
       const score2 = useScore();
       return reactExports.useMemo(() => {
-        const prefiltered = evalDescriptor && filter.value ? filterSamples(evalDescriptor, sampleSummaries, filter.value).result : sampleSummaries;
+        const { result: result2, error: error2, allErrors } = evalDescriptor && filter ? filterSamples(evalDescriptor, sampleSummaries, filter) : { result: sampleSummaries, error: void 0, allErrors: false };
+        if (error2 && allErrors) {
+          setFilterError(error2);
+        } else {
+          clearFilterError();
+        }
+        const prefiltered = error2 === void 0 || !allErrors ? result2 : sampleSummaries;
         const filtered = epoch && epoch !== "all" ? prefiltered.filter((sample2) => epoch === String(sample2.epoch)) : prefiltered;
         const sorted = samplesDescriptor ? sortSamples(sort, filtered, samplesDescriptor, score2) : filtered;
         return [...sorted];
@@ -42394,6 +42419,8 @@ categories: ${categories.join(" ")}`;
         evalDescriptor,
         sampleSummaries,
         filter,
+        setFilterError,
+        clearFilterError,
         epoch,
         sort,
         samplesDescriptor,
@@ -44311,7 +44338,7 @@ categories: ${categories.join(" ")}`;
       if (!evalDescriptor) {
         return null;
       }
-      const items = scoreFilterItems(evalDescriptor);
+      const items = sampleFilterItems(evalDescriptor);
       return /* @__PURE__ */ jsxRuntimeExports.jsx("span", { style: { position: "relative" }, children: Array.from(items).map((item2, index2, array) => /* @__PURE__ */ jsxRuntimeExports.jsxs("span", { children: [
         /* @__PURE__ */ jsxRuntimeExports.jsx("span", { title: item2.tooltip, children: item2.canonicalName }),
         index2 < array.length - 1 ? ", " : ""
@@ -81301,14 +81328,6 @@ Supported expressions:
         overflow: "hidden"
       }
     });
-    const getFilteringResult = (evalDescriptor, sampleSummaries, filterValue) => {
-      const { result: result2, error: error2 } = filterSamples(
-        evalDescriptor,
-        sampleSummaries,
-        filterValue
-      );
-      return { numSamples: result2.length, error: error2 };
-    };
     const ensureOneLine = (tr2) => {
       const newDoc = tr2.newDoc.toString();
       if (!newDoc.includes("\n")) return tr2;
@@ -81337,11 +81356,7 @@ Supported expressions:
         }
       ];
     };
-    const SampleFilter = ({
-      samples,
-      scoreFilter,
-      setScoreFilter
-    }) => {
+    const SampleFilter = () => {
       const editorRef = reactExports.useRef(null);
       const editorViewRef = reactExports.useRef(null);
       const linterCompartment = reactExports.useRef(new Compartment());
@@ -81349,41 +81364,50 @@ Supported expressions:
       const updateListenerCompartment = reactExports.useRef(new Compartment());
       const evalDescriptor = useEvalDescriptor();
       const filterItems = reactExports.useMemo(
-        () => evalDescriptor ? scoreFilterItems(evalDescriptor) : [],
+        () => evalDescriptor ? sampleFilterItems(evalDescriptor) : [],
         [evalDescriptor]
       );
-      const [filteringResultInstant, setFilteringResultInstant] = reactExports.useState(null);
-      const handleFocus = (event, view) => {
+      const filter = useStore((state) => state.log.filter);
+      const filterError = useStore((state) => state.log.filterError);
+      const setFilter = useStore((state) => state.logActions.setFilter);
+      const handleFocus = reactExports.useCallback((event, view) => {
         if (event.isTrusted && view.state.doc.toString() === "") {
           setTimeout(() => startCompletion(view), 0);
         }
-      };
-      const makeAutocompletion = () => autocompletion({
-        override: [(context) => getCompletions(context, filterItems)],
-        activateOnCompletion: (c2) => c2.label.endsWith(" ")
-      });
-      const makeLinter = () => linter((view) => getLints(view, filteringResultInstant == null ? void 0 : filteringResultInstant.error));
-      const makeUpdateListener = () => EditorView.updateListener.of((update) => {
-        if (update.docChanged && evalDescriptor) {
-          const newValue = update.state.doc.toString();
-          const filteringResult = getFilteringResult(
-            evalDescriptor,
-            samples,
-            newValue
-          );
-          if (!filteringResult.error) {
-            setScoreFilter({ value: newValue });
+      }, []);
+      const makeAutocompletion = reactExports.useCallback(
+        () => autocompletion({
+          override: [(context) => getCompletions(context, filterItems)],
+          activateOnCompletion: (c2) => c2.label.endsWith(" ")
+        }),
+        []
+      );
+      const makeLinter = reactExports.useCallback(
+        () => linter((view) => getLints(view, filterError)),
+        [filterError]
+      );
+      const debounceSetFilter = reactExports.useCallback(
+        debounce$1((value2) => {
+          setFilter(value2);
+        }, 200),
+        [setFilter]
+      );
+      const makeUpdateListener = reactExports.useCallback(
+        () => EditorView.updateListener.of((update) => {
+          if (update.docChanged && evalDescriptor) {
+            const newValue = update.state.doc.toString();
+            debounceSetFilter(newValue);
           }
-          setFilteringResultInstant(filteringResult);
-        }
-      });
+        }),
+        [setFilter]
+      );
       reactExports.useEffect(() => {
         var _a2;
         (_a2 = editorViewRef.current) == null ? void 0 : _a2.destroy();
         editorViewRef.current = new EditorView({
           parent: editorRef.current ?? void 0,
           state: EditorState.create({
-            doc: scoreFilter.value || "",
+            doc: filter || "",
             extensions: [
               minimalSetup,
               bracketMatching(),
@@ -81406,20 +81430,15 @@ Supported expressions:
       reactExports.useEffect(() => {
         if (!editorViewRef.current) return;
         const currentValue = editorViewRef.current.state.doc.toString();
-        if (scoreFilter.value === currentValue) return;
-        if (evalDescriptor) {
-          setFilteringResultInstant(
-            getFilteringResult(evalDescriptor, samples, scoreFilter.value || "")
-          );
-        }
+        if (filter === currentValue) return;
         editorViewRef.current.dispatch({
           changes: {
             from: 0,
             to: currentValue.length,
-            insert: scoreFilter.value || ""
+            insert: filter || ""
           }
         });
-      }, [evalDescriptor, scoreFilter.value]);
+      }, [filter]);
       reactExports.useEffect(() => {
         var _a2;
         (_a2 = editorViewRef.current) == null ? void 0 : _a2.dispatch({
@@ -81437,7 +81456,7 @@ Supported expressions:
         (_a2 = editorViewRef.current) == null ? void 0 : _a2.dispatch({
           effects: linterCompartment.current.reconfigure(makeLinter())
         });
-      }, [filteringResultInstant == null ? void 0 : filteringResultInstant.error]);
+      }, [filterError]);
       return /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { style: { display: "flex" }, children: [
         /* @__PURE__ */ jsxRuntimeExports.jsx(
           "span",
@@ -81456,10 +81475,7 @@ Supported expressions:
           "div",
           {
             ref: editorRef,
-            className: clsx(
-              (filteringResultInstant == null ? void 0 : filteringResultInstant.error) && "filter-pending",
-              styles$9.input
-            )
+            className: clsx(filterError && "filter-pending", styles$9.input)
           }
         ),
         /* @__PURE__ */ jsxRuntimeExports.jsx(
@@ -81487,20 +81503,16 @@ Supported expressions:
       score: score2,
       setScore
     }) => {
-      const scorers = scores2.reduce((accum, scorer2) => {
-        if (!accum.find((sc) => {
-          return scorer2.scorer === sc.scorer;
-        })) {
-          accum.push(scorer2);
-        }
-        return accum;
-      }, []);
-      const handleSelectScore = reactExports.useCallback(
-        (index2) => {
-          setScore(scores2[index2]);
-        },
-        [setScore, scores2]
-      );
+      const scorers = reactExports.useMemo(() => {
+        return scores2.reduce((accum, scorer2) => {
+          if (!accum.find((sc) => {
+            return scorer2.scorer === sc.scorer;
+          })) {
+            accum.push(scorer2);
+          }
+          return accum;
+        }, []);
+      }, [scores2]);
       if (scorers.length === 1) {
         return /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: styles$8.flex, children: [
           /* @__PURE__ */ jsxRuntimeExports.jsx(
@@ -81520,8 +81532,8 @@ Supported expressions:
             ScoreSelector,
             {
               scores: scores2,
-              selectedIndex: scoreIndex(scores2, score2),
-              setSelectedIndex: handleSelectScore
+              selectedScore: score2,
+              setSelectedScore: setScore
             }
           )
         ] });
@@ -81548,8 +81560,8 @@ Supported expressions:
             ScorerSelector,
             {
               scorers,
-              selectedIndex: scorerIndex(scorers, score2),
-              setSelectedIndex: handleSelectScore
+              selectedScore: score2,
+              setSelectedScore: setScore
             }
           ),
           scorerScores.length > 1 ? /* @__PURE__ */ jsxRuntimeExports.jsx(
@@ -81557,8 +81569,8 @@ Supported expressions:
             {
               className: clsx(styles$8.secondSel),
               scores: scorerScores,
-              selectedIndex: scoreIndex(scorerScores, score2),
-              setSelectedIndex: handleSelectScore
+              selectedScore: score2,
+              setSelectedScore: setScore
             }
           ) : void 0
         ] });
@@ -81566,17 +81578,20 @@ Supported expressions:
     };
     const ScoreSelector = ({
       scores: scores2,
-      selectedIndex,
-      setSelectedIndex,
+      selectedScore,
+      setSelectedScore,
       className: className2
     }) => {
       const handleChange = reactExports.useCallback(
         (e) => {
           const sel = e.target;
-          setSelectedIndex(sel.selectedIndex);
+          setSelectedScore(scores2[sel.selectedIndex]);
         },
-        [setSelectedIndex]
+        [setSelectedScore, scores2]
       );
+      const index2 = scores2.findIndex((sc) => {
+        return selectedScore && sc.name === selectedScore.name && sc.scorer === selectedScore.scorer;
+      });
       return /* @__PURE__ */ jsxRuntimeExports.jsx(
         "select",
         {
@@ -81587,7 +81602,7 @@ Supported expressions:
             className2
           ),
           "aria-label": ".select-scorer-label",
-          value: scores2[selectedIndex].name,
+          value: scores2[index2].name,
           onChange: handleChange,
           children: scores2.map((score2) => {
             return /* @__PURE__ */ jsxRuntimeExports.jsx("option", { value: score2.name, children: score2.name }, score2.name);
@@ -81597,22 +81612,25 @@ Supported expressions:
     };
     const ScorerSelector = ({
       scorers,
-      selectedIndex,
-      setSelectedIndex
+      selectedScore,
+      setSelectedScore
     }) => {
       const handleChange = reactExports.useCallback(
         (e) => {
           const sel = e.target;
-          setSelectedIndex(sel.selectedIndex);
+          setSelectedScore(scorers[sel.selectedIndex]);
         },
-        [setSelectedIndex]
+        [setSelectedScore, scorers]
       );
+      const index2 = scorers.findIndex((sc) => {
+        return selectedScore && sc.scorer === selectedScore.scorer;
+      });
       return /* @__PURE__ */ jsxRuntimeExports.jsx(
         "select",
         {
           className: clsx("form-select", "form-select-sm", "text-size-smaller"),
           "aria-label": ".epoch-filter-label",
-          value: scorers[selectedIndex].scorer,
+          value: scorers[index2].scorer,
           onChange: handleChange,
           children: scorers.map((scorer2) => {
             return /* @__PURE__ */ jsxRuntimeExports.jsx("option", { value: scorer2.scorer, children: scorer2.scorer }, scorer2.scorer);
@@ -81620,16 +81638,8 @@ Supported expressions:
         }
       );
     };
-    const scoreIndex = (scores2, score2) => scores2.findIndex((sc) => {
-      return score2 && sc.name === score2.name && sc.scorer === score2.scorer;
-    });
-    const scorerIndex = (scores2, score2) => scores2.findIndex((sc) => {
-      return score2 && sc.scorer === score2.scorer;
-    });
-    const SampleTools = ({ samples }) => {
+    const SampleTools = () => {
       const selectedLogSummary = useStore((state) => state.log.selectedLogSummary);
-      const filter = useStore((state) => state.log.filter);
-      const setFilter = useStore((state) => state.logActions.setFilter);
       const scores2 = useScores();
       const score2 = useScore();
       const setScore = useStore((state) => state.logActions.setScore);
@@ -81639,14 +81649,7 @@ Supported expressions:
       const setSort = useStore((state) => state.logActions.setSort);
       const epochs = (selectedLogSummary == null ? void 0 : selectedLogSummary.eval.config.epochs) || 1;
       return /* @__PURE__ */ jsxRuntimeExports.jsxs(jsxRuntimeExports.Fragment, { children: [
-        /* @__PURE__ */ jsxRuntimeExports.jsx(
-          SampleFilter,
-          {
-            samples,
-            scoreFilter: filter,
-            setScoreFilter: setFilter
-          }
-        ),
+        /* @__PURE__ */ jsxRuntimeExports.jsx(SampleFilter, {}),
         (scores2 == null ? void 0 : scores2.length) > 1 ? /* @__PURE__ */ jsxRuntimeExports.jsx(SelectScorer, { scores: scores2, score: score2, setScore }) : void 0,
         epochs > 1 ? /* @__PURE__ */ jsxRuntimeExports.jsx(EpochFilter, { epoch, setEpoch, epochs }) : void 0,
         /* @__PURE__ */ jsxRuntimeExports.jsx(SortFilter, { sort, setSort, epochs })
@@ -82342,13 +82345,7 @@ Supported expressions:
             running: evalStatus === "started"
           },
           tools: () => !samplesDescriptor ? void 0 : totalSampleCount === 1 ? [/* @__PURE__ */ jsxRuntimeExports.jsx(ScoreFilterTools, {})] : [
-            /* @__PURE__ */ jsxRuntimeExports.jsx(
-              SampleTools,
-              {
-                samples: sampleSummaries || []
-              },
-              "sample-tools"
-            ),
+            /* @__PURE__ */ jsxRuntimeExports.jsx(SampleTools, {}, "sample-tools"),
             evalStatus === "started" && !streamSamples && /* @__PURE__ */ jsxRuntimeExports.jsx(
               ToolButton,
               {

inspect_ai/_view/www/package.json

@@ -86,7 +86,7 @@
     "prismjs": "^1.30.0",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
-    "react-router-dom": "^7.5.2",
+    "react-router-dom": "^7.5.3",
     "react-virtuoso": "^4.12.6",
     "zustand": "^5.0.3"
   }

inspect_ai/_view/www/src/app/log-view/navbar/SecondaryBar.tsx

@@ -8,7 +8,7 @@ import {
   EvalStats,
 } from "../../../@types/log";
 import { EvalDescriptor } from "../../../app/samples/descriptor/types";
-import { scoreFilterItems } from "../../../app/samples/sample-tools/filters";
+import { sampleFilterItems } from "../../../app/samples/sample-tools/filters";
 import { ExpandablePanel } from "../../../components/ExpandablePanel";
 import { LabeledValue } from "../../../components/LabeledValue";
 import { useEvalDescriptor } from "../../../state/hooks";
@@ -181,7 +181,7 @@ const ScorerSummary: FC<ScoreSummaryProps> = ({ evalDescriptor }) => {
     return null;
   }
 
-  const items = scoreFilterItems(evalDescriptor);
+  const items = sampleFilterItems(evalDescriptor);
   return (
     <span style={{ position: "relative" }}>
       {Array.from(items).map((item, index, array) => (

inspect_ai/_view/www/src/app/log-view/tabs/SamplesTab.tsx

@@ -50,10 +50,7 @@ export const useSamplesTabConfig = (
           : totalSampleCount === 1
             ? [<ScoreFilterTools />]
             : [
-                <SampleTools
-                  samples={sampleSummaries || []}
-                  key="sample-tools"
-                />,
+                <SampleTools key="sample-tools" />,
                 evalStatus === "started" && !streamSamples && (
                   <ToolButton
                     key="refresh"

inspect_ai/_view/www/src/app/samples/SamplesTools.tsx

@@ -1,6 +1,5 @@
 import { FC } from "react";
 import { Fragment } from "react/jsx-runtime";
-import { SampleSummary } from "../../client/api/types";
 import { useScore, useScores } from "../../state/hooks";
 import { useStore } from "../../state/store";
 import { EpochFilter } from "./sample-tools/EpochFilter";
@@ -8,16 +7,11 @@ import { SampleFilter } from "./sample-tools/sample-filter/SampleFilter";
 import { SelectScorer } from "./sample-tools/SelectScorer";
 import { SortFilter } from "./sample-tools/SortFilter";
 
-interface SampleToolsProps {
-  samples: SampleSummary[];
-}
+interface SampleToolsProps {}
 
-export const SampleTools: FC<SampleToolsProps> = ({ samples }) => {
+export const SampleTools: FC<SampleToolsProps> = () => {
   const selectedLogSummary = useStore((state) => state.log.selectedLogSummary);
 
-  const filter = useStore((state) => state.log.filter);
-  const setFilter = useStore((state) => state.logActions.setFilter);
-
   const scores = useScores();
   const score = useScore();
   const setScore = useStore((state) => state.logActions.setScore);
@@ -29,11 +23,7 @@ export const SampleTools: FC<SampleToolsProps> = ({ samples }) => {
   const epochs = selectedLogSummary?.eval.config.epochs || 1;
   return (
     <Fragment>
-      <SampleFilter
-        samples={samples}
-        scoreFilter={filter}
-        setScoreFilter={setFilter}
-      />
+      <SampleFilter />
       {scores?.length > 1 ? (
         <SelectScorer scores={scores} score={score} setScore={setScore} />
       ) : undefined}