Improve error handling in Upload API

Author: const-cloudinary

cloudinary/api_client/execute_request.py

@@ -87,7 +87,6 @@ def execute_request(http_connector, method, params, headers, auth, api_url, **op
 
     if "error" in result:
         exception_class = EXCEPTION_CODES.get(response.status) or Exception
-        exception_class = exception_class
         raise exception_class("Error {0} - {1}".format(response.status, result["error"]["message"]))
 
     return Response(result, response)

cloudinary/uploader.py

@@ -9,6 +9,7 @@
 
 import cloudinary
 from cloudinary import utils
+from cloudinary.api_client.execute_request import EXCEPTION_CODES
 from cloudinary.cache.responsive_breakpoints_cache import instance as responsive_breakpoints_cache_instance
 from cloudinary.exceptions import Error
 from cloudinary.utils import build_eager
@@ -898,7 +899,6 @@ def call_api(action, params, http_headers=None, return_error=False, unsigned=Fal
     if timeout is not None:
         kw['timeout'] = timeout
 
-    code = 200
     try:
         response = _http.request(method="POST", url=api_url, fields=param_list, headers=headers, **kw)
     except HTTPError as e:
@@ -913,11 +913,11 @@ def call_api(action, params, http_headers=None, return_error=False, unsigned=Fal
                     .format(response.status, response.data, e))
 
     if "error" in result:
-        if response.status not in [200, 400, 401, 403, 404, 500]:
-            code = response.status
         if return_error:
-            result["error"]["http_code"] = code
-        else:
-            raise Error(result["error"]["message"])
+            result["error"]["http_code"] = response.status
+            return result
+
+        exception_class = EXCEPTION_CODES.get(response.status) or Error
+        raise exception_class(result["error"]["message"])
 
     return result

test/test_uploader.py

@@ -447,6 +447,19 @@ def test_explicit_responsive_breakpoints_cache(self):
 
         self.assertEqual(self.rbp_values, cache_value)
 
+    @unittest.skipUnless(cloudinary.config().api_secret, "requires api_key/api_secret")
+    def test_explicit_error_handling_not_found(self):
+        # Test explicit error handling
+        with six.assertRaisesRegex(self, exceptions.NotFound, "Resource not found"):
+            uploader.explicit(UNIQUE_ID + "_does_not_exist", type="upload", tags=[UNIQUE_TAG])
+
+        not_found_res = uploader.explicit(UNIQUE_ID + "_does_not_exist", type="upload", tags=[UNIQUE_TAG],
+                                          return_error=True)
+
+        self.assertEqual(not_found_res["error"]["http_code"], 404)
+        self.assertTrue(not_found_res["error"]["message"].startswith("Resource not found"))
+
+
     @unittest.skipUnless(cloudinary.config().api_secret, "requires api_key/api_secret")
     def test_update_metadata(self):
         metadata = {METADATA_FIELD_UNIQUE_EXTERNAL_ID: "test"}
@@ -799,7 +812,7 @@ def test_upload_large_file_io(self):
             resource = uploader.upload_large(temp_file, chunk_size=LARGE_CHUNK_SIZE,
                                              tags=["upload_large_tag", UNIQUE_TAG], resource_type="image")
 
-            self.assertEqual(resource["tags"], ["upload_large_tag", UNIQUE_TAG])
+            self.assertCountEqual(resource["tags"], ["upload_large_tag", UNIQUE_TAG])
             self.assertEqual(resource["resource_type"], "image")
             self.assertEqual(resource["width"], LARGE_FILE_WIDTH)
             self.assertEqual(resource["height"], LARGE_FILE_HEIGHT)