Merge pull request #9264 from OpenMined/fix-pytest

make pytest fail on syftexception
OpenMined · Sep 4, 2024 · c4616ad · c4616ad
2 parents 1096dd2 + 0c67e09
commit c4616ad
Show file tree

Hide file tree

Showing 20 changed files with 149 additions and 407 deletions.
diff --git a/.gitignore b/.gitignore
@@ -84,4 +84,7 @@ out.*
 packages/grid/helm/examples/dev/migration.yaml
 
 # dynaconf settings file
-**/settings.yaml
+**/settings.yaml
+
+
+notebooks/scenarios/bigquery/*.json
diff --git a/notebooks/api/0.8/05-custom-policy.ipynb b/notebooks/api/0.8/05-custom-policy.ipynb
@@ -135,7 +135,7 @@
     "            return None\n",
     "        return output_dict\n",
     "\n",
-    "    def _is_valid(self, context):\n",
+    "    def is_valid(self, context):\n",
     "        return self.state[\"counts\"] < self.n_calls"
    ]
   },
@@ -336,11 +336,10 @@
     "\n",
     "        return filtered_kwargs\n",
     "\n",
-    "    def _is_valid(\n",
+    "    def is_valid(\n",
     "        self,\n",
     "        context,\n",
     "        usr_input_kwargs,\n",
-    "        code_item_id,\n",
     "    ):\n",
     "        filtered_input_kwargs = self.filter_kwargs(\n",
     "            kwargs=usr_input_kwargs,\n",

diff --git a/notebooks/api/0.8/08-code-version.ipynb b/notebooks/api/0.8/08-code-version.ipynb
@@ -77,8 +77,8 @@
    "outputs": [],
    "source": [
     "datasite_client.register(\n",
-    "    name=\"Jane Doe\",\n",
-    "    email=\"jane@caltech.edu\",\n",
+    "    name=\"Janet Doe\",\n",
+    "    email=\"janet@caltech.edu\",\n",
     "    password=\"abc123\",\n",
     "    password_verify=\"abc123\",\n",
     "    institution=\"Caltech\",\n",
@@ -92,7 +92,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "jane_client = server.login(email=\"jane@caltech.edu\", password=\"abc123\")"
+    "janet_client = server.login(email=\"janet@caltech.edu\", password=\"abc123\")"
    ]
   },
   {
@@ -128,7 +128,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "jane_client.code.request_code_execution(code=test_func)"
+    "janet_client.code.request_code_execution(code=test_func)"
    ]
   },
   {
@@ -137,7 +137,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "jane_client.code"
+    "janet_client.code"
    ]
   },
   {
@@ -153,7 +153,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "jane_client.code_history"
+    "janet_client.code_history"
    ]
   },
   {
@@ -189,7 +189,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "jane_client.code.request_code_execution(code=test_func)"
+    "janet_client.code.request_code_execution(code=test_func)"
    ]
   },
   {
@@ -198,7 +198,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "jane_client.code_history.test_func"
+    "janet_client.code_history.test_func"
    ]
   },
   {
@@ -232,7 +232,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "admin_client.code_histories[\"jane@caltech.edu\"]"
+    "admin_client.code_histories[\"janet@caltech.edu\"]"
    ]
   },
   {
@@ -241,7 +241,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "admin_client.code_histories[\"jane@caltech.edu\"].test_func[0]"
+    "admin_client.code_histories[\"janet@caltech.edu\"].test_func[0]"
    ]
   },
   {
@@ -250,7 +250,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "test_func_history = admin_client.code_histories[\"jane@caltech.edu\"].test_func"
+    "test_func_history = admin_client.code_histories[\"janet@caltech.edu\"].test_func"
    ]
   },
   {
@@ -260,7 +260,7 @@
    "outputs": [],
    "source": [
     "with sy.raises(sy.SyftException, show=True):\n",
-    "    admin_client.code_histories[\"jane@caltech.edu\"].test_func[-1]"
+    "    admin_client.code_histories[\"janet@caltech.edu\"].test_func[-1]"
    ]
   },
   {

diff --git a/notebooks/api/0.8/12-custom-api-endpoint.ipynb b/notebooks/api/0.8/12-custom-api-endpoint.ipynb
@@ -68,7 +68,7 @@
     "def public_endpoint_method(\n",
     "    context,\n",
     "    query: str,\n",
-    ") -> Any:\n",
+    ") -> \"Any\":\n",
     "    return context.settings[\"key\"] == \"value\"\n",
     "\n",
     "\n",
@@ -673,14 +673,16 @@
     "        _print=False\n",
     "    )"
    ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": []
   }
  ],
  "metadata": {
-  "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
-   "language": "python",
-   "name": "python3"
-  },
   "language_info": {
    "codemirror_mode": {
     "name": "ipython",
@@ -691,7 +693,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.12.4"
+   "version": "3.12.5"
   }
  },
  "nbformat": 4,

diff --git a/notebooks/scenarios/bigquery/00-start-and-configure-server-and-admins.ipynb b/notebooks/scenarios/bigquery/00-start-and-configure-server-and-admins.ipynb
@@ -222,11 +222,6 @@
   }
  ],
  "metadata": {
-  "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
-   "language": "python",
-   "name": "python3"
-  },
   "language_info": {
    "codemirror_mode": {
     "name": "ipython",
@@ -237,7 +232,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.13"
+   "version": "3.12.5"
   }
  },
  "nbformat": 4,

diff --git a/notebooks/scenarios/bigquery/001-scale-delete-worker-pools.ipynb b/notebooks/scenarios/bigquery/001-scale-delete-worker-pools.ipynb
@@ -415,11 +415,6 @@
   }
  ],
  "metadata": {
-  "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
-   "language": "python",
-   "name": "python3"
-  },
   "language_info": {
    "codemirror_mode": {
     "name": "ipython",
@@ -430,7 +425,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.5"
+   "version": "3.12.5"
   }
  },
  "nbformat": 4,

diff --git a/notebooks/scenarios/bigquery/01-setup-datasite.ipynb b/notebooks/scenarios/bigquery/01-setup-datasite.ipynb
@@ -490,11 +490,6 @@
   }
  ],
  "metadata": {
-  "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
-   "language": "python",
-   "name": "python3"
-  },
   "language_info": {
    "codemirror_mode": {
     "name": "ipython",
@@ -505,7 +500,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.13"
+   "version": "3.12.5"
   }
  },
  "nbformat": 4,

diff --git a/notebooks/scenarios/bigquery/011-users-emails-passwords.ipynb b/notebooks/scenarios/bigquery/011-users-emails-passwords.ipynb
@@ -412,11 +412,6 @@
   }
  ],
  "metadata": {
-  "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
-   "language": "python",
-   "name": "python3"
-  },
   "language_info": {
    "codemirror_mode": {
     "name": "ipython",
@@ -427,7 +422,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.13"
+   "version": "3.12.5"
   }
  },
  "nbformat": 4,

diff --git a/notebooks/scenarios/bigquery/02-configure-api.ipynb b/notebooks/scenarios/bigquery/02-configure-api.ipynb
@@ -529,11 +529,6 @@
   }
  ],
  "metadata": {
-  "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
-   "language": "python",
-   "name": "python3"
-  },
   "language_info": {
    "codemirror_mode": {
     "name": "ipython",
@@ -544,7 +539,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.5"
+   "version": "3.12.5"
   }
  },
  "nbformat": 4,

diff --git a/notebooks/scenarios/bigquery/021-create-jobs.ipynb b/notebooks/scenarios/bigquery/021-create-jobs.ipynb
@@ -417,11 +417,6 @@
   }
  ],
  "metadata": {
-  "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
-   "language": "python",
-   "name": "python3"
-  },
   "language_info": {
    "codemirror_mode": {
     "name": "ipython",
@@ -432,7 +427,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.13"
+   "version": "3.12.5"
   }
  },
  "nbformat": 4,

diff --git a/notebooks/scenarios/bigquery/04-do-review-requests.ipynb b/notebooks/scenarios/bigquery/04-do-review-requests.ipynb
@@ -70,6 +70,15 @@
     ")"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "high_client.requests.get_all_pending()"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -211,6 +220,24 @@
     "save_jobs(jobs)"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "high_client.requests.get_all_approved()"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "high_client.requests.get_all_rejected()"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -238,11 +265,6 @@
   }
  ],
  "metadata": {
-  "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
-   "language": "python",
-   "name": "python3"
-  },
   "language_info": {
    "codemirror_mode": {
     "name": "ipython",
@@ -253,7 +275,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.13"
+   "version": "3.12.5"
   }
  },
  "nbformat": 4,