Sparsezoo stdout fix (#322) (#323)

* Revert "Suppress analytics errors and messages (#318)"

This reverts commit 960cae2.

* Catch HttpError over exception

* Catch HttpError over exception when checking country

(cherry picked from commit 9b5a0bd)

Author: rahul-tuli

src/sparsezoo/analytics.py

@@ -22,9 +22,9 @@
 
 import machineid
 import requests
+from requests import HTTPError
 
 from sparsezoo.utils.gdpr import is_gdpr_country
-from sparsezoo.utils.suppress import suppress_stdout_stderr
 from sparsezoo.version import version as sparsezoo_version
 
 
@@ -122,31 +122,30 @@ def send_event(
             event_params = {}
 
         def _send_request():
-            with suppress_stdout_stderr(suppress=not _DEBUG):
-                event_params.update(self._package_params)
-                event_params["package"] = self._package
-                event_params["version"] = self._version
-                payload = {
-                    "client_id": self._client_id,
-                    "events": [{"name": event_name, "params": event_params}],
-                }
-                headers = {
-                    "Content-Type": "application/json",
-                }
-                data = json.dumps(payload)
-
-                try:
-                    response = requests.post(self._url, headers=headers, data=data)
-                    response.raise_for_status()
-                    body = response.content
-                    if _DEBUG:
-                        print(body)
-                except Exception as err:
-                    if _DEBUG:
-                        print(err)
-
-                    if raise_errors:
-                        raise err
+            event_params.update(self._package_params)
+            event_params["package"] = self._package
+            event_params["version"] = self._version
+            payload = {
+                "client_id": self._client_id,
+                "events": [{"name": event_name, "params": event_params}],
+            }
+            headers = {
+                "Content-Type": "application/json",
+            }
+            data = json.dumps(payload)
+
+            try:
+                response = requests.post(self._url, headers=headers, data=data)
+                response.raise_for_status()
+                body = response.content
+                if _DEBUG:
+                    print(body)
+            except HTTPError as http_error:
+                if _DEBUG:
+                    print(http_error)
+
+                if raise_errors:
+                    raise http_error
 
         thread = threading.Thread(target=_send_request)
         thread.start()

src/sparsezoo/utils/gdpr.py

@@ -16,8 +16,7 @@
 
 import geocoder
 import requests
-
-from sparsezoo.utils.suppress import suppress_stdout_stderr
+from requests import HTTPError
 
 
 __all__ = ["get_external_ip", "get_country_code", "is_gdpr_country"]
@@ -58,28 +57,26 @@ def get_external_ip() -> Optional[str]:
     """
     :return: the external ip of the machine, None if unable to get
     """
-    with suppress_stdout_stderr():
-        try:
-            response = requests.get("https://ident.me")
-            external_ip = response.text.strip()
+    try:
+        response = requests.get("https://ident.me")
+        external_ip = response.text.strip()
 
-            return external_ip
-        except Exception:
-            return None
+        return external_ip
+    except Exception:
+        return None
 
 
 def get_country_code() -> Optional[str]:
     """
     :return: the country code of the machine, None if unable to get
     """
-    with suppress_stdout_stderr():
-        try:
-            ip = get_external_ip()
-            geo = geocoder.ip(ip)
+    try:
+        ip = get_external_ip()
+        geo = geocoder.ip(ip)
 
-            return geo.country
-        except Exception:
-            return None
+        return geo.country
+    except HTTPError:
+        return None
 
 
 def is_gdpr_country() -> bool: