Skip to content

Commit

Permalink
feat: state-aware completer (sigoden#251)
Browse files Browse the repository at this point in the history
  • Loading branch information
sigoden authored and rooct committed Nov 30, 2023
1 parent 39d1a82 commit fdadd06
Show file tree
Hide file tree
Showing 5 changed files with 117 additions and 32 deletions.
27 changes: 27 additions & 0 deletions src/config/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,24 @@ impl Config {
Ok(())
}

pub fn get_state(&self) -> State {
if let Some(session) = &self.session {
if session.is_empty() {
if session.role.is_some() {
State::EmptySessionWithRole
} else {
State::EmptySession
}
} else {
State::Session
}
} else if self.role.is_some() {
State::Role
} else {
State::Normal
}
}

pub fn get_temperature(&self) -> Option<f64> {
self.temperature
}
Expand Down Expand Up @@ -806,6 +824,15 @@ impl Keybindings {
}
}

#[derive(Debug, Clone, Copy, PartialEq, PartialOrd)]
pub enum State {
Normal,
Role,
EmptySession,
EmptySessionWithRole,
Session,
}

fn create_config_file(config_path: &Path) -> Result<()> {
let ans = Confirm::new("No config file, create a new one?")
.with_default(true)
Expand Down
2 changes: 2 additions & 0 deletions src/config/session.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ pub struct Session {
model_id: String,
temperature: Option<f64>,
messages: Vec<Message>,
#[serde(default)]
data_urls: HashMap<String, String>,
#[serde(skip)]
pub name: String,
Expand Down Expand Up @@ -248,6 +249,7 @@ impl Session {
role: MessageRole::Assistant,
content: MessageContent::Text(output.to_string()),
});
self.role = None;
self.dirty = true;
Ok(())
}
Expand Down
30 changes: 19 additions & 11 deletions src/repl/completer.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use super::REPL_COMMANDS;
use super::{ReplCommand, REPL_COMMANDS};

use crate::config::GlobalConfig;

Expand Down Expand Up @@ -27,17 +27,22 @@ impl Completer for ReplCompleter {
return suggestions;
}

let state = self.config.read().get_state();

let commands: Vec<_> = self
.commands
.iter()
.filter(|(cmd_name, _)| {
.filter(|cmd| {
if cmd.unavailable(&state) {
return false;
}
let line = parts
.iter()
.take(2)
.map(|(v, _)| *v)
.collect::<Vec<&str>>()
.join(" ");
cmd_name.starts_with(&line)
cmd.name.starts_with(&line)
})
.collect();

Expand All @@ -55,14 +60,16 @@ impl Completer for ReplCompleter {

if suggestions.is_empty() {
let span = Span::new(cmd_start, pos);
suggestions.extend(commands.iter().map(|(name, desc)| {
suggestions.extend(commands.iter().map(|cmd| {
let name = cmd.name;
let description = cmd.description;
let has_group = self.groups.get(name).map(|v| *v > 1).unwrap_or_default();
let name = if has_group {
name.to_string()
} else {
format!("{name} ")
};
create_suggestion(name, Some(desc.to_string()), span)
create_suggestion(name, Some(description.to_string()), span)
}))
}
suggestions
Expand All @@ -71,22 +78,23 @@ impl Completer for ReplCompleter {

pub struct ReplCompleter {
config: GlobalConfig,
commands: Vec<(&'static str, &'static str)>,
commands: Vec<ReplCommand>,
groups: HashMap<&'static str, usize>,
}

impl ReplCompleter {
pub fn new(config: &GlobalConfig) -> Self {
let mut groups = HashMap::new();

let mut commands = REPL_COMMANDS.to_vec();
commands.sort_by(|(a, _), (b, _)| a.cmp(b));
let mut commands: Vec<ReplCommand> = REPL_COMMANDS.to_vec();
commands.sort_by(|a, b| a.name.cmp(b.name));

for (name, _) in REPL_COMMANDS.iter() {
for cmd in REPL_COMMANDS.iter() {
let name = cmd.name;
if let Some(count) = groups.get(name) {
groups.insert(*name, count + 1);
groups.insert(name, count + 1);
} else {
groups.insert(*name, 1);
groups.insert(name, 1);
}
}

Expand Down
6 changes: 3 additions & 3 deletions src/repl/highlighter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ impl Highlighter for ReplHighlighter {

let mut styled_text = StyledText::new();

if REPL_COMMANDS.iter().any(|(cmd, _)| line.contains(cmd)) {
if REPL_COMMANDS.iter().any(|cmd| line.contains(cmd.name)) {
let matches: Vec<&str> = REPL_COMMANDS
.iter()
.filter(|(cmd, _)| line.contains(*cmd))
.map(|(cmd, _)| *cmd)
.filter(|cmd| line.contains(cmd.name))
.map(|cmd| cmd.name)
.collect();
let longest_match = matches.iter().fold(String::new(), |acc, &item| {
if item.len() > acc.len() {
Expand Down
84 changes: 66 additions & 18 deletions src/repl/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use self::highlighter::ReplHighlighter;
use self::prompt::ReplPrompt;

use crate::client::init_client;
use crate::config::{GlobalConfig, Input};
use crate::config::{GlobalConfig, Input, State};
use crate::render::{render_error, render_stream};
use crate::utils::{create_abort_signal, set_text, AbortSignal};

Expand All @@ -23,23 +23,50 @@ use reedline::{

const MENU_NAME: &str = "completion_menu";

const REPL_COMMANDS: [(&str, &str); 13] = [
(".help", "Print this help message"),
(".info", "Print system info"),
(".model", "Switch LLM model"),
(".role", "Use a role"),
(".info role", "Show role info"),
(".exit role", "Leave current role"),
(".session", "Start a context-aware chat session"),
(".info session", "Show session info"),
(".exit session", "End the current session"),
(".file", "Attach files to the message and then submit it"),
(".set", "Modify the configuration parameters"),
(".copy", "Copy the last reply to the clipboard"),
(".exit", "Exit the REPL"),
];

lazy_static! {
static ref REPL_COMMANDS: [ReplCommand; 13] = [
ReplCommand::new(".help", "Print this help message", vec![]),
ReplCommand::new(".info", "Print system info", vec![]),
ReplCommand::new(".model", "Switch LLM model", vec![]),
ReplCommand::new(".role", "Use a role", vec![State::Session]),
ReplCommand::new(
".info role",
"Show role info",
vec![State::Normal, State::EmptySession, State::Session]
),
ReplCommand::new(
".exit role",
"Leave current role",
vec![State::Normal, State::EmptySession, State::Session]
),
ReplCommand::new(
".session",
"Start a context-aware chat session",
vec![
State::EmptySession,
State::EmptySessionWithRole,
State::Session
]
),
ReplCommand::new(
".info session",
"Show session info",
vec![State::Normal, State::Role]
),
ReplCommand::new(
".exit session",
"End the current session",
vec![State::Normal, State::Role]
),
ReplCommand::new(
".file",
"Attach files to the message and then submit it",
vec![]
),
ReplCommand::new(".set", "Modify the configuration parameters", vec![]),
ReplCommand::new(".copy", "Copy the last reply to the clipboard", vec![]),
ReplCommand::new(".exit", "Exit the REPL", vec![]),
];
static ref COMMAND_RE: Regex = Regex::new(r"^\s*(\.\S*)\s*").unwrap();
static ref MULTILINE_RE: Regex = Regex::new(r"(?s)^\s*:::\s*(.*)\s*:::\s*$").unwrap();
}
Expand Down Expand Up @@ -318,6 +345,27 @@ Type ".help" for more information.
}
}

#[derive(Debug, Clone)]
pub struct ReplCommand {
name: &'static str,
description: &'static str,
unavailable_states: Vec<State>,
}

impl ReplCommand {
fn new(name: &'static str, desc: &'static str, unavailable_states: Vec<State>) -> Self {
Self {
name,
description: desc,
unavailable_states,
}
}

fn unavailable(&self, state: &State) -> bool {
self.unavailable_states.contains(state)
}
}

/// A default validator which checks for mismatched quotes and brackets
struct ReplValidator;

Expand All @@ -339,7 +387,7 @@ fn unknown_command() -> Result<()> {
fn dump_repl_help() {
let head = REPL_COMMANDS
.iter()
.map(|(name, desc)| format!("{name:<24} {desc}"))
.map(|cmd| format!("{:<24} {}", cmd.name, cmd.description))
.collect::<Vec<String>>()
.join("\n");
println!(
Expand Down

0 comments on commit fdadd06

Please sign in to comment.