Merge pull request #303 from superannotateai/432-483

Fix bug

Author: VaghinakDev

src/superannotate/lib/core/entities/pixel.py

@@ -5,6 +5,7 @@
 from lib.core.entities.utils import BaseModel
 from lib.core.entities.utils import Metadata
 from lib.core.entities.utils import Tag
+from lib.core.entities.utils import Comment
 from pydantic import Field
 from pydantic import validator
 from pydantic.color import Color
@@ -32,3 +33,4 @@ class PixelAnnotation(BaseModel):
     metadata: PixelMetaData
     instances: List[PixelAnnotationInstance]
     tags: Optional[List[Tag]] = Field(list())
+    comments: Optional[List[Comment]] = Field(list())

src/superannotate/lib/core/entities/utils.py

@@ -135,6 +135,7 @@ class BaseInstance(TrackableModel, TimedBaseModel):
 
 
 class MetadataBase(BaseModel):
+    url: Optional[str]
     name: NotEmptyStr
     last_action: Optional[LastUserAction] = Field(None, alias="lastAction")
     width: Optional[int]

src/superannotate/lib/core/entities/video_export.py

@@ -21,7 +21,6 @@ class VideoType(str, Enum):
 
 
 class MetaData(MetadataBase):
-    url: Optional[str]
     duration: Optional[int]
     error: Optional[bool]
 

tests/unit/test_validators.py

@@ -172,3 +172,121 @@ def test_validate_annotation_with_wrong_bbox(self):
                     "template,cuboid,polygon,point,polyline,ellipse,rbbox",
                     out.getvalue().strip().replace(" ", "")
                 )
+
+    def test_validate_document_annotation(self):
+        with tempfile.TemporaryDirectory() as tmpdir_name:
+            with open(f"{tmpdir_name}/doc.json", "w") as doc_json:
+                doc_json.write(
+                    '''
+                    {
+                        "metadata": {
+                            "name": "text_file_example_1",
+                            "status": "NotStarted",
+                            "url": "https://sa-public-files.s3.us-west-2.amazonaws.com/Text+project/text_file_example_1.txt",
+                            "projectId": 167826,
+                            "annotatorEmail": null,
+                            "qaEmail": null,
+                            "lastAction": {
+                                "email": "some.email@gmail.com"
+                                "timestamp": 1636620976450
+                            }
+                        },
+                        "instances": [],
+                        "tags": [],
+                        "freeText": ""
+                    }
+                    '''
+                )
+            self.assertTrue(sa.validate_annotations("Document", os.path.join(self.vector_folder_path, f"{tmpdir_name}/doc.json")))
+
+
+    def test_validate_pixel_annotation(self):
+        with tempfile.TemporaryDirectory() as tmpdir_name:
+            with open(f"{tmpdir_name}/pixel.json", "w") as pix_json:
+                pix_json.write(
+                    '''
+                    {
+                    "metadata": {
+                        "lastAction": {
+                            "email": "some.email@gmail.com"
+                            "timestamp": 1636627539398
+                        },
+                        "width": 1024,
+                        "height": 683,
+                        "name": "example_image_1.jpg",
+                        "projectId": 164324,
+                        "isPredicted": false,
+                        "isSegmented": false,
+                        "status": "NotStarted",
+                        "pinned": false,
+                        "annotatorEmail": null,
+                        "qaEmail": null
+                    },
+                    "comments": [],
+                    "tags": [],
+                    "instances": []
+                    }
+                    '''
+                )
+            self.assertTrue(sa.validate_annotations("Pixel", os.path.join(self.vector_folder_path, f"{tmpdir_name}/pixel.json")))
+
+    def test_validate_video_export_annotation(self):
+        with tempfile.TemporaryDirectory() as tmpdir_name:
+            with open(f"{tmpdir_name}/video_export.json", "w") as video_export:
+                video_export.write(
+                    '''
+                    {
+                        "metadata": {
+                            "name": "video.mp4",
+                            "width": 848,
+                            "height": 476,
+                            "status": "NotStarted",
+                            "url": "https://file-examples-com.github.io/uploads/2017/04/file_example_MP4_480_1_5MG.mp4",
+                            "duration": 2817000,
+                            "projectId": 164334,
+                            "error": null,
+                            "annotatorEmail": null,
+                            "qaEmail": null,
+                            "lastAction": {
+                                "timestamp": 1636384061135,
+                                "email": "some.email@gmail.com"
+                            }
+                        },
+                        "instances": [],
+                        "tags": []
+                    }
+                    '''
+                )
+            self.assertTrue(sa.validate_annotations("Video", os.path.join(self.vector_folder_path,
+                                                                          f"{tmpdir_name}/video_export.json")))
+
+
+    def test_validate_vector_empty_annotation(self):
+        with tempfile.TemporaryDirectory() as tmpdir_name:
+            with open(f"{tmpdir_name}/vector_empty.json", "w") as vector_empty:
+                vector_empty.write(
+                    '''
+                    {
+                        "metadata": {
+                            "lastAction": {
+                                "email": "shab.prog@gmail.com",
+                                "timestamp": 1636627956948
+                            },
+                            "width": 1024,
+                            "height": 683,
+                            "name": "example_image_1.jpg",
+                            "projectId": 162462,
+                            "isPredicted": false,
+                            "status": "NotStarted",
+                            "pinned": false,
+                            "annotatorEmail": null,
+                            "qaEmail": null
+                        },
+                        "comments": [],
+                        "tags": [],
+                        "instances": []
+                    }
+                    '''
+                )
+            self.assertTrue(sa.validate_annotations("Vector", os.path.join(self.vector_folder_path,
+                                                                          f"{tmpdir_name}/vector_empty.json")))