hotfix: datasetfile dates (#673)

* Changes datasetfile's added date to get parsed as datetime with timezone

* Puts datetime logic into utils and make Project dates load as datetime

* test: added migration support and test

Author: Panaetius

renku/models/datasets.py

@@ -25,11 +25,11 @@
 
 import attr
 from attr.validators import instance_of
-from dateutil.parser import parse as parse_date
 
 from renku import errors
 from renku._compat import Path
 from renku.models.provenance.entities import Entity
+from renku.utils.datetime8601 import parse_date
 from renku.utils.doi import is_doi
 
 from . import _jsonld as jsonld
@@ -193,7 +193,9 @@ class DatasetFile(Entity, CreatorsMixin):
         context='schema:creator'
     )
 
-    added = jsonld.ib(context='schema:dateCreated', kw_only=True)
+    added = jsonld.ib(
+        converter=parse_date, context='schema:dateCreated', kw_only=True
+    )
 
     checksum = attr.ib(default=None, kw_only=True)
 
@@ -241,13 +243,6 @@ def __attrs_post_init__(self):
             self.name = self.filename
 
 
-def _parse_date(value):
-    """Convert date to datetime."""
-    if isinstance(value, datetime.datetime):
-        return value
-    return parse_date(value)
-
-
 def _convert_dataset_files(value):
     """Convert dataset files."""
     coll = value
@@ -357,7 +352,7 @@ class Dataset(Entity, CreatorsMixin):
     version = jsonld.ib(default=None, context='schema:version', kw_only=True)
 
     created = jsonld.ib(
-        converter=_parse_date, context='schema:dateCreated', kw_only=True
+        converter=parse_date, context='schema:dateCreated', kw_only=True
     )
 
     files = jsonld.container.list(

renku/models/projects.py

@@ -19,6 +19,10 @@
 
 import datetime
 
+import pytz
+
+from renku.utils.datetime8601 import parse_date
+
 from . import _jsonld as jsonld
 from ._datastructures import Collection
 
@@ -38,8 +42,14 @@ class Project(object):
     """Represent a project."""
 
     name = jsonld.ib(default=None, context='foaf:name')
-    created = jsonld.ib(context='http://schema.org/dateCreated', )
-    updated = jsonld.ib(context='http://schema.org/dateUpdated', )
+    created = jsonld.ib(
+        converter=parse_date,
+        context='http://schema.org/dateCreated',
+    )
+    updated = jsonld.ib(
+        converter=parse_date,
+        context='http://schema.org/dateUpdated',
+    )
     version = jsonld.ib(
         converter=str,
         default='1',
@@ -52,6 +62,14 @@ def _now(self):
         """Define default value for datetime fields."""
         return datetime.datetime.now(datetime.timezone.utc)
 
+    def __attrs_post_init__(self):
+        """Initialize computed attributes."""
+        if self.created and self.created.tzinfo is None:
+            self.created = pytz.utc.localize(self.created)
+
+        if self.updated and self.updated.tzinfo is None:
+            self.updated = pytz.utc.localize(self.updated)
+
 
 class ProjectCollection(Collection):
     """Represent projects on the server.

renku/utils/datetime8601.py

@@ -16,8 +16,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 """Renku datetime utilities."""
+import datetime
 import re
 
+from dateutil.parser import parse as dateutil_parse_date
+
 regex = (
     r'^(-?(?:[1-9][0-9]*)?[0-9]{4})-(1[0-2]|0[1-9])-(3[01]|0[1-9]|[12]['
     r'0-9])T(2[0-3]|[01][0-9]):([0-5][0-9]):([0-5][0-9])(\.[0-9]+)?(Z|['
@@ -34,3 +37,16 @@ def validate_iso8601(str_val):
     except re.error:
         pass
     return False
+
+
+def parse_date(value):
+    """Convert date to datetime."""
+    if isinstance(value, datetime.datetime):
+        return value
+    date = dateutil_parse_date(value)
+    if not date.tzinfo:
+        # set timezone to local timezone
+        tz = datetime.datetime.now(datetime.timezone.utc).astimezone().tzinfo
+        date = date.replace(tzinfo=tz)
+
+    return date

tests/test_projects.py

@@ -17,7 +17,7 @@
 # limitations under the License.
 """Test projects API."""
 
-from datetime import timezone
+from datetime import datetime, timezone
 
 import yaml
 from freezegun import freeze_time
@@ -68,3 +68,14 @@ def test_project_metadata_compatibility():
 
     assert project.name == 'demo'
     assert project.version == '1'
+
+
+def test_project_datetime_loading():
+    """Check that datetime is correctly loaded."""
+    project = Project.from_jsonld(yaml.safe_load(PROJECT_V1))
+
+    assert isinstance(project.updated, datetime)
+    assert isinstance(project.created, datetime)
+
+    assert project.updated.tzinfo is not None
+    assert project.created.tzinfo is not None