wip

Author: Matt Sokoloff

labelbox/data/annotation_types/metrics/scalar.py

@@ -9,10 +9,18 @@ class ScalarMetric(BaseModel):
     # For backwards compatibility, metric_name is optional. This will eventually be deprecated
     # The metric_name will be set to a default name in the editor if it is not set.
 
+    # aggregation will be ignored wihtout providing a metric name.
+    # Not providing a metric name is deprecated.
     """
     value: float
     metric_name: Optional[str] = None
     feature_name: Optional[str] = None
     subclass_name: Optional[str] = None
     aggregation: MetricAggregation = MetricAggregation.ARITHMETIC_MEAN
     extra: Dict[str, Any] = {}
+
+    def dict(self, *args, **kwargs):
+        res = super().dict(*args, **kwargs)
+        if res['metric_name'] is None:
+            res.pop('aggregation')
+        return {k: v for k, v in res.items() if v is not None}

labelbox/data/metrics/iou.py

@@ -24,7 +24,7 @@ def test_legacy_scalar_metric():
         },
         'annotations': [{
             'value': 10.0,
-            'extra': {}
+            'extra': {},
         }],
         'extra': {},
         'uid': None
@@ -65,11 +65,17 @@ def test_custom_scalar_metric(feature_name, subclass_name, aggregation):
             'arr': None
         },
         'annotations': [{
-            'value': value,
-            'metric_name': 'iou',
-            'feature_name': feature_name,
-            'subclass_name': subclass_name,
-            'aggregation': aggregation or MetricAggregation.ARITHMETIC_MEAN,
+            'value':
+                value,
+            'metric_name':
+                'iou',
+            **({
+                'feature_name': feature_name
+            } if feature_name else {}),
+            **({
+                'subclass_name': subclass_name
+            } if subclass_name else {}), 'aggregation':
+                aggregation or MetricAggregation.ARITHMETIC_MEAN,
             'extra': {}
         }],
         'extra': {},

tests/data/annotation_types/test_metrics.py

@@ -311,7 +311,7 @@ def submit(project_id, data_row_id):
             })
         features = feature_result['project']['featuresForDataRow']
         feature_ids = [feature['id'] for feature in features]
-        client.execute(
+        res = client.execute(
             """mutation createLabelPyApi ($project_id : ID!,$datarow_id: ID!,$feature_ids: [ID!]!,$time_seconds : Float!) {
                 createLabelFromFeatures(data: {dataRow: { id: $datarow_id },project: { id: $project_id },
                     featureIds: $feature_ids,secondsSpent: $time_seconds}) {id}}""",
@@ -321,6 +321,7 @@ def submit(project_id, data_row_id):
                 "feature_ids": feature_ids,
                 "time_seconds": 10
             })
+        return res['createLabelFromFeatures']['id']
 
     return submit
 

tests/integration/conftest.py

@@ -320,14 +320,11 @@ def model_run_annotation_groups(client, configured_project,
         client, configured_project.uid, f'mal-import-{uuid.uuid4()}',
         model_run_predictions)
     upload_task.wait_until_done()
-
+    label_ids = []
     for data_row_id in {x['dataRow']['id'] for x in model_run_predictions}:
-        annotation_submit_fn(configured_project.uid, data_row_id)
-
+        label_ids.append(
+            annotation_submit_fn(configured_project.uid, data_row_id))
+    model_run.upsert_labels(label_ids)
     time.sleep(3)
-    labels = configured_project.export_labels(download=True)
-    model_run.upsert_labels([label['ID'] for label in labels])
-    time.sleep(3)
-
     yield model_run
     # TODO: Delete resources when that is possible ..