inspect-ai 0.3.103__py3-none-any.whl → 0.3.104__py3-none-any.whl

inspect_ai/_view/www/src/app/samples/chat/content-data/ContentDataView.tsx

@@ -0,0 +1,111 @@
+import { FC, ReactNode } from "react";
+import { WebSearch } from "./WebSearch";
+
+import clsx from "clsx";
+import { ContentData } from "../../../../@types/log";
+import { RecordTree } from "../../../content/RecordTree";
+import styles from "./ContentDataView.module.css";
+import { WebSearchContentData, WebSearchResults } from "./WebSearchResults";
+
+export interface ContentDataProps {
+  id: string;
+  contentData: ContentData;
+}
+
+interface RenderableData {
+  type: string;
+  name?: string;
+  [key: string]: any;
+}
+
+export const ContentDataView: FC<ContentDataProps> = ({ id, contentData }) => {
+  const renderableData = contentData.data as RenderableData;
+
+  const renderer = contentDataRenderers.find((r) =>
+    r.canRender(renderableData),
+  );
+
+  if (!renderer) {
+    const { encrypted_content, ...record } = renderableData;
+    return (
+      <div className={clsx(styles.contentData)}>
+        <RecordTree
+          id={`${id}-tree`}
+          record={record}
+          className={clsx(styles.data)}
+          defaultExpandLevel={0}
+        />
+      </div>
+    );
+  }
+
+  return (
+    <div className={clsx(styles.contentData)}>
+      {renderer.render(renderableData)}
+    </div>
+  );
+};
+
+// The following handles rendering of the content data based on its type
+// and name, allowing for different renderers to be used for different types of content data.
+
+interface ContentDataRenderer {
+  name: string;
+  canRender: (data: RenderableData) => boolean;
+  render: (data: RenderableData) => ReactNode;
+}
+
+const webSearchServerToolRenderer: ContentDataRenderer = {
+  name: "WebSearch",
+  canRender: (data: RenderableData) => {
+    return data.type === "server_tool_use" && data.name === "web_search";
+  },
+  render: (data: RenderableData): ReactNode => {
+    return <WebSearch query={data.input.query} />;
+  },
+};
+
+const webSearchResultsServerToolRenderer: ContentDataRenderer = {
+  name: "WebSearchResults",
+  canRender: (data: RenderableData) => {
+    return (
+      data.type === "web_search_tool_result" && Array.isArray(data.content)
+    );
+  },
+  render: (data: RenderableData): ReactNode => {
+    const results: WebSearchContentData[] =
+      data.content as WebSearchContentData[];
+    return <WebSearchResults results={results} />;
+  },
+};
+
+const serverToolRenderer: ContentDataRenderer = {
+  name: "ServerTool",
+  canRender: (data: RenderableData) => data.type === "server_tool_use",
+  render: (data: RenderableData): ReactNode => {
+    return (
+      <>
+        <div
+          className={clsx(
+            "text-style-label",
+            "text-style-secondary",
+            "text-size-smaller",
+          )}
+        >
+          Server Tool
+        </div>
+        <RecordTree
+          id={data.name || "server-tool"}
+          record={data}
+          className={clsx(styles.data)}
+        />
+      </>
+    );
+  },
+};
+
+export const contentDataRenderers: ContentDataRenderer[] = [
+  webSearchServerToolRenderer,
+  webSearchResultsServerToolRenderer,
+  serverToolRenderer,
+];

inspect_ai/_view/www/src/app/samples/chat/content-data/WebSearch.module.css

@@ -0,0 +1,10 @@
+.webSearch {
+  display: grid;
+  grid-template-columns: max-content 1fr;
+  column-gap: 0.5em;
+  align-items: baseline;
+}
+
+.query {
+  font-family: var(--bs-font-monospace);
+}

inspect_ai/_view/www/src/app/samples/chat/content-data/WebSearch.tsx

@@ -0,0 +1,14 @@
+import clsx from "clsx";
+import { FC } from "react";
+import styles from "./WebSearch.module.css";
+
+export const WebSearch: FC<{ query: string }> = ({ query }) => {
+  return (
+    <div className={clsx(styles.webSearch, "text-size-smaller")}>
+      <span className={clsx("text-style-label", "text-style-secondary")}>
+        Web Search:
+      </span>
+      <span className={clsx(styles.query, "text-size-smallest")}>{query}</span>
+    </div>
+  );
+};

inspect_ai/_view/www/src/app/samples/chat/content-data/WebSearchResults.module.css

@@ -0,0 +1,19 @@
+.webSearch {
+  display: grid;
+  grid-template-columns: max-content 1fr;
+  column-gap: 0.5em;
+  align-items: baseline;
+}
+
+.query {
+  font-family: var(--bs-font-monospace);
+}
+
+.result a:hover {
+  text-decoration: underline;
+}
+
+.result a {
+  opacity: 0.8;
+  text-decoration: none;
+}

inspect_ai/_view/www/src/app/samples/chat/content-data/WebSearchResults.tsx

@@ -0,0 +1,49 @@
+import clsx from "clsx";
+import { FC } from "react";
+import styles from "./WebSearchResults.module.css";
+
+export interface WebSearchContentData {
+  title: string;
+  url: string;
+  page_age: string;
+}
+
+export const WebSearchResults: FC<{ results: WebSearchContentData[] }> = ({
+  results,
+}) => {
+  return (
+    <>
+      <div
+        className={clsx(
+          styles.label,
+          "text-style-label",
+          "text-style-secondary",
+          "text-size-smaller",
+        )}
+      >
+        Results
+      </div>
+
+      <ol className={clsx(styles.results, "text-size-smaller")}>
+        {results.map((result, index) => (
+          <li
+            key={index}
+            className={clsx(styles.result, "text-style-secondary")}
+          >
+            <a
+              href={result.url}
+              target="_blank"
+              rel="noopener noreferrer"
+              title={
+                result.url +
+                (result.page_age ? `\n(Age: ${result.page_age})` : "")
+              }
+            >
+              {result.title}
+            </a>
+          </li>
+        ))}
+      </ol>
+    </>
+  );
+};

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

@@ -4,6 +4,7 @@ import {
   ChatMessageTool,
   ChatMessageUser,
   ContentAudio,
+  ContentData,
   ContentImage,
   ContentReasoning,
   ContentText,
@@ -64,6 +65,7 @@ export const resolveMessages = (messages: Messages) => {
     | ContentAudio
     | ContentVideo
     | ContentReasoning
+    | ContentData
   )[] = [];
   for (const systemMessage of systemMessages) {
     const contents = Array.isArray(systemMessage.content)
@@ -78,6 +80,7 @@ export const resolveMessages = (messages: Messages) => {
     content: systemContent,
     source: "input",
     internal: null,
+    metadata: null,
   };
 
   // Converge them
@@ -117,19 +120,22 @@ const normalizeContent = (
     | ContentAudio
     | ContentVideo
     | ContentReasoning
+    | ContentData
     | string,
 ):
   | ContentText
   | ContentImage
   | ContentAudio
   | ContentVideo
-  | ContentReasoning => {
+  | ContentReasoning
+  | ContentData => {
   if (typeof content === "string") {
     return {
       type: "text",
       text: content,
       refusal: null,
       internal: null,
+      citations: null,
     };
   } else {
     return content;

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

@@ -2,6 +2,7 @@ import clsx from "clsx";
 import { FC, useMemo } from "react";
 import {
   ContentAudio,
+  ContentData,
   ContentImage,
   ContentReasoning,
   ContentText,
@@ -11,6 +12,7 @@ import {
 import { ContentTool } from "../../../../app/types";
 import ExpandablePanel from "../../../../components/ExpandablePanel";
 import { MessageContent } from "../MessageContent";
+import { defaultContext } from "../MessageContents";
 import styles from "./ToolCallView.module.css";
 import { ToolInput } from "./ToolInput";
 import { ToolTitle } from "./ToolTitle";
@@ -31,6 +33,7 @@ interface ToolCallViewProps {
     | ContentVideo
     | ContentTool
     | ContentReasoning
+    | ContentData
     | (
         | ContentText
         | ContentAudio
@@ -38,6 +41,7 @@ interface ToolCallViewProps {
         | ContentVideo
         | ContentTool
         | ContentReasoning
+        | ContentData
       )[];
   mode?: "compact";
 }
@@ -65,7 +69,8 @@ export const ToolCallView: FC<ToolCallViewProps> = ({
       | ContentImage
       | ContentVideo
       | ContentTool
-      | ContentReasoning,
+      | ContentReasoning
+      | ContentData,
   ) {
     if (value && typeof value === "object") {
       if (value.type === "image") {
@@ -105,6 +110,7 @@ export const ToolCallView: FC<ToolCallViewProps> = ({
   });
 
   const contents = mode !== "compact" ? input : input || functionCall;
+  const context = defaultContext();
   return (
     <div className={clsx(styles.toolCallView)}>
       <div>
@@ -127,7 +133,7 @@ export const ToolCallView: FC<ToolCallViewProps> = ({
           lines={15}
           className={clsx("text-size-small")}
         >
-          <MessageContent contents={normalizedContent} />
+          <MessageContent contents={normalizedContent} context={context} />
         </ExpandablePanel>
       ) : undefined}
     </div>
@@ -148,6 +154,7 @@ const normalizeContent = (
     | ContentVideo
     | ContentTool
     | ContentReasoning
+    | ContentData
     | (
         | ContentText
         | ContentImage
@@ -155,6 +162,7 @@ const normalizeContent = (
         | ContentVideo
         | ContentTool
         | ContentReasoning
+        | ContentData
       )[],
 ): (
   | ContentText
@@ -163,6 +171,7 @@ const normalizeContent = (
   | ContentVideo
   | ContentTool
   | ContentReasoning
+  | ContentData
 )[] => {
   if (Array.isArray(output)) {
     return output;
@@ -176,6 +185,7 @@ const normalizeContent = (
             text: String(output),
             refusal: null,
             internal: null,
+            citations: null,
           },
         ],
       },

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

@@ -1 +1,5 @@
+import { Citations } from "../../../@types/log";
+
 export type ChatViewToolCallStyle = "compact" | "complete" | "omit";
+
+export type Citation = NonNullable<Citations>[number];

inspect_ai/_view/www/src/app/samples/list/SampleList.tsx

@@ -20,7 +20,7 @@ import clsx from "clsx";
 import { useProperty, useSampleDescriptor } from "../../../state/hooks";
 import { useVirtuosoState } from "../../../state/scrolling";
 import { useStore } from "../../../state/store";
-import { useSampleNavigation } from "../../routing/navigationHooks";
+import { useSampleNavigation } from "../../routing/sampleNavigation";
 import { SampleFooter } from "./SampleFooter";
 import { SampleHeader } from "./SampleHeader";
 import styles from "./SampleList.module.css";

inspect_ai/_view/www/src/app/samples/sampleLimit.ts

@@ -1,9 +1,9 @@
-import { Type14 } from "../../@types/log";
+import { Type21 } from "../../@types/log";
 
 /**
  * Formats a limit message
  */
-export const sampleLimitMessage = (type: Type14): string => {
+export const sampleLimitMessage = (type: Type21): string => {
   switch (type) {
     case "operator":
       return "Sample terminated due to operator limit.";

inspect_ai/_view/www/src/app/samples/transcript/ModelEventView.tsx

@@ -216,7 +216,7 @@ const ToolsConfig: FC<ToolConfigProps> = ({ tools, toolChoice }) => {
       <div className={clsx(styles.toolConfig, "text-size-small")}>
         {toolEls}
       </div>
-      <div className={styles.toolChoice}>
+      <div className={clsx(styles.toolChoice, "text-size-small")}>
         <div className={clsx("text-style-label", "text-style-secondary")}>
           Tool Choice
         </div>

inspect_ai/_view/www/src/app/samples/transcript/SampleLimitEventView.tsx

@@ -1,6 +1,6 @@
 import clsx from "clsx";
 import { FC } from "react";
-import { SampleLimitEvent, Type10 } from "../../../@types/log";
+import { SampleLimitEvent, Type15 } from "../../../@types/log";
 import { ApplicationIcons } from "../../appearance/icons";
 import { EventPanel } from "./event/EventPanel";
 import { EventNode } from "./types";
@@ -17,12 +17,12 @@ export const SampleLimitEventView: FC<SampleLimitEventViewProps> = ({
   eventNode,
   className,
 }) => {
-  const resolve_title = (type: Type10) => {
+  const resolve_title = (type: Type15) => {
     switch (type) {
       case "custom":
         return "Custom Limit Exceeded";
       case "time":
-        return "Time Limit Execeeded";
+        return "Time Limit Exceeded";
       case "message":
         return "Message Limit Exceeded";
       case "token":
@@ -34,7 +34,7 @@ export const SampleLimitEventView: FC<SampleLimitEventViewProps> = ({
     }
   };
 
-  const resolve_icon = (type: Type10) => {
+  const resolve_icon = (type: Type15) => {
     switch (type) {
       case "custom":
         return ApplicationIcons.limits.custom;

inspect_ai/_view/www/src/app/samples/transcript/outline/TranscriptOutline.tsx

@@ -16,7 +16,7 @@ import { useScrollTrack, useVirtuosoState } from "../../../../state/scrolling";
 import { useStore } from "../../../../state/store";
 import { flatTree } from "../transform/treeify";
 
-import { useSampleDetailNavigation } from "../../../routing/navigationHooks";
+import { useSampleDetailNavigation } from "../../../routing/sampleNavigation";
 import { kSandboxSignalName } from "../transform/fixups";
 import { OutlineRow } from "./OutlineRow";
 import styles from "./TranscriptOutline.module.css";

inspect_ai/_view/www/src/components/MarkdownDiv.tsx

@@ -51,8 +51,11 @@ export const MarkdownDiv = forwardRef<HTMLDivElement, MarkdownDivProps>(
     // For `code` tags, reverse the escaping if we can
     const withCode = unescapeCodeHtmlEntities(unescaped);
 
+    // For `sup` tags, reverse the escaping if we can
+    const withSup = unescapeSupHtmlEntities(withCode);
+
     // Return the rendered markdown
-    const markup = { __html: withCode };
+    const markup = { __html: withSup };
 
     return (
       <div
@@ -65,7 +68,7 @@ export const MarkdownDiv = forwardRef<HTMLDivElement, MarkdownDivProps>(
   },
 );
 
-const kLetterListPattern = /^([a-zA-Z0-9][).]\s.*?)$/gm;
+const kLetterListPattern = /^([a-zA-Z][).]\s.*?)$/gm;
 const kCommonmarkReferenceLinkPattern = /\[([^\]]*)\]: (?!http)(.*)/g;
 
 const protectBackslashesInLatex = (content: string): string => {
@@ -193,6 +196,16 @@ const unprotectMarkdown = (txt: string): string => {
   return txt;
 };
 
+function unescapeSupHtmlEntities(str: string): string {
+  // replace &lt;sup&gt; with <sup>
+  if (!str) {
+    return str;
+  }
+  return str
+    .replace(/&lt;sup&gt;/g, "<sup>")
+    .replace(/&lt;\/sup&gt;/g, "</sup>");
+}
+
 function unescapeCodeHtmlEntities(str: string): string {
   if (!str) return str;
 

inspect_ai/_view/www/src/tests/README.md

@@ -5,8 +5,8 @@ This directory contains the test files for the application. The test framework i
 ## Directory Structure
 
 - `tests/`: Root directory for all tests
-  - `__mocks__/`: Mock files for CSS modules and other assets
-  - `setupTests.mjs`: Setup file for Jest tests
+    - `__mocks__/`: Mock files for CSS modules and other assets
+    - `setupTests.mjs`: Setup file for Jest tests
 
 ## Running Tests
 

inspect_ai/_view/www/src/utils/git.ts

@@ -2,6 +2,8 @@
  * Generates a GitHub commit URL based on the repository origin URL and the commit hash.
  */
 export const ghCommitUrl = (origin: string, commit: string): string => {
-  const baseUrl = origin.replace(/\.git$/, "");
+  const baseUrl = origin
+    .replace(/\.git$/, "")
+    .replace(/^git@github.com:/, "https://github.com/");
   return `${baseUrl}/commit/${commit}`;
 };

inspect_ai/_view/www/src/utils/html.ts

@@ -4,3 +4,9 @@
 export function escapeSelector(id: string): string {
   return id.replace(/([ #.;,?!+*~'":^$[\]()=>|/\\])/g, "\\$1");
 }
+
+export const decodeHtmlEntities = (text: string): string => {
+  const parser = new DOMParser();
+  const doc = parser.parseFromString(text, "text/html");
+  return doc.documentElement.textContent || text;
+};

inspect_ai/agent/_handoff.py

@@ -37,9 +37,9 @@ def handoff(
             Use the built-in `last_message` filter to return only the last message
             or alternatively specify a custom `MessageFilter` function.
         tool_name: Alternate tool name (defaults to `transfer_to_{agent_name}`)
-        limits: List of limits to apply to the agent. Should a limit be exceeded,
-            the agent stops and a user message is appended explaining that a limit was
-            exceeded.
+        limits: List of limits to apply to the agent. Limits are scoped to each
+            handoff to the agent. Should a limit be exceeded, the agent stops and a user
+            message is appended explaining that a limit was exceeded.
         **agent_kwargs: Arguments to curry to `Agent` function (arguments provided here
             will not be presented to the model as part of the tool interface).
 

inspect_ai/log/_condense.py

@@ -9,6 +9,7 @@ from inspect_ai._util.constants import BASE_64_DATA_REMOVED
 from inspect_ai._util.content import (
     Content,
     ContentAudio,
+    ContentData,
     ContentImage,
     ContentReasoning,
     ContentText,
@@ -344,3 +345,7 @@ def walk_content(content: Content, content_fn: Callable[[str], str]) -> Content:
         return content.model_copy(update=dict(video=content_fn(content.video)))
     elif isinstance(content, ContentReasoning):
         return content.model_copy(update=dict(reasoning=content_fn(content.reasoning)))
+    elif isinstance(content, ContentData):
+        return content.model_copy(
+            update=dict(data=walk_json_value(content.data, content_fn))
+        )

inspect_ai/log/_file.py

@@ -198,7 +198,10 @@ def write_log_dir_manifest(
     fs = filesystem(output_dir)
     manifest = f"{output_dir}{fs.sep}{filename}"
     manifest_json = to_json(
-        value=manifest_logs, indent=2, exclude_none=True, fallback=lambda _x: None
+        value=jsonable_python(manifest_logs),
+        indent=2,
+        exclude_none=True,
+        fallback=lambda _x: None,
     )
     with file(manifest, mode="wb", fs_options=fs_options) as f:
         f.write(manifest_json)

inspect_ai/log/_log.py

@@ -422,7 +422,7 @@ class EvalSample(BaseModel):
             # warning will handle this)
             del values["transcript"]
 
-        return migrate_sandbox_spec(values)
+        return migrate_values(values)
 
     # allow field model_usage
     model_config = ConfigDict(protected_namespaces=())
@@ -707,7 +707,10 @@ class EvalSpec(BaseModel):
     """Attributes of the @task decorator."""
 
     task_args: dict[str, Any] = Field(default_factory=dict)
-    """Arguments used for invoking the task."""
+    """Arguments used for invoking the task (including defaults)."""
+
+    task_args_passed: dict[str, Any] = Field(default_factory=dict)
+    """Arguments explicitly passed by caller for invoking the task."""
 
     solver: str | None = Field(default=None)
     """Solver name."""
@@ -782,16 +785,18 @@ class EvalSpec(BaseModel):
     def read_sandbox_spec(
         cls: Type["EvalSpec"], values: dict[str, Any]
     ) -> dict[str, Any]:
-        return migrate_sandbox_spec(values)
+        return migrate_values(values)
 
 
-def migrate_sandbox_spec(values: dict[str, Any]) -> dict[str, Any]:
+def migrate_values(values: dict[str, Any]) -> dict[str, Any]:
     if "sandbox" in values:
         sandbox = values.get("sandbox")
         if isinstance(sandbox, list):
             values["sandbox"] = SandboxEnvironmentSpec(
                 type=sandbox[0], config=sandbox[1]
             )
+    if "task_args_passed" not in values:
+        values["task_args_passed"] = values.get("task_args", {})
     return values
 
 

inspect_ai/log/_recorders/json.py

@@ -3,6 +3,7 @@ from typing import Any, Literal, get_args
 
 import ijson  # type: ignore
 from ijson import IncompleteJSONError
+from ijson.backends.python import UnexpectedSymbol  # type: ignore
 from pydantic import BaseModel
 from pydantic_core import from_json
 from typing_extensions import override
@@ -129,12 +130,13 @@ class JSONRecorder(FileRecorder):
             # The Python JSON serializer supports NaN and Inf, however
             # this isn't technically part of the JSON spec. The json-stream
             # library shares this limitation, so if we fail with an
-            # invalid character then we move on and and parse w/ pydantic
+            # invalid character (or Unexpected symbol) then we move on and and parse w/ pydantic
             # (which does support NaN and Inf by default)
-            except (ValueError, IncompleteJSONError) as ex:
+            except (ValueError, IncompleteJSONError, UnexpectedSymbol) as ex:
                 if (
                     str(ex).find("Invalid JSON character") != -1
                     or str(ex).find("invalid char in json text") != -1
+                    or str(ex).find("Unexpected symbol") != -1
                 ):
                     pass
                 else:

inspect_ai/log/_util.py

@@ -4,6 +4,7 @@ from typing import Any
 
 from inspect_ai._util.content import (
     ContentAudio,
+    ContentData,
     ContentImage,
     ContentReasoning,
     ContentText,
@@ -24,6 +25,7 @@ def text_input_only(inputs: str | list[ChatMessage]) -> str | list[ChatMessage]:
                     | ContentImage
                     | ContentAudio
                     | ContentVideo
+                    | ContentData
                 ] = []
                 for content in message.content:
                     if content.type == "text":

inspect_ai/model/__init__.py

@@ -1,8 +1,16 @@
 # ruff: noqa: F401 F403 F405
 
+from inspect_ai._util.citation import (
+    Citation,
+    CitationBase,
+    ContentCitation,
+    DocumentCitation,
+    UrlCitation,
+)
 from inspect_ai._util.content import (
     Content,
     ContentAudio,
+    ContentData,
     ContentImage,
     ContentReasoning,
     ContentText,
@@ -59,6 +67,7 @@ __all__ = [
     "ResponseSchema",
     "CachePolicy",
     "ContentAudio",
+    "ContentData",
     "ContentImage",
     "ContentReasoning",
     "ContentText",
@@ -93,6 +102,11 @@ __all__ = [
     "cache_size",
     "get_model",
     "modelapi",
+    "Citation",
+    "CitationBase",
+    "DocumentCitation",
+    "ContentCitation",
+    "UrlCitation",
 ]
 
 _TOOL_MODULE_VERSION = "0.3.18"