inspect-ai 0.3.90__py3-none-any.whl → 0.3.92__py3-none-any.whl

inspect_ai/_view/www/src/{samples → app/samples}/SampleDisplay.tsx

@@ -1,12 +1,12 @@
-import { TabPanel, TabSet } from "../components/TabSet";
-import { MetaDataView } from "../metadata/MetaDataView";
+import { TabPanel, TabSet } from "../../components/TabSet";
+import { MetaDataView } from "../content/MetaDataView";
 
-import { escapeSelector } from "../utils/html";
-import { isVscode } from "../utils/vscode";
+import { escapeSelector } from "../../utils/html";
+import { isVscode } from "../../utils/vscode";
 
+import { ANSIDisplay } from "../../components/AnsiDisplay";
+import { ToolButton } from "../../components/ToolButton";
 import { ApplicationIcons } from "../appearance/icons";
-import { ANSIDisplay } from "../components/AnsiDisplay";
-import { ToolButton } from "../components/ToolButton";
 
 import clsx from "clsx";
 import {
@@ -17,10 +17,12 @@ import {
   useCallback,
   useMemo,
 } from "react";
-import { SampleSummary } from "../api/types";
-import { Card, CardBody, CardHeader } from "../components/Card";
-import { JSONPanel } from "../components/JsonPanel";
-import { NoContentsPanel } from "../components/NoContentsPanel";
+import { useNavigate, useParams } from "react-router-dom";
+import { EvalSample, Events } from "../../@types/log";
+import { SampleSummary } from "../../client/api/types";
+import { Card, CardBody, CardHeader } from "../../components/Card";
+import { JSONPanel } from "../../components/JsonPanel";
+import { NoContentsPanel } from "../../components/NoContentsPanel";
 import {
   kSampleErrorTabId,
   kSampleJsonTabId,
@@ -28,13 +30,13 @@ import {
   kSampleMetdataTabId,
   kSampleScoringTabId,
   kSampleTranscriptTabId,
-} from "../constants";
-import { useSampleSummaries } from "../state/hooks";
-import { useStore } from "../state/store";
-import { EvalSample, Events } from "../types/log";
+} from "../../constants";
+import { useFilteredSamples, useSampleData } from "../../state/hooks";
+import { useStore } from "../../state/store";
+import { formatTime } from "../../utils/format";
+import { printHeadingHtml, printHtml } from "../../utils/print";
+import { sampleUrl } from "../routing/url";
 import { ModelTokenTable } from "../usage/ModelTokenTable";
-import { formatTime } from "../utils/format";
-import { printHeadingHtml, printHtml } from "../utils/print";
 import { ChatViewVirtualList } from "./chat/ChatViewVirtualList";
 import { messagesFromEvents } from "./chat/messages";
 import styles from "./SampleDisplay.module.css";
@@ -44,32 +46,38 @@ import { TranscriptVirtualList } from "./transcript/TranscriptView";
 
 interface SampleDisplayProps {
   id: string;
-  sample?: EvalSample;
-  selectedTab?: string;
-  setSelectedTab: (tab: string) => void;
   scrollRef: RefObject<HTMLDivElement | null>;
-  runningEvents?: Events;
 }
 
 /**
  * Component to display a sample with relevant context and visibility control.
  */
-export const SampleDisplay: FC<SampleDisplayProps> = ({
-  id,
-  sample,
-  selectedTab,
-  setSelectedTab,
-  scrollRef,
-  runningEvents: runningSampleData,
-}) => {
+export const SampleDisplay: FC<SampleDisplayProps> = ({ id, scrollRef }) => {
   // Tab ids
   const baseId = `sample-dialog`;
-  const sampleSummaries = useSampleSummaries();
+  const filteredSamples = useFilteredSamples();
   const selectedSampleIndex = useStore(
     (state) => state.log.selectedSampleIndex,
   );
 
-  const sampleSummary = sampleSummaries[selectedSampleIndex];
+  const sampleData = useSampleData();
+  const sample = sampleData.sample;
+  const runningSampleData = sampleData.running;
+
+  // Selected tab handling
+  const selectedTab = useStore((state) => state.app.tabs.sample);
+  const setSelectedTab = useStore((state) => state.appActions.setSampleTab);
+
+  // Get sample tab from URL if available
+  const { sampleTabId } = useParams<{ sampleTabId?: string }>();
+
+  // Use sampleTabId from URL if available, otherwise use the one from state
+  const effectiveSelectedTab = sampleTabId || selectedTab;
+
+  // Navigation hook for URL updates
+  const navigate = useNavigate();
+
+  const sampleSummary = filteredSamples[selectedSampleIndex];
 
   // Consolidate the events and messages into the proper list
   // whether running or not
@@ -84,13 +92,42 @@ export const SampleDisplay: FC<SampleDisplayProps> = ({
     }
   }, [sample?.messages, runningSampleData]);
 
+  // Get all URL parameters at component level
+  const {
+    logPath: urlLogPath,
+    tabId: urlTabId,
+    sampleId: urlSampleId,
+    epoch: urlEpoch,
+  } = useParams<{
+    logPath?: string;
+    tabId?: string;
+    sampleId?: string;
+    epoch?: string;
+  }>();
+
   // Tab selection
-  const onSelectedTab = (e: MouseEvent<HTMLElement>) => {
-    const el = e.currentTarget as HTMLElement;
-    const id = el.id;
-    setSelectedTab(id);
-    return false;
-  };
+  const onSelectedTab = useCallback(
+    (e: MouseEvent<HTMLElement>) => {
+      const el = e.currentTarget as HTMLElement;
+      const id = el.id;
+      setSelectedTab(id);
+
+      // Use navigation hook to update URL with tab
+      if (id !== sampleTabId && urlLogPath) {
+        const url = sampleUrl(urlLogPath, urlSampleId, urlEpoch, id);
+        navigate(url);
+      }
+    },
+    [
+      sampleTabId,
+      urlLogPath,
+      urlTabId,
+      urlSampleId,
+      urlEpoch,
+      navigate,
+      setSelectedTab,
+    ],
+  );
 
   const sampleMetadatas = metadataViewsForSample(`${baseId}-${id}`, sample);
 
@@ -134,7 +171,8 @@ export const SampleDisplay: FC<SampleDisplayProps> = ({
           title="Transcript"
           onSelected={onSelectedTab}
           selected={
-            selectedTab === kSampleTranscriptTabId || selectedTab === undefined
+            effectiveSelectedTab === kSampleTranscriptTabId ||
+            effectiveSelectedTab === undefined
           }
           scrollable={false}
         >
@@ -152,7 +190,7 @@ export const SampleDisplay: FC<SampleDisplayProps> = ({
           className={clsx("sample-tab", styles.fullWidth, styles.chat)}
           title="Messages"
           onSelected={onSelectedTab}
-          selected={selectedTab === kSampleMessagesTabId}
+          selected={effectiveSelectedTab === kSampleMessagesTabId}
           scrollable={false}
         >
           <ChatViewVirtualList
@@ -171,7 +209,7 @@ export const SampleDisplay: FC<SampleDisplayProps> = ({
           className="sample-tab"
           title="Scoring"
           onSelected={onSelectedTab}
-          selected={selectedTab === kSampleScoringTabId}
+          selected={effectiveSelectedTab === kSampleScoringTabId}
         >
           <SampleScoresView sample={sample} />
         </TabPanel>
@@ -180,7 +218,7 @@ export const SampleDisplay: FC<SampleDisplayProps> = ({
           className={clsx("sample-tab")}
           title="Metadata"
           onSelected={onSelectedTab}
-          selected={selectedTab === kSampleMetdataTabId}
+          selected={effectiveSelectedTab === kSampleMetdataTabId}
         >
           {sampleMetadatas.length > 0 ? (
             <div className={clsx(styles.metadataPanel)}>{sampleMetadatas}</div>
@@ -188,19 +226,48 @@ export const SampleDisplay: FC<SampleDisplayProps> = ({
             <NoContentsPanel text="No metadata" />
           )}
         </TabPanel>
-        {sample?.error ? (
+        {sample?.error ||
+        (sample?.error_retries && sample?.error_retries.length > 0) ? (
           <TabPanel
             id={kSampleErrorTabId}
             className="sample-tab"
-            title="Error"
+            title="Errors"
             onSelected={onSelectedTab}
-            selected={selectedTab === kSampleErrorTabId}
+            selected={effectiveSelectedTab === kSampleErrorTabId}
           >
-            <div className={clsx(styles.padded)}>
-              <ANSIDisplay
-                output={sample.error.traceback_ansi}
-                className={clsx("text-size-small", styles.ansi)}
-              />
+            <div className={clsx(styles.error)}>
+              {sample?.error ? (
+                <Card key={`sample-error}`}>
+                  <CardHeader label={`Sample Error`} />
+                  <CardBody>
+                    <ANSIDisplay
+                      output={sample.error.traceback_ansi}
+                      className={clsx("text-size-small", styles.ansi)}
+                      style={{
+                        fontSize: "clamp(0.4rem, calc(0.15em + 1vw), 0.8rem)",
+                        margin: "0.5em 0",
+                      }}
+                    />
+                  </CardBody>
+                </Card>
+              ) : undefined}
+              {sample.error_retries?.map((retry, index) => {
+                return (
+                  <Card key={`sample-retry-error-${index}`}>
+                    <CardHeader label={`Attempt ${index + 1}`} />
+                    <CardBody>
+                      <ANSIDisplay
+                        output={retry.traceback_ansi}
+                        className={clsx("text-size-small", styles.ansi)}
+                        style={{
+                          fontSize: "clamp(0.4rem, calc(0.15em + 1vw), 0.8rem)",
+                          margin: "0.5em 0",
+                        }}
+                      />
+                    </CardBody>
+                  </Card>
+                );
+              })}
             </div>
           </TabPanel>
         ) : null}
@@ -209,7 +276,7 @@ export const SampleDisplay: FC<SampleDisplayProps> = ({
           className={"sample-tab"}
           title="JSON"
           onSelected={onSelectedTab}
-          selected={selectedTab === kSampleJsonTabId}
+          selected={effectiveSelectedTab === kSampleJsonTabId}
         >
           {!sample ? (
             <NoContentsPanel text="JSON not available" />

inspect_ai/_view/www/src/{samples → app/samples}/SampleSummaryView.module.css

@@ -8,7 +8,7 @@
 
 .grid {
   display: grid;
-  grid-column-gap: 0.5em;
+  grid-column-gap: 1em;
   border-bottom: solid var(--bs-border-color) 1px;
   margin-bottom: 1em;
   padding: 0em 1em 1em 1em;

inspect_ai/_view/www/src/{samples → app/samples}/SampleSummaryView.tsx

@@ -1,12 +1,12 @@
 import clsx from "clsx";
-import { MarkdownDiv } from "../components/MarkdownDiv";
-import { EvalSample, Target, TotalTime, WorkingTime } from "../types/log";
-import { arrayToString, formatTime, inputString } from "../utils/format";
+import { EvalSample, Target, TotalTime, WorkingTime } from "../../@types/log";
+import { MarkdownDiv } from "../../components/MarkdownDiv";
+import { arrayToString, formatTime, inputString } from "../../utils/format";
 import { FlatSampleError } from "./error/FlatSampleErrorView";
 
 import { FC, ReactNode } from "react";
-import { SampleSummary } from "../api/types";
-import { useSampleDescriptor, useScore } from "../state/hooks";
+import { SampleSummary } from "../../client/api/types";
+import { useSampleDescriptor, useScore } from "../../state/hooks";
 import styles from "./SampleSummaryView.module.css";
 import { SamplesDescriptor } from "./descriptor/samplesDescriptor";
 
@@ -30,6 +30,7 @@ interface SampleFields {
   target: Target;
   answer?: string;
   limit?: string;
+  retries?: number;
   working_time?: WorkingTime;
   total_time?: TotalTime;
   error?: string;
@@ -38,7 +39,7 @@ interface SampleFields {
 function isEvalSample(
   sample: SampleSummary | EvalSample,
 ): sample is EvalSample {
-  return "choices" in sample && Array.isArray((sample as EvalSample).choices);
+  return "store" in sample;
 }
 
 const resolveSample = (
@@ -64,6 +65,9 @@ const resolveSample = (
   const working_time = isEvalSample(sample) ? sample.working_time : undefined;
   const total_time = isEvalSample(sample) ? sample.total_time : undefined;
   const error = isEvalSample(sample) ? sample.error?.message : undefined;
+  const retries = isEvalSample(sample)
+    ? sample.error_retries?.length
+    : sample.retries;
 
   return {
     id: sample.id,
@@ -71,6 +75,7 @@ const resolveSample = (
     target,
     answer,
     limit,
+    retries,
     working_time,
     total_time,
     error,
@@ -91,23 +96,12 @@ export const SampleSummaryView: FC<SampleSummaryViewProps> = ({
   }
   const fields = resolveSample(sample, sampleDescriptor);
 
-  const input =
-    sampleDescriptor?.messageShape.normalized.input > 0
-      ? Math.max(0.15, sampleDescriptor.messageShape.normalized.input)
-      : 0;
-  const target =
-    sampleDescriptor?.messageShape.normalized.target > 0
-      ? Math.max(0.15, sampleDescriptor.messageShape.normalized.target)
-      : 0;
-  const answer =
-    sampleDescriptor?.messageShape.normalized.answer > 0
-      ? Math.max(0.15, sampleDescriptor.messageShape.normalized.answer)
-      : 0;
   const limitSize =
     sampleDescriptor?.messageShape.normalized.limit > 0
       ? Math.max(0.15, sampleDescriptor.messageShape.normalized.limit)
       : 0;
-  const timeSize = fields.working_time || fields.total_time ? 0.15 : 0;
+  const retrySize =
+    sampleDescriptor?.messageShape.normalized.retries > 0 ? 6 : 0;
   const idSize = Math.max(
     2,
     Math.min(10, sampleDescriptor?.messageShape.raw.id),
@@ -124,7 +118,7 @@ export const SampleSummaryView: FC<SampleSummaryViewProps> = ({
   columns.push({
     label: "Input",
     value: <MarkdownDiv markdown={fields.input.join(" ")} />,
-    size: `${input}fr`,
+    size: `minmax(auto, 5fr)`,
     clamp: true,
   });
 
@@ -137,7 +131,7 @@ export const SampleSummaryView: FC<SampleSummaryViewProps> = ({
           className={clsx("no-last-para-padding", styles.target)}
         />
       ),
-      size: `${target}fr`,
+      size: `minmax(auto, 3fr)`,
       clamp: true,
     });
   }
@@ -147,13 +141,13 @@ export const SampleSummaryView: FC<SampleSummaryViewProps> = ({
       label: "Answer",
       value: sample ? (
         <MarkdownDiv
-          markdown={fields.answer}
+          markdown={fields.answer || ""}
           className={clsx("no-last-para-padding", styles.answer)}
         />
       ) : (
         ""
       ),
-      size: `${answer}fr`,
+      size: `minmax(auto, 5fr)`,
       clamp: true,
     });
   }
@@ -169,7 +163,7 @@ export const SampleSummaryView: FC<SampleSummaryViewProps> = ({
     columns.push({
       label: "Time",
       value: formatTime(fields.total_time),
-      size: `${timeSize}fr`,
+      size: `fit-content(10rem)`,
       center: true,
       title: toolTip(fields.working_time),
     });
@@ -179,7 +173,16 @@ export const SampleSummaryView: FC<SampleSummaryViewProps> = ({
     columns.push({
       label: "Limit",
       value: fields.limit,
-      size: `${limitSize}fr`,
+      size: `fit-content(10rem)`,
+      center: true,
+    });
+  }
+
+  if (fields?.retries && retrySize > 0) {
+    columns.push({
+      label: "Retries",
+      value: fields.retries,
+      size: `fit-content(${retrySize}rem)`,
       center: true,
     });
   }
@@ -192,7 +195,7 @@ export const SampleSummaryView: FC<SampleSummaryViewProps> = ({
       sampleDescriptor?.evalDescriptor.score(sample, currentScore)?.render() ||
       ""
     ),
-    size: "minmax(2em, 30em)",
+    size: "fit-content(15em)",
     center: true,
   });
 

inspect_ai/_view/www/src/{samples → app/samples}/SamplesTools.tsx

@@ -1,8 +1,8 @@
 import { FC } from "react";
 import { Fragment } from "react/jsx-runtime";
-import { SampleSummary } from "../api/types";
-import { useScore, useScores } from "../state/hooks";
-import { useStore } from "../state/store";
+import { SampleSummary } from "../../client/api/types";
+import { useScore, useScores } from "../../state/hooks";
+import { useStore } from "../../state/store";
 import { EpochFilter } from "./sample-tools/EpochFilter";
 import { SampleFilter } from "./sample-tools/sample-filter/SampleFilter";
 import { SelectScorer } from "./sample-tools/SelectScorer";

inspect_ai/_view/www/src/{samples → app/samples}/chat/ChatMessage.module.css

@@ -1,11 +1,14 @@
 .message {
   font-weight: 300;
-  padding-bottom: 0.5em;
   margin-left: 0;
   margin-right: 0;
   white-space: normal;
 }
 
+.padded {
+  padding-bottom: 1em;
+}
+
 .systemRole {
   opacity: 0.7;
 }
@@ -15,7 +18,7 @@
   grid-template-columns: max-content auto;
   column-gap: 0.3em;
   font-weight: 500;
-  margin-bottom: 0.5em;
+  margin-bottom: 0.3em;
 }
 
 .messageContents {

inspect_ai/_view/www/src/{samples → app/samples}/chat/ChatMessage.tsx

@@ -1,22 +1,24 @@
 import clsx from "clsx";
 import { FC } from "react";
-import ExpandablePanel from "../../components/ExpandablePanel";
 import {
   ChatMessageAssistant,
   ChatMessageSystem,
   ChatMessageTool,
   ChatMessageUser,
-} from "../../types/log";
+} from "../../../@types/log";
+import ExpandablePanel from "../../../components/ExpandablePanel";
 import styles from "./ChatMessage.module.css";
 import { MessageContents } from "./MessageContents";
 import { iconForMsg } from "./messages";
+import { ChatViewToolCallStyle } from "./types";
 
 interface ChatMessageProps {
   id: string;
   message: ChatMessageAssistant | ChatMessageSystem | ChatMessageUser;
   toolMessages: ChatMessageTool[];
   indented?: boolean;
-  toolCallStyle: "compact" | "complete";
+  toolCallStyle: ChatViewToolCallStyle;
+  padded?: boolean;
 }
 
 export const ChatMessage: FC<ChatMessageProps> = ({
@@ -25,6 +27,7 @@ export const ChatMessage: FC<ChatMessageProps> = ({
   toolMessages,
   indented,
   toolCallStyle,
+  padded,
 }) => {
   const collapse = message.role === "system" || message.role === "user";
   return (
@@ -33,6 +36,7 @@ export const ChatMessage: FC<ChatMessageProps> = ({
         message.role,
         "text-size-base",
         styles.message,
+        padded ? styles.padded : undefined,
         message.role === "system" ? styles.systemRole : undefined,
       )}
     >
@@ -46,7 +50,11 @@ export const ChatMessage: FC<ChatMessageProps> = ({
           indented ? styles.indented : undefined,
         )}
       >
-        <ExpandablePanel id={`${id}-message`} collapse={collapse} lines={15}>
+        <ExpandablePanel
+          id={`${id}-message`}
+          collapse={collapse}
+          lines={collapse ? 15 : 25}
+        >
           <MessageContents
             id={`${id}-contents`}
             key={`${id}-contents`}

inspect_ai/_view/www/src/{samples → app/samples}/chat/ChatMessageRenderer.tsx

@@ -1,12 +1,12 @@
 import { FC } from "react";
-import { NavPills } from "../../components/NavPills.tsx";
-import { Buckets, ContentRenderer } from "../../metadata/types.ts";
 import {
   ChatMessageAssistant,
   ChatMessageSystem,
   ChatMessageTool,
   ChatMessageUser,
-} from "../../types/log";
+} from "../../../@types/log";
+import { NavPills } from "../../../components/NavPills.tsx";
+import { Buckets, ContentRenderer } from "../../content/types.ts";
 import { ChatView } from "./ChatView";
 
 /**

inspect_ai/_view/www/src/{samples → app/samples}/chat/ChatMessageRow.tsx

@@ -4,13 +4,15 @@ import { ChatMessage } from "./ChatMessage";
 import { FC } from "react";
 import styles from "./ChatMessageRow.module.css";
 import { ResolvedMessage } from "./messages";
+import { ChatViewToolCallStyle } from "./types";
 
 interface ChatMessageRowProps {
   parentName: string;
   number?: number;
   resolvedMessage: ResolvedMessage;
-  toolCallStyle: "compact" | "complete";
+  toolCallStyle: ChatViewToolCallStyle;
   indented?: boolean;
+  padded?: boolean;
 }
 
 /**
@@ -22,6 +24,7 @@ export const ChatMessageRow: FC<ChatMessageRowProps> = ({
   resolvedMessage,
   toolCallStyle,
   indented,
+  padded,
 }) => {
   if (number) {
     return (
@@ -41,6 +44,7 @@ export const ChatMessageRow: FC<ChatMessageRowProps> = ({
           toolMessages={resolvedMessage.toolMessages}
           indented={indented}
           toolCallStyle={toolCallStyle}
+          padded={padded}
         />
       </div>
     );
@@ -52,6 +56,7 @@ export const ChatMessageRow: FC<ChatMessageRowProps> = ({
         toolMessages={resolvedMessage.toolMessages}
         indented={indented}
         toolCallStyle={toolCallStyle}
+        padded={padded}
       />
     );
   }

inspect_ai/_view/www/src/{samples → app/samples}/chat/ChatView.tsx

@@ -1,13 +1,14 @@
 import clsx from "clsx";
 import { FC } from "react";
-import { Messages } from "../../types/log";
+import { Messages } from "../../../@types/log";
 import { ChatMessageRow } from "./ChatMessageRow";
 import { resolveMessages } from "./messages";
+import { ChatViewToolCallStyle } from "./types";
 
 interface ChatViewProps {
   id?: string;
   messages: Messages;
-  toolCallStyle?: "compact" | "complete";
+  toolCallStyle?: ChatViewToolCallStyle;
   title?: string;
   indented?: boolean;
   numbered?: boolean;
@@ -39,6 +40,7 @@ export const ChatView: FC<ChatViewProps> = ({
             resolvedMessage={msg}
             indented={indented}
             toolCallStyle={toolCallStyle}
+            padded={index < collapsedMessages.length - 1}
           />
         );
       })}

inspect_ai/_view/www/src/{samples → app/samples}/chat/ChatViewVirtualList.tsx

@@ -1,16 +1,17 @@
 import { FC, memo, ReactNode, RefObject, useMemo } from "react";
-import { Messages } from "../../types/log";
+import { Messages } from "../../../@types/log";
 
 import { ChatMessageRow } from "./ChatMessageRow";
 import { ResolvedMessage, resolveMessages } from "./messages";
 
-import { LiveVirtualList } from "../../components/LiveVirtualList";
+import { LiveVirtualList } from "../../../components/LiveVirtualList";
+import { ChatViewToolCallStyle } from "./types";
 
 interface ChatViewVirtualListProps {
   id: string;
   className?: string | string[];
   messages: Messages;
-  toolCallStyle: "compact" | "complete";
+  toolCallStyle: ChatViewToolCallStyle;
   indented: boolean;
   numbered?: boolean;
   scrollRef?: RefObject<HTMLDivElement | null>;
@@ -46,6 +47,7 @@ export const ChatViewVirtualList: FC<ChatViewVirtualListProps> = memo(
           resolvedMessage={item}
           indented={indented}
           toolCallStyle={toolCallStyle}
+          padded={index < collapsedMessages.length - 1}
         />
       );
     };

inspect_ai/_view/www/src/app/samples/chat/MessageContent.module.css

@@ -0,0 +1,12 @@
+.contentImage {
+  max-width: 800px;
+  border: solid var(--bs-border-color) 1px;
+}
+
+.reasoning {
+  border: solid var(--bs-light-border-subtle) 1px;
+  padding: 1em;
+  margin-bottom: 0.5em;
+  background-color: var(--bs-light-bg-subtle);
+  border-radius: var(--bs-border-radius);
+}