fix(core): fix metadata to match RFC and properly format wasDerivedFrom (#3166)

Author: Panaetius

renku/command/schema/composite_plan.py

@@ -42,7 +42,7 @@ class Meta:
     invalidated_at = fields.DateTime(prov.invalidatedAtTime, format="iso")
     keywords = fields.List(schema.keywords, fields.String(), load_default=None)
     name = fields.String(schema.name, load_default=None)
-    derived_from = fields.String(prov.wasDerivedFrom, load_default=None)
+    derived_from = fields.IRI(prov.wasDerivedFrom, load_default=None)
     project_id = fields.IRI(renku.hasPlan, reverse=True)
     plans = Nested(renku.hasSubprocess, [PlanSchema, "CompositePlanSchema"], many=True)
     links = Nested(renku.workflowLinks, [ParameterLinkSchema], many=True, load_default=None)

renku/command/schema/plan.py

@@ -35,7 +35,7 @@ class PlanSchema(JsonLDSchema):
     class Meta:
         """Meta class."""
 
-        rdf_type = [prov.Plan, schema.Action, schema.CreativeWork]
+        rdf_type = [prov.Plan, schema.Action, schema.CreativeWork, renku.Plan]
         model = Plan
         unknown = marshmallow.EXCLUDE
 
@@ -47,7 +47,7 @@ class Meta:
     invalidated_at = fields.DateTime(prov.invalidatedAtTime, format="iso")
     keywords = fields.List(schema.keywords, fields.String(), load_default=None)
     name = fields.String(schema.name, load_default=None)
-    derived_from = fields.String(prov.wasDerivedFrom, load_default=None)
+    derived_from = fields.IRI(prov.wasDerivedFrom, load_default=None)
     project_id = fields.IRI(renku.hasPlan, reverse=True)
     outputs = Nested(renku.hasOutputs, CommandOutputSchema, many=True, load_default=None)
     parameters = Nested(renku.hasArguments, CommandParameterSchema, many=True, load_default=None)

renku/data/shacl_shape.json

@@ -983,7 +983,7 @@
             }
          ],
          "closed": false,
-         "targetClass": "prov:Plan",
+         "targetClass": "renku:Plan",
          "property": [
             {
                "nodeKind": "sh:Literal",

tests/core/commands/test_graph.py

@@ -168,6 +168,7 @@ def input_objects(request, dataset_model, activity_model, plan_model):
                         "http://schema.org/Action",
                         "http://schema.org/CreativeWork",
                         "http://www.w3.org/ns/prov#Plan",
+                        "https://swissdatasciencecenter.github.io/renku-ontology#Plan",
                     ],
                     "http://schema.org/dateCreated": [{"@value": "2022-07-12T16:29:14+02:00"}],
                     "http://schema.org/keywords": [],
@@ -204,6 +205,7 @@ def input_objects(request, dataset_model, activity_model, plan_model):
                         "http://schema.org/Action",
                         "http://schema.org/CreativeWork",
                         "http://www.w3.org/ns/prov#Plan",
+                        "https://swissdatasciencecenter.github.io/renku-ontology#Plan",
                     ],
                     "http://schema.org/dateCreated": [{"@value": "2022-07-12T16:29:14+02:00"}],
                     "http://schema.org/keywords": [],
@@ -336,7 +338,12 @@ def test_graph_export_full():
         },
         {
             "@id": "/plans/abcdefg123456",
-            "@type": ["http://schema.org/Action", "http://schema.org/CreativeWork", "http://www.w3.org/ns/prov#Plan"],
+            "@type": [
+                "http://schema.org/Action",
+                "http://schema.org/CreativeWork",
+                "http://www.w3.org/ns/prov#Plan",
+                "https://swissdatasciencecenter.github.io/renku-ontology#Plan",
+            ],
             "http://schema.org/dateCreated": [{"@value": "2022-07-12T16:29:14+02:00"}],
             "http://schema.org/keywords": [],
             "http://schema.org/name": [{"@value": "echo"}],