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

inspect_ai/_view/www/src/{workspace/WorkSpaceView.tsx → app/log-view/LogView.tsx}

@@ -4,48 +4,66 @@ import {
   FC,
   Fragment,
   MouseEvent,
-  RefObject,
   useCallback,
+  useRef,
 } from "react";
-import { RunningMetric } from "../api/types";
-import { EmptyPanel } from "../components/EmptyPanel";
-import { TabPanel, TabSet } from "../components/TabSet";
-import {
-  EvalPlan,
-  EvalResults,
-  EvalSpec,
-  EvalStats,
-  Status,
-} from "../types/log";
+import { EmptyPanel } from "../../components/EmptyPanel";
+import { TabPanel, TabSet } from "../../components/TabSet";
 import { Navbar } from "./navbar/Navbar";
+
+import { useEvalSpec, useRefreshLog } from "../../state/hooks";
+import { useStore } from "../../state/store";
+import { useLogNavigation } from "../routing/navigationHooks";
+import styles from "./LogView.module.css";
+import { useInfoTabConfig } from "./tabs/InfoTab";
+import { useJsonTabConfig } from "./tabs/JsonTab";
+import { useSamplesTabConfig } from "./tabs/SamplesTab";
 import { TabDescriptor } from "./types";
 
-import { useStore } from "../state/store";
-import styles from "./WorkSpaceView.module.css";
+export const LogView: FC = () => {
+  const divRef = useRef<HTMLDivElement>(null);
+
+  const refreshLog = useRefreshLog();
+  const navigation = useLogNavigation();
+
+  const selectedLogSummary = useStore((state) => state.log.selectedLogSummary);
+  const evalSpec = useEvalSpec();
+  const runningMetrics = useStore(
+    (state) => state.log.pendingSampleSummaries?.metrics,
+  );
+  const logs = useStore((state) => state.logs.logs);
+  const showToggle = logs.files.length > 1 || !!logs.log_dir || false;
+
+  // Use individual tab config hooks
+  const samplesTabConfig = useSamplesTabConfig(
+    selectedLogSummary?.status,
+    refreshLog,
+  );
+
+  const configTabConfig = useInfoTabConfig(
+    evalSpec,
+    selectedLogSummary?.plan,
+    selectedLogSummary?.error,
+    selectedLogSummary?.results,
+    selectedLogSummary?.stats,
+  );
+
+  const jsonTabConfig = useJsonTabConfig(
+    selectedLogSummary?.version,
+    selectedLogSummary?.status,
+    evalSpec,
+    selectedLogSummary?.plan,
+    selectedLogSummary?.error,
+    selectedLogSummary?.results,
+    selectedLogSummary?.stats,
+  );
 
-interface WorkSpaceViewProps {
-  evalSpec: EvalSpec;
-  evalPlan?: EvalPlan;
-  evalResults?: EvalResults;
-  runningMetrics?: RunningMetric[];
-  evalStats?: EvalStats;
-  status?: Status;
-  showToggle: boolean;
-  tabs: Record<string, TabDescriptor<any>>;
-  divRef: RefObject<HTMLDivElement | null>;
-}
+  const tabs: Record<string, TabDescriptor<any>> = {
+    ...(samplesTabConfig ? { samples: samplesTabConfig } : {}),
+    config: configTabConfig,
+    json: jsonTabConfig,
+  };
 
-export const WorkSpaceView: FC<WorkSpaceViewProps> = ({
-  evalSpec,
-  evalPlan,
-  evalResults,
-  runningMetrics,
-  evalStats,
-  status,
-  showToggle,
-  tabs,
-  divRef,
-}) => {
   const selectedTab = useStore((state) => state.app.tabs.workspace);
   const setSelectedTab = useStore((state) => state.appActions.setWorkspaceTab);
 
@@ -54,9 +72,10 @@ export const WorkSpaceView: FC<WorkSpaceViewProps> = ({
       const id = e.currentTarget?.id;
       if (id) {
         setSelectedTab(id);
+        navigation.selectTab(id);
       }
     },
-    [setSelectedTab],
+    [setSelectedTab, navigation.selectTab],
   );
 
   if (evalSpec === undefined) {
@@ -83,11 +102,11 @@ export const WorkSpaceView: FC<WorkSpaceViewProps> = ({
       <Fragment>
         <Navbar
           evalSpec={evalSpec}
-          evalPlan={evalPlan}
-          evalResults={evalResults}
+          evalPlan={selectedLogSummary?.plan}
+          evalResults={selectedLogSummary?.results}
           runningMetrics={runningMetrics}
-          evalStats={evalStats}
-          status={status}
+          evalStats={selectedLogSummary?.stats}
+          status={selectedLogSummary?.status}
           showToggle={showToggle}
         />
         <div ref={divRef} className={clsx("workspace", styles.workspace)}>

inspect_ai/_view/www/src/app/log-view/LogViewContainer.tsx

@@ -0,0 +1,159 @@
+import { FC, useEffect } from "react";
+import { useNavigate, useParams } from "react-router-dom";
+import { kLogViewSamplesTabId } from "../../constants";
+import { useFilteredSamples, useTotalSampleCount } from "../../state/hooks";
+import { useStore } from "../../state/store";
+import { baseUrl } from "../routing/url";
+import { LogViewLayout } from "./LogViewLayout";
+
+/**
+ * LogContainer component that handles routing to specific logs, tabs, and samples
+ */
+export const LogViewContainer: FC = () => {
+  const { logPath, tabId, sampleId, epoch, sampleTabId } = useParams<{
+    logPath?: string;
+    tabId?: string;
+    sampleId?: string;
+    epoch?: string;
+    sampleTabId?: string;
+  }>();
+  const selectLogFile = useStore((state) => state.logsActions.selectLogFile);
+  const refreshLogs = useStore((state) => state.logsActions.refreshLogs);
+  const setWorkspaceTab = useStore((state) => state.appActions.setWorkspaceTab);
+  const setShowingSampleDialog = useStore(
+    (state) => state.appActions.setShowingSampleDialog,
+  );
+  const selectSample = useStore((state) => state.logActions.selectSample);
+  const setSampleTab = useStore((state) => state.appActions.setSampleTab);
+  const filteredSamples = useFilteredSamples();
+  const totalSampleCount = useTotalSampleCount();
+  const setStatus = useStore((state) => state.appActions.setStatus);
+  const setSelectedLogIndex = useStore(
+    (state) => state.logsActions.setSelectedLogIndex,
+  );
+
+  const selectedLogIndex = useStore((state) => state.logs.selectedLogIndex);
+  const initialState = useStore((state) => state.app.initialState);
+  const clearInitialState = useStore(
+    (state) => state.appActions.clearInitialState,
+  );
+  const navigate = useNavigate();
+
+  useEffect(() => {
+    if (initialState) {
+      const url = baseUrl(
+        initialState.log,
+        initialState.sample_id,
+        initialState.sample_epoch,
+      );
+      clearInitialState();
+      navigate(url);
+    }
+  }, [initialState]);
+
+  useEffect(() => {
+    const loadLogFromPath = async () => {
+      if (logPath) {
+        await selectLogFile(decodeURIComponent(logPath));
+
+        // Set the tab if specified in the URL
+        if (tabId) {
+          // Only set the tab if it's valid - the LogView component will handle
+          // determining if the tab exists before updating the state
+          setWorkspaceTab(tabId);
+        } else {
+          setWorkspaceTab(kLogViewSamplesTabId);
+        }
+      } else {
+        setStatus({
+          loading: true,
+          error: undefined,
+        });
+
+        // Reset the log/task tab
+        setSelectedLogIndex(-1);
+        setWorkspaceTab(kLogViewSamplesTabId);
+
+        // Refresh the list of logs
+        await refreshLogs();
+
+        // Select the first log in the list
+        setSelectedLogIndex(0);
+
+        if (!sampleId) {
+          selectSample(0);
+        }
+
+        setStatus({
+          loading: false,
+          error: undefined,
+        });
+      }
+    };
+
+    loadLogFromPath();
+  }, [
+    logPath,
+    tabId,
+    selectLogFile,
+    refreshLogs,
+    setWorkspaceTab,
+    setSelectedLogIndex,
+    setStatus,
+  ]);
+
+  const clearSample = useStore(
+    (state) => state.sampleActions.clearSelectedSample,
+  );
+
+  useEffect(() => {
+    if (selectedLogIndex > -1) {
+      selectSample(0);
+    }
+  }, [selectedLogIndex]);
+
+  // Handle sample selection from URL params
+  useEffect(() => {
+    if (sampleId && filteredSamples) {
+      // Find the sample with matching ID and epoch
+      const targetEpoch = epoch ? parseInt(epoch, 10) : undefined;
+      const sampleIndex = filteredSamples.findIndex((sample) => {
+        const matches =
+          String(sample.id) === sampleId &&
+          (targetEpoch === undefined || sample.epoch === targetEpoch);
+        return matches;
+      });
+
+      if (sampleIndex >= 0) {
+        selectSample(sampleIndex);
+        // Set the sample tab if specified in the URL
+        if (sampleTabId) {
+          setSampleTab(sampleTabId);
+        }
+
+        if (filteredSamples.length > 1) {
+          setShowingSampleDialog(true);
+        }
+      }
+    } else {
+      // If we don't have sample params in the URL but the dialog is showing, close it
+      // This handles the case when user navigates back from a sample
+      setShowingSampleDialog(false);
+      if (totalSampleCount > 1) {
+        clearSample();
+      }
+    }
+  }, [
+    sampleId,
+    epoch,
+    sampleTabId,
+    filteredSamples,
+    totalSampleCount,
+    selectSample,
+    setSampleTab,
+    setShowingSampleDialog,
+    clearSample,
+  ]);
+
+  return <LogViewLayout />;
+};

inspect_ai/_view/www/src/app/log-view/LogViewLayout.tsx

@@ -0,0 +1,109 @@
+import clsx from "clsx";
+import { FC, KeyboardEvent, useCallback, useRef } from "react";
+import { ErrorPanel } from "../../components/ErrorPanel";
+import { FindBand } from "../../components/FindBand";
+import { ProgressBar } from "../../components/ProgressBar";
+import { useStore } from "../../state/store";
+import { Sidebar } from "../sidebar/Sidebar";
+import { LogView } from "./LogView";
+
+/**
+ * AppContent component with the main UI layout
+ */
+export const LogViewLayout: FC = () => {
+  // App layout and state
+  const appStatus = useStore((state) => state.app.status);
+  const offCanvas = useStore((state) => state.app.offcanvas);
+  const setOffCanvas = useStore((state) => state.appActions.setOffcanvas);
+  const clearWorkspaceTab = useStore(
+    (state) => state.appActions.clearWorkspaceTab,
+  );
+  const clearSampleTab = useStore((state) => state.appActions.clearSampleTab);
+
+  // Find
+  const nativeFind = useStore((state) => state.capabilities.nativeFind);
+  const showFind = useStore((state) => state.app.showFind);
+  const setShowFind = useStore((state) => state.appActions.setShowFind);
+  const hideFind = useStore((state) => state.appActions.hideFind);
+
+  // Logs Data
+  const logs = useStore((state) => state.logs.logs);
+  const selectedLogIndex = useStore((state) => state.logs.selectedLogIndex);
+  const logHeaders = useStore((state) => state.logs.logHeaders);
+  const headersLoading = useStore((state) => state.logs.headersLoading);
+
+  // Log Data
+  const selectedLogSummary = useStore((state) => state.log.selectedLogSummary);
+  const resetFiltering = useStore((state) => state.logActions.resetFiltering);
+  const selectSample = useStore((state) => state.logActions.selectSample);
+
+  // The main application reference
+  const mainAppRef = useRef<HTMLDivElement>(null);
+
+  // Configure an app envelope specific to the current state
+  // if there are no log files, then don't show sidebar
+  const fullScreen = logs.files.length === 1 && !logs.log_dir;
+
+  const handleSelectedIndexChanged = useCallback(() => {
+    setOffCanvas(false);
+    resetFiltering();
+    clearSampleTab();
+    clearWorkspaceTab();
+  }, [
+    setOffCanvas,
+    resetFiltering,
+    clearSampleTab,
+    clearWorkspaceTab,
+    selectSample,
+  ]);
+
+  const handleKeyboard = useCallback(
+    (e: KeyboardEvent) => {
+      // Add keyboard shortcuts for find, if needed
+      if (nativeFind || !setShowFind) {
+        return;
+      }
+
+      if ((e.ctrlKey || e.metaKey) && e.key === "f") {
+        setShowFind(true);
+      } else if (e.key === "Escape") {
+        hideFind();
+      }
+    },
+    [nativeFind, setShowFind, hideFind],
+  );
+
+  return (
+    <>
+      {!fullScreen && selectedLogSummary ? (
+        <Sidebar
+          logHeaders={logHeaders}
+          loading={headersLoading}
+          selectedIndex={selectedLogIndex}
+          onSelectedIndexChanged={handleSelectedIndexChanged}
+        />
+      ) : undefined}
+      <div
+        ref={mainAppRef}
+        className={clsx(
+          "app-main-grid",
+          fullScreen ? "full-screen" : undefined,
+          offCanvas ? "off-canvas" : undefined,
+        )}
+        tabIndex={0}
+        onKeyDown={handleKeyboard}
+      >
+        {!nativeFind && showFind ? <FindBand /> : ""}
+        <ProgressBar animating={appStatus.loading} />
+        {appStatus.error ? (
+          <ErrorPanel
+            title="An error occurred while loading this task."
+            error={appStatus.error}
+          />
+        ) : (
+          <LogView />
+        )}
+      </div>
+    </>
+  );
+};

inspect_ai/_view/www/src/{workspace → app/log-view}/error/TaskErrorPanel.tsx

@@ -1,9 +1,9 @@
 import { FC } from "react";
 import { ApplicationIcons } from "../../appearance/icons";
 
-import { ANSIDisplay } from "../../components/AnsiDisplay";
-import { Card, CardBody, CardHeader } from "../../components/Card";
-import { EvalError } from "../../types/log";
+import { EvalError } from "../../../@types/log";
+import { ANSIDisplay } from "../../../components/AnsiDisplay";
+import { Card, CardBody, CardHeader } from "../../../components/Card";
 
 import styles from "./TaskErrorPanel.module.css";
 

inspect_ai/_view/www/src/{workspace → app/log-view}/navbar/ModelRolesView.tsx

@@ -1,7 +1,7 @@
 import { FC } from "react";
-import { ModelRoles } from "../../types/log";
 
 import clsx from "clsx";
+import { ModelRoles } from "../../../@types/log";
 import styles from "./ModelRolesView.module.css";
 
 interface ModelRolesViewProps {

inspect_ai/_view/www/src/{workspace → app/log-view}/navbar/Navbar.tsx

@@ -1,21 +1,21 @@
 import clsx from "clsx";
 import { FC } from "react";
-import { RunningMetric } from "../../api/types";
-import { useTotalSampleCount } from "../../state/hooks";
 import {
   EvalPlan,
   EvalResults,
   EvalSpec,
   EvalStats,
   Status,
-} from "../../types/log";
+} from "../../../@types/log";
+import { RunningMetric } from "../../../client/api/types";
+import { useTotalSampleCount } from "../../../state/hooks";
 import styles from "./Navbar.module.css";
 import { PrimaryBar } from "./PrimaryBar";
 import { SecondaryBar } from "./SecondaryBar";
 
 interface NavBarProps {
   evalSpec?: EvalSpec;
-  evalResults?: EvalResults;
+  evalResults?: EvalResults | null;
   runningMetrics?: RunningMetric[];
   evalPlan?: EvalPlan;
   evalStats?: EvalStats;

inspect_ai/_view/www/src/{workspace → app/log-view}/navbar/PrimaryBar.tsx

@@ -1,13 +1,12 @@
 import clsx from "clsx";
 import { FC, useCallback } from "react";
-import { RunningMetric } from "../../api/types";
+import { EvalResults, EvalSpec, Status } from "../../../@types/log";
+import { RunningMetric } from "../../../client/api/types";
+import { CopyButton } from "../../../components/CopyButton";
+import { kModelNone } from "../../../constants";
+import { useStore } from "../../../state/store";
+import { filename } from "../../../utils/path";
 import { ApplicationIcons } from "../../appearance/icons";
-import { CopyButton } from "../../components/CopyButton";
-import { kModelNone } from "../../constants";
-import { useStore } from "../../state/store";
-import { EvalResults, EvalSpec, Status } from "../../types/log";
-import { filename } from "../../utils/path";
-import { ModelRolesView } from "./ModelRolesView";
 import styles from "./PrimaryBar.module.css";
 import {
   displayScorersFromRunningMetrics,
@@ -16,11 +15,12 @@ import {
 } from "./ResultsPanel";
 import { RunningStatusPanel } from "./RunningStatusPanel";
 import { CancelledPanel, ErroredPanel } from "./StatusPanel";
+import { ModelRolesView } from "./ModelRolesView";
 
 interface PrimaryBarProps {
   showToggle: boolean;
   status?: Status;
-  evalResults?: EvalResults;
+  evalResults?: EvalResults | null;
   runningMetrics?: RunningMetric[];
   evalSpec?: EvalSpec;
   sampleCount?: number;

inspect_ai/_view/www/src/{workspace → app/log-view}/navbar/ResultsPanel.tsx

@@ -1,11 +1,11 @@
 import clsx from "clsx";
 import { FC } from "react";
-import { RunningMetric } from "../../api/types";
-import { LinkButton } from "../../components/LinkButton";
-import { Modal } from "../../components/Modal";
-import { useProperty } from "../../state/hooks";
-import { Scores } from "../../types/log";
-import { formatPrettyDecimal } from "../../utils/format";
+import { Scores } from "../../../@types/log";
+import { RunningMetric } from "../../../client/api/types";
+import { LinkButton } from "../../../components/LinkButton";
+import { Modal } from "../../../components/Modal";
+import { useProperty } from "../../../state/hooks";
+import { formatPrettyDecimal } from "../../../utils/format";
 import { metricDisplayName } from "../utils";
 import styles from "./ResultsPanel.module.css";
 import { ScoreGrid } from "./ScoreGrid";

inspect_ai/_view/www/src/{workspace → app/log-view}/navbar/RunningStatusPanel.tsx

@@ -1,5 +1,5 @@
 import clsx from "clsx";
-import { RunningMetric } from "../../api/types";
+import { RunningMetric } from "../../../client/api/types";
 import { ApplicationIcons } from "../../appearance/icons";
 
 import { FC } from "react";

inspect_ai/_view/www/src/{workspace → app/log-view}/navbar/ScoreGrid.tsx

@@ -1,6 +1,6 @@
 import clsx from "clsx";
 import { FC, ReactNode } from "react";
-import { formatPrettyDecimal } from "../../utils/format";
+import { formatPrettyDecimal } from "../../../utils/format";
 import { ResultsScorer } from "./ResultsPanel";
 
 import styles from "./ScoreGrid.module.css";

inspect_ai/_view/www/src/{workspace → app/log-view}/navbar/SecondaryBar.tsx

@@ -1,24 +1,24 @@
 import clsx from "clsx";
 import { FC } from "react";
-import { ExpandablePanel } from "../../components/ExpandablePanel";
-import { LabeledValue } from "../../components/LabeledValue";
-import { EvalDescriptor } from "../../samples/descriptor/types";
-import { scoreFilterItems } from "../../samples/sample-tools/filters";
-import { useEvalDescriptor } from "../../state/hooks";
 import {
   EvalDataset,
   EvalPlan,
   EvalResults,
   EvalSpec,
   EvalStats,
-} from "../../types/log";
-import { formatDataset, formatDuration } from "../../utils/format";
+} from "../../../@types/log";
+import { EvalDescriptor } from "../../../app/samples/descriptor/types";
+import { scoreFilterItems } from "../../../app/samples/sample-tools/filters";
+import { ExpandablePanel } from "../../../components/ExpandablePanel";
+import { LabeledValue } from "../../../components/LabeledValue";
+import { useEvalDescriptor } from "../../../state/hooks";
+import { formatDataset, formatDuration } from "../../../utils/format";
 import styles from "./SecondaryBar.module.css";
 
 interface SecondaryBarProps {
   evalSpec?: EvalSpec;
   evalPlan?: EvalPlan;
-  evalResults?: EvalResults;
+  evalResults?: EvalResults | null;
   evalStats?: EvalStats;
   status?: string;
   sampleCount?: number;

inspect_ai/_view/www/src/{workspace → app/log-view}/tabs/InfoTab.tsx

@@ -1,17 +1,46 @@
-import { FC } from "react";
-import { SampleSummary } from "../../api/types";
-import { MessageBand } from "../../components/MessageBand";
-import { ModelCard } from "../../plan/ModelCard";
-import { PlanCard } from "../../plan/PlanCard";
+import { FC, useMemo } from "react";
 import {
   EvalError,
   EvalPlan,
   EvalResults,
   EvalSpec,
   EvalStats,
-} from "../../types/log";
+} from "../../../@types/log";
 import { UsageCard } from "../../usage/UsageCard";
 import { TaskErrorCard } from "../error/TaskErrorPanel";
+import { SampleSummary } from "../../../client/api/types";
+import { MessageBand } from "../../../components/MessageBand";
+import { ModelCard } from "../../plan/ModelCard";
+import { kLogViewInfoTabId } from "../../../constants";
+import { useTotalSampleCount } from "../../../state/hooks";
+import { PlanCard } from "../../plan/PlanCard";
+
+// Individual hook for Info tab
+export const useInfoTabConfig = (
+  evalSpec: EvalSpec | undefined,
+  evalPlan: EvalPlan | undefined,
+  evalError: EvalError | undefined | null,
+  evalResults: EvalResults | undefined | null,
+  evalStats: EvalStats | undefined,
+) => {
+  const totalSampleCount = useTotalSampleCount();
+  return useMemo(() => {
+    return {
+      id: kLogViewInfoTabId,
+      label: "Info",
+      scrollable: true,
+      component: InfoTab,
+      componentProps: {
+        evalSpec,
+        evalPlan,
+        evalError,
+        evalResults,
+        evalStats,
+        sampleCount: totalSampleCount,
+      },
+    };
+  }, [evalSpec, evalPlan, evalError, evalResults, evalStats, totalSampleCount]);
+};
 
 interface PlanTabProps {
   evalSpec?: EvalSpec;