Split _send_request from resp error handling

Author: BryceBeagle

brainframe/api/stubs/base_stub.py

@@ -285,15 +285,15 @@ def _send_authorized(self, request: requests.Request, timeout) \
     def _send_no_auth(self, request: requests.Request, timeout) \
             -> requests.Response:
         """Sends the given request with no authorization."""
-        resp = self._send_request(request, timeout)
+        resp = self._perform_request(request, timeout)
         return resp
 
     def _send_with_credentials(self, request: requests.Request, timeout) \
             -> requests.Response:
         """Sends the given request with HTTP Basic Authorization."""
 
         request.auth = self._credentials
-        resp = self._send_request(request, timeout)
+        resp = self._perform_request(request, timeout)
 
         if "session_id" in resp.cookies:
             # Update the session ID if we don't already have one
@@ -306,7 +306,7 @@ def _send_with_session_id(self, request: requests.Request, timeout) \
         """Sends the given request with the session ID."""
         request.cookies = {"session_id": self._session_id}
         try:
-            resp = self._send_request(request, timeout)
+            resp = self._perform_request(request, timeout)
         except bf_errors.InvalidSessionError:
             # The session likely expired. Try again with the username and
             # password to fetch a new session
@@ -316,19 +316,13 @@ def _send_with_session_id(self, request: requests.Request, timeout) \
         return resp
 
     @staticmethod
-    def _send_request(request: requests.Request, timeout: int) \
-            -> requests.Response:
-        """Sends a request to the server. This method is mocked out in unit
-        tests.
+    def _perform_request(*args, **kwargs):
+        """Sends a request and handles any errors in the result
 
-        :param request: The request to send
-        :return: The response data
+        All arguments are passed to BaseStub._send_request
         """
-        prepared = request.prepare()
-
-        session = requests.Session()
         try:
-            resp = session.send(prepared, stream=True, timeout=timeout)
+            resp = BaseStub._send_request(*args, **kwargs)
         except requests.exceptions.RequestException as exc:
             raise _make_api_error(exception=exc)
 
@@ -337,6 +331,18 @@ def _send_request(request: requests.Request, timeout: int) \
 
         return resp
 
+    @staticmethod
+    def _send_request(request: requests.Request, timeout: int) \
+            -> requests.Response:
+        """Sends a request to the server. This method is mocked out in unit
+        tests.
+
+        :param request: The request to send
+        :return: The response data
+        """
+        prepared = request.prepare()
+        return requests.Session().send(prepared, stream=True, timeout=timeout)
+
 
 @typing.overload
 def _make_api_error(exception: Exception) -> bf_errors.BaseAPIError: