ADjust schemas

Author: VaghinakDev

src/superannotate_schemas/schemas/external/document.py

@@ -5,16 +5,16 @@
 from superannotate_schemas.schemas.base import BaseInstance
 from superannotate_schemas.schemas.base import BaseMetadata as Metadata
 from superannotate_schemas.schemas.base import Tag
+from superannotate_schemas.schemas.base import NotEmptyStr
 
 from superannotate_schemas.schemas.base import BaseModel
 from pydantic import Field
 from pydantic import StrictStr
-from pydantic import StrictInt
 
 
 class Attribute(BaseAttribute):
-    id: StrictInt
-    group_id: StrictInt = Field(None, alias="groupId")
+    name: NotEmptyStr
+    group_name: NotEmptyStr = Field(alias="groupName")
 
 
 class DocumentInstance(BaseInstance):

src/superannotate_schemas/schemas/internal/document.py

@@ -5,7 +5,7 @@
 from superannotate_schemas.schemas.base import BaseInstance
 from superannotate_schemas.schemas.base import BaseMetadata as Metadata
 from superannotate_schemas.schemas.base import Tag
-from superannotate_schemas.schemas.base import NotEmptyStr
+from superannotate_schemas.schemas.base import StrictInt
 
 from superannotate_schemas.schemas.base import BaseModel
 
@@ -14,8 +14,8 @@
 
 
 class Attribute(BaseAttribute):
-    name: NotEmptyStr
-    group_name: NotEmptyStr = Field(alias="groupName")
+    id: StrictInt
+    group_id: StrictInt = Field(None, alias="groupId")
 
 
 class DocumentInstance(BaseInstance):

tests/test_validators.py

@@ -340,7 +340,13 @@ 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(len(validator.generate_report()), 70)
+            # TODO adjust
+            self.assertEqual(
+                validator.generate_report().strip(),
+                """instances[0].classId                             integer type expected
+                instances[0].attributes[0].name                  field required
+                instances[0].attributes[0].groupName             field required""".strip()
+            )
 
     def test_validate_document_annotation_with_null_created_at(self):
         with tempfile.TemporaryDirectory() as tmpdir_name: