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

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

@@ -21,12 +21,12 @@ import {
  * Represents a utility summary of the samples that doesn't change with the selected score.
  * @typedef {Object} EvalDescriptor
  * @property {number} epochs - The number of epochs.
- * @property {import("../api/Types.mjs").SampleSummary[]} samples - The list of sample summaries.
+ * @property {import("../api/Types.ts").SampleSummary[]} samples - The list of sample summaries.
  * @property {import("../Types.mjs").ScoreLabel[]} scores - the list of available scores
- * @property {(sample: import("../api/Types.mjs").BasicSampleData, scoreLabel: import("../Types.mjs").ScoreLabel) => ScorerDescriptor} scorerDescriptor - Returns the scorer descriptor for a sample and a specified scorer.
+ * @property {(sample: import("../api/Types.ts").BasicSampleData, scoreLabel: import("../Types.mjs").ScoreLabel) => ScorerDescriptor} scorerDescriptor - Returns the scorer descriptor for a sample and a specified scorer.
  * @property {(scoreLabel: import("../Types.mjs").ScoreLabel) => ScoreDescriptor} scoreDescriptor - Provides information about the score types and how to render them.
- * @property {(sample: import("../api/Types.mjs").BasicSampleData, scoreLabel: import("../Types.mjs").ScoreLabel) => SelectedScore} score - Returns information about a score for a sample.
- * @property {(sample: import("../api/Types.mjs").BasicSampleData, scorer: string) => string} scoreAnswer - Returns the answer for a sample and a specified scorer.
+ * @property {(sample: import("../api/Types.ts").BasicSampleData, scoreLabel: import("../Types.mjs").ScoreLabel) => SelectedScore} score - Returns information about a score for a sample.
+ * @property {(sample: import("../api/Types.ts").BasicSampleData, scorer: string) => string} scoreAnswer - Returns the answer for a sample and a specified scorer.
  */
 
 /**
@@ -35,8 +35,8 @@ import {
  * @property {EvalDescriptor} evalDescriptor - The EvalDescriptor.
  * @property {MessageShape} messageShape - The normalized sizes of input, target, and answer messages.
  * @property {ScoreDescriptor} selectedScoreDescriptor - Provides information about the score types and how to render them.
- * @property {(sample: import("../api/Types.mjs").BasicSampleData) => SelectedScore} selectedScore - Returns the selected score for a sample.
- * @property {(sample: import("../api/Types.mjs").BasicSampleData) => ScorerDescriptor} selectedScorerDescriptor - Returns the scorer descriptor for a sample using the selected scorer.
+ * @property {(sample: import("../api/Types.ts").BasicSampleData) => SelectedScore} selectedScore - Returns the selected score for a sample.
+ * @property {(sample: import("../api/Types.ts").BasicSampleData) => ScorerDescriptor} selectedScorerDescriptor - Returns the scorer descriptor for a sample using the selected scorer.
  */
 
 /**
@@ -83,9 +83,32 @@ 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
+ * @param {import("../api/Types.ts").SampleSummary[]} samples - the list of sample summaries
  * @param {number} epochs - The number of epochs
  * @returns {EvalDescriptor} The EvalDescriptor
  */
@@ -95,7 +118,7 @@ export const createEvalDescriptor = (scores, samples, epochs) => {
   }
 
   /**
-   * @param {import("../api/Types.mjs").BasicSampleData} sample - the currently selected score
+   * @param {import("../api/Types.ts").BasicSampleData} sample - the currently selected score
    * @param {import("../Types.mjs").ScoreLabel} scoreLabel - the score label
    * @returns {import("../types/log").Value2} The Score
    */
@@ -119,7 +142,7 @@ export const createEvalDescriptor = (scores, samples, epochs) => {
   };
 
   /**
-   * @param {import("../api/Types.mjs").BasicSampleData} sample - the currently selected score
+   * @param {import("../api/Types.ts").BasicSampleData} sample - the currently selected score
    * @param {string} scorer - the scorer name
    * @returns {string} The answer
    */
@@ -135,7 +158,7 @@ export const createEvalDescriptor = (scores, samples, epochs) => {
   };
 
   /**
-   * @param {import("../api/Types.mjs").BasicSampleData} sample - the currently selected score
+   * @param {import("../api/Types.ts").BasicSampleData} sample - the currently selected score
    * @param {string} scorer - the scorer name
    * @returns {string} The explanation
    */
@@ -151,7 +174,7 @@ export const createEvalDescriptor = (scores, samples, epochs) => {
 
   // Retrieve the metadata for a sample
   /**
-   * @param {import("../api/Types.mjs").BasicSampleData} sample - the currently selected score
+   * @param {import("../api/Types.ts").BasicSampleData} sample - the currently selected score
    * @param {string} scorer - the scorer name
    * @returns {Object} The explanation
    */
@@ -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>}
@@ -236,7 +248,7 @@ export const createEvalDescriptor = (scores, samples, epochs) => {
   };
 
   /**
-   * @param {import("../api/Types.mjs").BasicSampleData} sample
+   * @param {import("../api/Types.ts").BasicSampleData} sample
    * @param {import("../Types.mjs").ScoreLabel} scoreLabel
    * @returns {any}
    */
@@ -253,7 +265,7 @@ export const createEvalDescriptor = (scores, samples, epochs) => {
   };
 
   /**
-   * @param {import("../api/Types.mjs").BasicSampleData} sample
+   * @param {import("../api/Types.ts").BasicSampleData} sample
    * @param {import("../Types.mjs").ScoreLabel} scoreLabel
    * @returns {ScorerDescriptor}
    */
@@ -336,7 +348,7 @@ export const createEvalDescriptor = (scores, samples, epochs) => {
   };
 
   /**
-   * @param {import("../api/Types.mjs").BasicSampleData} sample
+   * @param {import("../api/Types.ts").BasicSampleData} sample
    * @param {import("../Types.mjs").ScoreLabel} scoreLabel
    * @returns {SelectedScore}
    */
@@ -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

@@ -13,7 +13,7 @@ import { EmptyPanel } from "../components/EmptyPanel.mjs";
  * @param {Object} props - The parameters for the component.
  * @param {import("../types/log").Sample} [props.sample] - The sample
  * @param {string} [props.task_id] - The task id
- * @param {import("../api/Types.mjs").SampleSummary[]} [props.samples] - the samples
+ * @param {import("../api/Types.ts").SampleSummary[]} [props.samples] - the samples
  * @param {import("../Types.mjs").SampleMode} props.sampleMode - the mode for displaying samples
  * @param {"epoch" | "sample" | "none" } props.groupBy - how to group items
  * @param {"asc" | "desc" } props.groupByOrder - whether grouping is ascending or descending
@@ -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") {
@@ -210,19 +213,19 @@ export const SamplesTab = ({
  * @property {string} label - The label for the sample, formatted as "Sample {group} (Epoch {item})".
  * @property {number} number - The current counter item value.
  * @property {number} index - The index of the sample.
- * @property {import("../api/Types.mjs").SampleSummary | string} data - The items data payload.
+ * @property {import("../api/Types.ts").SampleSummary | string} data - The items data payload.
  * @property {string} type - The type of the result, in this case, "sample". (or "separator")
  */
 
 /**
  * Perform any grouping of the samples
  *
- * @param {import("../api/Types.mjs").SampleSummary[]} samples - the list of sample summaries
+ * @param {import("../api/Types.ts").SampleSummary[]} samples - the list of sample summaries
  * @param {"sample" | "epoch" | "none"} groupBy - how to group samples
  * @param {"asc" | "desc"} groupByOrder - how to order grouped samples
  * @param {import("../samples/SamplesDescriptor.mjs").SamplesDescriptor} sampleDescriptor - the sample descriptor
  
- * @returns {(sample: import("../api/Types.mjs").SampleSummary, index: number, previousSample: import("../api/Types.mjs").SampleSummary) => ListItem[]} The list items
+ * @returns {(sample: import("../api/Types.ts").SampleSummary, index: number, previousSample: import("../api/Types.ts").SampleSummary) => ListItem[]} The list items
  */
 const getSampleProcessor = (
   samples,
@@ -243,9 +246,9 @@ const getSampleProcessor = (
 /**
  * Performs no grouping
  *
- * @param {import("../api/Types.mjs").SampleSummary[]} samples - the list of sample summaries
+ * @param {import("../api/Types.ts").SampleSummary[]} samples - the list of sample summaries
  * @param {string} order - the selected order
- * @returns {(sample: import("../api/Types.mjs").SampleSummary, index: number, previousSample: import("../api/Types.mjs").SampleSummary) => ListItem[]} The list
+ * @returns {(sample: import("../api/Types.ts").SampleSummary, index: number, previousSample: import("../api/Types.ts").SampleSummary) => ListItem[]} The list
  */
 const noGrouping = (samples, order) => {
   const counter = getCounter(samples.length, 1, order);
@@ -267,10 +270,10 @@ const noGrouping = (samples, order) => {
 /**
  * Groups by sample (showing separators for Epochs)
  *
- * @param {import("../api/Types.mjs").SampleSummary[]} samples - the list of sample summaries
+ * @param {import("../api/Types.ts").SampleSummary[]} samples - the list of sample summaries
  * @param {string} order - the selected order
  * @param {import("../samples/SamplesDescriptor.mjs").SamplesDescriptor} sampleDescriptor - the sample descriptor
- * @returns {(sample: import("../api/Types.mjs").SampleSummary, index: number, previousSample: import("../api/Types.mjs").SampleSummary) => ListItem[]} The list
+ * @returns {(sample: import("../api/Types.ts").SampleSummary, index: number, previousSample: import("../api/Types.ts").SampleSummary) => ListItem[]} The list
  */
 const groupBySample = (samples, sampleDescriptor, order) => {
   // ensure that we are sorted by id
@@ -324,10 +327,10 @@ const groupBySample = (samples, sampleDescriptor, order) => {
 /**
  * Groups by epoch (showing a separator for each sample)
  *
- * @param {import("../api/Types.mjs").SampleSummary[]} samples - the list of sample summaries
+ * @param {import("../api/Types.ts").SampleSummary[]} samples - the list of sample summaries
  * @param {string} order - the selected order
  * @param {import("../samples/SamplesDescriptor.mjs").SamplesDescriptor} sampleDescriptor - the sample descriptor
- * @returns {(sample: import("../api/Types.mjs").SampleSummary, index: number, previousSample: import("../api/Types.mjs").SampleSummary) => ListItem[]} The list
+ * @returns {(sample: import("../api/Types.ts").SampleSummary, index: number, previousSample: import("../api/Types.ts").SampleSummary) => ListItem[]} The list
  */
 const groupByEpoch = (samples, sampleDescriptor, order) => {
   const groupCount = sampleDescriptor.evalDescriptor.epochs;

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}