Skip to content

Commit

Permalink
Merge pull request #318 from 4dn-dcic/dmichaels-20241004-minor-s3-uti…
Browse files Browse the repository at this point in the history
…ls-read-s3-change-for-andy

Added optional bucket argument to s3_utils.read_s3 function.
  • Loading branch information
dmichaels-harvard authored Oct 5, 2024
2 parents f424018 + 01e01a5 commit e3da7e7
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 3 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ dcicutils
Change Log
----------

8.15.0
======
* 2024-10-04 (dmichaels)
* Added optional bucket argument to s3_utils.s3Utils.read_s3 (initially for Andy).


8.14.3
======

Expand Down
6 changes: 4 additions & 2 deletions dcicutils/s3_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -328,8 +328,10 @@ def get_key(self, keyfile_name: str = 'access_key_admin'
# maybe its not json after all
return auth_text

def read_s3(self, filename: str):
response = self.s3.get_object(Bucket=self.outfile_bucket, Key=filename)
def read_s3(self, filename: str, bucket: Optional[str] = None):
if (not isinstance(bucket, str)) or (not bucket):
bucket = self.outfile_bucket
response = self.s3.get_object(Bucket=bucket, Key=filename)
logger.info(str(response))
return response['Body'].read()

Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "dcicutils"
version = "8.14.3"
version = "8.15.0"
description = "Utility package for interacting with the 4DN Data Portal and other 4DN resources"
authors = ["4DN-DCIC Team <support@4dnucleome.org>"]
license = "MIT"
Expand Down

0 comments on commit e3da7e7

Please sign in to comment.