downloaded files in pbs response (#3487)

This commit is contained in:
LawyZheng
2025-09-20 09:34:25 +08:00
committed by GitHub
parent c0082006e2
commit 5e1409a5c7
5 changed files with 83 additions and 4 deletions

View File

@@ -1,12 +1,19 @@
from __future__ import annotations
import asyncio
from datetime import datetime
import structlog
from pydantic import BaseModel, Field
from skyvern.config import settings
from skyvern.constants import GET_DOWNLOADED_FILES_TIMEOUT
from skyvern.forge.sdk.artifact.storage.base import BaseStorage
from skyvern.forge.sdk.schemas.files import FileInfo
from skyvern.forge.sdk.schemas.persistent_browser_sessions import PersistentBrowserSession
LOG = structlog.get_logger()
class BrowserSessionResponse(BaseModel):
"""Response model for browser session information."""
@@ -40,6 +47,10 @@ class BrowserSessionResponse(BaseModel):
examples=["https://app.skyvern.com/browser-session/pbs_123456"],
)
vnc_streaming_supported: bool = Field(False, description="Whether the browser session supports VNC streaming")
download_path: str | None = Field(None, description="The path where the browser session downloads files")
downloaded_files: list[FileInfo] | None = Field(
None, description="The list of files downloaded by the browser session"
)
started_at: datetime | None = Field(None, description="Timestamp when the session was started")
completed_at: datetime | None = Field(None, description="Timestamp when the session was completed")
created_at: datetime = Field(
@@ -49,7 +60,9 @@ class BrowserSessionResponse(BaseModel):
deleted_at: datetime | None = Field(None, description="Timestamp when the session was deleted, if applicable")
@classmethod
def from_browser_session(cls, browser_session: PersistentBrowserSession) -> BrowserSessionResponse:
async def from_browser_session(
cls, browser_session: PersistentBrowserSession, storage: BaseStorage | None = None
) -> BrowserSessionResponse:
"""
Creates a BrowserSessionResponse from a PersistentBrowserSession object.
@@ -62,6 +75,22 @@ class BrowserSessionResponse(BaseModel):
app_url = (
f"{settings.SKYVERN_APP_URL.rstrip('/')}/browser-session/{browser_session.persistent_browser_session_id}"
)
download_path = (
f"/app/downloads/{browser_session.organization_id}/{browser_session.persistent_browser_session_id}"
)
downloaded_files: list[FileInfo] = []
if storage:
try:
async with asyncio.timeout(GET_DOWNLOADED_FILES_TIMEOUT):
downloaded_files = await storage.get_shared_downloaded_files_in_browser_session(
organization_id=browser_session.organization_id,
browser_session_id=browser_session.persistent_browser_session_id,
)
except asyncio.TimeoutError:
LOG.warning(
"Timeout getting downloaded files", browser_session_id=browser_session.persistent_browser_session_id
)
return cls(
browser_session_id=browser_session.persistent_browser_session_id,
organization_id=browser_session.organization_id,
@@ -76,4 +105,6 @@ class BrowserSessionResponse(BaseModel):
created_at=browser_session.created_at,
modified_at=browser_session.modified_at,
deleted_at=browser_session.deleted_at,
download_path=download_path,
downloaded_files=downloaded_files,
)