From 7b20ab064f30b7eddd18cecb9afb93e2b2c2965a Mon Sep 17 00:00:00 2001
From: sigoden <sigoden@gmail.com>
Date: Sat, 19 Oct 2024 20:10:22 +0800
Subject: refactor: improve handling of no_stream/no_system_message (#936)

---
 src/client/common.rs | 2 +-
 src/client/openai.rs | 6 +-----
 src/client/stream.rs | 4 ++--
 3 files changed, 4 insertions(+), 8 deletions(-)

(limited to 'src/client')

diff --git a/src/client/common.rs b/src/client/common.rs
index 0cf900f..5fd4f24 100644
--- a/src/client/common.rs
+++ b/src/client/common.rs
@@ -67,7 +67,7 @@ pub trait Client: Sync + Send {
         input: &Input,
         handler: &mut SseHandler,
     ) -> Result<()> {
-        let abort_signal = handler.get_abort();
+        let abort_signal = handler.abort();
         let input = input.clone();
         tokio::select! {
             ret = async {
diff --git a/src/client/openai.rs b/src/client/openai.rs
index 831b64f..c4c2b0c 100644
--- a/src/client/openai.rs
+++ b/src/client/openai.rs
@@ -193,17 +193,13 @@ struct EmbeddingsResBodyEmbedding {
 
 pub fn openai_build_chat_completions_body(data: ChatCompletionsData, model: &Model) -> Value {
     let ChatCompletionsData {
-        mut messages,
+        messages,
         temperature,
         top_p,
         functions,
         stream,
     } = data;
 
-    if model.no_system_message() {
-        patch_system_message(&mut messages);
-    }
-
     let messages: Vec<Value> = messages
         .into_iter()
         .flat_map(|message| {
diff --git a/src/client/stream.rs b/src/client/stream.rs
index 7fa1abd..735ec93 100644
--- a/src/client/stream.rs
+++ b/src/client/stream.rs
@@ -61,11 +61,11 @@ impl SseHandler {
         Ok(())
     }
 
-    pub fn get_abort(&self) -> AbortSignal {
+    pub fn abort(&self) -> AbortSignal {
         self.abort.clone()
     }
 
-    pub fn get_tool_calls(&self) -> &[ToolCall] {
+    pub fn tool_calls(&self) -> &[ToolCall] {
         &self.tool_calls
     }
 
-- 
cgit v1.2.3