Merge branch 'main' into skore-make-cache-thread-safe

Author: thomass-dev

skore/src/skore/__init__.py

@@ -11,6 +11,7 @@
 from skore._externals._sklearn_compat import parse_version
 from skore._sklearn import (
     ComparisonReport,
+    ConfusionMatrixDisplay,
     CrossValidationReport,
     EstimatorReport,
     MetricsSummaryDisplay,
@@ -31,6 +32,7 @@
 __all__ = [
     "CrossValidationReport",
     "ComparisonReport",
+    "ConfusionMatrixDisplay",
     "Display",
     "EstimatorReport",
     "PrecisionRecallCurveDisplay",

skore/src/skore/_sklearn/__init__.py

@@ -4,6 +4,7 @@
 from skore._sklearn._cross_validation import CrossValidationReport
 from skore._sklearn._estimator import EstimatorReport
 from skore._sklearn._plot import (
+    ConfusionMatrixDisplay,
     MetricsSummaryDisplay,
     PrecisionRecallCurveDisplay,
     PredictionErrorDisplay,
@@ -14,6 +15,7 @@
 
 __all__ = [
     "ComparisonReport",
+    "ConfusionMatrixDisplay",
     "CrossValidationReport",
     "EstimatorReport",
     "PrecisionRecallCurveDisplay",

skore/src/skore/_sklearn/_estimator/metrics_accessor.py

@@ -1648,10 +1648,18 @@ def _get_display(
         data_source: DataSource,
         response_method: str | list[str] | tuple[str, ...],
         display_class: type[
-            RocCurveDisplay | PrecisionRecallCurveDisplay | PredictionErrorDisplay
+            RocCurveDisplay
+            | PrecisionRecallCurveDisplay
+            | PredictionErrorDisplay
+            | ConfusionMatrixDisplay
         ],
         display_kwargs: dict[str, Any],
-    ) -> RocCurveDisplay | PrecisionRecallCurveDisplay | PredictionErrorDisplay:
+    ) -> (
+        RocCurveDisplay
+        | PrecisionRecallCurveDisplay
+        | PredictionErrorDisplay
+        | ConfusionMatrixDisplay
+    ):
         """Get the display from the cache or compute it.
 
         Parameters
@@ -1676,7 +1684,7 @@ def _get_display(
             The display class.
 
         display_kwargs : dict
-            The display kwargs used by `display_class._from_predictions`.
+            The display kwargs used by `display_class._compute_data_for_display`.
 
         Returns
         -------
@@ -1692,7 +1700,11 @@ def _get_display(
             cache_key = None
         else:
             cache_key_parts: list[Any] = [self._parent._hash, display_class.__name__]
-            cache_key_parts.extend(display_kwargs.values())
+            for kwarg in display_kwargs.values():
+				# NOTE: We cannot use lists in cache keys because they are not hashable
+                if isinstance(kwarg, list):
+                    kwarg = tuple(kwarg)
+                cache_key_parts.append(kwarg)
             if data_source_hash is not None:
                 cache_key_parts.append(data_source_hash)
             else:
@@ -1984,11 +1996,8 @@ def confusion_matrix(
         data_source: DataSource = "test",
         X: ArrayLike | None = None,
         y: ArrayLike | None = None,
-        sample_weight: ArrayLike | None = None,
         display_labels: list | None = None,
-        include_values: bool = True,
-        normalize: Literal["true", "pred", "both"] | None = None,
-        values_format: str | None = None,
+        normalize: Literal["true", "pred", "all"] | None = None,
     ) -> ConfusionMatrixDisplay:
         """Plot the confusion matrix.
 
@@ -2012,25 +2021,15 @@ def confusion_matrix(
             New target on which to compute the metric. By default, we use the target
             provided when creating the report.
 
-        sample_weight : array-like of shape (n_samples,), default=None
-            Sample weights.
-
         display_labels : list of str, default=None
             Display labels for plot. If None, display labels are set from 0 to
             ``n_classes - 1``.
 
-        include_values : bool, default=True
-            Includes values in confusion matrix.
-
         normalize : {'true', 'pred', 'all'}, default=None
             Normalizes confusion matrix over the true (rows), predicted (columns)
             conditions or all the population. If None, confusion matrix will not be
             normalized.
 
-        values_format : str, default=None
-            Format specification for values in confusion matrix. If None, the format
-            specification is 'd' or '.2g' whichever is shorter.
-
         Returns
         -------
         display : :class:`~skore._sklearn._plot.ConfusionMatrixDisplay`
@@ -2048,21 +2047,16 @@ def confusion_matrix(
         >>> report = EstimatorReport(classifier, **split_data)
         >>> report.metrics.confusion_matrix()
         """
-        X, y, _ = self._get_X_y_and_data_source_hash(data_source=data_source, X=X, y=y)
-
-        y_pred = self._parent.get_predictions(
-            data_source=data_source,
-            response_method="predict",
-            X=X,
-            pos_label=None,
-        )
-
-        return ConfusionMatrixDisplay.from_predictions(
-            y_true=y,
-            y_pred=y_pred,
-            sample_weight=sample_weight,
-            display_labels=display_labels,
-            include_values=include_values,
-            normalize=normalize,
-            values_format=values_format,
+        display_kwargs = {"display_labels": display_labels, "normalize": normalize}
+        display = cast(
+            ConfusionMatrixDisplay,
+            self._get_display(
+                X=X,
+                y=y,
+                data_source=data_source,
+                response_method="predict",
+                display_class=ConfusionMatrixDisplay,
+                display_kwargs=display_kwargs,
+            ),
         )
+        return display