handle rdfs subclassof in template construction

Author: gtfierro

buildingmotif/utils.py

@@ -14,7 +14,7 @@
 from rdflib.term import Node
 
 from buildingmotif.database.errors import TemplateNotFound
-from buildingmotif.namespaces import OWL, PARAM, RDF, SH, XSD, bind_prefixes
+from buildingmotif.namespaces import OWL, PARAM, RDF, RDFS, SH, XSD, bind_prefixes
 
 if TYPE_CHECKING:
     from buildingmotif.dataclasses import Library, Template
@@ -224,6 +224,7 @@ def get_template_parts_from_shape(
     - sh:property with sh:qualifiedMinCount
     - sh:class
     - sh:node
+    - rdfs:subClassOf
 
     :param shape_name: name of shape
     :type shape_name: URIRef
@@ -297,6 +298,16 @@ def process_shape(shape_node: Node, focus_param: URIRef):
             if isinstance(cls, URIRef):
                 body.add((focus_param, RDF.type, cls))
 
+        superclass_nodes: Set[Node] = set()
+        for graph in [shape_graph, *depedency_graphs.values()]:
+            superclass_nodes.update(graph.objects(shape_node, RDFS["subClassOf"]))
+
+        for superclass in superclass_nodes:
+            if isinstance(superclass, URIRef) and is_nodeshape(superclass):
+                add_dependency(superclass, focus_param)
+            elif isinstance(superclass, URIRef):
+                body.add((focus_param, RDF.type, superclass))
+
         for node_shape in shape_graph.objects(shape_node, SH["node"]):
             if isinstance(node_shape, URIRef):
                 add_dependency(node_shape, focus_param)

tests/unit/test_utils.py

@@ -79,6 +79,27 @@ def test_get_template_parts_from_shape():
     # assert (PARAM['name'], BRICK.hasPoint,
 
 
+def test_get_template_parts_from_shape_rdfs_subclass():
+    shape_graph = Graph()
+    shape_graph.parse(
+        data=PREAMBLE
+        + """
+    :parentShape a owl:Class, sh:NodeShape .
+
+    :childShape a owl:Class, sh:NodeShape ;
+        rdfs:subClassOf :parentShape, brick:Equipment .
+    """
+    )
+
+    body, deps = get_template_parts_from_shape(MODEL["childShape"], shape_graph)
+
+    assert len(deps) == 1
+    assert deps[0]["template"] == str(MODEL["parentShape"])
+    assert deps[0]["args"] == {"name": PARAM["name"]}
+    assert (PARAM["name"], A, MODEL["parentShape"]) in body
+    assert (PARAM["name"], A, BRICK.Equipment) in body
+
+
 def test_replace_nodes():
     g = Graph()
     g.parse(