Update version.py

Author: dshabin

src/superannotate/lib/app/serializers.py

@@ -114,3 +114,4 @@ def serialize(self):
         if data["attribute"] == "ImageQuality":
             data["value"] = constance.ImageQuality.get_name(data["value"])
         return data
+

src/superannotate/lib/core/usecases/annotations.py

@@ -508,6 +508,7 @@ def __init__(
         self._item_names = item_names
         self._client = backend_service_provider
         self._show_process = show_process
+        self._item_names_provided = True
 
     def validate_project_type(self):
         if self._project.project_type == constances.ProjectType.PIXEL.value:
@@ -523,6 +524,7 @@ def validate_item_names(self):
                 )
                 self._item_names = item_names
         else:
+            self._item_names_provided = False
             condition = (
                     Condition("team_id", self._project.team_id, EQ)
                     & Condition("project_id", self._project.uuid, EQ)
@@ -531,6 +533,18 @@ def validate_item_names(self):
 
             self._item_names = [item.name for item in self._images.get_all(condition)]
 
+    def _prettify_annotations(self, annotations: List[dict]):
+
+        if self._item_names_provided:
+            try:
+                data = []
+                for annotation in annotations:
+                   data.append((self._item_names.index(annotation["metadata"]["name"]), annotation))
+                return [i[1] for i in sorted(data, key=lambda x: x[0])]
+            except KeyError:
+                raise AppException("Broken data.")
+        return annotations
+
     def execute(self):
         if self.is_valid():
             items_count = len(self._item_names)
@@ -552,7 +566,7 @@ def execute(self):
                 self.reporter.log_warning(
                     f"Could not find annotations for {items_count - received_items_count}/{items_count} items."
                 )
-            self._response.data = annotations
+            self._response.data = self._prettify_annotations(annotations)
         return self._response
 
 

src/superannotate/version.py

@@ -1 +1 @@
-__version__ = "4.3.0b13"
+__version__ = "4.3.0b16"

tests/integration/annotations/test_get_annotations.py

@@ -43,6 +43,25 @@ def test_get_annotations(self):
             self.assertEqual(len(annotation_data["instances"]), len(annotations[0]["instances"]))
         parse_obj_as(List[VectorAnnotation], annotations)
 
+    @pytest.mark.flaky(reruns=3)
+    def test_get_annotations_order(self):
+        sa.init()
+        sa.upload_images_from_folder_to_project(
+            self.PROJECT_NAME, self.folder_path, annotation_status="InProgress"
+        )
+        sa.create_annotation_classes_from_classes_json(
+            self.PROJECT_NAME, f"{self.folder_path}/classes/classes.json"
+        )
+        _, _, _ = sa.upload_annotations_from_folder_to_project(
+            self.PROJECT_NAME, self.folder_path
+        )
+        names = [
+            self.IMAGE_NAME, self.IMAGE_NAME.replace("1", "2"),
+            self.IMAGE_NAME.replace("1", "3"), self.IMAGE_NAME.replace("1", "4")
+        ]
+        annotations = sa.get_annotations(f"{self.PROJECT_NAME}", names)
+        self.assertEqual(names, [i["metadata"]["name"] for i in annotations])
+
     @pytest.mark.flaky(reruns=3)
     def test_get_annotations_from_folder(self):
         sa.init()