Skip to content

Commit

Permalink
services: metadata input on zenodo deposit creation
Browse files Browse the repository at this point in the history
* adds serializers/validation for metadata input
* adds unit tests for zenodo serializer
* closes cernanalysispreservation#1952

Signed-off-by: Ilias Koutsakis <[email protected]>
  • Loading branch information
Lilykos committed Dec 18, 2020
1 parent 99200b1 commit 077f5ca
Show file tree
Hide file tree
Showing 7 changed files with 499 additions and 52 deletions.
37 changes: 22 additions & 15 deletions cap/modules/deposit/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,15 @@
from cap.modules.repos.tasks import download_repo, download_repo_file
from cap.modules.repos.utils import (create_webhook, disconnect_subscriber,
parse_git_url)
from cap.modules.services.serializers.zenodo import ZenodoUploadSchema
from cap.modules.schemas.resolvers import (resolve_schema_by_url,
schema_name_to_url)
from cap.modules.user.errors import DoesNotExistInLDAP
from cap.modules.user.utils import (get_existing_or_register_role,
get_existing_or_register_user)

from .errors import (DepositValidationError, UpdateDepositPermissionsError,
ReviewError)
ReviewError, InputValidationError)
from .fetchers import cap_deposit_fetcher
from .minters import cap_deposit_minter
from .permissions import (AdminDepositPermission, CloneDepositPermission,
Expand Down Expand Up @@ -257,7 +258,7 @@ def upload(self, pid, *args, **kwargs):
with UpdateDepositPermission(self).require(403):
if request:
_, rec = request.view_args.get('pid_value').data
record_uuid = str(rec.id)
recid = str(rec.id)
data = request.get_json()
target = data.get('target')

Expand All @@ -269,20 +270,26 @@ def upload(self, pid, *args, **kwargs):
'Please connect your Zenodo account '
'before creating a deposit.')

files = data.get('files')
bucket = data.get('bucket')
zenodo_data = data.get('zenodo_data', {})
files = data.get('files', [])
zenodo_data = data.get('zenodo_data')
input = dict(files=files, data=zenodo_data) \
if zenodo_data else dict(files=files)

if files and bucket:
zenodo_deposit = create_zenodo_deposit(token, zenodo_data) # noqa
self.setdefault('_zenodo', []).append(zenodo_deposit)
if files:
_, errors = ZenodoUploadSchema(recid=recid).load(input)
if errors:
raise InputValidationError(
'Validation error in Zenodo input data.',
errors=errors)

deposit = create_zenodo_deposit(token, zenodo_data)
self.setdefault('_zenodo', []).append(deposit)
self.commit()

# upload files to zenodo deposit
upload_to_zenodo.delay(
files, bucket, token,
zenodo_deposit['id'],
zenodo_deposit['links']['bucket'])
upload_to_zenodo.delay(files, recid, token,
deposit['id'],
deposit['links']['bucket'])
else:
raise FileUploadError(
'You cannot create an empty Zenodo deposit. '
Expand All @@ -307,7 +314,7 @@ def upload(self, pid, *args, **kwargs):
'You cannot create a webhook on a file')

download_repo_file(
record_uuid,
recid,
f'repositories/{host}/{owner}/{repo}/{api.branch or api.sha}/{filepath}', # noqa
*api.get_file_download(filepath),
api.auth_headers,
Expand All @@ -325,10 +332,10 @@ def upload(self, pid, *args, **kwargs):
'You cannot create a push webhook'
' for a specific sha.')

create_webhook(record_uuid, api, event_type)
create_webhook(recid, api, event_type)
else:
download_repo.delay(
record_uuid,
recid,
f'repositories/{host}/{owner}/{repo}/{api.branch or api.sha}.tar.gz', # noqa
api.get_repo_download(),
api.auth_headers)
Expand Down
15 changes: 15 additions & 0 deletions cap/modules/deposit/errors.py
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,21 @@ def __init__(self, description, errors=None, **kwargs):
self.errors = [FieldError(e[0], e[1]) for e in errors.items()]


class InputValidationError(RESTValidationError):
"""Review validation error exception."""

code = 400

description = "Validation error. Try again with valid data"

def __init__(self, description, errors=None, **kwargs):
"""Initialize exception."""
super(InputValidationError, self).__init__(**kwargs)

self.description = description or self.description
self.errors = [FieldError(e[0], e[1]) for e in errors.items()]


class DataValidationError(RESTValidationError):
"""Review validation error exception."""

Expand Down
16 changes: 9 additions & 7 deletions cap/modules/deposit/tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,29 +28,31 @@
import requests
from flask import current_app
from celery import shared_task
from invenio_db import db
from invenio_files_rest.models import FileInstance, ObjectVersion
from invenio_files_rest.models import FileInstance


@shared_task(autoretry_for=(Exception, ),
retry_kwargs={
'max_retries': 5,
'countdown': 10
})
def upload_to_zenodo(files, bucket, token, zenodo_depid, zenodo_bucket_url):
def upload_to_zenodo(files, recid, token, zenodo_depid, zenodo_bucket_url):
"""Upload to Zenodo the files the user selected."""
from cap.modules.deposit.api import CAPDeposit
rec = CAPDeposit.get_record(recid)

for filename in files:
file_obj = ObjectVersion.get(bucket, filename)
file_obj = rec.files[filename]
file_ins = FileInstance.get(file_obj.file_id)

with open(file_ins.uri, 'rb') as fp:
file = requests.put(
resp = requests.put(
url=f'{zenodo_bucket_url}/{filename}',
data=fp,
params=dict(access_token=token),
)

if not file.ok:
if not resp.ok:
current_app.logger.error(
f'Uploading file {filename} to deposit {zenodo_depid} '
f'failed with {file.status_code}.')
f'failed with {resp.status_code}.')
25 changes: 7 additions & 18 deletions cap/modules/deposit/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@

import requests
from flask import current_app
from flask_login import current_user
from invenio_access.models import Role
from invenio_db import db

from cap.modules.deposit.errors import AuthorizationError, \
DataValidationError, FileUploadError
from cap.modules.records.utils import url_to_api_url
from cap.modules.services.serializers.zenodo import ZenodoDepositSchema


def clean_empty_values(data):
Expand Down Expand Up @@ -82,13 +82,15 @@ def add_api_to_links(links):
return response


def create_zenodo_deposit(token, data):
def create_zenodo_deposit(token, data=None):
"""Create a Zenodo deposit using the logged in user's credentials."""
zenodo_url = current_app.config.get("ZENODO_SERVER_URL")
zenodo_data = {'metadata': data} if data else {}

deposit = requests.post(
url=f'{zenodo_url}/deposit/depositions',
params=dict(access_token=token),
json={'metadata': data},
json=zenodo_data,
headers={'Content-Type': 'application/json'}
)

Expand All @@ -105,18 +107,5 @@ def create_zenodo_deposit(token, data):
raise FileUploadError(
'Something went wrong, Zenodo deposit not created.')

# TODO: fix with serializers
data = deposit.json()
zenodo_deposit = {
'id': data['id'],
'title': data.get('metadata', {}).get('title'),
'creator': current_user.id,
'created': data['created'],
'links': {
'self': data['links']['self'],
'bucket': data['links']['bucket'],
'html': data['links']['html'],
'publish': data['links']['publish'],
}
}
return zenodo_deposit
data = ZenodoDepositSchema().dump(deposit.json()).data
return data
166 changes: 166 additions & 0 deletions cap/modules/services/serializers/zenodo.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,166 @@
# -*- coding: utf-8 -*-
#
# This file is part of CERN Analysis Preservation Framework.
# Copyright (C) 2020 CERN.
#
# CERN Analysis Preservation Framework is free software; you can redistribute
# it and/or modify it under the terms of the GNU General Public License as
# published by the Free Software Foundation; either version 2 of the
# License, or (at your option) any later version.
#
# CERN Analysis Preservation Framework is distributed in the hope that it will
# be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with CERN Analysis Preservation Framework; if not, write to the
# Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
# MA 02111-1307, USA.
#
# In applying this license, CERN does not
# waive the privileges and immunities granted to it by virtue of its status
# as an Intergovernmental Organization or submit itself to any jurisdiction.
# or submit itself to any jurisdiction.

"""Zenodo Serializer/Validator."""

import arrow
from flask_login import current_user
from marshmallow import Schema, fields, ValidationError, validate, validates, \
validates_schema

DATE_REGEX = r'\d{4}-\d{2}-\d{2}'
DATE_ERROR = 'The date should follow the pattern YYYY-mm-dd.'

UPLOAD_TYPES = [
'publication',
'poster',
'presentation',
'dataset',
'image',
'video',
'software',
'lesson',
'physicalobject',
'other'
]
LICENSES = [
'CC-BY-4.0',
'CC-BY-1.0',
'CC-BY-2.0',
'CC-BY-3.0'
]
ACCESS_RIGHTS = [
'open',
'embargoed',
'restricted',
'closed'
]


def choice_error_msg(choices):
return f'Not a valid choice. Select one of: {choices}'


class ZenodoCreatorsSchema(Schema):
name = fields.String(required=True)
affiliation = fields.String()
orcid = fields.String()


class ZenodoDepositMetadataSchema(Schema):
title = fields.String(required=True)
description = fields.String(required=True)
version = fields.String()

keywords = fields.List(fields.String())
creators = fields.List(
fields.Nested(ZenodoCreatorsSchema), required=True)

upload_type = fields.String(required=True, validate=validate.OneOf(
UPLOAD_TYPES, error=choice_error_msg(UPLOAD_TYPES)))
license = fields.String(required=True, validate=validate.OneOf(
LICENSES, error=choice_error_msg(LICENSES)))
access_right = fields.String(required=True, validate=validate.OneOf(
ACCESS_RIGHTS, error=choice_error_msg(ACCESS_RIGHTS)))

publication_date = fields.String(
required=True, validate=validate.Regexp(DATE_REGEX, error=DATE_ERROR))
embargo_date = fields.String(
validate=validate.Regexp(DATE_REGEX, error=DATE_ERROR))
access_conditions = fields.String()

@validates('embargo_date')
def validate_embargo_date(self, value):
"""Validate that embargo date is in the future."""
if arrow.get(value).date() <= arrow.utcnow().date():
raise ValidationError(
'Embargo date must be in the future.',
field_names=['embargo_date']
)

@validates_schema()
def validate_license(self, data, **kwargs):
"""Validate license according to what Zenodo expects."""
access = data.get('access_right')
if access in ['open', 'embargoed'] and 'license' not in data:
raise ValidationError(
'Required when access right is open or embargoed.',
field_names=['license']
)
if access == 'embargoed' and 'embargo_date' not in data:
raise ValidationError(
'Required when access right is embargoed.',
field_names=['embargo_date']
)
if access == 'restricted' and 'access_conditions' not in data:
raise ValidationError(
'Required when access right is restricted.',
field_names=['access_conditions']
)


class ZenodoUploadSchema(Schema):
files = fields.List(fields.String(), required=True)
data = fields.Nested(ZenodoDepositMetadataSchema, default=dict())

def __init__(self, *args, **kwargs):
self.recid = kwargs.pop('recid') if 'recid' in kwargs else None
super(Schema, self).__init__(*args, **kwargs)

@validates_schema()
def validate_files(self, data, **kwargs):
"""Check if the files exist in this deposit."""
from cap.modules.deposit.api import CAPDeposit
rec = CAPDeposit.get_record(self.recid)

for _file in data['files']:
if _file not in rec.files.keys:
raise ValidationError(
f'File `{_file}` not found in record.',
field_names=['files']
)


class ZenodoDepositSchema(Schema):
id = fields.Int(dump_only=True)
created = fields.String(dump_only=True)

title = fields.Method('get_title', dump_only=True, allow_none=True)
creator = fields.Method('get_creator', dump_only=True, allow_none=True)
links = fields.Method('get_links', dump_only=True)

def get_creator(self, data):
return current_user.id if current_user else None

def get_title(self, data):
return data.get('metadata', {}).get('title')

def get_links(self, data):
return {
'self': data['links']['self'],
'bucket': data['links']['bucket'],
'html': data['links']['html'],
'publish': data['links']['publish']
}
Loading

0 comments on commit 077f5ca

Please sign in to comment.