inspect-ai 0.3.58__py3-none-any.whl → 0.3.59__py3-none-any.whl

inspect_ai/_view/www/src/samples/SampleList.mjs

@@ -1,6 +1,6 @@
 import { html } from "htm/preact";
-import { useCallback, useState } from "preact/hooks";
-import { useEffect, useMemo } from "preact/hooks";
+import { useCallback, useMemo, useState } from "preact/hooks";
+import { useEffect, useRef } from "preact/hooks";
 
 import { ApplicationStyles } from "../appearance/Styles.mjs";
 import { FontSize } from "../appearance/Fonts.mjs";
@@ -56,57 +56,28 @@ export const SampleList = (props) => {
     setHidden(false);
   }, [items]);
 
-  const heightForType = (type) => {
-    return type === "sample" ? kSampleHeight : kSeparatorHeight;
-  };
-
-  // Compute the row arrangement
-  const rowMap = useMemo(() => {
-    return items.reduce((values, current, index) => {
-      const height = heightForType(current.type);
-      const previous =
-        values.length > 0 ? values[values.length - 1] : undefined;
-      const start =
-        previous === undefined ? 0 : previous.start + previous.height;
-      values.push({
-        index,
-        height,
-        start,
-      });
-      return values;
-    }, []);
+  // Keep a mapping of the indexes to items (skipping separators)
+  const itemRowMapping = useMemo(() => {
+    const rowIndexes = [];
+    items.forEach((item, index) => {
+      if (item.type === "sample") {
+        rowIndexes.push(index);
+      }
+    });
+    return rowIndexes;
   }, [items]);
 
+  const prevSelectedIndexRef = useRef(null);
   useEffect(() => {
     const listEl = listRef.current;
     if (listEl) {
-      // Decide if we need to scroll the element into position
-      const selected = rowMap[selectedIndex];
-      if (selected) {
-        const itemTop = selected.start;
-        const itemBottom = selected.start + selected.height;
-
-        const scrollTop = listEl.base.scrollTop;
-        const scrollBottom = scrollTop + listEl.base.offsetHeight;
-
-        // It is visible
-        if (itemTop >= scrollTop && itemBottom <= scrollBottom) {
-          return;
-        }
-
-        if (itemTop < scrollTop) {
-          // Top is scrolled off
-          listEl.base.scrollTo({ top: itemTop });
-          return;
-        }
-
-        if (itemBottom > scrollBottom) {
-          listEl.base.scrollTo({ top: itemBottom - listEl.base.offsetHeight });
-          return;
-        }
-      }
+      const actualRowIndex = itemRowMapping[selectedIndex];
+      const direction =
+        actualRowIndex > prevSelectedIndexRef.current ? "down" : "up";
+      listRef.current?.scrollToIndex(actualRowIndex, direction);
+      prevSelectedIndexRef.current = actualRowIndex;
     }
-  }, [selectedIndex, rowMap, listRef]);
+  }, [selectedIndex, listRef, itemRowMapping]);
 
   /** @param {import("./SamplesTab.mjs").ListItem} item */
   const renderRow = (item) => {
@@ -254,7 +225,6 @@ export const SampleList = (props) => {
       tabIndex="0"
       renderRow=${renderRow}
       onkeydown=${onkeydown}
-      rowMap=${rowMap}
       style=${listStyle}
     />
     ${footerRow}

inspect_ai/_view/www/src/samples/SampleTranscript.mjs

@@ -1,6 +1,6 @@
 // @ts-check
 import { html } from "htm/preact";
-import { TranscriptView } from "./transcript/TranscriptView.mjs";
+import { TranscriptVirtualList } from "./transcript/TranscriptView.mjs";
 
 /**
  * Renders the SampleTranscript component.
@@ -8,8 +8,13 @@ import { TranscriptView } from "./transcript/TranscriptView.mjs";
  * @param {Object} props - The parameters for the component.
  * @param {string} props.id - The id of this component
  * @param {import("../types/log").Events} props.evalEvents - The transcript to display.
+ * @param {import("htm/preact").MutableRef<HTMLElement>} props.scrollRef - The scrollable parent element
  * @returns {import("preact").JSX.Element} The SampleTranscript component.
  */
-export const SampleTranscript = ({ id, evalEvents }) => {
-  return html`<${TranscriptView} id=${id} events=${evalEvents} />`;
+export const SampleTranscript = ({ id, evalEvents, scrollRef }) => {
+  return html`<${TranscriptVirtualList}
+    id=${id}
+    events=${evalEvents}
+    scrollRef=${scrollRef}
+  />`;
 };

inspect_ai/_view/www/src/samples/SamplesDescriptor.mjs

@@ -83,6 +83,29 @@ import {
  * @property {number} normalized.limit - Normalized size of the limit message.
  */
 
+/**
+ * @param {import("../Types.mjs").ScoreLabel | undefined} scoreLabel
+ * @returns {string}
+ */
+export const scoreLabelKey = (scoreLabel) => {
+  if (!scoreLabel) {
+    return "No score key";
+  }
+  return `${scoreLabel.scorer}.${scoreLabel.name}`;
+};
+
+/**
+ * @param {string} key
+ * @returns {import("../Types.mjs").ScoreLabel | undefined}
+ */
+export const parseScoreLabelKey = (key) => {
+  if (key == "No score key") {
+    return undefined;
+  }
+  const [scorer, name] = key.split(".");
+  return { scorer, name };
+};
+
 /**
  * @param {import("../Types.mjs").ScoreLabel[]} scores - the list of available scores
  * @param {import("../api/Types.mjs").SampleSummary[]} samples - the list of sample summaries
@@ -165,17 +188,6 @@ export const createEvalDescriptor = (scores, samples, epochs) => {
     return undefined;
   };
 
-  /**
-   * @param {import("../Types.mjs").ScoreLabel} [scoreLabel]
-   * @returns {string}
-   */
-  const scoreLabelKey = (scoreLabel) => {
-    if (!scoreLabel) {
-      return "No score key";
-    }
-    return `${scoreLabel.scorer}.${scoreLabel.name}`;
-  };
-
   /**
    * The EvalDescriptor is memoized. Compute all descriptors now to avoid duplicate work.
    * @type {Map<string, ScoreDescriptor>}
@@ -466,7 +478,7 @@ const scoreCategorizers = [
      * @returns {ScoreDescriptor} a ScoreDescriptor
      */
     describe: (values, types) => {
-      if (values.length === 2 && types.length === 1 && types[0] === "boolean") {
+      if (types.length === 1 && types[0] === "boolean") {
         return booleanScoreCategorizer();
       }
     },

inspect_ai/_view/www/src/samples/SamplesTab.mjs

@@ -31,6 +31,7 @@ import { EmptyPanel } from "../components/EmptyPanel.mjs";
  * @param {import("../Types.mjs").ScoreFilter} props.filter - the selected filter
  * @param {import("htm/preact").MutableRef<number>} props.sampleScrollPositionRef - the sample scroll position
  * @param {(position: number) => void} props.setSampleScrollPosition - sets the sample scroll position
+ * @param {import("htm/preact").MutableRef<HTMLElement>} props.sampleTabScrollRef - the sample scroll element
  * @param {any} props.sort - the selected sort
  *
  * @returns {import("preact").JSX.Element[]} The TranscriptView component.
@@ -54,6 +55,7 @@ export const SamplesTab = ({
   setSelectedSampleTab,
   sampleScrollPositionRef,
   setSampleScrollPosition,
+  sampleTabScrollRef,
 }) => {
   /** @type {[ListItem[], function(ListItem[]): void]} */
   const [items, setItems] = useState([]);
@@ -82,7 +84,7 @@ export const SamplesTab = ({
       setTimeout(() => {
         if (sampleListRef.current) {
           // @ts-ignore
-          sampleListRef.current.base.focus();
+          sampleListRef.current.focus();
         }
       }, 0);
     }
@@ -152,6 +154,7 @@ export const SamplesTab = ({
         sampleDescriptor=${sampleDescriptor}
         selectedTab=${selectedSampleTab}
         setSelectedTab=${setSelectedSampleTab}
+        scrollRef=${sampleTabScrollRef}
       />`,
     );
   } else if (sampleMode === "many") {

inspect_ai/_view/www/src/samples/SamplesTools.mjs

@@ -23,6 +23,14 @@ export const SampleTools = (props) => {
   const hasEpochs = epochs > 1;
   const tools = [];
 
+  tools.push(
+    html`<${SampleFilter}
+      evalDescriptor=${sampleDescriptor.evalDescriptor}
+      filter=${filter}
+      filterChanged=${filterChanged}
+    />`,
+  );
+
   if (scores.length > 1) {
     tools.push(
       html`<${SelectScorer}
@@ -43,14 +51,6 @@ export const SampleTools = (props) => {
     );
   }
 
-  tools.push(
-    html`<${SampleFilter}
-      filter=${filter}
-      filterChanged=${filterChanged}
-      descriptor=${sampleDescriptor}
-    />`,
-  );
-
   tools.push(
     html`<${SortFilter}
       sampleDescriptor=${sampleDescriptor}