Support multiple rectangle ontology configurations

To allow creation of different test case for bboxes

Author: Val Brodsky

tests/integration/annotation_import/conftest.py

@@ -208,11 +208,11 @@ def annotations_by_data_type_v2(
 
 @pytest.fixture
 def ontology():
-    bbox_tool = {
+    bbox_tool_with_nested_text = {
         'required':
             False,
         'name':
-            'bbox',
+            'bbox_tool_with_nested_text',
         'tool':
             'rectangle',
         'color':
@@ -259,6 +259,51 @@ def ontology():
         }]
     }
 
+    bbox_tool = {
+        'required':
+            False,
+        'name':
+            'bbox',
+        'tool':
+            'rectangle',
+        'color':
+            '#a23030',
+        'classifications': [{
+            'required':
+                False,
+            'instructions':
+                'nested',
+            'name':
+                'nested',
+            'type':
+                'radio',
+            'options': [{
+                'label':
+                    'radio_option_1',
+                'value':
+                    'radio_value_1',
+                'options': [{
+                    'required':
+                        False,
+                    'instructions':
+                        'nested_checkbox',
+                    'name':
+                        'nested_checkbox',
+                    'type':
+                        'checklist',
+                    'options': [{
+                        'label': 'nested_checkbox_option_1',
+                        'value': 'nested_checkbox_value_1',
+                        'options': []
+                    }, {
+                        'label': 'nested_checkbox_option_2',
+                        'value': 'nested_checkbox_value_2'
+                    }]
+                }]
+            },]
+        }]
+    }
+
     polygon_tool = {
         'required': False,
         'name': 'polygon',
@@ -387,6 +432,7 @@ def ontology():
 
     tools = [
         bbox_tool,
+        bbox_tool_with_nested_text,
         polygon_tool,
         polyline_tool,
         point_tool,
@@ -500,6 +546,10 @@ def configured_project_without_data_rows(client, ontology, rand_gen):
     project.delete()
 
 
+# This function allows to convert an ontology feature to actual annotation
+# At the moment it expects only one feature per tool type and this creates unnecessary coupling between differet tests
+# In an example of a 'rectangle' we have extended to support multiple instances of the same tool type
+# TODO: we will support this approach in the future for all tools
 @pytest.fixture
 def prediction_id_mapping(configured_project):
     # Maps tool types to feature schema ids
@@ -512,15 +562,31 @@ def prediction_id_mapping(configured_project):
         else:
             tool_type = tool[
                 'type'] if 'scope' not in tool else f"{tool['type']}_{tool['scope']}"  # so 'checklist' of 'checklist_index'
-        result[tool_type] = {
-            "uuid": str(uuid.uuid4()),
-            "schemaId": tool['featureSchemaId'],
-            "name": tool['name'],
-            "dataRow": {
-                "id": configured_project.data_row_ids[idx],
-            },
-            'tool': tool
-        }
+
+        # TODO: remove this once we have a better way to associate multiple tools instances with a single tool type
+        if tool_type == 'rectangle':
+            value = {
+                "uuid": str(uuid.uuid4()),
+                "schemaId": tool['featureSchemaId'],
+                "name": tool['name'],
+                "dataRow": {
+                    "id": configured_project.data_row_ids[idx],
+                },
+                'tool': tool
+            }
+            if tool_type not in result:
+                result[tool_type] = []
+            result[tool_type].append(value)
+        else:
+            result[tool_type] = {
+                "uuid": str(uuid.uuid4()),
+                "schemaId": tool['featureSchemaId'],
+                "name": tool['name'],
+                "dataRow": {
+                    "id": configured_project.data_row_ids[idx],
+                },
+                'tool': tool
+            }
     return result
 
 
@@ -546,9 +612,49 @@ def polygon_inference(prediction_id_mapping):
     return polygon
 
 
+def find_tool_by_name(tool_instances, name):
+    for tool in tool_instances:
+        if tool['name'] == name:
+            return tool
+    return None
+
+
 @pytest.fixture
 def rectangle_inference(prediction_id_mapping):
-    rectangle = prediction_id_mapping['rectangle'].copy()
+    tool_instance = find_tool_by_name(prediction_id_mapping['rectangle'],
+                                      'bbox')
+    rectangle = tool_instance.copy()
+    rectangle.update({
+        "bbox": {
+            "top": 48,
+            "left": 58,
+            "height": 65,
+            "width": 12
+        },
+        'classifications': [{
+            "schemaId":
+                rectangle['tool']['classifications'][0]['featureSchemaId'],
+            "name":
+                rectangle['tool']['classifications'][0]['name'],
+            "answer": {
+                "schemaId":
+                    rectangle['tool']['classifications'][0]['options'][0]
+                    ['featureSchemaId'],
+                "name":
+                    rectangle['tool']['classifications'][0]['options'][0]
+                    ['value']
+            }
+        }]
+    })
+    del rectangle['tool']
+    return rectangle
+
+
+@pytest.fixture
+def rectangle_inference_with_confidence(prediction_id_mapping):
+    tool_instance = find_tool_by_name(prediction_id_mapping['rectangle'],
+                                      'bbox_tool_with_nested_text')
+    rectangle = tool_instance.copy()
     rectangle.update({
         "bbox": {
             "top": 48,
@@ -581,17 +687,13 @@ def rectangle_inference(prediction_id_mapping):
             }
         }]
     })
-    del rectangle['tool']
-    return rectangle
 
-
-@pytest.fixture
-def rectangle_inference_with_confidence(rectangle_inference):
-    rectangle = rectangle_inference.copy()
     rectangle.update({"confidence": 0.9})
     rectangle["classifications"][0]["answer"]["confidence"] = 0.8
     rectangle["classifications"][0]["answer"]["classifications"][0][
         "confidence"] = 0.7
+
+    del rectangle['tool']
     return rectangle