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

inspect_ai/_view/www/src/{api → client/api}/client-api.ts

@@ -1,10 +1,10 @@
+import { EvalLog, EvalSample } from "../../@types/log";
 import {
   openRemoteLogFile,
   RemoteLogFile,
   SampleNotFoundError,
-} from "../logfile/remoteLogFile";
-import { FileSizeLimitError } from "../logfile/remoteZipFile";
-import { EvalLog, EvalSample } from "../types/log";
+} from "../remote/remoteLogFile";
+import { FileSizeLimitError } from "../remote/remoteZipFile";
 import { encodePathParts } from "./api-shared";
 import {
   ClientAPI,
@@ -65,12 +65,13 @@ export const clientApi = (api: LogViewAPI, log_file?: string): ClientAPI => {
 
   const remoteEvalFile = async (log_file: string, cached: boolean = false) => {
     if (!cached || loadedEvalFile.file !== log_file) {
-      loadedEvalFile.file = log_file;
-      loadedEvalFile.remoteLog = await openRemoteLogFile(
+      const remoteLog = await openRemoteLogFile(
         api,
         encodePathParts(log_file),
         5,
       );
+      loadedEvalFile.file = log_file;
+      loadedEvalFile.remoteLog = remoteLog;
     }
     return loadedEvalFile.remoteLog;
   };

inspect_ai/_view/www/src/{api → client/api}/index.ts

@@ -1,6 +1,6 @@
 import JSON5 from "json5";
-import { dirname } from "../utils/path";
-import { getVscodeApi } from "../utils/vscode";
+import { dirname } from "../../utils/path";
+import { getVscodeApi } from "../../utils/vscode";
 import browserApi from "./api-browser";
 import simpleHttpApi from "./api-http";
 import vscodeApi from "./api-vscode";

inspect_ai/_view/www/src/{api → client/api}/types.ts

@@ -24,7 +24,7 @@ import {
   Target,
   ToolEvent,
   Version,
-} from "../types/log";
+} from "../../@types/log";
 
 export interface EvalSummary {
   version?: Version;
@@ -116,6 +116,7 @@ export interface SampleSummary {
   error?: string;
   limit?: string;
   completed?: boolean;
+  retries?: number;
 }
 
 export interface BasicSampleData {
@@ -241,6 +242,8 @@ export interface UpdateStateMessage {
   data: {
     type: "updateState";
     url: string;
+    sample_id?: string;
+    sample_epoch?: string;
   };
 }
 

inspect_ai/_view/www/src/{logfile → client/remote}/remoteLogFile.ts

@@ -1,12 +1,12 @@
+import { EvalLog, EvalPlan, EvalSample, EvalSpec } from "../../@types/log";
+import { asyncJsonParse } from "../../utils/json-worker";
+import { AsyncQueue } from "../../utils/queue";
 import {
   EvalHeader,
   EvalSummary,
   LogViewAPI,
   SampleSummary,
 } from "../api/types";
-import { EvalLog, EvalPlan, EvalSample, EvalSpec } from "../types/log";
-import { asyncJsonParse } from "../utils/json-worker";
-import { AsyncQueue } from "../utils/queue";
 import { FileSizeLimitError, openRemoteZipFile } from "./remoteZipFile";
 
 // don't try to load samples greater than 50mb

inspect_ai/_view/www/src/{storage → client/storage}/index.ts

@@ -1,19 +1,25 @@
+import JSON5 from "json5";
+import { PersistedState } from "../../state/store";
+import { getVscodeApi } from "../../utils/vscode";
 import { ClientStorage } from "../api/types";
-import { PersistedState } from "../state/store";
-import { getVscodeApi } from "../utils/vscode";
 
 const resolveStorage = (): ClientStorage | undefined => {
   const vscodeApi = getVscodeApi();
   if (vscodeApi) {
     return {
       getItem: (_name: string) => {
-        const state = vscodeApi.getState() as PersistedState;
-        return state;
+        const state = vscodeApi.getState() as string;
+        const deserialized = JSON5.parse(state) as {
+          state: PersistedState;
+          version: number;
+        };
+        return deserialized;
       },
       setItem: (_name: string, value: unknown) => {
         // TODO: This is pretty gnarly type hijinks
         const valObj = value as { state: PersistedState; version: number };
-        vscodeApi.setState(valObj);
+        const serialized = JSON5.stringify(valObj);
+        vscodeApi.setState(serialized);
       },
       removeItem: (_name: string) => {
         vscodeApi.setState(null);

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

@@ -1,6 +1,6 @@
 import clsx from "clsx";
 import { FC, ReactNode } from "react";
-import { ApplicationIcons } from "../appearance/icons";
+import { ApplicationIcons } from "../app/appearance/icons";
 import "./Card.css";
 
 interface CardHeaderProps {

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

@@ -1,6 +1,6 @@
 import clsx from "clsx";
 import { JSX, useState } from "react";
-import { ApplicationIcons } from "../appearance/icons";
+import { ApplicationIcons } from "../app/appearance/icons";
 import styles from "./CopyButton.module.css";
 
 interface CopyButtonProps {

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

@@ -1,5 +1,5 @@
 import { FC } from "react";
-import api from "../api/index";
+import api from "../client/api/index";
 import "./DownloadButton.css";
 
 interface DownloadButtonProps {

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

@@ -1,5 +1,5 @@
 import { FC } from "react";
-import { ApplicationIcons } from "../appearance/icons";
+import { ApplicationIcons } from "../app/appearance/icons";
 import "./ErrorPanel.css";
 
 export interface DisplayError {

inspect_ai/_view/www/src/components/{ExpandablePanel.css → ExpandablePanel.module.css}

@@ -1,39 +1,42 @@
-.expandable-bordered {
+.expandableBordered {
   border: solid var(--bs-light-border-subtle) 1px;
 }
 
-.expandable-togglable {
+.expandableTogglable {
   margin-bottom: 1em;
 }
 
-.expandable-contents {
+.expandableContents {
   font-size: var(--inspect-font-size-base);
 }
 
-.expandable-collapsed {
+.expandableCollapsed {
   overflow: hidden;
 }
 
-.more-toggle {
+.moreToggle {
   display: flex;
-  margin-bottom: 0.5em;
   margin-top: 0;
+  position: relative;
+  height: 8px;
 }
 
-.more-toggle.bordered {
+.moreToggle.bordered {
   border-top: solid var(--bs-light-border-subtle) 1px;
-  margin-top: 0.5em;
 }
 
-.more-toggle-container {
+.moreToggleContainer {
+  position: absolute;
+  top: -1px;
+  right: 0;
   display: inline-block;
   border: solid var(--bs-light-border-subtle) 1px;
   border-top: none;
   margin-left: auto;
-  margin-right: 1em;
+  margin-right: 0;
 }
 
-.more-toggle-button {
+.moreToggleButton {
   font-size: var(--inspect-font-size-smaller);
   border: none;
   padding: 0.1rem 0.5rem;

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

@@ -8,10 +8,10 @@ import {
   useRef,
   useState,
 } from "react";
-import { ApplicationIcons } from "../appearance/icons";
+import { ApplicationIcons } from "../app/appearance/icons";
 import { useCollapsedState } from "../state/hooks";
 import { useResizeObserver } from "../utils/dom";
-import "./ExpandablePanel.css";
+import styles from "./ExpandablePanel.module.css";
 
 interface ExpandablePanelProps {
   id: string;
@@ -51,7 +51,7 @@ export const ExpandablePanel: FC<ExpandablePanelProps> = memo(
     const baseStyles = {
       overflow: "hidden",
       ...(collapsed && {
-        maxHeight: `${lines}em`,
+        maxHeight: `${lines}rem`,
       }),
     };
 
@@ -61,9 +61,9 @@ export const ExpandablePanel: FC<ExpandablePanelProps> = memo(
           style={baseStyles}
           ref={contentRef}
           className={clsx(
-            "expandable-panel",
-            collapsed ? "expandable-collapsed" : undefined,
-            border ? "expandable-bordered" : undefined,
+            styles.expandablePanel,
+            collapsed ? styles.expandableCollapsed : undefined,
+            border ? styles.expandableBordered : undefined,
           )}
         >
           {children}
@@ -104,10 +104,16 @@ const MoreToggle: FC<MoreToggleProps> = ({
   }, [setCollapsed, collapsed]);
 
   return (
-    <div className={`more-toggle ${border ? "bordered" : ""}`} style={style}>
-      <div className="more-toggle-container">
-        <button className="btn more-toggle-button" onClick={handleClick}>
-          <i className={icon} />
+    <div
+      className={clsx(styles.moreToggle, border ? styles.bordered : undefined)}
+      style={style}
+    >
+      <div className={clsx(styles.moreToggleContainer)}>
+        <button
+          className={clsx("btn", styles.moreToggleButton, "text-size-smallest")}
+          onClick={handleClick}
+        >
+          <i className={clsx(icon, styles.icon)} />
           {text}
         </button>
       </div>

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

@@ -1,5 +1,5 @@
 import { FC, KeyboardEvent, useCallback, useEffect, useRef } from "react";
-import { ApplicationIcons } from "../appearance/icons";
+import { ApplicationIcons } from "../app/appearance/icons";
 import { useStore } from "../state/store";
 import "./FindBand.css";
 

inspect_ai/_view/www/src/components/JsonPanel.css

@@ -10,8 +10,8 @@
 
 .json-panel .source-code {
   font-size: var(--inspect-font-size-small);
-  white-space: pre-wrap;
-  word-wrap: anywhere;
+  white-space: pre-wrap !important;
+  word-wrap: anywhere !important;
 }
 
 /* Prism.js theme customizations can go here if needed */

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

@@ -1,7 +1,7 @@
 import clsx from "clsx";
 import { ProgressBar } from "./ProgressBar";
 
-import { FC, ReactNode, RefObject, useRef } from "react";
+import { FC, ReactNode, RefObject, useEffect, useRef } from "react";
 import styles from "./LargeModal.module.css";
 
 export interface ModalTool {
@@ -55,6 +55,16 @@ export const LargeModal: FC<LargeModalProps> = ({
   const modalRef = useRef(null);
   scrollRef = scrollRef || modalRef;
 
+  // Focus the modal when it becomes visible
+  const dialogRef = useRef<HTMLDivElement>(null);
+
+  // Use effect to focus the modal when visible changes
+  useEffect(() => {
+    if (visible && dialogRef.current) {
+      dialogRef.current.focus();
+    }
+  }, [visible]);
+
   return (
     <div
       id={id}
@@ -66,6 +76,7 @@ export const LargeModal: FC<LargeModalProps> = ({
       role="dialog"
       onKeyUp={onkeyup}
       tabIndex={visible ? 0 : undefined}
+      ref={dialogRef}
     >
       <div
         className={clsx(

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

@@ -1,6 +1,6 @@
 import clsx from "clsx";
 import { FC, MouseEvent, ReactNode, useCallback, useEffect } from "react";
-import { ApplicationIcons } from "../appearance/icons";
+import { ApplicationIcons } from "../app/appearance/icons";
 import { useProperty } from "../state/hooks";
 import styles from "./LightboxCarousel.module.css";
 

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

@@ -97,7 +97,9 @@ const protectBackslashesInLatex = (content: string): string => {
 };
 
 const restoreBackslashesForLatex = (content: string): string => {
-  if (!content) return content;
+  if (!content) {
+    return content;
+  }
 
   try {
     // First restore backslashes

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

@@ -1,7 +1,7 @@
 import { clsx } from "clsx";
 
 import { FC, useCallback } from "react";
-import { ApplicationIcons } from "../appearance/icons";
+import { ApplicationIcons } from "../app/appearance/icons";
 import { useMessageVisibility } from "../state/hooks";
 import "./MessageBand.css";
 

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

@@ -1,7 +1,7 @@
 import clsx from "clsx";
 import { FC } from "react";
 
-import { ApplicationIcons } from "../appearance/icons";
+import { ApplicationIcons } from "../app/appearance/icons";
 import styles from "./NoContentsPanel.module.css";
 
 interface NoContentsPanelProps {

inspect_ai/_view/www/src/constants.ts

@@ -2,17 +2,18 @@
 export const kModelNone = "none/none";
 
 // Workspace tab constants
-export const kEvalWorkspaceTabId = "eval-tab";
-export const kJsonWorkspaceTabId = "json-tab";
-export const kInfoWorkspaceTabId = "plan-tab";
+export const kLogViewSamplesTabId = "samples";
+export const kLogViewJsonTabId = "json";
+export const kLogViewInfoTabId = "info";
 
 // Sample tab constants
-export const kSampleMessagesTabId = `sample-display-messages`;
-export const kSampleTranscriptTabId = `sample-display-transcript`;
-export const kSampleScoringTabId = `sample-display-scoring`;
-export const kSampleMetdataTabId = `sample-display-metadata`;
-export const kSampleErrorTabId = `sample-display-error`;
-export const kSampleJsonTabId = `sample-display-json`;
+export const kSampleMessagesTabId = `messages`;
+export const kSampleTranscriptTabId = `transcript`;
+export const kSampleScoringTabId = `scoring`;
+export const kSampleMetdataTabId = `metadata`;
+export const kSampleErrorTabId = `error`;
+export const kSampleErrorRetriesTabId = `retry-errors`;
+export const kSampleJsonTabId = `json`;
 
 // Scoring constants
 export const kScoreTypePassFail = "passfail";

inspect_ai/_view/www/src/index.tsx

@@ -1,10 +1,9 @@
 import { createRoot } from "react-dom/client";
-import api from "./api/index";
-import { Capabilities } from "./api/types";
-import { App } from "./App";
-import { AppErrorBoundary } from "./AppErrorBoundary";
-import { initializeStore } from "./state/store";
-import storage from "./storage";
+import { App } from "./app/App";
+import api from "./client/api/index";
+import { Capabilities } from "./client/api/types";
+import storage from "./client/storage";
+import { initializeStore, storeImplementation } from "./state/store";
 import { getVscodeApi } from "./utils/vscode";
 
 // Resolve the api
@@ -40,6 +39,9 @@ if (vscode) {
 // Inititialize the application store
 initializeStore(applicationApi, capabilities, applicationStorage);
 
+// Determine whether we need to restore a stored hash
+restoreHash();
+
 // Find the root element and render into it
 const containerId = "app";
 const container = document.getElementById(containerId);
@@ -52,8 +54,22 @@ if (!container) {
 
 // Render into the root
 const root = createRoot(container as HTMLElement);
-root.render(
-  <AppErrorBoundary>
-    <App api={applicationApi} />
-  </AppErrorBoundary>,
-);
+root.render(<App api={applicationApi} />);
+
+function restoreHash() {
+  // Check if we need to restore a route
+  if (storeImplementation && storeImplementation.getState().app.urlHash) {
+    const storedHash = storeImplementation.getState().app.urlHash;
+    if (storedHash) {
+      // Directly set the window location hash if there is
+      // a stored hash that needs to be restored
+      if (storedHash.startsWith("/")) {
+        window.location.hash = storedHash;
+      } else if (storedHash.startsWith("#")) {
+        window.location.hash = storedHash;
+      } else {
+        window.location.hash = "#" + storedHash;
+      }
+    }
+  }
+}

inspect_ai/_view/www/src/state/appSlice.ts

@@ -1,7 +1,7 @@
 import { StateSnapshot } from "react-virtuoso";
-import { Capabilities } from "../api/types";
-import { kEvalWorkspaceTabId, kSampleTranscriptTabId } from "../constants";
-import { AppState, AppStatus } from "../types";
+import { AppState, AppStatus } from "../app/types";
+import { Capabilities } from "../client/api/types";
+import { kLogViewSamplesTabId, kSampleTranscriptTabId } from "../constants";
 import { clearDocumentSelection } from "../utils/browser";
 import { StoreState } from "./store";
 
@@ -18,6 +18,13 @@ export interface AppSlice {
     setWorkspaceTab: (tab: string) => void;
     clearWorkspaceTab: () => void;
 
+    setInitialState: (
+      log: string,
+      sample_id?: string,
+      sample_epoch?: string,
+    ) => void;
+    clearInitialState: () => void;
+
     setSampleTab: (tab: string) => void;
     clearSampleTab: () => void;
 
@@ -38,10 +45,12 @@ export interface AppSlice {
     getPropertyValue: <T>(bagName: string, key: string, defaultValue?: T) => T;
     setPropertyValue: <T>(bagName: string, key: string, value: T) => void;
     removePropertyValue: (bagName: string, key: string) => void;
+
+    setUrlHash: (urlHash: string) => void;
   };
 }
 
-const kDefaultWorkspaceTab = kEvalWorkspaceTabId;
+const kDefaultWorkspaceTab = kLogViewSamplesTabId;
 const kDefaultSampleTab = kSampleTranscriptTabId;
 
 const initialState: AppState = {
@@ -108,13 +117,19 @@ export const createAppSlice = (
         });
       },
       setShowingSampleDialog: (showing: boolean) => {
+        const state = get();
+        const isShowing = state.app.dialogs.sample;
+
+        if (showing === isShowing) {
+          return;
+        }
+
         set((state) => {
           state.app.dialogs.sample = showing;
         });
         if (!showing) {
           const state = get();
           state.appActions.clearSampleTab();
-          state.sampleActions.clearSelectedSample();
         }
       },
       setWorkspaceTab: (tab: string) => {
@@ -127,6 +142,24 @@ export const createAppSlice = (
           state.app.tabs.workspace = kDefaultWorkspaceTab;
         });
       },
+      setInitialState: (
+        log: string,
+        sample_id?: string,
+        sample_epoch?: string,
+      ) => {
+        set((state) => {
+          state.app.initialState = {
+            log,
+            sample_id,
+            sample_epoch,
+          };
+        });
+      },
+      clearInitialState: () => {
+        set((state) => {
+          state.app.initialState = undefined;
+        });
+      },
       setSampleTab: (tab: string) => {
         set((state) => {
           state.app.tabs.sample = tab;
@@ -223,6 +256,12 @@ export const createAppSlice = (
           }
         });
       },
+
+      setUrlHash: (urlHash: string) => {
+        set((state) => {
+          state.app.urlHash = urlHash;
+        });
+      },
     },
   } as const;
 

inspect_ai/_view/www/src/state/hooks.ts

@@ -1,20 +1,20 @@
 import { highlightElement } from "prismjs";
 import { useCallback, useEffect, useMemo, useRef } from "react";
-import { SampleSummary } from "../api/types";
-import { kEpochAscVal, kSampleAscVal, kScoreAscVal } from "../constants";
+import { Events } from "../@types/log";
 import {
   createEvalDescriptor,
   createSamplesDescriptor,
-} from "../samples/descriptor/samplesDescriptor";
-import { filterSamples } from "../samples/sample-tools/filters";
+} from "../app/samples/descriptor/samplesDescriptor";
+import { filterSamples } from "../app/samples/sample-tools/filters";
 import {
   byEpoch,
   bySample,
   sortSamples,
-} from "../samples/sample-tools/SortFilter";
-import { getAvailableScorers, getDefaultScorer } from "../scoring/utils";
-import { Events } from "../types/log";
+} from "../app/samples/sample-tools/SortFilter";
+import { SampleSummary } from "../client/api/types";
+import { kEpochAscVal, kSampleAscVal, kScoreAscVal } from "../constants";
 import { createLogger } from "../utils/logger";
+import { getAvailableScorers, getDefaultScorer } from "./scoring";
 import { useStore } from "./store";
 import { mergeSampleSummaries } from "./utils";
 
@@ -25,6 +25,27 @@ export const useEvalSpec = () => {
   return selectedLogSummary?.eval;
 };
 
+export const useRefreshLog = () => {
+  const setAppStatus = useStore((state) => state.appActions.setStatus);
+  const refreshLog = useStore((state) => state.logActions.refreshLog);
+  const resetFiltering = useStore((state) => state.logActions.resetFiltering);
+
+  return useCallback(() => {
+    try {
+      setAppStatus({ loading: true, error: undefined });
+
+      refreshLog();
+      resetFiltering();
+
+      setAppStatus({ loading: false, error: undefined });
+    } catch (e) {
+      // Show an error
+      console.log(e);
+      setAppStatus({ loading: false, error: e as Error });
+    }
+  }, [refreshLog, resetFiltering, setAppStatus]);
+};
+
 // Fetches all samples summaries (both completed and incomplete)
 // without applying any filtering
 export const useSampleSummaries = () => {
@@ -208,10 +229,12 @@ export const useLogSelection = () => {
   const selectedLogFile = useStore((state) =>
     state.logsActions.getSelectedLogFile(),
   );
+  const loadedLog = useStore((state) => state.log.loadedLog);
 
   return useMemo(() => {
     return {
       logFile: selectedLogFile,
+      loadedLog: loadedLog,
       sample: selectedSampleSummary,
     };
   }, [selectedLogFile, selectedSampleSummary]);

inspect_ai/_view/www/src/state/logSlice.ts

@@ -1,9 +1,9 @@
-import { EvalSummary, PendingSamples } from "../api/types";
-import { kDefaultSort, kInfoWorkspaceTabId } from "../constants";
-import { ScorerInfo } from "../scoring/utils";
-import { LogState, ScoreFilter, ScoreLabel } from "../types";
+import { LogState, ScoreFilter, ScoreLabel } from "../app/types";
+import { EvalSummary, PendingSamples } from "../client/api/types";
+import { kDefaultSort, kLogViewInfoTabId } from "../constants";
 import { createLogger } from "../utils/logger";
 import { createLogPolling } from "./logPolling";
+import { ScorerInfo } from "./scoring";
 import { StoreState } from "./store";
 
 const log = createLogger("logSlice");
@@ -96,7 +96,7 @@ export const createLogSlice = (
           selectedLogSummary.sampleSummaries.length === 0
         ) {
           // If there are no samples, use the workspace tab id by default
-          get().appActions.setWorkspaceTab(kInfoWorkspaceTabId);
+          get().appActions.setWorkspaceTab(kLogViewInfoTabId);
         }
       },
 
@@ -175,6 +175,7 @@ export const createLogSlice = (
             logPolling.startPolling(logFileName);
         } catch (error) {
           log.error("Error loading log:", error);
+          throw error;
         }
       },
 
@@ -200,6 +201,7 @@ export const createLogSlice = (
           state.logActions.setSelectedLogSummary(logContents);
         } catch (error) {
           log.error("Error refreshing log:", error);
+          throw error;
         }
       },
     },

inspect_ai/_view/www/src/state/logsPolling.ts

@@ -1,4 +1,4 @@
-import { EvalLogHeader, LogFiles } from "../api/types";
+import { EvalLogHeader, LogFiles } from "../client/api/types";
 import { createLogger } from "../utils/logger";
 import { createPolling } from "../utils/polling";
 import { StoreState } from "./store";