Skip to content

Automate browser based workflows with AI

add helper check_downloading_files_and_wait_for_download_to_complete to action handler (#4475)

Shuchang Zhengd537e9dc5afe
diff --git a/skyvern/forge/sdk/api/files.py b/skyvern/forge/sdk/api/files.py
index 04820a9b4..67768e885 100644
--- a/skyvern/forge/sdk/api/files.py
+++ b/skyvern/forge/sdk/api/files.py
@@ -339,6 +339,39 @@ async def wait_for_download_finished(downloading_files: list[str], timeout: floa
raise DownloadFileMaxWaitingTime(downloading_files=cur_downloading_files)
+async def check_downloading_files_and_wait_for_download_to_complete(
+ download_dir: Path,
+ organization_id: str,
+ browser_session_id: str | None = None,
+ timeout: float = BROWSER_DOWNLOAD_TIMEOUT,
+) -> None:
+ # check if there's any file is still downloading
+ downloading_files = list_downloading_files_in_directory(download_dir)
+ if browser_session_id:
+ files_in_browser_session = await app.STORAGE.list_downloading_files_in_browser_session(
+ organization_id=organization_id, browser_session_id=browser_session_id
+ )
+ downloading_files = downloading_files + files_in_browser_session
+
+ if len(downloading_files) == 0:
+ return
+
+ LOG.info(
+ "File downloading hasn't completed, wait for a while",
+ downloading_files=downloading_files,
+ )
+ try:
+ await wait_for_download_finished(
+ downloading_files=downloading_files,
+ timeout=timeout,
+ )
+ except DownloadFileMaxWaitingTime as e:
+ LOG.warning(
+ "There're several long-time downloading files, these files might be broken",
+ downloading_files=e.downloading_files,
+ )
+
+
def get_number_of_files_in_directory(directory: Path, recursive: bool = False) -> int:
return len(list_files_in_directory(directory, recursive))
diff --git a/skyvern/webeye/actions/handler.py b/skyvern/webeye/actions/handler.py
index aefd19901..2fd7891ee 100644
--- a/skyvern/webeye/actions/handler.py
+++ b/skyvern/webeye/actions/handler.py
@@ -27,7 +27,6 @@ from skyvern.constants import (
from skyvern.errors.errors import TOTPExpiredError
from skyvern.exceptions import (
DownloadedFileNotFound,
- DownloadFileMaxWaitingTime,
EmptySelect,
ErrEmptyTweakValue,
ErrFoundSelectableElement,
@@ -62,12 +61,13 @@ from skyvern.exceptions import (
from skyvern.experimentation.wait_utils import get_or_create_wait_config, get_wait_time
from skyvern.forge import app
from skyvern.forge.prompts import prompt_engine
+from skyvern.forge.sdk.api.files import (
+ check_downloading_files_and_wait_for_download_to_complete,
+)
from skyvern.forge.sdk.api.files import download_file as download_file_api
from skyvern.forge.sdk.api.files import (
get_download_dir,
- list_downloading_files_in_directory,
list_files_in_directory,
- wait_for_download_finished,
)
from skyvern.forge.sdk.api.llm.api_handler_factory import LLMAPIHandlerFactory, LLMCallerManager
from skyvern.forge.sdk.api.llm.exceptions import LLMProviderError
@@ -484,32 +484,12 @@ class ActionHandler:
return results
results[-1].download_triggered = True
- # check if there's any file is still downloading
- downloading_files = list_downloading_files_in_directory(download_dir)
- if task.browser_session_id:
- files_in_browser_session = await app.STORAGE.list_downloading_files_in_browser_session(
- organization_id=task.organization_id, browser_session_id=task.browser_session_id
- )
- downloading_files = downloading_files + files_in_browser_session
-
- if len(downloading_files) == 0:
- return results
-
- LOG.info(
- "File downloading hasn't completed, wait for a while",
- downloading_files=downloading_files,
- workflow_run_id=task.workflow_run_id,
+ await check_downloading_files_and_wait_for_download_to_complete(
+ download_dir=download_dir,
+ organization_id=task.organization_id,
+ browser_session_id=task.browser_session_id,
+ timeout=task.download_timeout or BROWSER_DOWNLOAD_TIMEOUT,
)
- try:
- await wait_for_download_finished(
- downloading_files=downloading_files, timeout=task.download_timeout or BROWSER_DOWNLOAD_TIMEOUT
- )
- except DownloadFileMaxWaitingTime as e:
- LOG.warning(
- "There're several long-time downloading files, these files might be broken",
- downloading_files=e.downloading_files,
- workflow_run_id=task.workflow_run_id,
- )
return results
finally:
if browser_state is not None and download_triggered: