Add test for bad save endpoint

Author: ml-evs

src/datalab_api/_base.py

@@ -252,6 +252,7 @@ def _handle_response(
             try:
                 error_data = response.json()
                 error_message = error_data.get("message", str(response.content))
+                error_message += f"\nFull JSON: {error_data}"
             except ValueError:
                 error_message = str(response.content)
 
@@ -273,9 +274,10 @@ def _handle_response(
                 if hasattr(self, "_datalab_server_version"):
                     server_info = f" (Server version: {self._datalab_server_version})"
                 raise DatalabAPIError(
-                    f"HTTP 500 Internal Server Error at {url}: {error_message}{server_info}. "
-                    "This is a server-side bug. Please report this issue to the datalab developers "
-                    "at https://github.com/datalab-org/datalab/issues with the full error message."
+                    f"""HTTP 500 Internal Server Error at {url} {server_info}.
+This is likely a server-side bug. Please report this issue to the datalab developers at https://github.com/datalab-org/datalab/issues with the full error message below:
+
+\n{error_message}"""
                 )
             elif response.status_code == 502:
                 raise DatalabAPIError(

tests/conftest.py

@@ -45,11 +45,26 @@ def mocked_api(
         fake_item_api = respx_mock.get("/get-item-data/KUVEKJ", name="sample-KUVEKJ")
         fake_item_api.return_value = Response(200, json=fake_sample_json)
 
+        fake_missing_item_api = respx_mock.get("/get-item-data/TEST", name="sample-missing-TEST")
+        fake_missing_item_api.return_value = Response(
+            404,
+            json={
+                "message": "No matching items for match={'item_id': 'TEST'} with current authorization",
+                "status": "error",
+            },
+        )
+
         fake_collection_api = respx_mock.get(
             "/collections/test_collection", name="collection-test_collection"
         )
         fake_collection_api.return_value = Response(200, json=fake_collection_json)
 
+        # Fake an unhandled exception
+        fake_internal_error = respx_mock.post("/save-item/", name="bad-save")
+        fake_internal_error.return_value = Response(
+            500, json={"message": "('type',)", "title": "KeyError"}
+        )
+
         yield respx_mock
 
 

tests/test_client.py

@@ -2,6 +2,7 @@
 import respx
 
 from datalab_api import DatalabClient
+from datalab_api._base import DatalabAPIError
 
 
 def test_redirect_url(mocked_api, mocked_ui, fake_api_url, fake_ui_url):
@@ -17,7 +18,7 @@ def test_redirect_url(mocked_api, mocked_ui, fake_api_url, fake_ui_url):
     assert client.datalab_api_url == fake_api_url
 
 
-def test_sample_list(mocked_api, fake_api_url):
+def test_sample_operations(mocked_api, fake_api_url):
     with DatalabClient(fake_api_url) as client:
         assert mocked_api["api"].called
         assert mocked_api["info"].called
@@ -35,6 +36,18 @@ def test_sample_list(mocked_api, fake_api_url):
         assert mocked_api["sample-KUVEKJ"].called
         assert sample["item_id"] == "KUVEKJ"
 
+        # Check that the full server error message is shown for a missing item
+        with pytest.raises(
+            DatalabAPIError,
+            match="No matching items for match={'item_id': 'TEST'} with current authorization",
+        ):
+            client.get_item("TEST", display=True)
+        assert mocked_api["sample-missing-TEST"].called
+
+        with pytest.raises(DatalabAPIError, match="KeyError"):
+            client.update_item(item_id="TEST", item_data={"name": "test"})
+        assert mocked_api["bad-save"].called
+
 
 @respx.mock
 def test_collection_get(fake_api_url, mocked_api):