Deleted filering in the tags preprocessing

VaghinakDev · VaghinakDev · commit 762db47dfe5a · 2022-02-16T15:48:36.000+04:00
diff --git a/src/superannotate/lib/core/data_handlers.py b/src/superannotate/lib/core/data_handlers.py
@@ -8,13 +8,14 @@
 from typing import Dict
 from typing import List
 
-import lib.core as constances
-from lib.core.enums import ClassTypeEnum
-from lib.core.reporter import Reporter
 from superannotate_schemas.schemas.classes import AnnotationClass
 from superannotate_schemas.schemas.classes import Attribute
 from superannotate_schemas.schemas.classes import AttributeGroup
 
+import lib.core as constances
+from lib.core.enums import ClassTypeEnum
+from lib.core.reporter import Reporter
+
 
 class BaseDataHandler(metaclass=ABCMeta):
     @abstractmethod
@@ -40,17 +41,15 @@ def __init__(self, annotation_classes: List[AnnotationClass]):
 
     @lru_cache()
     def get_annotation_class(
-        self, name: str, class_type: ClassTypeEnum
+            self, name: str
     ) -> AnnotationClass:
         for annotation_class in self._annotation_classes:
-            if annotation_class.name == name and class_type.equals(
-                annotation_class.type
-            ):
+            if annotation_class.name == name:
                 return annotation_class
 
     @lru_cache()
     def get_attribute_group(
-        self, annotation_class: AnnotationClass, attr_group_name: str
+            self, annotation_class: AnnotationClass, attr_group_name: str
     ) -> AttributeGroup:
         for attr_group in annotation_class.attribute_groups:
             if attr_group.name == attr_group_name:
@@ -108,9 +107,7 @@ class DocumentTagHandler(BaseAnnotationDateHandler):
     def handle(self, annotation: dict):
         new_tags = []
         for tag in annotation["tags"]:
-            annotation_class = self.get_annotation_class(
-                tag, class_type=ClassTypeEnum.OBJECT
-            )
+            annotation_class = self.get_annotation_class(tag)
             if annotation_class:
                 new_tags.append(annotation_class.id)
         annotation["tags"] = new_tags
@@ -119,10 +116,10 @@ def handle(self, annotation: dict):
 
 class MissingIDsHandler(BaseAnnotationDateHandler):
     def __init__(
-        self,
-        annotation_classes: List[AnnotationClass],
-        templates: List[dict],
-        reporter: Reporter,
+            self,
+            annotation_classes: List[AnnotationClass],
+            templates: List[dict],
+            reporter: Reporter,
     ):
         super().__init__(annotation_classes)
         self.validate_existing_classes(annotation_classes)
@@ -175,9 +172,7 @@ def handle(self, annotation: dict):
                 annotation_instance["classId"] = -1
             else:
                 class_name = annotation_instance["className"]
-                annotation_type = annotation_instance.get("type", ClassTypeEnum.OBJECT)
-                class_type = self._get_class_type(annotation_type)
-                annotation_class = self.get_annotation_class(class_name, class_type)
+                annotation_class = self.get_annotation_class(class_name)
                 if not annotation_class:
                     self.reporter.log_warning(f"Couldn't find class {class_name}")
                     self.reporter.store_message("missing_classes", class_name)
@@ -199,7 +194,7 @@ def handle(self, annotation: dict):
             template["name"]: template["id"] for template in self._templates
         }
         for annotation_instance in (
-            i for i in annotation["instances"] if i.get("type", None) == "template"
+                i for i in annotation["instances"] if i.get("type", None) == "template"
         ):
             annotation_instance["templateId"] = template_name_id_map.get(
                 annotation_instance.get("templateName", ""), -1
@@ -209,13 +204,7 @@ def handle(self, annotation: dict):
             i for i in annotation["instances"] if "className" in i and i["classId"] > 0
         ]:
             annotation_class_name = annotation_instance["className"]
-            annotation_class_type = self._get_class_type(
-                annotation_instance.get("type", ClassTypeEnum.OBJECT)
-            )
-
-            annotation_class = self.get_annotation_class(
-                annotation_class_name, annotation_class_type
-            )
+            annotation_class = self.get_annotation_class(annotation_class_name)
             if not annotation_class:
                 self.reporter.log_warning(
                     f"Couldn't find annotation class {annotation_class_name}"
@@ -291,9 +280,7 @@ def convert_timestamp(timestamp):
                 "locked": False,
             }
             if class_name:
-                annotation_class = self.get_annotation_class(
-                    class_name, ClassTypeEnum.OBJECT
-                )
+                annotation_class = self.get_annotation_class(class_name)
                 if annotation_class:
                     editor_instance["classId"] = annotation_class.id
                 else:
@@ -328,9 +315,7 @@ def convert_timestamp(timestamp):
                         ] = timestamp_data["points"]
                     if not class_name:
                         continue
-                    annotation_class = self.get_annotation_class(
-                        class_name, ClassTypeEnum.OBJECT
-                    )
+                    annotation_class = self.get_annotation_class(class_name)
                     if not annotation_class:
                         self.reporter.store_message(
                             "missing_classes", meta["className"]
@@ -365,10 +350,10 @@ def convert_timestamp(timestamp):
                                 (group_name, attr_name)
                             )
                     attributes_to_add = (
-                        existing_attributes_in_current_instance - active_attributes
+                            existing_attributes_in_current_instance - active_attributes
                     )
                     attributes_to_delete = (
-                        active_attributes - existing_attributes_in_current_instance
+                            active_attributes - existing_attributes_in_current_instance
                     )
                     if attributes_to_add or attributes_to_delete:
                         editor_instance["timeline"][timestamp][
diff --git a/src/superannotate/lib/core/usecases/images.py b/src/superannotate/lib/core/usecases/images.py
@@ -2845,10 +2845,6 @@ def __init__(
         self._annotation_classes = annotation_classes
         self._project = project
 
-    def validate_annotation_classes(self):
-        if "attribute_groups" not in self._annotation_classes:
-            raise AppValidationException("Field attribute_groups is required.")
-
     def validate_project_type(self):
         if self._project.project_type != ProjectType.VECTOR.value and "tag" in [
             i.type for i in self._annotation_classes
diff --git a/tests/data_set/sample_project_pixel/classes/classes.json b/tests/data_set/sample_project_pixel/classes/classes.json
@@ -1 +1,110 @@
-[{"id":56820,"project_id":7617,"name":"Personal vehicle","color":"#547497","count":18,"createdAt":"2020-09-29T10:39:39.000Z","updatedAt":"2020-09-29T10:48:18.000Z","attribute_groups":[{"id":21448,"class_id":56820,"name":"Large","is_multiselect":0,"createdAt":"2020-09-29T10:39:39.000Z","updatedAt":"2020-09-29T10:39:39.000Z","attributes":[{"id":57096,"group_id":21448,"project_id":7617,"name":"no","count":0,"createdAt":"2020-09-29T10:39:39.000Z","updatedAt":"2020-09-29T10:39:39.000Z"},{"id":57097,"group_id":21448,"project_id":7617,"name":"yes","count":1,"createdAt":"2020-09-29T10:39:39.000Z","updatedAt":"2020-09-29T10:48:18.000Z"}]}]},{"id":56821,"project_id":7617,"name":"Large vehicle","color":"#2ba36d","count":1,"createdAt":"2020-09-29T10:39:39.000Z","updatedAt":"2020-09-29T10:48:18.000Z","attribute_groups":[{"id":21449,"class_id":56821,"name":"small","is_multiselect":0,"createdAt":"2020-09-29T10:39:39.000Z","updatedAt":"2020-09-29T10:39:39.000Z","attributes":[{"id":57098,"group_id":21449,"project_id":7617,"name":"yes","count":0,"createdAt":"2020-09-29T10:39:39.000Z","updatedAt":"2020-09-29T10:39:39.000Z"},{"id":57099,"group_id":21449,"project_id":7617,"name":"no","count":1,"createdAt":"2020-09-29T10:39:39.000Z","updatedAt":"2020-09-29T10:48:18.000Z"}]}]},{"id":56822,"project_id":7617,"name":"Pedestrian","color":"#d4da03","count":3,"createdAt":"2020-09-29T10:39:39.000Z","updatedAt":"2020-09-29T10:48:18.000Z","attribute_groups":[]},{"id":56823,"project_id":7617,"name":"Two wheeled vehicle","color":"#f11aec","count":1,"createdAt":"2020-09-29T10:39:39.000Z","updatedAt":"2020-09-29T10:48:18.000Z","attribute_groups":[]},{"id":56824,"project_id":7617,"name":"Traffic sign","color":"#d8a7fd","count":9,"createdAt":"2020-09-29T10:39:39.000Z","updatedAt":"2020-09-29T10:48:18.000Z","attribute_groups":[]}]
+[
+  {
+    "id": 56820,
+    "project_id": 7617,
+    "name": "Personal vehicle",
+    "color": "#547497",
+    "count": 18,
+    "createdAt": "2020-09-29T10:39:39.000Z",
+    "updatedAt": "2020-09-29T10:48:18.000Z",
+    "attribute_groups": [
+      {
+        "id": 21448,
+        "class_id": 56820,
+        "name": "Large",
+        "is_multiselect": 0,
+        "createdAt": "2020-09-29T10:39:39.000Z",
+        "updatedAt": "2020-09-29T10:39:39.000Z",
+        "attributes": [
+          {
+            "id": 57096,
+            "group_id": 21448,
+            "project_id": 7617,
+            "name": "no",
+            "count": 0,
+            "createdAt": "2020-09-29T10:39:39.000Z",
+            "updatedAt": "2020-09-29T10:39:39.000Z"
+          },
+          {
+            "id": 57097,
+            "group_id": 21448,
+            "project_id": 7617,
+            "name": "yes",
+            "count": 1,
+            "createdAt": "2020-09-29T10:39:39.000Z",
+            "updatedAt": "2020-09-29T10:48:18.000Z"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "id": 56821,
+    "project_id": 7617,
+    "name": "Large vehicle",
+    "color": "#2ba36d",
+    "count": 1,
+    "createdAt": "2020-09-29T10:39:39.000Z",
+    "updatedAt": "2020-09-29T10:48:18.000Z",
+    "attribute_groups": [
+      {
+        "id": 21449,
+        "class_id": 56821,
+        "name": "small",
+        "is_multiselect": 0,
+        "createdAt": "2020-09-29T10:39:39.000Z",
+        "updatedAt": "2020-09-29T10:39:39.000Z",
+        "attributes": [
+          {
+            "id": 57098,
+            "group_id": 21449,
+            "project_id": 7617,
+            "name": "yes",
+            "count": 0,
+            "createdAt": "2020-09-29T10:39:39.000Z",
+            "updatedAt": "2020-09-29T10:39:39.000Z"
+          },
+          {
+            "id": 57099,
+            "group_id": 21449,
+            "project_id": 7617,
+            "name": "no",
+            "count": 1,
+            "createdAt": "2020-09-29T10:39:39.000Z",
+            "updatedAt": "2020-09-29T10:48:18.000Z"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "id": 56822,
+    "project_id": 7617,
+    "name": "Pedestrian",
+    "color": "#d4da03",
+    "count": 3,
+    "createdAt": "2020-09-29T10:39:39.000Z",
+    "updatedAt": "2020-09-29T10:48:18.000Z",
+    "attribute_groups": []
+  },
+  {
+    "id": 56823,
+    "project_id": 7617,
+    "name": "Two wheeled vehicle",
+    "color": "#f11aec",
+    "count": 1,
+    "createdAt": "2020-09-29T10:39:39.000Z",
+    "updatedAt": "2020-09-29T10:48:18.000Z",
+    "attribute_groups": []
+  },
+  {
+    "id": 56824,
+    "project_id": 7617,
+    "name": "Traffic sign",
+    "color": "#d8a7fd",
+    "count": 9,
+    "createdAt": "2020-09-29T10:39:39.000Z",
+    "updatedAt": "2020-09-29T10:48:18.000Z",
+    "attribute_groups": []
+  }
+]
