deploy: 153ba61

cemsbv · Mar 15, 2024 · 020bcf1 · 020bcf1
1 parent 7b8f185
commit 020bcf1
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 15 deletions.
diff --git a/.doctrees/environment.pickle b/.doctrees/environment.pickle
diff --git a/.doctrees/tree/reference.doctree b/.doctrees/tree/reference.doctree
diff --git a/_modules/pyvibracore/api.html b/_modules/pyvibracore/api.html
@@ -89,17 +89,34 @@ <h1>Source code for pyvibracore.api</h1><div class="highlight"><pre>
     <span class="k">while</span> <span class="n">status</span> <span class="ow">in</span> <span class="p">[</span><span class="s2">&quot;PENDING&quot;</span><span class="p">,</span> <span class="s2">&quot;STARTED&quot;</span><span class="p">,</span> <span class="s2">&quot;RETRY&quot;</span><span class="p">]:</span>
         <span class="n">sleep_time</span> <span class="o">=</span> <span class="nb">min</span><span class="p">(</span><span class="n">sleep_time</span> <span class="o">*</span> <span class="mi">2</span><span class="p">,</span> <span class="mi">10</span><span class="p">)</span>
         <span class="n">sleep</span><span class="p">(</span><span class="n">sleep_time</span><span class="p">)</span>
-        <span class="n">response</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="n">call_endpoint</span><span class="p">(</span>
+        <span class="n">status_response</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="n">call_endpoint</span><span class="p">(</span>
             <span class="s2">&quot;VibraCore&quot;</span><span class="p">,</span> <span class="s2">&quot;/get-task-status&quot;</span><span class="p">,</span> <span class="n">schema</span><span class="o">=</span><span class="n">ticket</span><span class="o">.</span><span class="n">json</span><span class="p">(),</span> <span class="n">return_response</span><span class="o">=</span><span class="kc">True</span>
         <span class="p">)</span>
-        <span class="k">if</span> <span class="n">response</span><span class="o">.</span><span class="n">status_code</span> <span class="o">!=</span> <span class="mi">200</span><span class="p">:</span>
-            <span class="k">raise</span> <span class="ne">RuntimeError</span><span class="p">(</span><span class="sa">rf</span><span class="s2">&quot;</span><span class="si">{</span><span class="n">response</span><span class="o">.</span><span class="n">text</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">response</span><span class="o">.</span><span class="n">json</span><span class="p">()[</span><span class="s2">&quot;state&quot;</span><span class="p">]</span>
 
+        <span class="c1"># Check if the status response is OK</span>
+        <span class="k">if</span> <span class="n">status_response</span><span class="o">.</span><span class="n">status_code</span> <span class="o">!=</span> <span class="mi">200</span><span class="p">:</span>
+            <span class="k">raise</span> <span class="ne">RuntimeError</span><span class="p">(</span><span class="sa">rf</span><span class="s2">&quot;</span><span class="si">{</span><span class="n">status_response</span><span class="o">.</span><span class="n">text</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">status_response</span><span class="o">.</span><span class="n">json</span><span class="p">()[</span><span class="s2">&quot;state&quot;</span><span class="p">]</span>
+
+    <span class="c1"># If the status is FAILURE, raise an error</span>
     <span class="k">if</span> <span class="n">status</span> <span class="o">==</span> <span class="s2">&quot;FAILURE&quot;</span><span class="p">:</span>
-        <span class="k">raise</span> <span class="ne">RuntimeError</span><span class="p">(</span>
-            <span class="sa">f</span><span class="s1">&#39;</span><span class="si">{</span><span class="n">response</span><span class="o">.</span><span class="n">json</span><span class="p">()</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s2">&quot;msg&quot;</span><span class="p">)</span><span class="si">}</span><span class="se">\n</span><span class="si">{</span><span class="n">response</span><span class="o">.</span><span class="n">json</span><span class="p">()</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s2">&quot;traceback&quot;</span><span class="p">)</span><span class="si">}</span><span class="s1">&#39;</span>
-        <span class="p">)</span>
+        <span class="c1"># Get the task-status failure message</span>
+        <span class="n">failure_message</span> <span class="o">=</span> <span class="n">status_response</span><span class="o">.</span><span class="n">json</span><span class="p">()[</span><span class="s2">&quot;msg&quot;</span><span class="p">]</span>
+
+        <span class="c1"># Try to get the task-result failure message</span>
+        <span class="k">try</span><span class="p">:</span>
+            <span class="n">result_response</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="n">call_endpoint</span><span class="p">(</span>
+                <span class="s2">&quot;VibraCore&quot;</span><span class="p">,</span>
+                <span class="s2">&quot;/get-task-results&quot;</span><span class="p">,</span>
+                <span class="n">schema</span><span class="o">=</span><span class="n">ticket</span><span class="o">.</span><span class="n">json</span><span class="p">(),</span>
+                <span class="n">return_response</span><span class="o">=</span><span class="kc">True</span><span class="p">,</span>
+            <span class="p">)</span>
+            <span class="n">failure_message</span> <span class="o">=</span> <span class="n">result_response</span><span class="o">.</span><span class="n">text</span>
+
+        <span class="c1"># Raise the obtained failure message</span>
+        <span class="k">finally</span><span class="p">:</span>
+            <span class="k">raise</span> <span class="ne">RuntimeError</span><span class="p">(</span><span class="n">failure_message</span><span class="p">)</span>
 
 
 <div class="viewcode-block" id="get_impact_force_report"><a class="viewcode-back" href="../../tree/reference.html#pyvibracore.api.get_impact_force_report">[docs]</a><span class="k">def</span> <span class="nf">get_impact_force_report</span><span class="p">(</span><span class="n">client</span><span class="p">:</span> <span class="n">NucleiClient</span><span class="p">,</span> <span class="n">payload</span><span class="p">:</span> <span class="nb">dict</span><span class="p">)</span> <span class="o">-&gt;</span> <span class="nb">bytes</span><span class="p">:</span>

diff --git a/_modules/pyvibracore/input/impact_force_properties.html b/_modules/pyvibracore/input/impact_force_properties.html
@@ -73,7 +73,9 @@
            <div itemprop="articleBody">
 
   <h1>Source code for pyvibracore.input.impact_force_properties</h1><div class="highlight"><pre>
-<span></span><span class="kn">from</span> <span class="nn">copy</span> <span class="kn">import</span> <span class="n">deepcopy</span>
+<span></span><span class="kn">from</span> <span class="nn">__future__</span> <span class="kn">import</span> <span class="n">annotations</span>
+
+<span class="kn">from</span> <span class="nn">copy</span> <span class="kn">import</span> <span class="n">deepcopy</span>
 <span class="kn">from</span> <span class="nn">dataclasses</span> <span class="kn">import</span> <span class="n">dataclass</span>
 <span class="kn">from</span> <span class="nn">typing</span> <span class="kn">import</span> <span class="n">Dict</span><span class="p">,</span> <span class="n">List</span><span class="p">,</span> <span class="n">Literal</span>
 
@@ -163,6 +165,7 @@ <h1>Source code for pyvibracore.input.impact_force_properties</h1><div class="hi
     <span class="n">friction_strategy</span><span class="p">:</span> <span class="n">Literal</span><span class="p">[</span><span class="s2">&quot;CPTFrictionStrategy&quot;</span><span class="p">,</span> <span class="s2">&quot;SlipFrictionStrategy&quot;</span><span class="p">],</span>
     <span class="n">drive_strategy</span><span class="p">:</span> <span class="n">Literal</span><span class="p">[</span><span class="s2">&quot;vibrate&quot;</span><span class="p">,</span> <span class="s2">&quot;push&quot;</span><span class="p">],</span>
     <span class="n">installation_level_offset</span><span class="p">:</span> <span class="nb">float</span><span class="p">,</span>
+    <span class="n">groundwater_level_offset</span><span class="p">:</span> <span class="kc">None</span> <span class="o">|</span> <span class="nb">float</span> <span class="o">=</span> <span class="kc">None</span><span class="p">,</span>
     <span class="n">zeta</span><span class="p">:</span> <span class="nb">float</span> <span class="o">=</span> <span class="mf">0.6</span><span class="p">,</span>
 <span class="p">)</span> <span class="o">-&gt;</span> <span class="nb">dict</span><span class="p">:</span>
 <span class="w">    </span><span class="sd">&quot;&quot;&quot;</span>
@@ -227,6 +230,9 @@ <h1>Source code for pyvibracore.input.impact_force_properties</h1><div class="hi
 <span class="sd">        The push strategy calculates the impact force based on a push installation method.</span>
 <span class="sd">    installation_level_offset: float</span>
 <span class="sd">        Installation level of the sheet pile [m w.r.t REF]</span>
+<span class="sd">    groundwater_level_offset: float, optional</span>
+<span class="sd">        Groundwater level for all cpts. if None groundwater level of cpt is used. if no</span>
+<span class="sd">        groundwater level is set in the cpt we will take one meter below surface level [m w.r.t REF]</span>
 <span class="sd">    zeta: float = 0.6</span>
 <span class="sd">        verknedingsfactor [-], used in the push drive strategy based on CUR 166 6th edition.</span>
 
@@ -252,9 +258,9 @@ <h1>Source code for pyvibracore.input.impact_force_properties</h1><div class="hi
                     <span class="s2">&quot;y&quot;</span><span class="p">:</span> <span class="n">cpt</span><span class="o">.</span><span class="n">delivered_location</span><span class="o">.</span><span class="n">y</span><span class="p">,</span>
                 <span class="p">},</span>
                 <span class="s2">&quot;customInterval&quot;</span><span class="p">:</span> <span class="n">CustomInterval</span><span class="p">,</span>
-                <span class="s2">&quot;groundwaterLevelOffset&quot;</span><span class="p">:</span> <span class="n">cpt</span><span class="o">.</span><span class="n">groundwater_level_offset</span>
-                <span class="k">if</span> <span class="n">cpt</span><span class="o">.</span><span class="n">groundwater_level_offset</span>
-                <span class="k">else</span> <span class="n">cpt</span><span class="o">.</span><span class="n">delivered_vertical_position_offset</span> <span class="o">-</span> <span class="mi">1</span><span class="p">,</span>
+                <span class="s2">&quot;groundwaterLevelOffset&quot;</span><span class="p">:</span> <span class="n">groundwater_level_offset</span>
+                <span class="ow">or</span> <span class="n">cpt</span><span class="o">.</span><span class="n">groundwater_level_offset</span>
+                <span class="ow">or</span> <span class="n">cpt</span><span class="o">.</span><span class="n">delivered_vertical_position_offset</span> <span class="o">-</span> <span class="mi">1</span><span class="p">,</span>
                 <span class="s2">&quot;layerTable&quot;</span><span class="p">:</span> <span class="p">{</span>
                     <span class="s2">&quot;gamma_sat&quot;</span><span class="p">:</span> <span class="n">classify_tables</span><span class="p">[</span><span class="n">cpt</span><span class="o">.</span><span class="n">alias</span><span class="p">]</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s2">&quot;gamma_sat&quot;</span><span class="p">),</span>
                     <span class="s2">&quot;gamma_unsat&quot;</span><span class="p">:</span> <span class="n">classify_tables</span><span class="p">[</span><span class="n">cpt</span><span class="o">.</span><span class="n">alias</span><span class="p">]</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s2">&quot;gamma_unsat&quot;</span><span class="p">),</span>