Skip to content

Commit

Permalink
deploy: bacb91d
Browse files Browse the repository at this point in the history
  • Loading branch information
@gtfierro
gtfierro committed Mar 17, 2024
1 parent 819a940 commit aab06c7
Show file tree
Hide file tree
Showing 31 changed files with 1,387 additions and 1,216 deletions.
Binary file modified .doctrees/environment.pickle
View file
Binary file not shown.
Binary file modified .doctrees/explanations/shapes-and-templates.doctree
View file
Binary file not shown.
Binary file modified .doctrees/guides/generating-queries.doctree
View file
Binary file not shown.
Binary file modified .doctrees/guides/ingress-bacnet-to-brick.doctree
View file
Binary file not shown.
Binary file modified .doctrees/reference/apidoc/_autosummary/buildingmotif.dataclasses.model.doctree
View file
Binary file not shown.
Binary file modified .doctrees/reference/apidoc/_autosummary/buildingmotif.dataclasses.validation.doctree
View file
Binary file not shown.
Binary file modified .doctrees/reference/apidoc/_autosummary/buildingmotif.utils.doctree
View file
Binary file not shown.
Binary file modified .doctrees/tutorials/model_correction.doctree
View file
Binary file not shown.
Binary file modified .doctrees/tutorials/model_creation.doctree
View file
Binary file not shown.
Binary file modified .doctrees/tutorials/model_validation.doctree
View file
Binary file not shown.
10 changes: 7 additions & 3 deletions _modules/buildingmotif/api/views/model.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -566,8 +566,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>
Expand Down Expand Up @@ -598,15 +599,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>
Expand Down
13 changes: 3 additions & 10 deletions _modules/buildingmotif/dataclasses/library.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,6 @@ <h1>Source code for buildingmotif.dataclasses.library</h1><div class="highlight"
<span class="kn">from</span> <span class="nn">typing</span> <span class="kn">import</span> <span class="n">TYPE_CHECKING</span><span class="p">,</span> <span class="n">Any</span><span class="p">,</span> <span class="n">Dict</span><span class="p">,</span> <span class="n">List</span><span class="p">,</span> <span class="n">Mapping</span><span class="p">,</span> <span class="n">Optional</span><span class="p">,</span> <span class="n">Union</span>

<span class="kn">import</span> <span class="nn">pygit2</span>
<span class="kn">import</span> <span class="nn">pyshacl</span>
<span class="kn">import</span> <span class="nn">rdflib</span>
<span class="kn">import</span> <span class="nn">sqlalchemy</span>
<span class="kn">import</span> <span class="nn">yaml</span>
Expand All @@ -425,6 +424,7 @@ <h1>Source code for buildingmotif.dataclasses.library</h1><div class="highlight"
<span class="kn">from</span> <span class="nn">buildingmotif.utils</span> <span class="kn">import</span> <span class="p">(</span>
<span class="n">get_ontology_files</span><span class="p">,</span>
<span class="n">get_template_parts_from_shape</span><span class="p">,</span>
<span class="n">shacl_inference</span><span class="p">,</span>
<span class="n">skip_uri</span><span class="p">,</span>
<span class="p">)</span>

Expand Down Expand Up @@ -650,15 +650,7 @@ <h1>Source code for buildingmotif.dataclasses.library</h1><div class="highlight"
<span class="c1"># expand the ontology graph before we insert it into the database. This will ensure</span>
<span class="c1"># that the output of compiled models will not contain triples that really belong to</span>
<span class="c1"># the ontology</span>
<span class="n">pyshacl</span><span class="o">.</span><span class="n">validate</span><span class="p">(</span>
<span class="n">data_graph</span><span class="o">=</span><span class="n">ontology</span><span class="p">,</span>
<span class="n">shacl_graph</span><span class="o">=</span><span class="n">ontology</span><span class="p">,</span>
<span class="n">ont_graph</span><span class="o">=</span><span class="n">ontology</span><span class="p">,</span>
<span class="n">advanced</span><span class="o">=</span><span class="kc">True</span><span class="p">,</span>
<span class="n">inplace</span><span class="o">=</span><span class="kc">True</span><span class="p">,</span>
<span class="n">js</span><span class="o">=</span><span class="kc">True</span><span class="p">,</span>
<span class="n">allow_warnings</span><span class="o">=</span><span class="kc">True</span><span class="p">,</span>
<span class="p">)</span>
<span class="n">ontology</span> <span class="o">=</span> <span class="n">shacl_inference</span><span class="p">(</span><span class="n">ontology</span><span class="p">)</span>

<span class="n">lib</span> <span class="o">=</span> <span class="bp">cls</span><span class="o">.</span><span class="n">create</span><span class="p">(</span><span class="n">ontology_name</span><span class="p">,</span> <span class="n">overwrite</span><span class="o">=</span><span class="n">overwrite</span><span class="p">)</span>

Expand Down Expand Up @@ -686,6 +678,7 @@ <h1>Source code for buildingmotif.dataclasses.library</h1><div class="highlight"
<span class="n">dependency_cache</span><span class="p">:</span> <span class="n">Dict</span><span class="p">[</span><span class="nb">int</span><span class="p">,</span> <span class="n">List</span><span class="p">[</span><span class="n">Dict</span><span class="p">[</span><span class="n">Any</span><span class="p">,</span> <span class="n">Any</span><span class="p">]]]</span> <span class="o">=</span> <span class="p">{}</span>
<span class="k">for</span> <span class="n">candidate</span> <span class="ow">in</span> <span class="n">candidates</span><span class="p">:</span>
<span class="k">assert</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">candidate</span><span class="p">,</span> <span class="n">rdflib</span><span class="o">.</span><span class="n">URIRef</span><span class="p">)</span>
<span class="c1"># TODO: mincount 0 (or unspecified) should be optional args on the generated template</span>
<span class="n">partial_body</span><span class="p">,</span> <span class="n">deps</span> <span class="o">=</span> <span class="n">get_template_parts_from_shape</span><span class="p">(</span><span class="n">candidate</span><span class="p">,</span> <span class="n">graph</span><span class="p">)</span>
<span class="n">templ</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">create_template</span><span class="p">(</span><span class="nb">str</span><span class="p">(</span><span class="n">candidate</span><span class="p">),</span> <span class="n">partial_body</span><span class="p">)</span>
<span class="n">dependency_cache</span><span class="p">[</span><span class="n">templ</span><span class="o">.</span><span class="n">id</span><span class="p">]</span> <span class="o">=</span> <span class="n">deps</span>
Expand Down
Loading

0 comments on commit aab06c7

Please sign in to comment.