Coesmetic changes to avoid nesting exceptions

Author: elchicodepython

nocodb/infra/requests_client.py

@@ -21,16 +21,15 @@ def __init__(self, auth_token: AuthToken, base_uri: str):
         self.__session.headers.update({"Content-Type": "application/json"})
         self.__api_info = NocoDBAPI(base_uri)
 
-    def _request(self, method, url, *args, **kwargs):
+    def _request(self, method: str, url: str, *args, **kwargs):
         response = self.__session.request(method, url, *args, **kwargs)
+        response_json = None
         try:
             response.raise_for_status()
+            response_json = response.json()
+        except requests.exceptions.JSONDecodeError:
+            ...
         except requests.exceptions.HTTPError as http_error:
-            response_json = None
-            try:
-                response_json = response.json()
-            except requests.exceptions.JSONDecodeError:
-                ...
             raise NocoDBAPIError(
                 message=str(http_error),
                 status_code=http_error.response.status_code,

nocodb/infra/requests_client_test.py

@@ -0,0 +1,22 @@
+from unittest import mock
+
+import pytest
+import requests
+
+from .requests_client import NocoDBRequestsClient, requests as requests_lib
+from ..exceptions import NocoDBAPIError
+
+
+@mock.patch.object(requests_lib, "Session")
+def test_NocoDBAPIError_raised_on_bad_response(mock_requests_session):
+    mock_session = mock.Mock()
+    mock_resp = requests.models.Response()
+    mock_resp.status_code = 401
+    mock_requests_session.return_value = mock_session
+    mock_session.request.return_value = mock_resp
+
+    client = NocoDBRequestsClient(mock.Mock(), "")
+    with pytest.raises(NocoDBAPIError) as exc_info:
+        client._request("GET", "/")
+
+    assert exc_info.value.status_code == 401