Merge pull request #60 from Aspire1Inspire2/Auto-refresh-query-limit

Add more exceptions to better handle error code

Author: areed1192

td/client.py

@@ -20,21 +20,8 @@
 from td.app.auth import FlaskTDAuth
 from td.oauth import run
 from td.oauth import shutdown
-
-class TknExpError(Exception):
-    """Raise exception when refresh or access token is expired.
-
-    Args:
-        Exception (Exception): The base python exception class
-    """
-    def __init__(self, message):
-        """Print out message for this exception.
-
-        Args:
-            message (str): Pass in the message returned by the server.
-        """
-        self.message = message
-        super().__init__(self.message)
+from td.exceptions import TknExpError, ExdLmtError, NotNulError, \
+    ForbidError, NotFndError, ServerError, GeneralError
 
 class TDClient():
 
@@ -583,8 +570,20 @@ def _make_request(self, method: str, endpoint: str, mode: str = None, params: di
             print("RESPONSE TEXT: {text}".format(text=response.text))
             print('-'*80)
 
-            if response.status_code == 401:
+            if response.status_code == 400:
+                raise NotNulError(message=response.text)
+            elif response.status_code == 401:
                 raise TknExpError(message=response.text)
+            elif response.status_code == 403:
+                raise ForbidError(message=response.text)
+            elif response.status_code == 404:
+                raise NotFndError(message=response.text)
+            elif response.status_code == 429:
+                raise ExdLmtError(message=response.text)
+            elif response.status_code == 500 or response.status_code == 503:
+                raise ServerError(message=response.text)
+            elif response.status_code > 400:
+                raise GeneralError(message=response.text)
 
     def _validate_arguments(self, endpoint: str, parameter_name: str, parameter_argument: List[str]) -> bool:
         """Validates arguments for an API call.

td/exceptions.py

@@ -0,0 +1,107 @@
+class TknExpError(Exception):
+    """Raise exception when refresh or access token is expired.
+
+    Args:
+        Exception (Exception): The base python exception class
+    """
+    def __init__(self, message):
+        """Print out message for this exception.
+
+        Args:
+            message (str): Pass in the message returned by the server.
+        """
+        self.message = message
+        super().__init__(self.message)
+
+class ExdLmtError(Exception):
+    """Raise exception when exceeding query limit of the server.
+
+    Args:
+        Exception (Exception): The base python exception class
+    """
+    def __init__(self, message):
+        """Print out message for this exception.
+
+        Args:
+            message (str): Pass in the message returned by the server.
+        """
+        self.message = message
+        super().__init__(self.message)
+
+class NotNulError(Exception):
+    """Raise exception when a null value is passed into non-null field.
+
+    Args:
+        Exception (Exception): The base python exception class
+    """
+    def __init__(self, message):
+        """Print out message for this exception.
+
+        Args:
+            message (str): Pass in the message returned by the server.
+        """
+        self.message = message
+        super().__init__(self.message)
+
+class ForbidError(Exception):
+    """Raise forbidden exception. This usually occurs when the app does
+    not have access to the account.
+
+    Args:
+        Exception (Exception): The base python exception class
+    """
+    def __init__(self, message):
+        """Print out message for this exception.
+
+        Args:
+            message (str): Pass in the message returned by the server.
+        """
+        self.message = message
+        super().__init__(self.message)
+
+class NotFndError(Exception):
+    """Raise exception when criteria is not found.
+
+    Args:
+        Exception (Exception): The base python exception class
+    """
+    def __init__(self, message):
+        """Print out message for this exception.
+
+        Args:
+            message (str): Pass in the message returned by the server.
+        """
+        self.message = message
+        super().__init__(self.message)
+
+class ServerError(Exception):
+    """Raise exception when there is an error with the service or the server
+    cannot provide response.
+
+    Args:
+        Exception (Exception): The base python exception class
+    """
+    def __init__(self, message):
+        """Print out message for this exception.
+
+        Args:
+            message (str): Pass in the message returned by the server.
+        """
+        self.message = message
+        super().__init__(self.message)
+
+class GeneralError(Exception):
+    """Raise exception for all other status code >400 errors which are not
+    defined above.
+
+    Args:
+        Exception (Exception): The base python exception class
+    """
+    def __init__(self, message):
+        """Print out message for this exception.
+
+        Args:
+            message (str): Pass in the message returned by the server.
+        """
+        self.message = message
+        super().__init__(self.message)