Fix tests

Author: hovnatan

superannotate/db/annotation_classes.py

@@ -296,8 +296,6 @@ 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/images.py

@@ -753,13 +753,17 @@ def get_image_annotations(project, image_name, project_type=None):
             raise SABaseException(response.status_code, response.text)
         res_json = response.json()
         fill_class_and_attribute_names(res_json, annotation_classes_dict)
-        url = res["pixelSave"]["url"]
-        annotation_mask_filename = url.rsplit('/', 1)[-1]
-        headers = res["pixelSave"]["headers"]
-        response = requests.get(url=url, headers=headers)
-        if not response.ok:
-            raise SABaseException(response.status_code, response.text)
-        mask = io.BytesIO(response.content)
+        if len(res_json["instances"]) != 0:
+            url = res["pixelSave"]["url"]
+            annotation_mask_filename = url.rsplit('/', 1)[-1]
+            headers = res["pixelSave"]["headers"]
+            response = requests.get(url=url, headers=headers)
+            if not response.ok:
+                raise SABaseException(response.status_code, response.text)
+            mask = io.BytesIO(response.content)
+        else:
+            mask = None
+            annotation_mask_filename = None
         return {
             "annotation_json": res_json,
             "annotation_json_filename": annotation_json_filename,
@@ -800,11 +804,14 @@ def download_image_annotations(project, image_name, local_dir_path):
     else:
         with open(json_path, "w") as f:
             json.dump(annotation["annotation_json"], f, indent=4)
-        mask_path = Path(local_dir_path
-                        ) / annotation["annotation_mask_filename"]
+        if annotation["annotation_mask_filename"] is not None:
+            mask_path = Path(local_dir_path
+                            ) / annotation["annotation_mask_filename"]
+            with open(mask_path, "wb") as f:
+                f.write(annotation["annotation_mask"].getbuffer())
+        else:
+            mask_path = None
         return_filepaths.append(str(mask_path))
-        with open(mask_path, "wb") as f:
-            f.write(annotation["annotation_mask"].getbuffer())
 
     return tuple(return_filepaths)
 

superannotate/db/projects.py

@@ -539,7 +539,15 @@ def upload_images_from_folder_to_project(
 
 
 def create_empty_annotation(size):
-    return {"metadata": {'height': size[1], 'width': size[0]}}
+    return {
+        "metadata": {
+            'height': size[1],
+            'width': size[0]
+        },
+        "instances": [],
+        "comments": [],
+        "tags": []
+    }
 
 
 def upload_image_array_to_s3(

tests/test_basic_images.py

@@ -42,12 +42,14 @@ def test_basic_images(project_type, name, description, from_folder, tmpdir):
     sa.download_image(project, image_name, tmpdir, True)
     assert sa.get_image_preannotations(project, image_name
                                       )["preannotation_json_filename"] is None
-    assert sa.get_image_annotations(project, image_name
-                                   )["annotation_json_filename"] is None
+    assert len(
+        sa.get_image_annotations(project,
+                                 image_name)["annotation_json"]["instances"]
+    ) == 0
     sa.download_image_annotations(project, image_name, tmpdir)
-    assert len(list(Path(tmpdir).glob("*"))) == 1
+    assert len(list(Path(tmpdir).glob("*"))) == 2
     sa.download_image_preannotations(project, image_name, tmpdir)
-    assert len(list(Path(tmpdir).glob("*"))) == 1
+    assert len(list(Path(tmpdir).glob("*"))) == 2
 
     assert (Path(tmpdir) / image_name).is_file()