Merge pull request #329 from Labelbox/grant/improve-error-handling

Improve error handling [DIAG-884]

Author: GrantEating

labelbox/client.py

@@ -201,7 +201,7 @@ def check_errors(keywords, *path):
             return None
 
         def get_error_status_code(error):
-            return error["extensions"]["exception"]["status"]
+            return error["extensions"]["exception"].get("status")
 
         if check_errors(["AUTHENTICATION_ERROR"], "extensions",
                         "code") is not None:
@@ -242,6 +242,18 @@ def get_error_status_code(error):
             # as they already know which resource type and ID was requested
             return None
 
+        resource_conflict_error = check_errors(["RESOURCE_CONFLICT"],
+                                               "extensions", "code")
+        if resource_conflict_error is not None:
+            raise labelbox.exceptions.ResourceConflict(
+                resource_conflict_error["message"])
+
+        malformed_request_error = check_errors(["MALFORMED_REQUEST"],
+                                               "extensions", "code")
+        if malformed_request_error is not None:
+            raise labelbox.exceptions.MalformedQueryException(
+                malformed_request_error["message"])
+
         # A lot of different error situations are now labeled serverside
         # as INTERNAL_SERVER_ERROR, when they are actually client errors.
         # TODO: fix this in the server API
@@ -263,8 +275,14 @@ def get_error_status_code(error):
 
         if len(errors) > 0:
             logger.warning("Unparsed errors on query execution: %r", errors)
+            messages = list(
+                map(
+                    lambda x: {
+                        "message": x["message"],
+                        "code": x["extensions"]["code"]
+                    }, errors))
             raise labelbox.exceptions.LabelboxError("Unknown error: %s" %
-                                                    str(errors))
+                                                    str(messages))
 
         # if we do return a proper error code, and didn't catch this above
         # reraise

labelbox/exceptions.py

@@ -42,6 +42,11 @@ def __init__(self, db_object_type, params):
         self.params = params
 
 
+class ResourceConflict(LabelboxError):
+    """Exception raised when a given resource conflicts with another. """
+    pass
+
+
 class ValidationFailedError(LabelboxError):
     """Exception raised for when a GraphQL query fails validation (query cost,
     etc.) E.g. a query that is too expensive, or depth is too deep.