Merge pull request #131 from dsweber2/apiKeys

removing the temporary API key fixes

Author: dsweber2

R/epidatacall.R

@@ -184,22 +184,6 @@ fetch_classic <- function(epidata_call, fields = NULL, disable_data_frame_parsin
   response <- request_impl(epidata_call, "classic", fields)
   response_content <- httr::content(response, as = "text", encoding = "UTF-8")
 
-  # TODO Temporary workaround the first row of the response being a comment
-  # Remove on 2023-06-21
-  if (grepl("This request exceeded", response_content) && !epidata_call$only_supports_classic) {
-    response_content <- jsonlite::fromJSON(response_content, simplifyDataFrame = FALSE)
-    message <- response_content$epidata[[1L]]
-    cli::cli_abort(c(
-      "epidata warning, promoted to error: {message}",
-      "i" = "Either:",
-      "*" = "set the environment variable DELPHI_EPIDATA_KEY, or",
-      "*" = 'set the option "delphi.epidata.key":',
-      " " = '{.code options(delphi.epidata.key = "YOUR_KEY_OR_TEMP_KEY")}',
-      "To save your key for later sessions (and hide it from your code), you can edit your .Renviron file with:",
-      "*" = "usethis::edit_r_environ()"
-    ))
-  }
-
   response_content <- jsonlite::fromJSON(response_content, simplifyDataFrame = !disable_data_frame_parsing)
 
   # success is 1, no results is -2, truncated is 2, -1 is generic error

tests/testthat/test-epidatacall.R

@@ -81,21 +81,20 @@ test_that("fetch_tbl warns on non-success", {
     .package = "httr"
   )
   # TODO: Turn these tests back on, when the API is fully online
-  # Remove on 2023-06-21
-  # artificial_warning <- "* This is a warning with a leading asterisk and {braces} to make sure we don't have bulleting/glue bugs."
-  # debug_triplet <- readRDS(testthat::test_path("data/test-classic.rds")) %>%
-  #   jsonlite::fromJSON() %>%
-  #   `[[<-`("message", artificial_warning)
-  # local_mocked_bindings(
-  #   # see generation code above
-  #   fromJSON = function(...) debug_triplet,
-  #   .package = "jsonlite"
-  # )
+  artificial_warning <- "* This is a warning with a leading asterisk and {braces} to make sure we don't have bulleting/glue bugs."
+  debug_triplet <- readRDS(testthat::test_path("data/test-classic.rds")) %>%
+    jsonlite::fromJSON() %>%
+    `[[<-`("message", artificial_warning)
+  local_mocked_bindings(
+    # see generation code above
+    fromJSON = function(...) debug_triplet,
+    .package = "jsonlite"
+  )
 
-  # expect_warning(epidata_call %>% fetch_tbl(),
-  #   regexp = paste0("epidata warning: ", artificial_warning),
-  #   fixed = TRUE
-  # )
+  expect_warning(epidata_call %>% fetch_tbl(),
+    regexp = paste0("epidata warning: ", artificial_warning),
+    fixed = TRUE
+  )
 })
 
 test_that("classic only fetch", {

vignettes/endpoints.Rmd

@@ -141,7 +141,7 @@ Example call:
 
 ```{r}
 del <- delphi(system = "ec", epiweek = 201501) %>% fetch()
-names(del[[1L]]$forecast)
+names(del$forecast)
 ```
 
 ### FluSurv hospitalization data