change base image to inwt/r-shiny:4.3.2 (#10)

* change base image to inwt/r-shiny:4.3.2
* fix RCMD Check - add || to namespace
* fix RCMD Check - add rlang to DESCRIPTION
* test only shorter error message
* fix test

---------

Co-authored-by: Antonia Runge <antonia.runge@inwt-statistics.de>

Author: jan-abel-inwt

DESCRIPTION

@@ -17,6 +17,7 @@ Imports:
     data.table,
     futile.logger,
     httr2,
+    rlang,
     shiny,
     shinyAce,
     shinyjs,
@@ -29,6 +30,6 @@ Suggests:
     rmarkdown
 Remotes:
     ollamar=hauselin/ollama-r@v1.2.2
-RoxygenNote: 7.3.1
+RoxygenNote: 7.3.2
 VignetteBuilder: knitr
 URL: https://pandora-isomemo.github.io/llmModule/

Dockerfile

@@ -1,4 +1,6 @@
-FROM ghcr.io/pandora-isomemo/base-image:latest
+FROM inwt/r-shiny:4.3.2
+
+RUN echo "options(repos = c(getOption('repos'), PANDORA = 'https://Pandora-IsoMemo.github.io/drat/'))" >> /usr/local/lib/R/etc/Rprofile.site
 
 ADD . .
 

NAMESPACE

@@ -36,6 +36,7 @@ importFrom(httr2,req_perform)
 importFrom(httr2,req_timeout)
 importFrom(httr2,request)
 importFrom(httr2,resp_body_json)
+importFrom(rlang,"%||%")
 importFrom(shinyAce,aceEditor)
 importFrom(shinyAce,updateAceEditor)
 importFrom(shinyTools,shinyTryCatch)

R/00-Namespace.R

@@ -2,6 +2,7 @@
 #'
 #' @importFrom data.table data.table rbindlist
 #' @importFrom httr2 req_body_json req_headers req_perform req_timeout request resp_body_json
+#' @importFrom rlang %||%
 #' @importFrom shinyAce aceEditor updateAceEditor
 #' @importFrom shinyjs disable enable
 #' @importFrom shinyTools shinyTryCatch

tests/testthat/test-llm_api_server.R

@@ -19,7 +19,8 @@ testthat::test_that("Test llm_api_server with too short OpenAI key", {
                           row.names = c(NA, -1L)
                         )
                       )
-                      testthat::expect_equal(api(), structure(list(), error = "API key appears too short."))
+                      testthat::expect_length(api(), 0)
+                      testthat::expect_equal(attr(api(), "error"), "API key appears too short.")
                     })
 })
 
@@ -28,7 +29,7 @@ testthat::test_that("Test llm_api_server with OpenAI key", {
                     args = list(no_internet = NULL, exclude_pattern = ""),
                     {
                       # Arrange
-                      print("test llm_api_server: OpenAI provider with valid key file")
+                      print("test llm_api_server: OpenAI provider with invalid key file")
 
                       # Act
                       session$setInputs(
@@ -45,9 +46,10 @@ testthat::test_that("Test llm_api_server with OpenAI key", {
                         )
                       )
 
+                      testthat::expect_length(api(), 0)
                       testthat::expect_equal(
-                        api(),
-                        structure(list(), error = "API request failed: Unauthorized: API key is invalid or expired.\n• OAuth error\n• realm: OpenAI API")
+                        substr(attr(api(), "error"), 1, 64),
+                        "API request failed: Unauthorized: API key is invalid or expired."
                       )
                     })
 })