From f5360c85e9546fa21e10baef6286c72029a3d336 Mon Sep 17 00:00:00 2001 From: kburke Date: Fri, 25 Oct 2024 16:26:46 -0400 Subject: [PATCH] Switch to using hubmap-commons 2.1.18. Change constructor call for S3Worker. --- src/requirements.txt | 2 +- src/uuid_worker.py | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/requirements.txt b/src/requirements.txt index b5368cd..5264300 100644 --- a/src/requirements.txt +++ b/src/requirements.txt @@ -15,4 +15,4 @@ requests==2.32.3 # Use the branch name of commons from github for testing new changes made in commons # Default is master branch specified in docker-compose.yml if not set # git+https://github.com/hubmapconsortium/commons.git@${COMMONS_BRANCH}#egg=hubmap-commons -hubmap-commons==2.1.15 +hubmap-commons==2.1.18 diff --git a/src/uuid_worker.py b/src/uuid_worker.py index 34e6d43..88e99de 100644 --- a/src/uuid_worker.py +++ b/src/uuid_worker.py @@ -336,13 +336,15 @@ def __init__(self, app_config=None): ,'aws_object_url_expiration_in_secs': app_config['AWS_OBJECT_URL_EXPIRATION_IN_SECS'] ,'service_configured_obj_prefix': app_config['AWS_S3_OBJECT_PREFIX']} try: - self.theS3Worker = S3Worker(self.S3_settings_dict['aws_access_key_id'] - ,self.S3_settings_dict['aws_secret_access_key'] - ,self.S3_settings_dict['aws_s3_bucket_name'] - ,self.S3_settings_dict['aws_object_url_expiration_in_secs']) - self.logger.info("theS3Worker initialized") + self.theS3Worker = S3Worker(ACCESS_KEY_ID=self.S3_settings_dict['aws_access_key_id'] + , SECRET_ACCESS_KEY=self.S3_settings_dict['aws_secret_access_key'] + , S3_BUCKET_NAME=self.S3_settings_dict['aws_s3_bucket_name'] + , S3_OBJECT_URL_EXPIRATION_IN_SECS=self.S3_settings_dict['aws_object_url_expiration_in_secs'] + , LARGE_RESPONSE_THRESHOLD=self.S3_settings_dict['large_response_threshold'] + , SERVICE_S3_OBJ_PREFIX=self.S3_settings_dict['service_configured_obj_prefix']) + self.logger.info("self.theS3Worker initialized") except Exception as e: - self.logger.error(f"Error initializing theS3Worker - '{str(e)}'.", exc_info=True) + self.logger.error(f"Error initializing self.theS3Worker - '{str(e)}'.", exc_info=True) raise Exception(f"Unexpected error: {str(e)}") if not clientId: