Handles ImageUploadErrors in rfapi

Author: Leandro Rosemberg

roboflow/adapters/rfapi.py

@@ -18,6 +18,14 @@ class UploadError(RoboflowError):
     pass
 
 
+class ImageUploadError(RoboflowError):
+    def __init__(self, message, status_code=None):
+        self.message = message
+        self.status_code = status_code
+        self.retries = 0
+        super().__init__(self.message)
+
+
 def get_workspace(api_key, workspace_url):
     url = f"{API_URL}/{workspace_url}?api_key={api_key}"
     response = requests.get(url)
@@ -78,24 +86,29 @@ def upload_image(
 
     else:
         # Hosted image upload url
-
         upload_url = _hosted_upload_url(api_key, project_url, image_path, split, coalesced_batch_name, tag_names)
+
         # Get response
         response = requests.post(upload_url, timeout=(300, 300))
+
     responsejson = None
     try:
         responsejson = response.json()
     except Exception:
         pass
+
     if response.status_code != 200:
         if responsejson:
-            raise UploadError(f"Bad response: {response.status_code}: {responsejson}")
+            raise ImageUploadError(responsejson, status_code=response.status_code)
         else:
-            raise UploadError(f"Bad response: {response}")
+            raise ImageUploadError(response)
+
     if not responsejson:  # fail fast
-        raise UploadError(f"upload image {image_path} 200 OK, unexpected response: {response}")
+        raise ImageUploadError(response, status_code=response.status_code)
+
     if not (responsejson.get("success") or responsejson.get("duplicate")):
-        raise UploadError(f"Server rejected image: {responsejson}")
+        raise ImageUploadError(responsejson)
+
     return responsejson
 
 

roboflow/core/project.py

@@ -12,6 +12,7 @@
 import requests
 
 from roboflow.adapters import rfapi
+from roboflow.adapters.rfapi import ImageUploadError
 from roboflow.config import API_URL, DEMO_KEYS
 from roboflow.core.exceptions import UploadAnnotationError, UploadImageError
 from roboflow.core.version import Version
@@ -496,7 +497,7 @@ def single_upload(
         if image_path:
             t0 = time.time()
             try:
-                retry = Retry(num_retry_uploads, Exception)
+                retry = Retry(num_retry_uploads, ImageUploadError)
                 uploaded_image = retry(
                     rfapi.upload_image,
                     self.__api_key,
@@ -512,13 +513,9 @@ def single_upload(
                 )
                 image_id = uploaded_image["id"]  # type: ignore[index]
                 upload_retry_attempts = retry.retries
-            except rfapi.UploadError as e:
-                raise UploadImageError(
-                    f"Error uploading image: {self._parse_upload_error(e)}",
-                    retry_attempts=upload_retry_attempts,
-                )
-            except BaseException as e:
-                uploaded_image = {"error": e}
+            except rfapi.ImageUploadError as e:
+                e.retries = upload_retry_attempts
+                raise e
             finally:
                 upload_time = time.time() - t0