sort pbs downloaded files (#3496)
This commit is contained in:
@@ -212,8 +212,15 @@ class S3Storage(BaseStorage):
|
||||
|
||||
file_infos: list[FileInfo] = []
|
||||
for key in object_keys:
|
||||
metadata = {}
|
||||
modified_at: datetime | None = None
|
||||
# Get metadata (including checksum)
|
||||
metadata = await self.async_client.get_file_metadata(key, log_exception=False)
|
||||
try:
|
||||
object_info = await self.async_client.get_object_info(key)
|
||||
metadata = object_info.get("Metadata", {})
|
||||
modified_at = object_info.get("LastModified")
|
||||
except Exception:
|
||||
LOG.exception("Object info retrieval failed", uri=key)
|
||||
|
||||
# Create FileInfo object
|
||||
filename = os.path.basename(key)
|
||||
@@ -228,6 +235,7 @@ class S3Storage(BaseStorage):
|
||||
url=presigned_urls[0],
|
||||
checksum=checksum,
|
||||
filename=metadata.get("original_filename", filename) if metadata else filename,
|
||||
modified_at=modified_at,
|
||||
)
|
||||
file_infos.append(file_info)
|
||||
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
from datetime import datetime
|
||||
|
||||
from pydantic import BaseModel, Field
|
||||
|
||||
|
||||
@@ -7,3 +9,4 @@ class FileInfo(BaseModel):
|
||||
url: str = Field(..., description="URL to access the file")
|
||||
checksum: str | None = Field(None, description="SHA-256 checksum of the file")
|
||||
filename: str | None = Field(None, description="Original filename")
|
||||
modified_at: datetime | None = Field(None, description="Modified time of the file")
|
||||
|
||||
@@ -91,6 +91,9 @@ class BrowserSessionResponse(BaseModel):
|
||||
"Timeout getting downloaded files", browser_session_id=browser_session.persistent_browser_session_id
|
||||
)
|
||||
|
||||
# Sort downloaded files by modified_at in descending order (newest first)
|
||||
downloaded_files.sort(key=lambda x: x.modified_at or datetime.min, reverse=True)
|
||||
|
||||
return cls(
|
||||
browser_session_id=browser_session.persistent_browser_session_id,
|
||||
organization_id=browser_session.organization_id,
|
||||
|
||||
Reference in New Issue
Block a user