From fb8465c83051d2248ffd195ba1527c19d00d69b8 Mon Sep 17 00:00:00 2001
From: Shubham Gupta <shubhamgupta3121@gmail.com>
Date: Wed, 4 Sep 2024 19:29:00 +0530
Subject: [PATCH] fix scenario notebook 042-data review - use logger instead of
 print

---
 .../scenarios/bigquery/042-data_review.ipynb  | 21 +++++++------------
 .../syft/src/syft/service/code/user_code.py   |  9 ++++----
 .../src/syft/service/notifier/notifier.py     |  1 -
 packages/syft/src/syft/store/linked_obj.py    |  5 ++++-
 4 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/notebooks/scenarios/bigquery/042-data_review.ipynb b/notebooks/scenarios/bigquery/042-data_review.ipynb
index 04dab5e8392..b0111e9e12f 100644
--- a/notebooks/scenarios/bigquery/042-data_review.ipynb
+++ b/notebooks/scenarios/bigquery/042-data_review.ipynb
@@ -134,7 +134,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "high_client.requests.get_all_pending()"
+    "high_client.requests"
    ]
   },
   {
@@ -143,7 +143,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "for request in high_client.requests.get_all_pending():\n",
+    "for request in high_client.requests:\n",
     "    if request.code.service_func_name.startswith(\"wrong_syntax_query\"):\n",
     "        bad_request = request\n",
     "    if request.code.service_func_name.startswith(\"simple_query\"):\n",
@@ -168,15 +168,6 @@
     "good_job.wait()"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "good_request.deposit_result(good_job.info, approve=True)"
-   ]
-  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -232,7 +223,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "retry_good_job = good_request.code(blocking=False)"
+    "bad_job.wait()"
    ]
   },
   {
@@ -241,7 +232,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "retry_good_job.wait()"
+    "retry_good_job = good_request.code(blocking=False)"
    ]
   },
   {
@@ -249,7 +240,9 @@
    "execution_count": null,
    "metadata": {},
    "outputs": [],
-   "source": []
+   "source": [
+    "retry_good_job.wait()"
+   ]
   },
   {
    "cell_type": "code",
diff --git a/packages/syft/src/syft/service/code/user_code.py b/packages/syft/src/syft/service/code/user_code.py
index de096a3afba..3ba1b20a00f 100644
--- a/packages/syft/src/syft/service/code/user_code.py
+++ b/packages/syft/src/syft/service/code/user_code.py
@@ -12,6 +12,7 @@
 from io import StringIO
 import json
 import keyword
+import logging
 import random
 import re
 import sys
@@ -102,6 +103,8 @@
 from .utils import parse_code
 from .utils import submit_subjobs_code
 
+logger = logging.getLogger(name=__name__)
+
 if TYPE_CHECKING:
     # relative
     from ...service.sync.diff_state import AttrDiff
@@ -1871,13 +1874,11 @@ def to_str(arg: Any) -> str:
 
             if context.job is not None:
                 time = datetime.datetime.now().strftime("%d/%m/%y %H:%M:%S")
-                original_print(
-                    f"{time} EXCEPTION LOG ({job_id}):\n{error_msg}", file=sys.stderr
-                )
+                logger.error(f"{time} EXCEPTION LOG ({job_id}):\n{error_msg}")
             else:
                 # for local execution
                 time = datetime.datetime.now().strftime("%d/%m/%y %H:%M:%S")
-                original_print(f"{time} EXCEPTION LOG:\n{error_msg}\n", file=sys.stderr)
+                logger.error(f"{time} EXCEPTION LOG:\n{error_msg}\n")
 
             if (
                 context.server is not None
diff --git a/packages/syft/src/syft/service/notifier/notifier.py b/packages/syft/src/syft/service/notifier/notifier.py
index cb000d823f5..8400082303d 100644
--- a/packages/syft/src/syft/service/notifier/notifier.py
+++ b/packages/syft/src/syft/service/notifier/notifier.py
@@ -136,7 +136,6 @@ def send(
             return SyftSuccess(message="Email sent successfully!")
         except Exception as e:
             message = f"> Error sending email: {subject} to {receiver_email} from: {sender}. {e}"
-            print(message)
             logger.error(message)
             return SyftError(message="Failed to send an email.")
             # raise SyftException.from_exception(
diff --git a/packages/syft/src/syft/store/linked_obj.py b/packages/syft/src/syft/store/linked_obj.py
index 3301a95861b..5d9c29c9d9d 100644
--- a/packages/syft/src/syft/store/linked_obj.py
+++ b/packages/syft/src/syft/store/linked_obj.py
@@ -1,4 +1,5 @@
 # stdlib
+import logging
 from typing import Any
 
 # third party
@@ -16,6 +17,8 @@
 from ..types.syft_object import SyftObject
 from ..types.uid import UID
 
+logger = logging.getLogger(__name__)
+
 
 @serializable()
 class LinkedObject(SyftObject):
@@ -47,7 +50,7 @@ def resolve(self) -> SyftObject:
             self._resolve_cache = resolve
             return resolve
         except Exception as e:
-            print(">>> Failed to resolve object", type(api), e)
+            logger.error(">>> Failed to resolve object", type(api), e)
             raise e
 
     @as_result(SyftException)