inspect-ai 0.3.55__py3-none-any.whl → 0.3.57__py3-none-any.whl

inspect_ai/_view/www/src/components/MessageContent.mjs

@@ -52,7 +52,7 @@ const messageRenderers = {
         return html`<img
           src="${content.image}"
           style=${{
-            maxWidth: "400px",
+            maxWidth: "800px",
             border: "solid var(--bs-border-color) 1px",
           }}
         />`;

inspect_ai/_view/www/src/components/TabSet.mjs

@@ -44,7 +44,7 @@ export const TabPanel = ({
   children,
 }) => {
   const tabContentsId = computeTabContentsId(id, index);
-  const tabContentsRef = useRef();
+  const tabContentsRef = useRef(/** @type {HTMLElement|null} */ (null));
   useEffect(() => {
     setTimeout(() => {
       if (

inspect_ai/_view/www/src/components/Tools.mjs

@@ -51,7 +51,7 @@ export const resolveToolInput = (fn, toolArgs) => {
  * @param {string | undefined } props.input - The main input for this call
  * @param {string | undefined } props.inputType - The input type for this call
  * @param {import("../types/log").ToolCallContent} props.view - The tool call view
- * @param {string | number | boolean | (import("../types/log").ContentText | import("../types/log").ContentImage)[]} props.output - The tool output
+ * @param {string | number | boolean | import("../types/log").ContentText | import("../types/log").ContentImage | (import("../types/log").ContentText | import("../types/log").ContentImage)[]} props.output - The tool output
  * @param { "compact" | undefined } props.mode - The display mode for this call
  * @returns {import("preact").JSX.Element} The SampleTranscript component.
  */
@@ -63,6 +63,26 @@ export const ToolCallView = ({
   output,
   mode,
 }) => {
+  // don't collapse if output includes an image
+  function isContentImage(value) {
+    if (value && typeof value === "object") {
+      if (value.type === "image") {
+        return true;
+      } else if (value.type === "tool") {
+        if (
+          Array.isArray(value.content) &&
+          value.content.some(isContentImage)
+        ) {
+          return true;
+        }
+      }
+    }
+    return false;
+  }
+  const collapse = Array.isArray(output)
+    ? output.every((item) => !isContentImage(item))
+    : !isContentImage(output);
+
   return html`<div>
     ${mode !== "compact" && (!view || view.title)
       ? html`<${ToolTitle} title=${view?.title || functionCall} />`
@@ -77,7 +97,7 @@ export const ToolCallView = ({
         />
         ${output
           ? html`
-              <${ExpandablePanel} collapse=${true} border=${true} lines=${15}>
+              <${ExpandablePanel} collapse=${collapse} border=${true} lines=${15}>
               <${MessageContent} contents=${normalizeContent(output)} />
               </${ExpandablePanel}>`
           : ""}
@@ -107,7 +127,7 @@ const ToolTitle = ({ title }) => {
 /**
  * Renders the ToolCallView component.
  *
- * @param {string | number | boolean | (import("../types/log").ContentText | import("../types/log").ContentImage)[]} output - The tool output
+ * @param {string | number | boolean | import("../types/log").ContentImage | import("../types/log").ContentText | (import("../types/log").ContentText | import("../types/log").ContentImage)[]} output - The tool output
  * @returns {(import("../Types.mjs").ContentTool | import("../types/log").ContentText | import("../types/log").ContentImage)[]} The SampleTranscript component.
  */
 const normalizeContent = (output) => {
@@ -144,10 +164,13 @@ export const ToolInput = ({ type, contents, view, style }) => {
   }
 
   if (view) {
-    const toolInputRef = useRef(/** @type {HTMLElement|null} */ (null));
+    const toolInputRef = useRef(
+      /** @type {import("preact").Component & { base: Element }} */ (null),
+    );
     useEffect(() => {
       // Sniff around for code in the view that could be text highlighted
       if (toolInputRef.current) {
+        // @ts-expect-error: TS doesn't know that `HTMLCollection` is iterable.
         for (const child of toolInputRef.current.base.children) {
           if (child.tagName === "PRE") {
             const childChild = child.firstElementChild;
@@ -233,7 +256,7 @@ export const ToolOutput = ({ output, style }) => {
             html`<img
               src="${out.image}"
               style=${{
-                maxWidth: "100%",
+                maxWidth: "800px",
                 border: "solid var(--bs-border-color) 1px",
                 ...style,
               }}

inspect_ai/_view/www/src/components/VirtualList.mjs

@@ -10,32 +10,30 @@ const STYLE_CONTENT =
   "position:absolute; top:0; left:0; height:100%; width:100%; overflow:visible;";
 
 export class VirtualList extends Component {
+  /** @type {HTMLElement} */ base;
+
   constructor(props) {
     super(props);
     this.state = {
       height: 0,
       offset: 0,
     };
-    this.resize = this.resize.bind(this);
-    this.handleScroll = throttle(this.handleScroll.bind(this), 100);
+    this.resize = () => {
+      if (this.state.height !== this.base.offsetHeight) {
+        this.setState({ height: this.base.offsetHeight });
+      }
+    };
+    this.handleScroll = throttle(() => {
+      if (this.base) {
+        this.setState({ offset: this.base.scrollTop });
+      }
+      if (this.props.sync) {
+        this.forceUpdate();
+      }
+    }, 100);
     this.containerRef = createRef();
   }
 
-  resize() {
-    if (this.state.height !== this.base.offsetHeight) {
-      this.setState({ height: this.base.offsetHeight });
-    }
-  }
-
-  handleScroll() {
-    if (this.base) {
-      this.setState({ offset: this.base.scrollTop });
-    }
-    if (this.props.sync) {
-      this.forceUpdate();
-    }
-  }
-
   componentDidUpdate() {
     this.resize();
   }

inspect_ai/_view/www/src/log/remoteLogFile.mjs

@@ -6,7 +6,8 @@ import {
   openRemoteZipFile,
 } from "../utils/remoteZipFile.mjs";
 
-const MAX_BYTES = 12582912;
+// don't try to load samples greater than 50mb
+const MAX_BYTES = 50 * 1024 * 1024;
 
 /**
  * @typedef {Object} SampleEntry

inspect_ai/_view/www/src/navbar/Navbar.mjs

@@ -48,11 +48,13 @@ export const Navbar = ({
   if (status === "success") {
     statusPanel = html`<${ResultsPanel} results="${results}" />`;
   } else if (status === "cancelled") {
-    statusPanel = html`<${CanceledPanel}
+    statusPanel = html`<${CancelledPanel}
       sampleCount=${samples?.length || 0}
     />`;
   } else if (status === "started") {
-    statusPanel = html`<${RunningPanel} />`;
+    statusPanel = html`<${RunningPanel} sampleCount=${samples?.length || 0} />`;
+  } else if (status === "error") {
+    statusPanel = html`<${ErroredPanel} sampleCount=${samples?.length || 0} />`;
   }
 
   // If no logfile is loaded, just show an empty navbar
@@ -188,48 +190,54 @@ export const Navbar = ({
   `;
 };
 
-const CanceledPanel = ({ sampleCount }) => {
+const StatusPanel = ({ icon, status, sampleCount }) => {
   return html`<div
     style=${{
       padding: "1em",
       marginTop: "0.5em",
       textTransform: "uppercase",
       fontSize: FontSize.smaller,
+      display: "grid",
+      gridTemplateColumns: "auto auto",
     }}
   >
     <i
-      class="${ApplicationIcons.logging.info}"
-      style=${{ fontSize: FontSize.large, marginRight: "0.3em" }}
+      class="${icon}"
+      style=${{
+        fontSize: FontSize.large,
+        marginRight: "0.3em",
+        marginTop: "-0.1em",
+      }}
     />
-    cancelled (${sampleCount} ${sampleCount === 1 ? "sample" : "samples"})
+    <div>
+      <div>${status}</div>
+      <div>(${sampleCount} ${sampleCount === 1 ? "sample" : "samples"})</div>
+    </div>
   </div>`;
 };
 
-const RunningPanel = () => {
-  return html`
-    <div
-      style=${{
-        marginTop: "0.5em",
-        display: "inline-grid",
-        gridTemplateColumns: "max-content max-content",
-      }}
-    >
-      <div>
-        <i class=${ApplicationIcons.running} />
-      </div>
-      <div
-        style=${{
-          marginLeft: "0.3em",
-          paddingTop: "0.2em",
-          fontSize: FontSize.smaller,
-          ...TextStyle.label,
-          ...TextStyle.secondary,
-        }}
-      >
-        Running
-      </div>
-    </div>
-  `;
+const CancelledPanel = ({ sampleCount }) => {
+  return html`<${StatusPanel}
+    icon=${ApplicationIcons.logging.info}
+    status="Cancelled"
+    sampleCount=${sampleCount}
+  />`;
+};
+
+const ErroredPanel = ({ sampleCount }) => {
+  return html`<${StatusPanel}
+    icon=${ApplicationIcons.logging.error}
+    status="Task Failed"
+    sampleCount=${sampleCount}
+  />`;
+};
+
+const RunningPanel = ({ sampleCount }) => {
+  return html`<${StatusPanel}
+    icon=${ApplicationIcons.running}
+    status="Running"
+    sampleCount=${sampleCount}
+  />`;
 };
 
 const ResultsPanel = ({ results }) => {
@@ -298,6 +306,7 @@ const ResultsPanel = ({ results }) => {
  * @returns {import("preact").JSX.Element} The TranscriptView component.
  */
 const VerticalMetric = ({ metric, isFirst }) => {
+  // @ts-expect-error
   const reducer_component = metric.reducer
     ? html` <div
         style=${{
@@ -309,7 +318,10 @@ const VerticalMetric = ({ metric, isFirst }) => {
           ...TextStyle.secondary,
         }}
       >
-        ${metric.reducer}
+        ${
+          // @ts-expect-error
+          metric.reducer
+        }
       </div>`
     : "";
 

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

@@ -422,8 +422,7 @@ const SampleSummary = ({ parent_id, sample, style, sampleDescriptor }) => {
 
   const fullAnswer =
     sample && sampleDescriptor
-      ? // @ts-ignore
-        sampleDescriptor.selectedScorer(sample).answer()
+      ? sampleDescriptor.selectedScorerDescriptor(sample).answer()
       : undefined;
   if (fullAnswer) {
     columns.push({

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

@@ -17,7 +17,22 @@ import { inputString } from "../utils/Format.mjs";
 const kSampleHeight = 88;
 const kSeparatorHeight = 24;
 
-// Convert samples to a datastructure which contemplates grouping, etc...
+/**
+ * Convert samples to a datastructure which contemplates grouping, etc...
+ *
+ * @param {Object} props - The parameters for the component.
+ * @param {Object} props.listRef - The ref for the list.
+ * @param {import("./SamplesTab.mjs").ListItem[]} props.items - The samples.
+ * @param {import("../samples/SamplesDescriptor.mjs").SamplesDescriptor} props.sampleDescriptor - The sample descriptor.
+ * @param {Object} props.style - The style for the element
+ * @param {number} props.selectedIndex - The index of the selected sample.
+ * @param {(index: number) => void} props.setSelectedIndex - The function to set the selected sample index.
+ * @param {import("../Types.mjs").ScoreLabel} props.selectedScore - The function to get the selected score.
+ * @param {() => void} props.nextSample - The function to move to the next sample.
+ * @param {() => void} props.prevSample - The function to move to the previous sample.
+ * @param {(index: number) => void} props.showSample - The function to show the sample.
+ * @returns {import("preact").JSX.Element} The SampleList component.
+ */
 export const SampleList = (props) => {
   const {
     listRef,
@@ -93,6 +108,7 @@ export const SampleList = (props) => {
     }
   }, [selectedIndex, rowMap, listRef]);
 
+  /** @param {import("./SamplesTab.mjs").ListItem} item */
   const renderRow = (item) => {
     if (item.type === "sample") {
       return html`
@@ -145,7 +161,7 @@ export const SampleList = (props) => {
   );
 
   const listStyle = { ...style, flex: "1", overflowY: "auto", outline: "none" };
-  const { limit, answer, target } = gridColumns(sampleDescriptor);
+  const { input, limit, answer, target } = gridColumns(sampleDescriptor);
 
   const headerRow = html`<div
     style=${{
@@ -160,7 +176,7 @@ export const SampleList = (props) => {
     }}
   >
     <div>Id</div>
-    <div>Input</div>
+    <div>${input !== "0" ? "Input" : ""}</div>
     <div>${target !== "0" ? "Target" : ""}</div>
     <div>${answer !== "0" ? "Answer" : ""}</div>
     <div>${limit !== "0" ? "Limit" : ""}</div>
@@ -192,6 +208,7 @@ export const SampleList = (props) => {
   // Count any sample errors and display a bad alerting the user
   // to any errors
   const errorCount = items?.reduce((previous, item) => {
+    // @ts-expect-error
     if (item.data.error) {
       return previous + 1;
     } else {
@@ -201,6 +218,7 @@ export const SampleList = (props) => {
 
   // Count limits
   const limitCount = items?.reduce((previous, item) => {
+    // @ts-expect-error
     if (item.data.limit) {
       return previous + 1;
     } else {
@@ -260,6 +278,17 @@ const SeparatorRow = ({ id, title, height }) => {
   </div>`;
 };
 
+/**
+ * @param {Object} props - The parameters for the component.
+ * @param {string} props.id - The unique identifier for the sample.
+ * @param {number} props.index - The index of the sample.
+ * @param {import("../api/Types.mjs").SampleSummary} props.sample - The sample.
+ * @param {import("../samples/SamplesDescriptor.mjs").SamplesDescriptor} props.sampleDescriptor - The sample descriptor.
+ * @param {number} props.height - The height of the sample row.
+ * @param {boolean} props.selected - Whether the sample is selected.
+ * @param {(index: number) => void} props.showSample - The function to show the sample.
+ * @returns {import("preact").JSX.Element} The SampleRow component.
+ */
 const SampleRow = ({
   id,
   index,
@@ -339,7 +368,9 @@ const SampleRow = ({
         ${sample
           ? html`
               <${MarkdownDiv}
-                markdown=${sampleDescriptor?.selectedScorer(sample).answer()}
+                markdown=${sampleDescriptor
+                  ?.selectedScorerDescriptor(sample)
+                  .answer()}
                 style=${{ paddingLeft: "0" }}
                 class="no-last-para-padding"
               />

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

@@ -14,6 +14,14 @@ const labelStyle = {
   ...TextStyle.secondary,
 };
 
+/**
+ * @param {Object} props - The component props.
+ * @param {import("../types/log").EvalSample} props.sample - The sample.
+ * @param {import("../samples/SamplesDescriptor.mjs").SamplesDescriptor} props.sampleDescriptor - The sample descriptor.
+ * @param {Object} props.style - The style for the element.
+ * @param {string} props.scorer - The scorer.
+ * @returns {import("preact").JSX.Element} The SampleScoreView component.
+ */
 export const SampleScoreView = ({
   sample,
   sampleDescriptor,
@@ -21,7 +29,7 @@ export const SampleScoreView = ({
   scorer,
 }) => {
   if (!sampleDescriptor) {
-    return "";
+    return html``;
   }
 
   const scoreInput = inputString(sample.input);
@@ -34,7 +42,10 @@ export const SampleScoreView = ({
     );
   }
 
-  const scorerDescriptor = sampleDescriptor.scorer(sample, scorer);
+  const scorerDescriptor = sampleDescriptor.evalDescriptor.scorerDescriptor(
+    sample,
+    { scorer, name: scorer },
+  );
   const explanation = scorerDescriptor.explanation() || "(No Explanation)";
   const answer = scorerDescriptor.answer();
   const metadata = scorerDescriptor.metadata();

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

@@ -1,9 +1,18 @@
 import { html } from "htm/preact";
 
+/**
+ * @param {Object} props
+ * @param {import("../api/Types.mjs").SampleSummary} props.sample
+ * @param {import("../samples/SamplesDescriptor.mjs").SamplesDescriptor} props.sampleDescriptor
+ * @param {string} props.scorer
+ * @returns {import("preact").JSX.Element}
+ */
 export const SampleScores = ({ sample, sampleDescriptor, scorer }) => {
   const scores = scorer
-    ? sampleDescriptor.scorer(sample, scorer).scores()
-    : sampleDescriptor.selectedScorer(sample).scores();
+    ? sampleDescriptor.evalDescriptor
+        .scorerDescriptor(sample, { scorer, name: scorer })
+        .scores()
+    : sampleDescriptor.selectedScorerDescriptor(sample).scores();
 
   if (scores.length === 1) {
     return scores[0].rendered();