Archives/aichat
2
0
Fork 0
mirror of https://github.com/sigoden/aichat synced 2024-11-13 19:10:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: unable to rebuild agent rag (#763)

Browse Source
This commit is contained in:
sigoden 2024-07-29 17:21:52 +08:00 committed by GitHub
parent 14bfd4e97d
commit 44aac171b7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/config/agent.rs
View File

@ -36,7 +36,7 @@ impl Agent {
let definition_file_path = functions_dir.join("index.yaml");
let functions_file_path = functions_dir.join("functions.json");
let variables_path = Config::agent_variables_file(name)?;
let rag_path = Config::agent_rag_file(name)?;
let rag_path = Config::agent_rag_file(name, "rag")?;
let config_path = Config::agent_config_file(name)?;
let agent_config = if config_path.exists() {
AgentConfig::load(&config_path)?

14
src/config/mod.rs
View File

@ -49,7 +49,6 @@ const FUNCTIONS_DIR_NAME: &str = "functions";
const FUNCTIONS_FILE_NAME: &str = "functions.json";
const FUNCTIONS_BIN_DIR_NAME: &str = "bin";
const AGENTS_DIR_NAME: &str = "agents";
const AGENT_RAG_FILE_NAME: &str = "rag.bin";
const AGENT_VARIABLES_FILE_NAME: &str = "variables.yaml";
pub const TEMP_ROLE_NAME: &str = "%%";
@ -331,12 +330,9 @@ impl Config {
}
pub fn rag_file(&self, name: &str) -> Result<PathBuf> {
let path = if self.agent.is_none() {
Self::rags_dir()?.join(format!("{name}.bin"))
} else {
Self::rags_dir()?
.join(AGENTS_DIR_NAME)
.join(format!("{name}.bin"))
let path = match &self.agent {
Some(agent) => Self::agent_rag_file(agent.name(), name)?,
None => Self::rags_dir()?.join(format!("{name}.bin")),
};
Ok(path)
}
@ -356,8 +352,8 @@ impl Config {
Ok(Self::agent_config_dir(name)?.join(CONFIG_FILE_NAME))
}
pub fn agent_rag_file(name: &str) -> Result<PathBuf> {
Ok(Self::agent_config_dir(name)?.join(AGENT_RAG_FILE_NAME))
pub fn agent_rag_file(agent_name: &str, rag_name: &str) -> Result<PathBuf> {
Ok(Self::agent_config_dir(agent_name)?.join(format!("{rag_name}.bin")))
}
pub fn agent_variables_file(name: &str) -> Result<PathBuf> {

2
src/rag/mod.rs
View File

@ -79,7 +79,7 @@ impl Rag {
}
pub fn load(config: &GlobalConfig, name: &str, path: &Path) -> Result<Self> {
let err = || format!("Failed to load rag '{name}'");
let err = || format!("Failed to load rag '{name}' at '{}'", path.display());
let file = std::fs::File::open(path).with_context(err)?;
let reader = BufReader::new(file);
let data: RagData = bincode::deserialize_from(reader).with_context(err)?;