diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/cli.rs | 2 | ||||
| -rw-r--r-- | src/config/mod.rs | 16 | ||||
| -rw-r--r-- | src/config/session.rs | 8 | ||||
| -rw-r--r-- | src/repl/mod.rs | 2 |
4 files changed, 18 insertions, 10 deletions
@@ -54,7 +54,7 @@ pub struct Cli { /// Display information #[clap(long)] pub info: bool, - /// List all available models + /// List all available chat models #[clap(long)] pub list_models: bool, /// List all roles diff --git a/src/config/mod.rs b/src/config/mod.rs index cb510ef..41e449a 100644 --- a/src/config/mod.rs +++ b/src/config/mod.rs @@ -583,7 +583,8 @@ impl Config { } pub fn use_prompt(&mut self, prompt: &str) -> Result<()> { - let role = Role::new(TEMP_ROLE_NAME, prompt); + let mut role = Role::new(TEMP_ROLE_NAME, prompt); + role.set_model(&self.model); self.use_role_obj(role) } @@ -705,9 +706,8 @@ impl Config { pub fn exit_session(&mut self) -> Result<()> { if let Some(mut session) = self.session.take() { - let is_repl = self.working_mode == WorkingMode::Repl; let sessions_dir = self.sessions_dir()?; - session.exit(&sessions_dir, is_repl)?; + session.exit(&sessions_dir, self.working_mode.is_repl())?; self.last_message = None; } Ok(()) @@ -723,7 +723,7 @@ impl Config { }; let session_path = self.session_file(&name)?; if let Some(session) = self.session.as_mut() { - session.save(&session_path)?; + session.save(&session_path, self.working_mode.is_repl())?; } Ok(()) } @@ -933,8 +933,8 @@ impl Config { } pub fn exit_bot(&mut self) -> Result<()> { + self.exit_session()?; if self.bot.take().is_some() { - self.exit_session()?; self.rag.take(); self.last_message = None; } @@ -1420,6 +1420,12 @@ pub enum WorkingMode { Serve, } +impl WorkingMode { + pub fn is_repl(&self) -> bool { + *self == WorkingMode::Repl + } +} + bitflags::bitflags! { #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] pub struct StateFlags: u32 { diff --git a/src/config/session.rs b/src/config/session.rs index 2149ba5..726249c 100644 --- a/src/config/session.rs +++ b/src/config/session.rs @@ -312,12 +312,12 @@ impl Session { } } let session_path = session_dir.join(format!("{}.yaml", self.name())); - self.save(&session_path)?; + self.save(&session_path, is_repl)?; } Ok(()) } - pub fn save(&mut self, session_path: &Path) -> Result<()> { + pub fn save(&mut self, session_path: &Path, is_repl: bool) -> Result<()> { if let Some(sessions_dir) = session_path.parent() { if !sessions_dir.exists() { create_dir_all(sessions_dir).with_context(|| { @@ -338,7 +338,9 @@ impl Session { ) })?; - println!("✨ Saved session to '{}'", session_path.display()); + if is_repl { + println!("✨ Saved session to '{}'", session_path.display()); + } self.dirty = false; diff --git a/src/repl/mod.rs b/src/repl/mod.rs index ca718b5..1214fb5 100644 --- a/src/repl/mod.rs +++ b/src/repl/mod.rs @@ -350,7 +350,7 @@ Tips: use <tab> to autocomplete conversation starter text. ".copy" => { let config = self.config.read(); self.copy(config.last_reply()) - .with_context(|| "Failed to copy the last output")?; + .with_context(|| "Failed to copy the last response")?; } ".exit" => match args { Some("role") => { |