scriptoriumadmin/litellm
1
0
Fork 0
mirror of https://github.com/BerriAI/litellm.git synced 2026-10-10 03:28:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 85

fix(proxy): support custom S3 endpoint URL for config file loading

Browse source 
Add LITELLM_CONFIG_BUCKET_ENDPOINT_URL env var support to
get_file_contents_from_s3() and download_python_file_from_s3() in
load_config_utils.py, enabling config loading from S3-compatible
services (MinIO, Ceph, LocalStack, etc.).

The S3 callback logger already supports s3_endpoint_url, but the
config loading path did not pass endpoint_url to boto3.client().

Fixes #24427
This commit is contained in:
tmsk8219 2026-03-24 01:57:37 +09:00
parent c89496f378
commit a679e340f4
2 changed files with 42 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
litellm/proxy/common_utils/load_config_utils.py
View file

@ -14,8 +14,10 @@ def get_file_contents_from_s3(bucket_name, object_key):
from litellm.main import bedrock_converse_chat_completion
credentials: Credentials = bedrock_converse_chat_completion.get_credentials()
endpoint_url = os.environ.get("LITELLM_CONFIG_BUCKET_ENDPOINT_URL")
s3_client = boto3.client(
"s3",
endpoint_url=endpoint_url,
aws_access_key_id=credentials.access_key,
aws_secret_access_key=credentials.secret_key,
aws_session_token=credentials.token, # Optional, if using temporary credentials
@ -89,8 +91,10 @@ def download_python_file_from_s3(
base_aws_llm = BaseAWSLLM()
credentials: Credentials = base_aws_llm.get_credentials()
endpoint_url = os.environ.get("LITELLM_CONFIG_BUCKET_ENDPOINT_URL")
s3_client = boto3.client(
"s3",
endpoint_url=endpoint_url,
aws_access_key_id=credentials.access_key,
aws_secret_access_key=credentials.secret_key,
aws_session_token=credentials.token,

38
tests/test_litellm/proxy/common_utils/test_load_config_utils.py
View file

@ -70,6 +70,7 @@ class TestGetFileContentsFromS3:
# Verify S3 client was created with correct credentials
mock_boto3_client.assert_called_once_with(
"s3",
endpoint_url=None,
aws_access_key_id="test_access_key",
aws_secret_access_key="test_secret_key",
aws_session_token="test_token"
@ -87,4 +88,41 @@ class TestGetFileContentsFromS3:
# Verify yaml.safe_load was called with the decoded content
mock_yaml_load.assert_called_once_with(yaml_content)
@patch.dict('os.environ', {'LITELLM_CONFIG_BUCKET_ENDPOINT_URL': 'https://minio.example.com'})
@patch('boto3.client')
@patch('litellm.main.bedrock_converse_chat_completion')
@patch('yaml.safe_load')
def test_get_file_contents_from_s3_with_endpoint_url(
self, mock_yaml_load, mock_bedrock, mock_boto3_client
):
"""
Test that get_file_contents_from_s3 passes endpoint_url from
LITELLM_CONFIG_BUCKET_ENDPOINT_URL env var to boto3 client.
"""
mock_credentials = MagicMock()
mock_credentials.access_key = "test_access_key"
mock_credentials.secret_key = "test_secret_key"
mock_credentials.token = "test_token"
mock_bedrock.get_credentials.return_value = mock_credentials
mock_s3_client = MagicMock()
mock_boto3_client.return_value = mock_s3_client
yaml_content = "model_list: []"
mock_response_body = MagicMock()
mock_response_body.read.return_value = yaml_content.encode('utf-8')
mock_s3_client.get_object.return_value = {'Body': mock_response_body}
mock_yaml_load.return_value = {'model_list': []}
result = get_file_contents_from_s3("test-bucket", "config.yaml")
assert result == {'model_list': []}
mock_boto3_client.assert_called_once_with(
"s3",
endpoint_url="https://minio.example.com",
aws_access_key_id="test_access_key",
aws_secret_access_key="test_secret_key",
aws_session_token="test_token"
)