Add property inheritance to simplify st:module template

tetras_extraction/macao_12/macao_schema.ttl

@@ -59,7 +59,7 @@
 
 ###  http://www.semanticweb.org/eliott/ontologies/2024/4/macao/contientSousPartie
 :contientSousPartie rdf:type owl:ObjectProperty ;
-                    rdfs:subPropertyOf :contient ;
+                    rdfs:subPropertyOf :contientModule ;
                     rdfs:domain :Module ;
                     rdfs:range :SousPartie .
 
@@ -224,7 +224,7 @@
 
 ###  http://www.semanticweb.org/eliott/ontologies/2024/4/macao/SousPartie
 :SousPartie rdf:type owl:Class ;
-            rdfs:subClassOf :MacaoContenu .
+            rdfs:subClassOf :Module .
 
 
 #################################################################

tetras_extraction/macao_12/script/src/transform.py

@@ -51,6 +51,7 @@ def main():
     """
     construct_while(graph, q_transitive_subclass)
 
+    # Apply type inheritance (rdfs:subClassOf)
     log.info("Adding supertypes...")
     construct_while(
         graph,
@@ -64,6 +65,21 @@ def main():
         """,
     )
 
+    # Apply property inheritance (rdfs:subPropertyOf)
+    log.info("Adding super-properties...")
+    construct_while(
+        graph,
+        """
+        CONSTRUCT {
+            ?subj ?superprop ?obj
+        } WHERE {
+            ?subj ?prop ?obj .
+            ?prop rdfs:subPropertyOf ?superprop .
+            FILTER(?superprop != owl:topDataProperty)
+        }
+        """,
+    )
+
     # ==> Save
     # Remove dependency on previous ontologies
     for ontology in graph.subjects(RDF.type, OWL.Ontology):

tetras_extraction/macao_12/script/templates/module.rq

@@ -2,6 +2,8 @@ PREFIX : <http://www.semanticweb.org/eliott/ontologies/2024/4/macao/>
 PREFIX mt: <http://www.semanticweb.org/eliott/ontologies/2024/4/macao/template/>
 PREFIX st: <http://ns.inria.fr/sparql-template/>
 
+# Recursive template for Modules and SousParties (because SousParties are just
+# leaf-level modules)
 template mt:module(?mod) {
     mt:start_marker(?mod) "/_index.md" st:nl()
     
@@ -12,13 +14,12 @@ template mt:module(?mod) {
         st:call-template(mt:activite, ?child_act) ; separator=''
     }
 } where {
-    { ?mod a :Module } union { ?mod a :SousPartie } .
-    ?mod :titre ?title .
-    
+    ?mod a :Module
     optional {
-        { ?mod :contientModule ?child } union { ?mod :contientSousPartie ?child }
+        ?mod :contientModule ?child
     }
     optional {
+        ?mod a :SousPartie .
         ?mod :contientActivite ?child_act
     }
 }

tetras_extraction/macao_12/script/templates/path.rq

@@ -9,7 +9,7 @@ template mt:path(?obj) {
     ?obj a :MacaoContenu .
     ?obj :id ?id
     optional {
-        { ?parent :contientActivite ?obj } union {?parent :contientModule ?obj} union {?parent :contientSousPartie ?obj}.
+        { ?parent :contientActivite ?obj } union {?parent :contientModule ?obj} .
         bind(st:call-template(mt:path, ?parent) as ?rec)
     }
 }
\ No newline at end of file