From 75e5ffaeab818b02e8815a4222fe43d795cce953 Mon Sep 17 00:00:00 2001
From: adrinjalali <adrin.jalali@gmail.com>
Date: Thu, 6 Jun 2024 14:29:29 +0200
Subject: [PATCH 01/18] Revert "MNT space creator only after merge"

This reverts commit 3803876655d76d84f7287358de3eb272e380ea9b.
---
 .github/workflows/deploy-model-card-creator.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/deploy-model-card-creator.yml b/.github/workflows/deploy-model-card-creator.yml
index f4c94f21..258269e8 100644
--- a/.github/workflows/deploy-model-card-creator.yml
+++ b/.github/workflows/deploy-model-card-creator.yml
@@ -2,6 +2,7 @@ name: Deploy-Space-Creator
 
 on:
   - push
+  - pull_request
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}

From b73d1fd52480e1914e9ebcff8cd78d3239f02267 Mon Sep 17 00:00:00 2001
From: adrinjalali <adrin.jalali@gmail.com>
Date: Fri, 21 Jun 2024 18:06:48 +0200
Subject: [PATCH 02/18] MNT fix card tests

---
 skops/card/_model_card.py     | 31 +++++++++++++++++++------------
 skops/card/tests/test_card.py | 32 ++++++++++++++++----------------
 skops/io/_numpy.py            |  6 +++++-
 skops/io/_quantile_forest.py  |  3 +++
 skops/io/_trusted_types.py    | 16 ++++++++++++----
 5 files changed, 55 insertions(+), 33 deletions(-)

diff --git a/skops/card/_model_card.py b/skops/card/_model_card.py
index 31633985..61e09f0f 100644
--- a/skops/card/_model_card.py
+++ b/skops/card/_model_card.py
@@ -29,11 +29,6 @@
 else:
     from typing_extensions import Self
 
-# Repr attributes can be used to control the behavior of repr
-aRepr = Repr()
-aRepr.maxother = 79
-aRepr.maxstring = 79
-
 VALID_TEMPLATES = {item.value for item in Templates}
 NEED_SECTION_ERR_MSG = (
     "You are trying to {action} but you're using a custom template, please pass the "
@@ -1316,6 +1311,11 @@ def _add_metrics(
 
     def _generate_metadata(self, metadata: ModelCardData) -> Iterator[str]:
         """Yield metadata in yaml format"""
+        # Repr attributes can be used to control the behavior of repr
+        aRepr = Repr()
+        aRepr.maxother = 79
+        aRepr.maxstring = 79
+
         for key, val in metadata.to_dict().items() if metadata else {}:
             yield aRepr.repr(f"metadata.{key}={val},").strip('"').strip("'")
 
@@ -1367,11 +1367,18 @@ def _iterate_content(
                 yield from self._iterate_content(val.subsections, parent_section=title)
 
     @staticmethod
-    def _format_repr(text: str) -> str:
+    def _format_repr(title: str, content: str) -> str:
         # Remove new lines, multiple spaces, quotation marks, and cap line length
-        text = text.replace("\n", " ")
-        text = re.sub(r"\s+", r" ", text)
-        return aRepr.repr(text).strip('"').strip("'")
+        content = content.replace("\n", " ")
+        content = re.sub(r"\s+", r" ", content)
+
+        # Repr attributes can be used to control the behavior of repr
+        aRepr = Repr()
+        aRepr.maxother = max(3, 79 - len(title))
+        aRepr.maxstring = max(3, 79 - len(title))
+
+        content = aRepr.repr(content).strip('"').strip("'")
+        return f"{title}={content},"
 
     def __str__(self) -> str:
         return self.__repr__()
@@ -1380,7 +1387,7 @@ def __repr__(self) -> str:
         # repr for the model
         model = getattr(self, "model", None)
         if model:
-            model_repr = self._format_repr(f"model={repr(self.get_model())},")
+            model_repr = self._format_repr("model", repr(self.get_model()))
         else:
             model_repr = None
 
@@ -1391,7 +1398,7 @@ def __repr__(self) -> str:
                 metadata_reprs.append("metadata.widget=[{...}],")
                 continue
 
-            metadata_reprs.append(self._format_repr(f"metadata.{key}={val},"))
+            metadata_reprs.append(self._format_repr(f"metadata.{key}", repr(val)))
         metadata_repr = "\n".join(metadata_reprs)
 
         # repr for contents
@@ -1403,7 +1410,7 @@ def __repr__(self) -> str:
             if content.rstrip("`").rstrip().endswith(CONTENT_PLACEHOLDER):
                 # if content is just some default text, no need to show it
                 continue
-            content_reprs.append(self._format_repr(f"{title}={section},"))
+            content_reprs.append(self._format_repr(title, repr(section)))
         content_repr = "\n".join(content_reprs)
 
         # combine all parts
diff --git a/skops/card/tests/test_card.py b/skops/card/tests/test_card.py
index 9af02530..750bebb4 100644
--- a/skops/card/tests/test_card.py
+++ b/skops/card/tests/test_card.py
@@ -47,6 +47,14 @@ def save_model_to_file(model_instance, suffix):
     return save_file_handle, save_file
 
 
+def reprs_equal(repr1, repr2):
+    """Check that repr1 and repr2 are basically equal.
+
+    This ignores line order of what comes after the first and before the last line.
+    """
+    return sorted(repr1.split("\n")[1:-1]) == sorted(repr2.split("\n")[1:-1])
+
+
 @pytest.mark.parametrize("suffix", [".pkl", ".pickle", ".skops"])
 def test_load_model(suffix):
     model0 = LinearRegression(n_jobs=123)
@@ -1294,14 +1302,14 @@ def expected_lines(self):
         Card(
           model=LinearRegression(fit_intercept=False),
           Model description/Training Procedure/Hyperparameters=TableSection(4x2),
-          Model description/Training Procedure/...</div>,
+          Model description/Training Procedure/Model Plot=<style>#sk-co...v></div></div>,
           Model Card Authors=Jane Doe,
           Figures/ROC=PlotSection(ROC.png),
           Figures/Confusion matrix=PlotSection(confusion_matrix.jpg),
           Model Description=A description,
           Search Results=TableSection(3x2),
         )
-        """
+        """  # noqa: E501
         expected = textwrap.dedent(card_repr).strip()
         lines = expected.split("\n")
         return lines
@@ -1310,9 +1318,7 @@ def expected_lines(self):
     def test_card_repr(self, card: Card, meth, expected_lines):
         result = meth(card)
         expected = "\n".join(expected_lines)
-        expected = re.escape(expected)
-        expected = expected.replace(r"\.\.\.", ".*")
-        assert re.match(expected, result)
+        assert reprs_equal(expected, result)
 
     @pytest.mark.parametrize("meth", [repr, str])
     def test_card_repr_empty_card(self, meth):
@@ -1333,16 +1339,14 @@ def test_very_long_lines_are_shortened(self, card: Card, meth, expected_lines):
 
         # expected results contain 1 line at the very end
         extra_line = (
-            "  my_section=very long line very long l... "
-            "line very long line very long line ,"
+            "  my_section=very long line very long line ve...e very long line "
+            "very long line ,"
         )
         expected_lines.insert(-1, extra_line)
         expected = "\n".join(expected_lines)
-        expected = re.escape(expected)
-        expected = expected.replace(r"\.\.\.", ".*")
 
         result = meth(card)
-        assert re.match(expected, result)
+        assert reprs_equal(expected, result)
 
     @pytest.mark.parametrize("meth", [repr, str])
     def test_without_model_attribute(self, card: Card, meth, expected_lines):
@@ -1351,11 +1355,9 @@ def test_without_model_attribute(self, card: Card, meth, expected_lines):
         # remove line 1 from expected results, which corresponds to the model
         del expected_lines[1]
         expected = "\n".join(expected_lines)
-        expected = re.escape(expected)
-        expected = expected.replace(r"\.\.\.", ".*")
 
         result = meth(card)
-        assert re.match(expected, result)
+        assert reprs_equal(expected, result)
 
     @pytest.mark.parametrize("meth", [repr, str])
     def test_with_metadata(self, card: Card, meth, expected_lines):
@@ -1379,11 +1381,9 @@ def test_with_metadata(self, card: Card, meth, expected_lines):
             "  metadata.widget=[{...}],",
         ]
         expected = "\n".join(expected_lines[:2] + extra_lines + expected_lines[2:])
-        expected = re.escape(expected)
-        expected = expected.replace(r"\.\.\.", ".*")
         result = meth(card)
 
-        assert re.match(expected, result)
+        assert reprs_equal(expected, result)
 
 
 class TestCardModelAttributeIsPath:
diff --git a/skops/io/_numpy.py b/skops/io/_numpy.py
index f3887ba6..6488984e 100644
--- a/skops/io/_numpy.py
+++ b/skops/io/_numpy.py
@@ -260,7 +260,11 @@ def _construct(self):
 try:
     # From numpy=1.25.0 dispatching for `__array_function__` is done via
     # a C wrapper: https://github.com/numpy/numpy/pull/23020
-    from numpy.core._multiarray_umath import _ArrayFunctionDispatcher
+    try:
+        # numpy>=2
+        from numpy._core._multiarray_umath import _ArrayFunctionDispatcher
+    except ImportError:
+        from numpy.core._multiarray_umath import _ArrayFunctionDispatcher
 
     GET_STATE_DISPATCH_FUNCTIONS.append((_ArrayFunctionDispatcher, function_get_state))
 except ImportError:
diff --git a/skops/io/_quantile_forest.py b/skops/io/_quantile_forest.py
index dbe745a7..63e3ff61 100644
--- a/skops/io/_quantile_forest.py
+++ b/skops/io/_quantile_forest.py
@@ -10,6 +10,9 @@
     from quantile_forest._quantile_forest_fast import QuantileForest
 except ImportError:
     QuantileForest = None
+except ValueError:
+    # TODO: remove when quantile forest supports numpy=2
+    QuantileForest = None
 
 
 def quantile_forest_get_state(
diff --git a/skops/io/_trusted_types.py b/skops/io/_trusted_types.py
index e48df817..54e6541c 100644
--- a/skops/io/_trusted_types.py
+++ b/skops/io/_trusted_types.py
@@ -1,3 +1,5 @@
+import warnings
+
 import numpy as np
 import scipy
 from sklearn.utils import all_estimators
@@ -14,15 +16,21 @@
     if get_type_name(estimator_class).startswith("sklearn.")
 ]
 
-SCIPY_UFUNC_TYPE_NAMES = get_public_type_names(module=scipy.special, oftype=np.ufunc)
+with warnings.catch_warnings():
+    # This is to suppress deprecation warning coming from the fact that scipy reports
+    # numpy.core for ufuncs, and numpy.core is deprecated and renamed to numpy._core
+    warnings.simplefilter("ignore", category=DeprecationWarning)
+    SCIPY_UFUNC_TYPE_NAMES = get_public_type_names(
+        module=scipy.special, oftype=np.ufunc
+    )
 
 NUMPY_UFUNC_TYPE_NAMES = get_public_type_names(module=np, oftype=np.ufunc)
 
 NUMPY_DTYPE_TYPE_NAMES = sorted(
     {
         type_name
-        for dtypes in np.sctypes.values()
-        for dtype in dtypes  # type: ignore
-        if (type_name := get_type_name(dtype)).startswith("numpy")
+        for dtype in dir(np.dtypes)
+        if not dtype.startswith("_")
+        and (type_name := get_type_name(getattr(np.dtypes, dtype))).startswith("numpy")
     }
 )

From a7418f08e1119c06b52f3af8370cc12516cbe643 Mon Sep 17 00:00:00 2001
From: adrinjalali <adrin.jalali@gmail.com>
Date: Sun, 23 Jun 2024 16:09:10 +0200
Subject: [PATCH 03/18] fix np.random.Generator equality check

---
 skops/io/_trusted_types.py      | 5 ++---
 skops/io/tests/_utils.py        | 2 ++
 skops/io/tests/test_external.py | 6 +++++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/skops/io/_trusted_types.py b/skops/io/_trusted_types.py
index 54e6541c..eebd7d37 100644
--- a/skops/io/_trusted_types.py
+++ b/skops/io/_trusted_types.py
@@ -29,8 +29,7 @@
 NUMPY_DTYPE_TYPE_NAMES = sorted(
     {
         type_name
-        for dtype in dir(np.dtypes)
-        if not dtype.startswith("_")
-        and (type_name := get_type_name(getattr(np.dtypes, dtype))).startswith("numpy")
+        for dtype in np.sctypeDict.values()
+        if (type_name := get_type_name(dtype)).startswith("numpy")
     }
 )
diff --git a/skops/io/tests/_utils.py b/skops/io/tests/_utils.py
index 58857c3c..b8c2d337 100644
--- a/skops/io/tests/_utils.py
+++ b/skops/io/tests/_utils.py
@@ -123,6 +123,8 @@ def _assert_vals_equal(val1, val2):
         assert set(val1.keys()) == set(val2.keys())
         for key in val1:
             _assert_vals_equal(val1[key], val2[key])
+    elif isinstance(val1, np.random.Generator):
+        assert val1.bit_generator.state == val2.bit_generator.state
     elif hasattr(val1, "__dict__") and hasattr(val2, "__dict__"):
         _assert_vals_equal(val1.__dict__, val2.__dict__)
     elif isinstance(val1, np.ufunc):
diff --git a/skops/io/tests/test_external.py b/skops/io/tests/test_external.py
index aeb7ce72..a5d6c5ae 100644
--- a/skops/io/tests/test_external.py
+++ b/skops/io/tests/test_external.py
@@ -319,7 +319,11 @@ def cb_rank_data(self, rank_data):
 
     @pytest.fixture(autouse=True)
     def catboost(self):
-        catboost = pytest.importorskip("catboost")
+        try:
+            catboost = pytest.importorskip("catboost")
+        except ValueError:  # TODO(numpy2) remove when catboost supports numpy2
+            pytest.skip("Catboost not supporting numpy2 yet")
+
         return catboost
 
     @pytest.fixture

From 326dc6f49aade9c62e4229ba1df156ae86b68107 Mon Sep 17 00:00:00 2001
From: adrinjalali <adrin.jalali@gmail.com>
Date: Sun, 23 Jun 2024 19:14:37 +0200
Subject: [PATCH 04/18] save numpy bit_generator's seed sequence

---
 skops/io/_numpy.py       | 17 ++++++++++++++---
 skops/io/tests/_utils.py | 12 +++++-------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/skops/io/_numpy.py b/skops/io/_numpy.py
index 6488984e..9ac537ba 100644
--- a/skops/io/_numpy.py
+++ b/skops/io/_numpy.py
@@ -176,11 +176,12 @@ def _construct(self):
 
 def random_generator_get_state(obj: Any, save_context: SaveContext) -> dict[str, Any]:
     bit_generator_state = get_state(obj.bit_generator.state, save_context)
+    seed_seq_state = get_state(obj.bit_generator.seed_seq.state, save_context)
     res = {
         "__class__": obj.__class__.__name__,
         "__module__": get_module(type(obj)),
         "__loader__": "RandomGeneratorNode",
-        "content": {"bit_generator": bit_generator_state},
+        "content": {"bit_generator": bit_generator_state, "seed_seq": seed_seq_state},
     }
     return res
 
@@ -196,17 +197,27 @@ def __init__(
         self.children = {
             "bit_generator_state": get_tree(
                 state["content"]["bit_generator"], load_context, trusted=trusted
-            )
+            ),
+            "seed_seq_state": get_tree(
+                state["content"]["seed_seq"], load_context, trusted=trusted
+            ),
         }
         self.trusted = self._get_trusted(trusted, [np.random.Generator])
 
     def _construct(self):
         # first restore the state of the bit generator
+        seed_seq_cls = gettype(
+            "numpy.random.bit_generator",
+            "SeedSequence",
+        )
+        seed_seq_state = self.children["seed_seq_state"].construct()
+        seed_seq = seed_seq_cls(**seed_seq_state)
+
         bit_generator_state = self.children["bit_generator_state"].construct()
         bit_generator_cls = gettype(
             "numpy.random", bit_generator_state["bit_generator"]
         )
-        bit_generator = bit_generator_cls()
+        bit_generator = bit_generator_cls(seed_seq)
         bit_generator.state = bit_generator_state
 
         # next create the generator instance
diff --git a/skops/io/tests/_utils.py b/skops/io/tests/_utils.py
index b8c2d337..0bc4a031 100644
--- a/skops/io/tests/_utils.py
+++ b/skops/io/tests/_utils.py
@@ -62,7 +62,7 @@ def _is_builtin(val):
         assert val1 == val2
     else:
         # not a normal Python class, could be e.g. a Cython class
-        assert val1.__reduce__() == val2.__reduce__()
+        _assert_tuples_equal(val1.__reduce__(), val2.__reduce__())
 
 
 def _assert_tuples_equal(val1, val2):
@@ -72,7 +72,7 @@ def _assert_tuples_equal(val1, val2):
 
 
 def _assert_vals_equal(val1, val2):
-    if type(val1) == type:  # e.g. could be np.int64
+    if isinstance(val1, type):  # e.g. could be np.int64
         assert val1 is val2
     elif hasattr(val1, "__getstate__") and (val1.__getstate__() is not None):
         # This includes BaseEstimator since they implement __getstate__ and
@@ -113,9 +113,7 @@ def _assert_vals_equal(val1, val2):
             # we don't know what to do with these values, for now.
             assert False
     elif isinstance(val1, (tuple, list)):
-        assert len(val1) == len(val2)
-        for subval1, subval2 in zip(val1, val2):
-            _assert_vals_equal(subval1, subval2)
+        _assert_tuples_equal(val1, val2)
     elif isinstance(val1, float) and np.isnan(val1):
         assert np.isnan(val2)
     elif isinstance(val1, dict):
@@ -123,8 +121,8 @@ def _assert_vals_equal(val1, val2):
         assert set(val1.keys()) == set(val2.keys())
         for key in val1:
             _assert_vals_equal(val1[key], val2[key])
-    elif isinstance(val1, np.random.Generator):
-        assert val1.bit_generator.state == val2.bit_generator.state
+    # elif isinstance(val1, np.random.Generator):
+    #     assert val1.bit_generator.state == val2.bit_generator.state
     elif hasattr(val1, "__dict__") and hasattr(val2, "__dict__"):
         _assert_vals_equal(val1.__dict__, val2.__dict__)
     elif isinstance(val1, np.ufunc):

From 1e5d3bb9eed1da230d719bec2c23604961aeb8b5 Mon Sep 17 00:00:00 2001
From: adrinjalali <adrin.jalali@gmail.com>
Date: Sun, 23 Jun 2024 19:46:06 +0200
Subject: [PATCH 05/18] ignore np.core deprecation warning in whichmodule

---
 skops/io/_utils.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/skops/io/_utils.py b/skops/io/_utils.py
index d929380a..a3519ab9 100644
--- a/skops/io/_utils.py
+++ b/skops/io/_utils.py
@@ -2,6 +2,7 @@
 
 import importlib
 import sys
+import warnings
 from dataclasses import dataclass, field
 from functools import singledispatch
 from types import ModuleType
@@ -46,8 +47,11 @@ def whichmodule(obj: Any, name: str) -> str:
         ):
             continue
         try:
-            if _getattribute(module, name)[0] is obj:
-                return module_name
+            with warnings.catch_warnings():
+                # this is to silence numpy.core import warnings
+                warnings.simplefilter("ignore", DeprecationWarning)
+                if _getattribute(module, name)[0] is obj:
+                    return module_name
         except AttributeError:
             pass
     return "__main__"

From 1aeb2adc6bedec90631138fa57d1adecc35c1e7a Mon Sep 17 00:00:00 2001
From: adrinjalali <adrin.jalali@gmail.com>
Date: Sun, 23 Jun 2024 19:46:36 +0200
Subject: [PATCH 06/18] TST check something else since np.ma.core.MaskedArray
 is now np.ma.MaskedArray

---
 skops/io/tests/test_utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/skops/io/tests/test_utils.py b/skops/io/tests/test_utils.py
index 5cf483c2..4f0f6ebe 100644
--- a/skops/io/tests/test_utils.py
+++ b/skops/io/tests/test_utils.py
@@ -27,7 +27,7 @@ class TestGetTypeName:
             (str, "builtins.str"),
             # Numpy types
             (np.ndarray, "numpy.ndarray"),
-            (np.ma.MaskedArray, "numpy.ma.core.MaskedArray"),
+            (np.ma.ndenumerate, "numpy.ma.extras.ndenumerate"),
             # SciPy types
             (scipy.fft.fft, "scipy.fft._basic.fft"),
             # SKlearn types

From 6318c6898c9228148210a6116ecbf171bf773846 Mon Sep 17 00:00:00 2001
From: adrinjalali <adrin.jalali@gmail.com>
Date: Sun, 23 Jun 2024 19:55:05 +0200
Subject: [PATCH 07/18] safer guard against quantile_forest import fails

---
 skops/io/_quantile_forest.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/skops/io/_quantile_forest.py b/skops/io/_quantile_forest.py
index 63e3ff61..6913b9e9 100644
--- a/skops/io/_quantile_forest.py
+++ b/skops/io/_quantile_forest.py
@@ -8,10 +8,10 @@
 
 try:
     from quantile_forest._quantile_forest_fast import QuantileForest
-except ImportError:
-    QuantileForest = None
-except ValueError:
-    # TODO: remove when quantile forest supports numpy=2
+except Exception:
+    # Mostly ImportError, but in case of older QuantileForest and numpy>=2 it
+    # could also be ValueError.
+    # In general, this warrants no errors on our side if the import fails.
     QuantileForest = None
 
 

From 402266a228ef9d0166841c8a59aa5fe2be475f61 Mon Sep 17 00:00:00 2001
From: adrinjalali <adrin.jalali@gmail.com>
Date: Tue, 25 Jun 2024 21:57:03 +0200
Subject: [PATCH 08/18] test and fix numpy_v1

---
 skops/io/_persist.py               |  2 +-
 skops/io/_protocol.py              |  2 +-
 skops/io/tests/test_persist_old.py | 66 +++++++++++++++++++++++++++---
 3 files changed, 63 insertions(+), 7 deletions(-)

diff --git a/skops/io/_persist.py b/skops/io/_persist.py
index 711ec884..aaed469c 100644
--- a/skops/io/_persist.py
+++ b/skops/io/_persist.py
@@ -16,7 +16,7 @@
 # them. Old protocols are found in the 'old/' directory, with the protocol
 # version appended to the corresponding module name.
 modules = ["._general", "._numpy", "._scipy", "._sklearn", "._quantile_forest"]
-modules.extend([".old._general_v0", ".old._numpy_v0"])
+modules.extend([".old._general_v0", ".old._numpy_v0", ".old._numpy_v1"])
 for module_name in modules:
     # register exposed functions for get_state and get_tree
     module = importlib.import_module(module_name, package="skops.io")
diff --git a/skops/io/_protocol.py b/skops/io/_protocol.py
index cacd4fbe..e5d92f49 100644
--- a/skops/io/_protocol.py
+++ b/skops/io/_protocol.py
@@ -23,4 +23,4 @@
 version Y instead.
 
 """
-PROTOCOL = 1
+PROTOCOL = 2
diff --git a/skops/io/tests/test_persist_old.py b/skops/io/tests/test_persist_old.py
index 1dcff103..efa2b094 100644
--- a/skops/io/tests/test_persist_old.py
+++ b/skops/io/tests/test_persist_old.py
@@ -2,28 +2,39 @@
 
 from __future__ import annotations
 
+import io
+from zipfile import ZipFile
+
 import numpy as np
 import pytest
 from scipy import special
 from sklearn.preprocessing import FunctionTransformer
 
 from skops.io import dumps, get_untrusted_types, loads
-from skops.io._utils import get_module
+from skops.io._utils import SaveContext, get_module, get_state
 from skops.io.tests._utils import (
     assert_method_outputs_equal,
     assert_params_equal,
     downgrade_state,
 )
 
-#############
-# VERSION 0 #
-#############
-
 
 def dummy_func(X):
     return X
 
 
+@pytest.fixture
+def save_context():
+    buffer = io.BytesIO()
+    with ZipFile(buffer, "w") as zip_file:
+        yield SaveContext(zip_file=zip_file)
+
+
+#############
+# VERSION 0 #
+#############
+
+
 @pytest.mark.parametrize("func", [np.sqrt, len, special.exp10, dummy_func])
 def test_persist_function_v0(func):
     call_count = 0
@@ -109,3 +120,48 @@ def old_random_generator_get_state(obj, save_context):
     # update: we have removed trusted=True, so this doesn't work anymore.
     with pytest.raises(AttributeError):
         loads(downgraded, trusted=[])
+
+
+#############
+# VERSION 1 #
+#############
+
+
+@pytest.mark.parametrize(
+    "rng",
+    [
+        np.random.default_rng(),
+        np.random.Generator(np.random.PCG64DXSM(seed=123)),
+    ],
+    ids=["default_rng", "Generator"],
+)
+def test_random_generator_v1(save_context, rng):
+    call_count = 0
+
+    # random_generator_get_state as it was for protocol 0
+    def old_random_generator_get_state(obj, save_context):
+        # added for testing
+        nonlocal call_count
+        call_count += 1
+        # end
+
+        bit_generator_state = get_state(obj.bit_generator.state, save_context)
+        res = {
+            "__class__": obj.__class__.__name__,
+            "__module__": get_module(type(obj)),
+            "__loader__": "RandomGeneratorNode",
+            "content": {"bit_generator": bit_generator_state},
+        }
+        return res
+
+    rng.random(123)  # move RNG forwards
+    dumped = dumps(rng)
+    # importent: downgrade the whole state to mimic older version
+    downgraded = downgrade_state(
+        data=dumped,
+        keys=None,
+        old_state=old_random_generator_get_state(rng, save_context),
+        protocol=1,
+    )
+
+    loads(downgraded, trusted=[])

From 9045ecd6ec5ddf491954ad17cd928fc7931a91d7 Mon Sep 17 00:00:00 2001
From: adrinjalali <adrin.jalali@gmail.com>
Date: Tue, 25 Jun 2024 22:13:44 +0200
Subject: [PATCH 09/18] test numpy 1 as well

---
 .github/workflows/build-test.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 86aa2aaf..e0e7c59d 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -21,6 +21,7 @@ jobs:
         include:
           - python: "3.9"
             sklearn_version: "1.1"
+            numpy_version: "1"
           - python: "3.10"
             sklearn_version: "1.2"
           - python: "3.11"
@@ -55,6 +56,11 @@ jobs:
           pip install "pytest<8"
           pip install .[docs,tests]
           pip install black=="23.9.1" ruff=="0.0.292" mypy=="1.6.0"
+          if [ ${{ matrix.numpy_version }} ];
+            then
+              pip uninstall --yes numpy
+              pip install "numpy~=${{ matrix.numpy_version }}"
+          fi
           pip uninstall --yes scikit-learn
           if [ ${{ matrix.sklearn_version }} == "nightly" ];
             then pip install --pre --extra-index https://pypi.anaconda.org/scientific-python-nightly-wheels/simple scikit-learn;

From 70349bab6534e2d8235a57e5c09feede18b5c8fe Mon Sep 17 00:00:00 2001
From: adrinjalali <adrin.jalali@gmail.com>
Date: Wed, 26 Jun 2024 00:28:40 +0200
Subject: [PATCH 10/18] add missing file

---
 skops/io/old/_numpy_v1.py | 44 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 skops/io/old/_numpy_v1.py

diff --git a/skops/io/old/_numpy_v1.py b/skops/io/old/_numpy_v1.py
new file mode 100644
index 00000000..ff0e01f4
--- /dev/null
+++ b/skops/io/old/_numpy_v1.py
@@ -0,0 +1,44 @@
+from __future__ import annotations
+
+from typing import Any, Optional, Sequence
+
+import numpy as np
+
+from .._audit import Node, get_tree
+from .._utils import LoadContext, gettype
+
+PROTOCOL = 1
+
+
+class RandomGeneratorNode(Node):
+    def __init__(
+        self,
+        state: dict[str, Any],
+        load_context: LoadContext,
+        trusted: Optional[Sequence[str]] = None,
+    ) -> None:
+        super().__init__(state, load_context, trusted)
+        self.children = {
+            "bit_generator_state": get_tree(
+                state["content"]["bit_generator"], load_context, trusted=trusted
+            )
+        }
+        self.trusted = self._get_trusted(trusted, [np.random.Generator])
+
+    def _construct(self):
+        # first restore the state of the bit generator
+        bit_generator_state = self.children["bit_generator_state"].construct()
+        bit_generator_cls = gettype(
+            "numpy.random", bit_generator_state["bit_generator"]
+        )
+        bit_generator = bit_generator_cls()
+        bit_generator.state = bit_generator_state
+
+        # next create the generator instance
+        return gettype(self.module_name, self.class_name)(bit_generator=bit_generator)
+
+
+# tuples of type and function that creates the instance of that type
+NODE_TYPE_MAPPING = {
+    ("RandomGeneratorNode", PROTOCOL): RandomGeneratorNode,
+}

From b26440cca15b6a255c7044a5760ff60c321e9f76 Mon Sep 17 00:00:00 2001
From: adrinjalali <adrin.jalali@gmail.com>
Date: Wed, 26 Jun 2024 00:33:45 +0200
Subject: [PATCH 11/18] fix workflow

---
 .github/workflows/build-test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index e0e7c59d..6927c31d 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -21,7 +21,7 @@ jobs:
         include:
           - python: "3.9"
             sklearn_version: "1.1"
-            numpy_version: "1"
+            numpy_version: "numpy<2"
           - python: "3.10"
             sklearn_version: "1.2"
           - python: "3.11"
@@ -59,7 +59,7 @@ jobs:
           if [ ${{ matrix.numpy_version }} ];
             then
               pip uninstall --yes numpy
-              pip install "numpy~=${{ matrix.numpy_version }}"
+              pip install "${{ matrix.numpy_version }}"
           fi
           pip uninstall --yes scikit-learn
           if [ ${{ matrix.sklearn_version }} == "nightly" ];

From b7cb43b210ec9e981894861819c5cbcbde63519c Mon Sep 17 00:00:00 2001
From: adrinjalali <adrin.jalali@gmail.com>
Date: Wed, 26 Jun 2024 00:44:00 +0200
Subject: [PATCH 12/18] absolute imports

---
 skops/io/old/_numpy_v1.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/skops/io/old/_numpy_v1.py b/skops/io/old/_numpy_v1.py
index ff0e01f4..7e4b2b3e 100644
--- a/skops/io/old/_numpy_v1.py
+++ b/skops/io/old/_numpy_v1.py
@@ -4,8 +4,8 @@
 
 import numpy as np
 
-from .._audit import Node, get_tree
-from .._utils import LoadContext, gettype
+from skops.io._audit import Node, get_tree
+from skops.io._utils import LoadContext, gettype
 
 PROTOCOL = 1
 

From 86b2fe3df20b6839ccf9f67f3954328f071e29f4 Mon Sep 17 00:00:00 2001
From: adrinjalali <adrin.jalali@gmail.com>
Date: Wed, 26 Jun 2024 09:08:46 +0200
Subject: [PATCH 13/18] ignore mypy already defined error

---
 skops/io/_numpy.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/skops/io/_numpy.py b/skops/io/_numpy.py
index 9ac537ba..8921c70c 100644
--- a/skops/io/_numpy.py
+++ b/skops/io/_numpy.py
@@ -275,7 +275,9 @@ def _construct(self):
         # numpy>=2
         from numpy._core._multiarray_umath import _ArrayFunctionDispatcher
     except ImportError:
-        from numpy.core._multiarray_umath import _ArrayFunctionDispatcher
+        from numpy.core._multiarray_umath import (  # type: ignore
+            _ArrayFunctionDispatcher,
+        )
 
     GET_STATE_DISPATCH_FUNCTIONS.append((_ArrayFunctionDispatcher, function_get_state))
 except ImportError:

From 4d233e3e2a3b4b8a8e9aa11c3bef98b7e9494a4f Mon Sep 17 00:00:00 2001
From: adrinjalali <adrin.jalali@gmail.com>
Date: Wed, 26 Jun 2024 09:38:51 +0200
Subject: [PATCH 14/18] another go at testing numpy1

---
 .github/workflows/build-test.yml | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 6927c31d..0b13e53e 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -24,10 +24,13 @@ jobs:
             numpy_version: "numpy<2"
           - python: "3.10"
             sklearn_version: "1.2"
+            numpy_version: "numpy"
           - python: "3.11"
             sklearn_version: "1.4"
+            numpy_version: "numpy"
           - python: "3.12"
             sklearn_version: "nightly"
+            numpy_version: "numpy"
 
     # Timeout: https://stackoverflow.com/a/59076067/4521646
     timeout-minutes: 15
@@ -54,18 +57,13 @@ jobs:
       - name: Install dependencies
         run: |
           pip install "pytest<8"
-          pip install .[docs,tests]
-          pip install black=="23.9.1" ruff=="0.0.292" mypy=="1.6.0"
-          if [ ${{ matrix.numpy_version }} ];
-            then
-              pip uninstall --yes numpy
-              pip install "${{ matrix.numpy_version }}"
-          fi
-          pip uninstall --yes scikit-learn
+          pip install "${{ matrix.numpy_version }}"
           if [ ${{ matrix.sklearn_version }} == "nightly" ];
             then pip install --pre --extra-index https://pypi.anaconda.org/scientific-python-nightly-wheels/simple scikit-learn;
             else pip install "scikit-learn~=${{ matrix.sklearn_version }}";
           fi
+          pip install .[docs,tests]
+          pip install black=="23.9.1" ruff=="0.0.292" mypy=="1.6.0"
           if [ ${{ matrix.os }} == "ubuntu-latest" ];
             then sudo apt install pandoc && pandoc --version;
           fi

From d2e85d7c7a043d8ec5052e9a575b53d7aa3e5490 Mon Sep 17 00:00:00 2001
From: adrinjalali <adrin.jalali@gmail.com>
Date: Wed, 26 Jun 2024 09:40:47 +0200
Subject: [PATCH 15/18] upgrade pip

---
 .github/workflows/build-test.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 0b13e53e..e5872ea1 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -56,6 +56,7 @@ jobs:
 
       - name: Install dependencies
         run: |
+          pip install -U pip
           pip install "pytest<8"
           pip install "${{ matrix.numpy_version }}"
           if [ ${{ matrix.sklearn_version }} == "nightly" ];

From 3620f34a724b4ae955e2c8eea9950d6114c05612 Mon Sep 17 00:00:00 2001
From: adrinjalali <adrin.jalali@gmail.com>
Date: Wed, 26 Jun 2024 09:53:47 +0200
Subject: [PATCH 16/18] ignore mypy

---
 skops/io/_numpy.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/skops/io/_numpy.py b/skops/io/_numpy.py
index 8921c70c..f87c8d99 100644
--- a/skops/io/_numpy.py
+++ b/skops/io/_numpy.py
@@ -273,7 +273,9 @@ def _construct(self):
     # a C wrapper: https://github.com/numpy/numpy/pull/23020
     try:
         # numpy>=2
-        from numpy._core._multiarray_umath import _ArrayFunctionDispatcher
+        from numpy._core._multiarray_umath import (  # type: ignore
+            _ArrayFunctionDispatcher,
+        )
     except ImportError:
         from numpy.core._multiarray_umath import (  # type: ignore
             _ArrayFunctionDispatcher,

From b501b50fd279485739d4ca2e2bb868d95e590966 Mon Sep 17 00:00:00 2001
From: adrinjalali <adrin.jalali@gmail.com>
Date: Wed, 26 Jun 2024 10:04:42 +0200
Subject: [PATCH 17/18] make windows happy

---
 .github/workflows/build-test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index e5872ea1..4ef26a97 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -56,7 +56,7 @@ jobs:
 
       - name: Install dependencies
         run: |
-          pip install -U pip
+          python -m pip install -U pip
           pip install "pytest<8"
           pip install "${{ matrix.numpy_version }}"
           if [ ${{ matrix.sklearn_version }} == "nightly" ];

From ca586dc262f6fdebf2f7825f538a3eb7e41bcbc7 Mon Sep 17 00:00:00 2001
From: adrinjalali <adrin.jalali@gmail.com>
Date: Wed, 3 Jul 2024 17:18:49 +0200
Subject: [PATCH 18/18] remove unused code

---
 skops/io/tests/_utils.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/skops/io/tests/_utils.py b/skops/io/tests/_utils.py
index 0bc4a031..b1f41c25 100644
--- a/skops/io/tests/_utils.py
+++ b/skops/io/tests/_utils.py
@@ -121,8 +121,6 @@ def _assert_vals_equal(val1, val2):
         assert set(val1.keys()) == set(val2.keys())
         for key in val1:
             _assert_vals_equal(val1[key], val2[key])
-    # elif isinstance(val1, np.random.Generator):
-    #     assert val1.bit_generator.state == val2.bit_generator.state
     elif hasattr(val1, "__dict__") and hasattr(val2, "__dict__"):
         _assert_vals_equal(val1.__dict__, val2.__dict__)
     elif isinstance(val1, np.ufunc):