Test list models

R/ollama.R

@@ -405,7 +405,7 @@ delete <- function(name, endpoint = "/api/delete", host = NULL) {
 #'
 #' See https://ollama.com/library for a list of available models. Use the list_models() function to get the list of models already downloaded/installed on your machine.
 #'
-#' @param model A character string of the model name to download/pull, such as "llama3".
+#' @param name A character string of the model name to download/pull, such as "llama3".
 #' @param stream Enable response streaming. Default is TRUE.
 #' @param insecure Allow insecure connections Only use this if you are pulling from your own library during development. Default is FALSE.
 #' @param endpoint The endpoint to pull the model. Default is "/api/pull".
@@ -420,12 +420,12 @@ delete <- function(name, endpoint = "/api/delete", host = NULL) {
 #' @examplesIf test_connection()$status_code == 200
 #' pull("llama3")
 #' pull("all-minilm", stream = FALSE)
-pull <- function(model, stream = TRUE, insecure = FALSE, endpoint = "/api/pull", host = NULL) {
+pull <- function(name, stream = TRUE, insecure = FALSE, endpoint = "/api/pull", host = NULL) {
     req <- create_request(endpoint, host)
     req <- httr2::req_method(req, "POST")
 
-    body_json <- list(model = model, stream = stream, insecure = insecure)
-    req <- httr2::req_body_json(req, body_json)
+    body_json <- list(name = name, stream = stream, insecure = insecure)
+    req <- httr2::req_body_json(req, body_json, stream = stream)
 
     if (!stream) {
         tryCatch(
@@ -446,6 +446,7 @@ pull <- function(model, stream = TRUE, insecure = FALSE, endpoint = "/api/pull",
     env$accumulated_data <- raw()
     wrapped_handler <- function(x) stream_handler(x, env, endpoint)
     resp <- httr2::req_perform_stream(req, wrapped_handler, buffer_kb = 1)
+    resp$body <- env$accumulated_data
     return(resp)
 }
 

R/utils.R

@@ -86,18 +86,26 @@ stream_handler <- function(x, env, endpoint) {
 #' resp_process(resp, "resp") # return input response object
 #' resp_process(resp, "text") # return text/character vector
 resp_process <- function(resp, output = c("df", "jsonlist", "raw", "resp", "text")) {
+
     if (is.null(resp) || resp$status_code != 200) {
         warning("Cannot process response")
         return(NULL)
     }
 
+    endpoints_to_skip <- c("api/pull")
+    for (endpoint in endpoints_to_skip) {
+        if (grepl(endpoint, resp$url)) {
+            return(resp)
+        }
+    }
+
     output <- output[1]
     if (output == "resp") {
         return(resp)
     }
 
-    # endpoints that do not stream
-    endpoints_without_stream <- c("api/tags", "api/delete", "api/show")
+    # endpoints that should never be processed with resp_process_stream
+    endpoints_without_stream <- c("api/tags", "api/delete", "api/show", "api/pull")
 
     # process stream resp separately
     stream <- FALSE

README.Rmd

@@ -37,7 +37,7 @@ See [Ollama's Github page](https://github.com/ollama/ollama) for more informatio
 install.packages("ollamar")
 ```
 
-4. ALternatively, for the **latest/development** version with more/latest features, you can install it like so:
+4. Alternatively, for the **latest/development** version with more/latest features, you can install it like so:
 
 ``` r
 devtools::install_github("hauselin/ollamar")

README.md

@@ -38,7 +38,7 @@ use this library.
 install.packages("ollamar")
 ```
 
-4.  ALternatively, for the **latest/development** version with
+4.  Alternatively, for the **latest/development** version with
     more/latest features, you can install it like so:
 
 ``` r

tests/testthat/test-pull.R

@@ -0,0 +1,19 @@
+library(testthat)
+library(ollamar)
+
+test_that("pull function works", {
+    skip_if_not(test_connection()$status_code == 200, "Ollama server not available")
+
+    # wrong model
+    result <- pull('WRONGMODEL')
+    expect_s3_class(result, "httr2_response")
+    expect_equal(result$status_code, 200)
+    expect_vector(result$body)
+
+    # correct model
+    result <- pull('llama3')
+    expect_s3_class(result, "httr2_response")
+    expect_equal(result$status_code, 200)
+    expect_vector(result$body)
+})
+