Require ellmer >= 0.3.0 (#73)

Author: shikokuchuo

DESCRIPTION

@@ -26,7 +26,7 @@ Depends:
     R (>= 4.1.0)
 Imports: 
     cli,
-    ellmer (>= 0.2.0),
+    ellmer (>= 0.3.0),
     jsonlite,
     nanonext (>= 1.6.0),
     processx,

R/aaa.R

@@ -1,18 +1,2 @@
 the <- new_environment()
 the$server_processes <- list()
-
-# ellmer 0.3.0 --------------------------------------------------------------
-# the ellmer 0.3.0 release will make a number of breaking changes.
-# we'll include a few functions to future-proof the initial release of mcptools
-# for that package release (#52).
-is_new_ellmer <- function() {
-  packageVersion("ellmer") >= "0.2.1.9000"
-}
-
-tool_fun <- function(tool) {
-  if (is_new_ellmer()) {
-    return(tool)
-  }
-
-  tool@fun
-}

R/client.R

@@ -186,7 +186,7 @@ error_no_mcp_config <- function(call) {
   cli::cli_abort(
     c(
       "The mcptools MCP client configuration file does not exist.",
-      i = "Supply a non-NULL file {.arg config} or create a file at the default 
+      i = "Supply a non-NULL file {.arg config} or create a file at the default
            configuration location {.file {default_mcp_client_config()}}."
     ),
     call = call
@@ -221,41 +221,21 @@ server_as_ellmer_tools <- function(server) {
   for (i in seq_along(tools)) {
     tool <- tools[[i]]
     tool_arguments <- as_ellmer_types(tool)
-    if (is_new_ellmer()) {
-      tools_out[[i]] <-
-        do.call(
-          ellmer::tool,
-          c(
-            list(
-              fun = tool_ref(
-                server = server$name,
-                tool = tool$name,
-                arguments = names(tool_arguments)
-              ),
-              description = tool$description,
-              arguments = tool_arguments,
-              name = tool$name
-            )
-          )
-        )
-    } else {
-      tools_out[[i]] <-
-        do.call(
-          ellmer::tool,
-          c(
-            list(
-              .fun = tool_ref(
-                server = server$name,
-                tool = tool$name,
-                arguments = names(tool_arguments)
-              ),
-              .description = tool$description,
-              .name = tool$name
-            ),
-            tool_arguments
-          )
+    tools_out[[i]] <- do.call(
+      ellmer::tool,
+      c(
+        list(
+          fun = tool_ref(
+            server = server$name,
+            tool = tool$name,
+            arguments = names(tool_arguments)
+          ),
+          description = tool$description,
+          arguments = tool_arguments,
+          name = tool$name
         )
-    }
+      )
+    )
   }
 
   tools_out

R/server.R

@@ -343,7 +343,7 @@ append_tool_fn <- function(data) {
     ))
   }
 
-  data$tool <- tool_fun(get_mcptools_tools()[[tool_name]])
+  data$tool <- get_mcptools_tools()[[tool_name]]
   data
 }
 

R/tools.R

@@ -125,18 +125,10 @@ list_r_sessions_description <- paste(
   "and call select_r_session unless the user asks you to specifically."
 )
 
-list_r_sessions_tool <-
-  if (is_new_ellmer()) {
-    ellmer::tool(
-      fun = list_r_sessions,
-      description = list_r_sessions_description
-    )
-  } else {
-    ellmer::tool(
-      .fun = list_r_sessions,
-      .description = list_r_sessions_description
-    )
-  }
+list_r_sessions_tool <- ellmer::tool(
+  fun = list_r_sessions,
+  description = list_r_sessions_description
+)
 
 select_r_session <- function(session) {
   nanonext::reap(the$server_socket[["dialer"]][[1L]])
@@ -161,22 +153,13 @@ select_r_session_description <- paste(
   "call this tool more than once if you need to switch between sessions."
 )
 
-select_r_session_tool <-
-  if (is_new_ellmer()) {
-    ellmer::tool(
-      fun = select_r_session,
-      description = select_r_session_description,
-      arguments = list(
-        session = ellmer::type_integer("The R session number to select.")
-      )
-    )
-  } else {
-    ellmer::tool(
-      .fun = select_r_session,
-      .description = select_r_session_description,
-      session = ellmer::type_integer("The R session number to select.")
-    )
-  }
+select_r_session_tool <- ellmer::tool(
+  fun = select_r_session,
+  description = select_r_session_description,
+  arguments = list(
+    session = ellmer::type_integer("The R session number to select.")
+  )
+)
 
 get_mcptools_tools <- function() {
   # must be called inside of the server session

inst/example-ellmer-tools.R

@@ -1,36 +1,17 @@
-if (is_new_ellmer()) {
-  res <-
-    list(
-      tool_rnorm = ellmer::tool(
-        fun = rnorm,
-        description = "Draw numbers from a random normal distribution",
-        arguments = list(
-          n = ellmer::type_integer(
-            "The number of observations. Must be a positive integer."
-          ),
-          mean = ellmer::type_number("The mean value of the distribution."),
-          sd = ellmer::type_number(
-            "The standard deviation of the distribution. Must be a non-negative number."
-          )
-        )
+res <- list(
+  tool_rnorm = ellmer::tool(
+    fun = rnorm,
+    description = "Draw numbers from a random normal distribution",
+    arguments = list(
+      n = ellmer::type_integer(
+        "The number of observations. Must be a positive integer."
+      ),
+      mean = ellmer::type_number("The mean value of the distribution."),
+      sd = ellmer::type_number(
+        "The standard deviation of the distribution. Must be a non-negative number."
       )
     )
-} else {
-  res <-
-    list(
-      tool_rnorm = ellmer::tool(
-        rnorm,
-        "Draw numbers from a random normal distribution",
-        n = ellmer::type_integer(
-          "The number of observations. Must be a positive integer."
-        ),
-        mean = ellmer::type_number("The mean value of the distribution."),
-        sd = ellmer::type_number(
-          "The standard deviation of the distribution. Must be a non-negative number."
-        ),
-      )
-    )
-}
-
+  )
+)
 
 res