updates from review

Author: isabelizimm

README.md

@@ -43,7 +43,7 @@ from vetiver import mock, VetiverModel
 X, y = mock.get_mock_data()
 model = mock.get_mock_model().fit(X, y)
 
-v = VetiverModel(model, save_ptype=True, ptype_data=X, model_name='mock_model')
+v = VetiverModel(model, model_name='mock_model', prototype_data=X)
 ```
 
 You can **version** and **share** your `VetiverModel()` by choosing a [pins](https://rstudio.github.io/pins-python/) "board" for it, including a local folder, RStudio Connect, Amazon S3, and more.
@@ -60,7 +60,7 @@ You can **deploy** your pinned `VetiverModel()` using `VetiverAPI()`, an extensi
 
 ```python
 from vetiver import VetiverAPI
-app = VetiverAPI(v, check_ptype = True)
+app = VetiverAPI(v, check_prototype = True)
 ```
 
 To start a server using this object, use `app.run(port = 8080)` or your port of choice.

vetiver/pin_read_write.py

@@ -62,9 +62,7 @@ def vetiver_pin_write(board, model: VetiverModel, versioned: bool = True):
         description=model.description,
         metadata={
             "required_pkgs": model.metadata.get("required_pkgs"),
-            "ptype": None
-            if model.prototype is None
-            else model.prototype().json(),  # ptype_change
+            "prototype": None if model.prototype is None else model.prototype().json(),
         },
         versioned=versioned,
     )

vetiver/tests/test_sklearn.py

@@ -4,18 +4,18 @@
 import pytest
 
 
-def _start_application(save_ptype: bool = True):
+def _start_application(save_prototype: bool = True):
     X, y = mock.get_mock_data()
     model = mock.get_mock_model().fit(X, y)
     v = VetiverModel(
         model=model,
-        prototype_data=X if save_ptype else None,
+        prototype_data=X if save_prototype else None,
         model_name="my_model",
         versioned=None,
         description="A regression model for testing purposes",
     )
 
-    app = VetiverAPI(v, check_prototype=save_ptype)
+    app = VetiverAPI(v, check_prototype=save_prototype)
 
     return app
 
@@ -48,7 +48,7 @@ def test_predict_endpoint_ptype_error():
 
 def test_predict_endpoint_no_ptype():
     np.random.seed(500)
-    client = TestClient(_start_application(save_ptype=False).app)
+    client = TestClient(_start_application(save_prototype=False).app)
     data = [{"B": 0, "C": 0, "D": 0}]
     response = client.post("/predict", json=data)
     assert response.status_code == 200, response.text
@@ -57,7 +57,7 @@ def test_predict_endpoint_no_ptype():
 
 def test_predict_endpoint_no_ptype_batch():
     np.random.seed(500)
-    client = TestClient(_start_application(save_ptype=False).app)
+    client = TestClient(_start_application(save_prototype=False).app)
     data = [[0, 0, 0], [0, 0, 0]]
     response = client.post("/predict", json=data)
     assert response.status_code == 200, response.text
@@ -66,7 +66,7 @@ def test_predict_endpoint_no_ptype_batch():
 
 def test_predict_endpoint_no_ptype_error():
     np.random.seed(500)
-    client = TestClient(_start_application(save_ptype=False).app)
+    client = TestClient(_start_application(save_prototype=False).app)
     data = {"hell0", 9, 32.0}
     with pytest.raises(TypeError):
         client.post("/predict", json=data)

vetiver/vetiver_model.py

@@ -101,6 +101,13 @@ def from_pin(cls, board, name: str, version: str = None):
         model = board.pin_read(name, version)
         meta = board.pin_meta(name, version)
 
+        if meta.user.get("ptype"):
+            get_prototype = meta.user.get("ptype")
+        elif meta.user.get("prototype"):
+            get_prototype = meta.user.get("prototype")
+        else:
+            get_prototype = None
+
         return cls(
             model=model,
             model_name=name,
@@ -111,8 +118,6 @@ def from_pin(cls, board, name: str, version: str = None):
                 url=meta.local.get("url"),  # None all the time, besides Connect
                 required_pkgs=meta.user.get("required_pkgs"),
             ),
-            prototype_data=json.loads(meta.user.get("ptype"))
-            if meta.user.get("ptype")
-            else None,
+            prototype_data=json.loads(get_prototype) if get_prototype else None,
             versioned=True,
         )