From 5dce53579ec413e0d59807af838f852beb99636f Mon Sep 17 00:00:00 2001
From: Brian Schultheiss <bschulth@amgen.com>
Date: Tue, 25 Jun 2024 14:09:55 -0700
Subject: [PATCH] Revert some non-essential changes

---
 litellm/llms/bedrock.py | 23 ++---------------------
 1 file changed, 2 insertions(+), 21 deletions(-)

diff --git a/litellm/llms/bedrock.py b/litellm/llms/bedrock.py
index 07d9834bf4c..d0d3bef6da2 100644
--- a/litellm/llms/bedrock.py
+++ b/litellm/llms/bedrock.py
@@ -668,21 +668,6 @@ def init_bedrock_client(
             endpoint_url=endpoint_url,
             config=config,
         )
-    elif (
-            aws_access_key_id is not None
-            and aws_secret_access_key is not None
-            and aws_session_token is not None
-        ): ### CHECK FOR AWS SESSION TOKEN ###        
-        client = boto3.client(
-            service_name="bedrock-runtime",
-            aws_access_key_id=aws_access_key_id,
-            aws_secret_access_key=aws_secret_access_key,
-            aws_session_token=aws_session_token,
-            region_name=region_name,
-            endpoint_url=endpoint_url,
-            config=config,
-        )
-
     elif aws_role_name is not None and aws_session_name is not None:
         # use sts if role name passed in
         sts_client = boto3.client(
@@ -801,10 +786,9 @@ def completion(
     _is_function_call = False
     json_schemas: dict = {}
     try:
-        # pop aws_secret_access_key, aws_access_key_id, aws_session_token, aws_region_name from kwargs, since completion calls fail with them
+        # pop aws_secret_access_key, aws_access_key_id, aws_region_name from kwargs, since completion calls fail with them
         aws_secret_access_key = optional_params.pop("aws_secret_access_key", None)
         aws_access_key_id = optional_params.pop("aws_access_key_id", None)
-        aws_session_token = optional_params.pop("aws_session_token", None)
         aws_region_name = optional_params.pop("aws_region_name", None)
         aws_role_name = optional_params.pop("aws_role_name", None)
         aws_session_name = optional_params.pop("aws_session_name", None)
@@ -822,7 +806,6 @@ def completion(
             client = init_bedrock_client(
                 aws_access_key_id=aws_access_key_id,
                 aws_secret_access_key=aws_secret_access_key,
-                aws_session_token=aws_session_token,
                 aws_region_name=aws_region_name,
                 aws_bedrock_runtime_endpoint=aws_bedrock_runtime_endpoint,
                 aws_role_name=aws_role_name,
@@ -1342,10 +1325,9 @@ def embedding(
     encoding=None,
 ):
     ### BOTO3 INIT ###
-    # pop aws_secret_access_key, aws_access_key_id, aws_session_token, aws_region_name from kwargs, since completion calls fail with them
+    # pop aws_secret_access_key, aws_access_key_id, aws_region_name from kwargs, since completion calls fail with them
     aws_secret_access_key = optional_params.pop("aws_secret_access_key", None)
     aws_access_key_id = optional_params.pop("aws_access_key_id", None)
-    aws_session_token = optional_params.pop("aws_session_token", None)
     aws_region_name = optional_params.pop("aws_region_name", None)
     aws_role_name = optional_params.pop("aws_role_name", None)
     aws_session_name = optional_params.pop("aws_session_name", None)
@@ -1358,7 +1340,6 @@ def embedding(
     client = init_bedrock_client(
         aws_access_key_id=aws_access_key_id,
         aws_secret_access_key=aws_secret_access_key,
-        aws_session_token=aws_session_token,
         aws_region_name=aws_region_name,
         aws_bedrock_runtime_endpoint=aws_bedrock_runtime_endpoint,
         aws_web_identity_token=aws_web_identity_token,