Merge branch 'master' of https://github.com/superannotateai/superannotate-python-sdk

Author: agyurjin

.gitignore

@@ -139,3 +139,4 @@ venv_*
 pylint.html
 _mask.c
 tags
+temp

superannotate/db/annotation_classes.py

@@ -297,17 +297,25 @@ def download_annotation_classes_json(project, folder):
 
 def fill_class_and_attribute_names(annotations_json, annotation_classes_dict):
     for r in annotations_json["instances"]:
-        if "classId" in r and r["classId"] in annotation_classes_dict:
-            r["className"] = annotation_classes_dict[r["classId"]]["name"]
-            if "attributes" in r:
-                for attribute in r["attributes"]:
-                    if "groupId" in attribute and "id" in "attribute":
-                        attribute["groupName"] = annotation_classes_dict[
-                            r["classId"]]["attribute_groups"][
-                                attribute["groupId"]]["name"]
-                        attribute["name"] = annotation_classes_dict[
-                            r["classId"]]["attribute_groups"][attribute[
-                                "groupId"]]["attributes"][attribute["id"]]
+        if "classId" not in r or r["classId"] not in annotation_classes_dict:
+            continue
+        r["className"] = annotation_classes_dict[r["classId"]]["name"]
+        if "attributes" not in r:
+            continue
+        for attribute in r["attributes"]:
+            if "groupId" not in attribute or "id" not in attribute:
+                continue
+            if attribute["groupId"] not in annotation_classes_dict[
+                r["classId"]]["attribute_groups"]:
+                continue
+            attribute["groupName"] = annotation_classes_dict[
+                r["classId"]]["attribute_groups"][attribute["groupId"]]["name"]
+            if attribute["id"] not in annotation_classes_dict[r["classId"]][
+                "attribute_groups"][attribute["groupId"]]["attributes"]:
+                continue
+            attribute["name"] = annotation_classes_dict[
+                r["classId"]]["attribute_groups"][
+                    attribute["groupId"]]["attributes"][attribute["id"]]
 
 
 def fill_class_and_attribute_ids(annotation_json, annotation_classes_dict):
@@ -324,28 +332,27 @@ def fill_class_and_attribute_ids(annotation_json, annotation_classes_dict):
         class_id = annotation_classes_dict[annotation_class_name]["id"]
         ann["classId"] = class_id
         for attribute in ann["attributes"]:
-            if attribute["groupName"] in annotation_classes_dict[
+            if attribute["groupName"] not in annotation_classes_dict[
                 annotation_class_name]["attribute_groups"]:
-                attribute["groupId"] = annotation_classes_dict[
-                    annotation_class_name]["attribute_groups"][
-                        attribute["groupName"]]["id"]
-            else:
                 logger.warning(
                     "Couldn't find annotation group %s", attribute["groupName"]
                 )
                 continue
-            if attribute["name"] in annotation_classes_dict[
+            attribute["groupId"] = annotation_classes_dict[
+                annotation_class_name]["attribute_groups"][
+                    attribute["groupName"]]["id"]
+            if attribute["name"] not in annotation_classes_dict[
                 annotation_class_name]["attribute_groups"][
                     attribute["groupName"]]["attributes"]:
-                attribute["id"] = annotation_classes_dict[
-                    annotation_class_name]["attribute_groups"][
-                        attribute["groupName"]]["attributes"][attribute["name"]]
-            else:
                 logger.warning(
                     "Couldn't find annotation name %s in annotation group %s",
                     attribute["name"], attribute["groupName"]
                 )
                 del attribute["groupId"]
+                continue
+            attribute["id"] = annotation_classes_dict[annotation_class_name][
+                "attribute_groups"][attribute["groupName"]]["attributes"][
+                    attribute["name"]]
 
 
 def check_annotation_json(annotation_json):

superannotate/db/projects.py

@@ -41,6 +41,7 @@
 
 _api = API.get_instance()
 _NUM_THREADS = 10
+_TIME_TO_UPDATE_IN_TQDM = 1
 
 
 def create_project(project_name, project_description, project_type):
@@ -1196,7 +1197,8 @@ def __upload_annotations_thread(
             if not check_annotation_json(annotation_json):
                 couldnt_upload[thread_id].append(full_path)
                 logger.warning(
-                    "Annotation JSON %s missing width or height info", full_path
+                    "Annotation JSON %s missing width or height info. Skipping upload",
+                    full_path
                 )
                 continue
             fill_class_and_attribute_ids(
@@ -1431,7 +1433,8 @@ def __upload_preannotations_thread(
         if not check_annotation_json(annotation_json):
             couldnt_upload[thread_id].append(full_path)
             logger.warning(
-                "Annotation JSON %s missing width or height info", full_path
+                "Annotation JSON %s missing width or height info. Skipping upload",
+                full_path
             )
             continue
         fill_class_and_attribute_ids(annotation_json, annotation_classes_dict)
@@ -1460,7 +1463,7 @@ def __upload_preannotations_thread(
 def __tqdm_thread_upload(total_num, uploaded, couldnt_upload, finish_event):
     with tqdm(total=total_num) as pbar:
         while True:
-            finished = finish_event.wait(5)
+            finished = finish_event.wait(_TIME_TO_UPDATE_IN_TQDM)
             if not finished:
                 sum_all = 0
                 for i in couldnt_upload:
@@ -1478,7 +1481,7 @@ def __tqdm_thread_upload_annotations(
 ):
     with tqdm(total=total_num) as pbar:
         while True:
-            finished = finish_event.wait(5)
+            finished = finish_event.wait(_TIME_TO_UPDATE_IN_TQDM)
             if not finished:
                 sum_all = 0
                 for i in couldnt_upload:
@@ -1498,7 +1501,7 @@ def __tqdm_thread_upload_preannotations(
 ):
     with tqdm(total=total_num) as pbar:
         while True:
-            finished = finish_event.wait(5)
+            finished = finish_event.wait(_TIME_TO_UPDATE_IN_TQDM)
             if not finished:
                 sum_all = 0
                 for i in couldnt_upload:

superannotate/version.py

@@ -1 +1 @@
-__version__ = "3.1.0"
+__version__ = "3.1.2"

tests/test_image_copy_move.py

@@ -1,7 +1,5 @@
 from pathlib import Path
 
-import pytest
-
 import superannotate as sa
 
 PROJECT_NAME_CPY = "test image copy 1"

tests/test_single_annotation_download.py

@@ -42,7 +42,7 @@ def test_annotation_download_upload(
 
     project = upload_project(from_folder, name, description, project_type)
 
-    image = sa.search_images(project)[2]
+    image = sa.search_images(project)[0]
     paths = sa.download_image_annotations(project, image, tmpdir)
 
     input_annotation_paths_after = sa.image_path_to_annotation_paths(
@@ -68,8 +68,14 @@ def test_annotation_download_upload(
     json2 = json.load(open(anns_json_in_folder[0]))
     for i in json1["instances"]:
         i.pop("classId", None)
+        for j in i["attributes"]:
+            j.pop("groupId", None)
+            j.pop("id", None)
     for i in json2["instances"]:
         i.pop("classId", None)
+        for j in i["attributes"]:
+            j.pop("groupId", None)
+            j.pop("id", None)
     assert json1 == json2
     if project_type == "Pixel":
         assert filecmp.cmp(