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

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

@@ -4,22 +4,23 @@ import "prismjs/components/prism-python";
 
 import clsx from "clsx";
 import { FC, Fragment, useMemo } from "react";
-import { ApplicationIcons } from "../../appearance/icons";
-import { MetaDataGrid } from "../../metadata/MetaDataGrid";
 import {
   ModelCall,
   ModelEvent,
   Request,
   Response,
+  ToolChoice,
   Tools1,
-} from "../../types/log";
+} from "../../../@types/log";
+import { ApplicationIcons } from "../../appearance/icons";
+import { MetaDataGrid } from "../../content/MetaDataGrid";
 import { ModelUsagePanel } from "../../usage/ModelUsagePanel";
 import { ChatView } from "../chat/ChatView";
 import { EventPanel } from "./event/EventPanel";
 import { EventSection } from "./event/EventSection";
 
-import { PulsingDots } from "../../components/PulsingDots";
-import { usePrismHighlight } from "../../state/hooks";
+import { PulsingDots } from "../../../components/PulsingDots";
+import { usePrismHighlight } from "../../../state/hooks";
 import styles from "./ModelEventView.module.css";
 import { EventTimingPanel } from "./event/EventTimingPanel";
 import { formatTiming, formatTitle } from "./event/utils";
@@ -48,7 +49,6 @@ export const ModelEventView: FC<ModelEventViewProps> = ({
   });
 
   const entries: Record<string, unknown> = { ...event.config };
-  entries["tool_choice"] = event.tool_choice;
   delete entries["max_connections"];
 
   // For any user messages which immediately preceded this model call, including a
@@ -56,7 +56,7 @@ export const ModelEventView: FC<ModelEventViewProps> = ({
   // are already shown in the tool call above)
   const userMessages = [];
   for (const msg of event.input.slice().reverse()) {
-    if (msg.role === "user" && !msg.tool_call_id) {
+    if ((msg.role === "user" && !msg.tool_call_id) || msg.role === "system") {
       userMessages.push(msg);
     } else {
       break;
@@ -79,9 +79,8 @@ export const ModelEventView: FC<ModelEventViewProps> = ({
         <ChatView
           id={`${id}-model-output`}
           messages={[...userMessages, ...(outputMessages || [])]}
-          className={clsx(styles.output)}
           numbered={false}
-          toolCallStyle="compact"
+          toolCallStyle="omit"
         />
         {event.pending ? (
           <div className={clsx(styles.progress)}>
@@ -91,9 +90,14 @@ export const ModelEventView: FC<ModelEventViewProps> = ({
       </div>
       <div data-name="All" className={styles.container}>
         <div className={styles.all}>
-          <EventSection title="Configuration" className={styles.tableSelection}>
-            <MetaDataGrid entries={entries} plain={true} />
-          </EventSection>
+          {Object.keys(entries).length > 0 && (
+            <EventSection
+              title="Configuration"
+              className={styles.tableSelection}
+            >
+              <MetaDataGrid entries={entries} plain={true} />
+            </EventSection>
+          )}
 
           <EventSection title="Usage" className={styles.tableSelection}>
             {event.output.usage !== null ? (
@@ -109,13 +113,6 @@ export const ModelEventView: FC<ModelEventViewProps> = ({
               working_time={event.working_time}
             />
           </EventSection>
-
-          <EventSection
-            title="Tools"
-            className={clsx(styles.tableSelection, styles.tools)}
-          >
-            <ToolsConfig tools={event.tools} />
-          </EventSection>
         </div>
 
         <EventSection title="Messages">
@@ -126,6 +123,12 @@ export const ModelEventView: FC<ModelEventViewProps> = ({
         </EventSection>
       </div>
 
+      {event.tools.length > 1 && (
+        <div data-name="Tools" className={styles.container}>
+          <ToolsConfig tools={event.tools} toolChoice={event.tool_choice} />
+        </div>
+      )}
+
       {event.call ? (
         <APIView
           data-name="API"
@@ -192,9 +195,10 @@ export const APICodeCell: FC<APICodeCellProps> = ({ id, contents }) => {
 
 interface ToolConfigProps {
   tools: Tools1;
+  toolChoice: ToolChoice;
 }
 
-const ToolsConfig: FC<ToolConfigProps> = ({ tools }) => {
+const ToolsConfig: FC<ToolConfigProps> = ({ tools, toolChoice }) => {
   const toolEls = tools.map((tool, idx) => {
     return (
       <Fragment key={`${tool.name}-${idx}`}>
@@ -206,5 +210,29 @@ const ToolsConfig: FC<ToolConfigProps> = ({ tools }) => {
     );
   });
 
-  return <div className={styles.toolConfig}>{toolEls}</div>;
+  return (
+    <>
+      <div className={styles.toolConfig}>{toolEls}</div>
+      <div className={styles.toolChoice}>
+        <div className={clsx("text-style-label", "text-style-secondary")}>
+          Tool Choice
+        </div>
+        <div>
+          <ToolChoiceView toolChoice={toolChoice} />
+        </div>
+      </div>
+    </>
+  );
+};
+
+interface ToolChoiceViewProps {
+  toolChoice: ToolChoice;
+}
+
+const ToolChoiceView: FC<ToolChoiceViewProps> = ({ toolChoice }) => {
+  if (typeof toolChoice === "string") {
+    return toolChoice;
+  } else {
+    return <code>`${toolChoice.name}()`</code>;
+  }
 };

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

@@ -1,9 +1,9 @@
 // @ts-check
+import { Messages, SampleInitEvent } from "../../../@types/log";
+import { formatDateTime } from "../../../utils/format";
+import { toArray } from "../../../utils/type";
 import { ApplicationIcons } from "../../appearance/icons";
-import { MetaDataGrid } from "../../metadata/MetaDataGrid";
-import { Messages, SampleInitEvent } from "../../types/log";
-import { formatDateTime } from "../../utils/format";
-import { toArray } from "../../utils/type";
+import { MetaDataGrid } from "../../content/MetaDataGrid";
 import { ChatView } from "../chat/ChatView";
 import { EventPanel } from "./event/EventPanel";
 import { EventSection } from "./event/EventSection";
@@ -78,11 +78,13 @@ export const SampleInitEventView: FC<SampleInitEventViewProps> = ({
           ) : (
             ""
           )}
-          <EventSection title="Target">
-            {toArray(event.sample.target).map((target) => {
-              return <div key={target}>{target}</div>;
-            })}
-          </EventSection>
+          {event.sample.target ? (
+            <EventSection title="Target">
+              {toArray(event.sample.target).map((target) => {
+                return <div key={target}>{target}</div>;
+              })}
+            </EventSection>
+          ) : undefined}
         </div>
       </div>
       {event.sample.metadata &&

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

@@ -1,6 +1,6 @@
 import { FC } from "react";
+import { SampleLimitEvent, Type10 } from "../../../@types/log";
 import { ApplicationIcons } from "../../appearance/icons";
-import { SampleLimitEvent, Type10 } from "../../types/log";
 import { EventPanel } from "./event/EventPanel";
 
 interface SampleLimitEventViewProps {

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

@@ -1,8 +1,8 @@
+import { SandboxEvent } from "../../../@types/log";
+import ExpandablePanel from "../../../components/ExpandablePanel";
+import { MarkdownDiv } from "../../../components/MarkdownDiv";
 import { ApplicationIcons } from "../../appearance/icons";
-import ExpandablePanel from "../../components/ExpandablePanel";
-import { MarkdownDiv } from "../../components/MarkdownDiv";
-import { MetaDataGrid } from "../../metadata/MetaDataGrid";
-import { SandboxEvent } from "../../types/log";
+import { MetaDataGrid } from "../../content/MetaDataGrid";
 import { EventPanel } from "./event/EventPanel";
 import { EventSection } from "./event/EventSection";
 
@@ -68,7 +68,7 @@ const ExecView: FC<ExecViewProps> = ({ id, event }) => {
             {input !== null ? input?.trim() : undefined}
           </pre>
 
-          {options !== null ? (
+          {options !== null && Object.keys(options).length > 0 ? (
             <EventSection title={`Options`}>
               <MetaDataGrid
                 entries={options as Record<string, unknown>}
@@ -84,7 +84,9 @@ const ExecView: FC<ExecViewProps> = ({ id, event }) => {
             <MarkdownDiv markdown={output} />
           </ExpandablePanel>
         ) : undefined}
-        <div className={clsx(styles.result)}>Exited with code {result}</div>
+        {result !== 0 ? (
+          <div className={clsx(styles.result)}>Exited with code {result}</div>
+        ) : undefined}
       </EventSection>
     </div>
   );

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

@@ -1,9 +1,9 @@
 import { FC, Fragment } from "react";
+import { ScoreEvent, Value1 } from "../../../@types/log";
+import { MarkdownDiv } from "../../../components/MarkdownDiv";
+import { formatDateTime } from "../../../utils/format";
 import { ApplicationIcons } from "../../appearance/icons";
-import { MarkdownDiv } from "../../components/MarkdownDiv";
-import { MetaDataGrid } from "../../metadata/MetaDataGrid";
-import { ScoreEvent, Value1 } from "../../types/log";
-import { formatDateTime } from "../../utils/format";
+import { MetaDataGrid } from "../../content/MetaDataGrid";
 import { EventPanel } from "./event/EventPanel";
 
 import clsx from "clsx";

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

@@ -1,9 +1,10 @@
 import clsx from "clsx";
 import { FC } from "react";
-import { StepEvent } from "../../types/log";
-import { formatDateTime } from "../../utils/format";
+import { StepEvent } from "../../../@types/log";
+import { formatDateTime } from "../../../utils/format";
 import { EventPanel } from "./event/EventPanel";
 import { TranscriptComponent } from "./TranscriptView";
+import { kSandboxSignalName } from "./transform/fixups";
 import { EventNode } from "./types";
 
 interface StepEventViewProps {
@@ -114,6 +115,7 @@ const stepDescriptor = (
       case "system_message":
         return {
           ...rootStepDescriptor,
+          collapse: true,
         };
       case "use_tools":
         return {
@@ -133,7 +135,13 @@ const stepDescriptor = (
       ...rootStepDescriptor,
     };
   } else if (event.event === "step") {
-    if (event.name === "init") {
+    if (event.name === kSandboxSignalName) {
+      return {
+        ...rootStepDescriptor,
+        name: "Sandbox Events",
+        collapse: true,
+      };
+    } else if (event.name === "init") {
       return {
         ...rootStepDescriptor,
         name: "Init",

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

@@ -1,8 +1,8 @@
 import clsx from "clsx";
 import { FC, ReactNode } from "react";
+import { Input2, Input5, Result2, SubtaskEvent } from "../../../@types/log";
 import { ApplicationIcons } from "../../appearance/icons";
-import { MetaDataView } from "../../metadata/MetaDataView";
-import { Input2, Input5, Result2, SubtaskEvent } from "../../types/log";
+import { MetaDataView } from "../../content/MetaDataView";
 import { EventPanel } from "./event/EventPanel";
 import { formatTiming, formatTitle } from "./event/utils";
 import styles from "./SubtaskEventView.module.css";

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

@@ -1,5 +1,5 @@
+import { ToolEvent } from "../../../@types/log";
 import { ApplicationIcons } from "../../appearance/icons";
-import { ToolEvent } from "../../types/log";
 import { resolveToolInput } from "../chat/tools/tool";
 import { ToolCallView } from "../chat/tools/ToolCallView";
 import { ApprovalEventView } from "./ApprovalEventView";
@@ -8,7 +8,7 @@ import { TranscriptView } from "./TranscriptView";
 
 import clsx from "clsx";
 import { FC, useMemo } from "react";
-import { PulsingDots } from "../../components/PulsingDots";
+import { PulsingDots } from "../../../components/PulsingDots";
 import { ChatView } from "../chat/ChatView";
 import { formatTiming, formatTitle } from "./event/utils";
 import styles from "./ToolEventView.module.css";

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

@@ -6,13 +6,9 @@
   background-color: var(--bs-body-bg);
 }
 
-.node.first {
-  padding-top: 0.5em;
-}
-
 .node {
   padding-top: 0;
-  padding-bottom: 0.5em;
+  padding-bottom: 0.65em;
 }
 
 .nodes {
@@ -22,7 +18,7 @@
 
 .transcriptComponent {
   display: grid;
-  margin: 0.5em 0 0 0;
+  margin: 0 0 0 0;
   width: 100%;
 }
 
@@ -39,9 +35,14 @@
 }
 
 .eventNodeContainer {
-  padding-bottom: 0.5em;
+  padding-top: 0.7em;
 }
 
 .eventNodeContainer.noBottom {
   padding-bottom: 0;
 }
+
+.attached {
+  padding-top: 0rem;
+  margin-top: -8px;
+}

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

@@ -1,5 +1,5 @@
-import { FC, memo, RefObject, useMemo } from "react";
-import { Events } from "../../types/log";
+import { FC, JSX, memo, RefObject, useMemo } from "react";
+import { Events } from "../../../@types/log";
 import { ApprovalEventView } from "./ApprovalEventView";
 import { ErrorEventView } from "./ErrorEventView";
 import { InfoEventView } from "./InfoEventView";
@@ -14,11 +14,13 @@ import { StateEventView } from "./state/StateEventView";
 import { StepEventView } from "./StepEventView";
 import { SubtaskEventView } from "./SubtaskEventView";
 import { ToolEventView } from "./ToolEventView";
-import { EventNode, EventType } from "./types";
+import { EventNode } from "./types";
 
 import clsx from "clsx";
 import styles from "./TranscriptView.module.css";
 import { TranscriptVirtualListComponent } from "./TranscriptVirtualListComponent";
+import { fixupEventStream } from "./transform/fixups";
+import { treeifyEvents } from "./transform/treeify";
 
 interface TranscriptViewProps {
   id: string;
@@ -86,23 +88,40 @@ interface TranscriptComponentProps {
  */
 export const TranscriptComponent: FC<TranscriptComponentProps> = memo(
   ({ id, eventNodes }) => {
-    const rows = eventNodes.map((eventNode, index) => {
+    const rows: JSX.Element[] = [];
+
+    let attached = false;
+    for (let i = 0; i < eventNodes.length; i++) {
+      const eventNode = eventNodes[i];
       const clz = [styles.eventNode];
+      const containerClz = [];
+
+      if (eventNode.event.event !== "tool") {
+        attached = false;
+      }
+
+      // Special handling for toggling color
       if (eventNode.depth % 2 == 0) {
         clz.push(styles.darkenBg);
       }
-      if (index === eventNodes.length - 1) {
+
+      // Note last node
+      if (i === eventNodes.length - 1) {
         clz.push(styles.lastNode);
       }
 
-      const eventId = `${id}|event|${index}`;
+      if (attached) {
+        containerClz.push(styles.attached);
+      }
 
+      const eventId = `${id}|event|${i}`;
       const row = (
         <div
           key={eventId}
           className={clsx(
             styles.eventNodeContainer,
-            index === eventNodes.length - 1 ? styles.noBottom : undefined,
+            i === eventNodes.length - 1 ? styles.noBottom : undefined,
+            containerClz,
           )}
         >
           <RenderedEventNode
@@ -112,8 +131,12 @@ export const TranscriptComponent: FC<TranscriptComponentProps> = memo(
           />
         </div>
       );
-      return row;
-    });
+      rows.push(row);
+
+      if (eventNode.event.event === "model") {
+        attached = true;
+      }
+    }
 
     return (
       <div
@@ -241,108 +264,3 @@ export const RenderedEventNode: FC<RenderedEventNodeProps> = memo(
     }
   },
 );
-
-/**
- * Normalizes event content
- */
-const fixupEventStream = (events: Events, filterPending: boolean = true) => {
-  const initEventIndex = events.findIndex((e) => {
-    return e.event === "sample_init";
-  });
-  const initEvent = events[initEventIndex];
-
-  // If filtering pending, just remove all pending events
-  // otherise, collapse sequential pending events of the same
-  // type
-  const collapsed = filterPending
-    ? events.filter((e) => !e.pending)
-    : events.reduce<Events>((acc, event) => {
-        // Collapse sequential pending events of the same type
-        if (!event.pending) {
-          // Not a pending event
-          acc.push(event);
-        } else {
-          // For pending events, replace previous pending or add new
-          const lastIndex = acc.length - 1;
-          if (
-            lastIndex >= 0 &&
-            acc[lastIndex].pending &&
-            acc[lastIndex].event === event.event
-          ) {
-            // Replace previous pending with current one (if they're of the same type)
-            acc[lastIndex] = event;
-          } else {
-            // First event or follows non-pending
-            acc.push(event);
-          }
-        }
-        return acc;
-      }, []);
-  // See if the events have an init step
-  const hasInitStep =
-    collapsed.findIndex((e) => {
-      return e.event === "step" && e.name === "init";
-    }) !== -1;
-
-  const fixedUp = [...collapsed];
-  if (!hasInitStep && initEvent) {
-    fixedUp.splice(initEventIndex, 0, {
-      timestamp: initEvent.timestamp,
-      event: "step",
-      action: "begin",
-      type: null,
-      name: "sample_init",
-      pending: false,
-      working_start: 0,
-    });
-
-    fixedUp.splice(initEventIndex + 2, 0, {
-      timestamp: initEvent.timestamp,
-      event: "step",
-      action: "end",
-      type: null,
-      name: "sample_init",
-      pending: false,
-      working_start: 0,
-    });
-  }
-
-  return fixedUp;
-};
-
-/**
- * Gathers events into a hierarchy of EventNodes.
- */
-function treeifyEvents(events: Events, depth: number): EventNode[] {
-  const rootNodes: EventNode[] = [];
-  const stack: EventNode[] = [];
-
-  const pushNode = (event: EventType): EventNode => {
-    const node = new EventNode(event, stack.length + depth);
-    if (stack.length > 0) {
-      const parentNode = stack[stack.length - 1];
-      parentNode.children.push(node);
-    } else {
-      rootNodes.push(node);
-    }
-    return node;
-  };
-
-  events.forEach((event) => {
-    if (event.event === "step" && event.action === "begin") {
-      // Starting a new step
-      const node = pushNode(event);
-      stack.push(node);
-    } else if (event.event === "step" && event.action === "end") {
-      // An ending step
-      if (stack.length > 0) {
-        stack.pop();
-      }
-    } else {
-      // An event
-      pushNode(event);
-    }
-  });
-
-  return rootNodes;
-}

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

@@ -6,11 +6,12 @@
   background-color: var(--bs-body-bg);
 }
 
-.node.first {
-  padding-top: 0.5em;
+.node {
+  padding-top: 0.7rem;
+  padding-bottom: 0em;
 }
 
-.node {
-  padding-top: 0;
-  padding-bottom: 0.5em;
+.attached {
+  padding-top: 0rem;
+  margin-top: -8px;
 }

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

@@ -3,7 +3,7 @@ import { FC, RefObject, useCallback } from "react";
 import { RenderedEventNode } from "./TranscriptView";
 import { EventNode } from "./types";
 
-import { LiveVirtualList } from "../../components/LiveVirtualList";
+import { LiveVirtualList } from "../../../components/LiveVirtualList";
 import styles from "./TranscriptVirtualListComponent.module.css";
 
 interface TranscriptVirtualListComponentProps {
@@ -24,9 +24,21 @@ export const TranscriptVirtualListComponent: FC<
     const paddingClass = index === 0 ? styles.first : undefined;
 
     const eventId = `${id}-event-${index}`;
+    const previousIndex = index - 1;
+    const previous =
+      previousIndex > 0 && previousIndex <= eventNodes.length
+        ? eventNodes[previousIndex]
+        : undefined;
+    const attached =
+      item.event.event === "tool" &&
+      (previous?.event.event === "tool" || previous?.event.event === "model");
+    const attachedClass = attached ? styles.attached : undefined;
 
     return (
-      <div key={eventId} className={clsx(styles.node, paddingClass)}>
+      <div
+        key={eventId}
+        className={clsx(styles.node, paddingClass, attachedClass)}
+      >
         <RenderedEventNode id={eventId} node={item} className={clsx(bgClass)} />
       </div>
     );

inspect_ai/_view/www/src/{samples → app/samples}/transcript/event/EventPanel.tsx

@@ -9,8 +9,8 @@ import {
 import { ApplicationIcons } from "../../../appearance/icons";
 import { EventNavs } from "./EventNavs";
 
-import { ProgressBar } from "../../../components/ProgressBar";
-import { useProperty } from "../../../state/hooks";
+import { ProgressBar } from "../../../../components/ProgressBar";
+import { useProperty } from "../../../../state/hooks";
 import styles from "./EventPanel.module.css";
 
 interface EventPanelProps {

inspect_ai/_view/www/src/{samples → app/samples}/transcript/event/EventTimingPanel.tsx

@@ -1,6 +1,6 @@
 import clsx from "clsx";
 import { FC, Fragment } from "react";
-import { formatDateTime, formatTime } from "../../../utils/format";
+import { formatDateTime, formatTime } from "../../../../utils/format";
 import styles from "./EventTimingPanel.module.css";
 
 interface EventTimingPanelProps {

inspect_ai/_view/www/src/{samples → app/samples}/transcript/event/utils.ts

@@ -2,7 +2,7 @@ import {
   formatDateTime,
   formatNumber,
   formatTime,
-} from "../../../utils/format";
+} from "../../../../utils/format";
 
 export const formatTiming = (timestamp: string, working_start?: number) => {
   if (working_start) {