From b0c076a42cc359062788637cdacf10efd7ff64c2 Mon Sep 17 00:00:00 2001 From: Tom van Knippenberg Date: Fri, 15 Aug 2025 13:07:45 +0200 Subject: [PATCH] Conform with Numpy v2 requirements --- src/evidently/legacy/metrics/recsys/pairwise_distance.py | 4 ++-- tests/conftest.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/evidently/legacy/metrics/recsys/pairwise_distance.py b/src/evidently/legacy/metrics/recsys/pairwise_distance.py index 8702ff10ab..b397853497 100644 --- a/src/evidently/legacy/metrics/recsys/pairwise_distance.py +++ b/src/evidently/legacy/metrics/recsys/pairwise_distance.py @@ -62,11 +62,11 @@ def calculate(self, data: InputData) -> PairwiseDistanceResult: all_items = all_items[all_items[prediction_name] <= self.k + 1] all_items = all_items[[item_id.column_name] + self.item_features] if current_train_data is not None: - if not np.in1d(self.item_features, current_train_data.columns).all(): # type: ignore[attr-defined] + if not np.isin(self.item_features, current_train_data.columns).all(): # type: ignore[attr-defined] raise ValueError("current_train_data must contain item_features.") all_items = pd.concat([all_items, current_train_data[[item_id.column_name] + self.item_features]]) if reference_train_data is not None: - if not np.in1d(self.item_features, reference_train_data.columns).all(): # type: ignore[attr-defined] + if not np.isin(self.item_features, reference_train_data.columns).all(): # type: ignore[attr-defined] raise ValueError("reference_train_data must contain item_features.") all_items = pd.concat([all_items, reference_train_data[[item_id.column_name] + self.item_features]]) diff --git a/tests/conftest.py b/tests/conftest.py index cf527aeea9..1d22a32945 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -9,7 +9,7 @@ from evidently.pydantic_utils import PolymorphicModel # for np.testing.assert_equal to work with ApproxValue -np.core.numeric.ScalarType = np.core.numeric.ScalarType + (ApproxValue,) # type: ignore[attr-defined] +np._core.numeric.ScalarType = np._core.numeric.ScalarType + (ApproxValue,) # type: ignore[attr-defined] def smart_assert_equal(actual, expected, path=""):