Ballot 4

examples/core-data-product-extensions/README.md

@@ -78,7 +78,7 @@ Below is an example of a Data Product with an associated Data Product Agreement
       },
       "ex:iSubjectToAgreement": {
         "@id": "ex:VVSimpleAgreement",
-        "@type": "ex:DataProductagreement"
+        "@type": "ex:DataProductAgreement"
       }
     }
   ],

examples/data-rights/README.md

@@ -12,18 +12,21 @@ examplePolicyA odrl:target exampleProduct:ProductA .
 examplePolicyB odrl:target exampleDataset:DatasetA1 .
 ```
 
-An example of a policy follows, that describes permission to distribute the data only within a specific geographic region:
+An example of an agreement follows, that describes permission to use all the datasets of the product if the user is working inside EMEA or APAC:
 
 ```json
 examplePolicyA odrl:permission
    {
-    "action": "odrl:distribute",
-    "constraint": [
-       {"leftOperand": "spatial",
-         "operator": "eq",
-        "rightOperator": "region:EMEA"
-       }
-     ]
+    "action": "odrl:use",
+    "assignee": {
+      "@type": "odrl:PartyCollection",
+      "refinement": [
+        {"leftOperand": "odrl:spatial",
+         "operator": "odrl:isAnyOf",
+         "rightOperand": ["reg:EMEA", "reg:APAC"]
+        }
+      ]
     }
+   }
  ```
 

examples/data-rights/example.jsonld

@@ -1,30 +1,31 @@
 {
-  "@type": "Offer",
+  "@type": "Agreement",
   "@context": [
     {
       "odrl": "http://www.w3.org/ns/odrl/2/",
       "reg": "https://www.region.taxonomy/v/1/"
     }
   ],
   "uid": "56456df-dfg-34535345-5545",
-  "assigner": "https://schema.org/person/AdamSmith",
-  "target": "https://data.org/data-product/equity-trade-xxx",
 
   "permission": [
     {
-      "action": "odrl:read",
-      "constraint": [
-        {
-          "@type": "odrl:Constraint",
-          "leftOperand": "odrl:spatial",
-          "operator": "odrl:isAnyOf",
-          "rightOperand": [
-            "reg:EMEA",
-            "reg:APAC"
-          ],
-          "description": " Permission to read all the datasets of the product if user is working inside EMEA or APAC"
-        }
-      ]
+      "target": "https://data.org/data-product/equity-trade-xxx",
+      "assigner": "https://schema.org/person/AdamSmith",
+      "assignee": {
+         "@type": "PartyCollection",
+         "source":  "https://example.org/DataDepartment",
+         "refinement": [{
+             "leftOperand": "odrl:spatial",
+             "operator": "odrl:isAnyOf",
+             "rightOperand": [
+                "reg:EMEA",
+                "reg:APAC"
+             ],
+             "description": " Permission to read all the datasets of the product if user is working inside EMEA or APAC"
+         }]
+      },
+      "action": "odrl:use",
     }
   ]
 }

ontology/dprod/dprod-ontology.ttl

@@ -54,7 +54,7 @@ dprod:DataProduct
 dprod:DataProductLifecycleStatus
   a owl:Class, rdfs:Class ;
   dct:description
-    "The development status of the data product taken from a controlled list (e.g. Ideation, Design, Build, Deploy, Consume)."@en ;
+    "The development status of the data product taken from a controlled list (e.g. Ideation, Design, Build, Deploy, Consume, Retire)."@en ;
   rdfs:comment "The lifecycle of the data product as defined by EDM Council CDMC"@en ;
   rdfs:isDefinedBy dprod: ;
   rdfs:label "data product lifecycle status" ;
@@ -78,13 +78,6 @@ dprod:Enumeration
   rdfs:label "enumeration" ;
 .
 
-dprod:Protocol
-  a owl:Class, rdfs:Class ;
-  dct:description "A detailed specification, possibly including a specific version, for how to communicate with a service."@en ;
-  rdfs:isDefinedBy dprod: ;
-  rdfs:label "protocol" ;
-.
-
 dprod:SecuritySchemaType
   a owl:Class, rdfs:Class ;
   dct:description "A classification encompassing a set of rules used for authentication and communication."@en ;
@@ -211,7 +204,7 @@ dprod:protocol
   dct:description "A protocol (possibly one of many options) used to communicate with this data service."@en ;
   rdfs:isDefinedBy dprod: ;
   rdfs:domain dcat:DataService ;
-# rdfs:range rdf:resource ; # better let user decide whether they want Protocol class or own class or skos
+# rdfs:range not specified; users reference external URIs or SKOS concepts (DPROD-33)
   rdfs:label "protocol" ;
 .
 
@@ -221,5 +214,5 @@ dprod:securitySchemaType
   rdfs:isDefinedBy dprod: ;
   rdfs:domain dcat:DataService ;
 # rdfs:range rdf:resource ; # better let user decide whether they want SecuritySchemaType class or own class or skos
-  rdf:label "security schema type" ;
+  rdfs:label "security schema type" ;
 .

ontology/dprod/dprod-shapes.ttl

@@ -17,7 +17,6 @@
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix sh: <http://www.w3.org/ns/shacl#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix sdo: <http://schema.org/> .
 
 dprod-shapes:
   a owl:Ontology ;
@@ -125,19 +124,11 @@ dprod-shapes:InformationSensitivityClassificationShape
 dprod-shapes:DataProductLifecycleStatusShape
     a sh:NodeShape;
     rdfs:label "data product lifecycle status shape" ;
-    dct:description "The development status of the data product taken from a controlled list (e.g. Ideation, Design, Build, Deploy, Consume)."@en ;
+    dct:description "The development status of the data product taken from a controlled list (e.g. Ideation, Design, Build, Deploy, Consume, Retire)."@en ;
     sh:targetClass dprod:DataProductLifecycleStatus;
     rdfs:isDefinedBy dprod-shapes:;
   .
 
-dprod-shapes:ProtocolShape
-    a sh:NodeShape;
-    rdfs:label "protocol shape" ;
-    dct:description "A detailed specification, possibly including a specific version, for how to communicate with a service."@en ;
-    rdfs:isDefinedBy dprod-shapes:;
-    sh:targetClass dprod:Protocol;
-.
-
 dprod-shapes:SecuritySchemaTypeShape
     a sh:NodeShape;
     rdfs:label "security schema type shape" ;
@@ -362,7 +353,6 @@ dprod-shapes:DataService-protocol
   a sh:PropertyShape;
   rdfs:isDefinedBy dprod-shapes:;
   sh:path dprod:protocol;
-  sh:class dcat:Protocol;
   dct:description "A protocol (possibly one of many options) used to communicate with this data service."@en ;
   rdfs:label "data service protocol shape" ;
   .
@@ -371,7 +361,7 @@ dprod-shapes:DataService-securitySchemaType
   a sh:PropertyShape;
   rdfs:isDefinedBy dprod-shapes:;
   sh:path dprod:securitySchemaType;
-  sh:class dcat:SecuritySchemaType;
+  sh:class dprod:SecuritySchemaType;
   dct:description "The security schema type used for authentication and communication with this Data Service."@en ;
   rdfs:label "data service security schema type shape" ;
   .

respec/template.html

@@ -596,6 +596,15 @@ <h2>Normative namespaces</h2>
       </td>
       <td>[[dprod]]</td>
     </tr>
+    <tr>
+      <td>
+        <code>dprod-shapes</code>
+      </td>
+      <td>
+        <code>https://ekgf.github.io/dprod/shapes/</code>
+      </td>
+      <td>[[dprod]]</td>
+    </tr>
     <tr>
       <td>
         <code>dcat</code>
@@ -807,6 +816,17 @@ <h2>Data Product (DPROD) Model</h2>
   {% for cls in classes %}
   <section>
     <h3 id="{{cls.html_id()}}">{{cls.name}}</h3>
+    <table class="def classdef">
+      <tbody>
+        <tr>
+          <th>Identifier:</th>
+          <td>
+            <!--suppress HtmlUnknownTarget -->
+            <a href="{{cls.href()}}">{{cls.axiom_iri_normalized}}</a>
+          </td>
+        </tr>
+      </tbody>
+    </table>
     {% if cls.description is not none %}
     <p>{{cls.description}}</p>
     {% endif %}

spec-generator/globals.py

@@ -13,6 +13,7 @@
 
 IGNORED_NODE_SHAPE_PREDICATES = (
     RDF.type,
+    RDFS.label,
     RDFS.isDefinedBy,
     SKOS.altLabel,
     SKOS.changeNote,

spec-generator/main.py

@@ -47,7 +47,6 @@ def main():
         'Dataset',
         'DataProductLifecycleStatus',
         'InformationSensitivityClassification',
-        'Protocol',
         'SecuritySchemaType',
         'Enumeration'
     ])

spec-generator/node_shape.py

@@ -3,7 +3,7 @@
 from rdflib import URIRef, Graph, SH, DCTERMS, Literal, RDFS
 
 from functions import short_name, null_html_string, cast_to_uri_ref
-from globals import IGNORED_NODE_SHAPE_PREDICATES, shapes_graph_ns_iri
+from globals import IGNORED_NODE_SHAPE_PREDICATES, ontology_namespace_iri, shapes_graph_ns_iri
 
 
 @dataclass(init=False)
@@ -25,6 +25,7 @@ def __init__(self, g: Graph, **kwargs):
         self.axiom_iri = cast_to_uri_ref(g.value(self.shape_iri, SH.targetClass))
         if self.axiom_iri is None:
             raise ValueError("No sh:axiom_iri provided for NodeShape")
+        self.axiom_iri_normalized = g.namespace_manager.normalizeUri(self.axiom_iri)
         # First load the properties of the OWL target class
         for rdf_predicate, rdf_object in g.predicate_objects(self.axiom_iri):
             self._set_prop(g, rdf_predicate, rdf_object, 'OWL')
@@ -85,3 +86,12 @@ def html_id(self) -> str | None:
         if self.shape_iri.__contains__(shapes_graph_ns_iri):
             return self.shape_iri.replace(shapes_graph_ns_iri, '').lower()
         return self.name.lower()
+
+    def href(self) -> str:
+        """Return the href value for the class's canonical identifier.
+        For DPROD-local classes this points back to the in-page section
+        (consistent with PropertyShape.href); for external classes such as
+        dcat:DataService it points to the defining vocabulary."""
+        if self.axiom_iri.__contains__(ontology_namespace_iri):
+            return f"#{self.html_id()}"
+        return str(self.axiom_iri)