Merge pull request #259 from superannotateai/fix-tag-delay

Fix tag delay

Author: dshabin

src/superannotate/lib/core/helpers.py

@@ -45,6 +45,17 @@ def map_annotation_classes_name(annotation_classes, reporter: Reporter) -> dict:
     return classes_data
 
 
+def fill_document_tags(
+    annotations: dict,
+    annotation_classes: dict,
+):
+    new_tags = []
+    for tag in annotations['tags']:
+        if annotation_classes.get(tag):
+            new_tags.append(annotation_classes[tag]['id'])
+    annotations['tags'] = new_tags
+
+
 def fill_annotation_ids(
     annotations: dict,
     annotation_classes_name_maps: dict,

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

@@ -15,6 +15,7 @@
 from lib.core.exceptions import AppException
 from lib.core.helpers import convert_to_video_editor_json
 from lib.core.helpers import fill_annotation_ids
+from lib.core.helpers import fill_document_tags
 from lib.core.helpers import map_annotation_classes_name
 from lib.core.reporter import Reporter
 from lib.core.service_types import UploadAnnotationAuthData
@@ -361,22 +362,28 @@ def prepare_annotations(
         templates: List[dict],
         reporter: Reporter,
     ) -> dict:
+        annotation_classes_name_maps = map_annotation_classes_name(
+            annotation_classes, reporter
+        )
         if project_type in (
             constances.ProjectType.VECTOR.value,
             constances.ProjectType.PIXEL.value,
-            constances.ProjectType.DOCUMENT.value,
+            constances.ProjectType.DOCUMENT.value
         ):
             fill_annotation_ids(
                 annotations=annotations,
-                annotation_classes_name_maps=map_annotation_classes_name(
-                    annotation_classes, reporter
-                ),
+                annotation_classes_name_maps=annotation_classes_name_maps,
                 templates=templates,
                 reporter=reporter,
             )
         elif project_type == constances.ProjectType.VIDEO.value:
             annotations = convert_to_video_editor_json(
-                annotations, map_annotation_classes_name(annotation_classes, reporter), reporter
+                annotations, annotation_classes_name_maps, reporter
+            )
+        if project_type == constances.ProjectType.DOCUMENT.value:
+            fill_document_tags(
+                annotations=annotations,
+                annotation_classes=annotation_classes_name_maps,
             )
         return annotations
 

src/superannotate/lib/infrastructure/services.py

@@ -1,3 +1,4 @@
+import time
 from contextlib import contextmanager
 from datetime import datetime
 from typing import Dict
@@ -653,6 +654,7 @@ def get_bulk_images(
         self, project_id: int, team_id: int, folder_id: int, images: List[str]
     ) -> List[dict]:
         bulk_get_images_url = urljoin(self.api_url, self.URL_BULK_GET_IMAGES)
+        time.sleep(1)
 
         res = self._request(
             bulk_get_images_url,

tests/data_set/document_annotation/text_file_example_1.json

@@ -1,36 +1 @@
-{
-  "metadata": {
-    "name": "text_file_example_1",
-    "status": "Completed",
-    "url": "https://sa-public-files.s3.us-west-2.amazonaws.com/Text+project/text_file_example_1.txt",
-    "projectId": 160158,
-    "annotatorEmail": null,
-    "qaEmail": null,
-    "lastAction": {
-      "email": "shab.prog@gmail.com",
-      "timestamp": 1634899229953
-    }
-  },
-  "instances": [
-    {
-      "start": 253,
-      "end": 593,
-      "classId": 873208,
-      "createdAt": "2021-10-22T10:40:26.151Z",
-      "createdBy": {
-        "email": "shab.prog@gmail.com",
-        "role": "Admin"
-      },
-      "updatedAt": "2021-10-22T10:40:29.953Z",
-      "updatedBy": {
-        "email": "shab.prog@gmail.com",
-        "role": "Admin"
-      },
-      "attributes": [],
-      "creationType": "Manual",
-      "className": "vid"
-    }
-  ],
-  "tags": [],
-  "freeText": ""
-}
+{"metadata":{"name":"text_file_example_1","status":"Completed","url":"https://sa-public-files.s3.us-west-2.amazonaws.com/Text+project/text_file_example_1.txt","projectId":160158,"annotatorEmail":null,"qaEmail":null,"lastAction":{"email":"shab.prog@gmail.com","timestamp":1634899229953}},"instances":[{"start":253,"end":593,"classId":873208,"createdAt":"2021-10-22T10:40:26.151Z","createdBy":{"email":"shab.prog@gmail.com","role":"Admin"},"updatedAt":"2021-10-22T10:40:29.953Z","updatedBy":{"email":"shab.prog@gmail.com","role":"Admin"},"attributes":[],"creationType":"Manual","className":"vid"}],"tags":["vid"],"freeText":""}

tests/integration/annotations/test_text_annotation_upload.py

@@ -5,6 +5,7 @@
 import pytest
 import src.superannotate as sa
 from tests.integration.base import BaseTestCase
+from src.superannotate.lib.core.helpers import fill_document_tags
 
 
 class TestUploadTextAnnotation(BaseTestCase):
@@ -72,3 +73,5 @@ def test_text_annotation_upload(self):
             downloaded_annotation = json.loads(open(f"{output_path}/text_file_example_1.json").read())
             instance = downloaded_annotation['instances'][0]
             self.assertEqual(instance['classId'], classes[0]['id'])
+            self.assertEqual(downloaded_annotation['tags'][0], "vid")
+