Upload 2 files

Dockerfile

@@ -27,13 +27,17 @@ ENV OLLAMA_MODELS=/app/.ollama \
     DEPTH_EMBED_MODEL=${EMBED_MODEL} \
     DEPTH_RAG_PARQUET=/app/rag_chunks.parquet
 
-# R packages. Adds ellmer (chat + tool calling), shinychat (streaming chat UI)
-# and arrow (read the embeddings Parquet) on top of the map's deps.
+# R packages. The base image pins a dated CRAN snapshot whose ellmer/shinychat
+# are too old -- that ellmer lacked the `params` argument, so the assistant failed
+# with "unused argument (params = ...)". Install the stable map deps from the
+# snapshot, but pull ellmer + shinychat from the latest CRAN so their chat/tool
+# API matches the app code. The version banner lands in the build log.
 RUN install2.r --error --skipinstalled --ncpus 4 \
       shiny bslib DBI duckdb dplyr jsonlite htmltools glue writexl ggplot2 stringr httr2 \
-      ellmer shinychat arrow \
+      arrow \
  && R -e "install.packages('mapgl', repos = c('https://walkerke.r-universe.dev', 'https://cloud.r-project.org'))" \
- && R -e "library(mapgl); library(duckdb); library(sf); library(shiny); library(httr2); library(ellmer); library(shinychat)"
+ && R -e "install.packages(c('ellmer', 'shinychat'), repos = 'https://cloud.r-project.org')" \
+ && R -e "library(mapgl); library(duckdb); library(sf); library(shiny); library(httr2); library(ellmer); library(shinychat); cat('[build] ellmer', as.character(packageVersion('ellmer')), '| shinychat', as.character(packageVersion('shinychat')), '\n')"
 
 # Ollama runtime.
 RUN curl -fsSL https://ollama.com/install.sh | sh

assistant.R

@@ -290,13 +290,18 @@ assistant_top_municipalities <- function(con, state, indicator, n = 5) {
 # NULL if construction fails (e.g. Ollama dropped). Tools close over `con` and
 # the live `state` snapshot env.
 make_assistant <- function(con, state, cfg = assistant_config()) {
+  chat_args <- list(
+    model         = cfg$chat_model,
+    base_url      = cfg$host,
+    system_prompt = assistant_system_prompt(assistant_indicator_catalog_txt())
+  )
+  # `params` was added in newer ellmer; older versions error with
+  # "unused argument (params = ...)". Only pass it when supported.
+  if ("params" %in% names(formals(ellmer::chat_ollama))) {
+    chat_args$params <- ellmer::params(temperature = 0.2)
+  }
   chat <- tryCatch(
-    ellmer::chat_ollama(
-      model         = cfg$chat_model,
-      base_url      = cfg$host,
-      system_prompt = assistant_system_prompt(assistant_indicator_catalog_txt()),
-      params        = ellmer::params(temperature = 0.2)
-    ),
+    do.call(ellmer::chat_ollama, chat_args),
     error = function(e) { message("[assist] chat_ollama: ", conditionMessage(e)); NULL }
   )
   if (is.null(chat)) return(NULL)