new-dataset-models

renku/core/management/datasets.py

@@ -47,6 +47,7 @@
 from renku.core.management.clone import clone
 from renku.core.management.command_builder.command import replace_injected_client
 from renku.core.management.config import RENKU_HOME
+from renku.core.models.dataset import DatasetProvenance
 from renku.core.models.datasets import (
     Dataset,
     DatasetFile,
@@ -56,7 +57,6 @@
     is_dataset_name_valid,
 )
 from renku.core.models.provenance.agents import Person
-from renku.core.models.provenance.datasets import DatasetProvenance
 from renku.core.models.refs import LinkReference
 from renku.core.utils import communication
 from renku.core.utils.git import add_to_git, get_oauth_url, have_same_remote, run_command

renku/core/management/storage.py

@@ -34,8 +34,8 @@
 from renku.core import errors
 from renku.core.incubation.database import Database
 from renku.core.management.command_builder.command import inject
+from renku.core.models.dataset import DatasetProvenance
 from renku.core.models.provenance.activity import Collection
-from renku.core.models.provenance.datasets import DatasetProvenance
 from renku.core.models.provenance.provenance_graph import ProvenanceGraph
 from renku.core.utils import communication
 from renku.core.utils.file_size import parse_file_size

renku/core/models/calamus.py

@@ -19,14 +19,15 @@
 
 import copy
 import inspect
-from datetime import datetime, timezone
 
 import marshmallow
 from calamus import fields
 from calamus.schema import JsonLDSchema as CalamusJsonLDSchema
 from calamus.utils import normalize_type, normalize_value
 from marshmallow.base import SchemaABC
 
+from renku.core.utils.datetime8601 import fix_timezone
+
 prov = fields.Namespace("http://www.w3.org/ns/prov#")
 rdfs = fields.Namespace("http://www.w3.org/2000/01/rdf-schema#")
 renku = fields.Namespace("https://swissdatasciencecenter.github.io/renku-ontology#")
@@ -82,11 +83,7 @@ def _add_field_to_data(self, data, name, value):
 
     def _fix_timezone(self, value):
         """Fix timezone of non-aware datetime objects."""
-        if isinstance(value, datetime) and not value.tzinfo:
-            # set timezone to local timezone
-            tz = datetime.now(timezone.utc).astimezone().tzinfo
-            value = value.replace(tzinfo=tz)
-        return value
+        return fix_timezone(value)
 
 
 class Uri(fields._JsonLDField, marshmallow.fields.String, marshmallow.fields.Dict):