Merge pull request #27 from tadascience/slap

use {slap}

DESCRIPTION

@@ -20,5 +20,8 @@ Imports:
     tibble,
     stringr,
     jsonlite,
-    rlang
-Remotes: r-lib/httr2
+    rlang,
+    slap
+Remotes: 
+    r-lib/httr2, 
+    tadascience/slap

NAMESPACE

@@ -2,6 +2,7 @@
 
 S3method(as.data.frame,chat_response)
 S3method(as_messages,character)
+S3method(as_messages,default)
 S3method(as_messages,list)
 S3method(as_msg,character)
 S3method(as_tibble,chat_response)
@@ -14,6 +15,7 @@ export(stream)
 import(cli)
 import(httr2)
 import(rlang)
+import(slap)
 import(stringr)
 import(tibble)
 importFrom(jsonlite,fromJSON)

R/chat.R

@@ -18,10 +18,23 @@
 chat <- function(messages, model = "mistral-tiny", ..., error_call = current_env()) {
   check_dots_empty(call = error_call)
 
+  messages <- as_messages(messages) %!% "Can't convert {.arg messages} to a list of messages."
+
   req <- req_chat(messages, model = model, error_call = error_call)
   resp <- authenticate(req, error_call = error_call) |>
     req_mistral_perform(error_call = error_call)
 
+
+  req_messages <- x$request$body$data$messages
+  df_req <- map_dfr(req_messages, as.data.frame)
+
+  df_resp <- as.data.frame(
+    resp_body_json(x)$choices[[1]]$message[c("role", "content")]
+  )
+
+  rbind(df_req, df_resp)
+
+
   class(resp) <- c("chat", class(resp))
   resp
 }
@@ -36,8 +49,6 @@ req_chat <- function(messages, model = "mistral-tiny", stream = FALSE, ..., erro
   check_dots_empty(call = error_call)
   check_scalar_string(model, error_call = error_call)
 
-  messages <- as_messages(messages)
-
   request(mistral_base_url) |>
     req_url_path_append("v1", "chat", "completions") |>
     authenticate(error_call = error_call) |>

R/messages.R

@@ -1,7 +1,7 @@
 #' Convert object into a messages list
 #'
 #' @param messages object to convert to messages
-#' @param ... ignored
+#' @inheritParams rlang::args_dots_empty
 #' @inheritParams rlang::args_error_context
 #'
 #' @examples
@@ -10,10 +10,18 @@
 #' as_messages(list(assistant = "hello", user = "hello"))
 #'
 #' @export
-as_messages <- function(messages, ..., error_call = current_env()) {
+as_messages <- function(messages, ...) {
   UseMethod("as_messages")
 }
 
+#' @export
+as_messages.default <- function(messages, ..., error_call = current_env()) {
+  cli_abort(c(
+    "No known method for objects of class {.cls {class(messages)}}.",
+    i = "Use as_messages(<character>) or as_messages(<list>)."
+  ), call = error_call)
+}
+
 #' @export
 as_messages.character <- function(messages, ..., error_call = current_env()) {
   check_dots_empty(call = error_call)
@@ -57,12 +65,12 @@ check_role <- function(name = "", error_call = caller_env()) {
   name
 }
 
-check_scalar_string <- function(x, error_call = caller_env(), arg_name = deparse(substitute(x))) {
+check_scalar_string <- function(x, error_call = caller_env(), error_arg = caller_arg(x)) {
   if (!is.character(x)) {
-    cli_abort("{.arg {arg_name}} must be a single string, not {.obj_type_friendly {x}}. ", call = error_call)
+    cli_abort("{.arg {error_arg}} must be a single string, not {.obj_type_friendly {x}}. ", call = error_call)
   }
   if (length(x) != 1L) {
-    cli_abort("{.arg {arg_name}} must be a single string, not length {.code {length(x)}}. ", call = error_call)
+    cli_abort("{.arg {error_arg}} must be a single string, not length {.code {length(x)}}. ", call = error_call)
   }
 }
 

R/zzz.R

@@ -3,6 +3,7 @@
 #' @import httr2
 #' @import tibble
 #' @import stringr
+#' @import slap
 #' @importFrom purrr map_dfr map_chr pluck map2 list_flatten
 #' @importFrom jsonlite fromJSON
 NULL