Merge pull request #226 from MichelNivard/remove-magrittr

Remove magrittr
MichelNivard · Sep 2, 2024 · cd734a3 · cd734a3
2 parents 048801d + e81bcb4
commit cd734a3
Show file tree

Hide file tree

Showing 139 changed files with 267 additions and 3,332 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Type: Package
 Package: gptstudio
 Title: Use Large Language Models Directly in your Development Environment
-Version: 0.4.0.9004
+Version: 0.4.0.9006
 Authors@R: c(
     person("Michel", "Nivard", , "m.g.nivard@vu.nl", role = c("aut", "cph")),
     person("James", "Wade", , "github@jameshwade.com", role = c("aut", "cre", "cph"),
@@ -19,7 +19,7 @@ URL: https://github.com/MichelNivard/gptstudio,
     https://michelnivard.github.io/gptstudio/
 BugReports: https://github.com/MichelNivard/gptstudio/issues
 Depends:
-    R (>= 4.0)
+    R (>= 4.1)
 Imports: 
     bsicons,
     bslib (>= 0.8.0),
@@ -31,7 +31,6 @@ Imports:
     httr2,
     ids,
     jsonlite,
-    magrittr,
     purrr,
     R6 (>= 2.0),
     rlang,

diff --git a/NAMESPACE b/NAMESPACE
@@ -33,7 +33,6 @@ S3method(list_available_models,huggingface)
 S3method(list_available_models,ollama)
 S3method(list_available_models,openai)
 S3method(list_available_models,perplexity)
-export("%>%")
 export(chat)
 export(create_completion_anthropic)
 export(create_completion_azure_openai)
@@ -68,5 +67,4 @@ importFrom(htmltools,tag)
 importFrom(htmltools,tagList)
 importFrom(htmltools,tags)
 importFrom(jsonlite,fromJSON)
-importFrom(magrittr,"%>%")
 importFrom(shiny,icon)
diff --git a/NEWS.md b/NEWS.md
@@ -11,6 +11,7 @@
 - New styling of chat app. #224
 - Add code syntax highlighting to chat app. #224
 - Replace curl calls with httr2. #224
+- Remove magrittr pipe in favor of base pipe, require R >= 4.1
 
 ## gptstudio 0.4.0
 

diff --git a/R/addin_chatgpt-in-source.R b/R/addin_chatgpt-in-source.R
@@ -40,7 +40,7 @@ gptstudio_chat_in_source <- function(task = NULL, keep_selection = TRUE) {
       history = list(),
       stream  = FALSE,
       model   = model
-    ) %>%
+    ) |>
     gptstudio_request_perform()
 
   text_to_insert <- as.character(response$response)

diff --git a/R/addin_chatgpt.R b/R/addin_chatgpt.R
@@ -105,11 +105,11 @@ open_app_in_viewer <- function(host, port) {
 }
 
 wait_for_bg_app <- function(url, max_seconds = 10) {
-  request(url) %>%
+  request(url) |>
     req_retry(
       max_seconds = max_seconds,
       is_transient = \(resp) resp_status(resp) >= 300,
       backoff = function(n) 0.2
-    ) %>%
+    ) |>
     req_perform()
 }
diff --git a/R/api-transcribe-audio.R b/R/api-transcribe-audio.R
@@ -63,8 +63,8 @@ transcribe_audio <- function(audio_input, api_key = Sys.getenv("OPENAI_API_KEY")
     cli::cli_abort("Failed to convert audio: {system_result}")
   }
 
-  req <- request("https://api.openai.com/v1/audio/transcriptions") %>%
-    req_auth_bearer_token(api_key) %>%
+  req <- request("https://api.openai.com/v1/audio/transcriptions") |>
+    req_auth_bearer_token(api_key) |>
     req_body_multipart(
       file = structure(list(path = temp_wav,
                             type = NULL,

diff --git a/R/api_perform_request.R b/R/api_perform_request.R
@@ -46,8 +46,8 @@ gptstudio_request_perform.gptstudio_request_openai <- function(skeleton, ...,
   )
 
   # Create request
-  request <- request(skeleton$url) %>%
-    req_auth_bearer_token(skeleton$api_key) %>%
+  request <- request(skeleton$url) |>
+    req_auth_bearer_token(skeleton$api_key) |>
     req_body_json(body)
 
   # Perform request
@@ -70,8 +70,8 @@ gptstudio_request_perform.gptstudio_request_openai <- function(skeleton, ...,
 
     response <- stream_handler$value
   } else {
-    response_json <- request %>%
-      req_perform() %>%
+    response_json <- request |>
+      req_perform() |>
       resp_body_json()
 
     response <- response_json$choices[[1]]$message$content
@@ -129,7 +129,7 @@ gptstudio_request_perform.gptstudio_request_anthropic <-
 
     # Anthropic does not have a system message, so convert it to user
     system <-
-      purrr::keep(skeleton$history, function(x) x$role == "system") %>%
+      purrr::keep(skeleton$history, function(x) x$role == "system") |>
       purrr::pluck("content")
     history <-
       purrr::keep(skeleton$history, function(x) x$role %in% c("user", "assistant"))

diff --git a/R/app_chat_style.R b/R/app_chat_style.R
@@ -20,8 +20,8 @@
 #' style_chat_history(chat_history_example)
 #' }
 style_chat_history <- function(history, ide_colors = get_ide_theme_info()) {
-  history %>%
-    purrr::discard(~ .x$role == "system") %>%
+  history |>
+    purrr::discard(~ .x$role == "system") |>
     purrr::map(style_chat_message, ide_colors = ide_colors)
 }
 
@@ -137,22 +137,22 @@ create_ide_matching_colors <- function(role = c("user", "assistant"),
 }
 
 render_docs_message_content <- function(x) {
-  docs_info <- x %>%
-    stringr::str_extract("gptstudio-metadata-docs-start.*gptstudio-metadata-docs-end") %>%
-    stringr::str_remove("gptstudio-metadata-docs-start-") %>%
-    stringr::str_remove("-gptstudio-metadata-docs-end") %>%
+  docs_info <- x |>
+    stringr::str_extract("gptstudio-metadata-docs-start.*gptstudio-metadata-docs-end") |>
+    stringr::str_remove("gptstudio-metadata-docs-start-") |>
+    stringr::str_remove("-gptstudio-metadata-docs-end") |>
     stringr::str_split_1(pattern = "-")
 
   pkg_ref <- docs_info[1]
   topic <- docs_info[2]
 
-  message_content <- x %>%
-    stringr::str_remove("gptstudio-metadata-docs-start.*gptstudio-metadata-docs-end") %>%
+  message_content <- x |>
+    stringr::str_remove("gptstudio-metadata-docs-start.*gptstudio-metadata-docs-end") |>
     shiny::markdown()
 
   message_content <- tags$div(
     "R documentation:",
-    tags$code(glue::glue("{pkg_ref}::{topic}")) %>%
+    tags$code(glue::glue("{pkg_ref}::{topic}")) |>
       bslib::tooltip(message_content)
   )
 }
@@ -219,7 +219,7 @@ chat_history_append <- function(history, role, content, name = NULL) {
     role = role,
     content = content,
     name = name
-  ) %>%
+  ) |>
     purrr::compact()
 
   c(history, list(new_message))

diff --git a/R/chat.R b/R/chat.R
@@ -93,17 +93,17 @@ chat <- function(prompt,
       stream = stream,
       model = model,
       ...
-    ) %>%
+    ) |>
     gptstudio_skeleton_build(
       skill = skill,
       style = style,
       task = task,
       custom_prompt = custom_prompt
-    ) %>%
+    ) |>
     gptstudio_request_perform(shiny_session = session)
 
   if (process_response) {
-    response %>% gptstudio_response_process()
+    response |> gptstudio_response_process()
   } else {
     response$response
   }

diff --git a/R/gptstudio-sitrep.R b/R/gptstudio-sitrep.R
@@ -13,8 +13,8 @@ check_api_connection_openai <- function(service, api_key) {
   }
 
   response <-
-    request_base(task = "models") %>%
-    req_error(is_error = function(resp) FALSE) %>%
+    request_base(task = "models") |>
+    req_error(is_error = function(resp) FALSE) |>
     req_perform()
   process_response(response, service)
 }
@@ -25,8 +25,8 @@ check_api_connection_huggingface <- function(service, api_key) {
   if (rlang::is_false(api_check)) {
     return(invisible(NULL))
   }
-  response <- request_base_huggingface(task = "gpt2") %>%
-    req_error(is_error = function(resp) FALSE) %>%
+  response <- request_base_huggingface(task = "gpt2") |>
+    req_error(is_error = function(resp) FALSE) |>
     req_perform()
 
   process_response(response, service)
@@ -40,15 +40,15 @@ check_api_connection_anthropic <- function(service, api_key) {
   }
 
   response <-
-    request_base_anthropic(key = Sys.getenv("ANTHROPIC_API_KEY")) %>%
+    request_base_anthropic(key = Sys.getenv("ANTHROPIC_API_KEY")) |>
     req_body_json(
       data = list(
         prompt = "\n\nHuman: Hello, Claude\n\nAssistant:",
         model = "claude-2.1",
         max_tokens_to_sample = 1024
       )
-    ) %>%
-    req_error(is_error = function(resp) FALSE) %>%
+    ) |>
+    req_error(is_error = function(resp) FALSE) |>
     req_perform()
 
   process_response(response, service)
@@ -64,9 +64,9 @@ check_api_connection_google <- function(service, api_key) {
   request_body <-
     list(contents = list(list(parts = list(list(text = "Hello there")))))
 
-  response <- request_base_google(model = "gemini-pro", key = api_key) %>%
-    req_body_json(data = request_body) %>%
-    req_error(is_error = function(resp) FALSE) %>%
+  response <- request_base_google(model = "gemini-pro", key = api_key) |>
+    req_body_json(data = request_body) |>
+    req_error(is_error = function(resp) FALSE) |>
     req_perform()
 
   process_response(response, service)
@@ -80,12 +80,12 @@ check_api_connection_azure_openai <- function(service, api_key) {
     return(invisible(NULL))
   }
 
-  response <- request_base_azure_openai() %>%
+  response <- request_base_azure_openai() |>
     req_body_json(list(messages = list(list(
       role = "user",
       content = "Hello world!"
-    )))) %>%
-    req_error(is_error = function(resp) FALSE) %>%
+    )))) |>
+    req_error(is_error = function(resp) FALSE) |>
     req_perform()
 
   process_response(response, service)
@@ -98,12 +98,12 @@ check_api_connection_perplexity <- function(service, api_key) {
     return(invisible(NULL))
   }
 
-  response <- request_base_perplexity() %>%
+  response <- request_base_perplexity() |>
     req_body_json(data = list(
       model = "sonar-small-chat",
       messages = list(list(role = "user", content = "Hello world!"))
-    )) %>%
-    req_error(is_error = function(resp) FALSE) %>%
+    )) |>
+    req_error(is_error = function(resp) FALSE) |>
     req_perform()
 
   process_response(response, service)
@@ -116,9 +116,9 @@ check_api_connection_cohere <- function(service, api_key) {
     return(invisible(NULL))
   }
 
-  response <- request_base_cohere(api_key = api_key) %>%
-    req_body_json(data = list(message = "Hello world!")) %>%
-    req_error(is_error = function(resp) FALSE) %>%
+  response <- request_base_cohere(api_key = api_key) |>
+    req_body_json(data = list(message = "Hello world!")) |>
+    req_error(is_error = function(resp) FALSE) |>
     req_perform()
 
   process_response(response, service)

diff --git a/R/mod_app.R b/R/mod_app.R
@@ -72,7 +72,7 @@ rgb_str_to_hex <- function(rgb_string) {
     blue = as.numeric(rgb_vec[3]),
     names = FALSE,
     maxColorValue = 255
-  ) %>%
+  ) |>
     unname()
 }
 

diff --git a/R/mod_chat.R b/R/mod_chat.R
@@ -81,10 +81,10 @@ mod_chat_server <- function(
     # UI outputs ----
     output$welcome <- renderWelcomeMessage({
       welcomeMessage(ide_colors)
-    }) %>% bindEvent(rv$reset_welcome_message)
+    }) |> bindEvent(rv$reset_welcome_message)
 
     output$history <- renderUI({
-      rendered_history <- history$chat_history %>% style_chat_history(ide_colors = ide_colors)
+      rendered_history <- history$chat_history |> style_chat_history(ide_colors = ide_colors)
       tagList(
         tags$div(rendered_history),
         tags$script("hljs.highlightAll();")
@@ -93,7 +93,7 @@ mod_chat_server <- function(
 
     output$streaming <- renderStreamingMessage({
       streamingMessage(ide_colors)
-    }) %>% bindEvent(rv$reset_streaming_message)
+    }) |> bindEvent(rv$reset_streaming_message)
 
     # Observers ----
     observeEvent(history$create_new_chat, {
@@ -124,7 +124,7 @@ mod_chat_server <- function(
           session = session
         )
       })
-    }) %>% bslib::bind_task_button("chat")
+    }) |> bslib::bind_task_button("chat")
 
     observeEvent(input$chat, {
       process_chat$invoke(
@@ -209,7 +209,7 @@ mod_chat_server <- function(
               label = bsicons::bs_icon("send"),
               label_busy = NULL,
               class = "btn-secondary p-2 chat-send-btn"
-            ) %>% bslib::tooltip("Send (click or Enter)")
+            ) |> bslib::tooltip("Send (click or Enter)")
           ),
           audio_recorder
         )