ooodc/PicoBot
1
0
Fork 0
Code Pull Requests Activity

feat: 简化内存维护逻辑，移除不必要的时间戳参数，优化代码可读性

Browse Source
This commit is contained in:
ooodc 2026-05-05 19:40:07 +08:00
parent aa7f1d6160
commit 7c48a0f7f9
5 changed files with 37 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/gateway/agent_task_executor.rs
View File

@ -61,13 +61,8 @@ impl SchedulerMaintenanceService {
self.session_manager.cleanup_expired_sessions().await
}
async fn run_memory_maintenance(
&self,
updated_since: Option<i64>,
) -> Result<Vec<MemoryMaintenanceScopeResult>, AgentError> {
self.session_manager
.run_memory_maintenance_for_all_scopes(updated_since)
.await
async fn run_memory_maintenance(&self) -> Result<Vec<MemoryMaintenanceScopeResult>, AgentError> {
self.session_manager.run_memory_maintenance_for_all_scopes().await
}
}
@ -77,11 +72,8 @@ impl MaintenanceExecutor for SchedulerMaintenanceService {
self.cleanup_sessions().await
}
async fn run_memory_maintenance_for_all_scopes(
&self,
updated_since: Option<i64>,
) -> anyhow::Result<Vec<MaintenanceRunSummary>> {
self.run_memory_maintenance(updated_since)
async fn run_memory_maintenance_for_all_scopes(&self) -> anyhow::Result<Vec<MaintenanceRunSummary>> {
self.run_memory_maintenance()
.await
.map(|results| {
results

16
src/gateway/memory_maintenance.rs
View File

@ -220,22 +220,10 @@ impl MemoryMaintenanceService {
pub(crate) async fn run_for_all_scopes(
&self,
updated_since: Option<i64>,
) -> Result<Vec<MemoryMaintenanceScopeResult>, AgentError> {
let scope_keys = if let Some(cutoff) = updated_since {
self.store
.list_memory_scope_keys_updated_since("user", cutoff)
.map_err(|err| {
AgentError::Other(format!(
"list memory scope keys updated since error: {}",
err
))
})?
} else {
self.store.list_memory_scope_keys("user").map_err(|err| {
let scope_keys = self.store.list_memory_scope_keys("user").map_err(|err| {
AgentError::Other(format!("list memory scope keys error: {}", err))
})?
};
})?;
let mut results = Vec::new();
for scope_key in scope_keys {

3
src/gateway/memory_maintenance_coordinator.rs
View File

@ -32,9 +32,8 @@ impl MemoryMaintenanceCoordinator {
pub(crate) async fn run_for_all_scopes(
&self,
updated_since: Option<i64>,
) -> Result<Vec<MemoryMaintenanceScopeResult>, AgentError> {
self.service()?.run_for_all_scopes(updated_since).await
self.service()?.run_for_all_scopes().await
}
fn service(&self) -> Result<MemoryMaintenanceService, AgentError> {

37
src/gateway/session.rs
View File

@ -420,11 +420,8 @@ impl SessionManager {
pub(crate) async fn run_memory_maintenance_for_all_scopes(
&self,
updated_since: Option<i64>,
) -> Result<Vec<MemoryMaintenanceScopeResult>, AgentError> {
self.memory_maintenance
.run_for_all_scopes(updated_since)
.await
self.memory_maintenance.run_for_all_scopes().await
}
/// 确保 session 存在且未超时，超时则重建
@ -1239,18 +1236,34 @@ mod tests {
}
#[tokio::test]
async fn test_run_memory_maintenance_for_all_scopes_returns_empty_when_no_recent_updates() {
async fn test_run_memory_maintenance_for_all_scopes_scans_all_scopes_even_without_recent_updates() {
let mock_response_content = serde_json::to_string(&json!({
"user_facts": ["用户在做AI产品"],
"preferences": [],
"behavior_patterns": [],
"merges": [],
"conflicts": [],
"low_value_ids": [],
"managed_markdown": "### 用户事实\n- 用户在做AI产品"
}))
.unwrap();
let base_url =
start_mock_openai_server_with_content(Some(mock_response_content.clone())).await;
let provider_config = LLMProviderConfig {
provider_type: "openai".to_string(),
name: "maintenance-provider".to_string(),
base_url: "http://localhost".to_string(),
base_url,
api_key: "test-key".to_string(),
extra_headers: HashMap::new(),
model_id: "maintenance-model".to_string(),
temperature: Some(0.0),
max_tokens: Some(256),
context_window_tokens: None,
model_extra: HashMap::new(),
model_extra: HashMap::from([(
"mock_response_content".to_string(),
json!(mock_response_content),
)]),
max_tool_iterations: 1,
llm_timeout_secs: 30,
tool_result_max_chars: 20_000,
@ -1268,7 +1281,7 @@ mod tests {
)
.unwrap();
let memory = session_manager
session_manager
.store()
.put_memory(&crate::storage::MemoryUpsert {
scope_kind: "user".to_string(),
@ -1286,11 +1299,13 @@ mod tests {
.unwrap();
let results = session_manager
.run_memory_maintenance_for_all_scopes(Some(memory.updated_at + 1))
.run_memory_maintenance_for_all_scopes()
.await
.unwrap();
assert!(results.is_empty());
assert_eq!(results.len(), 1);
assert_eq!(results[0].scope_key, "feishu:user-1");
assert!(results[0].output.user_facts.contains(&"用户在做AI产品".to_string()));
}
#[tokio::test]
@ -1343,7 +1358,7 @@ mod tests {
}
let results = session_manager
.run_memory_maintenance_for_all_scopes(None)
.run_memory_maintenance_for_all_scopes()
.await
.unwrap();

14
src/scheduler/mod.rs
View File

@ -52,10 +52,7 @@ pub trait AgentTaskExecutor: Send + Sync {
pub trait MaintenanceExecutor: Send + Sync {
async fn cleanup_expired_sessions(&self) -> usize;
async fn run_memory_maintenance_for_all_scopes(
&self,
updated_since: Option<i64>,
) -> anyhow::Result<Vec<MaintenanceRunSummary>>;
async fn run_memory_maintenance_for_all_scopes(&self) -> anyhow::Result<Vec<MaintenanceRunSummary>>;
}
pub struct Scheduler {
@ -652,9 +649,7 @@ async fn execute_internal_event(
Ok(())
}
"memory_maintenance" => {
let results = maintenance_executor
.run_memory_maintenance_for_all_scopes(job.last_fired_at)
.await?;
let results = maintenance_executor.run_memory_maintenance_for_all_scopes().await?;
for result in &results {
tracing::info!(
job_id = %job.id,
@ -1039,10 +1034,7 @@ mod tests {
0
}
async fn run_memory_maintenance_for_all_scopes(
&self,
_updated_since: Option<i64>,
) -> anyhow::Result<Vec<MaintenanceRunSummary>> {
async fn run_memory_maintenance_for_all_scopes(&self) -> anyhow::Result<Vec<MaintenanceRunSummary>> {
Ok(Vec::new())
}
}