inspect-ai 0.3.89__py3-none-any.whl → 0.3.91__py3-none-any.whl

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

@@ -1,17 +1,18 @@
 import clsx from "clsx";
-import { FC, Fragment, ReactNode } from "react";
-import ExpandablePanel from "../../components/ExpandablePanel";
-import { MarkdownDiv } from "../../components/MarkdownDiv";
-import { ContentTool } from "../../types";
+
+import { FC, ReactNode } from "react";
 import {
   ContentAudio,
   ContentImage,
   ContentReasoning,
   ContentText,
   ContentVideo,
-  Format,
   Format1,
-} from "../../types/log";
+  Format2,
+} from "../../../@types/log";
+import { ContentTool } from "../../../app/types";
+import ExpandablePanel from "../../../components/ExpandablePanel";
+import { MarkdownDiv } from "../../../components/MarkdownDiv";
 import styles from "./MessageContent.module.css";
 import { ToolOutput } from "./tools/ToolOutput";
 
@@ -97,7 +98,7 @@ const messageRenderers: Record<string, MessageRenderer> = {
       return (
         <MarkdownDiv
           key={key}
-          markdown={c.text}
+          markdown={c.text || ""}
           className={isLast ? "no-last-para-padding" : ""}
         />
       );
@@ -110,7 +111,7 @@ const messageRenderers: Record<string, MessageRenderer> = {
         return undefined;
       }
       return (
-        <Fragment key={key}>
+        <div key={key} className={clsx(styles.reasoning, "text-size-small")}>
           <div
             className={clsx(
               "text-style-label",
@@ -129,7 +130,7 @@ const messageRenderers: Record<string, MessageRenderer> = {
               }
             />
           </ExpandablePanel>
-        </Fragment>
+        </div>
       );
     },
   },
@@ -175,7 +176,7 @@ const messageRenderers: Record<string, MessageRenderer> = {
  * Renders message content based on its type.
  * Supports rendering strings, images, and tools using specific renderers.
  */
-const mimeTypeForFormat = (format: Format | Format1): string => {
+const mimeTypeForFormat = (format: Format1 | Format2): string => {
   switch (format) {
     case "mov":
       return "video/quicktime";

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

@@ -0,0 +1,7 @@
+.content {
+  margin-bottom: 1em;
+}
+
+.codeCompact {
+  color: unset !important;
+}

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

@@ -3,20 +3,22 @@ import {
   ChatMessageSystem,
   ChatMessageTool,
   ChatMessageUser,
-} from "../../types/log";
+} from "../../../@types/log";
 import { MessageContent } from "./MessageContent";
 import { resolveToolInput } from "./tools/tool";
 import { ToolCallView } from "./tools/ToolCallView";
 
+import clsx from "clsx";
 import { FC, Fragment } from "react";
-import { ContentTool } from "../../types";
+import { ContentTool } from "../../../app/types";
 import styles from "./MessageContents.module.css";
+import { ChatViewToolCallStyle } from "./types";
 
 interface MessageContentsProps {
   id: string;
   message: ChatMessageAssistant | ChatMessageSystem | ChatMessageUser;
   toolMessages: ChatMessageTool[];
-  toolCallStyle: "compact" | "complete";
+  toolCallStyle: ChatViewToolCallStyle;
 }
 
 export const MessageContents: FC<MessageContentsProps> = ({
@@ -52,9 +54,13 @@ export const MessageContents: FC<MessageContentsProps> = ({
       if (toolCallStyle === "compact") {
         return (
           <div key={`tool-call-${idx}`}>
-            <code>tool: {functionCall}</code>
+            <code className={clsx(styles.codeCompact)}>
+              tool: {functionCall}
+            </code>
           </div>
         );
+      } else if (toolCallStyle === "omit") {
+        return undefined;
       } else {
         return (
           <ToolCallView
@@ -71,11 +77,11 @@ export const MessageContents: FC<MessageContentsProps> = ({
 
     return (
       <Fragment>
-        <div className={styles.content}>
-          {message.content ? (
+        {message.content && (
+          <div className={styles.content}>
             <MessageContent contents={message.content} />
-          ) : undefined}
-        </div>
+          </div>
+        )}
         {toolCalls}
       </Fragment>
     );

inspect_ai/_view/www/src/{samples → app/samples}/chat/messages.ts

@@ -1,4 +1,3 @@
-import { ApplicationIcons } from "../../appearance/icons";
 import {
   ChatMessageAssistant,
   ChatMessageSystem,
@@ -11,7 +10,8 @@ import {
   ContentVideo,
   Events,
   Messages,
-} from "../../types/log";
+} from "../../../@types/log";
+import { ApplicationIcons } from "../../appearance/icons";
 
 export interface ResolvedMessage {
   message: ChatMessageAssistant | ChatMessageSystem | ChatMessageUser;

inspect_ai/_view/www/src/app/samples/chat/tools/ToolCallView.module.css

@@ -0,0 +1,7 @@
+.output {
+}
+
+.toolCallView {
+  display: grid;
+  row-gap: 1em;
+}

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

@@ -1,6 +1,5 @@
+import clsx from "clsx";
 import { FC, useMemo } from "react";
-import ExpandablePanel from "../../../components/ExpandablePanel";
-import { ContentTool } from "../../../types";
 import {
   ContentAudio,
   ContentImage,
@@ -8,7 +7,9 @@ import {
   ContentText,
   ContentVideo,
   ToolCallContent,
-} from "../../../types/log";
+} from "../../../../@types/log";
+import { ContentTool } from "../../../../app/types";
+import ExpandablePanel from "../../../../components/ExpandablePanel";
 import { MessageContent } from "../MessageContent";
 import styles from "./ToolCallView.module.css";
 import { ToolInput } from "./ToolInput";
@@ -105,32 +106,30 @@ export const ToolCallView: FC<ToolCallViewProps> = ({
 
   const contents = mode !== "compact" ? input : input || functionCall;
   return (
-    <div>
-      {mode !== "compact" && (!view || view.title) ? (
-        <ToolTitle title={view?.title || functionCall} />
-      ) : (
-        ""
-      )}
+    <div className={clsx(styles.toolCallView)}>
       <div>
-        <div>
-          <ToolInput
-            highlightLanguage={highlightLanguage}
-            contents={contents}
-            toolCallView={view}
-          />
-          {hasContent ? (
-            <ExpandablePanel
-              id={`${id}-tool-input`}
-              collapse={collapse}
-              border={true}
-              lines={15}
-              className={styles.output}
-            >
-              <MessageContent contents={normalizedContent} />
-            </ExpandablePanel>
-          ) : undefined}
-        </div>
+        {mode !== "compact" && (!view || view.title) ? (
+          <ToolTitle title={view?.title || functionCall} />
+        ) : (
+          ""
+        )}
+        <ToolInput
+          highlightLanguage={highlightLanguage}
+          contents={contents}
+          toolCallView={view}
+        />
       </div>
+      {hasContent ? (
+        <ExpandablePanel
+          id={`${id}-tool-input`}
+          collapse={collapse}
+          border={true}
+          lines={15}
+          className={styles.output}
+        >
+          <MessageContent contents={normalizedContent} />
+        </ExpandablePanel>
+      ) : undefined}
     </div>
   );
 };

inspect_ai/_view/www/src/app/samples/chat/tools/ToolInput.module.css

@@ -0,0 +1,19 @@
+.outputPre {
+  padding: 0.5em;
+  margin-top: 0.25em;
+  margin-bottom: 0;
+}
+
+.toolView {
+  margin-top: 0.25em;
+}
+
+.toolView pre[class*="language-"] {
+  padding: 0.5em !important;
+}
+
+.outputCode {
+  font-size: 0.8rem !important;
+  overflow-wrap: anywhere !important;
+  white-space: pre-wrap !important;
+}

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

@@ -1,8 +1,8 @@
 import clsx from "clsx";
 import { FC } from "react";
-import { MarkdownDiv } from "../../../components/MarkdownDiv";
+import { MarkdownDiv } from "../../../../components/MarkdownDiv";
 
-import { usePrismHighlight } from "../../../state/hooks";
+import { usePrismHighlight } from "../../../../state/hooks";
 import styles from "./ToolInput.module.css";
 
 interface ToolInputProps {
@@ -22,7 +22,7 @@ export const ToolInput: FC<ToolInputProps> = (props) => {
       <MarkdownDiv
         markdown={toolCallView.content}
         ref={prismParentRef}
-        className={clsx(styles.bottomPadding, "text-size-small", "tool-output")}
+        className={clsx("tool-output", styles.toolView)}
       />
     );
   }

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

@@ -12,6 +12,7 @@
   padding: 0.5em 0.5em 0.5em 0.5em;
   white-space: pre-wrap;
   margin-bottom: 0;
+  font-size: 1em !important;
 }
 
 .textCode {

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

@@ -1,6 +1,6 @@
 import clsx from "clsx";
 import { FC } from "react";
-import { ContentImage, ContentText } from "../../../types/log";
+import { ContentImage, ContentText } from "../../../../@types/log";
 import styles from "./ToolOutput.module.css";
 
 interface ToolOutputProps {

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

@@ -2,3 +2,7 @@
   margin-right: 0.2rem;
   opacity: 0.4;
 }
+
+.toolTitle {
+  color: unset !important;
+}

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

@@ -11,8 +11,8 @@ interface ToolTitleProps {
 export const ToolTitle: FC<ToolTitleProps> = ({ title }) => {
   return (
     <Fragment>
-      <i className={clsx("bi", "bi-tools", styles.styles)} />
-      <code className={"text-size-small"}>{title}</code>
+      <i className={clsx("bi", "bi-tools", styles.image)} />
+      <code className={clsx("text-size-small", styles.toolTitle)}>{title}</code>
     </Fragment>
   );
 };

inspect_ai/_view/www/src/{samples → app/samples}/chat/tools/tool.ts

@@ -2,7 +2,7 @@ import "prismjs/components/prism-bash";
 import "prismjs/components/prism-json";
 import "prismjs/components/prism-python";
 
-import { Arguments } from "../../../types/log";
+import { Arguments } from "../../../../@types/log";
 
 export interface ToolCallResult {
   functionCall: string;

inspect_ai/_view/www/src/app/samples/chat/types.ts

@@ -0,0 +1 @@
+export type ChatViewToolCallStyle = "compact" | "complete" | "omit";

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

@@ -1,8 +1,8 @@
 import { ReactNode } from "react";
-import { BasicSampleData, SampleSummary } from "../../api/types";
-import { ScoreLabel } from "../../types";
-import { Value2 } from "../../types/log";
-import { arrayToString, inputString } from "../../utils/format";
+import { Value2 } from "../../../@types/log";
+import { ScoreLabel } from "../../../app/types";
+import { BasicSampleData, SampleSummary } from "../../../client/api/types";
+import { arrayToString, inputString } from "../../../utils/format";
 import { getScoreDescriptorForValues } from "./score/ScoreDescriptor";
 import {
   EvalDescriptor,
@@ -298,11 +298,12 @@ export const createSamplesDescriptor = (
         : current.error
           ? String(current.error)
           : "";
-      previous[0] = Math.min(Math.max(previous[0], text.length), 300);
+      previous[0] = Math.min(Math.max(previous[0], text.length), 200);
       previous[1] = Math.min(
         Math.max(previous[1], arrayToString(current.target).length),
         300,
       );
+
       previous[2] = Math.min(
         Math.max(
           previous[2],
@@ -317,14 +318,21 @@ export const createSamplesDescriptor = (
         50,
       );
       previous[4] = Math.min(
-        Math.max(previous[4], String(current.id).length),
+        Math.max(
+          previous[4],
+          current.retries ? String(current.retries).length : 0,
+        ),
+        50,
+      );
+      previous[5] = Math.min(
+        Math.max(previous[5], String(current.id).length),
         10,
       );
-      previous[5] = Math.min(Math.max(previous[5], scoreText.length), 30);
+      previous[6] = Math.min(Math.max(previous[6], scoreText.length), 30);
 
       return previous;
     },
-    [0, 0, 0, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0],
   );
 
   // normalize to base 1
@@ -333,30 +341,45 @@ export const createSamplesDescriptor = (
     target: Math.min(sizes[1], 300),
     answer: Math.min(sizes[2], 300),
     limit: Math.min(sizes[3], 50),
-    id: Math.min(sizes[4], 10),
-    score: Math.min(sizes[5], 30),
+    retries: Math.min(sizes[4], 50),
+    id: Math.min(sizes[5], 10),
+    score: Math.min(sizes[6], 30),
   };
   const base =
     maxSizes.input +
       maxSizes.target +
       maxSizes.answer +
       maxSizes.limit +
+      maxSizes.retries +
       maxSizes.id +
       maxSizes.score || 1;
+
+  const inputNormalized = maxSizes.input / base;
+  const targetNormalized =
+    maxSizes.target / base > 0
+      ? Math.max(maxSizes.target / base, inputNormalized / 10)
+      : 0;
+  const answerNormalized =
+    maxSizes.answer / base > 0
+      ? Math.max(maxSizes.answer / base, inputNormalized / 10)
+      : 0;
+
   const messageShape = {
     raw: {
       input: sizes[0],
       target: sizes[1],
       answer: sizes[2],
       limit: sizes[3],
-      id: sizes[4],
-      score: sizes[5],
+      retries: sizes[4],
+      id: sizes[5],
+      score: sizes[6],
     },
     normalized: {
-      input: maxSizes.input / base,
-      target: maxSizes.target / base,
-      answer: maxSizes.answer / base,
+      input: inputNormalized,
+      target: targetNormalized,
+      answer: answerNormalized,
       limit: maxSizes.limit / base,
+      retries: maxSizes.retries / base,
       id: maxSizes.id / base,
       score: maxSizes.score / base,
     },

inspect_ai/_view/www/src/{samples → app/samples}/descriptor/score/BooleanScoreDescriptor.tsx

@@ -1,5 +1,5 @@
 import clsx from "clsx";
-import { Value2 } from "../../../types/log";
+import { Value2 } from "../../../../@types/log";
 import { ScoreDescriptor, SelectedScore } from "../types";
 import styles from "./BooleanScoreDescriptor.module.css";
 

inspect_ai/_view/www/src/{samples → app/samples}/descriptor/score/CategoricalScoreDescriptor.tsx

@@ -1,5 +1,5 @@
-import { kScoreTypeCategorical } from "../../../constants";
-import { Value2 } from "../../../types/log";
+import { Value2 } from "../../../../@types/log";
+import { kScoreTypeCategorical } from "../../../../constants";
 import { ScoreDescriptor } from "../types";
 
 export const categoricalScoreDescriptor = (

inspect_ai/_view/www/src/{samples → app/samples}/descriptor/score/NumericScoreDescriptor.tsx

@@ -1,6 +1,6 @@
-import { kScoreTypeNumeric } from "../../../constants";
-import { Value2 } from "../../../types/log";
-import { formatDecimalNoTrailingZeroes } from "../../../utils/format";
+import { Value2 } from "../../../../@types/log";
+import { kScoreTypeNumeric } from "../../../../constants";
+import { formatDecimalNoTrailingZeroes } from "../../../../utils/format";
 import { ScoreDescriptor } from "../types";
 
 export const numericScoreDescriptor = (values: Value2[]): ScoreDescriptor => {

inspect_ai/_view/www/src/{samples → app/samples}/descriptor/score/ObjectScoreDescriptor.tsx

@@ -1,9 +1,9 @@
 import clsx from "clsx";
 import { JSX } from "react";
-import { kScoreTypeObject } from "../../../constants";
-import { Value2 } from "../../../types/log";
-import { formatPrettyDecimal } from "../../../utils/format";
-import { isNumeric } from "../../../utils/type";
+import { Value2 } from "../../../../@types/log";
+import { kScoreTypeObject } from "../../../../constants";
+import { formatPrettyDecimal } from "../../../../utils/format";
+import { isNumeric } from "../../../../utils/type";
 import { ScoreDescriptor } from "../types";
 import styles from "./ObjectScoreDescriptor.module.css";
 

inspect_ai/_view/www/src/{samples → app/samples}/descriptor/score/OtherScoreDescriptor.tsx

@@ -1,5 +1,5 @@
-import { kScoreTypeOther } from "../../../constants";
-import { RenderedContent } from "../../../metadata/RenderedContent";
+import { kScoreTypeOther } from "../../../../constants";
+import { RenderedContent } from "../../../content/RenderedContent";
 import { ScoreDescriptor } from "../types";
 
 export const otherScoreDescriptor = (): ScoreDescriptor => {

inspect_ai/_view/www/src/{samples → app/samples}/descriptor/score/PassFailScoreDescriptor.tsx

@@ -1,6 +1,6 @@
 import clsx from "clsx";
-import { kScoreTypePassFail } from "../../../constants";
-import { Value2 } from "../../../types/log";
+import { Value2 } from "../../../../@types/log";
+import { kScoreTypePassFail } from "../../../../constants";
 import { ScoreDescriptor, SelectedScore } from "../types";
 import styles from "./PassFailScoreDescriptor.module.css";
 

inspect_ai/_view/www/src/{samples → app/samples}/descriptor/score/ScoreDescriptor.tsx

@@ -1,4 +1,4 @@
-import { Value2 } from "../../../types/log";
+import { Value2 } from "../../../../@types/log";
 import { ScoreDescriptor } from "../types";
 import { booleanScoreDescriptor } from "./BooleanScoreDescriptor";
 import { categoricalScoreDescriptor } from "./CategoricalScoreDescriptor";

inspect_ai/_view/www/src/{samples → app/samples}/descriptor/types.ts

@@ -1,7 +1,7 @@
 import { ReactNode } from "react";
-import { BasicSampleData } from "../../api/types";
-import { ScoreLabel } from "../../types";
-import { Value2 } from "../../types/log";
+import { Value2 } from "../../../@types/log";
+import { ScoreLabel } from "../../../app/types";
+import { BasicSampleData } from "../../../client/api/types";
 
 export interface EvalDescriptor {
   scores: ScoreLabel[];
@@ -52,5 +52,6 @@ export interface MessageShapeData {
   target: number;
   answer: number;
   limit: number;
+  retries: number;
   score: number;
 }

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

@@ -2,7 +2,7 @@
   color: var(--bs-danger);
   display: grid;
   grid-template-columns: 1fr;
-  align-content: align;
+  align-content: baseline;
   justify-items: center;
 }
 
@@ -13,5 +13,6 @@
 }
 
 .message {
+  text-align: center;
   width: 300px;
 }

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

@@ -3,6 +3,7 @@ interface SampleHeaderProps {
   target?: boolean;
   answer?: boolean;
   limit?: boolean;
+  retries?: boolean;
   score?: boolean;
   gridColumnsTemplate: string;
 }
@@ -15,6 +16,7 @@ export const SampleHeader: FC<SampleHeaderProps> = ({
   target = true,
   answer = true,
   limit = true,
+  retries = false,
   score = true,
   gridColumnsTemplate,
 }) => (
@@ -32,6 +34,7 @@ export const SampleHeader: FC<SampleHeaderProps> = ({
     <div>{target ? "Target" : ""}</div>
     <div>{answer ? "Answer" : ""}</div>
     <div>{limit ? "Limit" : ""}</div>
+    <div>{retries ? "Retries" : ""}</div>
     <div className={styles.center}>{score ? "Score" : ""}</div>
   </div>
 );