fix the merge

NREL · Apr 12, 2024 · a128823 · a128823
1 parent 5fe5285
commit a128823
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 217 deletions.
diff --git a/buildingmotif/api/views/model.py b/buildingmotif/api/views/model.py
@@ -164,7 +164,6 @@ def validate_model(models_id: int) -> flask.Response:
         return {"message": f"No model with id {models_id}"}, status.HTTP_404_NOT_FOUND
 
     shape_collections = []
-    shacl_engine = None
 
     # no body provided -- default to model manifest and default SHACL engine
     if request.content_length is None:
@@ -197,12 +196,9 @@ def validate_model(models_id: int) -> flask.Response:
                 "message": f"Libraries with ids {nonexistent_libraries} do not exist"
             }, status.HTTP_400_BAD_REQUEST
 
-        # get shacl engine if it is provided
-        shacl_engine = body.get("shacl_engine", None)
-
     # if shape_collections is empty, model.validate will default
     # to the model's manifest
-    vaildation_context = model.validate(shape_collections, engine=shacl_engine)
+    vaildation_context = model.validate(shape_collections)
 
     return {
         "message": vaildation_context.report_string,

diff --git a/buildingmotif/dataclasses/library.py b/buildingmotif/dataclasses/library.py
@@ -248,7 +248,7 @@ def _load_from_ontology(
         # expand the ontology graph before we insert it into the database. This will ensure
         # that the output of compiled models will not contain triples that really belong to
         # the ontology
-        ontology = shacl_inference(ontology)
+        ontology = shacl_inference(ontology, engine=get_building_motif().shacl_engine)
 
         lib = cls.create(ontology_name, overwrite=overwrite)
 

diff --git a/buildingmotif/progressive_creation.py b/buildingmotif/progressive_creation.py
diff --git a/tests/unit/fixtures/template-inline-test/1.yml b/tests/unit/fixtures/template-inline-test/1.yml
diff --git a/tests/unit/test_generate_template_progression.py b/tests/unit/test_generate_template_progression.py