Adding test for annotations upload

Author: mmerce

bigml/api_handlers/sourcehandler.py

@@ -548,9 +548,12 @@ def update_composite_annotations(self, source, images_file,
                                     "components": source_ids})
                 elif optype == "regions":
                     for value, source_id in values:
+                        if isinstance(value, dict):
+                            # dictionary should contain the bigml-coco format
+                            value = compact_regions(value)
                         changes.append(
                             {"field": field,
-                             "value": compact_regions(value),
+                             "value": value,
                              "components": [source_id]})
                 else:
                     for value, source_id in values:

bigml/tests/create_dataset_steps.py

@@ -222,3 +222,16 @@ def clone_dataset(step, dataset):
 def the_cloned_dataset_is(step, dataset):
     """Checking the dataset is a clone"""
     eq_(world.dataset["origin"], dataset)
+
+
+def check_annotations(step, annotations_field, annotations_num):
+    """Checking the dataset contains a number of annotations"""
+    annotations_num = int(annotations_num)
+    field = world.dataset["fields"][annotations_field]
+    if field["optype"] == "regions":
+        count = field["summary"]["regions"]["sum"]
+    else:
+        count = 0
+        for _, num in field["summary"]["categories"]:
+            count += num
+    eq_(count, annotations_num)

bigml/tests/test_22_source_args.py

@@ -25,6 +25,7 @@
 from .world import world, setup_module, teardown_module, show_doc, \
     show_method
 from . import create_source_steps as source_create
+from . import create_dataset_steps as dataset_create
 
 
 class TestUploadSource:
@@ -125,3 +126,38 @@ def test_scenario3(self):
             source_create.the_source_is_finished(
                 self, example["source_wait"])
             source_create.the_cloned_source_origin_is(self, source)
+            
+    def test_scenario4(self):
+        """
+        Scenario: Successfully adding annotatations to composite source:
+            Given I create an annotated images data source uploading a "<data>" file
+            And I wait until the source is ready less than <source_wait> secs
+            And I create a dataset
+            And I wait until the dataset is ready less than <dataset_wait> secs
+            Then the new dataset has <annotations_num> annotations in the <annotations_field> field
+        """
+        headers = ["data", "source_wait", "dataset_wait", "annotations_num",
+                   "annotations_field"]
+        examples = [
+            ['data/images/metadata.json', '500', '500', '12',
+             '100002'],
+            ['data/images/metadata_compact.json', '500', '500', '3',
+             '100003']]
+        show_doc(self.test_scenario4)
+        for example in examples:
+            example = dict(zip(headers, example))
+            show_method(self, self.bigml["method"], example)
+            source_create.i_create_annotated_source(
+                self,
+                example["data"],
+                args={"image_analysis": {"enabled": False,
+                                         "extracted_features": []}})
+            source_create.the_source_is_finished(
+                self, example["source_wait"])
+            dataset_create.i_create_a_dataset(self)
+            dataset_create.the_dataset_is_finished_in_less_than(
+                self, example["dataset_wait"])
+            dataset_create.check_annotations(self, 
+                                             example["annotations_field"],
+                                             example["annotations_num"])
+

data/images/annotations_compact.json

@@ -0,0 +1,2 @@
+[{"file": "f1/fruits1f.png", "my_regions": "[[\"region1\" 0.2 0.2 0.4 0.4]]"},
+ {"file": "f1/fruits1.png", "my_regions": "[[\"region2\" 0.3 0.3 0.5 0.5] [\"region1\" 0.6 0.6 0.8 0.8]]"}]

data/images/metadata_compact.json

@@ -0,0 +1,5 @@
+{"description": "Fruit images to test colour distributions with regions",
+ "images_file": "./fruits_hist.zip",
+ "new_fields": [{"name": "my_regions", "optype": "regions"}],
+ "source_id": null,
+ "annotations": "./annotations_compact.json"}