ASHRAE Guideline 36, Section 4

.github/workflows/ci.yml

@@ -103,6 +103,8 @@ jobs:
         run: poetry install --all-extras
       - name: integration tests
         run: poetry run pytest tests/integration
+      - name: library tests
+        run: poetry run pytest tests/library
       - name: bacnet tests
         run: |
           cd tests/integration/fixtures/bacnet

buildingmotif/api/views/model.py

@@ -255,7 +255,7 @@ def validate_shape(models_id: int) -> flask.Response:
     target_class = URIRef(body.get("target_class"))
 
     # test
-    conformance = model.test_model_against_shapes(
+    conformance = model.validate_model_against_shapes(
         shape_collections=shape_collections,
         shapes_to_test=shape_uris,
         target_class=target_class,

buildingmotif/dataclasses/model.py

@@ -229,7 +229,7 @@ def compile(self, shape_collections: List["ShapeCollection"]):
             model_graph, ontology_graph, engine=self._bm.shacl_engine
         )
 
-    def test_model_against_shapes(
+    def validate_model_against_shapes(
         self,
         shape_collections: List["ShapeCollection"],
         shapes_to_test: List[rdflib.URIRef],
@@ -250,7 +250,10 @@ def test_model_against_shapes(
         """
         ontology_graph = rdflib.Graph()
         for shape_collection in shape_collections:
-            ontology_graph += shape_collection.graph
+            ontology_graph += shape_collection.resolve_imports(
+                error_on_missing_imports=False
+            ).graph
+        ontology_graph.remove((None, OWL.imports, None))
 
         model_graph = copy_graph(self.graph)