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

fix: Ensure video recordings upload before stopping artifact sync (#4316)

Browse Source
This commit is contained in:
Marc Kelechava
2025-12-17 12:57:53 -08:00
committed by GitHub
parent 8d8d766b2a
commit 0d6a070a80
2 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
skyvern/forge/sdk/api/aws.py
View File

@@ -175,6 +175,7 @@ class AsyncAWSClient:
metadata: dict | None = None, metadata: dict | None = None,
raise_exception: bool = False, raise_exception: bool = False,
tags: dict[str, str] | None = None, tags: dict[str, str] | None = None,
content_type: str | None = None,
) -> None: ) -> None:
# https://boto3.amazonaws.com/v1/documentation/api/latest/reference/services/s3/client/upload_file.html # https://boto3.amazonaws.com/v1/documentation/api/latest/reference/services/s3/client/upload_file.html
try: try:
@@ -185,6 +186,8 @@ class AsyncAWSClient:
extra_args["Metadata"] = metadata extra_args["Metadata"] = metadata
if tags: if tags:
extra_args["Tagging"] = self._create_tag_string(tags) extra_args["Tagging"] = self._create_tag_string(tags)
if content_type:
extra_args["ContentType"] = content_type
await client.upload_file( await client.upload_file(
Filename=file_path, Filename=file_path,
Bucket=parsed_uri.bucket, Bucket=parsed_uri.bucket,

21
skyvern/forge/sdk/artifact/storage/s3.py
View File

@@ -304,16 +304,34 @@ class S3Storage(BaseStorage):
file_infos: list[FileInfo] = [] file_infos: list[FileInfo] = []
for key in object_keys: for key in object_keys:
# Playwright's record_video_dir should only contain .webm files.
# Filter defensively in case of unexpected files.
key_lower = key.lower()
if not (key_lower.endswith(".webm") or key_lower.endswith(".mp4")):
LOG.warning(
"Skipping recording file with unsupported extension",
uri=key,
organization_id=organization_id,
browser_session_id=browser_session_id,
)
continue
metadata = {} metadata = {}
modified_at: datetime | None = None modified_at: datetime | None = None
content_length: int | None = None
# Get metadata (including checksum) # Get metadata (including checksum)
try: try:
object_info = await self.async_client.get_object_info(key) object_info = await self.async_client.get_object_info(key)
metadata = object_info.get("Metadata", {}) metadata = object_info.get("Metadata", {})
modified_at = object_info.get("LastModified") modified_at = object_info.get("LastModified")
content_length = object_info.get("ContentLength")
except Exception: except Exception:
LOG.exception("Recording object info retrieval failed", uri=key) LOG.exception("Recording object info retrieval failed", uri=key)
# Skip zero-byte objects (if any incompleted uploads)
if content_length == 0:
continue
# Create FileInfo object # Create FileInfo object
filename = os.path.basename(key) filename = os.path.basename(key)
checksum = metadata.get("sha256_checksum") if metadata else None checksum = metadata.get("sha256_checksum") if metadata else None
@@ -331,6 +349,9 @@ class S3Storage(BaseStorage):
) )
file_infos.append(file_info) file_infos.append(file_info)
# Prefer the newest recording first (S3 list order is not guaranteed).
# Treat None as "oldest".
file_infos.sort(key=lambda f: (f.modified_at is not None, f.modified_at), reverse=True)
return file_infos return file_infos
async def save_downloaded_files(self, organization_id: str, run_id: str | None) -> None: async def save_downloaded_files(self, organization_id: str, run_id: str | None) -> None: