Merge pull request #826 from superannotateai/FRIDAY-4611

Update Pixel project handling

Author: VaghinakDev

docs/source/api_reference/api_metadata.rst

@@ -18,7 +18,7 @@ Project metadata example:
      "creator_id": "admin@superannotate.com",
      "updatedAt": "2020-08-31T05:43:43.118Z",
      "createdAt": "2020-08-31T05:43:43.118Z"
-     "type": "Vector", # Pixel, Video, Multimodal
+     "type": "Vector", # Video, Multimodal
      "attachment_name": None,
      "attachment_path": None,
      "entropy_status": 1,

docs/source/cli_client.rst

@@ -42,7 +42,7 @@ To create a new project:
 
 .. code-block:: bash
 
-   superannotatecli create-project --name <project_name> --description <project_description> --type <project_type Vector or Pixel>
+   superannotatecli create-project --name <project_name> --description <project_description> --type <project_type Vector>
 
 ----------
 

docs/source/userguide/setup_project.rst

@@ -249,9 +249,7 @@ you are uploading to should contain annotation class with that name.
 
 
 This will try uploading to the project all the JSON files in the folder that have :file:`"<image_name>.json"` postfix.
-For pixel projects JSON files should be named :file:`"<image_name>___pixel.json"` and also for
-each JSON a mask image file should be present with the name
-:file:`"<image_name>___save.png"`. Image with :file:`<image_name>` should
+Image with :file:`<image_name>` should
 already be present in the project for the upload to work.
 
 

docs/source/userguide/utilities.rst

@@ -40,7 +40,7 @@ You can find more information annotation format conversion :ref:`here <ref_conve
     export_annotation(
        "tests/converter_test/COCO/input/fromSuperAnnotate/cats_dogs_panoptic_segm",
        "tests/converter_test/COCO/output/panoptic",
-       "COCO", "panoptic_test", "Pixel","panoptic_segmentation"
+       "COCO", "panoptic_test","panoptic_segmentation"
     )
 
     # From COCO keypoints detection format to SA annotation format
@@ -54,7 +54,7 @@ You can find more information annotation format conversion :ref:`here <ref_conve
     import_annotation(
        "tests/converter_test/VOC/input/fromPascalVOCToSuperAnnotate/VOC2012",
        "tests/converter_test/VOC/output/instances",
-       "VOC", "instances_test", "Pixel", "instance_segmentation"
+       "VOC", "instances_test", "instance_segmentation"
     )
 
     # YOLO annotation format to SA annotation format

pytest.ini

@@ -3,4 +3,4 @@ minversion = 3.7
 log_cli=true
 python_files = test_*.py
 ;pytest_plugins = ['pytest_profiling']
-;addopts = -n 6 --dist loadscope
+addopts = -n 6 --dist loadscope

src/superannotate/__init__.py

@@ -3,7 +3,7 @@
 import sys
 
 
-__version__ = "4.5.1"
+__version__ = "4.5.2dev1"
 
 
 os.environ.update({"sa_version": __version__})
@@ -17,7 +17,6 @@
 from lib.core import PACKAGE_VERSION_MAJOR_UPGRADE
 from lib.core.exceptions import AppException
 from lib.core.exceptions import FileChangedError
-from superannotate.lib.app.input_converters import convert_project_type
 from superannotate.lib.app.input_converters import export_annotation
 from superannotate.lib.app.input_converters import import_annotation
 from superannotate.lib.app.interface.sdk_interface import SAClient
@@ -37,7 +36,6 @@
     "FileChangedError",
     "import_annotation",
     "export_annotation",
-    "convert_project_type",
 ]
 
 __author__ = "Superannotate"

src/superannotate/lib/app/analytics/aggregators.py

@@ -9,7 +9,6 @@
 
 import lib.core as constances
 import pandas as pd
-from lib.core import PIXEL_ANNOTATION_POSTFIX
 from lib.core import VECTOR_ANNOTATION_POSTFIX
 from lib.core.exceptions import AppException
 
@@ -162,8 +161,6 @@ def _set_annotation_suffix(self, path):
             self._annotation_suffix = ".json"
         elif VECTOR_ANNOTATION_POSTFIX in fname.name:
             self._annotation_suffix = VECTOR_ANNOTATION_POSTFIX
-        elif PIXEL_ANNOTATION_POSTFIX in fname.name:
-            self._annotation_suffix = PIXEL_ANNOTATION_POSTFIX
         else:
             self._annotation_suffix = ".json"
 
@@ -205,10 +202,7 @@ def aggregate_annotations_as_df(self):
         self.check_classes_path()
         annotation_paths = self.get_annotation_paths()
 
-        if self.project_type in (
-            constances.ProjectType.VECTOR,
-            constances.ProjectType.PIXEL,
-        ):
+        if self.project_type is constances.ProjectType.VECTOR:
             return self.aggregate_image_annotations_as_df(annotation_paths)
         if self.project_type is constances.ProjectType.VIDEO:
             return self.aggregate_video_annotations_as_df(annotation_paths)

src/superannotate/lib/app/analytics/common.py

@@ -173,8 +173,6 @@ def __get_user_metadata(annotation):
 
     if "___objects.json" in annotations_paths[0].name:
         type_postfix = "___objects.json"
-    elif "___pixel.json" in annotations_paths[0].name:
-        type_postfix = "___pixel.json"
     else:
         type_postfix = ".json"
 

src/superannotate/lib/app/helpers.py

@@ -9,7 +9,6 @@
 import numpy as np
 import pandas as pd
 from lib.core import ATTACHED_VIDEO_ANNOTATION_POSTFIX
-from lib.core import PIXEL_ANNOTATION_POSTFIX
 from lib.core import VECTOR_ANNOTATION_POSTFIX
 from lib.core.exceptions import AppException
 
@@ -36,7 +35,6 @@ def get_local_annotation_paths(
             if i.name.endswith(
                 (
                     VECTOR_ANNOTATION_POSTFIX,
-                    PIXEL_ANNOTATION_POSTFIX,
                     ATTACHED_VIDEO_ANNOTATION_POSTFIX,
                 )
             )
@@ -66,10 +64,8 @@ def get_s3_annotation_paths(folder_path, s3_bucket, annotation_paths, recursive)
     for data in paginator.paginate(Bucket=s3_bucket, Prefix=folder_path):
         for annotation in data.get("Contents", []):
             key = annotation["Key"]
-            if (
-                key.endswith(VECTOR_ANNOTATION_POSTFIX)
-                or key.endswith(PIXEL_ANNOTATION_POSTFIX)
-                or key.endswith(ATTACHED_VIDEO_ANNOTATION_POSTFIX)
+            if key.endswith(VECTOR_ANNOTATION_POSTFIX) or key.endswith(
+                ATTACHED_VIDEO_ANNOTATION_POSTFIX
             ):
                 if not recursive and "/" in key[len(folder_path) + 1 :]:
                     continue

src/superannotate/lib/app/input_converters/__init__.py

@@ -1,10 +1,8 @@
-from lib.app.input_converters.conversion import convert_project_type
 from lib.app.input_converters.conversion import export_annotation
 from lib.app.input_converters.conversion import import_annotation
 
 
 __all__ = [
-    "convert_project_type",
     "export_annotation",
     "import_annotation",
 ]