leach
/
rustGPT
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use session refs for completions

This commit is contained in:
Christopher 2025-08-25 00:54:59 -04:00
parent fc99a7843d
commit 05e0fa88b3
2 changed files with 26 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/cli.rs
View File

@ -86,15 +86,6 @@ impl ChatCLI {
self.session.add_user_message(message.to_string()); self.session.add_user_message(message.to_string());
self.session.save()?; self.session.save()?;
// Clone data needed for the API call before getting mutable client reference
let model = self.session.model.clone();
let messages = self.session.messages.clone();
let enable_web_search = self.session.enable_web_search;
let enable_reasoning_summary = self.session.enable_reasoning_summary;
let reasoning_effort = self.session.reasoning_effort.clone();
let enable_extended_thinking = self.session.enable_extended_thinking;
let thinking_budget_tokens = self.session.thinking_budget_tokens;
// Check if we should use streaming before getting client // Check if we should use streaming before getting client
let should_use_streaming = { let should_use_streaming = {
let client = self.get_client()?; let client = self.get_client()?;
@ -117,20 +108,20 @@ impl ChatCLI {
}) as StreamCallback }) as StreamCallback
}; };
let client = self.get_client()?; let client = self.get_client()?.clone();
match client let response = client
.chat_completion_stream( .chat_completion_stream(
&model, &self.session.model,
&messages, &self.session.messages,
enable_web_search, self.session.enable_web_search,
enable_reasoning_summary, self.session.enable_reasoning_summary,
&reasoning_effort, &self.session.reasoning_effort,
enable_extended_thinking, self.session.enable_extended_thinking,
thinking_budget_tokens, self.session.thinking_budget_tokens,
stream_callback, stream_callback,
) )
.await .await;
{ match response {
Ok(response) => { Ok(response) => {
println!(); // Add newline after streaming println!(); // Add newline after streaming
self.session.add_assistant_message(response); self.session.add_assistant_message(response);
@ -145,20 +136,19 @@ impl ChatCLI {
} else { } else {
// Fallback to non-streaming // Fallback to non-streaming
let spinner = self.display.show_spinner("Thinking"); let spinner = self.display.show_spinner("Thinking");
let client = self.get_client()?; let client = self.get_client()?.clone();
let response = client
match client
.chat_completion( .chat_completion(
&model, &self.session.model,
&messages, &self.session.messages,
enable_web_search, self.session.enable_web_search,
enable_reasoning_summary, self.session.enable_reasoning_summary,
&reasoning_effort, &self.session.reasoning_effort,
enable_extended_thinking, self.session.enable_extended_thinking,
thinking_budget_tokens, self.session.thinking_budget_tokens,
) )
.await .await;
{ match response {
Ok(response) => { Ok(response) => {
spinner.finish("Done"); spinner.finish("Done");
self.display.print_assistant_response(&response); self.display.print_assistant_response(&response);

6
src/core/client.rs
View File

@ -13,7 +13,7 @@ use super::{provider::Provider, session::Message};
pub type StreamCallback = Box<dyn Fn(&str) -> Pin<Box<dyn Future<Output = ()> + Send>> + Send + Sync>; pub type StreamCallback = Box<dyn Fn(&str) -> Pin<Box<dyn Future<Output = ()> + Send>> + Send + Sync>;
#[derive(Debug)] #[derive(Debug, Clone)]
pub enum ChatClient { pub enum ChatClient {
OpenAI(OpenAIClient), OpenAI(OpenAIClient),
Anthropic(AnthropicClient), Anthropic(AnthropicClient),
@ -80,14 +80,14 @@ impl ChatClient {
} }
} }
#[derive(Debug)] #[derive(Debug, Clone)]
pub struct OpenAIClient { pub struct OpenAIClient {
client: Client, client: Client,
api_key: String, api_key: String,
base_url: String, base_url: String,
} }
#[derive(Debug)] #[derive(Debug, Clone)]
pub struct AnthropicClient { pub struct AnthropicClient {
client: Client, client: Client,
api_key: String, api_key: String,