valor-lite 0.34.3__py3-none-any.whl → 0.36.0__py3-none-any.whl

valor_lite/classification/utilities.py

@@ -19,7 +19,7 @@ def unpack_precision_recall_rocauc_into_metric_lists(
     score_thresholds: list[float],
     hardmax: bool,
     label_metadata: NDArray[np.int32],
-    index_to_label: dict[int, str],
+    index_to_label: list[str],
 ) -> dict[MetricType, list[Metric]]:
     (
         counts,
@@ -38,7 +38,7 @@ def unpack_precision_recall_rocauc_into_metric_lists(
             value=float(rocauc[label_idx]),
             label=label,
         )
-        for label_idx, label in index_to_label.items()
+        for label_idx, label in enumerate(index_to_label)
         if label_metadata[label_idx, 0] > 0
     ]
 
@@ -57,7 +57,7 @@ def unpack_precision_recall_rocauc_into_metric_lists(
         for score_idx, score_threshold in enumerate(score_thresholds)
     ]
 
-    for label_idx, label in index_to_label.items():
+    for label_idx, label in enumerate(index_to_label):
         for score_idx, score_threshold in enumerate(score_thresholds):
 
             kwargs = {
@@ -105,8 +105,8 @@ def _unpack_confusion_matrix_value(
     confusion_matrix: NDArray[np.float64],
     number_of_labels: int,
     number_of_examples: int,
-    index_to_uid: dict[int, str],
-    index_to_label: dict[int, str],
+    index_to_datum_id: list[str],
+    index_to_label: list[str],
 ) -> dict[str, dict[str, dict[str, int | list[dict[str, str | float]]]]]:
     """
     Unpacks a numpy array of confusion matrix counts and examples.
@@ -137,7 +137,7 @@ def _unpack_confusion_matrix_value(
                 ),
                 "examples": [
                     {
-                        "datum": index_to_uid[
+                        "datum_id": index_to_datum_id[
                             datum_idx(gt_label_idx, pd_label_idx, example_idx)
                         ],
                         "score": score_idx(
@@ -158,8 +158,8 @@ def _unpack_unmatched_ground_truths_value(
     unmatched_ground_truths: NDArray[np.int32],
     number_of_labels: int,
     number_of_examples: int,
-    index_to_uid: dict[int, str],
-    index_to_label: dict[int, str],
+    index_to_datum_id: list[str],
+    index_to_label: list[str],
 ) -> dict[str, dict[str, int | list[dict[str, str]]]]:
     """
     Unpacks a numpy array of unmatched ground truth counts and examples.
@@ -181,7 +181,11 @@ def _unpack_unmatched_ground_truths_value(
                 0,
             ),
             "examples": [
-                {"datum": index_to_uid[datum_idx(gt_label_idx, example_idx)]}
+                {
+                    "datum_id": index_to_datum_id[
+                        datum_idx(gt_label_idx, example_idx)
+                    ]
+                }
                 for example_idx in range(number_of_examples)
                 if datum_idx(gt_label_idx, example_idx) >= 0
             ],
@@ -194,12 +198,12 @@ def unpack_confusion_matrix_into_metric_list(
     results: tuple[NDArray[np.float64], NDArray[np.int32]],
     score_thresholds: list[float],
     number_of_examples: int,
-    index_to_uid: dict[int, str],
-    index_to_label: dict[int, str],
+    index_to_datum_id: list[str],
+    index_to_label: list[str],
 ) -> list[Metric]:
 
     (confusion_matrix, unmatched_ground_truths) = results
-    n_scores, n_labels, _, _ = confusion_matrix.shape
+    _, n_labels, _, _ = confusion_matrix.shape
     return [
         Metric.confusion_matrix(
             score_threshold=score_threshold,
@@ -209,7 +213,7 @@ def unpack_confusion_matrix_into_metric_list(
                 number_of_labels=n_labels,
                 number_of_examples=number_of_examples,
                 index_to_label=index_to_label,
-                index_to_uid=index_to_uid,
+                index_to_datum_id=index_to_datum_id,
             ),
             unmatched_ground_truths=_unpack_unmatched_ground_truths_value(
                 unmatched_ground_truths=unmatched_ground_truths[
@@ -218,7 +222,7 @@ def unpack_confusion_matrix_into_metric_list(
                 number_of_labels=n_labels,
                 number_of_examples=number_of_examples,
                 index_to_label=index_to_label,
-                index_to_uid=index_to_uid,
+                index_to_datum_id=index_to_datum_id,
             ),
         )
         for score_idx, score_threshold in enumerate(score_thresholds)

valor_lite/object_detection/__init__.py

@@ -1,13 +1,5 @@
 from .annotation import Bitmask, BoundingBox, Detection, Polygon
-from .computation import (
-    compute_bbox_iou,
-    compute_bitmask_iou,
-    compute_confusion_matrix,
-    compute_polygon_iou,
-    compute_precion_recall,
-    compute_ranked_pairs,
-)
-from .manager import DataLoader, Evaluator
+from .manager import DataLoader, Evaluator, Filter
 from .metric import Metric, MetricType
 
 __all__ = [
@@ -17,12 +9,7 @@ __all__ = [
     "Polygon",
     "Metric",
     "MetricType",
-    "compute_bbox_iou",
-    "compute_bitmask_iou",
-    "compute_polygon_iou",
-    "compute_ranked_pairs",
-    "compute_precion_recall",
-    "compute_confusion_matrix",
     "DataLoader",
     "Evaluator",
+    "Filter",
 ]

valor_lite/object_detection/annotation.py

@@ -1,4 +1,5 @@
 from dataclasses import dataclass, field
+from typing import Generic, TypeVar
 
 import numpy as np
 from numpy.typing import NDArray
@@ -12,6 +13,8 @@ class BoundingBox:
 
     Parameters
     ----------
+    uid : str
+        A unique identifier.
     xmin : float
         The minimum x-coordinate of the bounding box.
     xmax : float
@@ -29,16 +32,18 @@ class BoundingBox:
     --------
     Ground Truth Example:
 
-    >>> bbox = BoundingBox(xmin=10.0, xmax=50.0, ymin=20.0, ymax=60.0, labels=['cat'])
+    >>> bbox = BoundingBox(uid="xyz", xmin=10.0, xmax=50.0, ymin=20.0, ymax=60.0, labels=['cat'])
 
     Prediction Example:
 
     >>> bbox = BoundingBox(
+    ...     uid="abc",
     ...     xmin=10.0, xmax=50.0, ymin=20.0, ymax=60.0,
     ...     labels=['cat', 'dog'], scores=[0.9, 0.1]
     ... )
     """
 
+    uid: str
     xmin: float
     xmax: float
     ymin: float
@@ -58,18 +63,6 @@ class BoundingBox:
 
     @property
     def extrema(self) -> tuple[float, float, float, float]:
-        """
-        Returns the bounding box extrema.
-
-        Returns
-        -------
-        tuple[float, float, float, float]
-            A tuple in the form (xmin, xmax, ymin, ymax).
-        """
-        return (self.xmin, self.xmax, self.ymin, self.ymax)
-
-    @property
-    def annotation(self) -> tuple[float, float, float, float]:
         """
         Returns the annotation's data representation.
 
@@ -78,7 +71,7 @@ class BoundingBox:
         tuple[float, float, float, float]
             A tuple in the form (xmin, xmax, ymin, ymax).
         """
-        return self.extrema
+        return (self.xmin, self.xmax, self.ymin, self.ymax)
 
 
 @dataclass
@@ -88,7 +81,9 @@ class Polygon:
 
     Parameters
     ----------
-    shape : ShapelyPolygon
+    uid : str
+        A unique identifier.
+    shape : shapely.geometry.Polygon
         A Shapely polygon object representing the shape.
     labels : list of str
         List of labels associated with the polygon.
@@ -101,15 +96,16 @@ class Polygon:
 
     >>> from shapely.geometry import Polygon as ShapelyPolygon
     >>> shape = ShapelyPolygon([(0, 0), (1, 0), (1, 1), (0, 1)])
-    >>> polygon = Polygon(shape=shape, labels=['building'])
+    >>> polygon = Polygon(uid="xyz", shape=shape, labels=['building'])
 
     Prediction Example:
 
     >>> polygon = Polygon(
-    ...     shape=shape, labels=['building'], scores=[0.95]
+    ...     uid="abc", shape=shape, labels=['building'], scores=[0.95]
     ... )
     """
 
+    uid: str
     shape: ShapelyPolygon
     labels: list[str]
     scores: list[float] = field(default_factory=list)
@@ -129,19 +125,6 @@ class Polygon:
                 "If scores are defined, there must be a 1:1 pairing with labels."
             )
 
-    @property
-    def extrema(self) -> tuple[float, float, float, float]:
-        """
-        Returns the polygon's bounding box extrema.
-
-        Returns
-        -------
-        tuple[float, float, float, float]
-            A tuple in the form (xmin, xmax, ymin, ymax).
-        """
-        xmin, ymin, xmax, ymax = self.shape.bounds
-        return (xmin, xmax, ymin, ymax)
-
 
 @dataclass
 class Bitmask:
@@ -150,6 +133,8 @@ class Bitmask:
 
     Parameters
     ----------
+    uid : str
+        A unique identifier.
     mask : NDArray[np.bool_]
         A NumPy array of boolean values representing the mask.
     labels : list of str
@@ -163,15 +148,16 @@ class Bitmask:
 
     >>> import numpy as np
     >>> mask = np.array([[True, False], [False, True]], dtype=np.bool_)
-    >>> bitmask = Bitmask(mask=mask, labels=['tree'])
+    >>> bitmask = Bitmask(uid="abc", mask=mask, labels=['tree'])
 
     Prediction Example:
 
     >>> bitmask = Bitmask(
-    ...     mask=mask, labels=['tree'], scores=[0.85]
+    ...     uid="xyz", mask=mask, labels=['tree'], scores=[0.85]
     ... )
     """
 
+    uid: str
     mask: NDArray[np.bool_]
     labels: list[str]
     scores: list[float] = field(default_factory=list)
@@ -197,22 +183,12 @@ class Bitmask:
                 "If scores are defined, there must be a 1:1 pairing with labels."
             )
 
-    @property
-    def extrema(self) -> tuple[float, float, float, float]:
-        """
-        Returns the bounding box extrema of the mask.
 
-        Returns
-        -------
-        tuple[float, float, float, float]
-            A tuple in the form (xmin, xmax, ymin, ymax).
-        """
-        rows, cols = np.nonzero(self.mask)
-        return (cols.min(), cols.max(), rows.min(), rows.max())
+AnnotationType = TypeVar("AnnotationType", BoundingBox, Polygon, Bitmask)
 
 
 @dataclass
-class Detection:
+class Detection(Generic[AnnotationType]):
     """
     Detection data structure holding ground truths and predictions for object detection tasks.
 
@@ -220,9 +196,9 @@ class Detection:
     ----------
     uid : str
         Unique identifier for the image or sample.
-    groundtruths : list of BoundingBox or Bitmask or Polygon
+    groundtruths : list[BoundingBox] | list[Polygon] | list[Bitmask]
         List of ground truth annotations.
-    predictions : list of BoundingBox or Bitmask or Polygon
+    predictions : list[BoundingBox] | list[Polygon] | list[Bitmask]
         List of predicted annotations.
 
     Examples
@@ -239,8 +215,8 @@ class Detection:
     """
 
     uid: str
-    groundtruths: list[BoundingBox] | list[Bitmask] | list[Polygon]
-    predictions: list[BoundingBox] | list[Bitmask] | list[Polygon]
+    groundtruths: list[AnnotationType]
+    predictions: list[AnnotationType]
 
     def __post_init__(self):
         for prediction in self.predictions: