fixed?

Author: rmobmina

api/resources/proxy.py

@@ -30,7 +30,16 @@ def get(self, gene_id="", top_n=""):
 
         # Now query the web service
         payload = {"gene": gene_id, "topN": top_n}
-        resp = requests.get("https://atted.jp/api5/", params=payload, headers=request_headers)
-
-        # I think the remote API always returns status 200, so skip status checking
-        return resp.json()
+        try:
+            resp = requests.get("https://atted.jp/api5/", params=payload, headers=request_headers, timeout=30)
+            resp.raise_for_status()
+        except requests.exceptions.HTTPError as err:
+            status_code = err.response.status_code if err.response is not None else 502
+            return BARUtils.error_exit(f"External API request failed with status code {status_code}"), status_code
+        except requests.exceptions.RequestException as err:
+            return BARUtils.error_exit(f"External API request failed: {err}"), 502
+
+        try:
+            return resp.json()
+        except ValueError:
+            return BARUtils.error_exit("External API returned invalid JSON"), 502

tests/resources/test_proxy.py

@@ -1,6 +1,9 @@
 from api import app
 from json import load
 from unittest import TestCase
+from unittest.mock import MagicMock, patch
+
+import requests
 
 
 class TestIntegrations(TestCase):
@@ -12,23 +15,48 @@ def test_get_atted_api5(self):
         :return:
         """
         # Valid data
-        response = self.app_client.get("/proxy/atted_api5/At1g01010/5")
-        # Note: pytest is running from project root. So path is relative to project root
         with open("tests/data/get_atted_api5.json") as json_file:
             expected = load(json_file)
-        self.assertEqual(response.json, expected)
 
-        # Invalid gene
-        response = self.app_client.get("/proxy/atted_api5/At1g0101x/5")
-        expected = {"wasSuccessful": False, "error": "Invalid gene id"}
-        self.assertEqual(response.json, expected)
+        mock_success = MagicMock()
+        mock_success.status_code = 200
+        mock_success.json.return_value = expected
+        mock_success.raise_for_status.return_value = None
 
-        # If no data, the service should return this response
-        response = self.app_client.get("/proxy/atted_api5/At1g01011/5")
-        expected = {"error": "No gene ID specified.", "status_code": 400}
-        self.assertEqual(response.json, expected)
+        mock_no_data = MagicMock()
+        mock_no_data.status_code = 200
+        mock_no_data.json.return_value = {"error": "No gene ID specified.", "status_code": 400}
+        mock_no_data.raise_for_status.return_value = None
+
+        with patch("api.resources.proxy.requests.get", side_effect=[mock_success, mock_no_data]):
+            response = self.app_client.get("/proxy/atted_api5/At1g01010/5")
+
+            self.assertEqual(response.json, expected)
+
+            # Invalid gene
+            response = self.app_client.get("/proxy/atted_api5/At1g0101x/5")
+            expected = {"wasSuccessful": False, "error": "Invalid gene id"}
+            self.assertEqual(response.json, expected)
+
+            # If no data, the service should return this response
+            response = self.app_client.get("/proxy/atted_api5/At1g01011/5")
+            expected = {"error": "No gene ID specified.", "status_code": 400}
+            self.assertEqual(response.json, expected)
+
+            # Invalid topN count
+            response = self.app_client.get("proxy/atted_api5/At1g01010/9999999999999999999")
+            expected = {"wasSuccessful": False, "error": "Invalid count"}
+            self.assertEqual(response.json, expected)
+
+    def test_get_atted_api5_handles_external_error(self):
+        failure_response = MagicMock()
+        failure_response.status_code = 403
+        http_error = requests.exceptions.HTTPError(response=failure_response)
+        failure_response.raise_for_status.side_effect = http_error
+
+        with patch("api.resources.proxy.requests.get", return_value=failure_response):
+            response = self.app_client.get("/proxy/atted_api5/At1g01010/5")
 
-        # Invalid topN count
-        response = self.app_client.get("proxy/atted_api5/At1g01010/9999999999999999999")
-        expected = {"wasSuccessful": False, "error": "Invalid count"}
+        expected = {"wasSuccessful": False, "error": "External API request failed with status code 403"}
+        self.assertEqual(response.status_code, 403)
         self.assertEqual(response.json, expected)