From 444f4ebe9de8aa68afdf8d39b734a8543b9b5c4b Mon Sep 17 00:00:00 2001
From: sigoden <sigoden@gmail.com>
Date: Thu, 2 Nov 2023 09:53:54 +0800
Subject: refactor: improve code quanity (#196)

- rewrite Repl, remove ReplHandler
- move ReplyStreamHandler to repl/ and rename it to ReplyHandler
- deprecate utils::print_now
- refactor session info
---
 src/client/common.rs | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'src/client/common.rs')

diff --git a/src/client/common.rs b/src/client/common.rs
index 7963c76..0d0c0e2 100644
--- a/src/client/common.rs
+++ b/src/client/common.rs
@@ -1,6 +1,7 @@
 use crate::{
     config::{Message, SharedConfig},
-    repl::{ReplyStreamHandler, SharedAbortSignal},
+    render::ReplyHandler,
+    repl::AbortSignal,
     utils::{init_tokio_runtime, prompt_input_integer, prompt_input_string, tokenize, PromptKind},
 };
 
@@ -139,7 +140,7 @@ macro_rules! openai_compatible_client {
             async fn send_message_streaming_inner(
                 &self,
                 client: &reqwest::Client,
-                handler: &mut $crate::repl::ReplyStreamHandler,
+                handler: &mut $crate::render::ReplyHandler,
                 data: $crate::client::SendData,
             ) -> Result<()> {
                 let builder = self.request_builder(client, data)?;
@@ -201,12 +202,8 @@ pub trait Client {
         })
     }
 
-    fn send_message_streaming(
-        &self,
-        content: &str,
-        handler: &mut ReplyStreamHandler,
-    ) -> Result<()> {
-        async fn watch_abort(abort: SharedAbortSignal) {
+    fn send_message_streaming(&self, content: &str, handler: &mut ReplyHandler) -> Result<()> {
+        async fn watch_abort(abort: AbortSignal) {
             loop {
                 if abort.aborted() {
                     break;
@@ -252,7 +249,7 @@ pub trait Client {
     async fn send_message_streaming_inner(
         &self,
         client: &ReqwestClient,
-        handler: &mut ReplyStreamHandler,
+        handler: &mut ReplyHandler,
         data: SendData,
     ) -> Result<()>;
 }
-- 
cgit v1.2.3