wrapping rsconnect

Author: isabelizimm

vetiver/rsconnect.py

@@ -1,43 +1,47 @@
-from tempfile import tempdir
-import rsconnect
+import tempfile
+from rsconnect.actions import deploy_python_fastapi
 import typing
 
 from .write_fastapi import write_app
 
+
 def deploy_rsconnect(
     connect_server,
     board,
     pin_name,
-    version,
-    directory: str,
-    extra_files: typing.List[str],
-    excludes: typing.List[str],
-    entry_point: str,
-    new: bool,
-    app_id: int,
-    title: str,
-    python: str,
-    conda_mode: bool,
-    force_generate: bool,
-    log_callback: typing.Callable,
+    version = None,
+    extra_files: typing.List[str] = None,
+    new: bool = False,
+    app_id: int = None,
+    title: str = None,
+    python: str = None,
+    conda_mode: bool = False,
+    force_generate: bool = False,
+    log_callback: typing.Callable = None,
     image: str = None,
 ):
-    tmp = tempdir()
-
-    write_app(board = board, pin_name = pin_name, version = version, file = tmp+"app.py", overwrite = False)
+    with tempfile.TemporaryDirectory() as temp:
+        tmp_app = temp + "/app.py"
+        write_app(
+            board=board,
+            pin_name=pin_name,
+            version=version,
+            file=tmp_app,
+            overwrite=False,
+        )
 
-    rsconnect.actions.deploy_python_fastapi(
-        connect_server = connect_server,
-        directory = directory,
-        extra_files = extra_files,
-        excludes = excludes,
-        entry_point = entry_point,
-        new = new,
-        app_id = app_id,
-        title = title,
-        python = python,
-        conda_mode = conda_mode,
-        force_generate = force_generate,
-        log_callback = log_callback,
-        image = image,
-     )
+        deploy_python_fastapi(
+            connect_server=connect_server,
+            directory=temp,
+            extra_files=extra_files,
+            excludes=None,
+            entry_point="vetiver_api:api",
+            new=new,
+            app_id=app_id,
+            title=title,
+            python=python,
+            conda_mode=conda_mode,
+            force_generate=force_generate,
+            log_callback=log_callback,
+            image=image,
+        )

vetiver/tests/test_rsconnect.py

@@ -1,20 +1,38 @@
 import pytest
 import json
-from pins.rsconnect.fs import RsConnectFs
+import requests
+
+import sklearn
 from pins.boards import BoardRsConnect
 
+from vetiver import VetiverModel, vetiver_pin_write, mock
+from vetiver.rsconnect import deploy_rsconnect
+
+# Load data, model
+X_df, y = mock.get_mock_data()
+model = mock.get_mock_model().fit(X_df, y)
+
 RSC_SERVER_URL = "http://localhost:3939"
 RSC_KEYS_FNAME = "vetiver/tests/rsconnect_api_keys.json"
 
 pytestmark = pytest.mark.rsc_test  # noqa
 
+
+def server_from_key(name):
+    from rsconnect.api import RSConnectServer
+
+    with open(RSC_KEYS_FNAME) as f:
+        api_key = json.load(f)[name]
+        return RSConnectServer(RSC_SERVER_URL, api_key)
+
 def rsc_from_key(name):
     from pins.rsconnect.api import RsConnectApi
 
     with open(RSC_KEYS_FNAME) as f:
         api_key = json.load(f)[name]
         return RsConnectApi(RSC_SERVER_URL, api_key)
 
+
 def rsc_fs_from_key(name):
     from pins.rsconnect.fs import RsConnectFs
 
@@ -29,6 +47,7 @@ def rsc_delete_user_content(rsc):
     for entry in content:
         rsc.delete_content_item(entry["guid"])
 
+
 @pytest.fixture(scope="function")
 def rsc_short():
     # tears down content after each test
@@ -37,18 +56,30 @@ def rsc_short():
     # delete any content that might already exist
     rsc_delete_user_content(fs_susan.api)
 
-    yield BoardRsConnect("", fs_susan, allow_pickle_read=True) #fs_susan.ls to list content
+    yield BoardRsConnect(
+        "", fs_susan, allow_pickle_read=True
+    )  # fs_susan.ls to list content
 
     rsc_delete_user_content(fs_susan.api)
 
-from vetiver import VetiverModel, vetiver_pin_write, mock
-import sklearn
-# Load data, model
-X_df, y = mock.get_mock_data()
-model = mock.get_mock_model().fit(X_df, y)
 
 def test_board_pin_write(rsc_short):
-    v = VetiverModel(model=model, ptype_data=X_df,
-        model_name="susan/model", versioned=None)
+    v = VetiverModel(
+        model=model, ptype_data=X_df, model_name="susan/model", versioned=None
+    )
     vetiver_pin_write(board=rsc_short, model=v)
     assert isinstance(rsc_short.pin_read("susan/model"), sklearn.dummy.DummyRegressor)
+
+
+def test_deploy(rsc_short):
+    v = VetiverModel(
+        model=model, ptype_data=X_df, model_name="susan/model", versioned=None
+    )
+
+    vetiver_pin_write(board=rsc_short, model=v)
+    deploy_rsconnect(
+        connect_server=server_from_key("susan"), board=rsc_short, pin_name="susan/model"
+    )
+    response = requests.post(RSC_SERVER_URL + "/predict/", json=X_df)
+    assert response.status_code == 200, response.text
+    assert response.json() == {"prediction": [44.47, 44.47]}, response.json()