Update from dscc-admin-ch/lomas@08f0c90

Author: dscc-admin-ch

html/develop/en/_modules/lomas_core/error_handler.html

@@ -215,7 +215,7 @@ <h1>Source code for lomas_core.error_handler</h1><div class="highlight"><pre>
     <span class="k">async</span> <span class="k">def</span><span class="w"> </span><span class="nf">external_library_exception_handler</span><span class="p">(</span><span class="n">_</span><span class="p">:</span> <span class="n">Request</span><span class="p">,</span> <span class="n">exc</span><span class="p">:</span> <span class="n">ExternalLibraryException</span><span class="p">)</span> <span class="o">-&gt;</span> <span class="n">JSONResponse</span><span class="p">:</span>
         <span class="n">logger</span><span class="o">.</span><span class="n">debug</span><span class="p">(</span><span class="sa">f</span><span class="s2">&quot;ExternalLibraryException raised: </span><span class="si">{</span><span class="n">exc</span><span class="o">.</span><span class="n">error_message</span><span class="si">}</span><span class="s2">&quot;</span><span class="p">)</span>
         <span class="k">return</span> <span class="n">JSONResponse</span><span class="p">(</span>
-            <span class="n">status_code</span><span class="o">=</span><span class="n">status</span><span class="o">.</span><span class="n">HTTP_422_UNPROCESSABLE_ENTITY</span><span class="p">,</span>
+            <span class="n">status_code</span><span class="o">=</span><span class="n">status</span><span class="o">.</span><span class="n">HTTP_422_UNPROCESSABLE_CONTENT</span><span class="p">,</span>
             <span class="n">content</span><span class="o">=</span><span class="n">jsonable_encoder</span><span class="p">(</span>
                 <span class="n">ExternalLibraryExceptionModel</span><span class="p">(</span><span class="n">message</span><span class="o">=</span><span class="n">exc</span><span class="o">.</span><span class="n">error_message</span><span class="p">,</span> <span class="n">library</span><span class="o">=</span><span class="n">exc</span><span class="o">.</span><span class="n">library</span><span class="p">)</span>
             <span class="p">),</span>
@@ -244,7 +244,7 @@ <h1>Source code for lomas_core.error_handler</h1><div class="highlight"><pre>
 <span class="c1"># Server error responses for DP queries</span>
 <span class="n">SERVER_QUERY_ERROR_RESPONSES</span><span class="p">:</span> <span class="nb">dict</span><span class="p">[</span><span class="nb">int</span> <span class="o">|</span> <span class="nb">str</span><span class="p">,</span> <span class="nb">dict</span><span class="p">[</span><span class="nb">str</span><span class="p">,</span> <span class="n">Any</span><span class="p">]]</span> <span class="o">=</span> <span class="p">{</span>
     <span class="n">status</span><span class="o">.</span><span class="n">HTTP_400_BAD_REQUEST</span><span class="p">:</span> <span class="p">{</span><span class="s2">&quot;model&quot;</span><span class="p">:</span> <span class="n">InvalidQueryExceptionModel</span><span class="p">},</span>
-    <span class="n">status</span><span class="o">.</span><span class="n">HTTP_422_UNPROCESSABLE_ENTITY</span><span class="p">:</span> <span class="p">{</span><span class="s2">&quot;model&quot;</span><span class="p">:</span> <span class="n">ExternalLibraryExceptionModel</span><span class="p">},</span>
+    <span class="n">status</span><span class="o">.</span><span class="n">HTTP_422_UNPROCESSABLE_CONTENT</span><span class="p">:</span> <span class="p">{</span><span class="s2">&quot;model&quot;</span><span class="p">:</span> <span class="n">ExternalLibraryExceptionModel</span><span class="p">},</span>
     <span class="n">status</span><span class="o">.</span><span class="n">HTTP_403_FORBIDDEN</span><span class="p">:</span> <span class="p">{</span><span class="s2">&quot;model&quot;</span><span class="p">:</span> <span class="n">UnauthorizedAccessExceptionModel</span><span class="p">},</span>
     <span class="n">status</span><span class="o">.</span><span class="n">HTTP_500_INTERNAL_SERVER_ERROR</span><span class="p">:</span> <span class="p">{</span><span class="s2">&quot;model&quot;</span><span class="p">:</span> <span class="n">InternalServerExceptionModel</span><span class="p">},</span>
 <span class="p">}</span>

html/develop/en/_modules/lomas_core/models/config.html

@@ -127,11 +127,11 @@ <h1>Source code for lomas_core.models.config</h1><div class="highlight"><pre>
 <span class="w">    </span><span class="sd">&quot;&quot;&quot;Telemetry config.&quot;&quot;&quot;</span>
 
     <span class="n">enabled</span><span class="p">:</span> <span class="nb">bool</span>
-    <span class="n">service_name</span><span class="p">:</span> <span class="n">Annotated</span><span class="p">[</span><span class="nb">str</span> <span class="o">|</span> <span class="kc">None</span><span class="p">,</span> <span class="n">Field</span><span class="p">(</span><span class="n">default</span><span class="o">=</span><span class="s2">&quot;lomas-server-app&quot;</span><span class="p">)]</span>
-    <span class="n">service_id</span><span class="p">:</span> <span class="n">Annotated</span><span class="p">[</span><span class="nb">str</span> <span class="o">|</span> <span class="kc">None</span><span class="p">,</span> <span class="n">Field</span><span class="p">(</span><span class="n">default</span><span class="o">=</span><span class="s2">&quot;default-host&quot;</span><span class="p">)]</span>
-    <span class="n">collector_endpoint</span><span class="p">:</span> <span class="n">Annotated</span><span class="p">[</span><span class="n">HttpUrl</span> <span class="o">|</span> <span class="kc">None</span><span class="p">,</span> <span class="n">UrlConstraints</span><span class="p">(</span><span class="n">default_port</span><span class="o">=</span><span class="mi">4317</span><span class="p">)]</span> <span class="o">=</span> <span class="kc">None</span>
-    <span class="n">collector_insecure</span><span class="p">:</span> <span class="n">Annotated</span><span class="p">[</span><span class="nb">bool</span> <span class="o">|</span> <span class="kc">None</span><span class="p">,</span> <span class="n">Field</span><span class="p">(</span><span class="n">default</span><span class="o">=</span><span class="kc">False</span><span class="p">)]</span>
-    <span class="n">collector_log_correlation</span><span class="p">:</span> <span class="n">Annotated</span><span class="p">[</span><span class="nb">bool</span> <span class="o">|</span> <span class="kc">None</span><span class="p">,</span> <span class="n">Field</span><span class="p">(</span><span class="n">default</span><span class="o">=</span><span class="kc">False</span><span class="p">)]</span>
+    <span class="n">service_name</span><span class="p">:</span> <span class="n">Annotated</span><span class="p">[</span><span class="nb">str</span><span class="p">,</span> <span class="n">Field</span><span class="p">(</span><span class="n">default</span><span class="o">=</span><span class="s2">&quot;lomas-server-app&quot;</span><span class="p">)]</span>
+    <span class="n">service_id</span><span class="p">:</span> <span class="n">Annotated</span><span class="p">[</span><span class="nb">str</span><span class="p">,</span> <span class="n">Field</span><span class="p">(</span><span class="n">default</span><span class="o">=</span><span class="s2">&quot;default-host&quot;</span><span class="p">)]</span>
+    <span class="n">collector_endpoint</span><span class="p">:</span> <span class="n">Annotated</span><span class="p">[</span><span class="n">HttpUrl</span><span class="p">,</span> <span class="n">UrlConstraints</span><span class="p">(</span><span class="n">default_port</span><span class="o">=</span><span class="mi">4317</span><span class="p">)]</span> <span class="o">|</span> <span class="kc">None</span> <span class="o">=</span> <span class="kc">None</span>
+    <span class="n">collector_insecure</span><span class="p">:</span> <span class="n">Annotated</span><span class="p">[</span><span class="nb">bool</span><span class="p">,</span> <span class="n">Field</span><span class="p">(</span><span class="n">default</span><span class="o">=</span><span class="kc">False</span><span class="p">)]</span>
+    <span class="n">collector_log_correlation</span><span class="p">:</span> <span class="n">Annotated</span><span class="p">[</span><span class="nb">bool</span><span class="p">,</span> <span class="n">Field</span><span class="p">(</span><span class="n">default</span><span class="o">=</span><span class="kc">False</span><span class="p">)]</span>
 
 <div class="viewcode-block" id="Telemetry.options_set_if_enabled">
 <a class="viewcode-back" href="../../../lomas_core.models.html#lomas_core.models.config.Telemetry.options_set_if_enabled">[docs]</a>

html/develop/en/_modules/lomas_server/routes/utils.html

@@ -117,6 +117,7 @@ <h1>Source code for lomas_server.routes.utils</h1><div class="highlight"><pre>
 <span class="kn">from</span><span class="w"> </span><span class="nn">lomas_core.error_handler</span><span class="w"> </span><span class="kn">import</span> <span class="n">UnauthorizedAccessException</span>
 <span class="kn">from</span><span class="w"> </span><span class="nn">lomas_core.models.collections</span><span class="w"> </span><span class="kn">import</span> <span class="n">UserId</span>
 <span class="kn">from</span><span class="w"> </span><span class="nn">lomas_core.models.constants</span><span class="w"> </span><span class="kn">import</span> <span class="n">TimeAttackMethod</span>
+<span class="kn">from</span><span class="w"> </span><span class="nn">lomas_core.models.exceptions</span><span class="w"> </span><span class="kn">import</span> <span class="n">LomasServerExceptionTypeAdapter</span>
 <span class="kn">from</span><span class="w"> </span><span class="nn">lomas_core.models.requests</span><span class="w"> </span><span class="kn">import</span> <span class="p">(</span>
     <span class="n">DummyQueryModel</span><span class="p">,</span>
     <span class="n">LomasRequestModel</span><span class="p">,</span>
@@ -143,16 +144,17 @@ <h1>Source code for lomas_server.routes.utils</h1><div class="highlight"><pre>
                 <span class="k">else</span><span class="p">:</span>
                     <span class="k">await</span> <span class="n">message</span><span class="o">.</span><span class="n">ack</span><span class="p">()</span>
 
+                    <span class="n">message_body</span> <span class="o">=</span> <span class="n">message</span><span class="o">.</span><span class="n">body</span><span class="o">.</span><span class="n">decode</span><span class="p">()</span>
                     <span class="k">match</span> <span class="n">message</span><span class="o">.</span><span class="n">headers</span><span class="p">:</span>
                         <span class="k">case</span> <span class="p">{</span><span class="s2">&quot;type&quot;</span><span class="p">:</span> <span class="s2">&quot;exception&quot;</span><span class="p">,</span> <span class="s2">&quot;status_code&quot;</span><span class="p">:</span> <span class="n">status_code</span><span class="p">}:</span>
-                            <span class="n">jobs</span><span class="p">[</span><span class="n">message</span><span class="o">.</span><span class="n">correlation_id</span><span class="p">]</span><span class="o">.</span><span class="n">error</span> <span class="o">=</span> <span class="n">message</span><span class="o">.</span><span class="n">body</span><span class="o">.</span><span class="n">decode</span><span class="p">()</span>
+                            <span class="n">jobs</span><span class="p">[</span><span class="n">message</span><span class="o">.</span><span class="n">correlation_id</span><span class="p">]</span><span class="o">.</span><span class="n">error</span> <span class="o">=</span> <span class="p">(</span>
+                                <span class="n">LomasServerExceptionTypeAdapter</span><span class="o">.</span><span class="n">validate_json</span><span class="p">(</span><span class="n">message_body</span><span class="p">)</span>
+                            <span class="p">)</span>
                             <span class="n">jobs</span><span class="p">[</span><span class="n">message</span><span class="o">.</span><span class="n">correlation_id</span><span class="p">]</span><span class="o">.</span><span class="n">status</span> <span class="o">=</span> <span class="s2">&quot;failed&quot;</span>
                             <span class="n">jobs</span><span class="p">[</span><span class="n">message</span><span class="o">.</span><span class="n">correlation_id</span><span class="p">]</span><span class="o">.</span><span class="n">result</span> <span class="o">=</span> <span class="kc">None</span>
                             <span class="n">jobs</span><span class="p">[</span><span class="n">message</span><span class="o">.</span><span class="n">correlation_id</span><span class="p">]</span><span class="o">.</span><span class="n">status_code</span> <span class="o">=</span> <span class="n">status_code</span>
                         <span class="k">case</span><span class="w"> </span><span class="k">_</span><span class="p">:</span>
-                            <span class="n">jobs</span><span class="p">[</span><span class="n">message</span><span class="o">.</span><span class="n">correlation_id</span><span class="p">]</span><span class="o">.</span><span class="n">result</span> <span class="o">=</span> <span class="bp">cls</span><span class="o">.</span><span class="n">model_validate_json</span><span class="p">(</span>
-                                <span class="n">message</span><span class="o">.</span><span class="n">body</span><span class="o">.</span><span class="n">decode</span><span class="p">()</span>
-                            <span class="p">)</span>
+                            <span class="n">jobs</span><span class="p">[</span><span class="n">message</span><span class="o">.</span><span class="n">correlation_id</span><span class="p">]</span><span class="o">.</span><span class="n">result</span> <span class="o">=</span> <span class="bp">cls</span><span class="o">.</span><span class="n">model_validate_json</span><span class="p">(</span><span class="n">message_body</span><span class="p">)</span>
                             <span class="n">jobs</span><span class="p">[</span><span class="n">message</span><span class="o">.</span><span class="n">correlation_id</span><span class="p">]</span><span class="o">.</span><span class="n">status</span> <span class="o">=</span> <span class="s2">&quot;complete&quot;</span></div>
 
 

html/develop/en/_modules/lomas_server/tests/test_api.html

@@ -267,7 +267,7 @@ <h1>Source code for lomas_server.tests.test_api</h1><div class="highlight"><pre>
                     <span class="s2">&quot;dataset_name&quot;</span><span class="p">:</span> <span class="n">PENGUIN_DATASET</span><span class="p">,</span>
                 <span class="p">},</span>
             <span class="p">)</span>
-            <span class="k">assert</span> <span class="n">response</span><span class="o">.</span><span class="n">status_code</span> <span class="o">==</span> <span class="n">status</span><span class="o">.</span><span class="n">HTTP_422_UNPROCESSABLE_ENTITY</span>
+            <span class="k">assert</span> <span class="n">response</span><span class="o">.</span><span class="n">status_code</span> <span class="o">==</span> <span class="n">status</span><span class="o">.</span><span class="n">HTTP_422_UNPROCESSABLE_CONTENT</span>
 
             <span class="c1"># Expect to fail: user does have access to dataset</span>
             <span class="n">other_dataset</span> <span class="o">=</span> <span class="s2">&quot;IRIS&quot;</span>

html/develop/en/_modules/lomas_server/tests/test_api_diffprivlib.html

@@ -245,7 +245,7 @@ <h1>Source code for lomas_server.tests.test_api_diffprivlib</h1><div class="high
                 <span class="n">headers</span><span class="o">=</span><span class="bp">self</span><span class="o">.</span><span class="n">headers</span><span class="p">,</span>
             <span class="p">)</span>
             <span class="k">assert</span> <span class="n">job</span><span class="o">.</span><span class="n">status</span> <span class="o">==</span> <span class="s2">&quot;failed&quot;</span>
-            <span class="k">assert</span> <span class="n">job</span><span class="o">.</span><span class="n">status_code</span> <span class="o">==</span> <span class="n">status</span><span class="o">.</span><span class="n">HTTP_422_UNPROCESSABLE_ENTITY</span>
+            <span class="k">assert</span> <span class="n">job</span><span class="o">.</span><span class="n">status_code</span> <span class="o">==</span> <span class="n">status</span><span class="o">.</span><span class="n">HTTP_422_UNPROCESSABLE_CONTENT</span>
             <span class="k">assert</span> <span class="n">job</span><span class="o">.</span><span class="n">error</span> <span class="o">==</span> <span class="n">ExternalLibraryExceptionModel</span><span class="p">(</span>
                 <span class="n">message</span><span class="o">=</span><span class="s2">&quot;PrivacyLeakWarning: &quot;</span>
                 <span class="o">+</span> <span class="s2">&quot;Data norm has not been specified and will be calculated on the data provided.  &quot;</span>
@@ -274,7 +274,7 @@ <h1>Source code for lomas_server.tests.test_api_diffprivlib</h1><div class="high
                 <span class="n">headers</span><span class="o">=</span><span class="bp">self</span><span class="o">.</span><span class="n">headers</span><span class="p">,</span>
             <span class="p">)</span>
             <span class="k">assert</span> <span class="n">job</span><span class="o">.</span><span class="n">status</span> <span class="o">==</span> <span class="s2">&quot;failed&quot;</span>
-            <span class="k">assert</span> <span class="n">job</span><span class="o">.</span><span class="n">status_code</span> <span class="o">==</span> <span class="n">status</span><span class="o">.</span><span class="n">HTTP_422_UNPROCESSABLE_ENTITY</span>
+            <span class="k">assert</span> <span class="n">job</span><span class="o">.</span><span class="n">status_code</span> <span class="o">==</span> <span class="n">status</span><span class="o">.</span><span class="n">HTTP_422_UNPROCESSABLE_CONTENT</span>
             <span class="k">assert</span> <span class="n">job</span><span class="o">.</span><span class="n">error</span> <span class="o">==</span> <span class="n">ExternalLibraryExceptionModel</span><span class="p">(</span>
                 <span class="n">message</span><span class="o">=</span><span class="s2">&quot;PrivacyLeakWarning: &quot;</span>
                 <span class="o">+</span> <span class="s2">&quot;Bounds have not been specified and will be calculated on the data provided. &quot;</span>