inspect-ai 0.3.55__py3-none-any.whl → 0.3.56__py3-none-any.whl

inspect_ai/_util/trace.py

@@ -8,10 +8,10 @@ import shutil
 import time
 import traceback
 from contextlib import contextmanager
-from logging import Logger
-from logging.handlers import RotatingFileHandler
+from dataclasses import dataclass
+from logging import FileHandler, Logger
 from pathlib import Path
-from typing import Any, Generator, Literal, TextIO
+from typing import Any, Callable, Generator, Literal, TextIO
 
 import jsonlines
 from pydantic import BaseModel, Field, JsonValue
@@ -25,6 +25,10 @@ def inspect_trace_dir() -> Path:
     return inspect_data_dir("traces")
 
 
+def inspect_trace_file() -> Path:
+    return inspect_trace_dir() / f"trace-{os.getpid()}.log"
+
+
 @contextmanager
 def trace_action(
     logger: Logger, action: str, message: str, *args: Any, **kwargs: Any
@@ -32,7 +36,6 @@ def trace_action(
     trace_id = uuid()
     start_monotonic = time.monotonic()
     start_wall = time.time()
-    pid = os.getpid()
     detail = message % args if args else message % kwargs if kwargs else message
 
     def trace_message(event: str) -> str:
@@ -47,7 +50,6 @@ def trace_action(
             "event": "enter",
             "trace_id": str(trace_id),
             "start_time": start_wall,
-            "pid": pid,
         },
     )
 
@@ -63,7 +65,6 @@ def trace_action(
                 "event": "exit",
                 "trace_id": str(trace_id),
                 "duration": duration,
-                "pid": pid,
             },
         )
     except (KeyboardInterrupt, asyncio.CancelledError):
@@ -77,7 +78,6 @@ def trace_action(
                 "event": "cancel",
                 "trace_id": str(trace_id),
                 "duration": duration,
-                "pid": pid,
             },
         )
         raise
@@ -92,7 +92,6 @@ def trace_action(
                 "event": "timeout",
                 "trace_id": str(trace_id),
                 "duration": duration,
-                "pid": pid,
             },
         )
         raise
@@ -110,7 +109,6 @@ def trace_action(
                 "error": getattr(ex, "message", str(ex)) or repr(ex),
                 "error_type": type(ex).__name__,
                 "stacktrace": traceback.format_exc(),
-                "pid": pid,
             },
         )
         raise
@@ -153,7 +151,6 @@ class TraceFormatter(logging.Formatter):
                 "error",
                 "error_type",
                 "stacktrace",
-                "pid",
             ]:
                 if hasattr(record, key):
                     output[key] = getattr(record, key)
@@ -215,7 +212,22 @@ class ActionTraceRecord(TraceRecord):
     error: str | None = Field(default=None)
     error_type: str | None = Field(default=None)
     stacktrace: str | None = Field(default=None)
-    pid: int | None = Field(default=None)
+
+
+@dataclass
+class TraceFile:
+    file: Path
+    mtime: float
+
+
+def list_trace_files() -> list[TraceFile]:
+    trace_files: list[TraceFile] = [
+        TraceFile(file=f, mtime=f.lstat().st_mtime)
+        for f in inspect_trace_dir().iterdir()
+        if f.is_file()
+    ]
+    trace_files.sort(key=lambda f: f.mtime, reverse=True)
+    return trace_files
 
 
 def read_trace_file(file: Path) -> list[TraceRecord]:
@@ -237,39 +249,23 @@ def read_trace_file(file: Path) -> list[TraceRecord]:
             return read_file(f)
 
 
-class TraceFileHandler(RotatingFileHandler):
-    def __init__(
-        self,
-        filename: str,
-        mode: str = "a",
-        maxBytes: int = 0,
-        backupCount: int = 0,
-        encoding: str | None = None,
-        delay: bool = False,
-    ) -> None:
-        super().__init__(filename, mode, maxBytes, backupCount, encoding, delay)
-
-    def rotation_filename(self, default_name: str) -> str:
-        """
-        Returns the name of the rotated file.
-
-        Args:
-            default_name: The default name that would be used for rotation
-
-        Returns:
-            The modified filename with .gz extension
-        """
-        return default_name + ".gz"
-
-    def rotate(self, source: str, dest: str) -> None:
-        """
-        Compresses the source file and moves it to destination.
-
-        Args:
-            source: The source file to be compressed
-            dest: The destination path for the compressed file
-        """
-        with open(source, "rb") as f_in:
-            with gzip.open(dest, "wb") as f_out:
-                shutil.copyfileobj(f_in, f_out)
-        os.remove(source)
+def rotate_trace_files() -> None:
+    rotate_files = list_trace_files()[10:]
+    for file in rotate_files:
+        file.file.unlink(missing_ok=True)
+
+
+def compress_trace_log(log_handler: FileHandler) -> Callable[[], None]:
+    def compress() -> None:
+        # ensure log is closed
+        log_handler.close()
+
+        # compress
+        trace_file = Path(log_handler.baseFilename)
+        if trace_file.exists():
+            with open(trace_file, "rb") as f_in:
+                with gzip.open(trace_file.with_suffix(".log.gz"), "wb") as f_out:
+                    shutil.copyfileobj(f_in, f_out)
+            trace_file.unlink()
+
+    return compress

inspect_ai/_util/transcript.py

@@ -89,6 +89,10 @@ def transcript_function(function: str, arguments: dict[str, Any]) -> RenderableT
     return transcript_markdown("```python\n" + call + "\n```\n")
 
 
+DOUBLE_LINE = Box(
+    " ══ \n" "    \n" "    \n" "    \n" "    \n" "    \n" "    \n" "    \n"
+)
+
 LINE = Box(" ── \n" "    \n" "    \n" "    \n" "    \n" "    \n" "    \n" "    \n")
 
 DOTTED = Box(" ·· \n" "    \n" "    \n" "    \n" "    \n" "    \n" "    \n" "    \n")

inspect_ai/_util/vscode.py

@@ -0,0 +1,51 @@
+import os
+from pathlib import Path
+from typing import Any
+
+from pydantic import BaseModel, Field
+from pydantic_core import to_json
+from shortuuid import uuid
+
+from .appdirs import inspect_data_dir
+
+
+class VSCodeCommand(BaseModel):
+    command: str
+    args: list[Any] = Field(default_factory=list)
+
+
+def execute_vscode_commands(commands: VSCodeCommand | list[VSCodeCommand]) -> None:
+    # resolve to list
+    commands = commands if isinstance(commands, list) else [commands]
+
+    # ensure there is someone listening
+    command_dir = vs_code_commands_dir()
+    if command_dir is None:
+        raise NotImplementedError(
+            "Not running in VS Code session or have older version of Inspect AI extension"
+        )
+
+    command_file = command_dir / uuid()
+    with open(command_file, "w") as f:
+        f.write(to_json(commands).decode())
+
+
+def can_execute_vscode_commands() -> bool:
+    return vs_code_commands_dir() is not None
+
+
+def vs_code_commands_dir() -> Path | None:
+    workspace_id = vscode_workspace_id()
+    if workspace_id:
+        workspace_dir = inspect_data_dir(os.path.join("vscode", workspace_id))
+        if workspace_dir.exists():
+            commands_dir = workspace_dir / "commands"
+            return commands_dir if commands_dir.exists() else None
+        else:
+            return None
+    else:
+        return None
+
+
+def vscode_workspace_id() -> str | None:
+    return os.environ.get("INSPECT_WORKSPACE_ID", None)

inspect_ai/_view/notify.py

@@ -4,6 +4,7 @@ from pathlib import Path
 from urllib.parse import urlparse
 
 from inspect_ai._util.appdirs import inspect_data_dir
+from inspect_ai._util.vscode import vscode_workspace_id
 
 # lightweight tracking of when the last eval task completed
 # this enables the view client to poll for changes frequently
@@ -24,7 +25,7 @@ def view_notify_eval(location: str) -> None:
         payload = {
             "location": location,
         }
-        workspace_id = os.environ.get("INSPECT_WORKSPACE_ID")
+        workspace_id = vscode_workspace_id()
         if workspace_id:
             payload["workspace_id"] = workspace_id
 

inspect_ai/_view/www/App.css

@@ -235,6 +235,10 @@ body[class^="vscode-"] .sidebar .list-group {
   --bs-list-group-active-color: var(--vscode-sideBarSectionHeader-foreground);
 }
 
+body[class^="vscode-"] div.ap-control-bar .ap-fullscreen-button {
+  display: none;
+}
+
 :root {
   --bs-navbar-padding-y: 0;
   --bs-navbar-brand-padding-y: 0;
@@ -690,7 +694,7 @@ table.table.table-sm td {
 }
 
 @keyframes moveLeftToRight {
-  from {
+from {
     margin-left: 0;
   }
   to {
@@ -724,6 +728,23 @@ pre[class*="language-"].tool-output {
   border-radius: var(--bs-border-radius) !important;  
 }
 
+/* lightbox styles */
+
+
+.lightbox-overlay .close-button,
+.lightbox-overlay .nav-button {
+  /* Hide by default */
+  opacity: 0;
+  pointer-events: none; /* so it doesn't register clicks when hidden */
+  transition: opacity 0.3s ease;
+}
+
+.lightbox-overlay:hover .close-button,
+.lightbox-overlay .nav-button {
+  /* Show on hover */
+  opacity: 1;
+  pointer-events: auto;
+}
 
 /* jsondiffpatch */