inspect-ai 0.3.69__py3-none-any.whl → 0.3.71__py3-none-any.whl

inspect_ai/_view/www/src/usage/ModelTokenTable.tsx

@@ -1,11 +1,13 @@
+import { FC } from "react";
+import { ModelUsage, ModelUsage2 } from "../types/log";
 import { TokenHeader, TokenRow, TokenTable } from "./TokenTable";
 
-interface ModelTokenTable {
-  model_usage: any;
+interface ModelTokenTableProps {
+  model_usage: ModelUsage | ModelUsage2;
   className?: string | string[];
 }
 
-export const ModelTokenTable: React.FC<ModelTokenTable> = ({
+export const ModelTokenTable: FC<ModelTokenTableProps> = ({
   model_usage,
   className,
 }) => {
@@ -14,13 +16,7 @@ export const ModelTokenTable: React.FC<ModelTokenTable> = ({
       <TokenHeader />
       <tbody>
         {Object.keys(model_usage).map((key) => {
-          return (
-            <TokenRow
-              key={key}
-              model={`${key}-token-row`}
-              usage={model_usage[key]}
-            />
-          );
+          return <TokenRow key={key} model={key} usage={model_usage[key]} />;
         })}
       </tbody>
     </TokenTable>

inspect_ai/_view/www/src/usage/ModelUsagePanel.module.css

@@ -22,3 +22,7 @@
   height: 1px;
   background-color: var(--bs-light-border-subtle);
 }
+
+.padded {
+  margin-bottom: 1em;
+}

inspect_ai/_view/www/src/usage/ModelUsagePanel.tsx

@@ -1,5 +1,5 @@
 import clsx from "clsx";
-import { Fragment } from "react";
+import { FC, Fragment } from "react";
 import { ModelUsage1 } from "../types/log";
 import { formatNumber } from "../utils/format";
 import styles from "./ModelUsagePanel.module.css";
@@ -13,23 +13,40 @@ interface ModelUsageRow {
   value?: number;
   secondary?: boolean;
   bordered?: boolean;
+  padded?: boolean;
 }
 
 /**
  * Renders the ModelUsagePanel component.
  */
-export const ModelUsagePanel: React.FC<ModelUsageProps> = ({ usage }) => {
+export const ModelUsagePanel: FC<ModelUsageProps> = ({ usage }) => {
   if (!usage) {
     return null;
   }
 
-  const rows: ModelUsageRow[] = [
-    {
-      label: "input",
-      value: usage.input_tokens,
+  const rows: ModelUsageRow[] = [];
+
+  if (usage.reasoning_tokens) {
+    rows.push({
+      label: "Reasoning",
+      value: usage.reasoning_tokens,
+      secondary: false,
+      bordered: true,
+    });
+
+    rows.push({
+      label: "---",
+      value: undefined,
       secondary: false,
-    },
-  ];
+      padded: true,
+    });
+  }
+
+  rows.push({
+    label: "input",
+    value: usage.input_tokens,
+    secondary: false,
+  });
 
   if (usage.input_tokens_cache_read) {
     rows.push({
@@ -71,7 +88,13 @@ export const ModelUsagePanel: React.FC<ModelUsageProps> = ({ usage }) => {
       {rows.map((row, idx) => {
         if (row.label === "---") {
           return (
-            <div key={`$usage-sep-${idx}`} className={styles.separator}></div>
+            <div
+              key={`$usage-sep-${idx}`}
+              className={clsx(
+                styles.separator,
+                row.padded ? styles.padded : undefined,
+              )}
+            ></div>
           );
         } else {
           return (

inspect_ai/_view/www/src/usage/TokenTable.tsx

@@ -1,17 +1,15 @@
 import clsx from "clsx";
+import { FC, ReactNode } from "react";
 import { ModelUsage1 } from "../types/log";
 import { ModelUsagePanel } from "./ModelUsagePanel";
 import styles from "./TokenTable.module.css";
 
 interface TokenTableProps {
   className?: string | string[];
-  children?: React.ReactNode;
+  children?: ReactNode;
 }
 
-export const TokenTable: React.FC<TokenTableProps> = ({
-  className,
-  children,
-}) => {
+export const TokenTable: FC<TokenTableProps> = ({ className, children }) => {
   return (
     <table
       className={clsx(
@@ -77,7 +75,7 @@ interface TokenRowProps {
   usage: ModelUsage1;
 }
 
-export const TokenRow: React.FC<TokenRowProps> = ({ model, usage }) => {
+export const TokenRow: FC<TokenRowProps> = ({ model, usage }) => {
   return (
     <tr>
       <td>

inspect_ai/_view/www/src/usage/UsageCard.tsx

@@ -7,6 +7,7 @@ import { EvalStats } from "../types/log";
 import { formatDuration } from "../utils/format";
 import { ModelTokenTable } from "./ModelTokenTable";
 
+import { FC } from "react";
 import styles from "./UsageCard.module.css";
 
 const kUsageCardBodyId = "usage-card-body";
@@ -18,7 +19,7 @@ interface UsageCardProps {
 /**
  * Renders the UsageCard component.
  */
-export const UsageCard: React.FC<UsageCardProps> = ({ stats }) => {
+export const UsageCard: FC<UsageCardProps> = ({ stats }) => {
   if (!stats) {
     return null;
   }

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

@@ -77,9 +77,9 @@ export const formatDataset = (
  */
 export const formatTime = (seconds: number): string => {
   if (seconds < 60) {
-    return `${seconds} sec`;
+    return `${formatPrettyDecimal(seconds, 1)} sec`;
   } else if (seconds < 60 * 60) {
-    return `${Math.floor(seconds / 60)} min ${seconds % 60} sec`;
+    return `${Math.floor(seconds / 60)} min ${Math.floor(seconds % 60)} sec`;
   } else if (seconds < 60 * 60 * 24) {
     const hours = Math.floor(seconds / (60 * 60));
     const minutes = Math.floor((seconds % (60 * 60)) / 60);
@@ -97,15 +97,18 @@ export const formatTime = (seconds: number): string => {
 /**
  * Formats a number to a string with specific decimal places for prettiness.
  */
-export function formatPrettyDecimal(num: number): string {
+export function formatPrettyDecimal(
+  num: number,
+  maxDecimals: number = 3,
+): string {
   const numDecimalPlaces = num.toString().includes(".")
     ? num.toString().split(".")[1].length
     : 0;
 
   if (numDecimalPlaces === 0) {
     return num.toFixed(1);
-  } else if (numDecimalPlaces > 3) {
-    return num.toFixed(3);
+  } else if (numDecimalPlaces > maxDecimals) {
+    return num.toFixed(maxDecimals);
   } else {
     return num.toString();
   }

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

@@ -0,0 +1,24 @@
+export const isJson = (text: string): boolean => {
+  text = text.trim();
+  if (text.startsWith("{") && text.endsWith("}")) {
+    try {
+      JSON.parse(text);
+      return true;
+    } catch {
+      return false;
+    }
+  }
+  return false;
+};
+
+export const parsedJson = (text: string): unknown | undefined => {
+  text = text.trim();
+  if (text.startsWith("{") && text.endsWith("}")) {
+    try {
+      return JSON.parse(text);
+    } catch {
+      return undefined;
+    }
+  }
+  return undefined;
+};

inspect_ai/_view/www/src/workspace/WorkSpace.tsx

@@ -5,7 +5,7 @@ import { JsonTab } from "./tabs/JsonTab";
 import { SamplesTab } from "./tabs/SamplesTab";
 
 import clsx from "clsx";
-import { MouseEvent, RefObject, useEffect, useMemo, useRef } from "react";
+import { FC, MouseEvent, RefObject, useEffect, useMemo, useRef } from "react";
 import { SampleSummary } from "../api/types.ts";
 import {
   kEvalWorkspaceTabId,
@@ -84,7 +84,7 @@ interface WorkSpaceProps {
 /**
  * Renders the Main Application
  */
-export const WorkSpace: React.FC<WorkSpaceProps> = (props) => {
+export const WorkSpace: FC<WorkSpaceProps> = (props) => {
   const {
     task_id,
     evalStatus,
@@ -103,9 +103,6 @@ export const WorkSpace: React.FC<WorkSpaceProps> = (props) => {
     workspaceTabScrollPositionRef,
     setWorkspaceTabScrollPosition,
   } = props;
-  if (!evalSpec) {
-    return null;
-  }
 
   const divRef = useRef<HTMLDivElement>(null);
 
@@ -118,6 +115,10 @@ export const WorkSpace: React.FC<WorkSpaceProps> = (props) => {
 
   const resolvedTabs = useResolvedTabs(props);
 
+  if (!evalSpec) {
+    return undefined;
+  }
+
   return (
     <WorkSpaceView
       logFileName={logFileName}

inspect_ai/_view/www/src/workspace/WorkSpaceView.tsx

@@ -1,5 +1,12 @@
 import clsx from "clsx";
-import { Fragment, MouseEvent, RefObject, useCallback, useMemo } from "react";
+import {
+  FC,
+  Fragment,
+  MouseEvent,
+  RefObject,
+  useCallback,
+  useMemo,
+} from "react";
 import { SampleSummary } from "../api/types";
 import { EmptyPanel } from "../components/EmptyPanel";
 import { TabPanel, TabSet } from "../components/TabSet";
@@ -37,7 +44,7 @@ interface WorkSpaceViewProps {
   setWorkspaceTabScrollPosition: (tab: string, pos: number) => void;
 }
 
-export const WorkSpaceView: React.FC<WorkSpaceViewProps> = ({
+export const WorkSpaceView: FC<WorkSpaceViewProps> = ({
   logFileName,
   evalSpec,
   evalPlan,
@@ -78,6 +85,12 @@ export const WorkSpaceView: React.FC<WorkSpaceViewProps> = ({
     },
     [setSelectedTab],
   );
+  const handleScroll = useCallback(
+    (tabid: string, position: number) => {
+      onScroll(tabid, position);
+    },
+    [onScroll],
+  );
 
   if (evalSpec === undefined) {
     return <EmptyPanel />;
@@ -138,12 +151,9 @@ export const WorkSpaceView: React.FC<WorkSpaceViewProps> = ({
                     scrollPosition={
                       workspaceTabScrollPositionRef.current?.[tab.id]
                     }
-                    setScrollPosition={useCallback(
-                      (position: number) => {
-                        onScroll(tab.id, position);
-                      },
-                      [onScroll],
-                    )}
+                    setScrollPosition={(position: number) => {
+                      handleScroll(tab.id, position);
+                    }}
                   >
                     {tab.content()}
                   </TabPanel>

inspect_ai/_view/www/src/workspace/error/TaskErrorPanel.tsx

@@ -1,3 +1,4 @@
+import { FC } from "react";
 import { ApplicationIcons } from "../../appearance/icons";
 
 import { ANSIDisplay } from "../../components/AnsiDisplay";
@@ -10,7 +11,7 @@ interface TaskErrorProps {
   error: EvalError;
 }
 
-export const TaskErrorCard: React.FC<TaskErrorProps> = ({ error }) => {
+export const TaskErrorCard: FC<TaskErrorProps> = ({ error }) => {
   return (
     <Card>
       <CardHeader

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

@@ -1,4 +1,5 @@
 import clsx from "clsx";
+import { FC } from "react";
 import { SampleSummary } from "../../api/types";
 import { EvalDescriptor } from "../../samples/descriptor/types";
 import {
@@ -29,7 +30,7 @@ interface NavBarProps {
 /**
  * Renders the Navbar
  */
-export const Navbar: React.FC<NavBarProps> = ({
+export const Navbar: FC<NavBarProps> = ({
   file,
   evalSpec,
   evalPlan,

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

@@ -1,5 +1,5 @@
 import clsx from "clsx";
-import { useCallback } from "react";
+import { FC, useCallback } from "react";
 import { SampleSummary } from "../../api/types";
 import { ApplicationIcons } from "../../appearance/icons";
 import { CopyButton } from "../../components/CopyButton";
@@ -20,7 +20,7 @@ interface PrimaryBarProps {
   evalSpec?: EvalSpec;
 }
 
-export const PrimaryBar: React.FC<PrimaryBarProps> = ({
+export const PrimaryBar: FC<PrimaryBarProps> = ({
   showToggle,
   offcanvas,
   status,
@@ -34,7 +34,7 @@ export const PrimaryBar: React.FC<PrimaryBarProps> = ({
 
   const handleToggle = useCallback(() => {
     setOffcanvas(!offcanvas);
-  }, [offcanvas]);
+  }, [setOffcanvas, offcanvas]);
 
   return (
     <div className={clsx(styles.wrapper)}>

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

@@ -1,4 +1,5 @@
 import clsx from "clsx";
+import { FC } from "react";
 import { EvalMetric, EvalResults, EvalScore, Reducer } from "../../types/log";
 import { formatPrettyDecimal } from "../../utils/format";
 import { metricDisplayName } from "../utils";
@@ -13,7 +14,7 @@ interface MetricSummary {
   metric: EvalMetric;
 }
 
-export const ResultsPanel: React.FC<ResultsPanelProps> = ({ results }) => {
+export const ResultsPanel: FC<ResultsPanelProps> = ({ results }) => {
   // Map the scores into a list of key/values
   if (results?.scores?.length === 1) {
     const scorers: Record<string, MetricSummary[]> = {};
@@ -75,7 +76,7 @@ interface VerticalMetricProps {
 
 /** Renders a Vertical Metric
  */
-const VerticalMetric: React.FC<VerticalMetricProps> = ({
+const VerticalMetric: FC<VerticalMetricProps> = ({
   metricSummary,
   isFirst,
   showReducer,
@@ -123,7 +124,7 @@ interface MultiScorerMetricProps {
   showReducer: boolean;
 }
 
-const MultiScorerMetric: React.FC<MultiScorerMetricProps> = ({
+const MultiScorerMetric: FC<MultiScorerMetricProps> = ({
   scorer,
   isFirst,
   showReducer,

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

@@ -1,4 +1,5 @@
 import clsx from "clsx";
+import { FC } from "react";
 import { SampleSummary } from "../../api/types";
 import { ExpandablePanel } from "../../components/ExpandablePanel";
 import { LabeledValue } from "../../components/LabeledValue";
@@ -27,7 +28,7 @@ interface SecondaryBarProps {
 /**
  * Renders the SecondaryBar
  */
-export const SecondaryBar: React.FC<SecondaryBarProps> = ({
+export const SecondaryBar: FC<SecondaryBarProps> = ({
   evalSpec,
   evalPlan,
   evalResults,
@@ -152,7 +153,7 @@ interface DatasetSummaryProps {
 /**
  * A component that displays the dataset
  */
-const DatasetSummary: React.FC<DatasetSummaryProps> = ({
+const DatasetSummary: FC<DatasetSummaryProps> = ({
   dataset,
   samples,
   epochs,
@@ -177,7 +178,7 @@ interface ScoreSummaryProps {
 /**
  * A component that displays a list of scrorers
  */
-const ScorerSummary: React.FC<ScoreSummaryProps> = ({ evalDescriptor }) => {
+const ScorerSummary: FC<ScoreSummaryProps> = ({ evalDescriptor }) => {
   if (!evalDescriptor) {
     return null;
   }
@@ -202,7 +203,7 @@ interface ParamSummaryProps {
 /**
  * A component that displays a summary of parameters.
  */
-const ParamSummary: React.FC<ParamSummaryProps> = ({ params }) => {
+const ParamSummary: FC<ParamSummaryProps> = ({ params }) => {
   if (!params) {
     return null;
   }

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

@@ -1,4 +1,5 @@
 import clsx from "clsx";
+import { FC } from "react";
 import { ApplicationIcons } from "../../appearance/icons";
 import styles from "./StatusPanel.module.css";
 
@@ -6,7 +7,7 @@ interface StatusProps {
   sampleCount: number;
 }
 
-export const CancelledPanel: React.FC<StatusProps> = ({ sampleCount }) => {
+export const CancelledPanel: FC<StatusProps> = ({ sampleCount }) => {
   return (
     <StatusPanel
       icon={ApplicationIcons.logging["info"]}
@@ -16,7 +17,7 @@ export const CancelledPanel: React.FC<StatusProps> = ({ sampleCount }) => {
   );
 };
 
-export const ErroredPanel: React.FC<StatusProps> = ({ sampleCount }) => {
+export const ErroredPanel: FC<StatusProps> = ({ sampleCount }) => {
   return (
     <StatusPanel
       icon={ApplicationIcons.logging["error"]}
@@ -26,7 +27,7 @@ export const ErroredPanel: React.FC<StatusProps> = ({ sampleCount }) => {
   );
 };
 
-export const RunningPanel: React.FC<StatusProps> = ({ sampleCount }) => {
+export const RunningPanel: FC<StatusProps> = ({ sampleCount }) => {
   return (
     <StatusPanel
       icon={ApplicationIcons.running}
@@ -42,11 +43,7 @@ interface StatusPanelProps {
   sampleCount: number;
 }
 
-const StatusPanel: React.FC<StatusPanelProps> = ({
-  icon,
-  status,
-  sampleCount,
-}) => {
+const StatusPanel: FC<StatusPanelProps> = ({ icon, status, sampleCount }) => {
   return (
     <div className={styles.statusPanel}>
       <i className={clsx(icon, styles.statusIcon)} style={{}} />

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

@@ -1,4 +1,5 @@
 import clsx from "clsx";
+import { FC } from "react";
 import { EvalLogHeader } from "../../api/types";
 import styles from "./EvalStatus.module.css";
 import { SidebarScoreView } from "./SidebarScoreView";
@@ -8,7 +9,7 @@ interface EvalStatusProps {
   logHeader?: EvalLogHeader;
 }
 
-export const EvalStatus: React.FC<EvalStatusProps> = ({ logHeader }) => {
+export const EvalStatus: FC<EvalStatusProps> = ({ logHeader }) => {
   switch (logHeader?.status) {
     case "error":
       return <StatusError message="Error" />;
@@ -36,7 +37,7 @@ interface StatusProps {
   message: string;
 }
 
-const StatusCancelled: React.FC<StatusProps> = ({ message }) => {
+const StatusCancelled: FC<StatusProps> = ({ message }) => {
   return (
     <div
       className={clsx(
@@ -51,7 +52,7 @@ const StatusCancelled: React.FC<StatusProps> = ({ message }) => {
   );
 };
 
-const StatusRunning: React.FC<StatusProps> = ({ message }) => {
+const StatusRunning: FC<StatusProps> = ({ message }) => {
   return (
     <div
       className={clsx(
@@ -66,6 +67,6 @@ const StatusRunning: React.FC<StatusProps> = ({ message }) => {
   );
 };
 
-const StatusError: React.FC<StatusProps> = ({ message }) => {
+const StatusError: FC<StatusProps> = ({ message }) => {
   return <div className={clsx(styles.error, "text-size-small")}>{message}</div>;
 };

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

@@ -1,4 +1,5 @@
 import clsx from "clsx";
+import { FC } from "react";
 import styles from "./LogDirectoryTitleView.module.css";
 
 interface LogDirectoryTitleViewProps {
@@ -6,7 +7,7 @@ interface LogDirectoryTitleViewProps {
   offcanvas: boolean;
 }
 
-export const LogDirectoryTitleView: React.FC<LogDirectoryTitleViewProps> = ({
+export const LogDirectoryTitleView: FC<LogDirectoryTitleViewProps> = ({
   log_dir,
   offcanvas,
 }) => {

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

@@ -1,4 +1,5 @@
 import clsx from "clsx";
+import { FC } from "react";
 import { Fragment } from "react/jsx-runtime";
 import { EvalLogHeader, LogFiles } from "../../api/types";
 import { ApplicationIcons } from "../../appearance/icons";
@@ -17,7 +18,7 @@ interface SidebarProps {
   onSelectedIndexChanged: (index: number) => void;
 }
 
-export const Sidebar: React.FC<SidebarProps> = ({
+export const Sidebar: FC<SidebarProps> = ({
   logs,
   logHeaders,
   offcanvas,

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

@@ -1,5 +1,5 @@
 import clsx from "clsx";
-import { Fragment } from "react";
+import { FC, Fragment } from "react";
 import { EvalLogHeader } from "../../api/types";
 import { EvalStatus } from "./EvalStatus";
 import styles from "./SidebarLogEntry.module.css";
@@ -9,7 +9,7 @@ interface SidebarLogEntryProps {
   task: string;
 }
 
-export const SidebarLogEntry: React.FC<SidebarLogEntryProps> = ({
+export const SidebarLogEntry: FC<SidebarLogEntryProps> = ({
   logHeader,
   task,
 }) => {

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

@@ -2,13 +2,14 @@ import clsx from "clsx";
 import { EvalScore } from "../../types/log";
 import { formatPrettyDecimal } from "../../utils/format";
 
+import { FC } from "react";
 import { metricDisplayName } from "../utils";
 import styles from "./SidebarScoreView.module.css";
 interface SidebarScoreProps {
   scorer: EvalScore;
 }
 
-export const SidebarScoreView: React.FC<SidebarScoreProps> = ({ scorer }) => {
+export const SidebarScoreView: FC<SidebarScoreProps> = ({ scorer }) => {
   const showReducer = !!scorer.reducer;
   return (
     <div className={styles.container}>

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

@@ -1,5 +1,5 @@
 import clsx from "clsx";
-import { Fragment } from "react";
+import { FC, Fragment } from "react";
 import { Scores } from "../../types/log";
 import { formatPrettyDecimal } from "../../utils/format";
 import { metricDisplayName } from "../utils";
@@ -9,7 +9,7 @@ interface SidebarScoresProps {
   scores: Scores;
 }
 
-export const SidebarScoresView: React.FC<SidebarScoresProps> = ({ scores }) => {
+export const SidebarScoresView: FC<SidebarScoresProps> = ({ scores }) => {
   const showReducer = scores.findIndex((score) => !!score.reducer) !== -1;
   return (
     <div className={styles.container}>

inspect_ai/_view/www/src/workspace/tabs/InfoTab.tsx

@@ -1,4 +1,4 @@
-import { useEffect, useState } from "react";
+import { FC, useEffect, useState } from "react";
 import { SampleSummary } from "../../api/types";
 import { MessageBand } from "../../components/MessageBand";
 import { PlanCard } from "../../plan/PlanCard";
@@ -22,7 +22,7 @@ interface PlanTabProps {
   evalError?: EvalError;
 }
 
-export const InfoTab: React.FC<PlanTabProps> = ({
+export const InfoTab: FC<PlanTabProps> = ({
   evalSpec,
   evalPlan,
   evalResults,

inspect_ai/_view/www/src/workspace/tabs/JsonTab.tsx

@@ -1,5 +1,6 @@
 import { filename } from "../../utils/path";
 
+import { FC } from "react";
 import { Capabilities } from "../../api/types";
 import { DownloadPanel } from "../../components/DownloadPanel";
 import { JSONPanel } from "../../components/JsonPanel";
@@ -17,11 +18,7 @@ interface JsonTabProps {
 /**
  * Renders JSON tab
  */
-export const JsonTab: React.FC<JsonTabProps> = ({
-  logFile,
-  capabilities,
-  json,
-}) => {
+export const JsonTab: FC<JsonTabProps> = ({ logFile, capabilities, json }) => {
   if (logFile && json.length > kJsonMaxSize && capabilities.downloadFiles) {
     // This JSON file is so large we can't really productively render it
     // we should instead just provide a DL link