diff --git a/tests/testthat/test-provider-azure.R b/tests/testthat/test-provider-azure.R index 6d0be642..cceb4fb2 100644 --- a/tests/testthat/test-provider-azure.R +++ b/tests/testthat/test-provider-azure.R @@ -4,7 +4,7 @@ test_that("can make simple request", { chat <- chat_azure_test("Be as terse as possible; no punctuation") resp <- chat$chat("What is 1 + 1?", echo = FALSE) expect_match(resp, "2") - expect_true(all(chat$last_turn()@tokens >= 1)) + expect_equal(chat$last_turn()@tokens > 0, c(TRUE, TRUE)) }) test_that("can make simple streaming request", { diff --git a/tests/testthat/test-provider-bedrock.R b/tests/testthat/test-provider-bedrock.R index 9f208da2..a8881eb5 100644 --- a/tests/testthat/test-provider-bedrock.R +++ b/tests/testthat/test-provider-bedrock.R @@ -2,7 +2,7 @@ test_that("can make simple batch request", { chat <- chat_bedrock("Be as terse as possible; no punctuation") resp <- chat$chat("What is 1 + 1?", echo = FALSE) expect_match(resp, "2") - expect_equal(chat$last_turn()@tokens, c(26, 5)) + expect_equal(chat$last_turn()@tokens > 0, c(TRUE, TRUE)) }) test_that("can make simple streaming request", { diff --git a/tests/testthat/test-provider-claude.R b/tests/testthat/test-provider-claude.R index b31aab4c..966be5a6 100644 --- a/tests/testthat/test-provider-claude.R +++ b/tests/testthat/test-provider-claude.R @@ -2,7 +2,7 @@ test_that("can make simple batch request", { chat <- chat_claude("Be as terse as possible; no punctuation") resp <- chat$chat("What is 1 + 1?", echo = FALSE) expect_match(resp, "2") - expect_equal(chat$last_turn()@tokens, c(26, 5)) + expect_equal(chat$last_turn()@tokens > 0, c(TRUE, TRUE)) }) test_that("can make simple streaming request", { diff --git a/tests/testthat/test-provider-databricks.R b/tests/testthat/test-provider-databricks.R index c4f34b73..a467ef04 100644 --- a/tests/testthat/test-provider-databricks.R +++ b/tests/testthat/test-provider-databricks.R @@ -4,9 +4,7 @@ test_that("can make simple batch request", { ) resp <- chat$chat("What is 1 + 1?", echo = FALSE) expect_match(resp, "2") - # Note: the Databricks models don't seem to take "as terse as possible" very - # seriously, and return more verbose responses than expected. - # expect_equal(chat$last_turn()@tokens, c(26, 5)) + expect_equal(chat$last_turn()@tokens > 0, c(TRUE, TRUE)) }) test_that("can make simple streaming request", { diff --git a/tests/testthat/test-provider-deepseek.R b/tests/testthat/test-provider-deepseek.R index d367ccf0..3c84f59c 100644 --- a/tests/testthat/test-provider-deepseek.R +++ b/tests/testthat/test-provider-deepseek.R @@ -4,7 +4,7 @@ test_that("can make simple request", { chat <- chat_deepseek("Be as terse as possible; no punctuation") resp <- chat$chat("What is 1 + 1?", echo = FALSE) expect_match(resp, "2") - expect_equal(chat$last_turn()@tokens, c(20, 1)) + expect_equal(chat$last_turn()@tokens > 0, c(TRUE, TRUE)) }) test_that("can make simple streaming request", { diff --git a/tests/testthat/test-provider-gemini.R b/tests/testthat/test-provider-gemini.R index 90d675db..095c94af 100644 --- a/tests/testthat/test-provider-gemini.R +++ b/tests/testthat/test-provider-gemini.R @@ -4,7 +4,7 @@ test_that("can make simple request", { chat <- chat_gemini("Be as terse as possible; no punctuation") resp <- chat$chat("What is 1 + 1?", echo = FALSE) expect_match(resp, "2") - expect_equal(chat$last_turn()@tokens, c(17, 2)) + expect_equal(chat$last_turn()@tokens > 0, c(TRUE, TRUE)) }) test_that("can make simple streaming request", { diff --git a/tests/testthat/test-provider-ollama.R b/tests/testthat/test-provider-ollama.R index 33bd715b..5504ee44 100644 --- a/tests/testthat/test-provider-ollama.R +++ b/tests/testthat/test-provider-ollama.R @@ -4,7 +4,7 @@ test_that("can make simple request", { chat <- chat_ollama_test("Be as terse as possible; no punctuation") resp <- chat$chat("What is 1 + 1?", echo = FALSE) expect_match(resp, "2") - expect_equal(chat$last_turn()@tokens >= 1, c(TRUE, TRUE)) + expect_equal(chat$last_turn()@tokens > 0, c(TRUE, TRUE)) }) test_that("can make simple streaming request", { diff --git a/tests/testthat/test-provider-openai.R b/tests/testthat/test-provider-openai.R index 9653605a..882900bf 100644 --- a/tests/testthat/test-provider-openai.R +++ b/tests/testthat/test-provider-openai.R @@ -4,7 +4,7 @@ test_that("can make simple request", { chat <- chat_openai("Be as terse as possible; no punctuation", model = "gpt-4o-mini") resp <- chat$chat("What is 1 + 1?", echo = FALSE) expect_match(resp, "2") - expect_equal(chat$last_turn()@tokens, c(27, 2)) + expect_equal(chat$last_turn()@tokens > 0, c(TRUE, TRUE)) }) test_that("can make simple streaming request", { diff --git a/tests/testthat/test-provider-openrouter.R b/tests/testthat/test-provider-openrouter.R index 226695b4..cc258c7d 100644 --- a/tests/testthat/test-provider-openrouter.R +++ b/tests/testthat/test-provider-openrouter.R @@ -4,7 +4,7 @@ test_that("can make simple request", { chat <- chat_openrouter_test("Be as terse as possible; no punctuation") resp <- chat$chat("What is 1 + 1?", echo = FALSE) expect_match(resp, "2") - expect_true(all(chat$last_turn()@tokens >= 1)) + expect_equal(chat$last_turn()@tokens > 0, c(TRUE, TRUE)) }) test_that("can make simple streaming request", { diff --git a/tests/testthat/test-provider-snowflake.R b/tests/testthat/test-provider-snowflake.R index 24cdce84..e48b7929 100644 --- a/tests/testthat/test-provider-snowflake.R +++ b/tests/testthat/test-provider-snowflake.R @@ -6,13 +6,14 @@ test_that("can make simple request", { # chat <- chat_snowflake("Be as terse as possible; no punctuation") # resp <- chat$chat("What is 1 + 1?", echo = FALSE) # expect_match(resp, "2") - # expect_equal(chat$last_turn()@tokens, c(64, 2)) + # expect_equal(chat$last_turn()@tokens > 0, c(TRUE, TRUE)) }) test_that("can make simple streaming request", { chat <- chat_snowflake("Be as terse as possible; no punctuation") resp <- coro::collect(chat$stream("What is 1 + 1?")) expect_match(paste0(unlist(resp), collapse = ""), "2") + expect_equal(chat$last_turn()@tokens > 0, c(TRUE, TRUE)) }) # Common provider interface ----------------------------------------------- diff --git a/tests/testthat/test-provider-vllm.R b/tests/testthat/test-provider-vllm.R index c04af7ad..1ef0a3af 100644 --- a/tests/testthat/test-provider-vllm.R +++ b/tests/testthat/test-provider-vllm.R @@ -4,7 +4,7 @@ test_that("can make simple request", { chat <- chat_vllm_test("Be as terse as possible; no punctuation") resp <- chat$chat("What is 1 + 1?", echo = FALSE) expect_match(resp, "2") - expect_equal(chat$last_turn()@tokens, c(64, 2)) + expect_equal(chat$last_turn()@tokens > 0, c(TRUE, TRUE)) }) test_that("can make simple streaming request", {