updates to merge

Author: jtsodapop

CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+# Version 3.25.2 (2022-07-26)
+## Updated
+* Mask downloads now have retries
+* Failed `upload_data` now shows more details in the error message
+
+## Fixed
+* Fixed Metadata not importing with DataRows when bulk importing local files.
+* Fixed COCOConverter failing for empty annotations
+
+## Documentation
+* Notebooks are up-to-date with examples of importing annotations without `schema_id`
+
+# Version 3.25.1 (2022-07-20)
+## Fixed
+* Removed extra dependency causing import errors.
+
 # Version 3.25.0 (2022-07-20)
 
 ## Added

labelbox/__init__.py

@@ -1,5 +1,5 @@
 name = "labelbox"
-__version__ = "3.25.1"
+__version__ = "3.25.2"
 
 from labelbox.client import Client
 from labelbox.schema.project import Project

labelbox/client.py

@@ -381,9 +381,14 @@ def upload_data(self,
                 "Failed to upload, unknown cause", e)
 
         if not file_data or not file_data.get("uploadFile", None):
+            try:
+                errors = response.json().get("errors", [])
+                error_msg = next(iter(errors), {}).get("message",
+                                                       "Unknown error")
+            except Exception as e:
+                error_msg = "Unknown error"
             raise labelbox.exceptions.LabelboxError(
-                "Failed to upload, message: %s" % file_data or
-                file_data.get("error"))
+                "Failed to upload, message: %s" % error_msg)
 
         return file_data["uploadFile"]["url"]
 

labelbox/schema/project.py

@@ -205,6 +205,7 @@ def export_queued_data_rows(
             {exportQueuedDataRows(data:{projectId: $%s , includeMetadataInput: $%s}) {downloadUrl createdAt status} }
         """ % (id_param, metadata_param, id_param, metadata_param)
         sleep_time = 2
+        start_time = time.time()
         while True:
             res = self.client.execute(query_str, {
                 id_param: self.uid,
@@ -219,8 +220,8 @@ def export_queued_data_rows(
             elif res["status"] == "FAILED":
                 raise LabelboxError("Data row export failed.")
 
-            timeout_seconds -= sleep_time
-            if timeout_seconds <= 0:
+            current_time = time.time()
+            if current_time - start_time > timeout_seconds:
                 raise LabelboxError(
                     f"Unable to export data rows within {timeout_seconds} seconds."
                 )
@@ -328,10 +329,11 @@ def _validate_datetime(string_date: str) -> bool:
             {exportLabels(data:{projectId: $%s%s}) {downloadUrl createdAt shouldPoll} }
         """ % (id_param, id_param, filter_param)
 
+        start_time = time.time()
         while True:
             res = self.client.execute(query_str, {id_param: self.uid})
             res = res["exportLabels"]
-            if not res["shouldPoll"]:
+            if not res["shouldPoll"] and res["downloadUrl"] is not None:
                 url = res['downloadUrl']
                 if not download:
                     return url
@@ -340,8 +342,8 @@ def _validate_datetime(string_date: str) -> bool:
                     response.raise_for_status()
                     return response.json()
 
-            timeout_seconds -= sleep_time
-            if timeout_seconds <= 0:
+            current_time = time.time()
+            if current_time - start_time > timeout_seconds:
                 return None
 
             logger.debug("Project '%s' label export, waiting for server...",