From ff62cf2a7cfe1d0f8486d11362a9f472ad1e60b2 Mon Sep 17 00:00:00 2001 From: lijiaxing Date: Wed, 6 Dec 2023 15:15:54 +0800 Subject: [PATCH] storage --- internlm/utils/storage_manager.py | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/internlm/utils/storage_manager.py b/internlm/utils/storage_manager.py index 5a4456b..ce96816 100644 --- a/internlm/utils/storage_manager.py +++ b/internlm/utils/storage_manager.py @@ -340,24 +340,24 @@ class Boto3Client(StorageClient): super().__init__(boto3) self.botocore = botocore try: - if os.environ.get["S3_ACCESS_KEY_ID"] is not None and os.environ.get["ACCESS_KEY"] is not None: + if os.environ.get("S3_ACCESS_KEY_ID") is not None and os.environ.get("ACCESS_KEY") is not None: s3_access_key_id = os.environ["ACCESS_KEY"] logger.warning("Both 'S3_ACCESS_KEY_ID' and 'ACCESS_KEY' exist, 'ACCESS_KEY' will be used by default") - elif os.environ.get["ACCESS_KEY"] is None: + elif os.environ.get("ACCESS_KEY") is None: s3_access_key_id = os.environ["S3_ACCESS_KEY_ID"] else: s3_access_key_id = os.environ["ACCESS_KEY"] if ( - os.environ.get["S3_SECRET_ACCESS_KEY_ID"] is not None - and os.environ.get["SECRET_ACCESS_KEY"] is not None + os.environ.get("S3_SECRET_ACCESS_KEY_ID") is not None + and os.environ.get("SECRET_ACCESS_KEY") is not None ): s3_secret_access_key = os.environ["SECRET_ACCESS_KEY"] logger.warning( "Both 'S3_SECRET_ACCESS_KEY_ID' and 'SECRET_ACCESS_KEY' exist, " "'SECRET_ACCESS_KEY' will be used by default" ) - elif os.environ.get["SECRET_ACCESS_KEY"] is None: + elif os.environ.get("SECRET_ACCESS_KEY") is None: s3_secret_access_key = os.environ["S3_SECRET_ACCESS_KEY_ID"] else: s3_secret_access_key = os.environ["SECRET_ACCESS_KEY"] @@ -485,24 +485,24 @@ class VolcClient(StorageClient): super().__init__(tos) try: - if os.environ.get["VOLC_ACCESS_KEY_ID"] is not None and os.environ.get["ACCESS_KEY"] is not None: + if os.environ.get("VOLC_ACCESS_KEY_ID") is not None and os.environ.get("ACCESS_KEY") is not None: access_key = os.environ["ACCESS_KEY"] logger.warning("Both 'VOLC_ACCESS_KEY_ID' and 'ACCESS_KEY' exist, 'ACCESS_KEY' will be used by default") - elif os.environ.get["ACCESS_KEY"] is None: + elif os.environ.get("ACCESS_KEY") is None: access_key = os.environ["VOLC_ACCESS_KEY_ID"] else: access_key = os.environ["ACCESS_KEY"] if ( - os.environ.get["VOLC_SECRET_ACCESS_KEY_ID"] is not None - and os.environ.get["SECRET_ACCESS_KEY"] is not None + os.environ.get("VOLC_SECRET_ACCESS_KEY_ID") is not None + and os.environ.get("SECRET_ACCESS_KEY") is not None ): secret_key = os.environ["SECRET_ACCESS_KEY"] logger.warning( "Both 'VOLC_SECRET_ACCESS_KEY_ID' and 'SECRET_ACCESS_KEY' exist, " "'SECRET_ACCESS_KEY' will be used by default" ) - elif os.environ.get["SECRET_ACCESS_KEY"] is None: + elif os.environ.get("SECRET_ACCESS_KEY") is None: secret_key = os.environ["VOLC_SECRET_ACCESS_KEY_ID"] else: secret_key = os.environ["SECRET_ACCESS_KEY"] @@ -670,24 +670,24 @@ class AliClient(StorageClient): super().__init__(oss2) try: - if os.environ.get["ALI_ACCESS_KEY_ID"] is not None and os.environ.get["ACCESS_KEY"] is not None: + if os.environ.get("ALI_ACCESS_KEY_ID") is not None and os.environ.get("ACCESS_KEY") is not None: access_key = os.environ["ACCESS_KEY"] logger.warning("Both 'ALI_ACCESS_KEY_ID' and 'ACCESS_KEY' exist, 'ACCESS_KEY' will be used by default") - elif os.environ.get["ACCESS_KEY"] is None: + elif os.environ.get("ACCESS_KEY") is None: access_key = os.environ["ALI_ACCESS_KEY_ID"] else: access_key = os.environ["ACCESS_KEY"] if ( - os.environ.get["ALI_SECRET_ACCESS_KEY_ID"] is not None - and os.environ.get["SECRET_ACCESS_KEY"] is not None + os.environ.get("ALI_SECRET_ACCESS_KEY_ID") is not None + and os.environ.get("SECRET_ACCESS_KEY") is not None ): secret_key = os.environ["SECRET_ACCESS_KEY"] logger.warning( "Both 'ALI_SECRET_ACCESS_KEY_ID' and 'SECRET_ACCESS_KEY' exist, " "'SECRET_ACCESS_KEY' will be used by default" ) - elif os.environ.get["SECRET_ACCESS_KEY"] is None: + elif os.environ.get("SECRET_ACCESS_KEY") is None: secret_key = os.environ["ALI_SECRET_ACCESS_KEY_ID"] else: secret_key = os.environ["SECRET_ACCESS_KEY"]