Make sure that the bbox element is filled and categories are properly loaded.

Author: wilderrodrigues

backend/webserver/api/annotations.py

@@ -18,6 +18,7 @@
 create_annotation.add_argument('metadata', type=dict, location='json')
 create_annotation.add_argument('segmentation', type=list, location='json')
 create_annotation.add_argument('keypoints', type=list, location='json')
+create_annotation.add_argument('bbox', type=list, location='json')
 create_annotation.add_argument('color', location='json')
 
 update_annotation = reqparse.RequestParser()
@@ -42,11 +43,12 @@ def post(self):
         metadata = args.get('metadata', {})
         segmentation = args.get('segmentation', [])
         keypoints = args.get('keypoints', [])
+        bbox = args.get('bbox', [])
 
         image = current_user.images.filter(id=image_id, deleted=False).first()
         if image is None:
             return {"message": "Invalid image id"}, 400
-        
+
         logger.info(
             f'{current_user.username} has created an annotation for image {image_id} with {isbbox}')
         logger.info(
@@ -59,6 +61,7 @@ def post(self):
                 metadata=metadata,
                 segmentation=segmentation,
                 keypoints=keypoints,
+                bbox=bbox,
                 isbbox=isbbox
             )
             annotation.save()

backend/webserver/api/annotator.py

@@ -30,7 +30,7 @@ def post(self):
         image = data.get('image')
         dataset = data.get('dataset')
         image_id = image.get('id')
-        
+
         image_model = ImageModel.objects(id=image_id).first()
 
         if image_model is None:
@@ -40,9 +40,9 @@ def post(self):
         db_dataset = current_user.datasets.filter(id=image_model.dataset_id).first()
         if dataset is None:
             return {'success': False, 'message': 'Could not find associated dataset'}
-        
+
         db_dataset.update(annotate_url=dataset.get('annotate_url', ''))
-        
+
         categories = CategoryModel.objects.all()
         annotations = AnnotationModel.objects(image_id=image_id)
 
@@ -64,7 +64,7 @@ def post(self):
                 category_update['keypoint_edges'] = category.get('keypoint_edges', [])
                 category_update['keypoint_labels'] = category.get('keypoint_labels', [])
                 category_update['keypoint_colors'] = category.get('keypoint_colors', [])
-            
+
             db_category.update(**category_update)
 
             # Iterate every annotation from the data annotations
@@ -95,6 +95,7 @@ def post(self):
                     sessions.append(model)
 
                 keypoints = annotation.get('keypoints', [])
+                bbox = annotation.get('bbox', [])
                 if keypoints:
                     counted = True
 
@@ -103,6 +104,7 @@ def post(self):
                     inc__milliseconds=total_time,
                     set__isbbox=annotation.get('isbbox', False),
                     set__keypoints=keypoints,
+                    set__bbox=bbox,
                     set__metadata=annotation.get('metadata'),
                     set__color=annotation.get('color')
                 )
@@ -203,5 +205,3 @@ def get(self, image_id):
             data.get('categories').append(category)
 
         return data
-
-

backend/webserver/util/coco_util.py

@@ -34,7 +34,7 @@ def paperjs_to_coco(image_width, image_height, paperjs):
         compound_path = {"children": [paperjs]}
     else:
         compound_path = paperjs[1]
-    
+
     children = compound_path.get('children', [])
 
     for child in children:
@@ -43,11 +43,11 @@ def paperjs_to_coco(image_width, image_height, paperjs):
         segments_to_add = []
 
         for point in child_segments:
-            
+
             # Cruve
             if len(point) == 4:
                 point = point[0]
-            
+
             # Point
             if len(point) == 2:
                 x = round(center[0] + point[0], 2)
@@ -102,7 +102,7 @@ def paperjs_to_coco_cliptobounds(image_width, image_height, paperjs): # todo: th
         compound_path = {"children": [paperjs]}
     else:
         compound_path = paperjs[1]
-    
+
     children = compound_path.get('children', [])
 
     for child in children:
@@ -124,7 +124,7 @@ def paperjs_to_coco_cliptobounds(image_width, image_height, paperjs): # todo: th
                 inside = True
                 break
             i_start += 1
-        
+
         if inside: # if point is inside the canvas. Otherwise ignore it
             edges = {
                 'w_0': np.array([[0,0],[image_width, 0]], np.float),
@@ -136,12 +136,12 @@ def paperjs_to_coco_cliptobounds(image_width, image_height, paperjs): # todo: th
             for i in range(i_start, i_start + len(child_segments)):
                 p = i % len(child_segments)
                 point = child_segments[p]
-                
+
                 # print('point:', point, flush=True)
                 # Cruve
                 if len(point) == 4:
                     point = point[0]
-                
+
                 # Point
                 if len(point) == 2:
                     x = round(center[0] + point[0], 2)
@@ -221,7 +221,7 @@ def get_image_coco(image_id):
     """
     image = ImageModel.objects(id=image_id)\
         .only(*ImageModel.COCO_PROPERTIES)
-    
+
     image = fix_ids(image)[0]
     dataset = DatasetModel.objects(id=image.get('dataset_id')).first()
 
@@ -239,10 +239,10 @@ def get_image_coco(image_id):
         category_annotations = db_annotations\
             .filter(category_id=category.get('id'))\
             .only(*AnnotationModel.COCO_PROPERTIES)
-        
+
         if category_annotations.count() == 0:
             continue
-        
+
         category_annotations = fix_ids(category_annotations)
         for annotation in category_annotations:
 
@@ -256,7 +256,7 @@ def get_image_coco(image_id):
                     arr = np.array(annotation.get('keypoints', []))
                     arr = arr[2::3]
                     annotation['num_keypoints'] = len(arr[arr > 0])
-                
+
                 annotations.append(annotation)
 
         if len(category.get('keypoint_labels')) > 0:
@@ -265,7 +265,7 @@ def get_image_coco(image_id):
         else:
             del category['keypoint_edges']
             del category['keypoint_labels']
-        
+
         categories.append(category)
 
     coco = {
@@ -323,8 +323,9 @@ def get_dataset_coco(dataset):
 
             has_keypoints = len(annotation.get('keypoints', [])) > 0
             has_segmentation = len(annotation.get('segmentation', [])) > 0
+            has_bbox = len(annotation.get('bbox', [])) > 0
 
-            if has_keypoints or has_segmentation:
+            if has_keypoints or has_segmentation or has_bbox:
                 del annotation['deleted']
 
                 if not has_keypoints:
@@ -333,7 +334,7 @@ def get_dataset_coco(dataset):
                     arr = np.array(annotation.get('keypoints', []))
                     arr = arr[2::3]
                     annotation['num_keypoints'] = len(arr[arr > 0])
-                
+
                 coco.get('annotations').append(annotation)
 
         image = fix_ids(image)

backend/workers/tasks/data.py

@@ -90,8 +90,9 @@ def export_annotations(task_id, dataset_id, categories):
 
             has_keypoints = len(annotation.get('keypoints', [])) > 0
             has_segmentation = len(annotation.get('segmentation', [])) > 0
+            has_bbox = len(annotation.get('bbox', [])) > 0
 
-            if has_keypoints or has_segmentation:
+            if has_keypoints or has_segmentation or has_bbox:
 
                 if not has_keypoints:
                     if 'keypoints' in annotation:
@@ -231,18 +232,17 @@ def import_annotations(task_id, dataset_id, coco_json):
         category_id = annotation.get('category_id')
         segmentation = annotation.get('segmentation', [])
         keypoints = annotation.get('keypoints', [])
-        bboxes = annotation.get('bbox', [])
         # is_crowd = annotation.get('iscrowed', False)
         area = annotation.get('area', 0)
-        bbox = annotation.get('bbox', [0, 0, 0, 0])
-        isbbox = annotation.get('isbbox', False) if len(bboxes) == 0 else len(bboxes) > 0
+        bbox = annotation.get('bbox', [])
+        isbbox = annotation.get('isbbox', False) if len(bbox) == 0 else True
 
         progress += 1
         task.set_progress((progress / total_items) * 100, socket=socket)
 
         has_segmentation = len(segmentation) > 0
         has_keypoints = len(keypoints) > 0
-        has_bbox = len(bboxes) > 0
+        has_bbox = len(bbox) > 0
         if not has_segmentation and not has_keypoints and not has_bbox:
             task.warning(
                 f"Annotation {annotation.get('id')} has none of segmentation, keypoints and bounding boxes")
@@ -261,7 +261,8 @@ def import_annotations(task_id, dataset_id, coco_json):
             image_id=image_model.id,
             category_id=category_model_id,
             segmentation=segmentation,
-            keypoints=keypoints
+            keypoints=keypoints,
+            bbox=bbox
         ).first()
 
         if annotation_model is None:
@@ -273,7 +274,7 @@ def import_annotations(task_id, dataset_id, coco_json):
             annotation_model.color = annotation.get('color')
             annotation_model.metadata = annotation.get('metadata', {})
 
-            if has_segmentation:
+            if has_segmentation or has_bbox:
                 annotation_model.segmentation = segmentation
                 annotation_model.area = area
                 annotation_model.bbox = bbox