app: add exception class for ConnectionError, TooManyRedirects

sdclientapi/__init__.py

@@ -4,7 +4,12 @@
 import os
 import requests
 from datetime import datetime
-from requests.exceptions import ConnectTimeout, ReadTimeout
+from requests.exceptions import (
+    ConnectTimeout,
+    ReadTimeout,
+    ConnectionError,
+    TooManyRedirects
+)
 from subprocess import PIPE, Popen, TimeoutExpired
 from typing import List, Tuple, Dict, Optional, Any
 from urllib.parse import urljoin
@@ -33,6 +38,15 @@ def __init__(self) -> None:
         super().__init__("The request timed out.")
 
 
+class ServerConnectionError(Exception):
+    """
+    Error raised if a request times out.
+    """
+
+    def __init__(self) -> None:
+        super().__init__("The request timed out.")
+
+
 def json_query(proxy_vm_name: str, data: str, timeout: Optional[int] = None) -> str:
     """
     Takes a JSON based query and passes it to the network proxy.
@@ -149,6 +163,8 @@ def _send_http_json_request(
             result = requests.request(method, url, **kwargs)
         except (ConnectTimeout, ReadTimeout):
             raise RequestTimeoutError
+        except (TooManyRedirects, ConnectionError):
+            raise ServerConnectionError
 
         # Because when we download a file there is no JSON in the body
         if path_query.endswith("/download"):
@@ -183,6 +199,8 @@ def _send_rpc_json_request(
 
         if "error" in data and result["status"] == http.HTTPStatus.GATEWAY_TIMEOUT:
             raise RequestTimeoutError
+        elif "error" in data and result["status"] == http.HTTPStatus.BAD_GATEWAY:
+            raise ServerConnectionError
         elif "error" in data and result["status"] == 403:
             raise AuthError(data["error"])
         elif "error" in data and result["status"] != 404: