Update from dscc-admin-ch/lomas@284686c

dscc-admin-ch · Jun 5, 2024 · 5319d3c · 5319d3c
1 parent bb64ed5
commit 5319d3c
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 25 deletions.
diff --git a/html/_modules/lomas_server/private_dataset/utils.html b/html/_modules/lomas_server/private_dataset/utils.html
@@ -136,15 +136,15 @@ <h1>Source code for lomas_server.private_dataset.utils</h1><div class="highlight
             <span class="n">s3_parameters</span><span class="p">[</span><span class="s2">&quot;s3_endpoint&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">admin_database</span><span class="o">.</span><span class="n">get_dataset_field</span><span class="p">(</span>
                 <span class="n">dataset_name</span><span class="p">,</span> <span class="s2">&quot;endpoint_url&quot;</span>
             <span class="p">)</span>
-            <span class="n">s3_parameters</span><span class="p">[</span>
-                <span class="s2">&quot;s3_aws_access_key_id&quot;</span>
-            <span class="p">]</span> <span class="o">=</span> <span class="n">admin_database</span><span class="o">.</span><span class="n">get_dataset_field</span><span class="p">(</span>
-                <span class="n">dataset_name</span><span class="p">,</span> <span class="s2">&quot;aws_access_key_id&quot;</span>
+            <span class="n">s3_parameters</span><span class="p">[</span><span class="s2">&quot;s3_aws_access_key_id&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="p">(</span>
+                <span class="n">admin_database</span><span class="o">.</span><span class="n">get_dataset_field</span><span class="p">(</span>
+                    <span class="n">dataset_name</span><span class="p">,</span> <span class="s2">&quot;aws_access_key_id&quot;</span>
+                <span class="p">)</span>
             <span class="p">)</span>
-            <span class="n">s3_parameters</span><span class="p">[</span>
-                <span class="s2">&quot;aws_secret_access_key&quot;</span>
-            <span class="p">]</span> <span class="o">=</span> <span class="n">admin_database</span><span class="o">.</span><span class="n">get_dataset_field</span><span class="p">(</span>
-                <span class="n">dataset_name</span><span class="p">,</span> <span class="s2">&quot;aws_secret_access_key&quot;</span>
+            <span class="n">s3_parameters</span><span class="p">[</span><span class="s2">&quot;aws_secret_access_key&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="p">(</span>
+                <span class="n">admin_database</span><span class="o">.</span><span class="n">get_dataset_field</span><span class="p">(</span>
+                    <span class="n">dataset_name</span><span class="p">,</span> <span class="s2">&quot;aws_secret_access_key&quot;</span>
+                <span class="p">)</span>
             <span class="p">)</span>
             <span class="n">private_db</span> <span class="o">=</span> <span class="n">S3Dataset</span><span class="p">(</span><span class="n">ds_metadata</span><span class="p">,</span> <span class="n">s3_parameters</span><span class="p">)</span>
         <span class="k">case</span><span class="w"> </span><span class="k">_</span><span class="p">:</span>

diff --git a/html/_modules/lomas_server/tests/test_api.html b/html/_modules/lomas_server/tests/test_api.html
@@ -339,9 +339,9 @@ <h1>Source code for lomas_server.tests.test_api</h1><div class="highlight"><pre>
 
             <span class="c1"># Expect to fail: query does not make sense</span>
             <span class="n">input_smartnoise</span> <span class="o">=</span> <span class="nb">dict</span><span class="p">(</span><span class="n">example_smartnoise_sql</span><span class="p">)</span>
-            <span class="n">input_smartnoise</span><span class="p">[</span>
-                <span class="s2">&quot;query_str&quot;</span>
-            <span class="p">]</span> <span class="o">=</span> <span class="s2">&quot;SELECT AVG(bill) FROM df&quot;</span>  <span class="c1"># no &#39;bill&#39; column</span>
+            <span class="n">input_smartnoise</span><span class="p">[</span><span class="s2">&quot;query_str&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="p">(</span>
+                <span class="s2">&quot;SELECT AVG(bill) FROM df&quot;</span>  <span class="c1"># no &#39;bill&#39; column</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">post</span><span class="p">(</span>
                 <span class="s2">&quot;/smartnoise_query&quot;</span><span class="p">,</span>
                 <span class="n">json</span><span class="o">=</span><span class="n">input_smartnoise</span><span class="p">,</span>

diff --git a/html/_modules/lomas_server/utils/utils.html b/html/_modules/lomas_server/utils/utils.html
@@ -148,9 +148,9 @@ <h1>Source code for lomas_server.utils.utils</h1><div class="highlight"><pre>
     <span class="n">response</span> <span class="o">=</span> <span class="n">StreamingResponse</span><span class="p">(</span>
         <span class="nb">iter</span><span class="p">([</span><span class="n">stream</span><span class="o">.</span><span class="n">getvalue</span><span class="p">()]),</span> <span class="n">media_type</span><span class="o">=</span><span class="s2">&quot;text/csv&quot;</span>
     <span class="p">)</span>
-    <span class="n">response</span><span class="o">.</span><span class="n">headers</span><span class="p">[</span>
-        <span class="s2">&quot;Content-Disposition&quot;</span>
-    <span class="p">]</span> <span class="o">=</span> <span class="s2">&quot;attachment; filename=synthetic_data.csv&quot;</span>
+    <span class="n">response</span><span class="o">.</span><span class="n">headers</span><span class="p">[</span><span class="s2">&quot;Content-Disposition&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="p">(</span>
+        <span class="s2">&quot;attachment; filename=synthetic_data.csv&quot;</span>
+    <span class="p">)</span>
     <span class="k">return</span> <span class="n">response</span></div>
 
 

diff --git a/html/notebooks/demo_kubernetes_admin_notebook.ipynb b/html/notebooks/demo_kubernetes_admin_notebook.ipynb
@@ -19,7 +19,7 @@
   {
    "cell_type": "code",
    "execution_count": 2,
-   "id": "29cbe847",
+   "id": "855b8429",
    "metadata": {},
    "outputs": [
     {
@@ -53,7 +53,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "75de91e3",
+   "id": "5b6a95a0",
    "metadata": {},
    "source": [
     "#### Since the service has been deployed in the demo 1, the URL should be accessible."
@@ -392,7 +392,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "779913d2",
+   "id": "6fe87b7c",
    "metadata": {},
    "source": [
     "### Archives of queries"
@@ -401,7 +401,7 @@
   {
    "cell_type": "code",
    "execution_count": 11,
-   "id": "855935a1",
+   "id": "9327cb42",
    "metadata": {},
    "outputs": [
     {

diff --git a/html/notebooks/demo_kubernetes_deployment_notebook.ipynb b/html/notebooks/demo_kubernetes_deployment_notebook.ipynb
@@ -21,7 +21,7 @@
   {
    "cell_type": "code",
    "execution_count": 1,
-   "id": "e63d9531",
+   "id": "fa5558c2",
    "metadata": {},
    "outputs": [
     {
@@ -47,7 +47,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "f8579bb9",
+   "id": "365a9b39",
    "metadata": {},
    "source": [
     "### Server"
@@ -254,7 +254,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "adc82a88",
+   "id": "999dcabf",
    "metadata": {},
    "source": [
     "#### Update `values.yaml` file\n",
@@ -291,7 +291,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "e0e74c83",
+   "id": "ee7e8601",
    "metadata": {},
    "source": [
     "#### Access the client environment through the url and use the password defined in the values file."
@@ -308,7 +308,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "f3197413",
+   "id": "83e48147",
    "metadata": {},
    "outputs": [],
    "source": [

diff --git a/html/notebooks/kubernetes_deployment_notebook.ipynb b/html/notebooks/kubernetes_deployment_notebook.ipynb
@@ -199,7 +199,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "ed606014",
+   "id": "45e01cbc",
    "metadata": {},
    "source": [
     "Again, one needs to update the `values.yaml` file with the desired values. The important fields are `ingress.hosts[0].host` and `ingress.tls.hosts[0]` for the url, `password` for the user session and `image.repository` for specifying the previously built image. Make sure to change the `nameOverride`, `fullnameOverride` and url when deploying multiple client images.\n",
@@ -221,7 +221,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "c747bb5c",
+   "id": "1fe4e66b",
    "metadata": {},
    "source": [
     "The user session should now be available at the specified url, just type the password and you are in!\n",