PR comments

Author: phil-scale

nucleus/metrics/base.py

@@ -21,7 +21,7 @@ class MetricResult:
     """
 
     value: float
-    weight: float = 1
+    weight: float = 1.0
 
     @staticmethod
     def aggregate(results: Iterable["MetricResult"]) -> "MetricResult":

nucleus/metrics/filters.py

@@ -24,19 +24,8 @@ def confidence_filter(
         lambda prediction: not hasattr(prediction, "confidence")
         or prediction.confidence >= min_confidence
     )
-    predictions_copy.box_predictions = list(
-        filter(filter_fn, predictions.box_predictions)
-    )
-    predictions_copy.polygon_predictions = list(
-        filter(filter_fn, predictions.polygon_predictions)
-    )
-    predictions_copy.cuboid_predictions = list(
-        filter(filter_fn, predictions.cuboid_predictions)
-    )
-    predictions_copy.category_predictions = list(
-        filter(filter_fn, predictions.category_predictions)
-    )
-    predictions_copy.segmentation_predictions = list(
-        filter(filter_fn, predictions.segmentation_predictions)
-    )
+    for attr in predictions.__dict__:
+        predictions_copy.__dict__[attr] = list(
+            filter(filter_fn, predictions.__dict__[attr])
+        )
     return predictions_copy

nucleus/metrics/polygon_metrics.py

@@ -1,9 +1,9 @@
 import sys
 from abc import abstractmethod
-from typing import List
+from typing import List, Union
 
-from nucleus.annotation import AnnotationList
-from nucleus.prediction import PredictionList
+from nucleus.annotation import AnnotationList, BoxAnnotation, PolygonAnnotation
+from nucleus.prediction import BoxPrediction, PolygonPrediction, PredictionList
 
 from .base import Metric, MetricResult
 from .filters import confidence_filter
@@ -90,10 +90,10 @@ def __call__(
             predictions = confidence_filter(
                 predictions, self.confidence_threshold
             )
-        polygon_annotations: List[BoxOrPolygonAnnotation] = []
+        polygon_annotations: List[Union[BoxAnnotation, PolygonAnnotation]] = []
         polygon_annotations.extend(annotations.box_annotations)
         polygon_annotations.extend(annotations.polygon_annotations)
-        polygon_predictions: List[BoxOrPolygonAnnotation] = []
+        polygon_predictions: List[Union[BoxPrediction, PolygonPrediction]] = []
         polygon_predictions.extend(predictions.box_predictions)
         polygon_predictions.extend(predictions.polygon_predictions)
 

nucleus/metrics/polygon_utils.py

@@ -1,6 +1,6 @@
 import sys
 from functools import wraps
-from typing import Dict, List, Tuple, Union
+from typing import Dict, List, Tuple, TypeVar
 
 import numpy as np
 from scipy.optimize import linear_sum_assignment
@@ -12,10 +12,12 @@
 from .base import MetricResult
 from .errors import PolygonAnnotationTypeError
 
-BoxOrPolygonPrediction = Union[BoxPrediction, PolygonPrediction]
-BoxOrPolygonAnnotation = Union[
-    BoxAnnotation, PolygonAnnotation, BoxOrPolygonPrediction
-]
+BoxOrPolygonPrediction = TypeVar(
+    "BoxOrPolygonPrediction", BoxPrediction, PolygonPrediction
+)
+BoxOrPolygonAnnotation = TypeVar(
+    "BoxOrPolygonAnnotation", BoxAnnotation, PolygonAnnotation
+)
 
 
 def polygon_annotation_to_shape(