stagehand 4.0.3a0.dev1475__tar.gz → 4.0.3a0.dev1476__tar.gz

{stagehand-4.0.3a0.dev1475 → stagehand-4.0.3a0.dev1476}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: stagehand
-Version: 4.0.3a0.dev1475
+Version: 4.0.3a0.dev1476
 Summary: Browserbase's SDK for building browser agents
 Keywords: ai,browser,automation,web-scraping,testing
 Author: Browserbase

{stagehand-4.0.3a0.dev1475 → stagehand-4.0.3a0.dev1476}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "stagehand"
-version = "4.0.3a0.dev1475"
+version = "4.0.3a0.dev1476"
 description = "Browserbase's SDK for building browser agents"
 readme = "README.md"
 requires-python = ">=3.11"

{stagehand-4.0.3a0.dev1475 → stagehand-4.0.3a0.dev1476}/src/stagehand/_extension/service-worker.js

@@ -7359,7 +7359,7 @@ function isRecord$1(value) {
 }
 var package_default$1 = {
 	name: "@browserbasehq/stagehand-protocol",
-	version: "2.0.0-alpha-341433acac46a305ad6c2f9a0445e907675f4fb4",
+	version: "2.0.0-alpha-6555e81e837012088eb12a39c06aed0527a2e5af",
 	"private": true,
 	type: "module",
 	scripts: {
@@ -8302,7 +8302,6 @@ var PageNavigationOptionsSchema = strictObject({
 }).meta({ id: "PageNavigationOptions" });
 var PageVoidResultSchema = strictObject({ ok: literal(true) }).meta({ id: "PageVoidResult" });
 var ContextVoidResultSchema = strictObject({ ok: literal(true) }).meta({ id: "ContextVoidResult" });
-var ContextCloseResultSchema = strictObject({ closed: literal(true) }).meta({ id: "ContextCloseResult" });
 var PageScreenshotClipSchema = strictObject({
 	x: number$1(),
 	y: number$1(),
@@ -8784,11 +8783,6 @@ var StagehandMethods = {
 		params: ContextSetActivePageParamsSchema,
 		result: ContextVoidResultSchema
 	},
-	contextClose: {
-		name: "context.close",
-		params: EmptyParamsSchema,
-		result: ContextCloseResultSchema
-	},
 	contextAddInitScript: {
 		name: "context.add_init_script",
 		params: ContextAddInitScriptParamsSchema,
@@ -11555,10 +11549,6 @@ function createContextController(runtime) {
 		logger.debug("context.set_active_page", {});
 		return runtime.contextSetActivePage(params);
 	}
-	async function close(_params, { logger }) {
-		logger.debug("context.close", {});
-		return runtime.contextClose();
-	}
 	async function addInitScript(params, { logger }) {
 		logger.debug("context.add_init_script", {});
 		return runtime.contextAddInitScript(params);
@@ -11616,7 +11606,6 @@ function createContextController(runtime) {
 		newPage,
 		activePage,
 		setActivePage,
-		close,
 		addInitScript,
 		setExtraHTTPHeaders,
 		getDomainPolicy,
@@ -12335,8 +12324,9 @@ function reportPageEventListenerError(error) {
 //#endregion
 //#region ../sdk-ts/src/browserContext.ts
 var BrowserContext$1 = class {
-	constructor(rpcClient) {
+	constructor(rpcClient, closeBrowser) {
 		this.rpcClient = rpcClient;
+		this.closeBrowser = closeBrowser;
 	}
 	get clipboard() {
 		return this.clipboardRef ??= new BrowserClipboard(this.rpcClient);
@@ -12356,9 +12346,10 @@ var BrowserContext$1 = class {
 	async setActivePage(page) {
 		await this.rpcClient.send(StagehandMethods.contextSetActivePage, { pageId: page.pageId });
 	}
-	/** Close the remote context. Call Stagehand.close() to dispose the SDK's local resources. */
+	/** Close the underlying browser. */
 	async close() {
-		await this.rpcClient.send(StagehandMethods.contextClose, {});
+		if (!this.closeBrowser) throw new Error("Browser context is not attached to a browser");
+		await this.closeBrowser();
 	}
 	async addInitScript(script, arg) {
 		const source = await normalizeInitScriptSource$1(script, arg, "context.addInitScript");
@@ -51020,7 +51011,6 @@ var RPCRouter = class {
 			case "context.new_page": return this.contextController.newPage(parseParams(StagehandMethods.contextNewPage, request.params), context);
 			case "context.active_page": return this.contextController.activePage(parseParams(StagehandMethods.contextActivePage, request.params), context);
 			case "context.set_active_page": return this.contextController.setActivePage(parseParams(StagehandMethods.contextSetActivePage, request.params), context);
-			case "context.close": return this.contextController.close(parseParams(StagehandMethods.contextClose, request.params), context);
 			case "context.add_init_script": return this.contextController.addInitScript(parseParams(StagehandMethods.contextAddInitScript, request.params), context);
 			case "context.set_extra_http_headers": return this.contextController.setExtraHTTPHeaders(parseParams(StagehandMethods.contextSetExtraHTTPHeaders, request.params), context);
 			case "context.get_domain_policy": return this.contextController.getDomainPolicy(parseParams(StagehandMethods.contextGetDomainPolicy, request.params), context);
@@ -53447,7 +53437,7 @@ var WebTracerProvider = class extends BasicTracerProvider {
 };
 var package_default = {
 	name: "@browserbasehq/stagehand-extension",
-	version: "1.0.2-alpha-341433acac46a305ad6c2f9a0445e907675f4fb4",
+	version: "1.0.2-alpha-6555e81e837012088eb12a39c06aed0527a2e5af",
 	"private": true,
 	type: "module",
 	scripts: {
@@ -57030,10 +57020,6 @@ var StagehandRuntime = class {
 		await this.requireBrowserSession().setActivePage(page);
 		return { ok: true };
 	}
-	async contextClose() {
-		await this.close();
-		return { closed: true };
-	}
 	async contextAddInitScript(params) {
 		await this.requireBrowserSession().addInitScript(params.source);
 		return { ok: true };

{stagehand-4.0.3a0.dev1475 → stagehand-4.0.3a0.dev1476}/src/stagehand/_generated/input_types.py

@@ -140,10 +140,6 @@ class ContextClipboardWriteTextParams(TypedDict):
     text: str
 
 
-class ContextCloseResult(TypedDict):
-    closed: Literal[True]
-
-
 class ContextCookiesParams(TypedDict):
     urls: NotRequired[str | list[str]]
 

{stagehand-4.0.3a0.dev1475 → stagehand-4.0.3a0.dev1476}/src/stagehand/_generated/models.py

@@ -430,14 +430,6 @@ class ContextClipboardWriteTextParams(WireModel):
     text: StrictStr
 
 
-class ContextCloseResult(WireModel):
-    model_config = ConfigDict(
-        extra="forbid",
-        validate_by_name=True,
-    )
-    closed: Literal[True]
-
-
 class ContextCookiesParams(WireModel):
     model_config = ConfigDict(
         extra="forbid",

{stagehand-4.0.3a0.dev1475 → stagehand-4.0.3a0.dev1476}/src/stagehand/_generated/protocol_version.py

@@ -1,4 +1,4 @@
 """Generated from packages/protocol/package.json. Do not edit."""
 
 PROTOCOL_SEMVER_PATTERN = '^(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)(?:-((?:0|[1-9]\\d*|\\d*[A-Za-z-][0-9A-Za-z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[A-Za-z-][0-9A-Za-z-]*))*))?(?:\\+([0-9A-Za-z-]+(?:\\.[0-9A-Za-z-]+)*))?$'
-STAGEHAND_PROTOCOL_VERSION = '2.0.0-alpha-341433acac46a305ad6c2f9a0445e907675f4fb4'
+STAGEHAND_PROTOCOL_VERSION = '2.0.0-alpha-6555e81e837012088eb12a39c06aed0527a2e5af'

{stagehand-4.0.3a0.dev1475 → stagehand-4.0.3a0.dev1476}/src/stagehand/browser.py

@@ -22,7 +22,7 @@ from ._generated.models import (
     BrowserSessionMetadata,
 )
 from .browserbase_session import DEFAULT_BROWSERBASE_URL, _create_browserbase_session_client
-from .cdp_client import CDPClient
+from .cdp_client import CDPClient, CDPConnectionClosedError
 from .client_models import (
     BrowserbaseConnectOptions,
     LocalBrowserConnectOptions,
@@ -98,7 +98,8 @@ class StagehandBrowser:
         "_attachment",
         "_claimed",
         "_close_callback",
-        "_close_task",
+        "_invalidate_callback",
+        "_terminal_task",
         "_context",
         "_origin",
         "_provider",
@@ -112,6 +113,7 @@ class StagehandBrowser:
         attachment: _ClaimedBrowser,
         close: Callable[[], Awaitable[None]],
         *,
+        invalidate: Callable[[], Awaitable[None]] | None = None,
         session_id: str | None = None,
         _token: object | None = None,
     ) -> None:
@@ -121,8 +123,9 @@ class StagehandBrowser:
         self._origin = origin
         self._attachment = attachment
         self._close_callback = close
+        self._invalidate_callback = invalidate or close
         self._claimed = False
-        self._close_task: asyncio.Task[None] | None = None
+        self._terminal_task: asyncio.Task[None] | None = None
         self._context: BrowserContext | None = None
         self._session_id = session_id
 
@@ -141,7 +144,7 @@ class StagehandBrowser:
 
     @property
     def closed(self) -> bool:
-        return self._close_task is not None
+        return self._terminal_task is not None
 
     @property
     def context(self) -> BrowserContext:
@@ -153,15 +156,12 @@ class StagehandBrowser:
         return self._context
 
     def close(self) -> Awaitable[None]:
-        if self._close_task is None:
-            self._close_task = asyncio.create_task(
-                self._run_close(),
+        if self._terminal_task is None:
+            self._terminal_task = asyncio.create_task(
+                _run_browser_terminal_callback(self._close_callback),
                 name="stagehand-browser-close",
             )
-        return asyncio.shield(self._close_task)
-
-    async def _run_close(self) -> None:
-        await self._close_callback()
+        return asyncio.shield(self._terminal_task)
 
 
 def _claim_browser(browser: object) -> _ClaimedBrowser:
@@ -181,6 +181,23 @@ def _release_browser(browser: StagehandBrowser) -> None:
     browser._claimed = False
 
 
+def _invalidate_browser(browser: StagehandBrowser) -> Awaitable[None]:
+    if not isinstance(browser, StagehandBrowser):
+        raise TypeError("browser must be created by local_browser or browserbase")
+    if browser._terminal_task is None:
+        browser._terminal_task = asyncio.create_task(
+            _run_browser_terminal_callback(browser._invalidate_callback),
+            name="stagehand-browser-invalidate",
+        )
+    return asyncio.shield(browser._terminal_task)
+
+
+async def _run_browser_terminal_callback(
+    callback: Callable[[], Awaitable[None]],
+) -> None:
+    await callback()
+
+
 def _attach_browser_context(
     browser: StagehandBrowser,
     context: BrowserContext,
@@ -289,13 +306,34 @@ async def _connect_browser(
 
     connected_client = cdp_client
 
-    async def close() -> None:
+    async def invalidate() -> None:
         try:
             await connected_client.close()
         finally:
             if owns_source:
                 await source.close()
 
+    async def close() -> None:
+        errors: list[BaseException] = []
+        try:
+            if provider == "local" and origin == "connected":
+                try:
+                    await connected_client.send_command("Browser.close")
+                except CDPConnectionClosedError:
+                    pass
+            else:
+                await source.close()
+        except BaseException as error:
+            errors.append(error)
+        try:
+            await connected_client.close()
+        except BaseException as error:
+            errors.append(error)
+        if len(errors) == 1:
+            raise errors[0]
+        if errors:
+            raise BaseExceptionGroup("Browser termination and cleanup failed", errors)
+
     return StagehandBrowser(
         provider,
         origin,
@@ -304,6 +342,7 @@ async def _connect_browser(
             worker_init_metadata=worker_init_metadata,
         ),
         close,
+        invalidate=invalidate,
         session_id=(
             worker_init_metadata.browser.session_id if worker_init_metadata.browser else None
         ),
@@ -563,7 +602,11 @@ class BrowserbaseBrowser:
         return await _connect_browser(
             provider="browserbase",
             origin="connected",
-            source=_ConnectedBrowserSource(connection.cdp_url),
+            source=ResolvedBrowserSource(
+                cdp_url=connection.cdp_url,
+                keep_alive=True,
+                _close_callback=connection.close,
+            ),
             extension_id=options.extension_id,
             preloaded_extension=options.extension_id is None,
             worker_init_metadata=_WorkerInitMetadata(

{stagehand-4.0.3a0.dev1475 → stagehand-4.0.3a0.dev1476}/src/stagehand/browser_context.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import re
-from collections.abc import Mapping, Sequence
+from collections.abc import Awaitable, Callable, Mapping, Sequence
 from pathlib import Path
 
 from ._generated.input_types import CookieParam
@@ -12,7 +12,6 @@ from ._generated.models import (
     ContextAddCookiesParams,
     ContextAddInitScriptParams,
     ContextClearCookiesParams,
-    ContextCloseResult,
     ContextCookiesParams,
     ContextCookiesResult,
     ContextGetDomainPolicyResult,
@@ -35,8 +34,13 @@ from .rpc_client import RPCClient
 
 
 class BrowserContext:
-    def __init__(self, rpc_client: RPCClient) -> None:
+    def __init__(
+        self,
+        rpc_client: RPCClient,
+        close_browser: Callable[[], Awaitable[None]] | None = None,
+    ) -> None:
         self._rpc_client = rpc_client
+        self._close_browser = close_browser
         self._clipboard: BrowserClipboard | None = None
 
     @property
@@ -76,12 +80,10 @@ class BrowserContext:
         )
 
     async def close(self) -> None:
-        """Close the remote context; use Stagehand.close() to release local resources."""
-        await self._rpc_client.send(
-            "context.close",
-            EmptyParams(),
-            ContextCloseResult,
-        )
+        """Close the underlying browser."""
+        if self._close_browser is None:
+            raise RuntimeError("Browser context is not attached to a browser")
+        await self._close_browser()
 
     async def add_init_script(self, source: str | Path) -> None:
         if isinstance(source, Path):

{stagehand-4.0.3a0.dev1475 → stagehand-4.0.3a0.dev1476}/src/stagehand/browserbase_session.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import asyncio
-from collections.abc import Mapping
+from collections.abc import Awaitable, Callable, Mapping
 from dataclasses import dataclass, field
 from typing import Any, Protocol
 
@@ -142,6 +142,11 @@ class _BrowserbaseSessionConnection:
     session_id: str
     cdp_url: str
     region: BrowserbaseRegion | None = None
+    _close_callback: Callable[[], Awaitable[None]] | None = field(default=None, repr=False)
+
+    async def close(self) -> None:
+        if self._close_callback is not None:
+            await self._close_callback()
 
 
 @dataclass
@@ -254,10 +259,22 @@ class _BrowserbaseSessionClient:
         cdp_url = connect_url.strip() if connect_url is not None else ""
         if not cdp_url:
             raise BrowserbaseSessionError("Browserbase session is not available for connection")
+        released = False
+        close_lock = asyncio.Lock()
+
+        async def close() -> None:
+            nonlocal released
+            async with close_lock:
+                if released:
+                    return
+                await self._api.release_session(retrieved_id.strip() or normalized_session_id)
+                released = True
+
         return _BrowserbaseSessionConnection(
             session_id=retrieved_id.strip() or normalized_session_id,
             cdp_url=cdp_url,
             region=region,
+            _close_callback=close,
         )
 
     async def _delete_extension_best_effort(self, extension_id: str | None) -> None:

{stagehand-4.0.3a0.dev1475 → stagehand-4.0.3a0.dev1476}/src/stagehand/rpc_client.py

@@ -38,7 +38,6 @@ _UNBOUNDED_BY_DEFAULT_METHODS = {
     "stagehand.extract",
     "stagehand.observe",
     "context.new_page",
-    "context.close",
     "context.add_init_script",
     "context.set_extra_http_headers",
     "context.get_domain_policy",

{stagehand-4.0.3a0.dev1475 → stagehand-4.0.3a0.dev1476}/src/stagehand/stagehand.py

@@ -47,6 +47,7 @@ from .browser import (
     _claim_browser,
     _ClaimedBrowser,
     _detach_browser_context,
+    _invalidate_browser,
     _release_browser,
 )
 from .browser_context import BrowserContext
@@ -278,7 +279,10 @@ class Stagehand:
             init_params,
             StagehandInitResult,
         )
-        _attach_browser_context(self._browser_handle, BrowserContext(rpc_client))
+        _attach_browser_context(
+            self._browser_handle,
+            BrowserContext(rpc_client, self._browser_handle.close),
+        )
         self._initialized = True
 
     async def act(
@@ -547,11 +551,11 @@ class Stagehand:
         fail_closed: bool,
     ) -> None:
         if fail_closed:
-            browser_close = browser.close()
+            browser_invalidation = _invalidate_browser(browser)
             try:
                 await self._release_resources()
             finally:
-                await browser_close
+                await browser_invalidation
             return
 
         try: