Skip to content

Automate browser based workflows with AI

add timeout when close browser (#1134)

LawyZhenga81faabc73bd
diff --git a/skyvern/webeye/browser_factory.py b/skyvern/webeye/browser_factory.py
index f456f545c..7907d1dc7 100644
--- a/skyvern/webeye/browser_factory.py
+++ b/skyvern/webeye/browser_factory.py
@@ -14,7 +14,7 @@ from playwright.async_api import BrowserContext, ConsoleMessage, Error, Page, Pl
from pydantic import BaseModel, PrivateAttr
from skyvern.config import settings
-from skyvern.constants import REPO_ROOT_DIR
+from skyvern.constants import BROWSER_CLOSE_TIMEOUT, REPO_ROOT_DIR
from skyvern.exceptions import (
FailedToNavigateToUrl,
FailedToReloadPage,
@@ -443,17 +443,26 @@ class BrowserState:
async def close(self, close_browser_on_completion: bool = True) -> None:
LOG.info("Closing browser state")
- if self.browser_context and close_browser_on_completion:
- LOG.info("Closing browser context and its pages")
- await self.browser_context.close()
- LOG.info("Main browser context and all its pages are closed")
- if self.browser_cleanup is not None:
- self.browser_cleanup()
- LOG.info("Main browser cleanup is excuted")
- if self.pw and close_browser_on_completion:
- LOG.info("Stopping playwright")
- await self.pw.stop()
- LOG.info("Playwright is stopped")
+ try:
+ async with asyncio.timeout(BROWSER_CLOSE_TIMEOUT):
+ if self.browser_context and close_browser_on_completion:
+ LOG.info("Closing browser context and its pages")
+ await self.browser_context.close()
+ LOG.info("Main browser context and all its pages are closed")
+ if self.browser_cleanup is not None:
+ self.browser_cleanup()
+ LOG.info("Main browser cleanup is excuted")
+ except asyncio.TimeoutError:
+ LOG.error("Timeout to close browser context, going to stop playwright directly")
+
+ try:
+ async with asyncio.timeout(BROWSER_CLOSE_TIMEOUT):
+ if self.pw and close_browser_on_completion:
+ LOG.info("Stopping playwright")
+ await self.pw.stop()
+ LOG.info("Playwright is stopped")
+ except asyncio.TimeoutError:
+ LOG.error("Timeout to close playwright, might leave the broswer opening forever")
async def take_screenshot(self, full_page: bool = False, file_path: str | None = None) -> bytes:
page = await self.__assert_page()
diff --git a/skyvern/webeye/browser_manager.py b/skyvern/webeye/browser_manager.py
index c6c6b1c01..1f5b49391 100644
--- a/skyvern/webeye/browser_manager.py
+++ b/skyvern/webeye/browser_manager.py
@@ -1,12 +1,10 @@
from __future__ import annotations
-import asyncio
import os
import structlog
from playwright.async_api import async_playwright
-from skyvern.constants import BROWSER_CLOSE_TIMEOUT
from skyvern.exceptions import MissingBrowserState
from skyvern.forge.sdk.schemas.tasks import ProxyLocation, Task
from skyvern.forge.sdk.workflow.models.workflow import WorkflowRun
@@ -208,18 +206,14 @@ class BrowserManager:
async def cleanup_for_task(self, task_id: str, close_browser_on_completion: bool = True) -> BrowserState | None:
LOG.info("Cleaning up for task")
browser_state_to_close = self.pages.pop(task_id, None)
- try:
- if browser_state_to_close:
- async with asyncio.timeout(BROWSER_CLOSE_TIMEOUT):
- # Stop tracing before closing the browser if tracing is enabled
- if browser_state_to_close.browser_context and browser_state_to_close.browser_artifacts.traces_dir:
- trace_path = f"{browser_state_to_close.browser_artifacts.traces_dir}/{task_id}.zip"
- await browser_state_to_close.browser_context.tracing.stop(path=trace_path)
- LOG.info("Stopped tracing", trace_path=trace_path)
- await browser_state_to_close.close(close_browser_on_completion=close_browser_on_completion)
- LOG.info("Task is cleaned up")
- except TimeoutError:
- LOG.warning("Timeout on task cleanup")
+ if browser_state_to_close:
+ # Stop tracing before closing the browser if tracing is enabled
+ if browser_state_to_close.browser_context and browser_state_to_close.browser_artifacts.traces_dir:
+ trace_path = f"{browser_state_to_close.browser_artifacts.traces_dir}/{task_id}.zip"
+ await browser_state_to_close.browser_context.tracing.stop(path=trace_path)
+ LOG.info("Stopped tracing", trace_path=trace_path)
+ await browser_state_to_close.close(close_browser_on_completion=close_browser_on_completion)
+ LOG.info("Task is cleaned up")
return browser_state_to_close