tod

Author: VaghinakDev

pytest.ini

@@ -2,4 +2,4 @@
 minversion = 3.7
 log_cli=true
 python_files = test_*.py
-;addopts = -n auto --dist=loadscope
+addopts = -n auto --dist=loadscope

src/superannotate/lib/app/annotation_helpers.py

@@ -86,6 +86,7 @@ def add_annotation_comment_to_json(
         "y": comment_coords[1],
         "correspondence": [{"text": comment_text, "email": comment_author}],
         "resolved": resolved,
+        "creationType": "Preannotation",  # noqa
         "createdBy": user_action,
         "updatedBy": user_action,
     }
@@ -132,7 +133,6 @@ def add_annotation_bbox_to_json(
         "type": "bbox",
         "points": {"x1": bbox[0], "y1": bbox[1], "x2": bbox[2], "y2": bbox[3]},
         "className": annotation_class_name,
-        "error": error,
         "groupId": 0,
         "pointLabels": {},
         "locked": False,
@@ -141,7 +141,8 @@ def add_annotation_bbox_to_json(
         if annotation_class_attributes is None
         else annotation_class_attributes,
     }
-
+    if error is not None:
+        annotation["error"] = error
     annotation = _add_created_updated(annotation)
     annotation_json["instances"].append(annotation)
 
@@ -175,13 +176,11 @@ def add_annotation_point_to_json(
         raise AppException("Point should be 2 element float list.")
 
     annotation_json, path = _preprocess_annotation_json(annotation_json, image_name)
-
     annotation = {
         "type": "point",
         "x": point[0],
         "y": point[1],
         "className": annotation_class_name,
-        "error": error,
         "groupId": 0,
         "pointLabels": {},
         "locked": False,
@@ -190,6 +189,8 @@ def add_annotation_point_to_json(
         if annotation_class_attributes is None
         else annotation_class_attributes,
     }
+    if error is not None:
+        annotation["error"] = error
 
     annotation = _add_created_updated(annotation)
     annotation_json["instances"].append(annotation)

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

@@ -44,14 +44,13 @@
 from lib.core.entities import AttachmentEntity
 from lib.core.entities import SettingEntity
 from lib.core.entities.classes import AnnotationClassEntity
+from lib.core.entities.classes import AttributeGroup
 from lib.core.entities.integrations import IntegrationEntity
 from lib.core.enums import ImageQuality
 from lib.core.exceptions import AppException
-from lib.core.types import AttributeGroup
 from lib.core.types import MLModel
 from lib.core.types import PriorityScore
 from lib.core.types import Project
-from lib.infrastructure.controller import Controller
 from lib.infrastructure.validators import wrap_error
 from pydantic import conlist
 from pydantic import parse_obj_as
@@ -1141,19 +1140,76 @@ def create_annotation_class(
 
         :param project: project name
         :type project: str
+
         :param name: name for the class
         :type name: str
-        :param color: RGB hex color value, e.g., "#FFFFAA"
+
+        :param color: RGB hex color value, e.g., "#F9E0FA"
         :type color: str
-        :param attribute_groups: example:
-         [ { "name": "tall", "is_multiselect": 0, "attributes": [ { "name": "yes" }, { "name": "no" } ] },
-         { "name": "age", "is_multiselect": 0, "attributes": [ { "name": "young" }, { "name": "old" } ] } ]
+
+        :param attribute_groups:  list of attribute group dicts.
+                                  The values for the "group_type" key are  "radio"|"checklist"|"text"|"numeric".
+                                  Mandatory keys for each attribute group are
+                                      -  "name"
         :type attribute_groups: list of dicts
-        :param class_type: class type
+
+        :param class_type: class type. Should be either "object" or "tag"
         :type class_type: str
 
         :return: new class metadata
         :rtype: dict
+
+        Request Example:
+        ::
+            attributes_list = [
+               {
+                   "group_type": "radio",
+                   "name": "Vehicle",
+                   "attributes": [
+                       {
+                           "name": "Car"
+                       },
+                       {
+                           "name": "Track"
+                       },
+                       {
+                           "name": "Bus"
+                       }
+                   ],
+                   "default_value": "Car"
+               },
+               {
+                   "group_type": "checklist",
+                   "name": "Color",
+                   "attributes": [
+                       {
+                           "name": "Yellow"
+                       },
+                       {
+                           "name": "Black"
+                       },
+                       {
+                           "name": "White"
+                       }
+                   ],
+                   "default_value": ["Yellow", "White"]
+               },
+               {
+                   "group_type": "text",
+                   "name": "Timestamp"
+               },
+               {
+                   "group_type": "numeric",
+                   "name": "Description"
+               }
+            ]
+            client.create_annotation_class(
+               project="Image Project",
+               name="Example Class",
+               color="#F9E0FA",
+               attribute_groups=attributes_list
+            )
+
         """
         if isinstance(project, Project):
             project = project.dict()
@@ -1837,7 +1893,6 @@ def add_annotation_point_to_image(
             annotations,
             point,
             annotation_class_name,
-            image_name,
             annotation_class_attributes,
             error,
         )
@@ -2112,7 +2167,9 @@ def delete_annotations(
             raise AppException(response.errors)
 
     def validate_annotations(
-        self, project_type: ProjectTypes, annotations_json: Union[NotEmptyStr, Path, dict]
+        self,
+        project_type: ProjectTypes,
+        annotations_json: Union[NotEmptyStr, Path, dict],
     ):
         """Validates given annotation JSON.
 
@@ -2129,9 +2186,7 @@ def validate_annotations(
             annotation_data = annotations_json
         else:
             annotation_data = json.load(open(annotations_json))
-        response = self.controller.validate_annotations(
-            project_type, annotation_data
-        )
+        response = self.controller.validate_annotations(project_type, annotation_data)
         if response.errors:
             raise AppException(response.errors)
         report = response.data

src/superannotate/lib/core/enums.py

@@ -2,6 +2,14 @@
 from types import DynamicClassAttribute
 
 
+class classproperty:
+    def __init__(self, getter):
+        self.getter = getter
+
+    def __get__(self, instance, owner):
+        return self.getter(owner)
+
+
 class BaseTitledEnum(int, Enum):
     def __new__(cls, title, value):
         obj = int.__new__(cls, value)
@@ -64,6 +72,10 @@ class ProjectType(BaseTitledEnum):
     VIDEO = "Video", 3
     DOCUMENT = "Document", 4
 
+    @classproperty
+    def images(self):
+        return self.VECTOR.value, self.PIXEL.value
+
 
 class UserRole(BaseTitledEnum):
     SUPER_ADMIN = "Superadmin", 1

src/superannotate/lib/core/serviceproviders.py

@@ -372,7 +372,9 @@ def upload_annotations(
     ) -> ServiceResponse:
         raise NotImplementedError
 
-    def get_schema(self, team_id: int, project_type: int, version: str) -> dict:
+    def get_schema(
+        self, team_id: int, project_type: int, version: str
+    ) -> ServiceResponse:
         raise NotImplementedError
 
     def list_sub_sets(self, team_id: int, project_id: int) -> ServiceResponse:

src/superannotate/lib/core/types.py

@@ -3,12 +3,9 @@
 from pydantic import BaseModel
 from pydantic import constr
 from pydantic import Extra
-from superannotate_schemas.schemas.classes import AttributeGroup as AttributeGroupSchema
 
 NotEmptyStr = constr(strict=True, min_length=1)
 
-AttributeGroup = AttributeGroupSchema
-
 
 class Project(BaseModel):
     name: NotEmptyStr