Addressed Eli's comments on PR.

Author: EttoreM

rocrate_validator/profiles/five-safes-crate/must/10_outputs.ttl

@@ -27,22 +27,22 @@ five-safes-crate:CreateActionResultOutputsDefined
     a sh:NodeShape ;
     sh:name "CreateAction" ;
     sh:targetClass schema:CreateAction ;
-    sh:message "The result of a schema:CreateAction must be a defined node (must have an rdf:type)." ;
+    sh:message "The result of a schema:CreateAction must be a defined node (must have `@type`)." ;
     sh:property [
         sh:name "result" ;
         sh:path schema:result ;
         sh:node five-safes-crate:DefinedNodeShape ;
-        sh:description "The result of a schema:CreateAction must be a defined node (must have an rdf:type)." ;
+        sh:description "The result of a schema:CreateAction must be a defined node (must have `@type`)." ;
     ] .
 
 five-safes-crate:DefinedNodeShape
     a sh:NodeShape ;
     sh:name "DefinedNode" ;
-    sh:message "Result node is not defined in the RO-Crate (no rdf:type triple)." ;
+    sh:message "Result node is not defined in the RO-Crate (it does not have its own entry in `@graph` with a `@type` attribute defined)." ;
     sh:property [
         sh:name "type" ;
         sh:path rdf:type ;
         sh:minCount 1 ;
-        sh:message "Result node is not defined in the RO-Crate (no rdf:type triple)." ;
+        sh:message "Result node is not defined in the RO-Crate (it does not have its own entry in `@graph` with a `@type` attribute defined)." ;
         sh:severity sh:Violation ;
     ] .

rocrate_validator/profiles/five-safes-crate/should/10_outputs.ttl

@@ -51,41 +51,38 @@ five-safes-crate:CreateActionHasResultIfActionCompleted
   ] .
 
 
+five-safes-crate:CreateActionResultOutputsHaveAllowedTypes
+  a sh:NodeShape ;
+    sh:name "Output" ;
+    sh:description "Result SHOULD have a `@type` among an allowed set of values." ;
+    sh:target [
+      a sh:SPARQLTarget ;
+      sh:select """
+        PREFIX schema: <http://schema.org/>
+        SELECT ?this
+        WHERE {
+          ?createAction a schema:CreateAction .
+          ?createAction schema:result ?this .
+        }
+      """ ;
+    ] ;
+    sh:message "Result SHOULD have a `@type` among an allowed set of values." ;
+    sh:severity sh:Warning ;
+    sh:or (
+      [
+        sh:class schema:MediaObject;
+      ]
+      [
+        sh:class schema:Dataset;
+      ]
+      [
+        sh:class schema:Collection;
+      ]
+      [
+        sh:class schema:DigitalDocument;
+      ]
+      [
+        sh:class schema:PropertyValue;
+      ]
+    ) .
 
-# This test passes even when it should fail, so it is disabled for now.
-# According to Clause.ai the possible reason for this misbehaviour is that
-# the RO-Crate validator adds inferred types like schema:MediaObject to the
-# entity based on other characteristics (like it being a file). So the entity
-# has BOTH "Filexx" (which doesn't expand to a schema.org URI) AND the inferred
-#  schema:MediaObject, which makes the constraint pass.
-# The fundamental problem is that we can't easily distinguish between
-# user-declared types and validator-inferred types in the materialized RDF graph.
-
-# five-safes-crate:CreateActionResultOutputsHaveAllowedTypes
-#   a sh:NodeShape ;
-#     sh:name "Output" ;
-#     sh:target [
-#       a sh:SPARQLTarget ;
-#       sh:select """
-#         PREFIX schema: <http://schema.org/>
-#         SELECT ?this
-#         WHERE {
-#           ?createAction a schema:CreateAction .
-#           ?createAction schema:result ?this .
-#         }
-#       """ ;
-#     ] ;
-#     sh:message "Every schema:result must point to a defined node (must have an rdf:type)." ;
-#     sh:property [
-#       sh:path rdf:type ;
-#       sh:qualifiedValueShape (
-#         schema:MediaObject
-#         schema:Dataset
-#         schema:Collection
-#         schema:DigitalDocument
-#         schema:PropertyValue
-#       ) ;
-#       sh:qualifiedMinCount 1 ;
-#       sh:message "Result has a rdf:type outside the allowed set." ;
-#       sh:severity sh:Warning ;
-#     ] .

tests/integration/profiles/five-safes-crate/test_5src_10_outputs.py

@@ -79,7 +79,40 @@ def test_completed_createaction_does_not_have_result():
 
     do_entity_test(
         rocrate_path=ValidROC().five_safes_crate_request,
-        requirement_severity=Severity.REQUIRED,
+        requirement_severity=Severity.RECOMMENDED,
+        expected_validation_result=False,
+        expected_triggered_requirements=None,
+        expected_triggered_issues=None,
+        profile_identifier="five-safes-crate",
+        rocrate_entity_mod_sparql=sparql,
+    )
+
+
+def test_result_output_does_not_have_allowed_type():
+    """
+    Test a Five Safes Crate where the result output does not have a type that
+    is among those allowed.
+    (We remove the output entity and replace it with one that is of a wrong type)"""
+    sparql = (
+        SPARQL_PREFIXES
+        + """
+        DELETE {
+            ?result a ?oldType .
+        }
+        INSERT {
+            ?result a schema:Person .
+        }
+        WHERE {
+            ?action a schema:CreateAction ;
+                    schema:result ?result .
+            ?result a ?oldType .
+            }
+        """
+    )
+
+    do_entity_test(
+        rocrate_path=ValidROC().five_safes_crate_request,
+        requirement_severity=Severity.RECOMMENDED,
         expected_validation_result=False,
         expected_triggered_requirements=None,
         expected_triggered_issues=None,