Automate browser based workflows with AI
Python aiapiautomationbrowserbrowser-automationcomputergptllmplaywrightpowerautomatepuppeteerpythonrpaseleniumvisionworkflow
Renew the browser-session activity lease from the attached run (SKY-15568) (#8444)
Aaron Perez4f92d545a4e4
diff --git a/skyvern/webeye/real_browser_manager.py b/skyvern/webeye/real_browser_manager.pyindex 2d972ea4d..1c8e96a2b 100644--- a/skyvern/webeye/real_browser_manager.py+++ b/skyvern/webeye/real_browser_manager.py@@ -55,6 +55,10 @@ LOG = structlog.get_logger()_WORKFLOW_RUN_KEY_PREFIX = f"{WORKFLOW_RUN_PREFIX}_"+# Matched to the CDP proxy's own stamp throttle: the idle budget it feeds is minutes (MIN_TIMEOUT is+# 5), so a stamp this stale still resolves the session active.+SESSION_ACTIVITY_RENEWAL_INTERVAL_SECONDS = 30.0+# Only driver/transport-level CDP drops trigger the cached-PBS evict + reconnect path.# Playwright also surfaces page/context-only closes ("Target page, context or browser# has been closed") with text that overlaps a transport drop; treating those as cached@@ -273,6 +277,11 @@ class RealBrowserManager(BrowserManager):# ``_start_frame_publisher`` so concurrent attaches for one stream key# cannot orphan a publisher loop.self._publisher_lock = asyncio.Lock()+ # Started at the first lease: no event loop runs when the process-wide manager is built.+ self._session_activity_renewer: asyncio.Task[None] | None = None+ # A failed release retains its lease for cleanup attribution but must stop renewing: the+ # stamp outlives this process and would hold a browser past every deadline that reclaims it.+ self._released_session_ids: set[str] = set()@staticmethoddef _matching_session_lease(@@ -290,6 +299,7 @@ class RealBrowserManager(BrowserManager):organization_id: str,lease: _PersistentSessionLease | None,) -> bool:+ self._released_session_ids.add(session_id)owner = self._matching_session_lease(lease, session_id, organization_id)context = skyvern_context.current()expected_runnable_id: str | None = context.browser_session_runnable_id if context else None@@ -313,6 +323,7 @@ class RealBrowserManager(BrowserManager):def _discard_session_lease(self, run_id: str, lease: _PersistentSessionLease | None) -> None:if lease is not None and self._persistent_session_leases.get(run_id) is lease:self._persistent_session_leases.pop(run_id, None)+ self._released_session_ids.discard(lease.session_id)@asynccontextmanagerasync def acquiring_session_runnable(self, runnable_id: str | None) -> AsyncIterator[None]:@@ -331,6 +342,35 @@ class RealBrowserManager(BrowserManager):else:acquiring_runnables.pop(runnable_id, None)+ def _store_session_lease(self, run_id: str, lease: _PersistentSessionLease) -> None:+ self._persistent_session_leases[run_id] = lease+ self._released_session_ids.discard(lease.session_id)+ if self._session_activity_renewer is None or self._session_activity_renewer.done():+ self._session_activity_renewer = asyncio.create_task(+ self._renew_session_activity_leases(), name="persistent_session_activity_renewal"+ )++ def _renewable_session_ids(self) -> set[str]:+ held = {lease.session_id for lease in self._persistent_session_leases.values()}+ return held - self._released_session_ids++ async def _renew_session_activity_leases(self) -> None:+ # The session Pod ends a session on last_activity_at alone, and only the CDP proxy wrote it, so+ # a run driving a browser it did not reach through the proxy was closed mid-step (SKY-15568).+ # Sleeps before the first stamp: the base budget covers a fresh attach, and a run shorter than+ # the interval never writes. Exits once nothing is renewable; the next lease starts a fresh task.+ while self._renewable_session_ids():+ await asyncio.sleep(SESSION_ACTIVITY_RENEWAL_INTERVAL_SECONDS)+ for session_id in self._renewable_session_ids():+ try:+ await app.DATABASE.browser_sessions.touch_last_activity(session_id)+ except Exception:+ LOG.warning(+ "Failed to renew browser session activity lease",+ browser_session_id=session_id,+ exc_info=True,+ )+def live_session_runnable_ids(self) -> set[str]:lease_runnable_ids = {lease.runnable_id for lease in self._persistent_session_leases.values()}acquiring_runnable_ids = {@@ -751,12 +791,15 @@ class RealBrowserManager(BrowserManager):else:LOG.warning("Organization ID is not set for task", task_id=task.task_id)await _rebind_pbs_download_dir(browser_state, download_run_id, browser_session_id)- self._persistent_session_leases[expected_runnable_id] = _PersistentSessionLease(- session_id=browser_session_id,- organization_id=task.organization_id,- runnable_id=expected_runnable_id,- runnable_generation_id=expected_runnable_generation_id,- browser_state=browser_state,+ self._store_session_lease(+ expected_runnable_id,+ _PersistentSessionLease(+ session_id=browser_session_id,+ organization_id=task.organization_id,+ runnable_id=expected_runnable_id,+ runnable_generation_id=expected_runnable_generation_id,+ browser_state=browser_state,+ ),)if browser_state is not None:page = await browser_state.get_working_page()@@ -964,12 +1007,15 @@ class RealBrowserManager(BrowserManager):# It cannot rebind that runnable's download directory or acquire a cleanup lease.if expected_runnable_id is not None:await _rebind_pbs_download_dir(browser_state, download_run_id, browser_session_id)- self._persistent_session_leases[workflow_run.workflow_run_id] = _PersistentSessionLease(- session_id=browser_session_id,- organization_id=workflow_run.organization_id,- runnable_id=expected_runnable_id,- runnable_generation_id=expected_runnable_generation_id,- browser_state=browser_state,+ self._store_session_lease(+ workflow_run.workflow_run_id,+ _PersistentSessionLease(+ session_id=browser_session_id,+ organization_id=workflow_run.organization_id,+ runnable_id=expected_runnable_id,+ runnable_generation_id=expected_runnable_generation_id,+ browser_state=browser_state,+ ),)if browser_state is None:LOG.warning(@@ -1020,12 +1066,15 @@ class RealBrowserManager(BrowserManager):if browser_state is None:raiseif expected_runnable_id is not None:- self._persistent_session_leases[workflow_run.workflow_run_id] = _PersistentSessionLease(- session_id=browser_session_id,- organization_id=workflow_run.organization_id,- runnable_id=expected_runnable_id,- runnable_generation_id=expected_runnable_generation_id,- browser_state=browser_state,+ self._store_session_lease(+ workflow_run.workflow_run_id,+ _PersistentSessionLease(+ session_id=browser_session_id,+ organization_id=workflow_run.organization_id,+ runnable_id=expected_runnable_id,+ runnable_generation_id=expected_runnable_generation_id,+ browser_state=browser_state,+ ),)await _rebind_pbs_download_dir(browser_state, download_run_id, browser_session_id)page = await browser_state.get_working_page()@@ -1232,6 +1281,9 @@ class RealBrowserManager(BrowserManager):async def close(self) -> None:LOG.info("Closing BrowserManager")+ if self._session_activity_renewer is not None:+ self._session_activity_renewer.cancel()+ self._session_activity_renewer = None# Stop all streaming frame publishers before closing browsers so CDP# sessions detach cleanly. Cancellation here is best-effort and must# not block manager shutdown.@@ -1566,12 +1618,15 @@ class RealBrowserManager(BrowserManager):# browser below would produce an unregistered state that terminal cleanup misclassifies as# a reusable persistent session (keyed off browser_session_id) and leaks instead of closes.raise MissingBrowserStateForBrowserSession(browser_session_id)- self._persistent_session_leases[script_id] = _PersistentSessionLease(- session_id=browser_session_id,- organization_id=organization_id,- runnable_id=script_id,- runnable_generation_id=expected_runnable_generation_id,- browser_state=browser_state,+ self._store_session_lease(+ script_id,+ _PersistentSessionLease(+ session_id=browser_session_id,+ organization_id=organization_id,+ runnable_id=script_id,+ runnable_generation_id=expected_runnable_generation_id,+ browser_state=browser_state,+ ),)page = await browser_state.get_working_page()if not page:diff --git a/tests/unit/test_download_dir_rebind.py b/tests/unit/test_download_dir_rebind.pyindex b04a0f869..156659b81 100644--- a/tests/unit/test_download_dir_rebind.py+++ b/tests/unit/test_download_dir_rebind.py@@ -1392,12 +1392,10 @@ async def test_real_browser_manager_adoption_resolves_context_run_id() -> None:"""SKY-11153 / COMP-2: the RealBrowserManager adoption seam rebinds the adopted session'sdownload dir to context.run_id-first, matching the block seam and FileUploadBlock."""- manager = RealBrowserManager.__new__(RealBrowserManager)- manager.pages = {}+ manager = RealBrowserManager()workflow_run = MagicMock(workflow_run_id="wr_x", parent_workflow_run_id=None, browser_profile_id=None, organization_id="org_1")- manager._persistent_session_leases = {}browser_state = MagicMock()browser_state.get_working_page = AsyncMock(return_value=None)browser_state.get_or_create_page = AsyncMock()@@ -1411,6 +1409,7 @@ async def test_real_browser_manager_adoption_resolves_context_run_id() -> None:):mock_app.AGENT_FUNCTION.on_browser_context_acquired = AsyncMock()mock_app.PERSISTENT_SESSIONS_MANAGER.get_browser_state = AsyncMock(return_value=browser_state)+ mock_app.DATABASE.browser_sessions.touch_last_activity = AsyncMock()result = await manager.get_or_create_for_workflow_run(workflow_run, browser_session_id="bs")assert result is browser_statediff --git a/tests/unit/test_real_browser_manager.py b/tests/unit/test_real_browser_manager.pyindex 98c78daf1..c1ce421be 100644--- a/tests/unit/test_real_browser_manager.py+++ b/tests/unit/test_real_browser_manager.py@@ -10,7 +10,7 @@ import asynciofrom contextlib import contextmanagerfrom types import SimpleNamespacefrom typing import Iterator-from unittest.mock import AsyncMock, MagicMock, patch+from unittest.mock import AsyncMock, MagicMock, call, patchimport pytest@@ -52,6 +52,7 @@ def make_workflow_run(def configure_browser_context_acquired_hook(mock_app: MagicMock) -> None:mock_app.AGENT_FUNCTION.on_browser_context_acquired = AsyncMock()+ mock_app.DATABASE.browser_sessions.touch_last_activity = AsyncMock()class _StopBeforeBrowserContext(Exception):@@ -1271,6 +1272,60 @@ async def test_script_acquisition_reports_a_live_session_before_the_lease_existsassert manager.live_session_runnable_ids() == {"s_attach"}+async def test_attached_run_renews_the_session_activity_lease() -> None:+ # Only the CDP proxy wrote last_activity_at, so a run attached off-proxy read as never-active and+ # its session was closed mid-step (SKY-15568).+ manager = RealBrowserManager()+ pbs_state = MagicMock()+ pbs_state.get_working_page = AsyncMock(return_value=None)+ pbs_state.get_or_create_page = AsyncMock()++ with (+ patch("skyvern.webeye.real_browser_manager.app") as mock_app,+ patch.object(real_browser_manager, "SESSION_ACTIVITY_RENEWAL_INTERVAL_SECONDS", 0.01),+ ):+ configure_browser_context_acquired_hook(mock_app)+ mock_app.PERSISTENT_SESSIONS_MANAGER.begin_session = AsyncMock(return_value="gen_renew")+ mock_app.PERSISTENT_SESSIONS_MANAGER.get_browser_state = AsyncMock(return_value=pbs_state)+ touch = AsyncMock()+ mock_app.DATABASE.browser_sessions.touch_last_activity = touch++ try:+ await manager.get_or_create_for_script(+ script_id="s_renew",+ browser_session_id="pbs_renew",+ organization_id="org_test",+ )++ await asyncio.sleep(0.05)+ assert touch.await_args_list.count(call("pbs_renew")) > 0++ # A failed release keeps the lease for cleanup attribution; renewal must still stop there.+ mock_app.PERSISTENT_SESSIONS_MANAGER.release_browser_session = AsyncMock(return_value=False)+ await manager._release_persistent_session(+ "pbs_renew", "org_test", manager._persistent_session_leases["s_renew"]+ )+ assert "s_renew" in manager._persistent_session_leases, "the lease is retained on a failed release"++ touch.reset_mock()+ await asyncio.sleep(0.05)+ assert touch.await_args_list == []++ # A successful release drops the lease and its marker, and the renewer exits with nothing left.+ pbs_state.close = AsyncMock()+ pbs_state.browser_artifacts.traces_dir = None+ mock_app.PERSISTENT_SESSIONS_MANAGER.release_browser_session = AsyncMock(return_value=True)+ await manager.cleanup_for_script("s_renew", browser_session_id="pbs_renew", organization_id="org_test")+ assert "s_renew" not in manager._persistent_session_leases+ assert manager._released_session_ids == set()+ await asyncio.sleep(0.05)+ assert manager._session_activity_renewer is not None and manager._session_activity_renewer.done()+ finally:+ if manager._session_activity_renewer is not None:+ manager._session_activity_renewer.cancel()++@pytest.mark.asyncioasync def test_failed_script_acquisition_leaves_no_live_session_behind() -> None:# A cold/evicted session fails closed. The in-flight marker must not outlive the attempt, or a run