phoenix-oss/llama-stack-mirror
0
0
Fork 1
mirror of https://github.com/meta-llama/llama-stack.git synced 2025-12-17 19:19:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

clear metadata on upload failure

Browse source
This commit is contained in:
Matthew Farrellee 2025-08-21 15:44:39 -04:00
parent 279736cfc4
commit 5358eaa251
2 changed files with 23 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
llama_stack/providers/remote/files/s3/files.py
View file

@ -154,6 +154,8 @@ class S3FilesImpl(Files):
# TODO: enable server-side encryption # TODO: enable server-side encryption
) )
except ClientError as e: except ClientError as e:
await self.sql_store.delete("openai_files", where={"id": file_id})
raise RuntimeError(f"Failed to upload file to S3: {e}") from e raise RuntimeError(f"Failed to upload file to S3: {e}") from e
return OpenAIFileObject( return OpenAIFileObject(

21
tests/unit/providers/files/test_s3_files.py
View file

@ -4,6 +4,8 @@
# This source code is licensed under the terms described in the LICENSE file in # This source code is licensed under the terms described in the LICENSE file in
# the root directory of this source tree. # the root directory of this source tree.
from unittest.mock import patch
import boto3 import boto3
import pytest import pytest
from botocore.exceptions import ClientError from botocore.exceptions import ClientError
@ -232,3 +234,22 @@ class TestS3FilesImpl:
assert "content" in str(exc_info).lower() assert "content" in str(exc_info).lower()
assert uploaded.id in str(exc_info).lower() assert uploaded.id in str(exc_info).lower()
async def test_upload_file_s3_put_object_failure(self, s3_provider, sample_text_file, s3_config, s3_client):
"""Test that put_object failure results in exception and no orphaned metadata."""
sample_text_file.filename = "test_s3_put_object_failure"
def failing_put_object(*args, **kwargs):
raise ClientError(
error_response={"Error": {"Code": "SolarRadiation", "Message": "Bloop"}}, operation_name="PutObject"
)
with patch.object(s3_provider.client, "put_object", side_effect=failing_put_object):
with pytest.raises(RuntimeError, match="Failed to upload file to S3"):
await s3_provider.openai_upload_file(
file=sample_text_file,
purpose=OpenAIFilePurpose.ASSISTANTS,
)
files_list = await s3_provider.openai_list_files()
assert len(files_list.data) == 0, "No file metadata should remain after failed upload"