cloud_config() -> posit_workbench_config()

Author: shikokuchuo

NAMESPACE

@@ -26,7 +26,6 @@ export(.flat)
 export(.progress)
 export(.stop)
 export(call_mirai)
-export(cloud_config)
 export(cluster_config)
 export(collect_mirai)
 export(daemon)
@@ -51,6 +50,7 @@ export(nextcode)
 export(nextget)
 export(nextstream)
 export(on_daemon)
+export(posit_workbench_config)
 export(register_serial)
 export(remote_config)
 export(require_daemons)
@@ -83,6 +83,7 @@ importFrom(nanonext,listen)
 importFrom(nanonext,mclock)
 importFrom(nanonext,monitor)
 importFrom(nanonext,msleep)
+importFrom(nanonext,ncurl)
 importFrom(nanonext,nng_error)
 importFrom(nanonext,opt)
 importFrom(nanonext,parse_url)

NEWS.md

@@ -8,7 +8,7 @@
 
 #### New Features
 
-* Adds `cloud_config()` to launch remote daemons using a cloud / cloud-based managed platform. Currently supports Posit Workbench.
+* Adds `posit_workbench_config()` to launch remote daemons using the default-configured Posit Workbench Launcher.
 * Adds `with_daemons()` and `local_daemons()` helper functions for using a particular compute profile.
   This works with daemons that are already set up unlike the existing `with.miraiDaemons()` method, which creates a new scope and tears it down when finished (#360).
 * A mirai now has an attribute `id`, which is a monotonically increasing integer identifier unique to each session.

R/launchers.R

@@ -94,10 +94,8 @@ launch_remote <- function(n = 1L, remote = remote_config(), ..., tls = NULL, .co
   dots <- if (...length()) parse_dots(envir, ...) else envir[["dots"]]
   if (is.null(tls)) tls <- envir[["tls"]]
 
-  if (length(remote) == 2L) {
-    platform <- remote[["platform"]]
+  if (length(remote) == 2L && remote[["platform"]] == "posit_workbench") {
     args <- remote[["args"]]
-    platform != "posit" && stop(._[["platform_unsupported"]])
     tools <- posit_tools()
     is.environment(tools) || stop(._[["posit_api"]])
     return(posit_workbench_launch(n, args, tools))
@@ -401,45 +399,32 @@ cluster_config <- function(command = "sbatch", options = "", rscript = "Rscript"
   list(command = "/bin/sh", args = args, rscript = rscript, quote = NULL)
 }
 
-#' Cloud Remote Launch Configuration
+#' Posit Workbench Launch Configuration
 #'
-#' Generates a remote configuration for launching daemons via cloud /
-#' cloud-based managed platforms.
-#'
-#' @param platform \[default "posit"\] character name of the platform
-#'   (case-insensitive). Currently the only option is "posit" to use the Posit
-#'   Workbench launcher.
+#' Generates a remote configuration for launching daemons via the default
+#' configured Posit Workbench launcher method.
 #'
 #' @inherit remote_config return
 #'
 #' @seealso [ssh_config()], [cluster_config()], and [remote_config()] for other
 #'   types of remote launch configuration.
 #'
 #' @examples
-#' tryCatch(cloud_config(), error = identity)
+#' tryCatch(posit_workbench_config(), error = identity)
 #'
 #' \dontrun{
 #'
 #' # Launch 2 daemons using the Posit Workbench default:
-#' daemons(n = 2, url = host_url(), remote = cloud_config(platform = "posit"))
+#' daemons(n = 2, url = host_url(), remote = posit_workbench_config())
 #' }
 #'
 #' @export
 #'
-cloud_config <- function(platform = "posit") {
-  platform <- tolower(platform)
-  args <- switch(
-    platform,
-    posit = {
-      tools <- posit_tools()
-      is.environment(tools) || stop(._[["posit_api"]])
-      get_info <- .subset2(tools, ".rs.api.launcher.getInfo")
-      cluster <- get_info()[["clusters"]][[1L]]
-      list(name = cluster[["name"]], image = cluster[["defaultImage"]])
-    },
-    stop(._[["platform_unsupported"]])
-  )
-  list(platform = platform, args = args)
+posit_workbench_config <- function() {
+  tools <- posit_tools()
+  is.null(tools) && stop(._[["posit_api"]])
+  args <- posit_get_info(tools)
+  list(platform = "posit_workbench", args = args)
 }
 
 #' URL Constructors
@@ -528,17 +513,37 @@ find_dot <- function(args) {
 }
 
 posit_tools <- function() {
-  idx <- match("tools:rstudio", search(), nomatch = 0L)
-  idx || return()
-  tools <- as.environment(idx)
-  feature_available <- .subset2(tools, ".rs.api.launcher.jobsFeatureAvailable")
-  is.function(feature_available) && feature_available() || return()
-  tools
+  from_json <- get0(".rs.fromJSON")
+  cookie <- Sys.getenv("RS_SESSION_RPC_COOKIE")
+  server <- Sys.getenv("RS_SERVER_ADDRESS")
+  is.function(from_json) && nzchar(cookie) && nzchar(server) || return()
+  list(from_json = from_json, cookie = cookie, server = server)
+}
+
+posit_get_info <- function(tools) {
+  info <- ncurl(
+    url = file.path(tools[["server"]], "api", "get_compute_envs"),
+    headers = c(cookie = tools[["cookie"]])
+  )
+  data <- tools[["from_json"]](info[["data"]])
+  cluster <- .subset2(data, c(1L, 1L, 1L))
+  list(name = cluster[["name"]], image = cluster[["defaultImage"]])
 }
 
 posit_workbench_launch <- function(n, args, tools) {
-  submit_job <- .subset2(tools, ".rs.api.launcher.submitJob")
-  new_container <- .subset2(tools, ".rs.api.launcher.newContainer")
+  tools <- posit_tools()
+  json <- sprintf(
+    '{"method":"launch_job","kwparams":{"job":{"cluster":"%s","container":{"image":"%s"},"name":"mirai_daemon","exe":"Rscript","args":["-e","mirai::daemon(\\"%s\\")"]}}}',
+    args[["name"]],
+    args[["image"]],
+    nextget("url")
+  )
+  info <- ncurl(
+    url = file.path(tools[["server"]], "api", "launch_job"),
+    method = "POST",
+    headers = c(cookie = tools[["cookie"]]),
+    data = json
+  )
   cluster <- args[["name"]]
   container <- new_container(args[["image"]])
   cmds <- launch_remote(n)

R/mirai-package.R

@@ -27,7 +27,7 @@
 #'
 #' @importFrom nanonext .advance call_aio call_aio_ collect_aio collect_aio_
 #'   .context cv cv_signal cv_value dial ip_addr is_error_value .keep listen
-#'   .mark mclock monitor msleep nng_error opt opt<- parse_url pipe_id
+#'   .mark mclock monitor msleep ncurl nng_error opt opt<- parse_url pipe_id
 #'   pipe_notify random .read_header .read_marker read_monitor reap recv
 #'   recv_aio request send serial_config socket stat stop_aio tls_config
 #'   unresolved .unresolved until wait write_cert
@@ -80,8 +80,7 @@
     n_zero = "the number of daemons must be zero or greater",
     not_found = "compute profile `%s` not found",
     numeric_n = "`n` must be numeric, did you mean to provide `url`?",
-    platform_unsupported = "`platform` is currently not supported",
-    posit_api = "this launch configuration can only be used from Posit Workbench",
+    posit_api = "can only be used from Posit Workbench",
     sync_daemons = "mirai: initial sync with daemon(s) [%d secs elapsed]",
     sync_dispatcher = "mirai: initial sync with dispatcher [%d secs elapsed]",
     within_map = "cannot create local daemons from within mirai map"

man/cloud_config.Rd renamed to man/posit_workbench_config.Rd

@@ -61,23 +61,20 @@ test_null(register_serial("test_klass1", serialize, unserialize))
 test_null(register_serial(c("test_klass2", "test_klass3"), list(serialize, serialize), list(unserialize, unserialize)))
 test_equal(length(mirai:::.[["serial"]][[3L]]), 3L)
 # cloud launcher tests
-test_error(cloud_config(platform = ""), "not supported")
 is.null(mirai:::posit_tools()) && {
   ns <- new.env(parent = emptyenv())
   `[[<-`(ns, ".rs.api.launcher.jobsFeatureAvailable", function() TRUE)
   `[[<-`(ns, ".rs.api.launcher.getInfo", function() list(clusters = list(list(name = "Kubernetes", defaultImage = "1.a.b.reg.prov.com/int-r-sess:ubuntu2204-20250609"))))
   `[[<-`(ns, ".rs.api.launcher.newContainer", function(image) image)
   `[[<-`(ns, ".rs.api.launcher.submitJob", function(...) NULL)
   attach(ns, name = "tools:rstudio")
-  cfg <- cloud_config(platform = "posit")
+  cfg <- posit_workbench_config()
   test_type("list", cfg)
-  test_zero(daemons(url = local_url(), dispatcher = FALSE))
+  test_nzchar(daemons(url = local_url(), dispatcher = FALSE))
   test_class("miraiLaunchCmd", launch_remote(n = 2L, remote = cfg))
-  cfg$platform <- "wrong"
-  test_error(launch_remote(n = 2L, remote = cfg), "not supported")
-  test_zero(daemons(0))
+  test_null(daemons(0))
   detach()
-  test_error(cloud_config(platform = "posit"), "can only be used from Posit Workbench")
+  test_error(posit_workbench_config(), "can only be used from Posit Workbench")
 }
 # mirai and daemons tests
 connection && {