validmind 2.13.7__tar.gz → 2.13.8__tar.gz

{validmind-2.13.7 → validmind-2.13.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: validmind
-Version: 2.13.7
+Version: 2.13.8
 Summary: ValidMind Library
 Author-email: Andres Rodriguez <andres@validmind.ai>, Juan Martinez <juan@validmind.ai>, Anil Sorathiya <anil@validmind.ai>, Luis Pallares <luis@validmind.ai>, John Walz <john@validmind.ai>
 License:                          DUAL LICENSE NOTICE

{validmind-2.13.7 → validmind-2.13.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "validmind"
-version = "2.13.7"
+version = "2.13.8"
 description = "ValidMind Library"
 readme = "README.pypi.md"
 requires-python = ">=3.9,<3.15"

validmind-2.13.8/validmind/__version__.py

@@ -0,0 +1 @@
+__version__ = "2.13.8"

{validmind-2.13.7 → validmind-2.13.8}/validmind/api_client.py

@@ -317,7 +317,7 @@ def init(
             Can be set via env ``VM_OIDC_ISSUER``.
         client_id (str, optional): OAuth public client id for device flow. Can be
             set via env ``VM_OIDC_CLIENT_ID``.
-        scope (str, optional): OAuth scopes (default ``openid profile email``).
+        scope (str, optional): OAuth scopes (default ``openid profile email offline_access``).
             Can be set via env ``VM_OIDC_SCOPE``.
         audience (str, optional): Resource / API identifier for the access token
             (e.g. Auth0 API Identifier). Use the same value the ValidMind backend
@@ -392,7 +392,7 @@ def init(
         _api_key = None
         _api_secret = None
         _api_host = resolved_host
-        scope_val = oidc_scope or "openid profile email"
+        scope_val = oidc_scope or "openid profile email offline_access"
         from .credentials_store import normalize_audience
 
         oidc_audience_val = normalize_audience(

{validmind-2.13.7 → validmind-2.13.8}/validmind/tests/model_validation/sklearn/PopulationStabilityIndex.py

@@ -14,6 +14,8 @@ from validmind.errors import SkipTestError
 from validmind.logging import get_logger
 from validmind.vm_models import VMDataset, VMModel
 
+from ._multiclass_proba import multiclass_proba, proba_matrix
+
 logger = get_logger(__name__)
 
 _PSI_PALETTE = ["#DE257E", "#1F77B4", "#2CA02C", "#FF7F0E", "#9467BD", "#8C564B"]
@@ -104,54 +106,37 @@ def _psi_table_rows(psi_results):
     return rows_with_total, table_rows
 
 
-def _multiclass_psi(datasets, model, classes, num_bins, mode):
+def _multiclass_psi(datasets, model, num_bins, mode):
     """One-vs-rest PSI for a multiclass model.
 
     PSI needs a 1-D score distribution to compare across the two datasets. The
-    stored single probability column cannot represent every class, so we ask the
-    underlying estimator for the full per-class probability matrix (mirroring the
-    ROC/PR curve tests). Models without a usable ``predict_proba`` (metadata-only
-    / precomputed single-column predictions) are skipped rather than crashed.
+    stored single probability column cannot represent every class, so the shared
+    helper reaches the underlying estimator for the full per-class probability
+    matrix (mirroring the ROC/PR curve tests), aligning columns to the training
+    class order. The initial dataset drives the class alignment and the set of
+    classes actually present; the new dataset's matrix is validated against the
+    same class list. Models that cannot supply a matching matrix are skipped.
     """
-    raw_model = getattr(model, "model", None)
-    proba_fn = getattr(raw_model, "predict_proba", None)
-    if not callable(proba_fn):
-        raise SkipTestError(
-            "Multiclass Population Stability Index requires per-class "
-            "probabilities from the underlying model's predict_proba, which is "
-            "not available for this model (e.g. metadata-only / precomputed "
-            "predictions). Skipping."
-        )
-    try:
-        prob_initial = np.asarray(proba_fn(datasets[0].x_df()))
-        prob_new = np.asarray(proba_fn(datasets[1].x_df()))
-    except Exception as e:
-        raise SkipTestError(
-            "Multiclass Population Stability Index could not compute per-class "
-            f"probabilities ({type(e).__name__}). Skipping."
-        ) from e
-
-    n_classes = len(classes)
-    for prob in (prob_initial, prob_new):
-        if prob.ndim != 2 or prob.shape[1] != n_classes:
-            raise SkipTestError(
-                "Multiclass Population Stability Index requires a per-class "
-                f"probability matrix with one column per class (got shape "
-                f"{getattr(prob, 'shape', None)} for {n_classes} classes). Skipping."
-            )
-
-    # predict_proba columns are ordered by sorted class label == np.unique.
+    aligned = multiclass_proba(model, datasets[0], "Population Stability Index")
+    prob_initial = aligned.y_prob
+    prob_new = proba_matrix(
+        model, datasets[1], aligned.class_list, "Population Stability Index"
+    )
+
+    classes_present = aligned.classes_present
+    n_present = len(classes_present)
+
     fig = make_subplots(
-        rows=n_classes,
+        rows=n_present,
         cols=1,
-        specs=[[{"secondary_y": True}] for _ in range(n_classes)],
-        subplot_titles=[f"Class {cls}" for cls in classes],
+        specs=[[{"secondary_y": True}] for _ in range(n_present)],
+        subplot_titles=[f"Class {cls}" for cls in classes_present],
         vertical_spacing=0.08,
     )
 
     tables = {}
     raw_per_class = {}
-    for i, cls in enumerate(classes):
+    for plot_i, (i, cls) in enumerate(zip(aligned.present_indices, classes_present)):
         psi_results = calculate_psi(
             prob_initial[:, i].copy(),
             prob_new[:, i].copy(),
@@ -159,17 +144,17 @@ def _multiclass_psi(datasets, model, classes, num_bins, mode):
             mode=mode,
         )
         x = list(range(len(psi_results)))
-        color = _PSI_PALETTE[i % len(_PSI_PALETTE)]
+        color = _PSI_PALETTE[plot_i % len(_PSI_PALETTE)]
         fig.add_trace(
             go.Bar(
                 x=x,
                 y=[d["percent_initial"] for d in psi_results],
                 name="Initial",
                 marker=dict(color="#DE257E"),
-                showlegend=i == 0,
+                showlegend=plot_i == 0,
                 legendgroup="initial",
             ),
-            row=i + 1,
+            row=plot_i + 1,
             col=1,
             secondary_y=False,
         )
@@ -179,10 +164,10 @@ def _multiclass_psi(datasets, model, classes, num_bins, mode):
                 y=[d["percent_new"] for d in psi_results],
                 name="New",
                 marker=dict(color="#E8B1F8"),
-                showlegend=i == 0,
+                showlegend=plot_i == 0,
                 legendgroup="new",
             ),
-            row=i + 1,
+            row=plot_i + 1,
             col=1,
             secondary_y=False,
         )
@@ -192,10 +177,10 @@ def _multiclass_psi(datasets, model, classes, num_bins, mode):
                 y=[d["psi"] for d in psi_results],
                 name="PSI",
                 line=dict(color=color),
-                showlegend=i == 0,
+                showlegend=plot_i == 0,
                 legendgroup="psi",
             ),
-            row=i + 1,
+            row=plot_i + 1,
             col=1,
             secondary_y=True,
         )
@@ -211,7 +196,7 @@ def _multiclass_psi(datasets, model, classes, num_bins, mode):
     fig.update_layout(
         title="Population Stability Index (PSI) — one-vs-rest per class",
         barmode="group",
-        height=300 * n_classes,
+        height=300 * n_present,
     )
 
     return (
@@ -291,7 +276,7 @@ def PopulationStabilityIndex(
 
     classes = np.unique(datasets[0].y)
     if len(classes) > 2:
-        return _multiclass_psi(datasets, model, classes, num_bins, mode)
+        return _multiclass_psi(datasets, model, num_bins, mode)
 
     psi_results = calculate_psi(
         datasets[0].y_prob(model).copy(),

{validmind-2.13.7 → validmind-2.13.8}/validmind/tests/model_validation/sklearn/PrecisionRecallCurve.py

@@ -7,13 +7,14 @@ from typing import Tuple
 import numpy as np
 import plotly.graph_objects as go
 from sklearn.metrics import average_precision_score, precision_recall_curve
-from sklearn.preprocessing import label_binarize
 
 from validmind import RawData, tags, tasks
 from validmind.errors import SkipTestError
 from validmind.models import FoundationModel
 from validmind.vm_models import VMDataset, VMModel
 
+from ._multiclass_proba import multiclass_proba
+
 
 @tags(
     "sklearn",
@@ -75,7 +76,7 @@ def PrecisionRecallCurve(
     classes = np.unique(y_true)
 
     if len(classes) > 2:
-        return _multiclass_pr_curve(model, dataset, classes)
+        return _multiclass_pr_curve(model, dataset)
 
     precision, recall, _ = precision_recall_curve(y_true, dataset.y_prob(model))
 
@@ -105,53 +106,27 @@ def PrecisionRecallCurve(
 
 
 def _multiclass_pr_curve(
-    model: VMModel, dataset: VMDataset, classes: np.ndarray
+    model: VMModel, dataset: VMDataset
 ) -> Tuple[go.Figure, RawData]:
     """One-vs-rest precision-recall curves for a multiclass model.
 
     Needs the full per-class probability matrix, which the stored single
-    probability column cannot provide, so we ask the model for it directly.
-    Models without a usable ``predict_proba`` (Foundation/metadata-only,
-    precomputed single-column probabilities) are skipped rather than crashed.
+    probability column cannot provide; the shared helper reaches the underlying
+    estimator, aligns the probability columns to the training class order and
+    skips models that cannot supply a matching matrix.
     """
-    # The VMModel wrapper's predict_proba is binary-only (it returns just the
-    # positive-class column), so reach the underlying estimator for the full
-    # per-class probability matrix.
-    raw_model = getattr(model, "model", None)
-    proba_fn = getattr(raw_model, "predict_proba", None)
-    if not callable(proba_fn):
-        raise SkipTestError(
-            "Multiclass Precision-Recall Curve requires per-class probabilities "
-            "from the underlying model's predict_proba, which is not available "
-            "for this model (e.g. Foundation / metadata-only / precomputed "
-            "predictions). Skipping."
-        )
-    try:
-        y_prob = np.asarray(proba_fn(dataset.x_df()))
-    except Exception as e:
-        raise SkipTestError(
-            "Multiclass Precision-Recall Curve could not compute per-class "
-            f"probabilities ({type(e).__name__}). Skipping."
-        ) from e
-
-    n_classes = len(classes)
-    if y_prob.ndim != 2 or y_prob.shape[1] != n_classes:
-        raise SkipTestError(
-            "Multiclass Precision-Recall Curve requires a per-class probability "
-            f"matrix with one column per class (got shape "
-            f"{getattr(y_prob, 'shape', None)} for {n_classes} classes). Skipping."
-        )
-
-    # One-hot the true labels in the same class order predict_proba columns use
-    # (sklearn orders predict_proba columns by sorted class label == np.unique).
-    y_bin = label_binarize(dataset.y.flatten(), classes=classes)
+    aligned = multiclass_proba(model, dataset, "Precision-Recall Curve")
+    y_bin = aligned.y_bin
+    y_prob = aligned.y_prob
 
     traces = []
     raw_precision = {}
     raw_recall = {}
     raw_ap = {}
     palette = ["#DE257E", "#1F77B4", "#2CA02C", "#FF7F0E", "#9467BD", "#8C564B"]
-    for i, cls in enumerate(classes):
+    for plot_i, (i, cls) in enumerate(
+        zip(aligned.present_indices, aligned.classes_present)
+    ):
         precision, recall, _ = precision_recall_curve(y_bin[:, i], y_prob[:, i])
         ap = average_precision_score(y_bin[:, i], y_prob[:, i])
         key = str(cls)
@@ -164,11 +139,14 @@ def _multiclass_pr_curve(
                 y=precision,
                 mode="lines",
                 name=f"Class {key} (AP = {ap:.2f})",
-                line=dict(color=palette[i % len(palette)]),
+                line=dict(color=palette[plot_i % len(palette)]),
             )
         )
 
-    # Micro-average across all one-vs-rest decisions.
+    # Micro-average across the one-vs-rest decisions of the present classes.
+    present = aligned.present_indices
+    y_bin = y_bin[:, present]
+    y_prob = y_prob[:, present]
     micro_precision, micro_recall, _ = precision_recall_curve(
         y_bin.ravel(), y_prob.ravel()
     )

{validmind-2.13.7 → validmind-2.13.8}/validmind/tests/model_validation/sklearn/ROCCurve.py

@@ -7,12 +7,12 @@ from typing import Tuple
 import numpy as np
 import plotly.graph_objects as go
 from sklearn.metrics import roc_auc_score, roc_curve
-from sklearn.preprocessing import label_binarize
 
 from validmind import RawData, tags, tasks
-from validmind.errors import SkipTestError
 from validmind.vm_models import VMDataset, VMModel
 
+from ._multiclass_proba import multiclass_proba
+
 
 @tags(
     "sklearn",
@@ -76,7 +76,7 @@ def ROCCurve(model: VMModel, dataset: VMDataset) -> Tuple[go.Figure, RawData]:
     classes = np.unique(dataset.y)
 
     if len(classes) > 2:
-        return _multiclass_roc_curve(model, dataset, classes)
+        return _multiclass_roc_curve(model, dataset)
 
     y_prob = dataset.y_prob(model)
     y_true = dataset.y.astype(y_prob.dtype).flatten()
@@ -117,53 +117,27 @@ def ROCCurve(model: VMModel, dataset: VMDataset) -> Tuple[go.Figure, RawData]:
 
 
 def _multiclass_roc_curve(
-    model: VMModel, dataset: VMDataset, classes: np.ndarray
+    model: VMModel, dataset: VMDataset
 ) -> Tuple[go.Figure, RawData]:
     """One-vs-rest ROC curves for a multiclass model.
 
     Needs the full per-class probability matrix, which the stored single
-    probability column cannot provide, so we ask the model for it directly.
-    Models without a usable ``predict_proba`` (metadata-only, precomputed
-    single-column probabilities) are skipped rather than crashed.
+    probability column cannot provide; the shared helper reaches the underlying
+    estimator, aligns the probability columns to the training class order and
+    skips models that cannot supply a matching matrix.
     """
-    # The VMModel wrapper's predict_proba is binary-only (it returns just the
-    # positive-class column), so reach the underlying estimator for the full
-    # per-class probability matrix.
-    raw_model = getattr(model, "model", None)
-    proba_fn = getattr(raw_model, "predict_proba", None)
-    if not callable(proba_fn):
-        raise SkipTestError(
-            "Multiclass ROC Curve requires per-class probabilities from the "
-            "underlying model's predict_proba, which is not available for this "
-            "model (e.g. metadata-only / precomputed predictions). Skipping."
-        )
-    try:
-        y_prob = np.asarray(proba_fn(dataset.x_df()))
-    except Exception as e:
-        raise SkipTestError(
-            "Multiclass ROC Curve could not compute per-class probabilities "
-            f"({type(e).__name__}). Skipping."
-        ) from e
-
-    n_classes = len(classes)
-    if y_prob.ndim != 2 or y_prob.shape[1] != n_classes:
-        raise SkipTestError(
-            "Multiclass ROC Curve requires a per-class probability matrix with "
-            f"one column per class (got shape {getattr(y_prob, 'shape', None)} "
-            f"for {n_classes} classes). Skipping."
-        )
-
-    # One-hot the true labels in the same class order predict_proba columns use
-    # (sklearn orders predict_proba columns by sorted class label == np.unique).
-    y_true = dataset.y.flatten()
-    y_bin = label_binarize(y_true, classes=classes)
+    aligned = multiclass_proba(model, dataset, "ROC Curve")
+    y_bin = aligned.y_bin
+    y_prob = aligned.y_prob
 
     traces = []
     raw_fpr = {}
     raw_tpr = {}
     raw_auc = {}
     palette = ["#DE257E", "#1F77B4", "#2CA02C", "#FF7F0E", "#9467BD", "#8C564B"]
-    for i, cls in enumerate(classes):
+    for plot_i, (i, cls) in enumerate(
+        zip(aligned.present_indices, aligned.classes_present)
+    ):
         fpr, tpr, _ = roc_curve(y_bin[:, i], y_prob[:, i], drop_intermediate=False)
         auc = roc_auc_score(y_bin[:, i], y_prob[:, i])
         key = str(cls)
@@ -176,11 +150,14 @@ def _multiclass_roc_curve(
                 y=tpr,
                 mode="lines",
                 name=f"Class {key} (AUC = {auc:.2f})",
-                line=dict(color=palette[i % len(palette)]),
+                line=dict(color=palette[plot_i % len(palette)]),
             )
         )
 
-    # Micro-average across all one-vs-rest decisions.
+    # Micro-average across the one-vs-rest decisions of the present classes.
+    present = aligned.present_indices
+    y_bin = y_bin[:, present]
+    y_prob = y_prob[:, present]
     micro_fpr, micro_tpr, _ = roc_curve(y_bin.ravel(), y_prob.ravel())
     micro_auc = roc_auc_score(y_bin, y_prob, average="micro", multi_class="ovr")
     raw_fpr["micro"] = micro_fpr

validmind-2.13.8/validmind/tests/model_validation/sklearn/_multiclass_proba.py

@@ -0,0 +1,150 @@
+# Copyright © 2023-2026 ValidMind Inc. All rights reserved.
+# Refer to the LICENSE file in the root of this repository for details.
+# SPDX-License-Identifier: AGPL-3.0 AND ValidMind Commercial
+
+"""Shared preamble for the one-vs-rest multiclass classification tests.
+
+ROCCurve, PrecisionRecallCurve, PopulationStabilityIndex and GINITable all need
+the full per-class probability matrix for a multiclass model. The VMModel wrapper
+only stores/exposes the positive-class column, so every one of those tests reaches
+the underlying estimator's ``predict_proba``, guards the cases where it is missing,
+shaped wrong, trained on fewer than 3 classes, or evaluated against labels the
+model never saw (raising ``SkipTestError`` with a test-specific message), and
+one-hot encodes the true labels. This module holds that preamble in one place.
+
+Column alignment matters: scikit-learn orders ``predict_proba`` columns by
+``estimator.classes_`` (the classes seen in training), which is not necessarily
+``np.unique(dataset.y)`` — a dataset slice can be missing a training class. We
+align on ``classes_`` when available (falling back to ``np.unique``) so the
+probability columns line up, binarize against that full training class list to
+keep the columns aligned, and expose the subset of classes actually present in the
+evaluated dataset's ``y`` (a class with no positives has no defined ROC) so callers
+emit per-class output only for those. Consequently, callers that compute a
+micro-average pool only the present classes' aligned columns, so when a training
+class is absent from the evaluated slice the micro number deliberately excludes
+that class's column rather than pooling the full training-class matrix.
+"""
+
+from typing import Any, List, NamedTuple
+
+import numpy as np
+from sklearn.preprocessing import label_binarize
+
+from validmind.errors import SkipTestError
+from validmind.vm_models import VMDataset, VMModel
+
+
+class MulticlassProba(NamedTuple):
+    """Aligned per-class probabilities for a multiclass one-vs-rest test.
+
+    ``class_list`` is the full training class order used for column alignment and
+    binarization; ``classes_present``/``present_indices`` select the classes that
+    actually appear in the evaluated dataset's ``y`` (paired: ``present_indices[k]``
+    is the ``class_list``/``y_prob`` column for ``classes_present[k]``). ``y_bin`` is
+    the true labels one-hot encoded against ``class_list``; ``y_prob`` is the
+    estimator's per-class probability matrix in ``class_list`` column order.
+    """
+
+    class_list: np.ndarray
+    classes_present: List[Any]
+    present_indices: List[int]
+    y_bin: np.ndarray
+    y_prob: np.ndarray
+
+
+def resolve_class_list(model: VMModel, dataset: VMDataset) -> np.ndarray:
+    """Return the ``predict_proba`` column order for a multiclass model.
+
+    scikit-learn orders columns by ``estimator.classes_`` (training classes), so
+    prefer that; fall back to ``np.unique(dataset.y)`` for models that do not
+    expose it.
+    """
+    raw_model = getattr(model, "model", None)
+    classes = getattr(raw_model, "classes_", None)
+    if classes is None:
+        classes = np.unique(dataset.y)
+    return np.asarray(classes)
+
+
+def proba_matrix(
+    model: VMModel, dataset: VMDataset, class_list: np.ndarray, test_name: str
+) -> np.ndarray:
+    """Return the estimator's per-class probability matrix, or ``SkipTestError``.
+
+    The VMModel wrapper's ``predict_proba`` is binary-only (positive-class column
+    only), so reach the underlying estimator for the full per-class matrix. Skips
+    (rather than crashes) for models without a usable ``predict_proba``
+    (metadata-only / precomputed single-column predictions) or a matrix whose width
+    does not match ``class_list``.
+    """
+    raw_model = getattr(model, "model", None)
+    proba_fn = getattr(raw_model, "predict_proba", None)
+    if not callable(proba_fn):
+        raise SkipTestError(
+            f"Multiclass {test_name} requires per-class probabilities from the "
+            "underlying model's predict_proba, which is not available for this "
+            "model (e.g. metadata-only / precomputed predictions). Skipping."
+        )
+    try:
+        y_prob = np.asarray(proba_fn(dataset.x_df()))
+    except Exception as e:
+        raise SkipTestError(
+            f"Multiclass {test_name} could not compute per-class probabilities "
+            f"({type(e).__name__}). Skipping."
+        ) from e
+
+    n_classes = len(class_list)
+    if y_prob.ndim != 2 or y_prob.shape[1] != n_classes:
+        raise SkipTestError(
+            f"Multiclass {test_name} requires a per-class probability matrix with "
+            f"one column per class (got shape {getattr(y_prob, 'shape', None)} for "
+            f"{n_classes} classes). Skipping."
+        )
+    return y_prob
+
+
+def multiclass_proba(
+    model: VMModel, dataset: VMDataset, test_name: str
+) -> MulticlassProba:
+    """Resolve aligned per-class probabilities for a multiclass one-vs-rest test.
+
+    Aligns on the estimator's training classes, binarizes the true labels against
+    that full class list (so columns stay aligned even when the dataset is missing a
+    class), and reports which classes are actually present in the evaluated ``y``.
+    Raises ``SkipTestError`` for models that cannot supply a matching per-class
+    probability matrix, that were trained on fewer than 3 classes (one-vs-rest
+    multiclass metrics don't apply to a binary model), or when the evaluated
+    dataset's ``y`` contains a label the model was never trained on.
+    """
+    class_list = resolve_class_list(model, dataset)
+    if len(class_list) < 3:
+        raise SkipTestError(
+            f"Multiclass {test_name} requires a model trained on at least 3 "
+            "classes for one-vs-rest multiclass metrics to apply, but this model "
+            f"appears to be binary (trained on {len(class_list)} classes). "
+            "Skipping."
+        )
+
+    y_prob = proba_matrix(model, dataset, class_list, test_name)
+
+    y_true = np.asarray(dataset.y).flatten()
+    y_bin = label_binarize(y_true, classes=class_list)
+
+    unknown_labels = sorted(set(np.unique(y_true)) - set(class_list))
+    if unknown_labels:
+        raise SkipTestError(
+            f"Multiclass {test_name} found label(s) {unknown_labels} in the "
+            "evaluated dataset that the model was not trained on (not present in "
+            "the estimator's classes_). Skipping."
+        )
+
+    present_indices = [i for i, cls in enumerate(class_list) if np.any(y_true == cls)]
+    classes_present = [class_list[i] for i in present_indices]
+
+    return MulticlassProba(
+        class_list=class_list,
+        classes_present=classes_present,
+        present_indices=present_indices,
+        y_bin=y_bin,
+        y_prob=y_prob,
+    )

{validmind-2.13.7 → validmind-2.13.8}/validmind/tests/model_validation/statsmodels/GINITable.py

@@ -7,10 +7,9 @@ from typing import Tuple
 import numpy as np
 import pandas as pd
 from sklearn.metrics import roc_auc_score, roc_curve
-from sklearn.preprocessing import label_binarize
 
 from validmind import RawData, tags, tasks
-from validmind.errors import SkipTestError
+from validmind.tests.model_validation.sklearn._multiclass_proba import multiclass_proba
 from validmind.vm_models import VMDataset, VMModel
 
 
@@ -71,7 +70,7 @@ def GINITable(dataset: VMDataset, model: VMModel) -> Tuple[pd.DataFrame, RawData
     classes = np.unique(dataset.y)
 
     if len(classes) > 2:
-        return _multiclass_gini_table(model, dataset, classes)
+        return _multiclass_gini_table(model, dataset)
 
     y_true = np.ravel(dataset.y)  # Flatten y_true to make it one-dimensional
     y_prob = dataset.y_prob(model)
@@ -99,50 +98,24 @@ def GINITable(dataset: VMDataset, model: VMModel) -> Tuple[pd.DataFrame, RawData
 
 
 def _multiclass_gini_table(
-    model: VMModel, dataset: VMDataset, classes: np.ndarray
+    model: VMModel, dataset: VMDataset
 ) -> Tuple[pd.DataFrame, RawData]:
     """One-vs-rest AUC/GINI/KS for a multiclass model.
 
     Needs the full per-class probability matrix, which the stored single
-    probability column cannot provide, so we ask the underlying estimator for
-    it directly. Models without a usable ``predict_proba`` (metadata-only,
-    precomputed single-column probabilities) are skipped rather than crashed.
+    probability column cannot provide; the shared helper reaches the underlying
+    estimator, aligns the probability columns to the training class order and
+    skips models that cannot supply a matching matrix.
     """
-    # The VMModel wrapper's y_prob is binary-only (positive-class column only),
-    # so reach the underlying estimator for the full per-class probability matrix.
-    raw_model = getattr(model, "model", None)
-    proba_fn = getattr(raw_model, "predict_proba", None)
-    if not callable(proba_fn):
-        raise SkipTestError(
-            "Multiclass GINITable requires per-class probabilities from the "
-            "underlying model's predict_proba, which is not available for this "
-            "model (e.g. metadata-only / precomputed predictions). Skipping."
-        )
-    try:
-        y_prob = np.asarray(proba_fn(dataset.x_df()))
-    except Exception as e:
-        raise SkipTestError(
-            "Multiclass GINITable could not compute per-class probabilities "
-            f"({type(e).__name__}). Skipping."
-        ) from e
-
-    n_classes = len(classes)
-    if y_prob.ndim != 2 or y_prob.shape[1] != n_classes:
-        raise SkipTestError(
-            "Multiclass GINITable requires a per-class probability matrix with "
-            f"one column per class (got shape {getattr(y_prob, 'shape', None)} "
-            f"for {n_classes} classes). Skipping."
-        )
-
-    # One-hot the true labels in the same class order predict_proba columns use
-    # (sklearn orders predict_proba columns by sorted class label == np.unique).
-    y_true = dataset.y.flatten()
-    y_bin = label_binarize(y_true, classes=classes)
+    aligned = multiclass_proba(model, dataset, "GINITable")
+    y_true = np.asarray(dataset.y).flatten()
+    y_bin = aligned.y_bin
+    y_prob = aligned.y_prob
 
     rows = []
     raw_fpr = {}
     raw_tpr = {}
-    for i, cls in enumerate(classes):
+    for i, cls in zip(aligned.present_indices, aligned.classes_present):
         fpr, tpr, _ = roc_curve(y_bin[:, i], y_prob[:, i])
         auc = roc_auc_score(y_bin[:, i], y_prob[:, i])
         key = str(cls)
@@ -152,9 +125,14 @@ def _multiclass_gini_table(
             {"Class": key, "AUC": auc, "GINI": 2 * auc - 1, "KS": max(tpr - fpr)}
         )
 
-    # Micro-average across all one-vs-rest decisions.
-    micro_fpr, micro_tpr, _ = roc_curve(y_bin.ravel(), y_prob.ravel())
-    micro_auc = roc_auc_score(y_bin, y_prob, average="micro", multi_class="ovr")
+    # Micro-average across the one-vs-rest decisions of the present classes.
+    present = aligned.present_indices
+    micro_fpr, micro_tpr, _ = roc_curve(
+        y_bin[:, present].ravel(), y_prob[:, present].ravel()
+    )
+    micro_auc = roc_auc_score(
+        y_bin[:, present], y_prob[:, present], average="micro", multi_class="ovr"
+    )
     raw_fpr["micro"] = micro_fpr
     raw_tpr["micro"] = micro_tpr
     rows.append(

validmind-2.13.7/validmind/__version__.py

@@ -1 +0,0 @@
-__version__ = "2.13.7"