Made some fixes

OpenMined · Aug 31, 2024 · 9d25ce2 · 9d25ce2
1 parent 3d43dfb
commit 9d25ce2
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 21 deletions.
diff --git a/notebooks/scenarios/bigquery/021-create-jobs.ipynb b/notebooks/scenarios/bigquery/021-create-jobs.ipynb
@@ -204,10 +204,13 @@
    "outputs": [],
    "source": [
     "print(f\"num jobs: {len(jobs)}\")\n",
+    "num_should_submit = 0\n",
     "for job in jobs:\n",
     "    print(\n",
     "        f\"Job type: {job.job_type}, should succeed: {job.should_succeed}, should submit: {job.should_submit}\"\n",
-    "    )"
+    "    )\n",
+    "    if job.should_submit:\n",
+    "        num_should_submit += 1"
    ]
   },
   {
@@ -247,7 +250,9 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "admin_emails_before = len(email_server.get_emails_for_user(\"[email protected]\"))"
+    "admin_emails_before = len(email_server.get_emails_for_user(\"[email protected]\"))\n",
+    "print(\"admin emails before\", admin_emails_before)\n",
+    "admin_emails_before"
    ]
   },
   {
@@ -372,7 +377,8 @@
    "outputs": [],
    "source": [
     "admin_emails_after = len(email_server.get_emails_for_user(\"[email protected]\"))\n",
-    "assert admin_emails_after > admin_emails_before\n",
+    "print(\"admin emails after\", admin_emails_after)\n",
+    "assert admin_emails_after >= admin_emails_before + num_should_submit\n",
     "# assert len(users_emails) > after_number_of_emails\n",
     "# assert len(users_emails) == after_number_of_emails + 1"
    ]

diff --git a/notebooks/scenarios/bigquery/04-do-review-requests.ipynb b/notebooks/scenarios/bigquery/04-do-review-requests.ipynb
@@ -144,7 +144,9 @@
     "def approve_by_running(request):\n",
     "    job = request.code(blocking=False)\n",
     "    result = job.wait()\n",
-    "    assert result\n",
+    "    print(\"got result of type\", type(result), \"bool\", bool(result))\n",
+    "    # got result of type <class 'syft.service.action.pandas.PandasDataFrameObject'> bool False\n",
+    "    # assert result won't work unless we know what type is coming back\n",
     "    job_info = job.info(result=True)\n",
     "    # need force when running multiple times\n",
     "    # todo check and dont run if its already done\n",
@@ -209,13 +211,6 @@
     "save_jobs(jobs)"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": []
-  },
   {
    "cell_type": "code",
    "execution_count": null,

diff --git a/notebooks/scenarios/bigquery/05-ds-get-results.ipynb b/notebooks/scenarios/bigquery/05-ds-get-results.ipynb
@@ -103,7 +103,8 @@
    "outputs": [],
    "source": [
     "# submitted_jobs = [job for job in jobs if job.is_submitted]\n",
-    "reviewed_jobs = [job for job in jobs if job.admin_reviewed]"
+    "reviewed_jobs = [job for job in jobs if job.admin_reviewed]\n",
+    "len(reviewed_jobs)"
    ]
   },
   {
@@ -167,15 +168,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "expected_jobs = [job for job in jobs if job.result_as_expected]"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
+    "expected_jobs = [job for job in jobs if job.result_as_expected]\n",
     "len(expected_jobs)"
    ]
   },
@@ -186,6 +179,7 @@
    "outputs": [],
    "source": [
     "# TODO fix\n",
+    "print(f\"got expected_jobs: {len(expected_jobs)} == reviewed_jobs: {len(reviewed_jobs)}\")\n",
     "# assert len(reviewed_jobs) == len(expected_jobs)"
    ]
   },