diff options
| -rw-r--r-- | config.example.yaml | 6 | ||||
| -rw-r--r-- | src/config/mod.rs | 30 | ||||
| -rw-r--r-- | src/main.rs | 2 | ||||
| -rw-r--r-- | src/repl/mod.rs | 4 |
4 files changed, 26 insertions, 16 deletions
diff --git a/config.example.yaml b/config.example.yaml index e423d37..5941353 100644 --- a/config.example.yaml +++ b/config.example.yaml @@ -9,7 +9,11 @@ wrap_code: false # Whether wrap code block ctrlc_exit: false # Whether to exit REPL when Ctrl+C is pressed auto_copy: false # Automatically copy the last output to the clipboard keybindings: emacs # REPL keybindings. (emacs, vi) -prelude: '' # Set a default role or session (role:<name>, session:<name>) +prelude: null # Set a default role or session (role:<name>, session:<name>) + +# Command that will be used to edit the current line buffer with ctrl+o +# if unset fallback to $EDITOR and $VISUAL +buffer_editor: null # Compress session if tokens exceed this value (valid when >=1000) compress_threshold: 1000 diff --git a/src/config/mod.rs b/src/config/mod.rs index 88235ac..963ad50 100644 --- a/src/config/mod.rs +++ b/src/config/mod.rs @@ -70,7 +70,9 @@ pub struct Config { /// REPL keybindings. (emacs, vi) pub keybindings: Keybindings, /// Set a default role or session (role:<name>, session:<name>) - pub prelude: String, + pub prelude: Option<String>, + /// Command that will be used to edit the current line buffer + pub buffer_editor: Option<String>, /// Compress session if tokens exceed this value (>=1000) pub compress_threshold: usize, /// The prompt for summarizing session messages @@ -115,7 +117,8 @@ impl Default for Config { ctrlc_exit: false, auto_copy: false, keybindings: Default::default(), - prelude: String::new(), + prelude: None, + buffer_editor: None, compress_threshold: 2000, summarize_prompt: "Summarize the discussion briefly in 200 words or less to use as a prompt for future context.".to_string(), summary_prompt: "This is a summary of the chat history as a recap: ".into(), @@ -171,8 +174,11 @@ impl Config { Ok(config) } - pub fn prelude(&mut self) -> Result<()> { - let prelude = self.prelude.clone(); + pub fn apply_prelude(&mut self) -> Result<()> { + let prelude = self.prelude.clone().unwrap_or_default(); + if prelude.is_empty() { + return Ok(()); + } let err_msg = || format!("Invalid prelude '{}", prelude); match prelude.split_once(':') { Some(("role", name)) => { @@ -185,14 +191,19 @@ impl Config { self.start_session(Some(name)).with_context(err_msg)?; } } - Some(_) => { + _ => { bail!("{}", err_msg()) } - None => {} } Ok(()) } + pub fn buffer_editor(&self) -> Option<String> { + self.buffer_editor + .clone() + .or_else(|| env::var("VISUAL").ok().or_else(|| env::var("EDITOR").ok())) + } + pub fn retrieve_role(&self, name: &str) -> Result<Role> { self.roles .iter() @@ -413,11 +424,6 @@ impl Config { .wrap .clone() .map_or_else(|| String::from("no"), |v| v.to_string()); - let prelude = if self.prelude.is_empty() { - String::from("-") - } else { - self.prelude.clone() - }; let items = vec![ ("model", self.model.id()), ("temperature", format_option(&self.temperature)), @@ -430,7 +436,7 @@ impl Config { ("wrap_code", self.wrap_code.to_string()), ("auto_copy", self.auto_copy.to_string()), ("keybindings", self.keybindings.stringify().into()), - ("prelude", prelude), + ("prelude", format_option(&self.prelude)), ("compress_threshold", self.compress_threshold.to_string()), ("config_file", display_path(&Self::config_file()?)), ("roles_file", display_path(&Self::roles_file()?)), diff --git a/src/main.rs b/src/main.rs index be46bf1..90e1136 100644 --- a/src/main.rs +++ b/src/main.rs @@ -97,7 +97,7 @@ fn main() -> Result<()> { None => bail!("No input text"), } } - config.write().prelude()?; + config.write().apply_prelude()?; if let Err(err) = match input { Some(input) => start_directive(&config, input, cli.no_stream, cli.code), None => start_interactive(&config), diff --git a/src/repl/mod.rs b/src/repl/mod.rs index 30be73b..4de4251 100644 --- a/src/repl/mod.rs +++ b/src/repl/mod.rs @@ -316,7 +316,7 @@ Type ".help" for more information. .with_validator(Box::new(ReplValidator)) .with_ansi_colors(true); - if let Ok(cmd) = env::var("VISUAL").or_else(|_| env::var("EDITOR")) { + if let Some(cmd) = config.read().buffer_editor() { let temp_file = env::temp_dir().join(format!("aichat-{}.txt", chrono::Utc::now().timestamp())); let command = process::Command::new(cmd); @@ -425,7 +425,7 @@ fn dump_repl_help() { r###"{head} Type ::: to begin multi-line editing, type ::: to end it. -Press Ctrl+O to open an editor to modify the current prompt. +Press Ctrl+O to open an buffer editor to modify the current prompt. Press Ctrl+C to abort aichat, Ctrl+D to exit the REPL"###, ); } |