Fix some bugs

Author: Leandro Rosemberg

roboflow/adapters/rfapi.py

@@ -102,8 +102,15 @@ def upload_image(
 
     if response.status_code != 200:
         if responsejson:
-            message = responsejson.get("message") or responsejson
-            raise ImageUploadError(message, status_code=response.status_code)
+            err_msg = responsejson
+
+            if err_msg.get("error"):
+                err_msg = err_msg["error"]
+
+            if err_msg.get("message"):
+                err_msg = err_msg["message"]
+
+            raise ImageUploadError(err_msg, status_code=response.status_code)
         else:
             raise ImageUploadError(response, status_code=response.status_code)
 
@@ -224,9 +231,9 @@ def _save_annotation_error(response):
         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)
+        err_msg = responsejson["error"]
+        if err_msg.get("message"):
+            err_msg = err_msg["message"]
+        return AnnotationSaveError(err_msg, status_code=response.status_code)
 
     return AnnotationSaveError(responsejson, status_code=response.status_code)

roboflow/core/workspace.py

@@ -317,7 +317,7 @@ def _log_img_upload(
             img_duplicate = image.get("duplicate")
 
             upload_time_str = f"[{image_upload_time:.1f}s]"
-            annotation_time_str = f"[{annotation_time:.1f}s]"
+            annotation_time_str = f"[{annotation_time:.1f}s]" if annotation_time else ""
             retry_attempts = f" (with {image_upload_retry_attempts} retries)" if image_upload_retry_attempts > 0 else ""
 
             if img_duplicate:
@@ -366,7 +366,7 @@ def _save_annotation(image_id, imagedesc):
                     labelmap = load_labelmap(labelmap)
 
             if not annotation_path:
-                return
+                return None, None
 
             annotation, upload_time = project.save_annotation(
                 annotation_path=annotation_path,

tests/test_project.py

@@ -27,32 +27,16 @@ def test_check_valid_image_with_unaccepted_formats(self):
         for image in images_to_test:
             self.assertFalse(self.project.check_valid_image(f"tests/images/{image}"))
 
-    def test_upload_raises_upload_image_error_response_200(self):
+    def test_upload_raises_upload_image_error(self):
         responses.add(
             responses.POST,
             f"{API_URL}/dataset/{PROJECT_NAME}/upload?api_key={ROBOFLOW_API_KEY}" f"&batch={DEFAULT_BATCH_NAME}",
             json={
-                "message": "Invalid Image",
-                "type": "InvalidImageException",
-            },
-            status=200,
-        )
-
-        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), "Invalid Image")
-
-    def test_upload_raises_upload_image_error_response_400(self):
-        responses.add(
-            responses.POST,
-            f"{API_URL}/dataset/{PROJECT_NAME}/upload?api_key={ROBOFLOW_API_KEY}" f"&batch={DEFAULT_BATCH_NAME}",
-            json={
-                "message": "Invalid Image",
-                "type": "InvalidImageException",
+                "error": {
+                    "message": "Invalid image.",
+                    "type": "InvalidImageException",
+                    "hint": "This image was already annotated; to overwrite the annotation, pass overwrite=true..."
+                }
             },
             status=400,
         )
@@ -63,7 +47,7 @@ def test_upload_raises_upload_image_error_response_400(self):
                 annotation_path="tests/annotations/valid_annotation.json",
             )
 
-        self.assertEqual(str(error.exception), "Invalid Image")
+        self.assertEqual(str(error.exception), "Invalid image.")
 
     def test_upload_raises_upload_annotation_error(self):
         image_id = "hbALkCFdNr9rssgOUXug"
@@ -82,9 +66,11 @@ def test_upload_raises_upload_annotation_error(self):
             responses.POST,
             f"{API_URL}/dataset/{PROJECT_NAME}/annotate/{image_id}?api_key={ROBOFLOW_API_KEY}" f"&name={image_name}",
             json={
-                "message": "Image was already annotated.",
-                "type": "InvalidImageException",
-                "hint": "This image was already annotated; to overwrite the annotation, pass overwrite=true...",
+                "error": {
+                    "message": "Image was already annotated.",
+                    "type": "InvalidImageException",
+                    "hint": "This image was already annotated; to overwrite the annotation, pass overwrite=true..."
+                }
             },
             status=400,
         )