Init metadata with width and height

Author: hovnatan

.vscode/settings.json

@@ -7,5 +7,6 @@
     ],
     "python.testing.unittestEnabled": false,
     "python.testing.nosetestsEnabled": false,
-    "python.testing.pytestEnabled": true
+    "python.testing.pytestEnabled": true,
+    "python.pythonPath": "venv_sa_conv/bin/python"
 }

Makefile

@@ -44,4 +44,4 @@ dist:
 	twine upload dist/*
 
 check_formatting:
-	yapf -p -r --diff -e '*/pycocotools_sa' superannotate
+	yapf -p -r --diff superannotate

superannotate/db/annotation_classes.py

@@ -296,6 +296,8 @@ def download_annotation_classes_json(project, folder):
 
 
 def fill_class_and_attribute_names(annotations_json, annotation_classes_dict):
+    if "instances" not in annotations_json:
+        return
     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"]

superannotate/db/project_images.py

@@ -114,7 +114,7 @@ def upload_image_to_project(
         images_array = get_image_array_to_upload(
             img, image_quality_in_editor, project["type"]
         )
-        upload_image_array_to_s3(bucket, *images_array, key)
+        upload_image_array_to_s3(bucket, *images_array, key, project["type"])
     except Exception as e:
         raise SABaseException(0, "Couldn't upload to data server. " + e)
 

superannotate/db/projects.py

@@ -538,8 +538,13 @@ def upload_images_from_folder_to_project(
     )
 
 
+def create_empty_annotation(size):
+    return {"metadata": {'height': size[1], 'width': size[0]}}
+
+
 def upload_image_array_to_s3(
-    bucket, size, orig_image, lores_image, huge_image, thumbnail_image, key
+    bucket, size, orig_image, lores_image, huge_image, thumbnail_image, key,
+    project_type
 ):
     bucket.put_object(Body=orig_image, Key=key)
     bucket.put_object(Body=lores_image, Key=key + '___lores.jpg')
@@ -552,6 +557,10 @@ def upload_image_array_to_s3(
         }
     )
     bucket.put_object(Body=thumbnail_image, Key=key + '___thumb.jpg')
+    postfix_json = '___objects.json' if project_type == "Vector" else '___pixel.json'
+    bucket.put_object(
+        Body=json.dumps(create_empty_annotation(size)), Key=key + postfix_json
+    )
 
 
 def get_image_array_to_upload(
@@ -657,7 +666,9 @@ def __upload_images_to_aws_thread(
             images_array = get_image_array_to_upload(
                 file, image_quality_in_editor, project["type"]
             )
-            upload_image_array_to_s3(bucket, *images_array, key)
+            upload_image_array_to_s3(
+                bucket, *images_array, key, project["type"]
+            )
         except Exception as e:
             logger.warning("Unable to upload image %s. %s", path, e)
             couldnt_upload[thread_id].append(path)
@@ -1191,8 +1202,8 @@ def upload_annotations_from_folder_to_project(
     :param recursive_subfolders: enable recursive subfolder parsing
     :type recursive_subfolders: bool
 
-    :return: paths to annotations uploaded
-    :rtype: list of strs
+    :return: paths to annotations uploaded, could-not-upload, missing-images
+    :rtype: tuple of list of strs
     """
     if recursive_subfolders:
         logger.info(
@@ -1439,6 +1450,7 @@ def __tqdm_thread_upload_annotations(
                 pbar.update(total_num - pbar.n)
                 break
 
+
 def __tqdm_thread_upload_preannotations(
     total_num, uploaded, couldnt_upload, finish_event
 ):
@@ -1480,8 +1492,8 @@ def upload_preannotations_from_folder_to_project(
     :param recursive_subfolders: enable recursive subfolder parsing
     :type recursive_subfolders: bool
 
-    :return: paths to pre-annotations uploaded
-    :rtype: list of strs
+    :return: paths to pre-annotations uploaded and could-not-upload
+    :rtype: tuple of list of strs
     """
     if recursive_subfolders:
         logger.info(
@@ -1583,7 +1595,6 @@ def _upload_preannotations_from_folder_to_project(
     finish_event = threading.Event()
     tqdm_thread = threading.Thread(
         target=__tqdm_thread_upload_preannotations,
-
         args=(len_preannotations_paths, couldnt_upload, uploaded, finish_event),
         daemon=True
     )
@@ -1627,7 +1638,6 @@ def _upload_preannotations_from_folder_to_project(
         for file in upload_thread:
             list_of_uploaded.append(str(file))
     return (list_of_uploaded, list_of_not_uploaded)
-    return return_result + [str(p) for p in preannotations_paths]
 
 
 def share_project(project, user, user_role):

tests/test_init_annot.py

@@ -0,0 +1,29 @@
+from pathlib import Path
+
+import cv2
+
+import superannotate as sa
+
+name = "Example Project test meta init"
+project_type = "Vector"
+description = "test vector"
+from_folder = Path("./tests/sample_project_vector_for_checks")
+
+
+def test_meta_init(tmpdir):
+    projects = sa.search_projects(name, return_metadata=True)
+    for project in projects:
+        sa.delete_project(project)
+
+    project = sa.create_project(name, description, project_type)
+
+    sa.upload_images_from_folder_to_project(
+        project, from_folder, annotation_status="NotStarted"
+    )
+
+    for image in from_folder.glob("*.jpg"):
+        size = cv2.imread(str(image)).shape
+        annot = sa.get_image_annotations(project, image.name)["annotation_json"]
+        print(annot)
+        assert annot["metadata"]["width"] == size[1]
+        assert annot["metadata"]["height"] == size[0]

tests/test_missing_annotation_upload.py

@@ -2,13 +2,11 @@
 
 import superannotate as sa
 
-name = "Example Project test vector missing annotation upload"
-project_type = "Vector"
-description = "test vector"
-from_folder = Path("./tests/sample_project_vector_for_checks")
-
-
 def test_missing_annotation_upload(tmpdir):
+    name = "Example Project test vector missing annotation upload"
+    project_type = "Vector"
+    description = "test vector"
+    from_folder = Path("./tests/sample_project_vector_for_checks")
     projects = sa.search_projects(name, return_metadata=True)
     for project in projects:
         sa.delete_project(project)
@@ -44,6 +42,12 @@ def test_missing_annotation_upload(tmpdir):
 
 
 def test_missing_preannotation_upload(tmpdir):
+    name = "Example Project test vector missing preannotation upload"
+    project_type = "Vector"
+    description = "test vector"
+    from_folder = Path("./tests/sample_project_vector_for_checks")
+
+
     projects = sa.search_projects(name, return_metadata=True)
     for project in projects:
         sa.delete_project(project)