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
feat(ragfs): optimize S3 head-object error message return and parallelize legacy shape probe (#2692)
baojun-zhangb586a0c63850
diff --git a/crates/ragfs/src/plugins/s3fs/client.rs b/crates/ragfs/src/plugins/s3fs/client.rsindex d79df5395..c6b405bc0 100644--- a/crates/ragfs/src/plugins/s3fs/client.rs+++ b/crates/ragfs/src/plugins/s3fs/client.rs@@ -4,6 +4,7 @@//! Supports AWS S3 and S3-compatible services (MinIO, LocalStack, TOS).use crate::core::{ConfigValue, Error, Result};+use aws_sdk_s3::config::http::HttpResponse;use aws_sdk_s3::config::{BehaviorVersion, Credentials, Region};use aws_sdk_s3::error::ProvideErrorMetadata;use aws_sdk_s3::error::SdkError;@@ -63,22 +64,49 @@ wherefn format_sdk_s3_error<E, R>(op: &str, scope: &str, sdk_err: &SdkError<E, R>) -> ErrorwhereE: std::fmt::Display + ProvideErrorMetadata + RequestId + RequestIdExt,+ R: std::fmt::Debug + Send + Sync + 'static,{- let raw_error = sdk_err.to_string();- if let Some(service_err) = sdk_err.as_service_error() {- Error::internal(build_s3_error_message(+ use std::any::Any;++ match sdk_err {+ SdkError::ServiceError(se) => {+ if let Some(resp) = (se.raw() as &dyn Any).downcast_ref::<HttpResponse>() {+ let status = resp.status().as_u16();+ let headers = resp.headers();+ Error::internal(build_s3_error_message(+ op,+ scope,+ &format!("HTTP {}: {}", status, se.err()),+ se.err().code(),+ se.err().message(),+ se.err()+ .request_id()+ .or_else(|| headers.get("x-amz-request-id")),+ se.err()+ .extended_request_id()+ .or_else(|| headers.get("x-amz-id-2")),+ ))+ } else {+ Error::internal(build_s3_error_message(+ op,+ scope,+ &format!("service error: {}", se.err()),+ se.err().code(),+ se.err().message(),+ se.err().request_id(),+ se.err().extended_request_id(),+ ))+ }+ }+ _ => Error::internal(build_s3_error_message(op,scope,- &raw_error,- service_err.code(),- service_err.message(),- service_err.request_id(),- service_err.extended_request_id(),- ))- } else {- Error::internal(build_s3_error_message(- op, scope, &raw_error, None, None, None, None,- ))+ &sdk_err.to_string(),+ None,+ None,+ None,+ None,+ )),}}@@ -623,14 +651,17 @@ impl S3Client {}Err(sdk_err) => {// Check if it's a 404- let service_err = sdk_err.into_service_error();- if service_err.is_not_found() {+ if sdk_err+ .as_service_error()+ .map(|err| err.is_not_found())+ .unwrap_or(false)+ {Ok(None)} else {- Err(format_s3_service_error(+ Err(format_sdk_s3_error("HeadObject",&format!("bucket={} key={}", self.bucket, key),- &service_err,+ &sdk_err,))}}diff --git a/crates/ragfs/src/shape/probe.rs b/crates/ragfs/src/shape/probe.rsindex 9862d663e..ad8ac0f5e 100644--- a/crates/ragfs/src/shape/probe.rs+++ b/crates/ragfs/src/shape/probe.rs@@ -4,6 +4,7 @@ use crate::core::errors::{Error, Result};use crate::core::filesystem::FileSystem;use crate::core::WriteFlag;use crate::crypto;+use futures::stream::{self, StreamExt};use super::manifest::{StorageShape, SHAPE_MANIFEST_PATH};@@ -109,7 +110,7 @@ pub async fn write_shape_guard(/// Probe existing backend files to infer the legacy storage shape.pub async fn detect_legacy_shape(raw_fs: &Arc<dyn FileSystem>) -> Result<Option<StorageShape>> {let entries = raw_fs.tree_directory("/", true, None, None).await?;- let mut detected: Option<StorageShape> = None;+ let mut candidates = Vec::new();for entry in entries {// Zero-byte files are a legacy plaintext artifact in the current implementation, but they@@ -123,9 +124,22 @@ pub async fn detect_legacy_shape(raw_fs: &Arc<dyn FileSystem>) -> Result<Option<if normalized == SHAPE_MANIFEST_PATH || is_persistent_task_record_path(&normalized) {continue;}+ candidates.push(normalized);+ }++ let mut detected: Option<StorageShape> = None;+ let mut probes = stream::iter(candidates.into_iter().map(|normalized| {+ let raw_fs = Arc::clone(raw_fs);+ async move {+ let header = raw_fs.read(&normalized, 0, 6).await?;+ let current = shape_from_raw_bytes(&normalized, &header)?;+ Ok::<(String, StorageShape), Error>((normalized, current))+ }+ }))+ .buffer_unordered(16);- let header = raw_fs.read(&normalized, 0, 6).await?;- let current = shape_from_raw_bytes(&normalized, &header)?;+ while let Some(item) = probes.next().await {+ let (normalized, current) = item?;match &detected {None => detected = Some(current),