fix(bedrock): implement file retrieval for batch output files

Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
This commit is contained in:
Devin AI 2026-09-18 04:43:56 +00:00
parent db37977307
commit 56c7c00644
2 changed files with 125 additions and 4 deletions

View file

@ -8,6 +8,7 @@ from collections.abc import Iterable, Mapping, MutableMapping, Sequence
from contextlib import suppress
from dataclasses import dataclass
from datetime import datetime
from email.utils import parsedate_to_datetime
from functools import cache
from itertools import chain
from types import MappingProxyType
@ -67,6 +68,8 @@ from ..common_utils import BedrockError, merge_bedrock_aws_request_params, resol
S3_SIGNED_REQUEST_HEADERS_PARAM: Final = "_s3_signed_request_headers"
RETRIEVE_FILE_ID_PARAM: Final = "_s3_retrieve_file_id"
LIST_FILES_PURPOSE_PARAM: Final = "_s3_list_files_purpose"
LIST_FILES_LOCATION_PARAM: Final = "_s3_list_files_location"
@ -353,6 +356,15 @@ def _listed_object_created_at(entry: ET.Element) -> int:
return int(datetime.fromisoformat(last_modified.replace("Z", "+00:00")).timestamp())
def _last_modified_created_at(last_modified: object) -> int:
if not isinstance(last_modified, str):
return int(time.time())
try:
return int(parsedate_to_datetime(last_modified).timestamp())
except (TypeError, ValueError, OverflowError):
return int(time.time())
def _listed_managed_file(
entry: ET.Element,
bucket_name: str,
@ -1313,7 +1325,14 @@ class BedrockFilesConfig(BaseAWSLLM, BaseFilesConfig):
optional_params: dict,
litellm_params: dict,
) -> tuple[str, dict]:
raise NotImplementedError("BedrockFilesConfig does not support file retrieval")
litellm_params[RETRIEVE_FILE_ID_PARAM] = file_id
return self._transform_s3_file_request(
file_id=file_id,
method="GET",
optional_params=optional_params,
litellm_params=litellm_params,
extra_headers={"Range": "bytes=0-0"},
)
def transform_retrieve_file_response(
self,
@ -1321,7 +1340,35 @@ class BedrockFilesConfig(BaseAWSLLM, BaseFilesConfig):
logging_obj: LiteLLMLoggingObj,
litellm_params: dict,
) -> OpenAIFileObject:
raise NotImplementedError("BedrockFilesConfig does not support file retrieval")
if raw_response.status_code >= 400:
raise BedrockError(
status_code=raw_response.status_code,
message=raw_response.text,
headers=raw_response.headers,
response=raw_response,
)
file_id: Final = litellm_params.get(RETRIEVE_FILE_ID_PARAM)
if not isinstance(file_id, str):
raise ValueError("file id is required for Bedrock file retrieval response")
_, object_key = _resolve_managed_s3_object(file_id=file_id, litellm_params=litellm_params)
content_range: Final = raw_response.headers.get("Content-Range", "")
total_size: Final = (
int(content_range.rsplit("/", 1)[-1])
if "/" in content_range and content_range.rsplit("/", 1)[-1].isdigit()
else int(raw_response.headers.get("Content-Length", "0"))
)
last_modified: Final = raw_response.headers.get("Last-Modified")
created_at: Final = _last_modified_created_at(last_modified)
return OpenAIFileObject(
bytes=total_size,
created_at=created_at,
filename=posixpath.basename(object_key),
id=file_id,
object="file",
purpose="batch_output" if object_key.endswith((".out", ".jsonl.out")) else "batch",
status="processed",
)
def transform_delete_file_request(
self,
@ -1460,6 +1507,7 @@ class BedrockFilesConfig(BaseAWSLLM, BaseFilesConfig):
method: Literal["GET", "DELETE"],
optional_params: Mapping[str, object],
litellm_params: MutableMapping[str, object],
extra_headers: Mapping[str, str] = MappingProxyType({}),
) -> tuple[str, dict[str, str]]:
bucket_name, object_key = _resolve_managed_s3_object(file_id=file_id, litellm_params=litellm_params)
target: Final = self._s3_request_target(optional_params=optional_params, litellm_params=litellm_params)
@ -1469,6 +1517,7 @@ class BedrockFilesConfig(BaseAWSLLM, BaseFilesConfig):
api_base=url,
aws_region_name=target.aws_region_name,
request_params=target.request_params,
extra_headers=extra_headers,
)
litellm_params[S3_SIGNED_REQUEST_HEADERS_PARAM] = signed_headers # rebind-ok: handed to validate_environment
return url, {} # mutable-ok: the base files contract returns the query as a dict
@ -1504,6 +1553,8 @@ class BedrockFilesConfig(BaseAWSLLM, BaseFilesConfig):
api_base: str,
aws_region_name: str,
request_params: _BedrockS3RequestParams,
*,
extra_headers: Mapping[str, str] = MappingProxyType({}),
) -> Mapping[str, str]:
"""
SigV4-sign a bodiless S3 request (GetObject, DeleteObject, ListObjectsV2),
@ -1534,7 +1585,7 @@ class BedrockFilesConfig(BaseAWSLLM, BaseFilesConfig):
aws_request: Final = AWSRequest( # any-ok: botocore AWSRequest is untyped
method=method,
url=api_base,
headers={"x-amz-content-sha256": empty_body_hash}, # mutable-ok: botocore AWSRequest takes a dict
headers={"x-amz-content-sha256": empty_body_hash, **extra_headers},
)
auth: Final = S3SigV4Auth(credentials, "s3", aws_region_name) # any-ok: botocore untyped
auth.add_auth(aws_request) # any-ok: botocore request mutation is untyped

View file

@ -1443,7 +1443,6 @@ class TestBedrockFilesEmbeddingTransformation:
transformer, corrupting the modelInput.
"""
from litellm.llms.bedrock.files.transformation import BedrockFilesConfig
from litellm.types.llms.bedrock import BedrockBatchRecordKind
# Direct helper assertion
@ -2031,6 +2030,77 @@ class TestBedrockFileContentTransformation:
assert url == self.EXPECTED_URL
def test_transform_retrieve_file_request_signs_ranged_s3_get(self, monkeypatch):
from litellm.llms.bedrock.files.transformation import (
S3_SIGNED_REQUEST_HEADERS_PARAM,
BedrockFilesConfig,
)
monkeypatch.setenv("AWS_S3_BUCKET_NAME", "my-bucket")
litellm_params = self._litellm_params()
url, params = BedrockFilesConfig().transform_retrieve_file_request(
file_id=self.S3_URI,
optional_params={},
litellm_params=litellm_params,
)
assert url == self.EXPECTED_URL
assert params == {}
signed_headers = litellm_params[S3_SIGNED_REQUEST_HEADERS_PARAM]
assert signed_headers["Range"] == "bytes=0-0"
assert signed_headers["Authorization"].startswith("AWS4-HMAC-SHA256 Credential=AKIAEXAMPLE/")
def test_transform_retrieve_file_response_returns_file_metadata(self, monkeypatch):
import httpx
from litellm.llms.bedrock.files.transformation import BedrockFilesConfig
monkeypatch.setenv("AWS_S3_BUCKET_NAME", "my-bucket")
file_id = self.S3_URI
litellm_params = {**self._litellm_params(), "_s3_retrieve_file_id": file_id}
raw_response = httpx.Response(
206,
headers={
"Content-Range": "bytes 0-0/4321",
"Last-Modified": "Wed, 16 Sep 2026 10:00:00 GMT",
},
request=httpx.Request("GET", self.EXPECTED_URL),
)
result = BedrockFilesConfig().transform_retrieve_file_response(
raw_response=raw_response,
logging_obj=MagicMock(),
litellm_params=litellm_params,
)
assert result.bytes == 4321
assert result.created_at == 1789552800
assert result.filename == "input.jsonl.out"
assert result.id == file_id
assert result.object == "file"
assert result.purpose == "batch_output"
assert result.status == "processed"
def test_transform_retrieve_file_response_raises_for_not_found(self):
import httpx
from litellm.llms.bedrock.common_utils import BedrockError
from litellm.llms.bedrock.files.transformation import BedrockFilesConfig
raw_response = httpx.Response(
404,
text="NoSuchKey",
request=httpx.Request("GET", self.EXPECTED_URL),
)
with pytest.raises(BedrockError) as error:
BedrockFilesConfig().transform_retrieve_file_response(
raw_response=raw_response,
logging_obj=MagicMock(),
litellm_params={},
)
assert error.value.status_code == 404
def test_transform_file_content_request_rejects_foreign_bucket(self, monkeypatch):
from litellm.llms.bedrock.common_utils import BedrockError
from litellm.llms.bedrock.files.transformation import BedrockFilesConfig