refactor: rename jsonld.py to yaml.py in utils (#2818)

Author: Panaetius

renku/command/checks/validate_shacl.py

@@ -25,7 +25,7 @@
 from renku.command.schema.project import ProjectSchema
 from renku.core.interface.dataset_gateway import IDatasetGateway
 from renku.core.util.shacl import validate_graph
-from renku.domain_model.jsonld import NoDatesSafeLoader
+from renku.core.util.yaml import NoDatesSafeLoader
 
 
 def _shacl_graph_to_string(graph):

renku/core/migration/m_0003__1_jsonld.py

@@ -30,7 +30,7 @@
     get_pre_0_3_4_datasets_metadata,
     is_using_temporary_datasets_path,
 )
-from renku.domain_model.jsonld import read_yaml, write_yaml
+from renku.core.util.yaml import read_yaml, write_yaml
 
 
 def migrate(migration_context):

renku/core/migration/m_0009__new_metadata_storage.py

@@ -48,8 +48,8 @@
 )
 from renku.core.migration.utils.conversion import convert_dataset
 from renku.core.util import communication
+from renku.core.util.yaml import load_yaml
 from renku.domain_model.entity import Collection, Entity
-from renku.domain_model.jsonld import load_yaml
 from renku.domain_model.project import Project
 from renku.domain_model.provenance.activity import Activity, Association, Generation, Usage
 from renku.domain_model.provenance.agent import Person, SoftwareAgent

renku/core/migration/models/v3.py

@@ -25,8 +25,8 @@
 from renku.core.migration.models.v9 import Person as OldPerson
 from renku.core.migration.models.v9 import generate_project_id, wfprov
 from renku.core.migration.utils import OLD_METADATA_PATH, generate_dataset_tag_id, generate_url_id, get_datasets_path
+from renku.core.util import yaml
 from renku.core.util.urls import get_host
-from renku.domain_model import jsonld
 
 
 class Base:
@@ -86,7 +86,7 @@ class Project(Base):
     @classmethod
     def from_yaml(cls, path, client):
         """Read content from YAML file."""
-        data = jsonld.read_yaml(path)
+        data = yaml.read_yaml(path)
         self = ProjectSchemaV3().load(data)
 
         if not self.creator:
@@ -107,7 +107,7 @@ def to_yaml(self, path):
         self.agent_version = __version__
 
         data = ProjectSchemaV3().dump(self)
-        jsonld.write_yaml(path=path, data=data)
+        yaml.write_yaml(path=path, data=data)
 
 
 class Collection(Base):
@@ -166,7 +166,7 @@ class Dataset(Base):
     @classmethod
     def from_yaml(cls, path, client=None, commit=None):
         """Read content from YAML file."""
-        data = jsonld.read_yaml(path)
+        data = yaml.read_yaml(path)
         self = DatasetSchemaV3(client=client, commit=commit).load(data)
         self._metadata_path = path
         return self
@@ -175,7 +175,7 @@ def to_yaml(self, path=None):
         """Write content to a YAML file."""
         data = DatasetSchemaV3().dump(self)
         path = path or self._metadata_path or os.path.join(self.path, OLD_METADATA_PATH)
-        jsonld.write_yaml(path=path, data=data)
+        yaml.write_yaml(path=path, data=data)
 
 
 class PersonSchemaV3(JsonLDSchema):

renku/core/migration/models/v7.py

@@ -23,7 +23,7 @@
 
 from renku.command.schema.calamus import fields, prov, renku, schema
 from renku.core.migration.utils import OLD_METADATA_PATH, get_datasets_path
-from renku.domain_model import jsonld
+from renku.core.util import yaml
 
 from .v3 import Base, DatasetFileSchemaV3, DatasetSchemaV3, UrlSchemaV3
 
@@ -34,7 +34,7 @@ class Dataset(Base):
     @classmethod
     def from_yaml(cls, path, client=None, commit=None):
         """Read content from YAML file."""
-        data = jsonld.read_yaml(path)
+        data = yaml.read_yaml(path)
         self = DatasetSchemaV7(client=client, commit=commit).load(data)
         self._metadata_path = path
         return self
@@ -43,7 +43,7 @@ def to_yaml(self, path=None):
         """Write content to a YAML file."""
         data = DatasetSchemaV7().dump(self)
         path = path or self._metadata_path or os.path.join(self.path, OLD_METADATA_PATH)
-        jsonld.write_yaml(path=path, data=data)
+        yaml.write_yaml(path=path, data=data)
 
 
 class DatasetFileSchemaV7(DatasetFileSchemaV3):

renku/core/migration/models/v8.py

@@ -25,7 +25,7 @@
 from renku.command.schema.calamus import Uri, fields, prov, schema
 from renku.core.migration.models.v9 import generate_file_id
 from renku.core.migration.utils import OLD_METADATA_PATH, get_datasets_path
-from renku.domain_model import jsonld
+from renku.core.util import yaml
 
 from .v3 import CreatorMixinSchemaV3, DatasetTagSchemaV3, EntitySchemaV3, LanguageSchemaV3, PersonSchemaV3, UrlSchemaV3
 from .v7 import Base, DatasetFileSchemaV7
@@ -54,7 +54,7 @@ class Dataset(Base):
     @classmethod
     def from_yaml(cls, path, client=None, commit=None):
         """Read content from YAML file."""
-        data = jsonld.read_yaml(path)
+        data = yaml.read_yaml(path)
         self = DatasetSchemaV8(client=client, commit=commit, flattened=True).load(data)
         self._metadata_path = path
         return self
@@ -66,7 +66,7 @@ def to_yaml(self, path=None):
 
         data = DatasetSchemaV8(flattened=True).dump(self)
         path = path or self._metadata_path or os.path.join(self.path, OLD_METADATA_PATH)
-        jsonld.write_yaml(path=path, data=data)
+        yaml.write_yaml(path=path, data=data)
 
 
 class DatasetFileSchemaV8(DatasetFileSchemaV7):

renku/core/migration/models/v9.py

@@ -59,10 +59,10 @@
     generate_url_id,
     get_datasets_path,
 )
+from renku.core.util import yaml as yaml
 from renku.core.util.datetime8601 import fix_datetime, parse_date
 from renku.core.util.doi import extract_doi, is_doi
 from renku.core.util.urls import get_host, get_slug
-from renku.domain_model import jsonld as jsonld
 from renku.domain_model.dataset import generate_default_name
 from renku.domain_model.refs import LinkReference
 from renku.infrastructure.repository import Commit
@@ -192,7 +192,7 @@ def project_id(self):
     @classmethod
     def from_yaml(cls, path, client=None):
         """Return an instance from a YAML file."""
-        data = jsonld.read_yaml(path)
+        data = yaml.read_yaml(path)
         self = cls.from_jsonld(data=data, client=client)
         self._metadata_path = path
 
@@ -216,7 +216,7 @@ def to_yaml(self, path=None):
 
         self._metadata_path = path or self._metadata_path
         data = ProjectSchema().dump(self)
-        jsonld.write_yaml(path=self._metadata_path, data=data)
+        yaml.write_yaml(path=self._metadata_path, data=data)
 
 
 @attr.s(eq=False, order=False)
@@ -805,7 +805,7 @@ class Activity(CommitMixin):
     @classmethod
     def from_yaml(cls, path, client=None, commit=None):
         """Return an instance from a YAML file."""
-        data = jsonld.read_yaml(path)
+        data = yaml.read_yaml(path)
 
         self = cls.from_jsonld(data=data, client=client, commit=commit)
         self._metadata_path = path
@@ -1000,7 +1000,7 @@ def to_yaml(self, path=None):
         """Write an instance to the referenced YAML file."""
         self._metadata_path = path or self._metadata_path
         data = ProcessRunSchema(flattened=True).dump(self)
-        jsonld.write_yaml(path=self._metadata_path, data=data)
+        yaml.write_yaml(path=self._metadata_path, data=data)
 
 
 @attr.s(eq=False, order=False)
@@ -1740,7 +1740,7 @@ def _update_files_metadata(self, files=None):
     @classmethod
     def from_yaml(cls, path, client=None, commit=None):
         """Return an instance from a YAML file."""
-        data = jsonld.read_yaml(path)
+        data = yaml.read_yaml(path)
 
         self = cls.from_jsonld(data=data, client=client, commit=commit)
         self._metadata_path = path
@@ -1765,7 +1765,7 @@ def to_yaml(self, path=None, immutable=False):
 
         self._metadata_path = path or self._metadata_path
         data = OldDatasetSchema(flattened=True).dump(self)
-        jsonld.write_yaml(path=self._metadata_path, data=data)
+        yaml.write_yaml(path=self._metadata_path, data=data)
 
     def as_jsonld(self):
         """Create JSON-LD."""

renku/core/migration/utils/__init__.py

@@ -28,7 +28,7 @@
 import pyld
 
 from renku.core.management.client import LocalClient
-from renku.domain_model.jsonld import read_yaml
+from renku.core.util.yaml import read_yaml
 
 OLD_METADATA_PATH = "metadata.yml"
 OLD_DATASETS_PATH = "datasets"

renku/core/util/os.py

@@ -200,8 +200,8 @@ def safe_read_yaml(file: str) -> Dict[str, Any]:
         otherwise raises a ParameterError exception.
     """
     try:
-        from renku.domain_model import jsonld as jsonld
+        from renku.core.util import yaml as yaml
 
-        return jsonld.read_yaml(file)
+        return yaml.read_yaml(file)
     except Exception as e:
         raise errors.ParameterError(e)