Do not assume valid JSON body for bad responses

Author: FlorentinD

changelog.md

@@ -1,11 +1,13 @@
-# Changes in 1.16
+# Changes in 1.17
 
 ## Breaking changes
 
 ## New features
 
 ## Bug fixes
 
+* Fix reporting error based on http responses from the Aura-API with an invalid JSON body. Earlier the client would report JSONDecodeError instead of showing the actual issue.
+
 ## Improvements
 
 ## Other changes

graphdatascience/session/aura_api.py

@@ -351,8 +351,17 @@ def _check_resp(self, resp: requests.Response) -> None:
 
     def _check_status_code(self, resp: requests.Response) -> None:
         if resp.status_code >= 400:
+            message = ""
+            try:
+                message = resp.json()
+            except requests.JSONDecodeError:
+                try:
+                    message = resp.text
+                except Exception:
+                    message = f"Not parsable body `{resp.raw.data!r}`"
+
             raise AuraApiError(
-                f"Request for {resp.url} failed with status code {resp.status_code} - {resp.reason}: {resp.json()}",
+                f"Request for {resp.url} failed with status code {resp.status_code} - {resp.reason}: `{message}`",
                 status_code=resp.status_code,
             )
 

graphdatascience/tests/unit/test_aura_api.py

@@ -948,6 +948,43 @@ def test_list_missing_instance(requests_mock: Mocker) -> None:
     assert api.list_instance("id0") is None
 
 
+def test_list_instance_unknown_error(requests_mock: Mocker) -> None:
+    api = AuraApi("", "", project_id="some-tenant")
+
+    mock_auth_token(requests_mock)
+
+    requests_mock.get(
+        "https://api.neo4j.io/v1/instances/id0",
+        status_code=500,
+        reason="Not Found",
+        text="my text",
+    )
+
+    with pytest.raises(
+        AuraApiError,
+        match="Request for https://api.neo4j.io/v1/instances/id0 failed with status code 500 - Not Found: `my text`'",
+    ):
+        api.list_instance("id0")
+
+
+def test_list_instance_unknown_error_empty_body(requests_mock: Mocker) -> None:
+    api = AuraApi("", "", project_id="some-tenant")
+
+    mock_auth_token(requests_mock)
+
+    requests_mock.get(
+        "https://api.neo4j.io/v1/instances/id0",
+        status_code=500,
+        reason="Not Found",
+    )
+
+    with pytest.raises(
+        AuraApiError,
+        match="Request for https://api.neo4j.io/v1/instances/id0 failed with status code 500 - Not Found: ``",
+    ):
+        api.list_instance("id0")
+
+
 def test_dont_wait_forever(requests_mock: Mocker, caplog: LogCaptureFixture) -> None:
     mock_auth_token(requests_mock)
     requests_mock.get(