Merge pull request #388 from superannotateai/update_tag_tests

Update tag tests

Author: dshabin

src/superannotate/lib/app/interface/sdk_interface.py

@@ -39,7 +39,6 @@
 from lib.core.enums import ImageQuality
 from lib.core.exceptions import AppException
 from lib.core.types import AttributeGroup
-from lib.core.types import ClassesJson
 from lib.core.types import MLModel
 from lib.core.types import Project
 from pydantic import conlist
@@ -1607,7 +1606,7 @@ def download_annotation_classes_json(project: NotEmptyStr, folder: Union[str, Pa
 @validate_arguments
 def create_annotation_classes_from_classes_json(
     project: Union[NotEmptyStr, dict],
-    classes_json: Union[List[ClassesJson], str, Path],
+    classes_json: Union[List[AnnotationClassEntity], str, Path],
     from_s3_bucket=False,
 ):
     """Creates annotation classes in project from a SuperAnnotate format
@@ -1623,6 +1622,7 @@ def create_annotation_classes_from_classes_json(
     :return: list of created annotation class metadatas
     :rtype: list of dicts
     """
+    classes_json_initial = classes_json
     if isinstance(classes_json, str) or isinstance(classes_json, Path):
         if from_s3_bucket:
             from_session = boto3.Session()
@@ -1637,7 +1637,7 @@ def create_annotation_classes_from_classes_json(
         classes_json = json.load(data)
     annotation_classes = parse_obj_as(List[AnnotationClassEntity], classes_json)
     logger.info(
-        "Creating annotation classes in project %s from %s.", project, classes_json,
+        "Creating annotation classes in project %s from %s.", project, classes_json_initial,
     )
     response = controller.create_annotation_classes(
         project_name=project, annotation_classes=annotation_classes,

src/superannotate/lib/core/data_handlers.py

@@ -40,10 +40,10 @@ def __init__(self, annotation_classes: List[AnnotationClass]):
 
     @lru_cache()
     def get_annotation_class(
-        self, name: str, class_type: ClassTypeEnum = ClassTypeEnum.OBJECT
+        self, name: str, class_type: ClassTypeEnum
     ) -> AnnotationClass:
         for annotation_class in self._annotation_classes:
-            if annotation_class.name == name and annotation_class.type == class_type:
+            if annotation_class.name == name and class_type.equals(annotation_class.type):
                 return annotation_class
 
     @lru_cache()
@@ -162,8 +162,8 @@ def validate_existing_classes(self, annotation_classes: List[AnnotationClass]):
 
     def _get_class_type(self, annotation_type: str):
         if annotation_type == ClassTypeEnum.TAG.name:
-            return annotation_type
-        return ClassTypeEnum.OBJECT.name
+            return ClassTypeEnum.TAG
+        return ClassTypeEnum.OBJECT
 
     def handle(self, annotation: dict):
         if "instances" not in annotation:
@@ -287,7 +287,7 @@ def convert_timestamp(timestamp):
                 "locked": False,
             }
             if class_name:
-                annotation_class = self.get_annotation_class(class_name)
+                annotation_class = self.get_annotation_class(class_name,ClassTypeEnum.OBJECT)
                 if annotation_class:
                     editor_instance["classId"] = annotation_class.id
                 else:
@@ -322,7 +322,7 @@ def convert_timestamp(timestamp):
                         ] = timestamp_data["points"]
                     if not class_name:
                         continue
-                    annotation_class = self.get_annotation_class(class_name)
+                    annotation_class = self.get_annotation_class(class_name,ClassTypeEnum.OBJECT)
                     if not annotation_class:
                         self.reporter.store_message(
                             "missing_classes", meta["className"]

src/superannotate/lib/core/enums.py

@@ -31,6 +31,9 @@ def values(cls):
     def titles(cls):
         return [enum.name for enum in list(cls)]
 
+    def equals(self, other: Enum):
+        return self.name.lower() == other.lower()
+
 
 class ProjectType(BaseTitledEnum):
     VECTOR = "Vector", 1

src/superannotate/lib/core/types.py

@@ -11,9 +11,12 @@
 from pydantic import validator
 from pydantic.error_wrappers import ErrorWrapper
 from pydantic.error_wrappers import ValidationError
+from superannotate_schemas.schemas.classes import AttributeGroup as AttributeGroupSchema
 
 NotEmptyStr = constr(strict=True, min_length=1)
 
+AttributeGroup = AttributeGroupSchema
+
 
 class AnnotationType(StrictStr):
     @classmethod
@@ -25,160 +28,6 @@ def validate(cls, value: str) -> Union[str]:
         return value
 
 
-class Attribute(BaseModel):
-    name: NotEmptyStr
-
-
-class AttributeGroup(BaseModel):
-    name: StrictStr
-    is_multiselect: Optional[int] = False
-    attributes: List[Attribute]
-
-
-class ClassesJson(BaseModel):
-    name: StrictStr
-    color: StrictStr
-    attribute_groups: List[AttributeGroup]
-
-
-class Metadata(BaseModel):
-    name: Optional[NotEmptyStr]
-    width: Optional[int]
-    height: Optional[int]
-
-
-class PointLabels(BaseModel):
-    __root__: Dict[constr(regex=r"^[0-9]+$"), str]  # noqa: F722
-
-
-class BaseInstance(BaseModel):
-    type: AnnotationType
-    classId: Optional[int]
-    groupId: Optional[int]
-    attributes: List[Attribute]
-    # point_labels: Optional[PointLabels]
-
-    class Config:
-        error_msg_templates = {
-            "value_error.missing": "field required for annotation",
-        }
-
-
-class Point(BaseInstance):
-    x: float
-    y: float
-
-
-class PolyLine(BaseInstance):
-    points: List[float]
-
-
-class Polygon(BaseInstance):
-    points: List[float]
-
-
-class BboxPoints(BaseModel):
-    x1: float
-    x2: float
-    y1: float
-    y2: float
-
-
-class Bbox(BaseInstance):
-    points: BboxPoints
-
-
-class Ellipse(BaseInstance):
-    cx: float
-    cy: float
-    rx: float
-    ry: float
-
-
-class TemplatePoint(BaseModel):
-    id: Optional[int]
-    x: float
-    y: float
-
-
-class TemplateConnection(BaseModel):
-    id: Optional[int]
-    to: int
-
-
-class Template(BaseInstance):
-    points: List[TemplatePoint]
-    connections: List[Optional[TemplateConnection]]
-    templateId: Optional[int]
-
-
-class EmptyPoint(BaseModel):
-    x: float
-    y: float
-
-
-class CuboidPoint(BaseModel):
-    f1: EmptyPoint
-    f2: EmptyPoint
-    r1: EmptyPoint
-    r2: EmptyPoint
-
-
-class Cuboid(BaseInstance):
-    points: CuboidPoint
-
-
-class PixelAnnotationPart(BaseModel):
-    color: NotEmptyStr
-
-
-class PixelAnnotationInstance(BaseModel):
-    classId: Optional[int]
-    groupId: Optional[int]
-    parts: List[PixelAnnotationPart]
-    attributes: List[Attribute]
-
-
-class VectorInstance(BaseModel):
-    __root__: Union[Template, Cuboid, Point, PolyLine, Polygon, Bbox, Ellipse]
-
-
-ANNOTATION_TYPES = {
-    "bbox": Bbox,
-    "ellipse": Ellipse,
-    "template": Template,
-    "cuboid": Cuboid,
-    "polyline": PolyLine,
-    "polygon": Polygon,
-    "point": Point,
-}
-
-
-class VectorAnnotation(BaseModel):
-    metadata: Metadata
-    instances: Optional[
-        List[Union[Template, Cuboid, Point, PolyLine, Polygon, Bbox, Ellipse]]
-    ]
-
-    @validator("instances", pre=True, each_item=True)
-    def check_instances(cls, instance):
-        annotation_type = AnnotationType.validate(instance.get("type"))
-        if not annotation_type:
-            raise ValidationError(
-                [ErrorWrapper(TypeError("value not specified"), "type")], cls
-            )
-        result = validate_model(ANNOTATION_TYPES[annotation_type], instance)
-        if result[2]:
-            raise ValidationError(
-                result[2].raw_errors, model=ANNOTATION_TYPES[annotation_type]
-            )
-        return instance
-
-
-class PixelAnnotation(BaseModel):
-    metadata: Metadata
-    instances: List[PixelAnnotationInstance]
-
 
 class Project(BaseModel):
     name: NotEmptyStr
@@ -198,40 +47,3 @@ class Config:
         extra = Extra.allow
 
 
-class VideoMetaData(BaseModel):
-    name: StrictStr
-    width: Optional[int]
-    height: Optional[int]
-    duration: Optional[int]
-
-
-class VideoInstanceMeta(BaseModel):
-    type: NotEmptyStr
-    classId: Optional[int]
-
-
-class VideoTimeStamp(BaseModel):
-    timestamp: int
-    attributes: List[Attribute]
-
-
-class VideoInstanceParameter(BaseModel):
-    start: int
-    end: int
-    timestamps: List[VideoTimeStamp]
-
-
-class VideoInstance(BaseModel):
-    meta: VideoInstanceMeta
-    parameters: List[VideoInstanceParameter]
-
-
-class VideoAnnotation(BaseModel):
-    metadata: VideoMetaData
-    instances: Optional[List[VideoInstance]]
-    tags: Optional[List[str]]
-
-
-class DocumentAnnotation(BaseModel):
-    instances: list
-    tags: Optional[List[str]]

src/superannotate/lib/infrastructure/repositories.py

@@ -360,7 +360,7 @@ def dict2entity(data: dict) -> AnnotationClassEntity:
             createdAt=data["createdAt"],
             updatedAt=data["updatedAt"],
             attribute_groups=data["attribute_groups"],
-            type=ClassTypeEnum.get_name(data["type"]),
+            type=ClassTypeEnum.get_name(data.get('type')),
         )
 
 

tests/data_set/sample_project_vector_with_tag/classes/classes.json

@@ -0,0 +1,42 @@
+[
+    {
+        "id": 55920,
+        "project_id": 11979,
+        "name": "Weather",
+        "color": "#46ccb2",
+        "type": "tag",
+        "count": 0,
+        "createdAt": "2020-10-12T11:35:20.000Z",
+        "updatedAt": "2020-10-12T11:35:20.000Z",
+        "attribute_groups": [
+            {
+                "id": 17245,
+                "class_id": 55917,
+                "name": "g1",
+                "is_multiselect": 0,
+                "createdAt": "2020-10-12T11:35:20.000Z",
+                "updatedAt": "2020-10-12T11:35:20.000Z",
+                "attributes": [
+                    {
+                        "id": 62792,
+                        "group_id": 17245,
+                        "project_id": 11979,
+                        "name": "1",
+                        "count": 1,
+                        "createdAt": "2020-10-12T11:35:20.000Z",
+                        "updatedAt": "2020-10-12T11:46:28.000Z"
+                    },
+                    {
+                        "id": 62793,
+                        "group_id": 17245,
+                        "project_id": 11979,
+                        "name": "2",
+                        "count": 1,
+                        "createdAt": "2020-10-12T11:35:20.000Z",
+                        "updatedAt": "2020-10-12T11:35:20.000Z"
+                    }
+                ]
+            }
+        ]
+    }
+]