fix: finish python browser routing cleanup

Preserve browser routing settings across copy(), skip cache warming for raw response wrappers, and clean up the handwritten routing files so lint can pass on the current branch.

Made-with: Cursor

Author: rgarcia

examples/browser_routing.py

@@ -1,21 +1,26 @@
 """Example: direct-to-VM browser routing for process exec and raw HTTP."""
 
-from kernel import BrowserRoutingConfig, Kernel
+from typing import Any, cast
+
+import httpx
+
+from kernel import Kernel, BrowserRoutingConfig
 
 
 def main() -> None:
     with Kernel(browser_routing=BrowserRoutingConfig(enabled=True, subresources=("process",))) as client:
-        browser = client.browsers.create(headless=True)
+        browsers = cast(Any, client.browsers)
+        browser = browsers.create(headless=True)
         try:
-            client.browsers.process.exec(browser.session_id, command="uname", args=["-a"])
+            browsers.process.exec(browser.session_id, command="uname", args=["-a"])
 
-            response = client.browsers.request(browser.session_id, "GET", "https://example.com")
+            response = cast(httpx.Response, browsers.request(browser.session_id, "GET", "https://example.com"))
             print("status", response.status_code)
 
-            with client.browsers.stream(browser.session_id, "GET", "https://example.com") as streamed:
+            with cast(Any, browsers.stream(browser.session_id, "GET", "https://example.com")) as streamed:
                 print("streamed-bytes", len(streamed.read()))
         finally:
-            client.browsers.delete_by_id(browser.session_id)
+            browsers.delete_by_id(browser.session_id)
 
 
 if __name__ == "__main__":

src/kernel/__init__.py

@@ -7,7 +7,6 @@
 from ._utils import file_from_path
 from ._client import (
     ENVIRONMENTS,
-    BrowserRoutingConfig,
     Client,
     Kernel,
     Stream,
@@ -17,6 +16,7 @@
     AsyncKernel,
     AsyncStream,
     RequestOptions,
+    BrowserRoutingConfig,
 )
 from ._models import BaseModel
 from ._version import __title__, __version__

src/kernel/_client.py

@@ -32,8 +32,8 @@
 from .lib.browser_routing.routing import (
     BrowserRouteCache,
     BrowserRoutingConfig,
-    rewrite_direct_vm_options,
     strip_direct_vm_auth,
+    rewrite_direct_vm_options,
 )
 
 if TYPE_CHECKING:
@@ -301,6 +301,8 @@ def copy(
         set_default_headers: Mapping[str, str] | None = None,
         default_query: Mapping[str, object] | None = None,
         set_default_query: Mapping[str, object] | None = None,
+        browser_routing: BrowserRoutingConfig | None = None,
+        _browser_route_cache: BrowserRouteCache | None = None,
         _extra_kwargs: Mapping[str, Any] = {},
     ) -> Self:
         """
@@ -334,8 +336,8 @@ def copy(
             max_retries=max_retries if is_given(max_retries) else self.max_retries,
             default_headers=headers,
             default_query=params,
-            browser_routing=self._browser_routing,
-            _browser_route_cache=self.browser_route_cache,
+            browser_routing=browser_routing if browser_routing is not None else self._browser_routing,
+            _browser_route_cache=_browser_route_cache or self.browser_route_cache,
             **_extra_kwargs,
         )
 
@@ -595,6 +597,8 @@ def copy(
         set_default_headers: Mapping[str, str] | None = None,
         default_query: Mapping[str, object] | None = None,
         set_default_query: Mapping[str, object] | None = None,
+        browser_routing: BrowserRoutingConfig | None = None,
+        _browser_route_cache: BrowserRouteCache | None = None,
         _extra_kwargs: Mapping[str, Any] = {},
     ) -> Self:
         """
@@ -628,8 +632,8 @@ def copy(
             max_retries=max_retries if is_given(max_retries) else self.max_retries,
             default_headers=headers,
             default_query=params,
-            browser_routing=self._browser_routing,
-            _browser_route_cache=self.browser_route_cache,
+            browser_routing=browser_routing if browser_routing is not None else self._browser_routing,
+            _browser_route_cache=_browser_route_cache or self.browser_route_cache,
             **_extra_kwargs,
         )
 

src/kernel/lib/browser_routing/__init__.py

@@ -1 +1,3 @@
+from __future__ import annotations
+
 __all__: list[str] = []

src/kernel/lib/browser_routing/raw_http.py

@@ -1,15 +1,15 @@
 from __future__ import annotations
 
-from collections.abc import AsyncIterator, Iterable, Iterator
-from contextlib import asynccontextmanager, contextmanager
 from typing import IO, Any, Mapping, cast
+from contextlib import contextmanager, asynccontextmanager
+from collections.abc import Iterable, Iterator, AsyncIterator
 
 import httpx
 
-from ..._models import FinalRequestOptions
-from ..._types import BinaryTypes, Body, NotGiven, Timeout, not_given
-from .routing import BrowserRoute
 from .util import sanitize_curl_raw_params
+from .routing import BrowserRoute
+from ..._types import Body, Timeout, NotGiven, BinaryTypes, not_given
+from ..._models import FinalRequestOptions
 
 
 def request_via_browser_route(

src/kernel/lib/browser_routing/routing.py

@@ -1,13 +1,18 @@
 from __future__ import annotations
 
-from dataclasses import dataclass, field
 from typing import Any, Mapping, cast
+from dataclasses import field, dataclass
 
 import httpx
 
+from .util import (
+    jwt_from_cdp_ws_url,
+    base_url_from_browser_like,
+    cdp_ws_url_from_browser_like,
+    session_id_from_browser_like,
+)
 from ..._compat import model_copy
 from ..._models import FinalRequestOptions
-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
@@ -45,7 +50,11 @@ def values(self) -> list[BrowserRoute]:
 
 
 def browser_route_from_browser(browser: Any) -> BrowserRoute | None:
-    session_id = session_id_from_browser_like(browser)
+    try:
+        session_id = session_id_from_browser_like(browser)
+    except TypeError:
+        return None
+
     base_url = base_url_from_browser_like(browser)
     if not base_url:
         return None

src/kernel/resources/browsers/browsers.py

@@ -2,9 +2,9 @@
 
 from __future__ import annotations
 
-from contextlib import asynccontextmanager, contextmanager
 import typing_extensions
-from typing import AsyncIterator, Dict, Iterator, Mapping, Iterable, Optional, cast
+from typing import Dict, Mapping, Iterable, Iterator, Optional, AsyncIterator, cast
+from contextlib import contextmanager, asynccontextmanager
 from typing_extensions import Literal
 
 import httpx
@@ -79,22 +79,22 @@
 )
 from ...pagination import SyncOffsetPagination, AsyncOffsetPagination
 from ..._base_client import AsyncPaginator, make_request_options
+from ...lib.browser_routing.routing import browser_route_from_browser
 from ...types.browser_curl_response import BrowserCurlResponse
 from ...types.browser_list_response import BrowserListResponse
+from ...lib.browser_routing.raw_http import (
+    stream_via_browser_route,
+    request_via_browser_route,
+    async_stream_via_browser_route,
+    async_request_via_browser_route,
+)
 from ...types.browser_create_response import BrowserCreateResponse
 from ...types.browser_update_response import BrowserUpdateResponse
 from ...types.browser_persistence_param import BrowserPersistenceParam
 from ...types.browser_retrieve_response import BrowserRetrieveResponse
 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_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_routing.routing import browser_route_from_browser
 
 __all__ = ["BrowsersResource", "AsyncBrowsersResource"]
 

tests/test_browser_routing.py

@@ -4,12 +4,12 @@
 from typing import Any, cast
 
 import httpx
-import pytest
 import respx
+import pytest
 
 from kernel import Kernel
-from kernel.lib.browser_routing.routing import BrowserRoutingConfig, browser_route_from_browser
 from kernel.lib.browser_routing.util import jwt_from_cdp_ws_url
+from kernel.lib.browser_routing.routing import BrowserRoutingConfig, browser_route_from_browser
 
 base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
 api_key = "sk-123"