From 6bc1e30ef9ebaca4fe87c4406e60298b29d73ef9 Mon Sep 17 00:00:00 2001 From: Chauncey Date: Wed, 23 Apr 2025 10:22:29 +0800 Subject: [PATCH] Revert "[Misc] Add S3 environment variables for better support of MinIO." (#17021) --- vllm/transformers_utils/s3_utils.py | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/vllm/transformers_utils/s3_utils.py b/vllm/transformers_utils/s3_utils.py index f67b8fdd7c4e..1c3520bcfb27 100644 --- a/vllm/transformers_utils/s3_utils.py +++ b/vllm/transformers_utils/s3_utils.py @@ -45,12 +45,7 @@ def glob(s3=None, list[str]: List of full S3 paths allowed by the pattern """ if s3 is None: - s3 = boto3.client( - 's3', - aws_access_key_id=os.getenv("AWS_ACCESS_KEY_ID"), - aws_secret_access_key=os.getenv("AWS_SECRET_ACCESS_KEY"), - endpoint_url=os.getenv("AWS_ENDPOINT_URL"), - region_name=os.getenv("AWS_REGION_NAME")) + s3 = boto3.client("s3") if not path.endswith("/"): path = path + "/" bucket_name, _, paths = list_files(s3, @@ -112,12 +107,7 @@ class S3Model: """ def __init__(self) -> None: - self.s3 = boto3.client( - 's3', - aws_access_key_id=os.getenv("AWS_ACCESS_KEY_ID"), - aws_secret_access_key=os.getenv("AWS_SECRET_ACCESS_KEY"), - endpoint_url=os.getenv("AWS_ENDPOINT_URL"), - region_name=os.getenv("AWS_REGION_NAME")) + self.s3 = boto3.client('s3') for sig in (signal.SIGINT, signal.SIGTERM): existing_handler = signal.getsignal(sig) signal.signal(sig, self._close_by_signal(existing_handler))