Merge pull request #45 from mlverse/updates

Fixes #43

Author: edgararuiz

.gitignore

@@ -1,56 +1,39 @@
 # History files
 .Rhistory
 .Rapp.history
-
 # Session Data files
 .RData
 .RDataTmp
-
 # User-specific files
 .Ruserdata
-
 # Example code in package build process
 *-Ex.R
-
 # Output files from R CMD build
 /*.tar.gz
-
 # Output files from R CMD check
 /*.Rcheck/
-
 # RStudio files
 .Rproj.user/
-
 # produced vignettes
 vignettes/*.html
 vignettes/*.pdf
-
 # OAuth2 token, see https://github.com/hadley/httr/releases/tag/v0.3
 .httr-oauth
-
 # knitr and R markdown default cache directories
 *_cache/
 /cache/
-
 # Temporary files created by R markdown
 *.utf8.md
 *.knit.md
-
 # R Environment Variables
 .Renviron
-
-
 # translation temp files
 po/*~
-
 rsconnect/
-
 /.quarto/
-
 docs/
-
 python/mall/src/
 python/assets/style.css
-
 python/README_files
 python/README.html
+mall.Rproj

r/DESCRIPTION

@@ -1,7 +1,7 @@
 Package: mall
 Title: Run Multiple Large Language Model Predictions Against a Table, or 
     Vectors
-Version: 0.1.9000
+Version: 0.1.9001
 Authors@R: c(
   person("Edgar", "Ruiz", , "edgar@posit.co", role = c("aut", "cre")),
   person(given = "Posit Software, PBC", role = c("cph", "fnd"))

r/NEWS.md

@@ -1,7 +1,7 @@
 # mall (dev)
 
-* Adds new LLM Simulate mode for testing. With "text", you can pass a custom
-return message by using the `text` argument.
+* Returns a warning when there are over 4,096 tokens in one or many records
+sent to Ollama (#43)
 
 # mall 0.1.0
 

r/R/m-backend-submit.R

@@ -23,11 +23,25 @@ m_backend_submit.mall_ollama <- function(backend, x, prompt, preview = FALSE) {
   } else {
     map_here <- map_chr
   }
-  map_here(
+  warnings <- NULL
+  out <- map_here(
     x,
     \(x) {
       .args <- c(
-        messages = list(map(prompt, \(i) map(i, \(j) glue(j, x = x)))),
+        messages = list(
+          map(prompt, \(i)
+          map(i, \(j) {
+            out <- glue(j, x = x)
+            ln <- length(unlist(strsplit(out, " ")))
+            if (ln > warn_tokens()) {
+              warnings <<- c(
+                warnings,
+                list(list(row = substr(x, 1, 20), len = ln))
+              )
+            }
+            out
+          }))
+        ),
         output = "text",
         m_defaults_args(backend)
       )
@@ -46,6 +60,27 @@ m_backend_submit.mall_ollama <- function(backend, x, prompt, preview = FALSE) {
       res
     }
   )
+  if (!is.null(warnings)) {
+    warn_len <- length(warnings)
+    cli_alert_warning(c(
+      "{warn_len} record{?s} may be over {warn_tokens()} tokens\n",
+      "Ollama may have truncated what was sent to the model \n",
+      "(https://github.com/ollama/ollama/issues/7043)"
+    ))
+    limit <- 10
+    limit <- ifelse(limit > warn_len, warn_len, limit)
+    warn_text <- map(warnings[1:limit], \(x) paste0(x[["row"]], "..."))
+    cli_bullets(set_names(warn_text, "*"))
+    if (warn_len > limit) {
+      cli_inform(c("i" = "{warn_len - limit} more record{?s}"))
+    }
+  }
+  out
+}
+
+# Using a function so that it can be mocked in testing
+warn_tokens <- function() {
+  4096
 }
 
 #' @export
@@ -61,8 +96,6 @@ m_backend_submit.mall_simulate_llm <- function(backend,
     out <- x
   } else if (args$model == "prompt") {
     out <- prompt
-  } else if (args$model == "text") {
-    out <- args$text
   }
   res <- NULL
   if (m_cache_use()) {

r/codecov.yml

@@ -0,0 +1,12 @@
+# Ollama code is covered
+
+    Code
+      llm_vec_sentiment("I am happy")
+    Message
+      ! 1 record may be over 10 tokens
+      Ollama may have truncated what was sent to the model 
+      (https://github.com/ollama/ollama/issues/7043)
+      * I am happy...
+    Output
+      [1] "positive"
+

r/tests/testthat/_snaps/m-backend-submit.md

@@ -27,7 +27,7 @@ skip_if_no_ollama <- function() {
       seed = 100,
       .silent = TRUE,
       .force = TRUE,
-      .cache = .mall_test$cache_ollama 
+      .cache = .mall_test$cache_ollama
     )
   }
 }

r/tests/testthat/helper-ollama.R

@@ -9,6 +9,17 @@ test_that("Ollama code is covered", {
   )
 })
 
+test_that("Ollama code is covered", {
+  local_mocked_bindings(
+    warn_tokens = function() 10,
+    chat = function(...) "positive"
+  )
+  llm_use("ollama", "llama3.2", .silent = TRUE, .force = TRUE)
+  expect_snapshot(
+    llm_vec_sentiment("I am happy")
+  )
+})
+
 test_that("No cache is saved if turned off", {
   llm_use("simulate_llm", "echo", .silent = TRUE, .force = TRUE, .cache = "")
   expect_equal(

r/tests/testthat/test-m-backend-submit.R

@@ -1,8 +1,8 @@
 test_that("Ollama cache exists and delete", {
   skip_if_no_ollama()
-  expect_equal(
-    length(fs::dir_ls(.mall_test$cache_ollama , recurse = TRUE)),
-    59
+  expect_gt(
+    length(fs::dir_ls(.mall_test$cache_ollama, recurse = TRUE)),
+    30
   )
-  fs::dir_delete(.mall_test$cache_ollama )
+  fs::dir_delete(.mall_test$cache_ollama)
 })