Move plumber to suggests

DESCRIPTION

@@ -28,7 +28,6 @@ Imports:
     lifecycle,
     magrittr (>= 2.0.3),
     pins (>= 1.0.0),
-    plumber (>= 1.0.0),
     purrr,
     rapidoc,
     readr (>= 1.4.0),
@@ -59,6 +58,7 @@ Suggests:
     parsnip,
     pingr,
     plotly,
+    plumber (>= 1.0.0),
     ranger,
     recipes,
     rmarkdown,

R/api.R

@@ -34,7 +34,7 @@
 #'
 #' @return A Plumber router with the prediction endpoint added.
 #'
-#' @examples
+#' @examplesIf rlang::is_installed("plumber")
 #'
 #' cars_lm <- lm(mpg ~ ., data = mtcars)
 #' v <- vetiver_model(cars_lm, "cars_linear")
@@ -75,6 +75,7 @@ vetiver_pr_post <- function(pr,
                             debug = is_interactive(),
                             ...,
                             check_ptype = TRUE) {
+    rlang::check_installed("plumber")
     # `force()` all `...` arguments early; https://github.com/tidymodels/vetiver/pull/20
     rlang::list2(...)
     handler_startup(vetiver_model)
@@ -108,6 +109,7 @@ vetiver_pr_docs <- function(pr,
                             vetiver_model,
                             path = "/predict",
                             all_docs = TRUE) {
+    rlang::check_installed("plumber")
     loadNamespace("rapidoc")
     modify_spec <- function(spec) api_spec(spec, vetiver_model, path, all_docs)
     pr <- plumber::pr_set_api_spec(pr, api = modify_spec)
@@ -141,21 +143,23 @@ vetiver_pr_predict <- function(pr,
                                path = "/predict",
                                debug = is_interactive(),
                                ...) {
-
-    lifecycle::deprecate_warn(
+    lifecycle::deprecate_stop(
         "0.1.2",
         "vetiver_pr_predict()",
         "vetiver_api()"
     )
+}
 
-    # `force()` all `...` arguments early; https://github.com/tidymodels/vetiver/pull/20
-    rlang::list2(...)
-    vetiver_api(
-        pr = pr,
-        vetiver_model = vetiver_model,
-        path = path,
-        debug = debug,
-        ...,
-        docs = TRUE
+
+local_plumber_session <- function(pr, port, docs = FALSE, env = parent.frame()) {
+    rlang::check_installed("plumber")
+    rs <- callr::r_session$new()
+    rs$call(
+        function(pr, port, docs) {
+            plumber::pr_run(pr = pr, port = port, docs = docs)
+        },
+        args = list(pr = pr, port = port, docs = docs)
     )
+    withr::defer(rs$close(), envir = env)
+    rs
 }

R/open-api-spec.R

@@ -120,7 +120,7 @@ map_request_body.array <- function(ptype) {
 #' character string.
 #' @export
 #'
-#' @examples
+#' @examplesIf rlang::is_installed("plumber")
 #' library(plumber)
 #' cars_lm <- lm(mpg ~ ., data = mtcars)
 #' v <- vetiver_model(cars_lm, "cars_linear")

R/write-plumber.R

@@ -23,7 +23,7 @@
 #'
 #' @export
 #'
-#' @examples
+#' @examplesIf rlang::is_installed("plumber")
 #' library(pins)
 #' tmp <- tempfile()
 #' b <- board_temp(versioned = TRUE)
@@ -38,6 +38,7 @@ vetiver_write_plumber <- function(board, name, version = NULL,
                                   file = "plumber.R",
                                   rsconnect = TRUE) {
 
+    rlang::check_installed("plumber")
     plumber_dots <- rlang::list2(...)
 
     if (board$versioned) {

tests/testthat/_snaps/api.md

@@ -1,9 +1,5 @@
 # old function is deprecated
 
-    Code
-      p <- pr() %>% vetiver_pr_predict(v)
-    Condition
-      Warning:
-      `vetiver_pr_predict()` was deprecated in vetiver 0.1.2.
-      i Please use `vetiver_api()` instead.
+    `vetiver_pr_predict()` was deprecated in vetiver 0.1.2 and is now defunct.
+    i Please use `vetiver_api()` instead.
 

tests/testthat/helper-redact.R

@@ -1,8 +1,19 @@
+library(pins)
+
+cars_lm <- lm(mpg ~ cyl + disp, data = mtcars)
+v <- vetiver_model(cars_lm, "cars1")
+
+root_path <- "http://localhost"
 tmp_dir <- fs::path_real(withr::local_tempdir())
 rel_dir <- fs::path_rel(tmp_dir)
+port <- ifelse(rlang::is_installed("httpuv"), httpuv::randomPort(), 8088)
 
 redact_vetiver <- function(snapshot) {
     snapshot <- gsub(rel_dir, "<redacted>", snapshot, fixed = TRUE)
     snapshot <- gsub(tmp_dir, "<redacted>", snapshot, fixed = TRUE)
     snapshot <- gsub(getRversion(), "<r_version>", snapshot, fixed = TRUE)
 }
+
+redact_port <- function(snapshot) {
+    snapshot <- gsub(port, "<port>", snapshot, fixed = TRUE)
+}

tests/testthat/test-api.R

@@ -1,3 +1,6 @@
+skip_if_not_installed("plumber")
+library(plumber)
+
 test_that("default endpoint", {
   p <- pr() %>% vetiver_api(v)
   expect_equal(names(p$routes), c("logo", "ping", "predict"))
@@ -6,7 +9,7 @@ test_that("default endpoint", {
 })
 
 test_that("old function is deprecated", {
-  expect_snapshot(p <- pr() %>% vetiver_pr_predict(v))
+  expect_snapshot_error(p <- pr() %>% vetiver_pr_predict(v))
 })
 
 test_that("default endpoint via modular functions", {

tests/testthat/test-caret.R

@@ -1,7 +1,9 @@
 skip_if_not_installed("caret")
 skip_if_not_installed("ranger")
+skip_if_not_installed("plumber")
 
 library(caret)
+library(plumber)
 
 predictors <- mtcars[, c("cyl", "disp", "hp")]
 

tests/testthat/test-create-ptype.R

@@ -1,5 +1,3 @@
-library(pins)
-
 b <- board_temp()
 cars_lm <- lm(mpg ~ cyl + disp, data = mtcars)
 

tests/testthat/test-gam.R

@@ -1,5 +1,7 @@
 skip_if_not_installed("mgcv")
+skip_if_not_installed("plumber")
 
+library(plumber)
 mtcars_gam <- mgcv::gam(mpg ~ s(disp, k = 3) + s(wt), data = mtcars)
 v <- vetiver_model(mtcars_gam, "cars_gam")
 
@@ -53,7 +55,7 @@ test_that("default OpenAPI spec", {
 
 })
 
-test_that("create plumber.R for xgboost", {
+test_that("create plumber.R for gam", {
     skip_on_cran()
     b <- board_folder(path = tmp_dir)
     vetiver_pin_write(b, v)

tests/testthat/test-glm.R

@@ -1,3 +1,6 @@
+skip_if_not_installed("plumber")
+library(plumber)
+
 mtcars_glm <- glm(mpg ~ ., data = mtcars)
 v <- vetiver_model(mtcars_glm, "cars_glm")
 

tests/testthat/test-predict.R

@@ -1,5 +1,7 @@
 skip_on_cran()
-skip_if_not_installed(c("pingr", "httr"))
+skip_if_not_installed(c("pingr", "httr", "httpuv", "plumber"))
+
+library(plumber)
 
 pr <- pr() %>% vetiver_api(v, debug = TRUE)
 rs <- local_plumber_session(pr, port)

tests/testthat/test-ranger.R

@@ -1,5 +1,7 @@
 skip_if_not_installed("ranger")
+skip_if_not_installed("plumber")
 
+library(plumber)
 set.seed(123)
 cars_rf <- ranger::ranger(mpg ~ ., data = mtcars, quantreg = TRUE)
 v <- vetiver_model(cars_rf, "cars3", ptype_data = mtcars[,-1])

tests/testthat/test-stacks.R

@@ -1,6 +1,8 @@
-skip_if_not_installed("stacks")
 skip_on_cran()
+skip_if_not_installed("stacks")
+skip_if_not_installed("plumber")
 
+library(plumber)
 library(stacks)
 
 data("tree_frogs", package = "stacks")

tests/testthat/test-tidymodels.R

@@ -1,7 +1,9 @@
 skip_if_not_installed("workflows")
 skip_if_not_installed("parsnip")
 skip_if_not_installed("ranger")
+skip_if_not_installed("plumber")
 
+library(plumber)
 library(workflows)
 library(parsnip)
 

tests/testthat/test-write-docker.R

@@ -1,3 +1,4 @@
+skip_if_not_installed("plumber")
 b <- board_folder(path = tmp_dir)
 
 test_that("create Dockerfile with packages", {

tests/testthat/test-write-plumber.R

@@ -1,3 +1,5 @@
+skip_if_not_installed("plumber")
+
 test_that("create plumber.R with packages", {
     skip_on_cran()
     b <- board_folder(path = tmp_dir)

tests/testthat/test-xgboost.R

@@ -1,5 +1,7 @@
 skip_if_not_installed("xgboost")
+skip_if_not_installed("plumber")
 
+library(plumber)
 set.seed(123)
 cars_xgb <- xgboost::xgboost(as.matrix(mtcars[,-1]),
                              mtcars$mpg, nrounds = 3,