Self-evolving Context Database for AI Agents. Unify Agent Memory, Knowledge RAG and Skills.
Python agent-contextagent-memoryagent-pluginsagentic-ragcontext-databasedsh-pluginknowledge-basememorymemory-managementself-evolvingvector-database
fix(cli): 在 zip 压缩阶段应用 --ignore-dirs 参数过滤指定目录 (#2070)
zgy008816ecefdb
diff --git a/crates/ov_cli/src/base_client.rs b/crates/ov_cli/src/base_client.rsindex 6362914f9..4c093506a 100644--- a/crates/ov_cli/src/base_client.rs+++ b/crates/ov_cli/src/base_client.rs@@ -12,6 +12,45 @@ use indicatif::{ProgressBar, ProgressStyle};use crate::error::{Error, Result};+fn parse_ignore_dirs(ignore_dirs: Option<&str>) -> Vec<String> {+ ignore_dirs+ .map(|s| {+ s.split(',')+ .map(|d| d.trim().to_string())+ .filter(|d| !d.is_empty())+ .collect()+ })+ .unwrap_or_default()+}++fn ignore_dirs_filter<'a>(+ root: &'a Path,+ ignore_list: &'a [String],+) -> impl Fn(&walkdir::DirEntry) -> bool + 'a {+ move |e: &walkdir::DirEntry| {+ if e.path() == root {+ return true;+ }+ if e.file_type().is_dir() && !ignore_list.is_empty() {+ let name = e.file_name().to_str().unwrap_or("");+ for pattern in ignore_list.iter() {+ if pattern.contains('/') {+ let normalized = pattern.trim_start_matches("./").trim_end_matches('/');+ if let Ok(rel) = e.path().strip_prefix(root) {+ let rel_str = rel.to_str().unwrap_or("").replace('\\', "/");+ if rel_str == normalized {+ return false;+ }+ }+ } else if pattern == name {+ return false;+ }+ }+ }+ true+ }+}+pub fn api_error_from_envelope(json: &Value, status: StatusCode) -> String {let error_code = json.get("error")@@ -389,7 +428,7 @@ impl<'a> FileUploader<'a> {self}- pub fn zip_directory(&self, dir_path: &Path) -> Result<NamedTempFile> {+ pub fn zip_directory(&self, dir_path: &Path, ignore_dirs: Option<&str>) -> Result<NamedTempFile> {if !dir_path.is_dir() {return Err(Error::Network(format!("Path {} is not a directory",@@ -397,6 +436,7 @@ impl<'a> FileUploader<'a> {)));}+ let ignore_list = parse_ignore_dirs(ignore_dirs);let temp_file = Builder::new().suffix(".zip").tempfile()?;let file = File::create(temp_file.path())?;let mut zip = zip::ZipWriter::new(file);@@ -404,7 +444,11 @@ impl<'a> FileUploader<'a> {FileOptions::default().compression_method(CompressionMethod::Deflated);let walkdir = walkdir::WalkDir::new(dir_path);- for entry in walkdir.into_iter().filter_map(|e| e.ok()) {+ for entry in walkdir+ .into_iter()+ .filter_entry(ignore_dirs_filter(dir_path, &ignore_list))+ .filter_map(|e| e.ok())+ {let path = entry.path();if path.is_file() {let name = path.strip_prefix(dir_path).unwrap_or(path);@@ -425,6 +469,7 @@ impl<'a> FileUploader<'a> {&self,dir_path: &Path,verbose: bool,+ ignore_dirs: Option<&str>,) -> Result<NamedTempFile> {if !dir_path.is_dir() {return Err(Error::Network(format!(@@ -433,6 +478,7 @@ impl<'a> FileUploader<'a> {)));}+ let ignore_list = parse_ignore_dirs(ignore_dirs);let temp_file = Builder::new().suffix(".zip").tempfile()?;let file = File::create(temp_file.path())?;let mut zip = zip::ZipWriter::new(file);@@ -442,7 +488,11 @@ impl<'a> FileUploader<'a> {let mut total_size = 0u64;let mut total_files = 0u64;let walkdir = walkdir::WalkDir::new(dir_path);- for entry in walkdir.into_iter().filter_map(|e| e.ok()) {+ for entry in walkdir+ .into_iter()+ .filter_entry(ignore_dirs_filter(dir_path, &ignore_list))+ .filter_map(|e| e.ok())+ {let path = entry.path();if path.is_file() {if let Ok(meta) = std::fs::metadata(path) {@@ -469,7 +519,11 @@ impl<'a> FileUploader<'a> {};let walkdir = walkdir::WalkDir::new(dir_path);- for entry in walkdir.into_iter().filter_map(|e| e.ok()) {+ for entry in walkdir+ .into_iter()+ .filter_entry(ignore_dirs_filter(dir_path, &ignore_list))+ .filter_map(|e| e.ok())+ {let path = entry.path();if path.is_file() {let name = path.strip_prefix(dir_path).unwrap_or(path);diff --git a/crates/ov_cli/src/client.rs b/crates/ov_cli/src/client.rsindex 207641286..8e62a2564 100644--- a/crates/ov_cli/src/client.rs+++ b/crates/ov_cli/src/client.rs@@ -112,17 +112,21 @@ impl HttpClient {FileUploader::new(&self.base).with_upload_mode(self.upload_mode())}- fn zip_directory(&self, dir_path: &Path) -> Result<tempfile::NamedTempFile> {- self.create_uploader().zip_directory(dir_path)+ fn zip_directory(+ &self,+ dir_path: &Path,+ ignore_dirs: Option<&str>,+ ) -> Result<tempfile::NamedTempFile> {+ self.create_uploader().zip_directory(dir_path, ignore_dirs)}fn zip_directory_with_progress(&self,dir_path: &Path,verbose: bool,+ ignore_dirs: Option<&str>,) -> Result<tempfile::NamedTempFile> {- self.create_uploader()- .zip_directory_with_progress(dir_path, verbose)+ self.create_uploader().zip_directory_with_progress(dir_path, verbose, ignore_dirs)}async fn upload_temp_file(&self, file_path: &Path) -> Result<String> {@@ -462,9 +466,9 @@ impl HttpClient {.and_then(|n| n.to_str()).map(|s| s.to_string());let zip_file = if show_progress {- self.zip_directory_with_progress(path_obj, verbose)?+ self.zip_directory_with_progress(path_obj, verbose, ignore_dirs.as_deref())?} else {- self.zip_directory(path_obj)?+ self.zip_directory(path_obj, ignore_dirs.as_deref())?};let temp_file_id = if show_progress {self.upload_temp_file_with_progress(zip_file.path(), verbose)@@ -579,7 +583,7 @@ impl HttpClient {if path_obj.exists() {if path_obj.is_dir() {- let zip_file = self.zip_directory(path_obj)?;+ let zip_file = self.zip_directory(path_obj, None)?;let temp_file_id = self.upload_temp_file(zip_file.path()).await?;let body = serde_json::json!({