Merge pull request #149 from mlverse/upkeep-2025-11

Upkeep 2025 11

Author: edgararuiz

.Rbuildignore

@@ -13,3 +13,5 @@
 ^CRAN-SUBMISSION$
 ^doc$
 ^Meta$
+^[.]?air[.]toml$
+^\.vscode$

.github/CODE_OF_CONDUCT.md

@@ -0,0 +1,126 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, caste, color, religion, or sexual
+identity and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the overall
+  community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or advances of
+  any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email address,
+  without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at codeofconduct@posit.co. 
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series of
+actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or permanent
+ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior, harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within the
+community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.1, available at
+<https://www.contributor-covenant.org/version/2/1/code_of_conduct.html>.
+
+Community Impact Guidelines were inspired by
+[Mozilla's code of conduct enforcement ladder][https://github.com/mozilla/inclusion].
+
+For answers to common questions about this code of conduct, see the FAQ at
+<https://www.contributor-covenant.org/faq>. Translations are available at <https://www.contributor-covenant.org/translations>.
+
+[homepage]: https://www.contributor-covenant.org

.vscode/extensions.json

@@ -0,0 +1,5 @@
+{
+    "recommendations": [
+        "Posit.air-vscode"
+    ]
+}

.vscode/settings.json

@@ -0,0 +1,10 @@
+{
+    "[r]": {
+        "editor.formatOnSave": true,
+        "editor.defaultFormatter": "Posit.air-vscode"
+    },
+    "[quarto]": {
+        "editor.formatOnSave": true,
+        "editor.defaultFormatter": "quarto.quarto"
+    }
+}

DESCRIPTION

@@ -2,46 +2,49 @@ Package: chattr
 Title: Interact with Large Language Models in 'RStudio'
 Version: 0.3.1
 Authors@R: c(
-  person("Edgar", "Ruiz", , "edgar@posit.co", role = c("aut", "cre")),
-  person(given = "Posit Software, PBC", role = c("cph", "fnd"))
+    person("Edgar", "Ruiz", , "edgar@posit.co", role = c("aut", "cre")),
+    person("Posit Software, PBC", role = c("cph", "fnd"),
+           comment = c(ROR = "03wc8by49"))
   )
-Description: Enables user interactivity with large-language models ('LLM') inside
-    the 'RStudio' integrated development environment (IDE). The user can
-    interact with the model using the 'shiny' app included in this package, or
-    directly in the 'R' console. It comes with back-ends for 'OpenAI', 'GitHub'
-    'Copilot', and 'LlamaGPT'. 
-URL: https://github.com/mlverse/chattr,
-    https://mlverse.github.io/chattr/
-BugReports: https://github.com/mlverse/chattr/issues
+Description: Enables user interactivity with large-language models ('LLM')
+    inside the 'RStudio' integrated development environment (IDE). The
+    user can interact with the model using the 'shiny' app included in
+    this package, or directly in the 'R' console. It comes with back-ends
+    for 'OpenAI', 'GitHub' 'Copilot', and 'LlamaGPT'.
 License: MIT + file LICENSE
-Encoding: UTF-8
-Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.3.2
+URL: https://github.com/mlverse/chattr, https://mlverse.github.io/chattr/
+BugReports: https://github.com/mlverse/chattr/issues
+Depends: 
+    R (>= 4.1)
 Imports: 
-    rstudioapi,
-    lifecycle,
-    processx,
+    bslib,
+    cli,
+    clipr,
     config,
+    coro,
     ellmer (>= 0.3.0),
+    fs,
+    glue,
+    httr2 (>= 1.1.0),
+    lifecycle,
+    processx,
     purrr,
     rlang,
-    bslib,
+    rstudioapi,
     shiny,
-    clipr,
-    httr2 (>= 1.1.0),    
-    yaml,
-    glue,
-    coro,
-    cli,
-    fs    
-Depends: 
-    R (>= 2.10)
+    yaml
 Suggests: 
     covr,
     knitr,
+    withr,
     rmarkdown,
-    testthat (>= 3.0.0),
-    shinytest2, 
-    withr
+    shinytest2,
+    testthat (>= 3.0.0)
+VignetteBuilder: 
+    knitr
+Config/Needs/website: tidyverse/tidytemplate
 Config/testthat/edition: 3
-VignetteBuilder: knitr
+Config/usethis/last-upkeep: 2025-11-11
+Encoding: UTF-8
+Roxygen: list(markdown = TRUE)
+RoxygenNote: 7.3.3

NAMESPACE

@@ -24,11 +24,13 @@ import(fs)
 import(glue)
 import(httr2)
 import(processx)
+import(rlang)
 import(rstudioapi)
 import(shiny)
 import(yaml)
 importFrom(bslib,bs_theme)
 importFrom(clipr,write_clip)
+importFrom(glue,glue)
 importFrom(grDevices,rgb)
 importFrom(lifecycle,deprecated)
 importFrom(purrr,discard)

R/app-server.R

@@ -131,7 +131,7 @@ app_add_assistant <- function(content, input) {
 
   walk(
     order(seq_along(ch), decreasing = TRUE),
-    ~ {
+    \(.x) {
       len <- len_hist + .x
       content <- ch[[.x]]$content
       prep_content <- prep_entry(content, !ui_current_markdown())
@@ -140,8 +140,10 @@ app_add_assistant <- function(content, input) {
       insertUI(
         selector = "#tabs",
         where = "afterEnd",
-        ui = app_ui_entry(content, is_code, len) %>%
-          tagAppendAttributes(style = "width: 100%;")
+        ui = tagAppendAttributes(
+          app_ui_entry(content, is_code, len),
+          style = "width: 100%;"
+        )
       )
       if (is_code) {
         observeEvent(input[[paste0("copy", len)]], {
@@ -162,7 +164,7 @@ app_add_assistant <- function(content, input) {
 
   ch_env$content_hist <- c(
     ch_env$content_hist,
-    map_chr(ch, ~ .x$content)
+    map_chr(ch, \(.x) .x$content)
   )
 }
 
@@ -181,7 +183,7 @@ prep_entry <- function(x, remove) {
 app_split_content <- function(content) {
   split_content <- unlist(strsplit(content, "```"))
   map(
-    seq_along(split_content), ~ {
+    seq_along(split_content), \(.x) {
       is_code <- (.x / 2) == floor(.x / 2)
       content <- split_content[.x]
       code <- NULL

R/app-ui.R

@@ -60,7 +60,7 @@ app_ui <- function() {
             width = "100%",
             resize = "none"
           )
-        ) %>%
+        ) |>
           tagAppendAttributes(style = "width: 85%;"),
         column(
           width = 1,
@@ -80,7 +80,7 @@ app_ui <- function() {
             uiOutput("provider"),
             style = paste0("font-size:9px; color:", style$color_bk, ";")
           )
-        ) %>%
+        ) |>
           tagAppendAttributes(style = "width: 15%;"),
       ),
       style = style$ui_panel
@@ -102,8 +102,8 @@ app_ui_modal <- function() {
 
   tc <- chattr_defaults(type = "chat")
 
-  prompt2 <- tc$prompt %>%
-    process_prompt() %>%
+  prompt2 <- tc$prompt |>
+    process_prompt() |>
     paste(collapse = "\n")
 
   modalDialog(
@@ -135,8 +135,7 @@ app_ui_entry <- function(content, is_code, no_id) {
       width = 12,
       fluidRow(
         align = "right",
-        column(width = 10, div()) %>%
-          tagAppendAttributes(style = "width: 80%;"),
+        tagAppendAttributes(column(width = 10, div()), style = "width: 80%;"),
         column(
           width = 2,
           if (is_code) {
@@ -149,7 +148,7 @@ app_ui_entry <- function(content, is_code, no_id) {
             app_ui_button("New script", "new", "plus", no_id)
           },
           style = "padding: 0px"
-        ) %>%
+        ) |>
           tagAppendAttributes(style = "width: 20%;")
       ),
       fluidRow(

R/backend-ellmer.R

@@ -1,12 +1,13 @@
 #' @export
 ch_submit.ch_ellmer <- function(
-    defaults,
-    prompt = NULL,
-    stream = TRUE,
-    prompt_build = TRUE,
-    preview = FALSE,
-    shiny = FALSE,
-    ...) {
+  defaults,
+  prompt = NULL,
+  stream = TRUE,
+  prompt_build = TRUE,
+  preview = FALSE,
+  shiny = FALSE,
+  ...
+) {
   if (preview) {
     return(prompt)
   }
@@ -80,7 +81,7 @@ ch_ellmer_history <- function(x) {
   ) {
     new_history <- map(
       x,
-      ~ {
+      \(.x) {
         ellmer::Turn(
           role = .x$role,
           contents = list(ellmer::ContentText(.x$content)),

R/backend-ollama.R

@@ -3,11 +3,13 @@ ch_ollama_check <- function() {
     "http://localhost:11434",
     "http://127.0.0.1:11434"
   )
-  check_urls <- urls %>%
-    map(~ request(.x) %>%
-      req_perform() %>%
-      try(silent = TRUE)) %>%
-    map_lgl(~ {
+  check_urls <- urls |>
+    map(\(.x){
+      request(.x) |>
+        req_perform() |>
+        try(silent = TRUE)
+    }) |>
+    map_lgl(\(.x) {
       if (inherits(.x, "httr2_response")) {
         if (.x$status_code == 200) {
           TRUE