valor-lite 0.33.3__py3-none-any.whl → 0.33.5__py3-none-any.whl

valor_lite/detection/metric.py

@@ -19,7 +19,7 @@ class MetricType(str, Enum):
     ARAveragedOverScores = "ARAveragedOverScores"
     mARAveragedOverScores = "mARAveragedOverScores"
     PrecisionRecallCurve = "PrecisionRecallCurve"
-    DetailedCounts = "DetailedCounts"
+    ConfusionMatrix = "ConfusionMatrix"
 
     @classmethod
     def base_metrics(cls):
@@ -329,52 +329,78 @@ class PrecisionRecallCurve:
 
 
 @dataclass
-class DetailedCounts:
-    tp: list[int]
-    fp_misclassification: list[int]
-    fp_hallucination: list[int]
-    fn_misclassification: list[int]
-    fn_missing_prediction: list[int]
-    tp_examples: list[list[tuple[str, tuple[float, float, float, float]]]]
-    fp_misclassification_examples: list[
-        list[tuple[str, tuple[float, float, float, float]]]
+class ConfusionMatrix:
+    confusion_matrix: dict[
+        str,  # ground truth label value
+        dict[
+            str,  # prediction label value
+            dict[
+                str,  # either `count` or `examples`
+                int
+                | list[
+                    dict[
+                        str,  # either `datum`, `groundtruth`, `prediction` or score
+                        str  # datum uid
+                        | tuple[
+                            float, float, float, float
+                        ]  # bounding box (xmin, xmax, ymin, ymax)
+                        | float,  # prediction score
+                    ]
+                ],
+            ],
+        ],
     ]
-    fp_hallucination_examples: list[
-        list[tuple[str, tuple[float, float, float, float]]]
+    hallucinations: dict[
+        str,  # prediction label value
+        dict[
+            str,  # either `count` or `examples`
+            int
+            | list[
+                dict[
+                    str,  # either `datum`, `prediction` or score
+                    str  # datum uid
+                    | float  # prediction score
+                    | tuple[
+                        float, float, float, float
+                    ],  # bounding box (xmin, xmax, ymin, ymax)
+                ]
+            ],
+        ],
     ]
-    fn_misclassification_examples: list[
-        list[tuple[str, tuple[float, float, float, float]]]
+    missing_predictions: dict[
+        str,  # ground truth label value
+        dict[
+            str,  # either `count` or `examples`
+            int
+            | list[
+                dict[
+                    str,  # either `datum` or `groundtruth`
+                    str  # datum uid
+                    | tuple[
+                        float, float, float, float
+                    ],  # bounding box (xmin, xmax, ymin, ymax)
+                ]
+            ],
+        ],
     ]
-    fn_missing_prediction_examples: list[
-        list[tuple[str, tuple[float, float, float, float]]]
-    ]
-    score_thresholds: list[float]
+    score_threshold: float
     iou_threshold: float
-    label: tuple[str, str]
+    label_key: str
+    number_of_examples: int
 
     @property
     def metric(self) -> Metric:
         return Metric(
             type=type(self).__name__,
             value={
-                "tp": self.tp,
-                "fp_misclassification": self.fp_misclassification,
-                "fp_hallucination": self.fp_hallucination,
-                "fn_misclassification": self.fn_misclassification,
-                "fn_missing_prediction": self.fn_missing_prediction,
-                "tp_examples": self.tp_examples,
-                "fp_misclassification_examples": self.fp_misclassification_examples,
-                "fp_hallucination_examples": self.fp_hallucination_examples,
-                "fn_misclassification_examples": self.fn_misclassification_examples,
-                "fn_missing_prediction_examples": self.fn_missing_prediction_examples,
+                "confusion_matrix": self.confusion_matrix,
+                "hallucinations": self.hallucinations,
+                "missing_predictions": self.missing_predictions,
             },
             parameters={
-                "score_thresholds": self.score_thresholds,
+                "score_threshold": self.score_threshold,
                 "iou_threshold": self.iou_threshold,
-                "label": {
-                    "key": self.label[0],
-                    "value": self.label[1],
-                },
+                "label_key": self.label_key,
             },
         )
 

{valor_lite-0.33.3.dist-info → valor_lite-0.33.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: valor-lite
-Version: 0.33.3
+Version: 0.33.5
 Summary: Compute valor metrics directly in your client.
 License: MIT License
         
@@ -32,6 +32,7 @@ Requires-Dist: Pillow >=9.1.0
 Requires-Dist: tqdm
 Requires-Dist: requests
 Requires-Dist: numpy
+Requires-Dist: shapely
 Requires-Dist: importlib-metadata ; python_version < "3.8"
 Provides-Extra: test
 Requires-Dist: pytest ; extra == 'test'

valor_lite-0.33.5.dist-info/RECORD

@@ -0,0 +1,12 @@
+valor_lite/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+valor_lite/schemas.py,sha256=r4cC10w1xYsA785KmGE4ePeOX3wzEs846vT7QAiVg_I,293
+valor_lite/detection/__init__.py,sha256=PiKfemo8FkZRzBhPSjhil8ahGURLy0Vk_iV25CB4UBU,1139
+valor_lite/detection/annotation.py,sha256=BspLc3SjWXj6qYlGGpzDPHEZ8j7CiFzIL5cNlk0WCAM,2732
+valor_lite/detection/computation.py,sha256=HDFfPTFQN2obm-g570KKDf7SP9V-h09OyMtFEJXsoTA,26323
+valor_lite/detection/manager.py,sha256=ld2ytAw96UOO25iTwnfvAI1D2UY2Z1AGmP7cyCrT-V4,52801
+valor_lite/detection/metric.py,sha256=RYKN17nEFRIZIqmotQa6OyNnU0nkjXyfFIclX_5hGpY,9933
+valor_lite-0.33.5.dist-info/LICENSE,sha256=M0L53VuwfEEqezhHb7NPeYcO_glw7-k4DMLZQ3eRN64,1068
+valor_lite-0.33.5.dist-info/METADATA,sha256=WL0LQR2fT4CO4MuV0aXIkLPt3zQW2SsBS4MwcA_kHJY,1865
+valor_lite-0.33.5.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+valor_lite-0.33.5.dist-info/top_level.txt,sha256=9ujykxSwpl2Hu0_R95UQTR_l07k9UUTSdrpiqmq6zc4,11
+valor_lite-0.33.5.dist-info/RECORD,,

valor_lite-0.33.3.dist-info/RECORD

@@ -1,12 +0,0 @@
-valor_lite/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-valor_lite/schemas.py,sha256=r4cC10w1xYsA785KmGE4ePeOX3wzEs846vT7QAiVg_I,293
-valor_lite/detection/__init__.py,sha256=WHLHwHoKzXTBjkjC6E1_lhqB7gRWkiGWVWPqkKn-yK8,997
-valor_lite/detection/annotation.py,sha256=c45pZD1Pp2vf5GeyW_6Kl9JCx5FoaaktCaaa4q3QDUo,1758
-valor_lite/detection/computation.py,sha256=7PttK0VuOWlhRN92wpLVrGzB7RAdfdZyT3b1aTm_WaI,23214
-valor_lite/detection/manager.py,sha256=ziVnukGs-WrkyBEBBO3LVSv4LTbaWFaWqLWarVosj2c,35807
-valor_lite/detection/metric.py,sha256=DLqpODJZOG7SCqt7TCgR4am68PQORRCIQW_SXiTb1IA,9473
-valor_lite-0.33.3.dist-info/LICENSE,sha256=M0L53VuwfEEqezhHb7NPeYcO_glw7-k4DMLZQ3eRN64,1068
-valor_lite-0.33.3.dist-info/METADATA,sha256=FBpd-wMWv-m37EK5BfFuiVmnJXg4GNzCaJrTDHv4-gE,1842
-valor_lite-0.33.3.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-valor_lite-0.33.3.dist-info/top_level.txt,sha256=9ujykxSwpl2Hu0_R95UQTR_l07k9UUTSdrpiqmq6zc4,11
-valor_lite-0.33.3.dist-info/RECORD,,