Skip to content

Commit 33e15c7

Browse files
committed
Re-order the args of _create_s3_client in order to make bucket required
1 parent 041dc3e commit 33e15c7

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

sdv/datasets/demo.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def _validate_output_folder(output_folder_name):
4040
)
4141

4242

43-
def _create_s3_client(credentials=None, bucket=None):
43+
def _create_s3_client(bucket=None, credentials=None):
4444
"""Create and return an S3 client with unsigned requests."""
4545
if bucket is not None and bucket != PUBLIC_BUCKET:
4646
raise ValueError('Private buckets are only supported in SDV Enterprise.')
@@ -178,7 +178,7 @@ def _download(modality, dataset_name, bucket, credentials=None):
178178
tuple:
179179
(BytesIO(zip_bytes), metadata_bytes)
180180
"""
181-
client = _create_s3_client(credentials, bucket)
181+
client = _create_s3_client(bucket=bucket, credentials=credentials)
182182
dataset_prefix = f'{modality}/{dataset_name}/'
183183
bucket_url = f'https://{bucket}.s3.amazonaws.com'
184184
LOGGER.info(
@@ -452,7 +452,7 @@ def get_available_demos(modality, s3_bucket_name=PUBLIC_BUCKET, credentials=None
452452
``num_tables``: The number of tables in the dataset.
453453
"""
454454
_validate_modalities(modality)
455-
s3_client = _create_s3_client(credentials=credentials, bucket=s3_bucket_name)
455+
s3_client = _create_s3_client(bucket=s3_bucket_name, credentials=credentials)
456456
contents = _list_objects(f'{modality}/', bucket=s3_bucket_name, client=s3_client)
457457
tables_info = defaultdict(list)
458458
for dataset_name, yaml_key in _iter_metainfo_yaml_entries(contents, modality):
@@ -576,7 +576,7 @@ def _get_text_file_content(
576576
_validate_text_file_content(modality, output_filepath, filename)
577577

578578
dataset_prefix = f'{modality}/{dataset_name}/'
579-
s3_client = _create_s3_client(credentials=credentials, bucket=bucket)
579+
s3_client = _create_s3_client(bucket=bucket, credentials=credentials)
580580
contents = _list_objects(dataset_prefix, bucket=bucket, client=s3_client)
581581
key = _find_text_key(contents, dataset_prefix, filename)
582582
if not key:

0 commit comments

Comments
 (0)