vodorod/Dorod-Sky
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Ensure Task Clenup - add timeout to browser context close (#714)

Browse Source
This commit is contained in:
Kerem Yilmaz
2024-08-22 22:36:30 +03:00
committed by GitHub
parent 8baa8de032
commit 43cbfa7451
2 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
skyvern/constants.py
View File

@@ -8,6 +8,7 @@ REPO_ROOT_DIR = SKYVERN_DIR.parent
INPUT_TEXT_TIMEOUT = 120000 # 2 minutes INPUT_TEXT_TIMEOUT = 120000 # 2 minutes
PAGE_CONTENT_TIMEOUT = 300 # 5 mins PAGE_CONTENT_TIMEOUT = 300 # 5 mins
BROWSER_CLOSE_TIMEOUT = 60 # 1 minute
# reserved fields for navigation payload # reserved fields for navigation payload
SPECIAL_FIELD_VERIFICATION_CODE = "verification_code" SPECIAL_FIELD_VERIFICATION_CODE = "verification_code"

24
skyvern/webeye/browser_manager.py
View File

@@ -1,8 +1,11 @@
from __future__ import annotations from __future__ import annotations
import asyncio
import structlog import structlog
from playwright.async_api import async_playwright from playwright.async_api import async_playwright
from skyvern.constants import BROWSER_CLOSE_TIMEOUT
from skyvern.exceptions import MissingBrowserState from skyvern.exceptions import MissingBrowserState
from skyvern.forge.sdk.schemas.tasks import ProxyLocation, Task from skyvern.forge.sdk.schemas.tasks import ProxyLocation, Task
from skyvern.forge.sdk.workflow.models.workflow import WorkflowRun from skyvern.forge.sdk.workflow.models.workflow import WorkflowRun
@@ -164,15 +167,18 @@ class BrowserManager:
async def cleanup_for_task(self, task_id: str, close_browser_on_completion: bool = True) -> BrowserState | None: async def cleanup_for_task(self, task_id: str, close_browser_on_completion: bool = True) -> BrowserState | None:
LOG.info("Cleaning up for task") LOG.info("Cleaning up for task")
browser_state_to_close = self.pages.pop(task_id, None) browser_state_to_close = self.pages.pop(task_id, None)
if browser_state_to_close: try:
# Stop tracing before closing the browser if tracing is enabled if browser_state_to_close:
if browser_state_to_close.browser_context and browser_state_to_close.browser_artifacts.traces_dir: async with asyncio.timeout(BROWSER_CLOSE_TIMEOUT):
trace_path = f"{browser_state_to_close.browser_artifacts.traces_dir}/{task_id}.zip" # Stop tracing before closing the browser if tracing is enabled
await browser_state_to_close.browser_context.tracing.stop(path=trace_path) if browser_state_to_close.browser_context and browser_state_to_close.browser_artifacts.traces_dir:
LOG.info("Stopped tracing", trace_path=trace_path) 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)
await browser_state_to_close.close(close_browser_on_completion=close_browser_on_completion) LOG.info("Stopped tracing", trace_path=trace_path)
LOG.info("Task is cleaned up") 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")
return browser_state_to_close return browser_state_to_close