From e3c7e29ae3a821b4fecb959fedcfcddab273db64 Mon Sep 17 00:00:00 2001
From: Jamie Broomall <jamie@whylabs.ai>
Date: Fri, 10 Jan 2025 07:58:38 -0800
Subject: [PATCH] Verbose retry in whylabs writer, test cleanup

---
 python/tests/api/writer/test_whylabs.py     | 16 ----------------
 python/whylogs/api/writer/whylabs_client.py |  4 +++-
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/python/tests/api/writer/test_whylabs.py b/python/tests/api/writer/test_whylabs.py
index 87ae5bea99..1f585ea583 100644
--- a/python/tests/api/writer/test_whylabs.py
+++ b/python/tests/api/writer/test_whylabs.py
@@ -342,22 +342,6 @@ def test_option_will_overwrite_defaults(self) -> None:
         assert writer._whylabs_client._dataset_id == "new_dataset_id"
         assert writer.key_id == "newkeynewk"
 
-    def test_api_key_prefers_parameter_over_env_var(self, results, caplog):
-        with pytest.raises(ValueError):
-            results.writer("whylabs").option(org_id="org_id", api_key="api_key_123.foo").write(dataset_id="dataset_id")
-
-    def test_writer_accepts_dest_param(self, results, caplog):
-        # TODO: inspect error or mock better to avoid network call and keep test focused.
-        with pytest.raises(ValueError):
-            results.writer("whylabs").option(api_key="bad_key_format").write(dataset_id="dataset_id", dest="tmp")
-
-    def test_write_response(self, results):
-        with pytest.raises(ValueError):
-            response = (
-                results.writer("whylabs").option(api_key="bad_key_format").write(dataset_id="dataset_id", dest="tmp")
-            )
-            assert response[0] is True
-
     def test_changing_api_key_works(self) -> None:
         #
         # Defaults
diff --git a/python/whylogs/api/writer/whylabs_client.py b/python/whylogs/api/writer/whylabs_client.py
index d85baefedb..42adbeced6 100644
--- a/python/whylogs/api/writer/whylabs_client.py
+++ b/python/whylogs/api/writer/whylabs_client.py
@@ -100,7 +100,9 @@
 
 
 def _giveup(e) -> bool:
-    return (e.status not in _RETRY_CODES,)  # type: ignore
+    result = e.status not in _RETRY_CODES
+    logger.warning(f"whylabs client communication error: {e}, retryable: {result}")
+    return result
 
 
 def _get_column_names(x: Union[DatasetProfile, DatasetProfileView, SegmentedDatasetProfileView, ResultSet]) -> Set[str]: