fix: satisfy browser-scoped lint checks

Tighten browser-scoped helper typing and test casts so the Python SDK passes the repository's lint and pyright checks cleanly.

Made-with: Cursor

Author: rgarcia

src/kernel/lib/browser_scoped/browser_session_kernel.py

@@ -2,7 +2,8 @@
 
 from __future__ import annotations
 
-from typing import Any, cast
+from typing import Any, Mapping, cast
+from typing_extensions import override
 
 from ..._client import Kernel, AsyncKernel
 from ..._compat import model_copy
@@ -18,19 +19,18 @@ def __init__(self, *, browser_session_id: str, **kwargs: Any) -> None:
         self._scoped_session_id = browser_session_id
         super().__init__(**kwargs)
 
+    @override
     def _prepare_options(self, options: FinalRequestOptions) -> FinalRequestOptions:
         options = super()._prepare_options(options)
         url = options.url
-        if not isinstance(url, str):
-            return options
         prefix = f"/browsers/{self._scoped_session_id}/"
         if not url.startswith(prefix):
             return options
         suffix = url[len(prefix) :].lstrip("/")
         new_url = f"/{suffix}" if suffix else "/"
         out = model_copy(options)
         out.url = new_url
-        return cast(FinalRequestOptions, out)
+        return out
 
 
 class _BrowserSessionAsyncKernel(AsyncKernel):
@@ -40,27 +40,30 @@ def __init__(self, *, browser_session_id: str, **kwargs: Any) -> None:
         self._scoped_session_id = browser_session_id
         super().__init__(**kwargs)
 
+    @override
     async def _prepare_options(self, options: FinalRequestOptions) -> FinalRequestOptions:
         options = await super()._prepare_options(options)
         url = options.url
-        if not isinstance(url, str):
-            return options
         prefix = f"/browsers/{self._scoped_session_id}/"
         if not url.startswith(prefix):
             return options
         suffix = url[len(prefix) :].lstrip("/")
         new_url = f"/{suffix}" if suffix else "/"
         out = model_copy(options)
         out.url = new_url
-        return cast(FinalRequestOptions, out)
+        return out
 
 
 def build_browser_session_kernel(
     parent: Kernel, *, session_id: str, session_base_url: str, jwt: str
 ) -> _BrowserSessionKernel:
     """Build a sync client sharing the parent's httpx transport; requests use session_base_url."""
-    base_q = getattr(parent, "_custom_query", None) or {}
-    dq = {str(k): v for k, v in dict(base_q).items()}
+    base_q_raw = getattr(parent, "_custom_query", None)
+    if isinstance(base_q_raw, Mapping):
+        base_q = {str(k): v for k, v in cast(Mapping[str, object], base_q_raw).items()}
+    else:
+        base_q = {}
+    dq = dict(base_q)
     dq["jwt"] = jwt
     return _BrowserSessionKernel(
         browser_session_id=session_id,
@@ -78,8 +81,12 @@ def build_browser_session_kernel(
 def build_async_browser_session_kernel(
     parent: AsyncKernel, *, session_id: str, session_base_url: str, jwt: str
 ) -> _BrowserSessionAsyncKernel:
-    base_q = getattr(parent, "_custom_query", None) or {}
-    dq = {str(k): v for k, v in dict(base_q).items()}
+    base_q_raw = getattr(parent, "_custom_query", None)
+    if isinstance(base_q_raw, Mapping):
+        base_q = {str(k): v for k, v in cast(Mapping[str, object], base_q_raw).items()}
+    else:
+        base_q = {}
+    dq = dict(base_q)
     dq["jwt"] = jwt
     return _BrowserSessionAsyncKernel(
         browser_session_id=session_id,

src/kernel/lib/browser_scoped/client.py

@@ -3,9 +3,9 @@
 from __future__ import annotations
 
 import inspect
-from typing import TYPE_CHECKING, Any, Mapping, cast
+from typing import IO, TYPE_CHECKING, Any, Mapping, cast
 from contextlib import contextmanager, asynccontextmanager
-from collections.abc import Iterator, AsyncIterator
+from collections.abc import Iterable, Iterator, AsyncIterator
 
 import httpx
 
@@ -316,11 +316,11 @@ def _normalize_timeout(timeout: float | Timeout | None | NotGiven) -> float | Ti
     return None if isinstance(timeout, NotGiven) else timeout
 
 
-def _normalize_binary_content(content: BinaryTypes | None) -> httpx._types.RequestContent | None:
+def _normalize_binary_content(content: BinaryTypes | None) -> bytes | IO[bytes] | Iterable[bytes] | None:
     if content is None:
         return None
     if isinstance(content, bytearray):
         return bytes(content)
     if isinstance(content, memoryview):
         return content.tobytes()
-    return cast(httpx._types.RequestContent, content)
+    return content

tests/test_browser_scoped.py

@@ -2,7 +2,7 @@
 
 import os
 import json
-from typing import cast
+from typing import Any, cast
 
 import httpx
 import respx
@@ -48,7 +48,8 @@ def test_for_browser_process_exec_routes_to_session_base() -> None:
         b = client.for_browser(_fake_browser())
         out = b.process.exec(command="echo", args=["hi"])
     assert route.called
-    request = cast(httpx.Request, route.calls[0].request)
+    call = cast(Any, route.calls[0])
+    request = cast(httpx.Request, call.request)
     sent = request.read().decode()
     body = json.loads(sent)
     assert body["command"] == "echo"
@@ -67,7 +68,8 @@ def test_browser_request_uses_curl_raw() -> None:
     assert r.status_code == 200
     assert r.content == b"ok"
     assert route.called
-    request = cast(httpx.Request, route.calls[0].request)
+    call = cast(Any, route.calls[0])
+    request = cast(httpx.Request, call.request)
     assert "curl/raw" in str(request.url)
     assert "jwt=token-abc" in str(request.url)
 
@@ -85,7 +87,8 @@ def test_browser_request_params_cannot_override_target_url_or_jwt() -> None:
             params={"url": "https://evil.example", "jwt": "other", "timeout_ms": 1},
         )
     assert route.called
-    request = cast(httpx.Request, route.calls[0].request)
+    call = cast(Any, route.calls[0])
+    request = cast(httpx.Request, call.request)
     req_url = request.url
     assert str(req_url.params.get("url")) == "https://example.com"
     assert str(req_url.params.get("jwt")) == "token-abc"
@@ -107,7 +110,8 @@ def test_browser_stream_params_cannot_override_target_url_or_jwt() -> None:
             assert resp.status_code == 200
             assert resp.read() == b"streamed"
     assert route.called
-    request = cast(httpx.Request, route.calls[0].request)
+    call = cast(Any, route.calls[0])
+    request = cast(httpx.Request, call.request)
     req_url = request.url
     assert str(req_url.params.get("url")) == "https://example.com"
     assert str(req_url.params.get("jwt")) == "token-abc"