remove v2 specific changes to maintain compatability

Author: isabelizimm

vetiver/tests/test_build_vetiver_model.py

@@ -36,8 +36,9 @@ def test_vetiver_model_array_prototype():
 
     assert vt1.model == model
     assert issubclass(vt1.prototype, vt.Prototype)
-    assert isinstance(vt1.prototype.model_construct(), pydantic.BaseModel)
-    assert vt1.prototype.model_construct().__dict__ == {"0": 96, "1": 11, "2": 33}
+    # change to model_construct for pydantic v3
+    assert isinstance(vt1.prototype.construct(), pydantic.BaseModel)
+    assert vt1.prototype.construct().__dict__ == {"0": 96, "1": 11, "2": 33}
 
 
 def test_vetiver_model_df_prototype():
@@ -51,8 +52,9 @@ def test_vetiver_model_df_prototype():
     )
 
     assert vt2.model == model
-    assert isinstance(vt2.prototype.model_construct(), pydantic.BaseModel)
-    assert vt2.prototype.model_construct().B == 96
+    # change to model_construct for pydantic v3
+    assert isinstance(vt2.prototype.construct(), pydantic.BaseModel)
+    assert vt2.prototype.construct().B == 96
 
 
 def test_vetiver_model_dict_prototype():
@@ -67,8 +69,9 @@ def test_vetiver_model_dict_prototype():
     )
 
     assert vt3.model == model
-    assert isinstance(vt3.prototype.model_construct(), pydantic.BaseModel)
-    assert vt3.prototype.model_construct().B == 0
+    # change to model_construct for pydantic v3
+    assert isinstance(vt3.prototype.construct(), pydantic.BaseModel)
+    assert vt3.prototype.construct().B == 0
 
 
 def test_vetiver_model_basemodel_prototype():
@@ -138,7 +141,8 @@ def test_vetiver_model_from_pin():
 
     assert isinstance(v2, vt.VetiverModel)
     assert isinstance(v2.model, sklearn.base.BaseEstimator)
-    assert isinstance(v2.prototype.model_construct(), pydantic.BaseModel)
+    # change to model_construct for pydantic v3
+    assert isinstance(v2.prototype.construct(), pydantic.BaseModel)
     assert v2.metadata.user == {"test": 123}
     assert v2.metadata.version is not None
     assert v2.metadata.required_pkgs == ["scikit-learn"]
@@ -173,7 +177,8 @@ def test_vetiver_model_from_pin_user_metadata():
 
     assert isinstance(v2, vt.VetiverModel)
     assert isinstance(v2.model, sklearn.base.BaseEstimator)
-    assert isinstance(v2.prototype.model_construct(), pydantic.BaseModel)
+    # change to model_construct for pydantic v3
+    assert isinstance(v2.prototype.construct(), pydantic.BaseModel)
     assert v2.metadata.user == custom_meta
     assert v2.metadata.version is not None
     assert v2.metadata.required_pkgs == loaded_pkgs

vetiver/tests/test_custom_handler.py

@@ -40,7 +40,8 @@ def test_custom_vetiver_model():
     assert v.description == "A  DummyRegressor model"
     assert not v.metadata.required_pkgs
     assert isinstance(v.model, sklearn.dummy.DummyRegressor)
-    assert isinstance(v.prototype.model_construct(), pydantic.BaseModel)
+    # change to model_construct for pydantic v3
+    assert isinstance(v.prototype.construct(), pydantic.BaseModel)
 
 
 def test_custom_vetiver_model_no_ptype():
@@ -58,4 +59,5 @@ def test_custom_vetiver_model_no_ptype():
 
     assert v.description == "A regression model for testing purposes"
     assert isinstance(v.model, sklearn.dummy.DummyRegressor)
-    assert isinstance(v.prototype.model_construct(), pydantic.BaseModel)
+    # change to model_construct for pydantic v3
+    assert isinstance(v.prototype.construct(), pydantic.BaseModel)

vetiver/vetiver_model.py

@@ -84,7 +84,6 @@ def __init__(
         translator = create_handler(model, prototype_data)
 
         self.model = translator.model
-        self.prototype_data = prototype_data
         self.prototype = translator.construct_prototype()
         self.model_name = model_name
         self.description = description if description else translator.describe()