Versioning support

FAIRshake/settings.py

@@ -63,6 +63,7 @@
     'corsheaders',
     'ajax_select',
     'analytical',
+    'versions_tests',
     'allauth',
     'allauth.account',
     'allauth.socialaccount',
@@ -73,6 +74,7 @@
     'extensions.allauth_ex',
     'extensions.drf_yasg_ex',
     'extensions.rest_auth_ex',
+    'extensions.versions_ex',
     'extensions.rest_framework_ex',
     'FAIRshakeHub',
     'FAIRshakeAPI',

FAIRshakeAPI/assessments/fairsharing/__init__.py

@@ -1,61 +1,59 @@
+import re
 from django.conf import settings
 from scripts.pyswagger_wrapper import SwaggerClient
 
+url_re = re.compile(r'^https?://doi.org/(.+)$')
+
+metric_to_attr = {
+  'metric:9': 'licence',
+  'metric:60': 'homepage',
+  'metric:101': 'taxonomies',
+  'metric:102': 'domains',
+}
+
 class Assessment:
   inputs = [
-    'target:fairsharing'
+    'target:url'
   ]
   outputs = [
     # 'target:url',
     # 'target:description',
     # 'target:title',
-    # 'target:doi',
     # 'target:authors'
-    'metric:9', # license
-    'metric:60', # title
-    'metric:101', # taxonomies
-    'metric:102', # domains
-  ]
+  ] + list(metric_to_attr.keys())
+
   @classmethod
   def perform(kls, inputs):
-    client = SwaggerClient(
-      'https://fairsharing.org/api/?format=openapi',
-      headers={
-        'Api-Key': settings.ASSESSMENT_CONFIG['fairsharing']['api-key'],
-      }
-    )
-    results = client.actions.database_summary_read.call(
-      bsg_id=inputs['target:fairsharing']
-    )
-    return {
-      # 'target:url': {
-      #   'answer': results['data'].get('homepage'),
-      #   'comment': results['data'].get('homepage'),
-      # },
-      # 'target:description': {
-      #   'answer': results['data'].get('description'),
-      #   'comment': results['data'].get('description'),
-      # },
-      # 'target:title': {
-      #   'answer': results['data'].get('name'),
-      #   'comment': results['data'].get('name'),
-      # },
-      'metric:9': {
-        'answer': 'yes' if results.get('licence') else 'no',
-        'comment': results.get('licence'),
-      },
-      'metric:60': {
-        'answer': 'yes' if results['data'].get('homepage') is not None else 'no',
-        'comment': results['data'].get('homepage'),
-      },
-      'metric:101': {
-        'answer': 'yes' if results['data'].get('taxonomies') else 'no',
-        'comment': results['data'].get('taxonomies'),
-      },
-      'metric:102': {
-        'answer': 'yes' if results['data'].get('domains') else 'no',
-        'comment': results['data'].get('domains'),
-      },
-      # 'target:doi': results['data'].get('doi'),
-      # 'target:authors': results['data'].get('maintainers'),
-    }
+    url = inputs['target:url']
+    dois = [m.group(1) for m in map(url_re.match, url.splitlines()) if m]
+
+    if dois:
+      client = SwaggerClient(
+        'https://fairsharing.org/api/?format=openapi',
+        headers={
+          'Api-Key': settings.ASSESSMENT_CONFIG['fairsharing']['api-key'],
+        }
+      )
+
+      results = [
+        result
+        for doi in dois
+        for result in client.actions.database_summary_list.call(
+          doi=doi,
+        )['results']
+      ]
+
+      if len(results) > 1:
+        logging.warn('More than 1 DOI was identified in the fairsharing database! (%s)' % (url))
+      if len(results) >= 1:
+        data = results[0]['data']
+      else:
+        data = None
+
+      return {
+        key: {
+          'answer': 'yes' if data.get(attr) else 'no',
+          'comment': data.get(attr),
+        }
+        for key, attr in metric_to_attr.items()
+      } if data else {key: {} for key in metric_to_attr.keys()}

FAIRshakeAPI/forms.py

@@ -16,7 +16,21 @@ def __init__(self, *args, **kwargs):
         help_text=None,
         initial=getattr(self.instance, child).all() if self.instance and self.instance.id else [],
       )
-
+
+  def clean_slug(self):
+    slug = self.cleaned_data.get('slug')
+    try:
+      if any([
+        self.Meta.model.objects.current.get(slug=slug) != self.instance,
+        self.Meta.model.objects.get(id=slug) != self.instance,
+      ]):
+        raise forms.ValidationError(
+          'Slug was already taken, please try something different.'
+        )
+    except self.Meta.model.DoesNotExist:
+      pass
+    return slug
+
   def save(self, *args, commit=True, **kwargs):
     ''' Explicitly add children for children in the reverse direction.
     '''
@@ -43,6 +57,7 @@ class Meta:
       'image',
       'tags',
       'type',
+      'slug',
       'digital_objects',
       'authors',
     )
@@ -57,6 +72,7 @@ class Meta:
       'image',
       'tags',
       'type',
+      'slug',
       'rubrics',
       'authors',
     )
@@ -71,6 +87,7 @@ class Meta:
       'image',
       'tags',
       'type',
+      'slug',
       'license',
       'metrics',
       'authors',
@@ -86,27 +103,11 @@ class Meta:
       'image',
       'tags',
       'type',
+      'slug',
       'license',
       'rationale',
       'principle',
       'fairmetrics',
-      'authors',
-    )
-
-class AssessmentForm(forms.ModelForm):
-  def __init__(self, *args, **kwargs):
-    super(AssessmentForm, self).__init__(*args, **kwargs)
-
-    self.fields['target'].widget = forms.HiddenInput()
-    self.fields['rubric'].widget = forms.HiddenInput()
-    self.fields['project'].widget = forms.HiddenInput()
-
-  class Meta:
-    model = models.Assessment
-    fields = (
-      'target',
-      'rubric',
-      'project',
     )
 
 class AnswerForm(forms.ModelForm):