inspect-ai 0.3.99__py3-none-any.whl → 0.3.100__py3-none-any.whl

inspect_ai/_view/www/src/app/content/RenderedContent.tsx

@@ -1,16 +1,14 @@
-import JSON5 from "json5";
-import { ApplicationIcons } from "../appearance/icons";
-
-import { ChatMessageRenderer } from "../../app/samples/chat/ChatMessageRenderer";
-import { ANSIDisplay } from "../../components/AnsiDisplay";
-import { formatNumber } from "../../utils/format";
-import { MetaDataView } from "./MetaDataView";
-
 import clsx from "clsx";
+import JSON5 from "json5";
 import { FC, Fragment, isValidElement, JSX, ReactNode } from "react";
+import { ANSIDisplay } from "../../components/AnsiDisplay";
 import JSONPanel from "../../components/JsonPanel";
 import { MarkdownDiv } from "../../components/MarkdownDiv";
+import { formatNumber } from "../../utils/format";
 import { isJson } from "../../utils/json";
+import { ApplicationIcons } from "../appearance/icons";
+import { ChatMessageRenderer } from "../samples/chat/ChatMessageRenderer";
+import { MetaDataView } from "./MetaDataView";
 import styles from "./RenderedContent.module.css";
 import { Buckets, ContentRenderer, RenderOptions } from "./types";
 
@@ -18,6 +16,7 @@ interface RenderedContentProps {
   id: string;
   entry: { name: string; value: unknown };
   renderOptions?: RenderOptions;
+  renderObject?(entry: any): ReactNode;
 }
 
 /**
@@ -27,15 +26,16 @@ export const RenderedContent: FC<RenderedContentProps> = ({
   id,
   entry,
   renderOptions = { renderString: "markdown" },
+  renderObject,
 }): JSX.Element => {
   // Explicitly specify return type
   if (entry.value === null) {
     return <span>[null]</span>;
   }
-
-  const renderer = Object.keys(contentRenderers)
+  const renderers = contentRenderers(renderObject);
+  const renderer = Object.keys(renderers)
     .map((key) => {
-      return contentRenderers[key];
+      return renderers[key];
     })
     .sort((a, b) => {
       return a.bucket - b.bucket;
@@ -70,216 +70,231 @@ export const RenderedContent: FC<RenderedContentProps> = ({
  * Object containing different content renderers.
  * Each renderer is responsible for rendering a specific type of content.
  */
-const contentRenderers: Record<string, ContentRenderer> = {
-  AnsiString: {
-    bucket: Buckets.first,
-    canRender: (entry) => {
-      return (
-        typeof entry.value === "string" && entry.value.indexOf("\u001b") > -1
-      );
-    },
-    render: (_id, entry, _options) => {
-      return {
-        rendered: <ANSIDisplay output={entry.value} />,
-      };
-    },
-  },
-  JsonString: {
-    bucket: Buckets.first,
-    canRender: (entry) => {
-      if (typeof entry.value === "string") {
-        const trimmed = entry.value.trim();
-        return isJson(trimmed);
-      }
-      return false;
-    },
-    render: (_id, entry, _options) => {
-      const obj = JSON5.parse(entry.value);
-      return { rendered: <JSONPanel data={obj as Record<string, unknown>} /> };
-    },
-  },
-
-  Model: {
-    bucket: Buckets.intermediate,
-    canRender: (entry) => {
-      return typeof entry.value === "object" && entry.value._model;
-    },
-    render: (_id, entry, _options) => {
-      return {
-        rendered: (
-          <Fragment>
-            <i className={ApplicationIcons.model} /> {entry.value._model}
-          </Fragment>
-        ),
-      };
-    },
-  },
-  Boolean: {
-    bucket: Buckets.intermediate,
-    canRender: (entry) => {
-      return typeof entry.value === "boolean";
-    },
-    render: (id, entry, options) => {
-      entry.value = entry.value.toString();
-      return contentRenderers.String.render(id, entry, options);
-    },
-  },
-  Number: {
-    bucket: Buckets.intermediate,
-    canRender: (entry) => {
-      return typeof entry.value === "number";
-    },
-    render: (id, entry, options) => {
-      entry.value = formatNumber(entry.value);
-      return contentRenderers.String.render(id, entry, options);
-    },
-  },
-  String: {
-    bucket: Buckets.final,
-    canRender: (entry) => {
-      return typeof entry.value === "string";
+const contentRenderers: (
+  renderObject?: (object: any) => ReactNode,
+) => Record<string, ContentRenderer> = (renderObject) => {
+  const contentRenderers: Record<string, ContentRenderer> = {
+    AnsiString: {
+      bucket: Buckets.first,
+      canRender: (entry) => {
+        return (
+          typeof entry.value === "string" && entry.value.indexOf("\u001b") > -1
+        );
+      },
+      render: (_id, entry, _options) => {
+        return {
+          rendered: <ANSIDisplay output={entry.value} />,
+        };
+      },
     },
-    render: (_id, entry, options) => {
-      const rendered = entry.value.trim();
-      if (options.renderString === "markdown") {
+    JsonString: {
+      bucket: Buckets.first,
+      canRender: (entry) => {
+        if (typeof entry.value === "string") {
+          const trimmed = entry.value.trim();
+          return isJson(trimmed);
+        }
+        return false;
+      },
+      render: (_id, entry, _options) => {
+        const obj = JSON5.parse(entry.value);
         return {
-          rendered: <MarkdownDiv markdown={rendered} />,
+          rendered: <JSONPanel data={obj as Record<string, unknown>} />,
         };
-      } else {
+      },
+    },
+
+    Model: {
+      bucket: Buckets.intermediate,
+      canRender: (entry) => {
+        return typeof entry.value === "object" && entry.value._model;
+      },
+      render: (_id, entry, _options) => {
         return {
           rendered: (
-            <pre className={clsx(styles.preWrap, styles.preCompact)}>
-              {rendered}
-            </pre>
+            <Fragment>
+              <i className={ApplicationIcons.model} /> {entry.value._model}
+            </Fragment>
           ),
         };
-      }
+      },
     },
-  },
-  Array: {
-    bucket: Buckets.intermediate,
-    canRender: (entry) => {
-      const isArray = Array.isArray(entry.value);
-      if (isArray) {
-        if (entry.value.length === 0 || entry.value.length === 1) {
-          return true;
-        }
-        const types = new Set(
-          entry.value
-            .filter((e: unknown) => e !== null)
-            .map((e: unknown) => {
-              return typeof e;
-            }),
-        );
-        return types.size === 1;
-      } else {
-        return false;
-      }
+    Boolean: {
+      bucket: Buckets.intermediate,
+      canRender: (entry) => {
+        return typeof entry.value === "boolean";
+      },
+      render: (id, entry, options) => {
+        entry.value = entry.value.toString();
+        return contentRenderers.String.render(id, entry, options);
+      },
     },
-    render: (id, entry, _options) => {
-      const arrayMap: Record<string, unknown> = {};
-      entry.value.forEach((e: unknown, index: number) => {
-        arrayMap[`[${index}]`] = e;
-      });
-
-      const arrayRendered = (
-        <MetaDataView
-          id={id}
-          className={"font-size-small"}
-          entries={arrayMap}
-          tableOptions="borderless,sm"
-          compact={true}
-        />
-      );
-      return { rendered: arrayRendered };
+    Number: {
+      bucket: Buckets.intermediate,
+      canRender: (entry) => {
+        return typeof entry.value === "number";
+      },
+      render: (id, entry, options) => {
+        entry.value = formatNumber(entry.value);
+        return contentRenderers.String.render(id, entry, options);
+      },
     },
-  },
-  ChatMessage: ChatMessageRenderer,
-  web_search: {
-    bucket: Buckets.intermediate,
-    canRender: (entry) => {
-      return typeof entry.value === "object" && entry.name === "web_search";
+    String: {
+      bucket: Buckets.final,
+      canRender: (entry) => {
+        return typeof entry.value === "string";
+      },
+      render: (_id, entry, options) => {
+        const rendered = entry.value.trim();
+        if (options.renderString === "markdown") {
+          return {
+            rendered: <MarkdownDiv markdown={rendered} />,
+          };
+        } else {
+          return {
+            rendered: (
+              <pre className={clsx(styles.preWrap, styles.preCompact)}>
+                {rendered}
+              </pre>
+            ),
+          };
+        }
+      },
     },
-    render: (_id, entry, _options) => {
-      const results: ReactNode[] = [];
-      results.push(
-        <div className={styles.query}>
-          <i className={ApplicationIcons.search}></i> {entry.value.query}
-        </div>,
-      );
-      entry.value.results.forEach(
-        (result: { url: string; summary: string }) => {
-          results.push(
-            <div>
-              <a href={result.url}>{result.url}</a>
-            </div>,
+    Array: {
+      bucket: Buckets.intermediate,
+      canRender: (entry) => {
+        const isArray = Array.isArray(entry.value);
+        if (isArray) {
+          if (entry.value.length === 0 || entry.value.length === 1) {
+            return true;
+          }
+          const types = new Set(
+            entry.value
+              .filter((e: unknown) => e !== null)
+              .map((e: unknown) => {
+                return typeof e;
+              }),
           );
-          results.push(
-            <div className={clsx("text-size-smaller", styles.summary)}>
-              {result.summary}
-            </div>,
-          );
-        },
-      );
-      return {
-        rendered: results,
-      };
-    },
-  },
-  web_browser: {
-    bucket: Buckets.intermediate,
-    canRender: (entry) => {
-      return (
-        typeof entry.value === "string" && entry.name?.startsWith("web_browser")
-      );
-    },
-    render: (_id, entry, _options) => {
-      return {
-        rendered: <pre className={styles.preWrap}>{entry.value}</pre>,
-      };
-    },
-  },
-  Html: {
-    bucket: Buckets.intermediate,
-    canRender: (entry) => {
-      return typeof entry.value === "object" && entry.value._html;
+          return types.size === 1;
+        } else {
+          return false;
+        }
+      },
+      render: (id, entry, _options) => {
+        const arrayMap: Record<string, unknown> = {};
+        entry.value.forEach((e: unknown, index: number) => {
+          arrayMap[`[${index}]`] = e;
+        });
+
+        const arrayRendered = renderObject ? (
+          renderObject(arrayMap)
+        ) : (
+          <MetaDataView
+            id={id}
+            className={"font-size-small"}
+            entries={arrayMap}
+            tableOptions="borderless,sm"
+            compact={true}
+          />
+        );
+        return { rendered: arrayRendered };
+      },
     },
-    render: (_id, entry, _options) => {
-      return {
-        rendered: entry.value._html,
-      };
+    ChatMessage: ChatMessageRenderer,
+    web_search: {
+      bucket: Buckets.intermediate,
+      canRender: (entry) => {
+        return typeof entry.value === "object" && entry.name === "web_search";
+      },
+      render: (_id, entry, _options) => {
+        const results: ReactNode[] = [];
+        results.push(
+          <div className={styles.query}>
+            <i className={ApplicationIcons.search}></i> {entry.value.query}
+          </div>,
+        );
+        entry.value.results.forEach(
+          (result: { url: string; summary: string }) => {
+            results.push(
+              <div>
+                <a href={result.url}>{result.url}</a>
+              </div>,
+            );
+            results.push(
+              <div className={clsx("text-size-smaller", styles.summary)}>
+                {result.summary}
+              </div>,
+            );
+          },
+        );
+        return {
+          rendered: results,
+        };
+      },
     },
-  },
-  Image: {
-    bucket: Buckets.intermediate,
-    canRender: (entry) => {
-      return (
-        typeof entry.value === "string" && entry.value.startsWith("data:image/")
-      );
+    web_browser: {
+      bucket: Buckets.intermediate,
+      canRender: (entry) => {
+        return (
+          typeof entry.value === "string" &&
+          entry.name?.startsWith("web_browser")
+        );
+      },
+      render: (_id, entry, _options) => {
+        return {
+          rendered: <pre className={styles.preWrap}>{entry.value}</pre>,
+        };
+      },
     },
-    render: (_id, entry, _options) => {
-      return {
-        rendered: <img src={entry.value} />,
-      };
+    Html: {
+      bucket: Buckets.intermediate,
+      canRender: (entry) => {
+        return typeof entry.value === "object" && entry.value._html;
+      },
+      render: (_id, entry, _options) => {
+        return {
+          rendered: entry.value._html,
+        };
+      },
     },
-  },
-  Object: {
-    bucket: Buckets.intermediate,
-    canRender: (entry) => {
-      return typeof entry.value === "object";
+    Image: {
+      bucket: Buckets.intermediate,
+      canRender: (entry) => {
+        return (
+          typeof entry.value === "string" &&
+          entry.value.startsWith("data:image/")
+        );
+      },
+      render: (_id, entry, _options) => {
+        return {
+          rendered: <img src={entry.value} />,
+        };
+      },
     },
-    render: (id, entry, _options) => {
-      return {
-        rendered: (
-          <MetaDataView
-            id={id}
-            className={"text-size-smaller"}
-            entries={entry.value}
-            tableOptions="borderless,sm"
-            compact
-          />
-        ),
-      };
+    Object: {
+      bucket: Buckets.intermediate,
+      canRender: (entry) => {
+        return typeof entry.value === "object";
+      },
+      render: (id, entry, _options) => {
+        if (renderObject) {
+          return { rendered: renderObject(entry.value) };
+        } else {
+          return {
+            rendered: (
+              <MetaDataView
+                id={id}
+                className={"text-size-smaller"}
+                entries={entry.value}
+                tableOptions="borderless,sm"
+                compact
+              />
+            ),
+          };
+        }
+      },
     },
-  },
+  };
+  return contentRenderers;
 };

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

@@ -21,6 +21,7 @@ export const LogViewContainer: FC = () => {
     epoch?: string;
     sampleTabId?: string;
   }>();
+
   const initialState = useStore((state) => state.app.initialState);
   const clearInitialState = useStore(
     (state) => state.appActions.clearInitialState,
@@ -80,7 +81,7 @@ export const LogViewContainer: FC = () => {
         }
 
         // Reset the sample
-        if (logPath !== prevLogPath) {
+        if (prevLogPath && logPath !== prevLogPath) {
           clearSelectedSample();
 
           clearSelectedLogSummary();

inspect_ai/_view/www/src/app/log-view/tabs/SamplesTab.tsx

@@ -105,6 +105,7 @@ export const SamplesTab: FC<SamplesTabProps> = ({ running }) => {
   const groupBy = useGroupBy();
   const groupByOrder = useGroupByOrder();
   const currentScore = useScore();
+  const selectSample = useStore((state) => state.logActions.selectSample);
 
   const selectedSampleIdentifier = useStore(
     (state) => state.sample.sample_identifier,
@@ -186,6 +187,10 @@ export const SamplesTab: FC<SamplesTabProps> = ({ running }) => {
           })
         : [],
     );
+
+    if (sampleSummaries.length === 1) {
+      selectSample(0);
+    }
   }, [sampleSummaries, sampleProcessor]);
 
   const title =

inspect_ai/_view/www/src/app/routing/url.ts

@@ -1,4 +1,7 @@
+import { useMemo } from "react";
+import { useParams } from "react-router-dom";
 import { kSampleMessagesTabId, kSampleTranscriptTabId } from "../../constants";
+import { useStore } from "../../state/store";
 import { directoryRelativeUrl } from "../../utils/uri";
 
 export const kLogRouteUrlPattern = "/logs/:logPath/:tabId?/:sampleTabId?";
@@ -46,6 +49,80 @@ export const sampleEventUrl = (
   return `${baseUrl}?event=${eventId}`;
 };
 
+export const useSampleMessageUrl = (
+  messageId: string | null,
+  sampleId?: string | number,
+  sampleEpoch?: string | number,
+) => {
+  const {
+    logPath: urlLogPath,
+    sampleId: urlSampleId,
+    epoch: urlEpoch,
+  } = useParams<{
+    logPath?: string;
+    tabId?: string;
+    sampleId?: string;
+    epoch?: string;
+  }>();
+
+  const log_file = useStore((state) => state.logs.selectedLogFile);
+  const log_dir = useStore((state) => state.logs.logs.log_dir);
+
+  let targetLogPath = urlLogPath;
+  if (!targetLogPath && log_file) {
+    targetLogPath = makeLogPath(log_file, log_dir);
+  }
+
+  const eventUrl = useMemo(() => {
+    return messageId && targetLogPath
+      ? sampleMessageUrl(
+          messageId,
+          targetLogPath,
+          sampleId || urlSampleId,
+          sampleEpoch || urlEpoch,
+        )
+      : undefined;
+  }, [targetLogPath, messageId, sampleId, urlSampleId, sampleEpoch, urlEpoch]);
+  return eventUrl;
+};
+
+export const useSampleEventUrl = (
+  eventId: string,
+  sampleId?: string | number,
+  sampleEpoch?: string | number,
+) => {
+  const {
+    logPath: urlLogPath,
+    sampleId: urlSampleId,
+    epoch: urlEpoch,
+  } = useParams<{
+    logPath?: string;
+    tabId?: string;
+    sampleId?: string;
+    epoch?: string;
+  }>();
+
+  const log_file = useStore((state) => state.logs.selectedLogFile);
+  const log_dir = useStore((state) => state.logs.logs.log_dir);
+
+  let targetLogPath = urlLogPath;
+  if (!targetLogPath && log_file) {
+    targetLogPath = makeLogPath(log_file, log_dir);
+  }
+
+  const eventUrl = useMemo(() => {
+    return targetLogPath
+      ? sampleEventUrl(
+          eventId,
+          targetLogPath,
+          sampleId || urlSampleId,
+          sampleEpoch || urlEpoch,
+        )
+      : undefined;
+  }, [targetLogPath, eventId, sampleId, urlSampleId, sampleEpoch, urlEpoch]);
+  return eventUrl;
+};
+
 export const sampleMessageUrl = (
   messageId: string,
   logPath: string,
@@ -63,8 +140,12 @@ export const sampleMessageUrl = (
 };
 
 export const logUrl = (log_file: string, log_dir?: string, tabId?: string) => {
+  return logUrlRaw(makeLogPath(log_file, log_dir), tabId);
+};
+
+export const makeLogPath = (log_file: string, log_dir?: string) => {
   const pathSegment = directoryRelativeUrl(log_file, log_dir);
-  return logUrlRaw(pathSegment, tabId);
+  return pathSegment;
 };
 
 export const logUrlRaw = (log_segment: string, tabId?: string) => {
@@ -77,9 +158,8 @@ export const logUrlRaw = (log_segment: string, tabId?: string) => {
 
 export const supportsLinking = () => {
   return (
-    location.hostname !== "localhost" &&
-    location.hostname !== "127.0.0.1" &&
-    location.protocol !== "vscode-webview:"
+    //location.hostname !== "localhost" &&
+    location.hostname !== "127.0.0.1" && location.protocol !== "vscode-webview:"
   );
 };
 

inspect_ai/_view/www/src/app/samples/InlineSampleDisplay.module.css

@@ -4,11 +4,6 @@
   flex-direction: column;
 }
 
-.body {
-  margin-top: 1em;
-  margin-bottom: 1em;
-}
-
 .scroller {
   overflow-y: auto;
   width: 100%;

inspect_ai/_view/www/src/app/samples/SampleDialog.module.css

@@ -1,3 +1,3 @@
 .modalBody {
-  padding: 1em 0;
+  padding: 0 0;
 }

inspect_ai/_view/www/src/app/samples/SampleDisplay.module.css

@@ -2,6 +2,13 @@
   padding-bottom: 1em;
 }
 
+.tabControls {
+  position: sticky;
+  z-index: 1001;
+  top: 0;
+  background-color: var(--bs-body-bg);
+}
+
 .fullWidth {
   width: 100%;
 }