Replaces readline() with menu(), adds test for that

NAMESPACE

@@ -66,3 +66,4 @@ importFrom(rlang,is_interactive)
 importFrom(rlang,is_named)
 importFrom(utils,capture.output)
 importFrom(utils,head)
+importFrom(utils,menu)

R/chattr-package.R

@@ -1,7 +1,7 @@
 #' @importFrom purrr map_chr map_lgl map imap set_names walk flatten
 #' @importFrom purrr iwalk discard keep imap_lgl reduce transpose
 #' @importFrom rlang %||% abort is_named is_interactive
-#' @importFrom utils capture.output head
+#' @importFrom utils capture.output head menu
 #' @importFrom clipr write_clip
 #' @importFrom bslib bs_theme
 #' @importFrom grDevices rgb

R/chattr-use.R

@@ -102,18 +102,14 @@ ch_get_ymls <- function(menu = TRUE) {
       } else {
         x <- paste(.x[[1]], "-", .x[[2]])
       }
-      paste0(trimws(.y), ": ", x, " (", .x[[3]], ") \n")
+      paste0(x, " (", .x[[3]], ") \n")
     }) %>%
     set_names(orig_names)
 
   if(menu) {
     cli_h3("chattr - Available models")
-    cli_text()
-    prep_files %>%
-      as.character() %>%
-      cli_code()
-    cli_text()
-    model_no <- readline("Select the number of the model you would like to use: ")
+    cli_text("Select the number of the model you would like to use: ")
+    model_no <- menu(prep_files)
     model_label <- names(prep_files[as.integer(model_no)])
     model_label
   } else {

tests/testthat/_snaps/ch_context.md

@@ -20,7 +20,7 @@
     Code
       ch_context_data_files(file_types = "R")
     Output
-      [1] "Data files available: \n|- setup.R\n|- test-app_server.R\n|- test-app_ui.R\n|- test-app_utils.R\n|- test-backend-llamagpt.R\n|- test-backend-openai-core.R\n|- test-backend-openai.R\n|- test-ch-defaults-save.R\n|- test-ch-history.R\n|- test-ch-submit.R\n|- test-ch_context.R\n|- test-ch_defaults.R\n|- test-chatter-use.R\n|- test-chattr-test.R\n|- test-chattr.R\n|- test-ide.R"
+      [1] "Data files available: \n|- setup.R\n|- test-app_server.R\n|- test-app_ui.R\n|- test-app_utils.R\n|- test-backend-llamagpt.R\n|- test-backend-openai-core.R\n|- test-backend-openai.R\n|- test-ch-defaults-save.R\n|- test-ch-history.R\n|- test-ch-submit.R\n|- test-ch_context.R\n|- test-ch_defaults.R\n|- test-chattr-test.R\n|- test-chattr-use.R\n|- test-chattr.R\n|- test-ide.R"
 
 ---
 

tests/testthat/_snaps/chattr-use.md

@@ -0,0 +1,21 @@
+# Request submission works
+
+    Code
+      out$davinci
+    Output
+      [1] "OpenAI - Completions - text-davinci-003 (davinci) \n"
+
+---
+
+    Code
+      out$gpt35
+    Output
+      [1] "OpenAI - Chat Completions - gpt-3.5-turbo (gpt35) \n"
+
+---
+
+    Code
+      out$gpt4
+    Output
+      [1] "OpenAI - Chat Completions - gpt-4 (gpt4) \n"
+

tests/testthat/test-backend-openai-core.R

@@ -114,7 +114,7 @@ test_that("OpenAI error check works", {
 
 test_that("Copilot httr2 request works", {
   local_mocked_bindings(
-    openai_token = function(...) "",
+    openai_token = function(...) ""
   )
   expect_snapshot(
     openai_request.ch_openai_github_copilot_chat(

tests/testthat/test-chattr-use.R

@@ -1,4 +1,29 @@
-test_that("Model lists output is as expected", {
-  skip("Will fix as part of the testing upgrades")
-  expect_snapshot(capture.output(ch_get_ymls(menu = FALSE)))
+test_that("Request submission works", {
+  withr::with_envvar(
+    new = c("OPENAI_API_KEY" = "test"),
+    {
+      out <- ch_get_ymls(menu = FALSE)
+      expect_equal(class(out), "list")
+      expect_snapshot(out$davinci)
+      expect_snapshot(out$gpt35)
+      expect_snapshot(out$gpt4)
+    }
+  )
 })
+
+test_that("Menu works", {
+  withr::with_envvar(
+    new = c("OPENAI_API_KEY" = "test"),
+    {
+      local_mocked_bindings(
+        menu = function(...) {
+          return(1)
+        }
+      )
+      expect_true(
+        ch_get_ymls(menu = TRUE) %in% c("copilot", "davinci")
+      )
+    }
+  )
+})
+