refactor: clean up python browser routing diff

Move the handwritten routing helpers out of the old browser_scoped package, delete the unused browser session clone helper, warm the async browser list cache, and drop the generated type churn from the branch.

Made-with: Cursor

Author: rgarcia

src/kernel/_client.py

@@ -29,7 +29,7 @@
     SyncAPIClient,
     AsyncAPIClient,
 )
-from .lib.browser_scoped.routing import (
+from .lib.browser_routing.routing import (
     BrowserRouteCache,
     BrowserRoutingConfig,
     rewrite_direct_vm_options,

src/kernel/lib/browser_scoped/__init__.py …c/kernel/lib/browser_routing/__init__.pysrc/kernel/lib/browser_scoped/__init__.py renamed to src/kernel/lib/browser_routing/__init__.py src/kernel/lib/browser_scoped/__init__.py renamed to src/kernel/lib/browser_routing/__init__.py

@@ -1,13 +1,13 @@
 from __future__ import annotations
 
+from collections.abc import AsyncIterator, Iterable, Iterator
 from contextlib import asynccontextmanager, contextmanager
 from typing import IO, Any, Mapping, cast
-from collections.abc import AsyncIterator, Iterable, Iterator
 
 import httpx
 
 from ..._models import FinalRequestOptions
-from ..._types import Body, BinaryTypes, NotGiven, Timeout, not_given
+from ..._types import BinaryTypes, Body, NotGiven, Timeout, not_given
 from .routing import BrowserRoute
 from .util import sanitize_curl_raw_params
 
@@ -26,18 +26,17 @@ def request_via_browser_route(
 ) -> httpx.Response:
     if json is not None and content is not None:
         raise TypeError("Passing both `json` and `content` is not supported")
-    q: dict[str, object] = {**sanitize_curl_raw_params(params), "url": url}
-    q["jwt"] = route.jwt
-    opts = FinalRequestOptions.construct(
+    query: dict[str, object] = {**sanitize_curl_raw_params(params), "url": url, "jwt": route.jwt}
+    options = FinalRequestOptions.construct(
         method=method.upper(),
         url=route.base_url.rstrip("/") + "/curl/raw",
-        params=q,
+        params=query,
         headers=headers or {},
         content=_normalize_binary_content(content),
         json_data=json,
         timeout=timeout,
     )
-    return cast(httpx.Response, parent.request(httpx.Response, opts))
+    return cast(httpx.Response, parent.request(httpx.Response, options))
 
 
 @contextmanager
@@ -52,25 +51,25 @@ def stream_via_browser_route(
     params: Mapping[str, object] | None = None,
     timeout: float | Timeout | None | NotGiven = not_given,
 ) -> Iterator[httpx.Response]:
-    q: dict[str, Any] = sanitize_curl_raw_params(params)
-    q["jwt"] = route.jwt
-    q["url"] = url
-    h = {k: v for k, v in parent.default_headers.items() if isinstance(v, str)}
+    query: dict[str, Any] = sanitize_curl_raw_params(params)
+    query["jwt"] = route.jwt
+    query["url"] = url
+    request_headers = {k: v for k, v in parent.default_headers.items() if isinstance(v, str)}
     if content is None:
-        h.pop("Content-Type", None)
+        request_headers.pop("Content-Type", None)
     if headers:
-        h.update(headers)
-    h.pop("Authorization", None)
-    eff_timeout = parent.timeout if isinstance(timeout, NotGiven) else timeout
+        request_headers.update(headers)
+    request_headers.pop("Authorization", None)
+    effective_timeout = parent.timeout if isinstance(timeout, NotGiven) else timeout
     with parent._client.stream(
         method.upper(),
         route.base_url.rstrip("/") + "/curl/raw",
-        params=q,
-        headers=h,
+        params=query,
+        headers=request_headers,
         content=_normalize_binary_content(content),
-        timeout=_normalize_timeout(eff_timeout),
-    ) as resp:
-        yield resp
+        timeout=_normalize_timeout(effective_timeout),
+    ) as response:
+        yield response
 
 
 async def async_request_via_browser_route(
@@ -87,18 +86,17 @@ async def async_request_via_browser_route(
 ) -> httpx.Response:
     if json is not None and content is not None:
         raise TypeError("Passing both `json` and `content` is not supported")
-    q: dict[str, object] = {**sanitize_curl_raw_params(params), "url": url}
-    q["jwt"] = route.jwt
-    opts = FinalRequestOptions.construct(
+    query: dict[str, object] = {**sanitize_curl_raw_params(params), "url": url, "jwt": route.jwt}
+    options = FinalRequestOptions.construct(
         method=method.upper(),
         url=route.base_url.rstrip("/") + "/curl/raw",
-        params=q,
+        params=query,
         headers=headers or {},
         content=_normalize_binary_content(content),
         json_data=json,
         timeout=timeout,
     )
-    return cast(httpx.Response, await parent.request(httpx.Response, opts))
+    return cast(httpx.Response, await parent.request(httpx.Response, options))
 
 
 @asynccontextmanager
@@ -113,25 +111,25 @@ async def async_stream_via_browser_route(
     params: Mapping[str, object] | None = None,
     timeout: float | Timeout | None | NotGiven = not_given,
 ) -> AsyncIterator[httpx.Response]:
-    q: dict[str, Any] = sanitize_curl_raw_params(params)
-    q["jwt"] = route.jwt
-    q["url"] = url
-    h = {k: v for k, v in parent.default_headers.items() if isinstance(v, str)}
+    query: dict[str, Any] = sanitize_curl_raw_params(params)
+    query["jwt"] = route.jwt
+    query["url"] = url
+    request_headers = {k: v for k, v in parent.default_headers.items() if isinstance(v, str)}
     if content is None:
-        h.pop("Content-Type", None)
+        request_headers.pop("Content-Type", None)
     if headers:
-        h.update(headers)
-    h.pop("Authorization", None)
-    eff_timeout = parent.timeout if isinstance(timeout, NotGiven) else timeout
+        request_headers.update(headers)
+    request_headers.pop("Authorization", None)
+    effective_timeout = parent.timeout if isinstance(timeout, NotGiven) else timeout
     async with parent._client.stream(
         method.upper(),
         route.base_url.rstrip("/") + "/curl/raw",
-        params=q,
-        headers=h,
+        params=query,
+        headers=request_headers,
         content=_normalize_binary_content(content),
-        timeout=_normalize_timeout(eff_timeout),
-    ) as resp:
-        yield resp
+        timeout=_normalize_timeout(effective_timeout),
+    ) as response:
+        yield response
 
 
 def _normalize_timeout(timeout: float | Timeout | None | NotGiven) -> float | Timeout | None:

src/kernel/lib/browser_scoped/raw_http.py …c/kernel/lib/browser_routing/raw_http.pysrc/kernel/lib/browser_scoped/raw_http.py renamed to src/kernel/lib/browser_routing/raw_http.py src/kernel/lib/browser_scoped/raw_http.py renamed to src/kernel/lib/browser_routing/raw_http.py

@@ -7,7 +7,7 @@
 
 from ..._compat import model_copy
 from ..._models import FinalRequestOptions
-from .util import base_url_from_browser_like, jwt_from_cdp_ws_url, cdp_ws_url_from_browser_like, session_id_from_browser_like
+from .util import base_url_from_browser_like, cdp_ws_url_from_browser_like, jwt_from_cdp_ws_url, session_id_from_browser_like
 
 
 @dataclass
@@ -118,5 +118,3 @@ def match_direct_vm_path(path: str) -> tuple[str, str, str] | None:
             suffix = "/" + "/".join(parts[index + 3 :])
         return session_id, subresource, suffix
     return None
-
-

src/kernel/lib/browser_scoped/routing.py src/kernel/lib/browser_routing/routing.pysrc/kernel/lib/browser_scoped/routing.py renamed to src/kernel/lib/browser_routing/routing.py

@@ -28,33 +28,31 @@ def session_id_from_browser_like(browser: Any) -> str:
         return sid
     if isinstance(browser, Mapping):
         mapping = cast(Mapping[str, object], browser)
-        m = mapping.get("session_id")
-        if isinstance(m, str) and m:
-            return m
+        value = mapping.get("session_id")
+        if isinstance(value, str) and value:
+            return value
     raise TypeError("browser object must have a non-empty session_id")
 
 
 def base_url_from_browser_like(browser: Any) -> str | None:
-    bu = getattr(browser, "base_url", None)
-    if isinstance(bu, str) and bu.strip():
-        return bu.strip().rstrip("/") + "/"
+    base_url = getattr(browser, "base_url", None)
+    if isinstance(base_url, str) and base_url.strip():
+        return base_url.strip().rstrip("/") + "/"
     if isinstance(browser, Mapping):
         mapping = cast(Mapping[str, object], browser)
-        raw = mapping.get("base_url")
-        if isinstance(raw, str) and raw.strip():
-            return raw.strip().rstrip("/") + "/"
+        value = mapping.get("base_url")
+        if isinstance(value, str) and value.strip():
+            return value.strip().rstrip("/") + "/"
     return None
 
 
 def cdp_ws_url_from_browser_like(browser: Any) -> str:
-    u = getattr(browser, "cdp_ws_url", None)
-    if isinstance(u, str) and u:
-        return u
+    cdp_ws_url = getattr(browser, "cdp_ws_url", None)
+    if isinstance(cdp_ws_url, str) and cdp_ws_url:
+        return cdp_ws_url
     if isinstance(browser, Mapping):
         mapping = cast(Mapping[str, object], browser)
-        m = mapping.get("cdp_ws_url")
-        if isinstance(m, str) and m:
-            return m
+        value = mapping.get("cdp_ws_url")
+        if isinstance(value, str) and value:
+            return value
     raise TypeError("browser object must have a non-empty cdp_ws_url")
-
-

src/kernel/lib/browser_scoped/util.py src/kernel/lib/browser_routing/util.pysrc/kernel/lib/browser_scoped/util.py renamed to src/kernel/lib/browser_routing/util.py

@@ -88,13 +88,13 @@
 from ...types.shared_params.browser_profile import BrowserProfile
 from ...types.shared_params.browser_viewport import BrowserViewport
 from ...types.shared_params.browser_extension import BrowserExtension
-from ...lib.browser_scoped.raw_http import (
+from ...lib.browser_routing.raw_http import (
     async_request_via_browser_route,
     async_stream_via_browser_route,
     request_via_browser_route,
     stream_via_browser_route,
 )
-from ...lib.browser_scoped.routing import browser_route_from_browser
+from ...lib.browser_routing.routing import browser_route_from_browser
 
 __all__ = ["BrowsersResource", "AsyncBrowsersResource"]
 
@@ -978,7 +978,7 @@ def list(
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        return self._get_api_list(
+        page = self._get_api_list(
             "/browsers",
             page=AsyncOffsetPagination[BrowserListResponse],
             options=make_request_options(
@@ -999,6 +999,11 @@ def list(
             ),
             model=BrowserListResponse,
         )
+        for item in page.items:
+            route = browser_route_from_browser(item)
+            if route is not None:
+                self._client.browser_route_cache.set(route)
+        return page
 
     @typing_extensions.deprecated("deprecated")
     async def delete(

src/kernel/lib/browser_scoped/browser_session_kernel.py

@@ -36,7 +36,7 @@ class BrowserCreateResponse(BaseModel):
     """Websocket URL for WebDriver BiDi connections to the browser session"""
 
     base_url: Optional[str] = None
-    """HTTP base URL for this browser session (browser VM / session proxy)."""
+    """Metro-API HTTP base URL for this browser session."""
 
     browser_live_view_url: Optional[str] = None
     """Remote URL for live viewing the browser session.

src/kernel/resources/browsers/browsers.py

@@ -36,7 +36,7 @@ class BrowserListResponse(BaseModel):
     """Websocket URL for WebDriver BiDi connections to the browser session"""
 
     base_url: Optional[str] = None
-    """HTTP base URL for this browser session (browser VM / session proxy)."""
+    """Metro-API HTTP base URL for this browser session."""
 
     browser_live_view_url: Optional[str] = None
     """Remote URL for live viewing the browser session.

src/kernel/types/browser_create_response.py

@@ -36,7 +36,7 @@ class BrowserPoolAcquireResponse(BaseModel):
     """Websocket URL for WebDriver BiDi connections to the browser session"""
 
     base_url: Optional[str] = None
-    """HTTP base URL for this browser session (browser VM / session proxy)."""
+    """Metro-API HTTP base URL for this browser session."""
 
     browser_live_view_url: Optional[str] = None
     """Remote URL for live viewing the browser session.