inspect-ai 0.3.73__py3-none-any.whl → 0.3.75__py3-none-any.whl

inspect_ai/_view/www/package.json

@@ -39,7 +39,7 @@
     "vite": "^5.3.2"
   },
   "dependencies": {
-    "@codemirror/autocomplete": "^6.18.4",
+    "@codemirror/autocomplete": "^6.18.6",
     "@codemirror/language": "^6.10.8",
     "@codemirror/lint": "^6.8.4",
     "@codemirror/state": "^6.5.2",
@@ -62,7 +62,7 @@
     "markdown-it": "^14.1.0",
     "murmurhash": "^2.0.1",
     "postcss-url": "^10.1.3",
-    "prismjs": "^1.29.0",
+    "prismjs": "^1.30.0",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
     "react-virtuoso": "^4.12.5"

inspect_ai/_view/www/src/appearance/styles.ts

@@ -1,3 +1,4 @@
+import { CSSProperties } from "react";
 import { FontSize, TextStyle } from "./fonts";
 
 export const ApplicationStyles = {
@@ -9,15 +10,15 @@ export const ApplicationStyles = {
   },
   threeLineClamp: {
     display: "-webkit-box",
-    "-webkit-line-clamp": "3",
-    "-webkit-box-orient": "vertical",
+    WebkitLineClamp: "3",
+    WebkitBoxOrient: "vertical",
     overflow: "hidden",
   },
-  lineClamp: (len: number) => {
+  lineClamp: (len: number): CSSProperties => {
     return {
       display: "-webkit-box",
-      "-webkit-line-clamp": `${len}`,
-      "-webkit-box-orient": "vertical",
+      WebkitLineClamp: `${len}`,
+      WebkitBoxOrient: "vertical",
       overflow: "hidden",
     };
   },

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

@@ -20,10 +20,10 @@ export const ANSIDisplay: FC<ANSIDisplayProps> = ({
   let firstOutput = false;
   return (
     <div className={clsx("ansi-display", className)} style={{ ...style }}>
-      {ansiOutput.outputLines.map((line) => {
+      {ansiOutput.outputLines.map((line, index) => {
         firstOutput = firstOutput || !!line.outputRuns.length;
         return (
-          <div className={"ansi-display-line"}>
+          <div key={index} className={"ansi-display-line"}>
             {!line.outputRuns.length ? (
               firstOutput ? (
                 <br />

inspect_ai/_view/www/src/constants.ts

@@ -1,3 +1,6 @@
+// Model constants
+export const kModelNone = "none/none";
+
 // Workspace tab constants
 export const kEvalWorkspaceTabId = "eval-tab";
 export const kJsonWorkspaceTabId = "json-tab";

inspect_ai/_view/www/src/logfile/remoteZipFile.ts

@@ -65,8 +65,54 @@ export const openRemoteZipFile = async (
   );
   const eocdrView = new DataView(eocdrBuffer.buffer);
 
-  const centralDirOffset = eocdrView.getUint32(16, true);
-  const centralDirSize = eocdrView.getUint32(12, true);
+  // Check signature to make sure we found the EOCD record
+  if (eocdrView.getUint32(0, true) !== 0x06054b50) {
+    throw new Error("End of central directory record not found");
+  }
+
+  let centralDirOffset = eocdrView.getUint32(16, true);
+  let centralDirSize = eocdrView.getUint32(12, true);
+
+  // Check if we need to use ZIP64 format
+  const needsZip64 =
+    centralDirOffset === 0xffffffff || centralDirSize === 0xffffffff;
+
+  if (needsZip64) {
+    // We need to locate and read the ZIP64 EOCD record and locator
+    // First, read the ZIP64 EOCD locator which is just before the standard EOCD
+    // Standard EOCD (22 bytes) + Locator (20 bytes)
+    const locatorBuffer = await fetchBytes(
+      url,
+      contentLength - 22 - 20,
+      contentLength - 23,
+    );
+    const locatorView = new DataView(locatorBuffer.buffer);
+
+    // Verify the ZIP64 EOCD locator signature
+    if (locatorView.getUint32(0, true) !== 0x07064b50) {
+      throw new Error("ZIP64 End of central directory locator not found");
+    }
+
+    // Get the offset to the ZIP64 EOCD record
+    const zip64EOCDOffset = Number(locatorView.getBigUint64(8, true));
+
+    // Now read the ZIP64 EOCD record
+    const zip64EOCDBuffer = await fetchBytes(
+      url,
+      zip64EOCDOffset,
+      zip64EOCDOffset + 56,
+    );
+    const zip64EOCDView = new DataView(zip64EOCDBuffer.buffer);
+
+    // Verify the ZIP64 EOCD signature
+    if (zip64EOCDView.getUint32(0, true) !== 0x06064b50) {
+      throw new Error("ZIP64 End of central directory record not found");
+    }
+
+    // Get the 64-bit central directory size and offset
+    centralDirSize = Number(zip64EOCDView.getBigUint64(40, true));
+    centralDirOffset = Number(zip64EOCDView.getBigUint64(48, true));
+  }
 
   // Fetch and parse the central directory
   const centralDirBuffer = await fetchBytes(
@@ -75,6 +121,7 @@ export const openRemoteZipFile = async (
     centralDirOffset + centralDirSize - 1,
   );
   const centralDirectory = parseCentralDirectory(centralDirBuffer);
+
   return {
     centralDirectory: centralDirectory,
     readFile: async (file, maxBytes): Promise<Uint8Array> => {
@@ -97,6 +144,8 @@ export const openRemoteZipFile = async (
 
       // 28-29 bytes in local header
       const extraFieldLength = headerData[28] + (headerData[29] << 8);
+
+      // Use the entry's compressed size from the central directory
       const totalSizeToFetch =
         headerSize + filenameLength + extraFieldLength + entry.compressedSize;
 
@@ -118,13 +167,13 @@ export const openRemoteZipFile = async (
         // No compression
         return zipFileEntry.data;
       } else if (zipFileEntry.compressionMethod === 8) {
-        // Defate compression
+        // Deflate compression
         const results = await decompressAsync(zipFileEntry.data, {
           size: zipFileEntry.uncompressedSize,
         });
         return results;
       } else {
-        throw new Error(`Unsupported compressionMethod for file ${file}`);
+        throw new Error(`Unsupported compression method for file ${file}`);
       }
     },
   };
@@ -194,15 +243,63 @@ const parseZipFileEntry = async (
   offset += 4; // Skip last mod time and date
   const crc32 = view.getUint32(offset, true);
   offset += 4;
-  const compressedSize = view.getUint32(offset, true);
+
+  // Get initial sizes from standard header
+  let compressedSize = view.getUint32(offset, true);
   offset += 4;
-  const uncompressedSize = view.getUint32(offset, true);
+  let uncompressedSize = view.getUint32(offset, true);
   offset += 4;
+
   const filenameLength = view.getUint16(offset, true);
   offset += 2;
   const extraFieldLength = view.getUint16(offset, true);
   offset += 2;
 
+  // The original header offset
+  const headerOffset = offset;
+
+  // Check if we need to look for ZIP64 extra fields
+  const needsZip64 =
+    compressedSize === 0xffffffff || uncompressedSize === 0xffffffff;
+
+  if (needsZip64) {
+    // Skip the filename
+    offset += filenameLength;
+
+    // Look through extra fields for ZIP64 data
+    const extraFieldEnd = offset + extraFieldLength;
+    while (offset < extraFieldEnd) {
+      const tag = view.getUint16(offset, true);
+      const size = view.getUint16(offset + 2, true);
+
+      if (tag === 0x0001) {
+        // ZIP64 Extra Field
+        // Position in the extra field data
+        let zip64Offset = offset + 4;
+
+        // Read values in the order they appear in the ZIP64 extra field
+        if (
+          uncompressedSize === 0xffffffff &&
+          zip64Offset + 8 <= extraFieldEnd
+        ) {
+          uncompressedSize = Number(view.getBigUint64(zip64Offset, true));
+          zip64Offset += 8;
+        }
+
+        if (compressedSize === 0xffffffff && zip64Offset + 8 <= extraFieldEnd) {
+          compressedSize = Number(view.getBigUint64(zip64Offset, true));
+        }
+
+        break;
+      }
+      offset += 4 + size;
+    }
+
+    // Reset offset
+    offset = headerOffset;
+  }
+
+  // Skip filename and extra field to get to the data
   offset += filenameLength + extraFieldLength;
 
   const data = rawData.subarray(offset, offset + compressedSize);
@@ -223,7 +320,7 @@ const kFileHeaderSize = 46;
 /**
  * Parses the central directory of a ZIP file from the provided buffer and returns a map of entries.
  */
-const parseCentralDirectory = (buffer: Uint8Array<ArrayBufferLike>) => {
+const parseCentralDirectory = (buffer: Uint8Array) => {
   let offset = 0;
   const view = new DataView(buffer.buffer);
   const entries = new Map();
@@ -236,6 +333,11 @@ const parseCentralDirectory = (buffer: Uint8Array<ArrayBufferLike>) => {
     const extraFieldLength = view.getUint16(offset + 30, true);
     const fileCommentLength = view.getUint16(offset + 32, true);
 
+    // Get initial 32-bit values
+    let compressedSize = view.getUint32(offset + 20, true);
+    let uncompressedSize = view.getUint32(offset + 24, true);
+    let fileOffset = view.getUint32(offset + 42, true);
+
     const filename = new TextDecoder().decode(
       buffer.subarray(
         offset + kFileHeaderSize,
@@ -243,34 +345,53 @@ const parseCentralDirectory = (buffer: Uint8Array<ArrayBufferLike>) => {
       ),
     );
 
-    // Read 32-bit file offset
-    let fileOffset = view.getUint32(offset + 42, true);
+    // Check if we need to use ZIP64 extra fields
+    const needsZip64 =
+      fileOffset === 0xffffffff ||
+      compressedSize === 0xffffffff ||
+      uncompressedSize === 0xffffffff;
 
-    // If fileOffset is 0xFFFFFFFF, use the ZIP64 extended offset instead
-    if (fileOffset === 0xffffffff) {
+    if (needsZip64) {
       // Move to extra field
       let extraOffset = offset + kFileHeaderSize + filenameLength;
+      const extraEnd = extraOffset + extraFieldLength;
+
       // Look through extra fields until we find zip64 extra field
-      while (
-        extraOffset <
-        offset + kFileHeaderSize + filenameLength + extraFieldLength
-      ) {
+      while (extraOffset < extraEnd) {
         const tag = view.getUint16(extraOffset, true);
         const size = view.getUint16(extraOffset + 2, true);
+
         if (tag === 0x0001) {
-          // ZIP64 Extra Field - Read 64-bit offset
-          fileOffset = Number(view.getBigUint64(extraOffset + 4, true));
+          // ZIP64 Extra Field
+          // Position in the extra field data
+          let zip64Offset = extraOffset + 4;
+
+          // Read values in the order they appear in the ZIP64 extra field
+          if (uncompressedSize === 0xffffffff && zip64Offset + 8 <= extraEnd) {
+            uncompressedSize = Number(view.getBigUint64(zip64Offset, true));
+            zip64Offset += 8;
+          }
+
+          if (compressedSize === 0xffffffff && zip64Offset + 8 <= extraEnd) {
+            compressedSize = Number(view.getBigUint64(zip64Offset, true));
+            zip64Offset += 8;
+          }
+
+          if (fileOffset === 0xffffffff && zip64Offset + 8 <= extraEnd) {
+            fileOffset = Number(view.getBigUint64(zip64Offset, true));
+          }
+
           break;
         }
-        extraOffset += 4 + size; // Move to next extra field
+        extraOffset += 4 + size;
       }
     }
 
     const entry = {
       filename,
       compressionMethod: view.getUint16(offset + 10, true),
-      compressedSize: view.getUint32(offset + 20, true),
-      uncompressedSize: view.getUint32(offset + 24, true),
+      compressedSize,
+      uncompressedSize,
       fileOffset,
     };
 

inspect_ai/_view/www/src/plan/PlanDetailView.tsx

@@ -8,6 +8,7 @@ import { SolversDetailView } from "./SolverDetailView";
 
 import clsx from "clsx";
 import { FC, ReactNode } from "react";
+import { kModelNone } from "../constants";
 import styles from "./PlanDetailView.module.css";
 
 interface PlanDetailViewProps {
@@ -71,7 +72,7 @@ export const PlanDetailView: FC<PlanDetailViewProps> = ({
     taskInformation["Tags"] = evaluation.tags.join(", ");
   }
 
-  if (evaluation?.model) {
+  if (evaluation?.model && evaluation.model !== kModelNone) {
     config["model"] = evaluation.model;
   }
 

inspect_ai/_view/www/src/samples/SampleSummaryView.tsx

@@ -146,7 +146,7 @@ export const SampleSummaryView: FC<SampleSummaryViewProps> = ({
       // TODO: Cleanup once the PR lands which makes sample / sample summary share common interface
       sampleDescriptor?.selectedScore(sample)?.render() || ""
     ),
-    size: "minmax(2em, auto)",
+    size: "minmax(2em, 30em)",
     center: true,
   });
 

inspect_ai/_view/www/src/samples/chat/tools/tool.ts

@@ -53,11 +53,13 @@ const extractInput = (
 ): { input?: string; args: string[] } => {
   const formatArg = (key: string, value: unknown) => {
     const quotedValue =
-      typeof value === "string"
-        ? `"${value}"`
-        : typeof value === "object" || Array.isArray(value)
-          ? JSON.stringify(value, undefined, 2)
-          : String(value);
+      value === null
+        ? "None"
+        : typeof value === "string"
+          ? `"${value}"`
+          : typeof value === "object" || Array.isArray(value)
+            ? JSON.stringify(value, undefined, 2)
+            : String(value);
     return `${key}: ${quotedValue}`;
   };
   if (args) {

inspect_ai/_view/www/src/samples/error/FlatSampleErrorView.module.css

@@ -16,4 +16,5 @@
   font-size: var(--inspect-font-size-base);
   line-height: var(--inspect-font-size-base);
   height: var(--inspect-font-size-base);
+  max-width: 30em;
 }

inspect_ai/_view/www/src/samples/error/FlatSampleErrorView.tsx

@@ -15,7 +15,9 @@ export const FlatSampleError: FC<FlatSampleErrorViewProps> = ({ message }) => {
   return (
     <div className={clsx(styles.flatBody)}>
       <i className={clsx(ApplicationIcons.error, styles.iconSmall)} />
-      <div className={clsx(styles.lineBase)}>{errorType(message)}</div>
+      <div className={clsx(styles.lineBase, "text-truncate")}>
+        {errorType(message)}
+      </div>
     </div>
   );
 };

inspect_ai/_view/www/src/samples/sample-tools/sample-filter/SampleFilter.tsx

@@ -138,8 +138,11 @@ const getLints = (
   if (!filterError) return [];
   return [
     {
-      from: filterError.from || 0,
-      to: filterError.to || view.state.doc.length,
+      from: Math.min(filterError.from || 0, view.state.doc.length),
+      to: Math.min(
+        filterError.to || view.state.doc.length,
+        view.state.doc.length,
+      ),
       severity: filterError.severity,
       message: filterError.message,
     },

inspect_ai/_view/www/src/samples/transcript/state/StateEventView.tsx

@@ -17,7 +17,7 @@ import {
   StoreSpecificRenderableTypes,
 } from "./StateEventRenderers";
 
-import { useMemo, FC } from "react";
+import { FC, useMemo } from "react";
 import styles from "./StateEventView.module.css";
 
 interface StateEventViewProps {
@@ -246,6 +246,10 @@ const synthesizeComparable = (changes: Changes) => {
         setPath(before, change.path, change.value);
         break;
       case "replace":
+        // 'Fill in' arrays with empty strings to ensure there is no unnecessary diff
+        initializeArrays(before, change.path);
+        initializeArrays(after, change.path);
+
         setPath(before, change.path, change.replaced);
         setPath(after, change.path, change.value);
         break;

inspect_ai/_view/www/src/workspace/navbar/PrimaryBar.tsx

@@ -3,6 +3,7 @@ import { FC, useCallback } from "react";
 import { SampleSummary } from "../../api/types";
 import { ApplicationIcons } from "../../appearance/icons";
 import { CopyButton } from "../../components/CopyButton";
+import { kModelNone } from "../../constants";
 import { EvalResults, EvalSpec, Status } from "../../types/log";
 import { filename } from "../../utils/path";
 import styles from "./PrimaryBar.module.css";
@@ -71,18 +72,22 @@ export const PrimaryBar: FC<PrimaryBarProps> = ({
             >
               {evalSpec?.task}
             </div>
-            <div
-              id="task-model"
-              className={clsx(
-                "task-model",
-                "text-truncate",
-                styles.taskModel,
-                "text-size-base",
-              )}
-              title={evalSpec?.model}
-            >
-              {evalSpec?.model}
-            </div>
+            {evalSpec?.model && evalSpec.model !== kModelNone ? (
+              <div
+                id="task-model"
+                className={clsx(
+                  "task-model",
+                  "text-truncate",
+                  styles.taskModel,
+                  "text-size-base",
+                )}
+                title={evalSpec?.model}
+              >
+                {evalSpec?.model}
+              </div>
+            ) : (
+              ""
+            )}
           </div>
           <div className={clsx("text-size-small", styles.secondaryContainer)}>
             <div className={clsx("navbar-secondary-text", "text-truncate")}>

inspect_ai/_view/www/src/workspace/sidebar/SidebarLogEntry.tsx

@@ -1,6 +1,7 @@
 import clsx from "clsx";
 import { FC, Fragment } from "react";
 import { EvalLogHeader } from "../../api/types";
+import { kModelNone } from "../../constants";
 import { EvalStatus } from "./EvalStatus";
 import styles from "./SidebarLogEntry.module.css";
 
@@ -51,7 +52,7 @@ export const SidebarLogEntry: FC<SidebarLogEntryProps> = ({
           </div>
           <small className={clsx("mb-1", "text-size-small")}>{timeStr}</small>
 
-          {model ? (
+          {model && model !== kModelNone ? (
             <div>
               <small className={clsx("mb-1", "text-size-small")}>{model}</small>
             </div>

inspect_ai/_view/www/yarn.lock

@@ -220,13 +220,20 @@
     "@codemirror/view" "^6.0.0"
     crelt "^1.0.5"
 
-"@codemirror/state@^6.0.0", "@codemirror/state@^6.4.0", "@codemirror/state@^6.5.0", "@codemirror/state@^6.5.1":
+"@codemirror/state@^6.0.0", "@codemirror/state@^6.4.0", "@codemirror/state@^6.5.0":
   version "6.5.1"
   resolved "https://registry.yarnpkg.com/@codemirror/state/-/state-6.5.1.tgz#e5c0599f7b43cf03f19e05861317df5425c07904"
   integrity sha512-3rA9lcwciEB47ZevqvD8qgbzhM9qMb8vCcQCNmDfVRPQG4JT9mSb0Jg8H7YjKGGQcFnLN323fj9jdnG59Kx6bg==
   dependencies:
     "@marijn/find-cluster-break" "^1.0.0"
 
+"@codemirror/state@^6.5.2":
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/@codemirror/state/-/state-6.5.2.tgz#8eca3a64212a83367dc85475b7d78d5c9b7076c6"
+  integrity sha512-FVqsPqtPWKVVL3dPSxy8wEF/ymIEuVzF1PK3VbUgrxXpJUSHQWWZz4JMToquRxnkw+36LTamCZG2iua2Ptq0fA==
+  dependencies:
+    "@marijn/find-cluster-break" "^1.0.0"
+
 "@codemirror/view@^6.0.0", "@codemirror/view@^6.17.0", "@codemirror/view@^6.23.0", "@codemirror/view@^6.27.0", "@codemirror/view@^6.35.0":
   version "6.36.2"
   resolved "https://registry.yarnpkg.com/@codemirror/view/-/view-6.36.2.tgz#aeb644e161440734ac5a153bf6e5b4a4355047be"
@@ -862,10 +869,10 @@ argparse@^2.0.1:
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
   integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
 
-asciinema-player@^3.8.2:
-  version "3.8.2"
-  resolved "https://registry.yarnpkg.com/asciinema-player/-/asciinema-player-3.8.2.tgz#12fbf475ddaeee0051ace17532e5f003475f6dfa"
-  integrity sha512-Lgcnj9u/H6sRpGRX1my7Azcay6llLmB/GVkCGcDbPwdTVTisS1ir8SQ9jRWRvjlLUjpSJkN0euruvy3sLRM8tw==
+asciinema-player@^3.9.0:
+  version "3.9.0"
+  resolved "https://registry.yarnpkg.com/asciinema-player/-/asciinema-player-3.9.0.tgz#c60742f85978e861b878fc7eb6289a5622c298af"
+  integrity sha512-SXVFImVzeNr8ZUdNIHABGuzlbnGWTKy245AquAjODsAnv+Lp6vxjYGN0LfA8ns30tnx/ag/bMrTbLq13TpHE6w==
   dependencies:
     "@babel/runtime" "^7.21.0"
     solid-js "^1.3.0"

inspect_ai/log/_log.py

@@ -215,7 +215,16 @@ class EvalSample(BaseModel):
         Returns:
           StoreModel: Instance of model_cls bound to sample store data.
         """
-        return model_cls(store=Store(self.store))
+        # un-namespace names for creation
+        data = {
+            k.replace(f"{model_cls.__name__}:", "", 1): v for k, v in self.store.items()
+        }
+
+        # since we are reading from the log provide a fully detached store
+        data["store"] = Store()
+
+        # create the model
+        return model_cls.model_validate(data)
 
     events: list[Event] = Field(default_factory=list)
     """Events that occurred during sample execution."""

inspect_ai/log/_recorders/eval.py

@@ -10,7 +10,7 @@ from pydantic import BaseModel, Field
 from pydantic_core import to_json
 from typing_extensions import override
 
-from inspect_ai._util.constants import LOG_SCHEMA_VERSION
+from inspect_ai._util.constants import DESERIALIZING_CONTEXT, LOG_SCHEMA_VERSION
 from inspect_ai._util.content import (
     ContentAudio,
     ContentImage,
@@ -224,7 +224,9 @@ class EvalRecorder(FileRecorder):
             with ZipFile(z, mode="r") as zip:
                 try:
                     with zip.open(_sample_filename(id, epoch), "r") as f:
-                        return EvalSample(**json.load(f))
+                        return EvalSample.model_validate(
+                            json.load(f), context=DESERIALIZING_CONTEXT
+                        )
                 except KeyError:
                     raise IndexError(
                         f"Sample id {id} for epoch {epoch} not found in log {location}"
@@ -414,7 +416,10 @@ def _read_log(log: BinaryIO, location: str, header_only: bool = False) -> EvalLo
         if REDUCTIONS_JSON in zip.namelist():
             with zip.open(REDUCTIONS_JSON, "r") as f:
                 reductions = [
-                    EvalSampleReductions(**reduction) for reduction in json.load(f)
+                    EvalSampleReductions.model_validate(
+                        reduction, context=DESERIALIZING_CONTEXT
+                    )
+                    for reduction in json.load(f)
                 ]
                 if evalLog.results is not None:
                     evalLog.reductions = reductions
@@ -425,7 +430,11 @@ def _read_log(log: BinaryIO, location: str, header_only: bool = False) -> EvalLo
             for name in zip.namelist():
                 if name.startswith(f"{SAMPLES_DIR}/") and name.endswith(".json"):
                     with zip.open(name, "r") as f:
-                        samples.append(EvalSample(**json.load(f)))
+                        samples.append(
+                            EvalSample.model_validate(
+                                json.load(f), context=DESERIALIZING_CONTEXT
+                            ),
+                        )
             sort_samples(samples)
             evalLog.samples = samples
         return evalLog
@@ -452,7 +461,10 @@ def _read_all_summaries(zip: ZipFile, count: int) -> list[SampleSummary]:
     if SUMMARIES_JSON in zip.namelist():
         summaries_raw = _read_json(zip, SUMMARIES_JSON)
         if isinstance(summaries_raw, list):
-            return [SampleSummary(**value) for value in summaries_raw]
+            return [
+                SampleSummary.model_validate(value, context=DESERIALIZING_CONTEXT)
+                for value in summaries_raw
+            ]
         else:
             raise ValueError(
                 f"Expected a list of summaries when reading {SUMMARIES_JSON}"
@@ -464,7 +476,14 @@ def _read_all_summaries(zip: ZipFile, count: int) -> list[SampleSummary]:
             summary_path = _journal_summary_path(summary_file)
             summary = _read_json(zip, summary_path)
             if isinstance(summary, list):
-                summaries.extend([SampleSummary(**value) for value in summary])
+                summaries.extend(
+                    [
+                        SampleSummary.model_validate(
+                            value, context=DESERIALIZING_CONTEXT
+                        )
+                        for value in summary
+                    ]
+                )
             else:
                 raise ValueError(
                     f"Expected a list of summaries when reading {summary_file}"
@@ -476,12 +495,12 @@ def _read_header(zip: ZipFile, location: str) -> EvalLog:
     # first see if the header is here
     if HEADER_JSON in zip.namelist():
         with zip.open(HEADER_JSON, "r") as f:
-            log = EvalLog(**json.load(f))
+            log = EvalLog.model_validate(json.load(f), context=DESERIALIZING_CONTEXT)
             log.location = location
             return log
     else:
         with zip.open(_journal_path(START_JSON), "r") as f:
-            start = LogStart(**json.load(f))
+            start = LogStart.model_validate(json.load(f), context=DESERIALIZING_CONTEXT)
         return EvalLog(
             version=start.version, eval=start.eval, plan=start.plan, location=location
         )

inspect_ai/log/_recorders/json.py

@@ -7,7 +7,7 @@ from pydantic import BaseModel
 from pydantic_core import from_json
 from typing_extensions import override
 
-from inspect_ai._util.constants import LOG_SCHEMA_VERSION
+from inspect_ai._util.constants import DESERIALIZING_CONTEXT, LOG_SCHEMA_VERSION
 from inspect_ai._util.error import EvalError
 from inspect_ai._util.file import absolute_file_path, file
 from inspect_ai._util.trace import trace_action
@@ -143,7 +143,7 @@ class JSONRecorder(FileRecorder):
         with file(location, "r") as f:
             # parse w/ pydantic
             raw_data = from_json(f.read())
-            log = EvalLog(**raw_data)
+            log = EvalLog.model_validate(raw_data, context=DESERIALIZING_CONTEXT)
             log.location = location
 
             # fail for unknown version

inspect_ai/model/_cache.py

@@ -155,7 +155,9 @@ def _cache_key(entry: CacheEntry) -> str:
                 exclude=set(["max_retries", "timeout", "max_connections"])
             )
         ),
-        ",".join([str(message.model_dump()) for message in entry.input]),
+        ",".join(
+            [str(message.model_dump(exclude=set(["id"]))) for message in entry.input]
+        ),
         entry.base_url,
         entry.tool_choice,
         entry.tools,