Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: support session-scoped agent variables #969

Merged
merged 1 commit into from
Nov 5, 2024
Merged

feat: support session-scoped agent variables #969

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
147 changes: 95 additions & 52 deletions src/config/agent.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,18 @@ use std::{fs::read_to_string, path::Path};

use serde::{Deserialize, Serialize};

const DEFAULT_AGENT_NAME: &str = "rag";

#[derive(Debug, Clone, Serialize)]
pub struct Agent {
name: String,
config: AgentConfig,
definition: AgentDefinition,
#[serde(skip)]
shared_variables: IndexMap<String, String>,
#[serde(skip)]
session_variables: Option<IndexMap<String, String>>,
#[serde(skip)]
functions: Functions,
#[serde(skip)]
rag: Option<Arc<Rag>>,
Expand All @@ -33,17 +39,14 @@ impl Agent {
bail!("Unknown agent `{name}`");
}
let functions_file_path = functions_dir.join("functions.json");
let rag_path = Config::agent_rag_file(name, "rag")?;
let rag_path = Config::agent_rag_file(name, DEFAULT_AGENT_NAME)?;
let config_path = Config::agent_config_file(name)?;
let agent_config = if config_path.exists() {
AgentConfig::load(&config_path)?
} else {
AgentConfig::new(&config.read())
};
let mut definition = AgentDefinition::load(&definition_file_path)?;
init_variables(&mut definition.variables, &agent_config.variables)
.context("Failed to init variables")?;

let functions = if functions_file_path.exists() {
Functions::init(&functions_file_path)?
} else {
Expand All @@ -60,7 +63,7 @@ impl Agent {
};

let rag = if rag_path.exists() {
Some(Arc::new(Rag::load(config, "rag", &rag_path)?))
Some(Arc::new(Rag::load(config, DEFAULT_AGENT_NAME, &rag_path)?))
} else if !definition.documents.is_empty() {
let mut ans = false;
if *IS_STDOUT_TERMINAL {
Expand Down Expand Up @@ -93,16 +96,66 @@ impl Agent {
name: name.to_string(),
config: agent_config,
definition,
shared_variables: Default::default(),
session_variables: None,
functions,
rag,
model,
})
}

pub fn init_agent_variables(
agent_variables: &[AgentVariable],
variables: &IndexMap<String, String>,
) -> Result<IndexMap<String, String>> {
let mut output = IndexMap::new();
if agent_variables.is_empty() {
return Ok(output);
}
let mut printed = false;
for agent_variable in agent_variables {
let key = agent_variable.name.clone();
match variables.get(&key) {
Some(value) => {
output.insert(key, value.clone());
}
None => {
if let Some(value) = agent_variable.default.clone() {
output.insert(key, value);
continue;
}
if *IS_STDOUT_TERMINAL {
if !printed {
println!("🚀 Init agent variables...");
printed = true;
}
let value = Text::new(&agent_variable.description)
.with_validator(|input: &str| {
if input.trim().is_empty() {
Ok(Validation::Invalid("This field is required".into()))
} else {
Ok(Validation::Valid)
}
})
.prompt()?;
output.insert(key, value);
} else {
bail!("Failed to init agent variables in non-interactive mode");
}
}
}
}
Ok(output)
}

pub fn export(&self) -> Result<String> {
let mut agent = self.clone();
agent.definition.instructions = self.interpolated_instructions();
let mut value = serde_json::json!(agent);
let variables = self.variables();
if !variables.is_empty() {
value["variables"] = serde_json::to_value(variables)?;
}
value["functions_dir"] = Config::agent_functions_dir(&self.name)?
.display()
.to_string()
Expand Down Expand Up @@ -140,7 +193,7 @@ impl Agent {
}

pub fn interpolated_instructions(&self) -> String {
self.definition.interpolated_instructions()
self.definition.interpolated_instructions(self.variables())
}

pub fn agent_prelude(&self) -> Option<&str> {
Expand All @@ -151,18 +204,43 @@ impl Agent {
self.config.agent_prelude = value;
}

pub fn variables(&self) -> &[AgentVariable] {
&self.definition.variables
pub fn variables(&self) -> &IndexMap<String, String> {
match &self.session_variables {
Some(variables) => variables,
None => &self.shared_variables,
}
}

pub fn config_variables(&self) -> &IndexMap<String, String> {
&self.config.variables
}

pub fn shared_variables(&self) -> &IndexMap<String, String> {
&self.shared_variables
}

pub fn set_shared_variables(&mut self, shared_variables: IndexMap<String, String>) {
self.shared_variables = shared_variables;
}

pub fn set_session_variables(&mut self, session_variables: Option<IndexMap<String, String>>) {
self.session_variables = session_variables;
}

pub fn set_variable(&mut self, key: &str, value: &str) -> Result<()> {
match self.definition.variables.iter_mut().find(|v| v.name == key) {
Some(variable) => {
variable.value = value.to_string();
Ok(())
}
None => bail!("Unknown variable '{key}'"),
let variables = match self.session_variables.as_mut() {
Some(v) => v,
None => &mut self.shared_variables,
};
if !variables.contains_key(key) {
bail!("Unknown variable: '{key}'")
}
variables.insert(key.to_string(), value.to_string());
Ok(())
}

pub fn defined_variables(&self) -> &[AgentVariable] {
&self.definition.variables
}
}

Expand Down Expand Up @@ -296,10 +374,10 @@ impl AgentDefinition {
)
}

fn interpolated_instructions(&self) -> String {
fn interpolated_instructions(&self, variables: &IndexMap<String, String>) -> String {
let mut output = self.instructions.clone();
for variable in &self.variables {
output = output.replace(&format!("{{{{{}}}}}", variable.name), &variable.value)
for (k, v) in variables {
output = output.replace(&format!("{{{{{k}}}}}"), v)
}
interpolate_variables(&mut output);
output
Expand Down Expand Up @@ -356,38 +434,3 @@ fn list_agents_impl() -> Result<Vec<String>> {
.collect();
Ok(agents)
}

fn init_variables(
variables: &mut [AgentVariable],
config_variable: &IndexMap<String, String>,
) -> Result<()> {
if variables.is_empty() {
return Ok(());
}
for variable in variables.iter_mut() {
match config_variable.get(&variable.name) {
Some(value) => variable.value = value.to_string(),
None => {
if let Some(value) = variable.default.clone() {
variable.value = value;
continue;
}
if *IS_STDOUT_TERMINAL {
let value = Text::new(&variable.description)
.with_validator(|input: &str| {
if input.trim().is_empty() {
Ok(Validation::Invalid("This field is required".into()))
} else {
Ok(Validation::Valid)
}
})
.prompt()?;
variable.value = value;
} else {
bail!("Failed to init agent variables in non-interactive mode");
}
}
}
}
Ok(())
}
52 changes: 48 additions & 4 deletions src/config/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1039,6 +1039,7 @@ impl Config {
}
}
self.session = session;
self.init_agent_session_variables()?;
Ok(())
}

Expand All @@ -1058,6 +1059,9 @@ impl Config {
session.exit(&sessions_dir, self.working_mode.is_repl())?;
self.last_message = None;
}
if let Some(agent) = self.agent.as_mut() {
agent.set_session_variables(None);
}
Ok(())
}

Expand Down Expand Up @@ -1097,10 +1101,10 @@ impl Config {

pub fn empty_session(&mut self) -> Result<()> {
if let Some(session) = self.session.as_mut() {
session.clear_messages();
if let Some(agent) = self.agent.as_ref() {
session.set_agent(agent);
session.sync_agent(agent, false);
}
session.clear_messages();
} else {
bail!("No session")
}
Expand Down Expand Up @@ -1380,6 +1384,8 @@ impl Config {
config.write().agent = Some(agent);
if let Some(session) = session {
config.write().use_session(Some(&session))?;
} else {
config.write().init_agent_shared_variables()?;
}
Ok(())
}
Expand Down Expand Up @@ -1408,7 +1414,12 @@ impl Config {
let key = parts[0];
let value = parts[1];
match self.agent.as_mut() {
Some(agent) => agent.set_variable(key, value)?,
Some(agent) => {
agent.set_variable(key, value)?;
if let Some(session) = self.session.as_mut() {
session.sync_agent(agent, true);
}
}
None => bail!("No agent"),
};
Ok(())
Expand Down Expand Up @@ -1563,7 +1574,7 @@ impl Config {
},
".variable" => match &self.agent {
Some(agent) => agent
.variables()
.defined_variables()
.iter()
.map(|v| (v.name.clone(), Some(v.description.clone())))
.collect(),
Expand Down Expand Up @@ -1856,6 +1867,39 @@ impl Config {
.with_context(|| "Failed to save message")
}

fn init_agent_shared_variables(&mut self) -> Result<()> {
let agent = match self.agent.as_mut() {
Some(v) => v,
None => return Ok(()),
};
let new_variables =
Agent::init_agent_variables(agent.defined_variables(), agent.config_variables())?;
agent.set_shared_variables(new_variables);
Ok(())
}

fn init_agent_session_variables(&mut self) -> Result<()> {
let (agent, session) = match (self.agent.as_mut(), self.session.as_mut()) {
(Some(agent), Some(session)) => (agent, session),
_ => return Ok(()),
};
let config_variables = agent.config_variables();
let shared_variables = agent.shared_variables();
let mut all_variables = if shared_variables.is_empty() {
config_variables.clone()
} else {
shared_variables.clone()
};
all_variables.extend(session.agent_variables().clone());
let new_variables = Agent::init_agent_variables(agent.defined_variables(), &all_variables)?;
if shared_variables.is_empty() {
agent.set_shared_variables(new_variables.clone());
}
agent.set_session_variables(Some(new_variables));
session.sync_agent(agent, false);
Ok(())
}

fn open_message_file(&self) -> Result<File> {
let path = self.messages_file()?;
ensure_parent_exists(&path)?;
Expand Down
29 changes: 18 additions & 11 deletions src/config/session.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,15 @@ pub struct Session {
#[serde(skip_serializing_if = "Option::is_none")]
compress_threshold: Option<usize>,

#[serde(skip_serializing_if = "Option::is_none")]
role_name: Option<String>,
#[serde(skip_serializing_if = "IndexMap::is_empty")]
agent_variables: IndexMap<String, String>,

#[serde(default, skip_serializing_if = "HashMap::is_empty")]
data_urls: HashMap<String, String>,
#[serde(default, skip_serializing_if = "Vec::is_empty")]
compressed_messages: Vec<Message>,
#[serde(skip_serializing_if = "Option::is_none")]
role_name: Option<String>,

messages: Vec<Message>,

Expand Down Expand Up @@ -79,10 +82,6 @@ impl Session {
}
}

if let Some(agent) = &config.agent {
session.set_agent(agent);
}

Ok(session)
}

Expand Down Expand Up @@ -249,16 +248,24 @@ impl Session {
self.dirty = true;
}

pub fn set_agent(&mut self, agent: &Agent) {
self.role_prompt
.clone_from(&agent.interpolated_instructions());
}

pub fn clear_role(&mut self) {
self.role_name = None;
self.role_prompt.clear();
}

pub fn sync_agent(&mut self, agent: &Agent, set_dirty: bool) {
self.role_name = None;
self.role_prompt = agent.interpolated_instructions();
self.agent_variables = agent.variables().clone();
if set_dirty {
self.dirty = true;
}
}

pub fn agent_variables(&self) -> &IndexMap<String, String> {
&self.agent_variables
}

pub fn set_save_session(&mut self, value: Option<bool>) {
if self.name == TEMP_SESSION_NAME {
return;
Expand Down
Loading