Update base schema

Author: dshabin

src/superannotate_schemas/schemas/base.py

@@ -65,8 +65,8 @@ class AxisPoint(BaseModel):
 class BaseAttribute(BaseModel):
     id: Optional[StrictInt]
     group_id: Optional[StrictInt] = Field(alias="groupId")
-    name: Optional[NotEmptyStr]
-    group_name: Optional[NotEmptyStr] = Field(alias="groupName")
+    name: NotEmptyStr
+    group_name: NotEmptyStr = Field(alias="groupName")
 
 
 class Tag(BaseModel):
@@ -121,7 +121,7 @@ class BaseInstance(TrackableModel, TimedBaseModel):
     class_name: Optional[NotEmptyStr] = Field(None, alias="className")
 
 
-class InstanceTag(BaseInstance):
+class BaseInstanceTag(BaseInstance):
     type: TagTypeEnum
     probability: Optional[StrictInt] = Field(100)
     attributes: Optional[List[BaseAttribute]] = Field(list())

src/superannotate_schemas/schemas/external/vector.py

@@ -21,10 +21,14 @@
 from superannotate_schemas.schemas.base import NotEmptyStr
 from superannotate_schemas.schemas.base import StrictNumber
 from superannotate_schemas.schemas.base import Tag
-from superannotate_schemas.schemas.base import InstanceTag
+from superannotate_schemas.schemas.base import BaseInstanceTag
 from superannotate_schemas.schemas.enums import VectorAnnotationTypeEnum
 
 
+class InstanceTag(BaseInstanceTag):
+    class_name: NotEmptyStr
+
+
 class Attribute(BaseAttribute):
     name: NotEmptyStr
     group_name: NotEmptyStr = Field(alias="groupName")

src/superannotate_schemas/schemas/internal/vector.py

@@ -10,6 +10,7 @@
 from superannotate_schemas.schemas.base import Tag
 from superannotate_schemas.schemas.base import AxisPoint
 from superannotate_schemas.schemas.base import VectorAnnotationTypeEnum
+from superannotate_schemas.schemas.base import BaseInstanceTag
 from superannotate_schemas.schemas.base import StrictNumber
 from superannotate_schemas.schemas.base import INVALID_DICT_MESSAGE
 from superannotate_schemas.schemas.base import BaseModel
@@ -24,6 +25,11 @@
 from pydantic.error_wrappers import ErrorWrapper
 
 
+
+class InstanceTag(BaseInstanceTag):
+    class_id: StrictInt
+
+
 class Attribute(BaseAttribute):
     id: StrictInt
     group_id: StrictInt = Field(alias="groupId")
@@ -110,12 +116,13 @@ class Cuboid(VectorInstance):
     VectorAnnotationTypeEnum.POLYLINE: PolyLine,
     VectorAnnotationTypeEnum.ELLIPSE: Ellipse,
     VectorAnnotationTypeEnum.RBBOX: RotatedBox,
+    VectorAnnotationTypeEnum.TAG: InstanceTag,
 }
 
 
 class AnnotationInstance(BaseModel):
     __root__: Union[
-        Template, Cuboid, Point, PolyLine, Polygon, Bbox, Ellipse, RotatedBox
+        Template, Cuboid, Point, PolyLine, Polygon, Bbox, Ellipse, RotatedBox, InstanceTag
     ]
 
     @classmethod

tests/test_validators.py

@@ -310,7 +310,12 @@ def test_validate_document_annotation_wrong_class_id(self, mock_print):
                                         "email": "some.email@gmail.com",
                                         "role": "Admin"
                                       },
-                                      "attributes": [],
+                                      "attributes": [
+                                      {
+                                                    "id": 1175876,
+                                                    "groupId": 338357
+                                      }
+                                      ],
                                       "creationType": "Manual",
                                       "className": "vid"
                                     }],
@@ -324,8 +329,7 @@ def test_validate_document_annotation_wrong_class_id(self, mock_print):
                 data = json.loads(f.read())
             validator = AnnotationValidators.get_validator("document")(data)
             self.assertFalse(validator.is_valid())
-            self.assertEqual(validator.generate_report(),
-                             "instances[0].classId                             integer type expected")
+            self.assertEqual(len(validator.generate_report()), 198)
 
     def test_validate_document_annotation_with_null_created_at(self):
         with tempfile.TemporaryDirectory() as tmpdir_name: