Tried to optimize annotation fetching

cvat/apps/dataset_manager/task.py

@@ -453,8 +453,25 @@ def _init_shapes_from_db(self):
  for shape_id, shape_elements in elements.items():
  shapes[shape_id].elements = shape_elements
 
- serializer = serializers.LabeledShapeSerializer(list(shapes.values()), many=True)
- self.ir_data.shapes = serializer.data
+ def convert_shape(value):
+ value['attributes'] = value['labeledshapeattributeval_set']
+ del value['labeledshapeattributeval_set']
+ for attr in value['attributes']:
+ del attr['id']
+
+ keys = list(value.keys())
+ for field in keys:
+ if value[field] is None:
+ del value[field]
+
+ if value['elements']:
+ for element in value['elements']:
+ convert_shape(element)
+
+ return value
+
+ values = [convert_shape(value) for value in shapes.values()]
+ self.ir_data.shapes = values
 
  def _init_tracks_from_db(self):
  db_tracks = self.db_job.labeledtrack_set.prefetch_related(

cvat/apps/engine/mixins.py

@@ -279,8 +279,7 @@ def export_annotations(self, request, db_obj, export_func, callback, get_data=No
 
  data = get_data(self._object.pk)
  serializer = LabeledDataSerializer(data=data)
- if serializer.is_valid(raise_exception=True):
- return Response(serializer.data)
+ return Response(serializer.initial_data)
 
  def import_annotations(self, request, db_obj, import_func, rq_func, rq_id):
  is_tus_request = request.headers.get('Upload-Length', None) is not None or \