inspect-ai 0.3.78__py3-none-any.whl → 0.3.80__py3-none-any.whl

inspect_ai/_view/www/src/App.tsx

@@ -1,5 +1,6 @@
 import "bootstrap-icons/font/bootstrap-icons.css";
 import "bootstrap/dist/css/bootstrap.css";
+import JSON5 from "json5";
 
 import "prismjs";
 import "prismjs/components/prism-bash";
@@ -748,7 +749,7 @@ export const App: FC<AppProps> = ({
 
       const embeddedState = document.getElementById("logview-state");
       if (embeddedState) {
-        const state = JSON.parse(embeddedState.textContent || "");
+        const state = JSON5.parse(embeddedState.textContent || "");
         onMessage({ data: state });
       } else {
         const result = await load();

inspect_ai/_view/www/src/api/index.ts

@@ -1,3 +1,4 @@
+import JSON5 from "json5";
 import { dirname } from "../utils/path";
 import { getVscodeApi } from "../utils/vscode";
 import browserApi from "./api-browser";
@@ -22,7 +23,7 @@ const resolveApi = (): ClientAPI => {
       // Read the contents
       const context = scriptEl.textContent;
       if (context !== null) {
-        const data = JSON.parse(context);
+        const data = JSON5.parse(context);
         if (data.log_dir || data.log_file) {
           const log_dir = data.log_dir || dirname(data.log_file);
           const api = simpleHttpApi(log_dir, data.log_file);

inspect_ai/_view/www/src/metadata/RenderedContent.tsx

@@ -1,3 +1,4 @@
+import JSON5 from "json5";
 import { ApplicationIcons } from "../appearance/icons";
 
 import { ANSIDisplay } from "../components/AnsiDisplay";
@@ -91,7 +92,7 @@ const contentRenderers: Record<string, ContentRenderer> = {
       return false;
     },
     render: (_id, entry) => {
-      const obj = JSON.parse(entry.value);
+      const obj = JSON5.parse(entry.value);
       return { rendered: <JSONPanel data={obj as Record<string, unknown>} /> };
     },
   },

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

@@ -34,7 +34,7 @@ self.onmessage = function (e) {
   const decoder = new TextDecoder();
   const text = decoder.decode(encodedText);
   try {
-    const result = JSON.parse(text);
+    const result = JSON5.parse(text);
     postMessage({ success: true, result });
   } catch (err) {
     postMessage({ success: false, error: err.message });

inspect_ai/model/_providers/google.py

@@ -70,8 +70,6 @@ from inspect_ai.model import (
     TopLogprob,
 )
 from inspect_ai.model._model_call import ModelCall
-from inspect_ai.model._providers.util import model_base_url
-from inspect_ai.model._providers.util.hooks import HttpHooks, urllib3_hooks
 from inspect_ai.tool import (
     ToolCall,
     ToolChoice,
@@ -81,6 +79,9 @@ from inspect_ai.tool import (
     ToolParams,
 )
 
+from .util import model_base_url
+from .util.hooks import HttpHooks, HttpxHooks
+
 logger = getLogger(__name__)
 
 
@@ -177,15 +178,10 @@ class GoogleGenAIAPI(ModelAPI):
                 self.api_key = os.environ.get(GOOGLE_API_KEY, None)
 
             # custom base_url
-            base_url = model_base_url(base_url, "GOOGLE_BASE_URL")
+            self.base_url = model_base_url(self.base_url, "GOOGLE_BASE_URL")
 
-        # create client
-        self.client = Client(
-            vertexai=self.is_vertex(),
-            api_key=self.api_key,
-            http_options={"base_url": base_url},
-            **model_args,
-        )
+        # save model args
+        self.model_args = model_args
 
     @override
     async def close(self) -> None:
@@ -202,11 +198,20 @@ class GoogleGenAIAPI(ModelAPI):
         tool_choice: ToolChoice,
         config: GenerateConfig,
     ) -> ModelOutput | tuple[ModelOutput | Exception, ModelCall]:
-        # generate request_id
-        request_id = urllib3_hooks().start_request()
+        # create client
+        client = Client(
+            vertexai=self.is_vertex(),
+            api_key=self.api_key,
+            http_options={"base_url": self.base_url},
+            **self.model_args,
+        )
+
+        # create hooks and allocate request
+        http_hooks = HttpxHooks(client._api_client._async_httpx_client)
+        request_id = http_hooks.start_request()
 
         # Create google-genai types.
-        gemini_contents = await as_chat_messages(self.client, input)
+        gemini_contents = await as_chat_messages(client, input)
         gemini_tools = chat_tools(tools) if len(tools) > 0 else None
         gemini_tool_config = chat_tool_config(tool_choice) if len(tools) > 0 else None
         parameters = GenerateContentConfig(
@@ -222,9 +227,7 @@ class GoogleGenAIAPI(ModelAPI):
             safety_settings=safety_settings_to_list(self.safety_settings),
             tools=gemini_tools,
             tool_config=gemini_tool_config,
-            system_instruction=await extract_system_message_as_parts(
-                self.client, input
-            ),
+            system_instruction=await extract_system_message_as_parts(client, input),
         )
         if config.response_schema is not None:
             parameters.response_mime_type = "application/json"
@@ -242,11 +245,11 @@ class GoogleGenAIAPI(ModelAPI):
                 tools=gemini_tools,
                 tool_config=gemini_tool_config,
                 response=response,
-                time=urllib3_hooks().end_request(request_id),
+                time=http_hooks.end_request(request_id),
             )
 
         try:
-            response = await self.client.aio.models.generate_content(
+            response = await client.aio.models.generate_content(
                 model=self.model_name,
                 contents=gemini_contents,
                 config=parameters,
@@ -264,26 +267,8 @@ class GoogleGenAIAPI(ModelAPI):
 
     @override
     def should_retry(self, ex: Exception) -> bool:
-        import requests  # type: ignore
-
-        # standard http errors
-        if (
-            isinstance(ex, APIError)
-            and isinstance(ex.status, str)
-            and ex.status.isdigit()
-        ):
-            return is_retryable_http_status(int(ex.status))
-
-        # low-level requests exceptions
-        elif isinstance(ex, requests.exceptions.RequestException):
-            return isinstance(
-                ex,
-                (
-                    requests.exceptions.ConnectionError
-                    | requests.exceptions.ConnectTimeout
-                    | requests.exceptions.ChunkedEncodingError
-                ),
-            )
+        if isinstance(ex, APIError) and ex.code is not None:
+            return is_retryable_http_status(ex.code)
         else:
             return False
 

inspect_ai/model/_providers/mistral.py

@@ -283,10 +283,9 @@ def mistral_function(tool: ToolInfo) -> MistralFunction:
     return MistralFunction(
         name=tool.name,
         description=tool.description,
-        parameters={
-            k: v.model_dump(exclude={"additionalProperties"}, exclude_none=True)
-            for k, v in tool.parameters.properties.items()
-        },
+        parameters=tool.parameters.model_dump(
+            exclude={"additionalProperties"}, exclude_none=True
+        ),
     )
 
 

inspect_ai/model/_providers/providers.py

@@ -94,11 +94,7 @@ def vertex() -> type[ModelAPI]:
 def google() -> type[ModelAPI]:
     FEATURE = "Google API"
     PACKAGE = "google-genai"
-    MIN_VERSION = "1.2.0"
-
-    # workaround log spam
-    # https://github.com/ray-project/ray/issues/24917
-    os.environ["GRPC_ENABLE_FORK_SUPPORT"] = "0"
+    MIN_VERSION = "1.8.0"
 
     # verify we have the package
     try:
@@ -148,7 +144,7 @@ def cf() -> type[ModelAPI]:
 def mistral() -> type[ModelAPI]:
     FEATURE = "Mistral API"
     PACKAGE = "mistralai"
-    MIN_VERSION = "1.5.1"
+    MIN_VERSION = "1.6.0"
 
     # verify we have the package
     try:

{inspect_ai-0.3.78.dist-info → inspect_ai-0.3.80.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: inspect_ai
-Version: 0.3.78
+Version: 0.3.80
 Summary: Framework for large language model evaluations
 Author: UK AI Security Institute
 License: MIT License

{inspect_ai-0.3.78.dist-info → inspect_ai-0.3.80.dist-info}/RECORD

@@ -50,7 +50,7 @@ inspect_ai/_eval/evalset.py,sha256=HGrz0LkTMsBbYDPZEMVnZCmFi_pYegZtSoqRVYbRDiE,2
 inspect_ai/_eval/list.py,sha256=VbZ-2EI6MqrXvCN7VTz21TQSoU5K5_Q0hqhxmj5A_m0,3744
 inspect_ai/_eval/loader.py,sha256=yOj8HqYBFQntx0_GY4Wxqm6jivlT4N4WiQ1T8J9uRVA,23606
 inspect_ai/_eval/registry.py,sha256=9Q-Re9uZagQ2nw-W7hA6zhrmCQFmo3KcxncTcG24EG8,5315
-inspect_ai/_eval/run.py,sha256=9TtOp1vc18KclxstjvWhEL5VtcLBL3SRbRwsoRXaah8,19179
+inspect_ai/_eval/run.py,sha256=7Cepcyd5KaMcoUQybRifTtFEOLBBvmszhJdH_-yzb3E,19315
 inspect_ai/_eval/score.py,sha256=qf9T8XwUmfE6A8QK1-D-jUbNlLETVM-HXhucPWZ0Ro0,9591
 inspect_ai/_eval/task/__init__.py,sha256=6FvojMW3yo36L7xDacppCHDxt6A8_tzj_ftg5bQ6eNk,199
 inspect_ai/_eval/task/constants.py,sha256=quAKMw-4-3xKd1T_KwXCZvHYoKRXt1ZGuaHbBcWJwnA,72
@@ -144,8 +144,8 @@ inspect_ai/_view/www/.vscode/settings.json,sha256=g5hrVnMaYxM06JpiJD2EuE2xjcbF6x
 inspect_ai/_view/www/dist/index.html,sha256=gpdu6SR-SOH9EWx15cCWHzujMZujnZR5tRlEfROJg2A,997
 inspect_ai/_view/www/dist/assets/favicon.svg,sha256=b9AHYZaO2zBzeKH6G4PwXZMGGW_UxY0omKHam-c9MAs,1508
 inspect_ai/_view/www/dist/assets/index.css,sha256=V0HHB6ss9UdKAlLKTmyHoYAZrstD6nvb-UhnWInyhQQ,895546
-inspect_ai/_view/www/dist/assets/index.js,sha256=-dI_BWa2w7TMj1_inAgHQmG4qq44oG_X2JM70W7DygY,2748559
-inspect_ai/_view/www/src/App.tsx,sha256=rhiZKs-f1y9amyX_OLay7aL4OXaQ_o0gNd04M3pZVuk,28852
+inspect_ai/_view/www/dist/assets/index.js,sha256=VOFdGjZJ1tIRN494HFu_9wY6jghQP5lswgZLvppnwxw,2748550
+inspect_ai/_view/www/src/App.tsx,sha256=Biposnrrx3ZZXLiLJXTCJGQge66C9BE8mfn4W4QJyF4,28880
 inspect_ai/_view/www/src/AppErrorBoundary.tsx,sha256=RyhZWbIMZj1QeUOUUXh9hUFvq6LoDEoHuTY0giswmL0,1169
 inspect_ai/_view/www/src/constants.ts,sha256=aLncMT1XjKzyphLF_jkXPZicsCJXMsBXcDomAC4EaIY,1228
 inspect_ai/_view/www/src/index.tsx,sha256=WOnrMIxwi4xRcUnOyPDHCbA6cGpi5VUGeSHlcZp3v4o,3455
@@ -155,7 +155,7 @@ inspect_ai/_view/www/src/api/api-http.ts,sha256=BWgMOn0l4YL12HcoQRFSJPZ9QLTV4j3z
 inspect_ai/_view/www/src/api/api-shared.ts,sha256=F0qCU97BN8p4DjsdK62hwoRSlcJUahCY--WyacbMRz0,1524
 inspect_ai/_view/www/src/api/api-vscode.ts,sha256=1GzxZ5Os_l2mjPkfhSe7qKDPlGFSDMh5DjTA0vONVts,2324
 inspect_ai/_view/www/src/api/client-api.ts,sha256=bSHmXBp9i4NxBQn_BlTF_DyBlhR4sNPueHJEbC8nlOI,8202
-inspect_ai/_view/www/src/api/index.ts,sha256=A-nWwvyWc5uf7ebNmxdnDXMj4fuyYzhZHgIGsmyRlJw,1737
+inspect_ai/_view/www/src/api/index.ts,sha256=8ZnvEspFRo9n0oWpWEw_FeGXmEbep36QlrvX4dgRPnA,1765
 inspect_ai/_view/www/src/api/jsonrpc.ts,sha256=XDyp8ruONzjng1vuiSv8EU7eJhST-4K2ox0IBkCmBfc,5662
 inspect_ai/_view/www/src/api/types.ts,sha256=fKO0-xwnQr2CEIvOH6umBknuVEJ_2NR3zXUapsk1x88,3086
 inspect_ai/_view/www/src/appearance/colors.ts,sha256=nkVEfmgLb8vTOF1o0YNu0SWNwmSMAbPKFwg4OTZDK_M,217
@@ -212,7 +212,7 @@ inspect_ai/_view/www/src/metadata/MetaDataView.module.css,sha256=-8AWTfZEMm7PEtS
 inspect_ai/_view/www/src/metadata/MetaDataView.tsx,sha256=JUfhXUzxDDzy240YZOMs2Zr9AXiWLUgUDU6puEin_G0,2243
 inspect_ai/_view/www/src/metadata/MetadataGrid.module.css,sha256=jHCm0DLEMzjpQGFIRZiJEej3LsliFKIe3qxPOPnSWH0,221
 inspect_ai/_view/www/src/metadata/RenderedContent.module.css,sha256=Ji5KWs-f7J2g-OqZ41Rxr0DAOkHHTDL-w7KAjgWxeVo,134
-inspect_ai/_view/www/src/metadata/RenderedContent.tsx,sha256=B0DohyaqZoJduAYbq1oQKTG--vGBxVZROb9douEPR_I,6909
+inspect_ai/_view/www/src/metadata/RenderedContent.tsx,sha256=FTWVKM-TGN5GMSMijp56B2LbT9f2Oc9O9LoxeG15M8s,6937
 inspect_ai/_view/www/src/metadata/types.ts,sha256=Ss21MoobQ3SS1D3sbgQp_ab0ef4nD0MtTebUSllTWKs,345
 inspect_ai/_view/www/src/plan/DatasetDetailView.module.css,sha256=FxQ9APykN8fb9JPADCIeO6wq7F9YEmRll8P04Ay3k0o,32
 inspect_ai/_view/www/src/plan/DatasetDetailView.tsx,sha256=J-m35hVN4Sruw5CtuZUJQjASwD-rtJmXJP8SJynmcCU,933
@@ -361,7 +361,7 @@ inspect_ai/_view/www/src/utils/format.ts,sha256=AD7bQMaluuuP_VK_ST3ZJTst7gWPFxiW
 inspect_ai/_view/www/src/utils/git.ts,sha256=2hEC8kRq0NjEEwEmbi9vKy1COJ7NDNURq7PKxcs-7Tc,261
 inspect_ai/_view/www/src/utils/html.ts,sha256=BAiToeaO6DVHrofhNrhi0_bTbUumr8wmpkOGJe4Pd34,212
 inspect_ai/_view/www/src/utils/http.ts,sha256=bHOv920oFymmUJqDMjSaDRCAel3uvRBZFcDMirToKMg,388
-inspect_ai/_view/www/src/utils/json-worker.ts,sha256=LIVuPff2JrGkkjwrdlfNsSZUNpJTtEre6jGlJSwoztg,43454
+inspect_ai/_view/www/src/utils/json-worker.ts,sha256=0eYPlkHkqu4JztHovMccTHa7ha8J84Dam9FEv0Js8Qk,43455
 inspect_ai/_view/www/src/utils/json.ts,sha256=tD4qnoHPB4bky08gHLgtaAMEcYvplqAQtg-173pwYp0,495
 inspect_ai/_view/www/src/utils/path.ts,sha256=rEGEqZVSjuOJ8NcOWGM7fzXrnQ28FGwHG_RVRAA8cWg,700
 inspect_ai/_view/www/src/utils/print.ts,sha256=KAJ4eAQwGql1qy7Ps5wDgPYSn4qrLzP0djFlS5As2U0,2693
@@ -469,12 +469,12 @@ inspect_ai/model/_providers/azureai.py,sha256=tDWuePLhnZBcpHLVzX7J3Wx8VRPhW8tmtj
 inspect_ai/model/_providers/bedrock.py,sha256=mLeMW2JkG4lF0VQGEdku73ZL00EBy-hEvEcyCdjDUDo,24153
 inspect_ai/model/_providers/cloudflare.py,sha256=0e0HPas21cVC8N9mNJlZnSZyIt6FUB9lTIAqPXJDrtE,4586
 inspect_ai/model/_providers/goodfire.py,sha256=EzebC1woEjIXfHLP_ixpMR6G1hC-LxbSUxiilq1c-Is,8868
-inspect_ai/model/_providers/google.py,sha256=YkgeFxVh9hMWoqiHe39wgt02eNTogMxmlYX6goYWyo0,28697
+inspect_ai/model/_providers/google.py,sha256=HpTn7FXF4Lx34-RigFm2xW0yBTQfzPBDOhcTum69vBo,28207
 inspect_ai/model/_providers/grok.py,sha256=dS88ueXiD-kHAFr0jCoTpTGLGa2VsUlB_TFP8L_2lBM,995
 inspect_ai/model/_providers/groq.py,sha256=Fr4fy8NmqllmUW7jhnQ3W94zGlxyr276qaGFS_iDI3Q,11189
 inspect_ai/model/_providers/hf.py,sha256=EZRiiRSzIoRCdFYKj3Otn5ebsROdjzx5YSQ6CzqOJxk,17969
 inspect_ai/model/_providers/llama_cpp_python.py,sha256=i2I56Damgb8VDhMuPxPca24fVhlajDHzxCTYFnT41uI,702
-inspect_ai/model/_providers/mistral.py,sha256=TPJIB0AytktnFwwAlvg6Mz2hXarJK8m0G6ggJw5Cbqg,17774
+inspect_ai/model/_providers/mistral.py,sha256=jrGZUhH6zJvzSz7ZBKa7JoggMXzWIpq1qDW_paRKk_w,17724
 inspect_ai/model/_providers/mockllm.py,sha256=gL9f-f5TOdE4a0GVENr3cOIIp2kv8zVXWPZ608rouGk,2440
 inspect_ai/model/_providers/none.py,sha256=6qLbZpHSoEZaaxFO7luieFjqig2Ju8Fu00DlRngAry8,935
 inspect_ai/model/_providers/ollama.py,sha256=mBPSxaEkiH_RnlHKqOyFBlXObQhc2dfjL-rCKrea5u8,675
@@ -482,7 +482,7 @@ inspect_ai/model/_providers/openai.py,sha256=Qg0MM2OftmzzZ8aio-hvg3GZv77-PyuuY0u
 inspect_ai/model/_providers/openai_o1.py,sha256=wURSSI7aCBxbZONQBaEOYPrQleBExL2c2uSIdJXLi1U,12763
 inspect_ai/model/_providers/openai_responses.py,sha256=9mVdfcKgIULv6YpwCFKFUj63JVi7szvBzHczj12ZdOc,6096
 inspect_ai/model/_providers/openrouter.py,sha256=pDimDmm_4FzS4GZx0n9z8z717mQf3IQlgEy30huzpc4,4730
-inspect_ai/model/_providers/providers.py,sha256=TdRXKzNQmeWZyTaAWkalmxVylRHkft0O8LqGJ054EiI,6508
+inspect_ai/model/_providers/providers.py,sha256=cOXH7P7_mFs0UGQ3VBtXXSbGpQ0YlX1daM9wD98YeBI,6378
 inspect_ai/model/_providers/together.py,sha256=Hwg-5jlFR3K61Epp_NnmDR5lX-bHZ2QT77GjM9dQOKY,9461
 inspect_ai/model/_providers/vertex.py,sha256=3PX3pVvzydA-IczZaEAeqQeiTtimBa3a6t418GAtjhY,17235
 inspect_ai/model/_providers/vllm.py,sha256=KNEjdu-oeCXH-vhpMeF1Pmnf8-mkLpQ5pbyFJMlaT9c,14172
@@ -627,9 +627,9 @@ inspect_ai/util/_sandbox/docker/internal.py,sha256=c8X8TLrBPOvsfnq5TkMlb_bzTALyc
 inspect_ai/util/_sandbox/docker/prereqs.py,sha256=0j6_OauBBnVlpBleADcZavIAAQZy4WewVjbRn9c0stg,3355
 inspect_ai/util/_sandbox/docker/service.py,sha256=hhHIWH1VDFLwehdGd19aUBD_VKfDO3GCPxpw1HSwVQk,2437
 inspect_ai/util/_sandbox/docker/util.py,sha256=EeInihCNXgUWxaqZ4dNOJd719kXL2_jr63QCoXn68vA,3154
-inspect_ai-0.3.78.dist-info/licenses/LICENSE,sha256=xZPCr8gTiFIerrA_DRpLAbw-UUftnLFsHxKeW-NTtq8,1081
-inspect_ai-0.3.78.dist-info/METADATA,sha256=NNzcpeDyLChQBQ9aFqlE2iVcY-sod8sd5B72_pI2qq8,4997
-inspect_ai-0.3.78.dist-info/WHEEL,sha256=DK49LOLCYiurdXXOXwGJm6U4DkHkg4lcxjhqwRa0CP4,91
-inspect_ai-0.3.78.dist-info/entry_points.txt,sha256=WGGLmzTzDWLzYfiyovSY6oEKuf-gqzSDNOb5V-hk3fM,54
-inspect_ai-0.3.78.dist-info/top_level.txt,sha256=Tp3za30CHXJEKLk8xLe9qGsW4pBzJpEIOMHOHNCXiVo,11
-inspect_ai-0.3.78.dist-info/RECORD,,
+inspect_ai-0.3.80.dist-info/licenses/LICENSE,sha256=xZPCr8gTiFIerrA_DRpLAbw-UUftnLFsHxKeW-NTtq8,1081
+inspect_ai-0.3.80.dist-info/METADATA,sha256=ir05BvBkasBJahUTZEdiALpHw3BQMfx8A4oYr3Cd2wc,4997
+inspect_ai-0.3.80.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+inspect_ai-0.3.80.dist-info/entry_points.txt,sha256=WGGLmzTzDWLzYfiyovSY6oEKuf-gqzSDNOb5V-hk3fM,54
+inspect_ai-0.3.80.dist-info/top_level.txt,sha256=Tp3za30CHXJEKLk8xLe9qGsW4pBzJpEIOMHOHNCXiVo,11
+inspect_ai-0.3.80.dist-info/RECORD,,

{inspect_ai-0.3.78.dist-info → inspect_ai-0.3.80.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.0.2)
+Generator: setuptools (78.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any