Skip to content

Modified datasets/prov-info and samples/prov-info to check the size o… #433

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yuanzhou merged 2 commits into from
Jan 31, 2023
Merged

Modified datasets/prov-info and samples/prov-info to check the size o… #433

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3485db8
Modified datasets/prov-info and samples/prov-info to check the size o…
DerekFurstPitt Jan 31, 2023
168c1d7
Changed 9mb to 9437184 bytes for threshold in prov-info endpoints
DerekFurstPitt Jan 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 20 additions & 6 deletions src/app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2688,9 +2688,9 @@ def get_prov_info():
internal_dict[HEADER_DATASET_STATUS] = dataset['status']
internal_dict[HEADER_DATASET_GROUP_NAME] = dataset['group_name']
internal_dict[HEADER_DATASET_GROUP_UUID] = dataset['group_uuid']
internal_dict[HEADER_DATASET_DATE_TIME_CREATED] = datetime.fromtimestamp(int(dataset['created_timestamp']/1000.0))
internal_dict[HEADER_DATASET_DATE_TIME_CREATED] = str(datetime.fromtimestamp(int(dataset['created_timestamp'] / 1000.0)))
internal_dict[HEADER_DATASET_CREATED_BY_EMAIL] = dataset['created_by_user_email']
internal_dict[HEADER_DATASET_DATE_TIME_MODIFIED] = datetime.fromtimestamp(int(dataset['last_modified_timestamp']/1000.0))
internal_dict[HEADER_DATASET_DATE_TIME_MODIFIED] = str(datetime.fromtimestamp(int(dataset['last_modified_timestamp'] / 1000.0)))
internal_dict[HEADER_DATASET_MODIFIED_BY_EMAIL] = dataset['last_modified_user_email']
internal_dict[HEADER_DATASET_LAB_ID] = dataset['lab_dataset_id']

Expand Down Expand Up @@ -2856,6 +2856,14 @@ def get_prov_info():
# Each dataset's dictionary is added to the list to be returned
dataset_prov_list.append(internal_dict)

# Determine whether the size of the returned data exceeds or nearly exceeds the AWS Gateway 10MB maximum size. If it
# is greater than 9437184 bytes Return a 400 and prompt the user to reduce the size of the output by applying optional
# argument filters.
dataset_prov_json_encode = json.dumps(dataset_prov_list).encode('utf-8')
if len(dataset_prov_json_encode) > 9437184:
bad_request_error(
"Request generated a response over the 10MB limit. Sub-select the results using a query parameter.")

# if return_json is true, this dictionary is ready to be returned already
if return_json:
return jsonify(dataset_prov_list)
Expand Down Expand Up @@ -3018,10 +3026,9 @@ def get_prov_info_for_dataset(id):
internal_dict[HEADER_DATASET_STATUS] = dataset['status']
internal_dict[HEADER_DATASET_GROUP_NAME] = dataset['group_name']
internal_dict[HEADER_DATASET_GROUP_UUID] = dataset['group_uuid']
internal_dict[HEADER_DATASET_DATE_TIME_CREATED] = datetime.fromtimestamp(int(dataset['created_timestamp'] / 1000.0))
internal_dict[HEADER_DATASET_DATE_TIME_CREATED] = str(datetime.fromtimestamp(int(dataset['created_timestamp'] / 1000.0)))
internal_dict[HEADER_DATASET_CREATED_BY_EMAIL] = dataset['created_by_user_email']
internal_dict[HEADER_DATASET_DATE_TIME_MODIFIED] = datetime.fromtimestamp(
int(dataset['last_modified_timestamp'] / 1000.0))
internal_dict[HEADER_DATASET_DATE_TIME_MODIFIED] = str(datetime.fromtimestamp(int(dataset['last_modified_timestamp'] / 1000.0)))
internal_dict[HEADER_DATASET_MODIFIED_BY_EMAIL] = dataset['last_modified_user_email']
internal_dict[HEADER_DATASET_LAB_ID] = dataset['lab_dataset_id']

Expand Down Expand Up @@ -3448,7 +3455,14 @@ def get_sample_prov_info():

# Each sample's dictionary is added to the list to be returned
sample_prov_list.append(internal_dict)


# Determine whether the size of the returned data exceeds or nearly exceeds the AWS Gateway 10MB maximum size. If it
# is greater than 9437184 bytes Return a 400 and prompt the user to reduce the size of the output by applying optional
# argument filters.
sample_prov_json_encode = json.dumps(sample_prov_list).encode('utf-8')
if len(sample_prov_json_encode) > 9437184:
bad_request_error(
"Request generated a response over the 10MB limit. Sub-select the results using a query parameter.")
return jsonify(sample_prov_list)


Expand Down