Fix Amazon dependencies versions (#3252)

Author: yifanmai

setup.cfg

@@ -132,8 +132,8 @@ allenai =
 
 amazon = 
     boto3~=1.34.131
-    awscli~=1.32.1
-    botocore~=1.34.1
+    awscli~=1.33.13
+    botocore~=1.34.131
 
 anthropic =
     anthropic~=0.17,<0.39  # TODO(#3212): Limit anthropic to >=0.39 after resolving #3212.

src/helm/benchmark/run_expander.py

@@ -366,11 +366,7 @@ def expand(self, run_spec: RunSpec) -> List[RunSpec]:
             replace(
                 run_spec,
                 name=run_spec.name,
-                adapter_spec=replace(
-                    run_spec.adapter_spec,
-                    global_prefix=NovaRunExpander.PROMPT
-                    + "\n\n"
-                ),
+                adapter_spec=replace(run_spec.adapter_spec, global_prefix=NovaRunExpander.PROMPT + "\n\n"),
             ),
         ]
 

src/helm/clients/bedrock_client.py

@@ -8,7 +8,6 @@
 from helm.common.cache import CacheConfig
 from helm.clients.client import CachingClient, truncate_and_tokenize_response_text
 from helm.common.request import Request, RequestResult, GeneratedOutput, wrap_request_time
-from helm.common.hierarchical_logger import htrack_block
 from helm.clients.bedrock_utils import get_bedrock_client, get_bedrock_client_v1
 from helm.tokenizers.tokenizer import Tokenizer
 
@@ -99,7 +98,6 @@ def do_it() -> Dict[Any, Any]:
 
 
 class BedrockNovaClient(CachingClient):
-
     """
     Amazon Bedrock is a fully managed service that provides s selection of leading foundation models (FMs) from Amazon
     and other partner model providers.
@@ -125,23 +123,14 @@ def __init__(
 
     def convert_request_to_raw_request(self, request: Request) -> Dict:
         model_id = request.model.replace("/", ".")
-        messages = [
-            {
-                "role": "user",
-                "content": [
-                    {
-                    "text": request.prompt
-                    }
-                ]
-            }
-        ]
+        messages = [{"role": "user", "content": [{"text": request.prompt}]}]
 
         return {
             "modelId": model_id,
             "inferenceConfig": {
                 "temperature": request.temperature,
                 "maxTokens": request.max_tokens,
-                "topP": request.top_p
+                "topP": request.top_p,
             },
             "messages": messages,
         }

src/helm/clients/bedrock_utils.py

@@ -74,45 +74,37 @@ def get_bedrock_client(
 
 
 def get_bedrock_client_v1(
-        assumed_role: Optional[str] = None,
-        service_name: str = "bedrock-runtime",
-        region: str = "us-east-1",
-        read_timeout: int = 5000,
-        connect_timeout: int = 5000,
-        retries: Dict = {"max_attempts": 10},
-    ):
-        if region is None:
-            target_region = os.environ.get("AWS_REGION", os.environ.get("AWS_DEFAULT_REGION"))
-        else:
-            target_region = region
-
-        boto_config = Config(
-            read_timeout=read_timeout, connect_timeout=connect_timeout, retries=retries
-        )
+    assumed_role: Optional[str] = None,
+    service_name: str = "bedrock-runtime",
+    region: Optional[str] = "us-east-1",
+    read_timeout: int = 5000,
+    connect_timeout: int = 5000,
+    retries: Dict = {"max_attempts": 10},
+):
+    if region is None:
+        target_region = os.environ.get("AWS_REGION", os.environ.get("AWS_DEFAULT_REGION"))
+    else:
+        target_region = region
 
-        if target_region is None:
-            raise ValueError(
-                "region environment variable is not set."
-            )
-
-        if assumed_role:
-            session = boto3.Session(region_name=target_region)
-            # Assume role and get credentials
-            sts = session.client("sts")
-            creds = sts.assume_role(RoleArn=str(assumed_role),RoleSessionName="crfm-helm")["Credentials"]
-            session = Session(
-                aws_access_key_id=creds["AccessKeyId"],
-                aws_secret_access_key=creds["SecretAccessKey"],
-            )
-            return session.client(
-                service_name=service_name,
-                region_name=target_region,
-                config=boto_config,
-            )
-
-        # default to instance role to get the aws credentials or aws configured credentials
-        return boto3.client(
+    boto_config = Config(read_timeout=read_timeout, connect_timeout=connect_timeout, retries=retries)
+
+    if target_region is None:
+        raise ValueError("region environment variable is not set.")
+
+    if assumed_role:
+        session = boto3.Session(region_name=target_region)
+        # Assume role and get credentials
+        sts = session.client("sts")
+        creds = sts.assume_role(RoleArn=str(assumed_role), RoleSessionName="crfm-helm")["Credentials"]
+        session = Session(
+            aws_access_key_id=creds["AccessKeyId"],
+            aws_secret_access_key=creds["SecretAccessKey"],
+        )
+        return session.client(
             service_name=service_name,
             region_name=target_region,
-            config=boto_config
+            config=boto_config,
         )
+
+    # default to instance role to get the aws credentials or aws configured credentials
+    return boto3.client(service_name=service_name, region_name=target_region, config=boto_config)