Fix one more bug and remove use of annotate_segmentation endpoint

Author: Ubuntu

nucleus/annotation_uploader.py

@@ -24,7 +24,7 @@ def accumulate_dict_values(dicts: Iterable[dict]):
     result = {}
     for d in dicts:
         for key, value in d.items():
-            if key not in result:
+            if key not in result or key == "dataset_id":
                 result[key] = value
             else:
                 result[key] += value
@@ -112,15 +112,12 @@ def make_batched_annotate_requests(
             "Segmentation batches" if segmentation else "Annotation batches"
         )
         for batch in self._client.tqdm_bar(batches, desc=progress_bar_name):
-            if segmentation:
-                payload = construct_segmentation_payload(batch, update)
-                # TODO: remove validation checks in backend for /annotate
-                # since it should work.
-                route = f"dataset/{self.dataset_id}/annotate_segmentation"
-            else:
-                payload = construct_annotation_payload(batch, update)
-                route = f"dataset/{self.dataset_id}/annotate"
-            responses.append(self._client.make_request(payload, route))
+            payload = construct_annotation_payload(batch, update)
+            responses.append(
+                self._client.make_request(
+                    payload, route=f"dataset/{self.dataset_id}/annotate"
+                )
+            )
         return responses
 
     def make_batched_file_form_data_requests(

nucleus/payload_constructor.py

@@ -1,4 +1,4 @@
-from typing import Dict, List, Optional, Union
+from typing import Any, Dict, List, Optional, Union
 
 from .annotation import (
     BoxAnnotation,
@@ -72,11 +72,22 @@ def construct_annotation_payload(
     ],
     update: bool,
 ) -> dict:
-    annotations = []
-    for annotation_item in annotation_items:
-        annotations.append(annotation_item.to_payload())
-
-    return {ANNOTATIONS_KEY: annotations, ANNOTATION_UPDATE_KEY: update}
+    annotations = [
+        annotation.to_payload()
+        for annotation in annotation_items
+        if not isinstance(annotation, SegmentationAnnotation)
+    ]
+    segmentations = [
+        annotation.to_payload()
+        for annotation in annotation_items
+        if isinstance(annotation, SegmentationAnnotation)
+    ]
+    payload: Dict[str, Any] = {ANNOTATION_UPDATE_KEY: update}
+    if annotations:
+        payload[ANNOTATIONS_KEY] = annotations
+    if segmentations:
+        payload[SEGMENTATIONS_KEY] = segmentations
+    return payload
 
 
 def construct_segmentation_payload(