(feat) proxy - support s3_callback_params

litellm/__init__.py

@@ -135,6 +135,7 @@ model_fallbacks: Optional[List] = None  # Deprecated for 'litellm.fallbacks'
 model_cost_map_url: str = "https://raw.githubusercontent.com/BerriAI/litellm/main/model_prices_and_context_window.json"
 suppress_debug_info = False
 dynamodb_table_name: Optional[str] = None
+s3_callback_params: Optional[Dict] = None
 #### RELIABILITY ####
 request_timeout: Optional[float] = 6000
 num_retries: Optional[int] = None  # per model endpoint

litellm/integrations/s3.py

@@ -15,7 +15,7 @@ class S3Logger:
     # Class variables or attributes
     def __init__(
         self,
-        s3_bucket_name="litellm-logs",
+        s3_bucket_name=None,
         s3_region_name=None,
         s3_api_version=None,
         s3_use_ssl=True,
@@ -29,6 +29,33 @@ class S3Logger:
     ):
         import boto3
 
+        try:
+            print_verbose("in init s3 logger")
+
+            if litellm.s3_callback_params is not None:
+                # read in .env variables - example os.environ/AWS_BUCKET_NAME
+                for key, value in litellm.s3_callback_params.items():
+                    if type(value) is str and value.startswith("os.environ/"):
+                        litellm.s3_callback_params[key] = litellm.get_secret(value)
+                # now set s3 params from litellm.s3_logger_params
+                s3_bucket_name = litellm.s3_callback_params.get("s3_bucket_name")
+                s3_region_name = litellm.s3_callback_params.get("s3_region_name")
+                s3_api_version = litellm.s3_callback_params.get("s3_api_version")
+                s3_use_ssl = litellm.s3_callback_params.get("s3_use_ssl")
+                s3_verify = litellm.s3_callback_params.get("s3_verify")
+                s3_endpoint_url = litellm.s3_callback_params.get("s3_endpoint_url")
+                s3_aws_access_key_id = litellm.s3_callback_params.get(
+                    "s3_aws_access_key_id"
+                )
+                s3_aws_secret_access_key = litellm.s3_callback_params.get(
+                    "s3_aws_secret_access_key"
+                )
+                s3_aws_session_token = litellm.s3_callback_params.get(
+                    "s3_aws_session_token"
+                )
+                s3_config = litellm.s3_callback_params.get("s3_config")
+                # done reading litellm.s3_callback_params
+
             self.bucket_name = s3_bucket_name
             # Create an S3 client with custom endpoint URL
             self.s3_client = boto3.client(
@@ -44,6 +71,9 @@ class S3Logger:
                 config=s3_config,
                 **kwargs,
             )
+        except Exception as e:
+            print_verbose(f"Got exception on init s3 client {str(e)}")
+            raise e
 
     async def _async_log_event(
         self, kwargs, response_obj, start_time, end_time, print_verbose
@@ -109,7 +139,7 @@ class S3Logger:
 
             print_verbose(f"s3 Layer Logging - final response object: {response_obj}")
             return response
-        except:
+        except Exception as e:
             traceback.print_exc()
-            print_verbose(f"s3 Layer Error - {traceback.format_exc()}")
+            print_verbose(f"s3 Layer Error - {str(e)}\n{traceback.format_exc()}")
             pass

litellm/tests/test_s3_logs.py

@@ -24,6 +24,11 @@ def test_s3_logging():
         # redirect stdout to log_file
 
         litellm.success_callback = ["s3"]
+        litellm.s3_callback_params = {
+            "s3_bucket_name": "litellm-logs",
+            "s3_aws_secret_access_key": "os.environ/AWS_SECRET_ACCESS_KEY",
+            "s3_aws_access_key_id": "os.environ/AWS_ACCESS_KEY_ID",
+        }
         litellm.set_verbose = True
 
         print("Testing async s3 logging")