update version, Closes #225

DESCRIPTION

@@ -1,7 +1,7 @@
 Type: Package
 Package: gptstudio
 Title: Use Large Language Models Directly in your Development Environment
-Version: 0.4.0.9004
+Version: 0.4.0.9005
 Authors@R: c(
     person("Michel", "Nivard", , "m.g.nivard@vu.nl", role = c("aut", "cph")),
     person("James", "Wade", , "github@jameshwade.com", role = c("aut", "cre", "cph"),

R/service-ollama.R

@@ -49,7 +49,6 @@ body_to_json_str <- function(x) {
 
 
 ollama_perform_stream <- function(request, parser) {
-<<<<<<< HEAD
   req_perform_stream(
     request,
     callback = function(x) {
@@ -58,27 +57,6 @@ ollama_perform_stream <- function(request, parser) {
     },
     buffer_kb = 0.01,
     round = "line"
-=======
-  request_body <- request |>
-    purrr::pluck("body")
-
-  request_url <- request |>
-    purrr::pluck("url")
-
-  request_handle <- curl::new_handle() |>
-    curl::handle_setopt(postfields = body_to_json_str(request_body))
-
-  curl_response <- curl::curl_fetch_stream(
-    url = request_url,
-    handle = request_handle,
-    fun = function(x) parser$parse_ndjson(rawToChar(x))
-  )
-
-  response_json(
-    url = curl_response$url,
-    method = "POST",
-    body = list(response = parser$lines)
->>>>>>> 2a5751d (%>% to |>, R >=4.1, update news)
   )
 }
 

R/service-openai_streaming.R

@@ -27,7 +27,6 @@ stream_chat_completion <-
       "messages" = messages
     )
 
-<<<<<<< HEAD
     request(url) %>%
       req_headers(
         "Content-Type" = "application/json",
@@ -43,22 +42,6 @@ stream_chat_completion <-
         round = "line",
         buffer_kb = 0.01
       )
-=======
-    # Create a new curl handle object
-    handle <- curl::new_handle() |>
-      curl::handle_setheaders(.list = headers) |>
-      curl::handle_setopt(postfields = jsonlite::toJSON(body, auto_unbox = TRUE)) # request body
-
-    # Make the streaming request using curl_fetch_stream()
-    curl::curl_fetch_stream(
-      url = url,
-      fun = function(x) {
-        element <- rawToChar(x)
-        element_callback(element) # Do whatever element_callback does
-      },
-      handle = handle
-    )
->>>>>>> 2a5751d (%>% to |>, R >=4.1, update news)
   }
 
 openai_handler <- function(x) {