Create helper for getting key & checking for existance (#34)

Mostly prospective change to better support incoming gemini and claude wrappers.

R/api-openai.R

@@ -77,14 +77,6 @@ openai_result_message <- function(result, streaming) {
   }
 }
 
-openai_key <- function() {
-  key <- Sys.getenv("OPENAI_API_KEY")
-  if (identical(key, "")) {
-    cli::cli_abort("Can't find env var {.code OPENAI_API_KEY}.")
-  }
-  key
-}
-
 # https://platform.openai.com/docs/api-reference/chat/create
 openai_chat_req <- function(messages,
                             tools = list(),
@@ -127,17 +119,9 @@ openai_request <- function(base_url = "https://api.openai.com/v1",
 }
 
 openai_key_exists <- function() {
-  !identical(Sys.getenv("OPENAI_API_KEY"), "")
+  key_exists("OPENAI_API_KEY")
 }
 
 openai_key <- function() {
-  if (openai_key_exists()) {
-    Sys.getenv("OPENAI_API_KEY")
-  } else {
-    if (is_testing()) {
-      testthat::skip("OPENAI_API_KEY env var is not configured")
-    } else {
-      cli::cli_abort("Can't find env var {.code OPENAI_API_KEY}.")
-    }
-  }
+  key_get("OPENAI_API_KEY")
 }

R/utils.R

@@ -1,3 +1,20 @@
 is_testing <- function() {
   identical(Sys.getenv("TESTTHAT"), "true")
 }
+
+key_get <- function(name, error_call = caller_env()) {
+  val <- Sys.getenv(name)
+  if (!identical(val, "")) {
+    val
+  } else {
+    if (is_testing()) {
+      testthat::skip(sprintf("%s env var is not configured", name))
+    } else {
+      cli::cli_abort("Can't find env var {.code {name}}.", call = error_call)
+    }
+  }
+}
+
+key_exists <- function(name) {
+  !identical(Sys.getenv(name), "")
+}

tests/testthat/_snaps/utils.md

@@ -0,0 +1,8 @@
+# informative error if no key
+
+    Code
+      key_get("FOO")
+    Condition
+      Error:
+      ! Can't find env var `FOO`.
+

tests/testthat/test-api-openai.R

@@ -1,8 +1,3 @@
-test_that("informative error if no key", {
-  withr::local_envvar(OPENAI_API_KEY = NULL, TESTTHAT = "false")
-  expect_snapshot(openai_key(), error = TRUE)
-})
-
 test_that("system prompt is applied correctly", {
   sys_prompt <- "foo"
   sys_msg <- list(role = "system", content = sys_prompt)

tests/testthat/test-utils.R

@@ -0,0 +1,12 @@
+test_that("finds key if set", {
+  withr::local_envvar(FOO = "abc123")
+  expect_true(key_exists("FOO"))
+  expect_equal(key_get("FOO"), "abc123")
+})
+
+
+test_that("informative error if no key", {
+  withr::local_envvar(FOO = NULL, TESTTHAT = "false")
+  expect_false(key_exists("FOO"))
+  expect_snapshot(key_get("FOO"), error = TRUE)
+})