Merge branch 'friday' of https://github.com/superannotateai/superannotate-python-sdk into friday

Author: VaghinakDev

src/superannotate/lib/core/video_convertor.py

@@ -15,6 +15,7 @@ class Annotation(BaseModel):
     instanceId: int
     type: str
     className: Optional[str]
+    classId: Optional[int]
     x: Optional[Any]
     y: Optional[Any]
     points: Optional[Dict]
@@ -57,6 +58,7 @@ def get_frame(self, frame_no: int):
     def _interpolate(
         self,
         class_name: str,
+        class_id: int,
         from_frame: int,
         to_frame: int,
         data: dict,
@@ -87,6 +89,7 @@ def _interpolate(
                 instanceId=instance_id,
                 type=annotation_type,
                 className=class_name,
+                classId=class_id,
                 attributes=data["attributes"],
                 keyframe=False,
                 **tmp_data
@@ -105,23 +108,21 @@ def pairwise(data: list):
         return zip(a, b)
 
     def get_median(self, annotations: List[dict]) -> dict:
-        if len(annotations) == 1:
+        if len(annotations) >= 1:
             return annotations[0]
-        first_annotations = annotations[:1][0]
-        median = (
-            first_annotations["timestamp"] // self.ratio
-        ) * self.ratio + self.ratio / 2
-        median_annotation = first_annotations
-        distance = abs(median - first_annotations["timestamp"])
-        for annotation in annotations[1:]:
-            annotation_distance = abs(median - annotation["timestamp"])
-            if annotation_distance < distance:
-                distance = annotation_distance
-                median_annotation = annotation
-        return median_annotation
-
-    def calculate_sped(self, from_frame, to_frame):
-        pass
+        ## Let's just leave the code for reference.
+        # first_annotations = annotations[:1][0]
+        # median = (
+        #     first_annotations["timestamp"] // self.ratio
+        # ) * self.ratio + self.ratio / 2
+        # median_annotation = first_annotations
+        # distance = abs(median - first_annotations["timestamp"])
+        # for annotation in annotations[1:]:
+        #     annotation_distance = abs(median - annotation["timestamp"])
+        #     if annotation_distance < distance:
+        #         distance = annotation_distance
+        #         median_annotation = annotation
+        # return median_annotation
 
     @staticmethod
     def merge_first_frame(frames_mapping):
@@ -141,6 +142,7 @@ def _interpolate_frames(
         to_frame_no,
         annotation_type,
         class_name,
+        class_id,
         instance_id,
     ):
         steps = None
@@ -171,6 +173,7 @@ def _interpolate_frames(
             ]
         return self._interpolate(
             class_name=class_name,
+            class_id=class_id,
             from_frame=from_frame_no,
             to_frame=to_frame_no,
             data=from_frame,
@@ -184,6 +187,7 @@ def _process(self):
             instance_id = next(self.id_generator)
             annotation_type = instance["meta"]["type"]
             class_name = instance["meta"].get("className")
+            class_id = instance["meta"].get("classId", -1)
             for parameter in instance["parameters"]:
                 frames_mapping = defaultdict(list)
                 interpolated_frames = {}
@@ -207,6 +211,7 @@ def _process(self):
                                 to_frame=to_frame,
                                 to_frame_no=to_frame_no,
                                 class_name=class_name,
+                                class_id=class_id,
                                 annotation_type=annotation_type,
                                 instance_id=instance_id,
                             )
@@ -222,6 +227,7 @@ def _process(self):
                             instanceId=instance_id,
                             type=annotation_type,
                             className=class_name,
+                            classId=class_id,
                             x=frame.get("x"),
                             y=frame.get("y"),
                             points=frame.get("points"),
@@ -234,6 +240,7 @@ def _process(self):
                         instanceId=instance_id,
                         type=annotation_type,
                         className=class_name,
+                        classId=class_id,
                         x=median.get("x"),
                         y=median.get("y"),
                         points=median.get("points"),