deploy: e0b0771

NREL · Mar 14, 2024 · 715fcab · 715fcab
1 parent 45eb7a7
commit 715fcab
Show file tree

Hide file tree

Showing 25 changed files with 1,239 additions and 1,229 deletions.
diff --git a/.doctrees/environment.pickle b/.doctrees/environment.pickle
diff --git a/.doctrees/explanations/shapes-and-templates.doctree b/.doctrees/explanations/shapes-and-templates.doctree
diff --git a/.doctrees/guides/generating-queries.doctree b/.doctrees/guides/generating-queries.doctree
diff --git a/.doctrees/guides/ingress-bacnet-to-brick.doctree b/.doctrees/guides/ingress-bacnet-to-brick.doctree
diff --git a/.doctrees/reference/apidoc/_autosummary/buildingmotif.dataclasses.model.doctree b/.doctrees/reference/apidoc/_autosummary/buildingmotif.dataclasses.model.doctree
diff --git a/.doctrees/reference/apidoc/_autosummary/buildingmotif.dataclasses.validation.doctree b/.doctrees/reference/apidoc/_autosummary/buildingmotif.dataclasses.validation.doctree
diff --git a/.doctrees/tutorials/model_correction.doctree b/.doctrees/tutorials/model_correction.doctree
diff --git a/.doctrees/tutorials/model_creation.doctree b/.doctrees/tutorials/model_creation.doctree
diff --git a/.doctrees/tutorials/model_validation.doctree b/.doctrees/tutorials/model_validation.doctree
diff --git a/_modules/buildingmotif/api/views/model.html b/_modules/buildingmotif/api/views/model.html
@@ -569,8 +569,9 @@ <h1>Source code for buildingmotif.api.views.model</h1><div class="highlight"><pr
         <span class="k">return</span> <span class="p">{</span><span class="s2">&quot;message&quot;</span><span class="p">:</span> <span class="sa">f</span><span class="s2">&quot;No model with id </span><span class="si">{</span><span class="n">models_id</span><span class="si">}</span><span class="s2">&quot;</span><span class="p">},</span> <span class="n">status</span><span class="o">.</span><span class="n">HTTP_404_NOT_FOUND</span>
 
     <span class="n">shape_collections</span> <span class="o">=</span> <span class="p">[]</span>
+    <span class="n">shacl_engine</span> <span class="o">=</span> <span class="kc">None</span>
 
-    <span class="c1"># no body provided -- default to model manifest</span>
+    <span class="c1"># no body provided -- default to model manifest and default SHACL engine</span>
     <span class="k">if</span> <span class="n">request</span><span class="o">.</span><span class="n">content_length</span> <span class="ow">is</span> <span class="kc">None</span><span class="p">:</span>
         <span class="n">shape_collections</span> <span class="o">=</span> <span class="p">[</span><span class="n">model</span><span class="o">.</span><span class="n">get_manifest</span><span class="p">()]</span>
     <span class="k">else</span><span class="p">:</span>
@@ -601,15 +602,18 @@ <h1>Source code for buildingmotif.api.views.model</h1><div class="highlight"><pr
                 <span class="s2">&quot;message&quot;</span><span class="p">:</span> <span class="sa">f</span><span class="s2">&quot;Libraries with ids </span><span class="si">{</span><span class="n">nonexistent_libraries</span><span class="si">}</span><span class="s2"> do not exist&quot;</span>
             <span class="p">},</span> <span class="n">status</span><span class="o">.</span><span class="n">HTTP_400_BAD_REQUEST</span>
 
+        <span class="c1"># get shacl engine if it is provided</span>
+        <span class="n">shacl_engine</span> <span class="o">=</span> <span class="n">body</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s2">&quot;shacl_engine&quot;</span><span class="p">,</span> <span class="kc">None</span><span class="p">)</span>
+
     <span class="c1"># if shape_collections is empty, model.validate will default</span>
     <span class="c1"># to the model&#39;s manifest</span>
-    <span class="n">vaildation_context</span> <span class="o">=</span> <span class="n">model</span><span class="o">.</span><span class="n">validate</span><span class="p">(</span><span class="n">shape_collections</span><span class="p">)</span>
+    <span class="n">vaildation_context</span> <span class="o">=</span> <span class="n">model</span><span class="o">.</span><span class="n">validate</span><span class="p">(</span><span class="n">shape_collections</span><span class="p">,</span> <span class="n">engine</span><span class="o">=</span><span class="n">shacl_engine</span><span class="p">)</span>
 
     <span class="k">return</span> <span class="p">{</span>
         <span class="s2">&quot;message&quot;</span><span class="p">:</span> <span class="n">vaildation_context</span><span class="o">.</span><span class="n">report_string</span><span class="p">,</span>
         <span class="s2">&quot;valid&quot;</span><span class="p">:</span> <span class="n">vaildation_context</span><span class="o">.</span><span class="n">valid</span><span class="p">,</span>
         <span class="s2">&quot;reasons&quot;</span><span class="p">:</span> <span class="p">{</span>
-            <span class="n">focus_node</span><span class="p">:</span> <span class="p">[</span><span class="n">gd</span><span class="o">.</span><span class="n">reason</span><span class="p">()</span> <span class="k">for</span> <span class="n">gd</span> <span class="ow">in</span> <span class="n">grahdiffs</span><span class="p">]</span>
+            <span class="n">focus_node</span><span class="p">:</span> <span class="nb">list</span><span class="p">(</span><span class="nb">set</span><span class="p">(</span><span class="n">gd</span><span class="o">.</span><span class="n">reason</span><span class="p">()</span> <span class="k">for</span> <span class="n">gd</span> <span class="ow">in</span> <span class="n">grahdiffs</span><span class="p">))</span>
             <span class="k">for</span> <span class="n">focus_node</span><span class="p">,</span> <span class="n">grahdiffs</span> <span class="ow">in</span> <span class="n">vaildation_context</span><span class="o">.</span><span class="n">diffset</span><span class="o">.</span><span class="n">items</span><span class="p">()</span>
         <span class="p">},</span>
     <span class="p">},</span> <span class="n">status</span><span class="o">.</span><span class="n">HTTP_200_OK</span></div>