Merge pull request #311 from superannotateai/497-8-9-0

Fix 497-8-0

Author: VaghinakDev

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

@@ -86,7 +86,7 @@ class Attribute(BaseModel):
     id: Optional[int]
     group_id: Optional[int] = Field(None, alias="groupId")
     name: NotEmptyStr
-    group_name: NotEmptyStr = Field(None, alias="groupName")
+    group_name: NotEmptyStr = Field(alias="groupName")
 
 
 class Tag(BaseModel):
@@ -107,10 +107,10 @@ class BboxPoints(BaseModel):
 
 
 class TimedBaseModel(BaseModel):
-    created_at: constr(regex=DATE_REGEX) = Field(None, alias="createdAt")
-    updated_at: constr(regex=DATE_REGEX) = Field(None, alias="updatedAt")
+    created_at: Optional[constr(regex=DATE_REGEX)] = Field(None, alias="createdAt")
+    updated_at: Optional[constr(regex=DATE_REGEX)] = Field(None, alias="updatedAt")
 
-    @validator("created_at", "updated_at" , pre=True)
+    @validator("created_at", "updated_at", pre=True)
     def validate_created_at(cls, value):
         try:
             if value is not None:
@@ -144,7 +144,7 @@ class LastUserAction(BaseModel):
 
 class BaseInstance(TrackableModel, TimedBaseModel):
     class_id: Optional[int] = Field(None, alias="classId")
-    class_name: Optional[NotEmptyStr] = Field(None, alias="className")
+    class_name: NotEmptyStr = Field(alias="className")
 
 
 class MetadataBase(BaseModel):
@@ -176,8 +176,6 @@ class Comment(TimedBaseModel, TrackableModel):
 
 
 class BaseImageInstance(BaseInstance):
-    class_id: Optional[int] = Field(None, alias="classId")
-    class_name: NotEmptyStr = Field(alias="className")
     visible: Optional[bool]
     locked: Optional[bool]
     probability: Optional[int] = Field(100)

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

@@ -12,6 +12,8 @@
 from lib.core.entities.utils import VectorAnnotationTypeEnum
 from pydantic import conlist
 from pydantic import Field
+from pydantic import ValidationError
+from pydantic.error_wrappers import ErrorWrapper
 
 
 class AxisPoint(BaseModel):
@@ -24,11 +26,11 @@ class Point(BaseVectorInstance, AxisPoint):
 
 
 class PolyLine(BaseVectorInstance):
-    points: List[float]
+    points: conlist(float, min_items=2)
 
 
 class Polygon(BaseVectorInstance):
-    points: List[float]
+    points: conlist(float, min_items=3)
 
 
 class Bbox(BaseVectorInstance):
@@ -114,12 +116,22 @@ def return_action(cls, values):
         try:
             instance_type = values["type"]
         except KeyError:
-            raise ValueError("metadata.type required")
+            raise ValidationError(
+                [ErrorWrapper(ValueError("field required"), "type")], cls
+            )
         try:
             return ANNOTATION_TYPES[instance_type](**values)
         except KeyError:
-            raise ValueError(
-                f"invalid type, valid types is {', '.join(ANNOTATION_TYPES.keys())}"
+            raise ValidationError(
+                [
+                    ErrorWrapper(
+                        ValueError(
+                            f"invalid type, valid types are {', '.join(ANNOTATION_TYPES.keys())}"
+                        ),
+                        "type",
+                    )
+                ],
+                cls,
             )
 
 

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

@@ -13,6 +13,8 @@
 from lib.core.entities.utils import Tag
 from pydantic import conlist
 from pydantic import Field
+from pydantic import ValidationError
+from pydantic.error_wrappers import ErrorWrapper
 
 
 class VideoType(str, Enum):
@@ -40,7 +42,7 @@ class EventTimeStamp(BaseTimeStamp):
 
 class InstanceMetadata(BaseInstance):
     type: VideoType
-    class_name: Optional[NotEmptyStr] = Field(alias="className")
+    class_name: Optional[NotEmptyStr] = Field(None, alias="className")
     point_labels: Optional[PointLabels] = Field(None, alias="pointLabels")
     start: int
     end: int
@@ -95,12 +97,22 @@ def return_action(cls, values):
         try:
             instance_type = values["meta"]["type"]
         except KeyError:
-            raise ValueError("meta.type required")
+            raise ValidationError(
+                [ErrorWrapper(ValueError("meta.field required"), "type")], cls
+            )
         try:
             return INSTANCES[instance_type](**values)
         except KeyError:
-            raise ValueError(
-                f"invalid type, valid types is {', '.join(INSTANCES.keys())}"
+            raise ValidationError(
+                [
+                    ErrorWrapper(
+                        ValueError(
+                            f"invalid type, valid types are {', '.join(INSTANCES.keys())}"
+                        ),
+                        "meta.type",
+                    )
+                ],
+                cls,
             )