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

Author: agyurjin

.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

@@ -348,6 +348,14 @@ def fill_class_and_attribute_ids(annotation_json, annotation_classes_dict):
                 del attribute["groupId"]
 
 
+def check_annotation_json(annotation_json):
+    if "metadata" not in annotation_json or "width" not in annotation_json[
+        "metadata"] or "height" not in annotation_json["metadata"]:
+        return False
+    else:
+        return True
+
+
 def get_annotation_classes_id_to_name(annotation_classes):
     annotation_classes_dict = {}
     for annotation_class in annotation_classes:

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/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)