deploy: 64d7246

_modules/buildingmotif/database/table_connection.html

@@ -862,9 +862,9 @@ <h1>Source code for buildingmotif.database.table_connection</h1><div class="high
         <span class="kn">from</span> <span class="nn">buildingmotif.dataclasses</span> <span class="kn">import</span> <span class="n">Template</span>
 
         <span class="n">templ</span> <span class="o">=</span> <span class="n">Template</span><span class="o">.</span><span class="n">load</span><span class="p">(</span><span class="n">template_id</span><span class="p">)</span>
-        <span class="n">params</span> <span class="o">=</span> <span class="n">templ</span><span class="o">.</span><span class="n">inline_dependencies</span><span class="p">()</span><span class="o">.</span><span class="n">parameters</span>
+        <span class="n">params</span> <span class="o">=</span> <span class="n">templ</span><span class="o">.</span><span class="n">transitive_parameters</span>
         <span class="n">dep_templ</span> <span class="o">=</span> <span class="n">Template</span><span class="o">.</span><span class="n">load</span><span class="p">(</span><span class="n">dependency_id</span><span class="p">)</span>
-        <span class="n">dep_params</span> <span class="o">=</span> <span class="n">dep_templ</span><span class="o">.</span><span class="n">inline_dependencies</span><span class="p">()</span><span class="o">.</span><span class="n">parameters</span>
+        <span class="n">dep_params</span> <span class="o">=</span> <span class="n">dep_templ</span><span class="o">.</span><span class="n">transitive_parameters</span>
 
         <span class="c1"># check parameters are valid</span>
         <span class="k">if</span> <span class="ow">not</span> <span class="nb">set</span><span class="p">(</span><span class="n">args</span><span class="o">.</span><span class="n">values</span><span class="p">())</span><span class="o">.</span><span class="n">issubset</span><span class="p">(</span><span class="n">params</span><span class="p">):</span>

_modules/buildingmotif/dataclasses/library.html

@@ -818,6 +818,7 @@ <h1>Source code for buildingmotif.dataclasses.library</h1><div class="highlight"
         <span class="c1"># check documentation for skip_uri for what URIs get skipped</span>
         <span class="k">if</span> <span class="n">skip_uri</span><span class="p">(</span><span class="n">dep</span><span class="p">[</span><span class="s2">&quot;template&quot;</span><span class="p">]):</span>
             <span class="k">return</span>
+
         <span class="c1"># if the dependency is not in the local cache, then search through this library&#39;s imports</span>
         <span class="c1"># for the template</span>
         <span class="k">for</span> <span class="n">imp</span> <span class="ow">in</span> <span class="bp">self</span><span class="o">.</span><span class="n">graph_imports</span><span class="p">:</span>

_modules/buildingmotif/dataclasses/template.html

@@ -640,6 +640,26 @@ <h1>Source code for buildingmotif.dataclasses.template</h1><div class="highlight
         <span class="n">replace_nodes</span><span class="p">(</span><span class="n">templ</span><span class="o">.</span><span class="n">body</span><span class="p">,</span> <span class="n">to_replace</span><span class="p">)</span>
         <span class="k">return</span> <span class="n">templ</span></div>
 
+    <span class="nd">@property</span>
+    <span class="k">def</span> <span class="nf">transitive_parameters</span><span class="p">(</span><span class="bp">self</span><span class="p">)</span> <span class="o">-&gt;</span> <span class="n">Set</span><span class="p">[</span><span class="nb">str</span><span class="p">]:</span>
+<span class="w">        </span><span class="sd">&quot;&quot;&quot;Get all parameters used in this template and its dependencies.</span>
+
+<span class="sd">        :return: set of all parameters</span>
+<span class="sd">        :rtype: Set[str]</span>
+<span class="sd">        &quot;&quot;&quot;</span>
+        <span class="n">params</span> <span class="o">=</span> <span class="nb">set</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">parameters</span><span class="p">)</span>
+        <span class="k">for</span> <span class="n">dep</span> <span class="ow">in</span> <span class="bp">self</span><span class="o">.</span><span class="n">get_dependencies</span><span class="p">():</span>
+            <span class="n">transitive_params</span> <span class="o">=</span> <span class="n">dep</span><span class="o">.</span><span class="n">template</span><span class="o">.</span><span class="n">transitive_parameters</span>
+            <span class="n">rename_params</span><span class="p">:</span> <span class="n">Dict</span><span class="p">[</span><span class="nb">str</span><span class="p">,</span> <span class="nb">str</span><span class="p">]</span> <span class="o">=</span> <span class="p">{</span>
+                <span class="n">ours</span><span class="p">:</span> <span class="n">theirs</span> <span class="k">for</span> <span class="n">ours</span><span class="p">,</span> <span class="n">theirs</span> <span class="ow">in</span> <span class="n">dep</span><span class="o">.</span><span class="n">args</span><span class="o">.</span><span class="n">items</span><span class="p">()</span>
+            <span class="p">}</span>
+            <span class="n">name_prefix</span> <span class="o">=</span> <span class="n">dep</span><span class="o">.</span><span class="n">args</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s2">&quot;name&quot;</span><span class="p">)</span>
+            <span class="k">for</span> <span class="n">param</span> <span class="ow">in</span> <span class="n">transitive_params</span><span class="p">:</span>
+                <span class="k">if</span> <span class="n">param</span> <span class="ow">not</span> <span class="ow">in</span> <span class="n">dep</span><span class="o">.</span><span class="n">args</span> <span class="ow">and</span> <span class="n">param</span> <span class="o">!=</span> <span class="s2">&quot;name&quot;</span><span class="p">:</span>
+                    <span class="n">rename_params</span><span class="p">[</span><span class="n">param</span><span class="p">]</span> <span class="o">=</span> <span class="sa">f</span><span class="s2">&quot;</span><span class="si">{</span><span class="n">name_prefix</span><span class="si">}</span><span class="s2">-</span><span class="si">{</span><span class="n">param</span><span class="si">}</span><span class="s2">&quot;</span>
+            <span class="n">params</span><span class="o">.</span><span class="n">update</span><span class="p">(</span><span class="n">rename_params</span><span class="o">.</span><span class="n">values</span><span class="p">())</span>
+        <span class="k">return</span> <span class="n">params</span>
+
 <div class="viewcode-block" id="Template.inline_dependencies"><a class="viewcode-back" href="../../../reference/apidoc/_autosummary/buildingmotif.dataclasses.template.html#buildingmotif.dataclasses.template.Template.inline_dependencies">[docs]</a>    <span class="k">def</span> <span class="nf">inline_dependencies</span><span class="p">(</span><span class="bp">self</span><span class="p">)</span> <span class="o">-&gt;</span> <span class="s2">&quot;Template&quot;</span><span class="p">:</span>
 <span class="w">        </span><span class="sd">&quot;&quot;&quot;Copies this template with all dependencies recursively inlined.</span>
 

_modules/buildingmotif/dataclasses/validation.html

@@ -856,7 +856,7 @@ <h1>Source code for buildingmotif.dataclasses.validation</h1><div class="highlig
             <span class="k">continue</span>
 
         <span class="n">templ_lists</span> <span class="o">=</span> <span class="p">(</span><span class="n">diff</span><span class="o">.</span><span class="n">resolve</span><span class="p">(</span><span class="n">lib</span><span class="p">)</span> <span class="k">for</span> <span class="n">diff</span> <span class="ow">in</span> <span class="n">diffset</span><span class="p">)</span>
-        <span class="n">templs</span> <span class="o">=</span> <span class="nb">list</span><span class="p">(</span><span class="nb">filter</span><span class="p">(</span><span class="kc">None</span><span class="p">,</span> <span class="n">chain</span><span class="o">.</span><span class="n">from_iterable</span><span class="p">(</span><span class="n">templ_lists</span><span class="p">)))</span>
+        <span class="n">templs</span><span class="p">:</span> <span class="n">List</span><span class="p">[</span><span class="n">Template</span><span class="p">]</span> <span class="o">=</span> <span class="nb">list</span><span class="p">(</span><span class="nb">filter</span><span class="p">(</span><span class="kc">None</span><span class="p">,</span> <span class="n">chain</span><span class="o">.</span><span class="n">from_iterable</span><span class="p">(</span><span class="n">templ_lists</span><span class="p">)))</span>
         <span class="k">if</span> <span class="nb">len</span><span class="p">(</span><span class="n">templs</span><span class="p">)</span> <span class="o">&lt;=</span> <span class="mi">1</span><span class="p">:</span>
             <span class="n">templates</span><span class="o">.</span><span class="n">extend</span><span class="p">(</span><span class="n">templs</span><span class="p">)</span>
             <span class="k">continue</span>

_modules/buildingmotif/namespaces.html

@@ -431,6 +431,7 @@ <h1>Source code for buildingmotif.namespaces</h1><div class="highlight"><pre>
 
 <span class="n">BM</span> <span class="o">=</span> <span class="n">Namespace</span><span class="p">(</span><span class="s2">&quot;https://nrel.gov/BuildingMOTIF#&quot;</span><span class="p">)</span>
 <span class="n">CONSTRAINT</span> <span class="o">=</span> <span class="n">Namespace</span><span class="p">(</span><span class="s2">&quot;https://nrel.gov/BuildingMOTIF/constraints#&quot;</span><span class="p">)</span>
+<span class="n">S223</span> <span class="o">=</span> <span class="n">Namespace</span><span class="p">(</span><span class="s2">&quot;http://data.ashrae.org/standard223#&quot;</span><span class="p">)</span>
 
 <span class="n">A</span> <span class="o">=</span> <span class="n">RDF</span><span class="o">.</span><span class="n">type</span>
 

_modules/buildingmotif/utils.html

@@ -611,7 +611,9 @@ <h1>Source code for buildingmotif.utils</h1><div class="highlight"><pre>
     <span class="k">for</span> <span class="n">pshape</span> <span class="ow">in</span> <span class="n">pshapes</span><span class="p">:</span>
         <span class="n">property_path</span> <span class="o">=</span> <span class="n">shape_graph</span><span class="o">.</span><span class="n">value</span><span class="p">(</span><span class="n">pshape</span><span class="p">,</span> <span class="n">SH</span><span class="p">[</span><span class="s2">&quot;path&quot;</span><span class="p">])</span>
         <span class="k">if</span> <span class="n">property_path</span> <span class="ow">is</span> <span class="kc">None</span><span class="p">:</span>
-            <span class="k">raise</span> <span class="ne">Exception</span><span class="p">(</span><span class="sa">f</span><span class="s2">&quot;no sh:path detected on </span><span class="si">{</span><span class="n">shape_name</span><span class="si">}</span><span class="s2">&quot;</span><span class="p">)</span>
+            <span class="k">raise</span> <span class="ne">Exception</span><span class="p">(</span>
+                <span class="sa">f</span><span class="s2">&quot;no sh:path detected on </span><span class="si">{</span><span class="n">shape_name</span><span class="si">}</span><span class="s2"> property shape </span><span class="si">{</span><span class="n">pshape</span><span class="si">}</span><span class="s2">&quot;</span>
+            <span class="p">)</span>
         <span class="c1"># TODO: expand otypes to include sh:in, sh:or, or no datatype at all!</span>
         <span class="n">otypes</span> <span class="o">=</span> <span class="nb">list</span><span class="p">(</span>
             <span class="n">shape_graph</span><span class="o">.</span><span class="n">objects</span><span class="p">(</span>
@@ -979,6 +981,7 @@ <h1>Source code for buildingmotif.utils</h1><div class="highlight"><pre>
             <span class="p">)</span>
             <span class="k">pass</span>
 
+    <span class="n">data_graph</span> <span class="o">=</span> <span class="n">data_graph</span> <span class="o">+</span> <span class="p">(</span><span class="n">shape_graph</span> <span class="ow">or</span> <span class="n">Graph</span><span class="p">())</span>
     <span class="k">return</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="p">,</span>
         <span class="n">shacl_graph</span><span class="o">=</span><span class="n">shape_graph</span><span class="p">,</span>