Skip to content
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

Moving to file_upload to upload files over the gallery #472

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

Moving to file_upload to upload files over the gallery #472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3a8eae9
adding kwargs for header request, using file_upload rest endpoint to …
burnout87 Oct 26, 2022
9489130
removed unexplainable import
burnout87 Oct 27, 2022
22638d0
reformatting file_upload call
burnout87 Oct 27, 2022
e19f4fb
directly using fields of the bundle for the file_upload rest call
burnout87 Oct 28, 2022
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
97 changes: 69 additions & 28 deletions cdci_data_analysis/analysis/drupal_helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@ def analyze_drupal_output(drupal_output, operation_performed=None):
status_code=drupal_output.status_code,
payload={'drupal_helper_error_message': f'error while performing: {operation_performed}'})
else:
if drupal_output.headers.get('content-type') == 'application/hal+json':
if drupal_output.headers.get('content-type') == 'application/hal+json' or \
drupal_output.headers.get('content-type') == 'application/json':
return drupal_output.json()
return drupal_output.text

Expand Down Expand Up @@ -269,10 +270,12 @@ def execute_drupal_request(url,
payload={'drupal_helper_error_message': str(e)})


def get_drupal_request_headers(gallery_jwt_token=None):
def get_drupal_request_headers(gallery_jwt_token=None, content_type='application/hal+json', **kwargs):
headers = {
'Content-type': 'application/hal+json'
'Content-type': content_type
}
for k, v in kwargs.items():
headers[k] = v
if gallery_jwt_token is not None:
headers['Authorization'] = 'Bearer ' + gallery_jwt_token
return headers
Expand Down Expand Up @@ -323,6 +326,29 @@ def delete_file_gallery(product_gallery_url, file_to_delete_id, gallery_jwt_toke
return output_post


def post_file_to_gallery_via_file_upload(product_gallery_url, file, gallery_jwt_token, field_name,
entity_type_id="node", bundle="data_product", sentry_dsn=None):
logger.info(f"uploading file {file} to the product gallery via file_upload")
post_url = os.path.join(product_gallery_url, f'file/upload/{entity_type_id}/{bundle}/{field_name}')

content_disposition_arg = {'content-disposition': f'file; filename=\"{file.filename}\"',
'connection': 'keep-alive'}
headers = get_drupal_request_headers(gallery_jwt_token,
content_type='application/octet-stream',
**content_disposition_arg)

log_res = execute_drupal_request(post_url,
method='post',
data=file,
request_format='json',
headers=headers,
sentry_dsn=sentry_dsn)

logger.info(f"file {file.filename} successfully uploaded to the product gallery")
output_post = analyze_drupal_output(log_res, operation_performed="posting a picture to the product gallery")
return output_post


def post_file_to_gallery(product_gallery_url, file, gallery_jwt_token, file_type="image", sentry_dsn=None):
logger.info(f"uploading file {file} to the product gallery")

Expand Down Expand Up @@ -400,32 +426,47 @@ def post_content_to_gallery(decoded_token,
if files is not None:
for f in files:
if f == 'img':
img_file_obj = files[f]
# upload file to drupal
output_img_post = post_file_to_gallery(product_gallery_url=product_gallery_url,
file_type="image",
file=img_file_obj,
gallery_jwt_token=gallery_jwt_token,
sentry_dsn=sentry_dsn)
output_img_post = post_file_to_gallery_via_file_upload(product_gallery_url=product_gallery_url,
gallery_jwt_token=gallery_jwt_token,
field_name="field_image_png",
entity_type_id="node",
bundle="data_product",
file=files[f],
sentry_dsn=sentry_dsn)
img_fid = output_img_post['fid'][0]['value']
else:
output_file_post = post_file_to_gallery(product_gallery_url=product_gallery_url,
file_type="document",
file=files[f],
gallery_jwt_token=gallery_jwt_token,
sentry_dsn=sentry_dsn)
if f.startswith('fits_file'):
if fits_file_fid_list is None:
fits_file_fid_list = []
fits_file_fid_list.append(output_file_post['fid'][0]['value'])
elif f.startswith('html_file'):
if html_file_fid_list is None:
html_file_fid_list = []
html_file_fid_list.append(output_file_post['fid'][0]['value'])
elif f.startswith('yaml_file'):
if yaml_file_fid_list is None:
yaml_file_fid_list = []
yaml_file_fid_list.append(output_file_post['fid'][0]['value'])
elif f.startswith('fits_file'):
output_file_post = post_file_to_gallery_via_file_upload(product_gallery_url=product_gallery_url,
gallery_jwt_token=gallery_jwt_token,
field_name="field_fits_file",
entity_type_id="node",
bundle="data_product",
file=files[f],
sentry_dsn=sentry_dsn)
if fits_file_fid_list is None:
fits_file_fid_list = []
fits_file_fid_list.append(output_file_post['fid'][0]['value'])
elif f.startswith('html_file'):
output_file_post = post_file_to_gallery_via_file_upload(product_gallery_url=product_gallery_url,
gallery_jwt_token=gallery_jwt_token,
field_name="field_html_file",
entity_type_id="node",
bundle="data_product",
file=files[f],
sentry_dsn=sentry_dsn)
if html_file_fid_list is None:
html_file_fid_list = []
html_file_fid_list.append(output_file_post['fid'][0]['value'])
elif f.startswith('yaml_file'):
output_file_post = post_file_to_gallery_via_file_upload(product_gallery_url=product_gallery_url,
gallery_jwt_token=gallery_jwt_token,
field_name="field_attachments",
entity_type_id="node",
bundle="observation",
file=files[f],
sentry_dsn=sentry_dsn)
if yaml_file_fid_list is None:
yaml_file_fid_list = []
yaml_file_fid_list.append(output_file_post['fid'][0]['value'])
if content_type == content_type.DATA_PRODUCT:

product_id = par_dic.get('product_id', None)
Expand Down
4 changes: 2 additions & 2 deletions cdci_data_analysis/pytest_fixtures.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ def dispatcher_test_conf_with_gallery_fn(dispatcher_test_conf_fn):
f.write(f_default.read())

f.write('\n product_gallery_options:'
'\n product_gallery_url: "http://cdciweb02.isdc.unige.ch/mmoda/galleryd9"'
'\n product_gallery_url: "http://cdciweb02.isdc.unige.ch/mmoda/galleryd"'
f'\n product_gallery_secret_key: "{os.getenv("DISPATCHER_PRODUCT_GALLERY_SECRET_KEY", "secret_key")}"'
'\n product_gallery_timezone: "Europe/Zurich"'
'\n name_resolver_url: "https://resolver-prod.obsuks1.unige.ch/api/v1.1/byname/{}"'
Expand All @@ -436,7 +436,7 @@ def dispatcher_test_conf_with_gallery_no_resolver_fn(dispatcher_test_conf_fn):
f.write(f_default.read())

f.write('\n product_gallery_options:'
'\n product_gallery_url: "http://cdciweb02.isdc.unige.ch/mmoda/galleryd9"'
'\n product_gallery_url: "http://cdciweb02.isdc.unige.ch/mmoda/galleryd"'
'\n product_gallery_timezone: "Europe/Zurich"'
f'\n product_gallery_secret_key: "{os.getenv("DISPATCHER_PRODUCT_GALLERY_SECRET_KEY", "secret_key")}"')

Expand Down