fix: make datasets.Creator a subclass of Person

addresses #793

Author: rokroskar

renku/core/models/datasets.py

@@ -31,6 +31,7 @@
 from attr.validators import instance_of
 
 from renku.core import errors
+from renku.core.models.provenance.agents import Person
 from renku.core.models.provenance.entities import Entity
 from renku.core.utils.datetime8601 import parse_date
 from renku.core.utils.doi import extract_doi, is_doi
@@ -53,35 +54,17 @@ def _extract_doi(value):
     return value
 
 
-@jsonld.s(
-    type='schema:Person',
-    context={'schema': 'http://schema.org/'},
-    slots=True,
-)
-class Creator(object):
+class Creator(Person):
     """Represent the creator of a resource."""
 
-    client = attr.ib(default=None, kw_only=True)
-
     affiliation = jsonld.ib(
         default=None, kw_only=True, context='schema:affiliation'
     )
 
-    email = jsonld.ib(default=None, kw_only=True, context='schema:email')
-
     alternate_name = jsonld.ib(
         default=None, kw_only=True, context='schema:alternateName'
     )
 
-    name = jsonld.ib(
-        default=None,
-        kw_only=True,
-        validator=instance_of(str),
-        context='schema:name'
-    )
-
-    _id = jsonld.ib(kw_only=True, context='@id')
-
     @property
     def short_name(self):
         """Gives full name in short form."""
@@ -95,14 +78,6 @@ def short_name(self):
 
         return '{0}.{1}'.format('.'.join(initials), last_name)
 
-    @email.validator
-    def check_email(self, attribute, value):
-        """Check that the email is valid."""
-        if self.email and not (
-            isinstance(value, str) and re.match(r'[^@]+@[^@]+\.[^@]+', value)
-        ):
-            raise ValueError('Email address is invalid.')
-
     @classmethod
     def from_git(cls, git):
         """Create an instance from a Git repo."""
@@ -129,18 +104,6 @@ def from_git(cls, git):
 
         return cls(name=name, email=email)
 
-    @classmethod
-    def from_commit(cls, commit):
-        """Create an instance from a Git commit."""
-        return cls(name=commit.author.name, email=commit.author.email)
-
-    @_id.default
-    def default_id(self):
-        """Set the default id."""
-        if self.email:
-            return 'mailto:{email}'.format(email=self.email)
-        return '_:{}'.format(str(uuid.uuid4()))
-
     def __attrs_post_init__(self):
         """Finish object initialization."""
         # handle the case where ids were improperly set

renku/core/models/provenance/agents.py

@@ -18,6 +18,7 @@
 """Represent provenance agents."""
 
 import re
+import uuid
 
 from renku.core.models import jsonld as jsonld
 from renku.version import __version__, version_url
@@ -38,21 +39,31 @@
 class Person:
     """Represent a person."""
 
-    name = jsonld.ib(context='rdfs:label')
-    email = jsonld.ib(context='schema:email')
+    name = jsonld.ib(context='schema:name')
+    email = jsonld.ib(context='schema:email', default=None, kw_only=True)
+    label = jsonld.ib(context='rdfs:label', kw_only=True)
 
-    _id = jsonld.ib(context='@id', init=False, kw_only=True)
+    _id = jsonld.ib(context='@id', kw_only=True)
 
     @_id.default
     def default_id(self):
-        """Configure calculated ID."""
-        return 'mailto:{0}'.format(self.email)
+        """Set the default id."""
+        if self.email:
+            return 'mailto:{email}'.format(email=self.email)
+        return '_:{}'.format(str(uuid.uuid4()))
 
     @email.validator
     def check_email(self, attribute, value):
         """Check that the email is valid."""
-        if not (isinstance(value, str) and re.match(r'[^@]+@[^@]+', value)):
-            raise ValueError('Email address "{0}" is invalid.'.format(value))
+        if self.email and not (
+            isinstance(value, str) and re.match(r'[^@]+@[^@]+\.[^@]+', value)
+        ):
+            raise ValueError('Email address is invalid.')
+
+    @label.default
+    def default_label(self):
+        """Set the default label."""
+        return self.name
 
     @classmethod
     def from_commit(cls, commit):