Fixing some tests

Author: Leandro Rosemberg

roboflow/adapters/rfapi.py

@@ -106,15 +106,17 @@ def upload_image(
 
     if response.status_code != 200:
         if responsejson:
-            raise ImageUploadError(responsejson, status_code=response.status_code)
+            message = responsejson.get("message") or responsejson
+            raise ImageUploadError(message, status_code=response.status_code)
         else:
             raise ImageUploadError(response, status_code=response.status_code)
 
     if not responsejson:  # fail fast
         raise ImageUploadError(response, status_code=response.status_code)
 
     if not (responsejson.get("success") or responsejson.get("duplicate")):
-        raise ImageUploadError(responsejson)
+        message = responsejson.get("message") or responsejson
+        raise ImageUploadError(message)
 
     return responsejson
 
@@ -157,17 +159,18 @@ def save_annotation(
         pass
 
     if not responsejson:
-        raise AnnotationSaveError(response, status_code=response.status_code)
-
+        raise _save_annotation_error(response)
+    if response.status_code not in (200, 409):
+        raise _save_annotation_error(response)
     if response.status_code == 409:
         if "already annotated" in responsejson.get("error", {}).get("message"):
             return {"warn": "already annotated"}
-
+        else:
+            raise _save_annotation_error(response)
     if responsejson.get("error"):
-        raise AnnotationSaveError(responsejson["error"], status_code=response.status_code)
-
+        raise _save_annotation_error(response)
     if not responsejson.get("success"):
-        raise AnnotationSaveError(responsejson, status_code=response.status_code)
+        raise _save_annotation_error(response)
 
     return responsejson
 
@@ -212,3 +215,22 @@ def _local_upload_url(api_key, project_url, batch_name, tag_names, sequence_numb
         query_params.update(sequence_number=sequence_number, sequence_size=sequence_size)
 
     return _upload_url(api_key, project_url, **query_params)
+
+
+def _save_annotation_error(response):
+    responsejson = None
+    try:
+        responsejson = response.json()
+    except Exception:
+        pass
+
+    if not responsejson:
+        return AnnotationSaveError(response, status_code=response.status_code)
+
+    if responsejson.get("error"):
+        return AnnotationSaveError(responsejson['error'], status_code=response.status_code)
+
+    if responsejson.get("message"):
+        return AnnotationSaveError(responsejson['message'], status_code=response.status_code)
+
+    return AnnotationSaveError(responsejson, status_code=response.status_code)

roboflow/core/exceptions.py

@@ -1,21 +1,13 @@
 import responses
 
 from roboflow import API_URL
+from roboflow.adapters.rfapi import ImageUploadError, AnnotationSaveError
 from roboflow.config import DEFAULT_BATCH_NAME
-from roboflow.core.exceptions import UploadAnnotationError, UploadImageError
 from tests import PROJECT_NAME, ROBOFLOW_API_KEY, RoboflowTest
 
 
 class TestProject(RoboflowTest):
     def test_check_valid_image_with_accepted_formats(self):
-        # Mock dataset upload
-        responses.add(
-            responses.POST,
-            f"{API_URL}/dataset/{PROJECT_NAME}/upload?api_key={ROBOFLOW_API_KEY}" f"&batch={DEFAULT_BATCH_NAME}",
-            json={"duplicate": True, "id": "hbALkCFdNr9rssgOUXug"},
-            status=200,
-        )
-
         images_to_test = [
             "rabbit.JPG",
             "rabbit2.jpg",
@@ -27,14 +19,6 @@ def test_check_valid_image_with_accepted_formats(self):
             self.assertTrue(self.project.check_valid_image(f"tests/images/{image}"))
 
     def test_check_valid_image_with_unaccepted_formats(self):
-        # Mock dataset upload
-        responses.add(
-            responses.POST,
-            f"{API_URL}/dataset/{PROJECT_NAME}/upload?api_key={ROBOFLOW_API_KEY}" f"&batch={DEFAULT_BATCH_NAME}",
-            json={"duplicate": True, "id": "hbALkCFdNr9rssgOUXug"},
-            status=200,
-        )
-
         images_to_test = [
             "sky-rabbit.gif",
             "sky-rabbit.heic",
@@ -54,13 +38,13 @@ def test_upload_raises_upload_image_error_response_200(self):
             status=200,
         )
 
-        with self.assertRaises(UploadImageError) as error:
+        with self.assertRaises(ImageUploadError) as error:
             self.project.upload(
                 "tests/images/rabbit.JPG",
                 annotation_path="tests/annotations/valid_annotation.json",
             )
 
-        self.assertEqual(str(error.exception), "Error uploading image: Invalid Image")
+        self.assertEqual(str(error.exception), "Invalid Image")
 
     def test_upload_raises_upload_image_error_response_400(self):
         responses.add(
@@ -73,13 +57,13 @@ def test_upload_raises_upload_image_error_response_400(self):
             status=400,
         )
 
-        with self.assertRaises(UploadImageError) as error:
+        with self.assertRaises(ImageUploadError) as error:
             self.project.upload(
                 "tests/images/rabbit.JPG",
                 annotation_path="tests/annotations/valid_annotation.json",
             )
 
-        self.assertEqual(str(error.exception), "Error uploading image: Invalid Image")
+        self.assertEqual(str(error.exception), "Invalid Image")
 
     def test_upload_raises_upload_annotation_error(self):
         image_id = "hbALkCFdNr9rssgOUXug"
@@ -105,10 +89,10 @@ def test_upload_raises_upload_annotation_error(self):
             status=400,
         )
 
-        with self.assertRaises(UploadAnnotationError) as error:
+        with self.assertRaises(AnnotationSaveError) as error:
             self.project.upload(
                 "tests/images/rabbit.JPG",
                 annotation_path=f"tests/annotations/{image_name}",
             )
 
-        self.assertEqual(str(error.exception), "Error uploading annotation: Image was already annotated.")
+        self.assertEqual(str(error.exception), "Image was already annotated.")