fix: catch exceptions for get_table (#3)

* fix: 404 error returns empty response

* fix: raises exception from powerplatform-client

* linter

* fix: test not included in last commit

Author: mekhlakapoor

aind-dataverse-service-server/src/aind_dataverse_service_server/route.py

@@ -2,7 +2,7 @@
 
 from typing import List
 
-from fastapi import APIRouter, Path, status
+from fastapi import APIRouter, HTTPException, Path, status
 from aind_dataverse_service_server.models import HealthCheck, EntityTableRow
 from fastapi_cache.decorator import cache
 from azure.core.credentials import AccessToken
@@ -87,9 +87,15 @@ async def get_table(
         body = allen_powerplatform_client.GetTableRequest(
             table_name=entity_set_table_name
         )
-        api_response = api_instance.get_table(
-            api_version=api_version, body=body
-        )
+        try:
+            api_response = api_instance.get_table(
+                api_version=api_version, body=body, _request_timeout=10
+            )
+        except allen_powerplatform_client.exceptions.ApiException as e:
+            raise HTTPException(
+                status_code=e.status,
+                detail=f"Error fetching {entity_set_table_name}: {e.reason}",
+            )
     return api_response
 
 

aind-dataverse-service-server/tests/test_route.py

@@ -5,7 +5,7 @@
 import pytest
 from azure.core.credentials import AccessToken
 from starlette.testclient import TestClient
-
+from allen_powerplatform_client.exceptions import NotFoundException
 from aind_dataverse_service_server.route import get_access_token
 
 
@@ -69,6 +69,51 @@ def test_get_table_200_response(
         assert isinstance(response.json(), list)
         assert len(response.json()) == 2
 
+    @patch(
+        "aind_dataverse_service_server.route."
+        "allen_powerplatform_client.DefaultApi"
+    )
+    @patch(
+        "aind_dataverse_service_server.route."
+        "allen_powerplatform_client.ApiClient"
+    )
+    @patch("aind_dataverse_service_server.route.get_access_token")
+    def test_get_table_exception_response(
+        self,
+        mock_get_token: MagicMock,
+        mock_api_client: MagicMock,
+        mock_default_api: MagicMock,
+        client: TestClient,
+        mock_table_data,
+    ):
+        """Tests error is properly handled during table data retrieval"""
+
+        mock_get_token.return_value = "mock_token"
+        mock_instance = MagicMock()
+
+        # Create a proper NotFoundException instance with required attributes
+        mock_http_resp = MagicMock()
+        mock_http_resp.status = 404
+        mock_http_resp.reason = "Not Found"
+        not_found_exception = NotFoundException(
+            http_resp=mock_http_resp,
+            body="",
+            data=None,
+        )
+        not_found_exception.status = 404
+        not_found_exception.reason = "Not Found"
+
+        mock_instance.get_table.side_effect = not_found_exception
+        mock_default_api.return_value = mock_instance
+        mock_api_client.return_value.__enter__.return_value = MagicMock()
+
+        response = client.get("/tables/non_existent_table")
+        assert 404 == response.status_code
+        assert (
+            "Error fetching non_existent_table"
+            in response.json()["detail"]
+        )
+
     @patch(
         "aind_dataverse_service_server.route."
         "allen_powerplatform_client.DefaultApi"