inspect-ai 0.3.82__py3-none-any.whl → 0.3.83__py3-none-any.whl

inspect_ai/_eval/task/task.py

@@ -1,4 +1,3 @@
-from copy import deepcopy
 from dataclasses import dataclass
 from logging import getLogger
 from typing import Any, Awaitable, Callable, Sequence, cast
@@ -9,6 +8,8 @@ from typing_extensions import TypedDict, Unpack
 from inspect_ai._util.logger import warn_once
 from inspect_ai._util.notgiven import NOT_GIVEN, NotGiven
 from inspect_ai._util.registry import is_registry_object, registry_info
+from inspect_ai.agent._agent import Agent, is_agent
+from inspect_ai.agent._as_solver import as_solver
 from inspect_ai.approval._policy import ApprovalPolicy, approval_policies_from_config
 from inspect_ai.dataset import Dataset, MemoryDataset, Sample
 from inspect_ai.log import EvalLog
@@ -47,7 +48,7 @@ class Task:
         self,
         dataset: Dataset | Sequence[Sample] | None = None,
         setup: Solver | list[Solver] | None = None,
-        solver: Solver | list[Solver] = generate(),
+        solver: Solver | Agent | list[Solver] = generate(),
         cleanup: Callable[[TaskState], Awaitable[None]] | None = None,
         scorer: Scorer | list[Scorer] | None = None,
         metrics: list[Metric] | dict[str, list[Metric]] | None = None,
@@ -158,6 +159,13 @@ class Task:
         else:
             return "task"
 
+    @property
+    def registry_name(self) -> str | None:
+        if is_registry_object(self):
+            return registry_info(self).name
+        else:
+            return None
+
     @property
     def attribs(self) -> dict[str, Any]:
         if is_registry_object(self):
@@ -191,8 +199,12 @@ def task_with(
 ) -> Task:
     """Task adapted with alternate values for one or more options.
 
+    This function modifies the passed task in place and returns it.
+    If you want to create multiple variations of a single task using
+    `task_with()` you should create the underlying task multiple times.
+
     Args:
-        task: Task to adapt (it is deep copied prior to mutating options)
+        task: Task to adapt
         dataset: Dataset to evaluate
         setup: Setup step (always run even when the main `solver` is replaced).
         solver: Solver or list of solvers. Defaults to generate(), a normal call to the model.
@@ -227,11 +239,8 @@ def task_with(
         metadata:  Additional metadata to associate with the task.
 
     Returns:
-        Task: Task adapted with alternate options.
+        Task: Passed `task` with modifications.
     """
-    # deep copy the task
-    task = deepcopy(task)
-
     if not isinstance(dataset, NotGiven):
         task.dataset = resolve_dataset(dataset)
     if not isinstance(setup, NotGiven):
@@ -340,8 +349,13 @@ def resolve_dataset(dataset: Dataset | Sequence[Sample] | None) -> Dataset:
     return dataset if isinstance(dataset, Dataset) else MemoryDataset(list(dataset))
 
 
-def resolve_solver(solver: Solver | list[Solver]) -> Solver:
-    return chain(solver) if isinstance(solver, list) else solver
+def resolve_solver(solver: Solver | Agent | list[Solver]) -> Solver:
+    if isinstance(solver, list):
+        return chain(solver)
+    elif is_agent(solver):
+        return as_solver(solver)
+    else:
+        return cast(Solver, solver)
 
 
 def resolve_model(model: str | Model | None) -> Model | None:

inspect_ai/_util/file.py

@@ -322,6 +322,19 @@ def absolute_file_path(file: str) -> str:
     return file
 
 
+def to_uri(path_or_uri: str) -> str:
+    # Check if it's already a URI
+    parsed = urlparse(path_or_uri)
+
+    if parsed.scheme:
+        # Already has a scheme, return as is
+        return path_or_uri
+
+    # It's a file path, convert to URI
+    path_obj = Path(path_or_uri).absolute()
+    return path_obj.as_uri()
+
+
 def default_fs_options(file: str) -> dict[str, Any]:
     scheme = urlparse(file).scheme
     if (

inspect_ai/_util/json.py

@@ -8,7 +8,8 @@ import jsonpatch
 from pydantic import BaseModel, Field, JsonValue
 from pydantic_core import to_json, to_jsonable_python
 
-from inspect_ai.util._json import JSONType
+JSONType = Literal["string", "integer", "number", "boolean", "array", "object", "null"]
+"""Valid types within JSON schema."""
 
 
 def jsonable_python(x: Any) -> Any:

inspect_ai/_util/registry.py

@@ -21,6 +21,7 @@ RegistryType = Literal[
     "scorer",
     "metric",
     "tool",
+    "agent",
     "sandboxenv",
     "score_reducer",
     "approver",

inspect_ai/_util/vscode.py

@@ -1,13 +1,19 @@
 import os
+from logging import getLogger
 from pathlib import Path
 from typing import Any
 
 from pydantic import BaseModel, Field
 from pydantic_core import to_json
+from semver import Version
 from shortuuid import uuid
 
 from .appdirs import inspect_data_dir
 
+logger = getLogger(__name__)
+
+EXTENSION_COMMAND_VERSIONS = {"inspect.openLogViewer": Version(0, 3, 61)}
+
 
 class VSCodeCommand(BaseModel):
     command: str
@@ -34,6 +40,25 @@ def can_execute_vscode_commands() -> bool:
     return vs_code_commands_dir() is not None
 
 
+def can_execute_vscode_command(command: str) -> bool:
+    if not can_execute_vscode_commands():
+        return False
+
+    required_version = EXTENSION_COMMAND_VERSIONS.get(command)
+    if required_version is None:
+        return True
+    else:
+        return has_vscode_version(required_version)
+
+
+def has_vscode_version(required_version: Version) -> bool:
+    current_version = vscode_extension_version()
+    if current_version is None:
+        return False
+    else:
+        return current_version.is_compatible(required_version)
+
+
 def vs_code_commands_dir() -> Path | None:
     workspace_id = vscode_workspace_id()
     if workspace_id:
@@ -49,3 +74,15 @@ def vs_code_commands_dir() -> Path | None:
 
 def vscode_workspace_id() -> str | None:
     return os.environ.get("INSPECT_WORKSPACE_ID", None)
+
+
+def vscode_extension_version() -> Version | None:
+    version = os.environ.get("INSPECT_VSCODE_EXT_VERSION", None)
+    if version is not None:
+        try:
+            return Version.parse(version)
+        except Exception:
+            logger.warning(f"Invalid Inspect vscode extension version: {version}")
+            return None
+    else:
+        return None

inspect_ai/_view/www/App.css

@@ -31,6 +31,10 @@
   --inspect-font-size-base: 0.9rem;
   --inspect-font-size-small: 0.8rem;
   --inspect-font-size-smaller: 0.8rem;
+
+  /* Inspect Glass */
+  --inspect-glass-color: #000000;
+  --inspect-glass-opacity: 0.3;
 }
 
 body:not([class^="vscode-"]) button {
@@ -154,6 +158,8 @@ body[class^="vscode-"] {
   --inspect-input-border: var(--vscode-input-border);
   --inspect-diff-add-color: var(--vscode-diffEditor-insertedTextBackground);
   --inspect-diff-remove-color: var(--vscode-diffEditor-removedTextBackground);
+  --inspect-glass-color: var(--vscode-editor-foreground);
+  --inspect-glass-opacity: 0.15;
 }
 
 html.vscode {