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/oc2ov timeout tolerance (#1726)
kaisongli34ab56705d14
diff --git a/tests/oc2ov_test/tests/base_cli_test.py b/tests/oc2ov_test/tests/base_cli_test.pyindex fe3bf5323..b6c6453cb 100644--- a/tests/oc2ov_test/tests/base_cli_test.py+++ b/tests/oc2ov_test/tests/base_cli_test.py@@ -188,6 +188,7 @@ class BaseOpenClawCLITest(unittest.TestCase):session_id: str = None,agent_id: str = None,retry_on_failure: bool = False,+ timeout: int = None,):"""发送消息并记录日志@@ -197,6 +198,7 @@ class BaseOpenClawCLITest(unittest.TestCase):session_id: session ID(默认使用当前测试类的 session_id)agent_id: agent IDretry_on_failure: 是否在失败时重试+ timeout: 命令超时时间(秒),默认使用客户端配置Returns:dict: 响应结果@@ -215,11 +217,15 @@ class BaseOpenClawCLITest(unittest.TestCase):@self.retry_manager.retry_on_exception(Exception)def send_with_retry():- return self.client.send_message(message, target_session_id, agent_id)+ return self.client.send_message(+ message, target_session_id, agent_id, timeout=timeout+ )response = send_with_retry()else:- response = self.client.send_message(message, target_session_id, agent_id)+ response = self.client.send_message(+ message, target_session_id, agent_id, timeout=timeout+ )self.logger.info("\n" + "◂" * 40)self.logger.info("📩 测试步骤 - 响应接收")@@ -241,8 +247,13 @@ class BaseOpenClawCLITest(unittest.TestCase):"couldn't generate a response","couldn't generate","please try again",+ "命令执行超时",]- return any(ind.lower() in text.lower() for ind in timeout_indicators)+ if any(ind.lower() in text.lower() for ind in timeout_indicators):+ return True+ if isinstance(response, dict) and response.get("error", "").startswith("命令执行超时"):+ return True+ return Falsedef _is_empty_response(self, response) -> bool:text = self.assertion.extract_response_text(response)@@ -290,10 +301,13 @@ class BaseOpenClawCLITest(unittest.TestCase):agent_id: str = None,max_retries: int = 3,retry_delay: float = 8.0,+ timeout: int = None,):target_session_id = session_id or self.current_session_idfor attempt in range(max_retries + 1):- response = self.send_and_log(message, session_id=target_session_id, agent_id=agent_id)+ response = self.send_and_log(+ message, session_id=target_session_id, agent_id=agent_id, timeout=timeout+ )is_timeout = self._is_llm_timeout(response)is_empty = self._is_empty_response(response)is_tool_result = self._is_tool_result_only(response)@@ -352,9 +366,12 @@ class BaseOpenClawCLITest(unittest.TestCase):"couldn't generate a response","please try again","NO_REPLY",+ "命令执行超时",]if any(ind.lower() in text.lower() for ind in unstable_indicators):return True+ if isinstance(response, dict) and response.get("error", "").startswith("命令执行超时"):+ return Trueif text.startswith('[{"name"') and len(text) < 300:return Trueif text == "}]" or text == "}":diff --git a/tests/oc2ov_test/tests/p0/test_context_engine.py b/tests/oc2ov_test/tests/p0/test_context_engine.pyindex 7fef5528e..70777066e 100644--- a/tests/oc2ov_test/tests/p0/test_context_engine.py+++ b/tests/oc2ov_test/tests/p0/test_context_engine.py@@ -29,15 +29,20 @@ from tests.base_cli_test import BaseOpenClawCLITestSERVER_URL = os.environ.get("SERVER_URL", "http://127.0.0.1:1933")OPENVIKING_API_KEY = os.environ.get("OPENVIKING_API_KEY", "test-root-api-key")+OPENVIKING_ACCOUNT = os.environ.get("OPENVIKING_ACCOUNT", "default")+OPENVIKING_USER = os.environ.get("OPENVIKING_USER", "default")TASK_POLL_INTERVAL = 5TASK_POLL_MAX_WAIT = 120def _get_api_headers() -> Dict[str, str]:- return {- "X-OpenViking-API-Key": OPENVIKING_API_KEY,+ headers = {+ "X-API-Key": OPENVIKING_API_KEY,+ "X-OpenViking-Account": OPENVIKING_ACCOUNT,+ "X-OpenViking-User": OPENVIKING_USER,"Content-Type": "application/json",}+ return headersclass OVSessionVerifier:@@ -257,6 +262,7 @@ class TestAssembleArchiveReplay(BaseOpenClawCLITest):response = self.send_and_retry_on_timeout(f"我之前提到的{unique_marker}是什么?目标是什么?请从你的记忆或上下文中搜索",session_id=session_b,+ timeout=300,)self.assertAnyKeywordInResponse(response,@@ -331,6 +337,7 @@ class TestMemoryRecallExplicit(BaseOpenClawCLITest):response = self.send_and_retry_on_timeout("请搜索你的记忆,我之前有没有提到过一个和加密通信或者协议相关的项目?请仔细搜索记忆文件后回答",session_id=session_b,+ timeout=300,)self.logger.info("[6/7] 验证回复包含记忆中的关键信息(对话级别断言)")@@ -503,6 +510,7 @@ class TestSessionIsolation(BaseOpenClawCLITest):response_a = self.send_and_retry_on_timeout("请根据你记住的关于我的信息回答:我之前告诉过你我在做什么项目?负责什么工作?不要调用任何外部工具,直接从记忆中回答",session_id=session_a,+ timeout=300,)self.assertAnyKeywordInResponse(response_a,@@ -514,6 +522,7 @@ class TestSessionIsolation(BaseOpenClawCLITest):response_b = self.send_and_retry_on_timeout("请根据你记住的关于我的信息回答:我之前告诉过你我在做什么项目?负责什么工作?不要调用任何外部工具,直接从记忆中回答",session_id=session_b,+ timeout=300,)self.assertAnyKeywordInResponse(response_b,@@ -582,6 +591,7 @@ class TestCompactArchiveGeneration(BaseOpenClawCLITest):response = self.send_and_retry_on_timeout("我负责的项目叫什么?核心模块是什么?",session_id=session_id,+ timeout=300,)self.assertAnyKeywordInResponse(response,@@ -593,6 +603,7 @@ class TestCompactArchiveGeneration(BaseOpenClawCLITest):response2 = self.send_and_retry_on_timeout("我们团队有几个人?项目截止日期是什么时候?",session_id=session_id,+ timeout=300,)self.assertAnyKeywordInResponse(response2,@@ -665,6 +676,7 @@ class TestCrossSessionRecall(BaseOpenClawCLITest):response = self.send_and_retry_on_timeout(f"我之前提到的{unique_marker}是什么?有什么特点?",session_id=session_b,+ timeout=300,)self.logger.info("[7/7] 验证 session B 通过 auto-recall 获取到 session A 的记忆")diff --git a/tests/oc2ov_test/tests/p0/test_memory_crud.py b/tests/oc2ov_test/tests/p0/test_memory_crud.pyindex 63f94e5a5..df76e4690 100644--- a/tests/oc2ov_test/tests/p0/test_memory_crud.py+++ b/tests/oc2ov_test/tests/p0/test_memory_crud.py@@ -61,7 +61,7 @@ class TestMemoryRead(BaseOpenClawCLITest):for query, expected_keywords, desc in queries:self.logger.info(f" 查询: {query} (场景: {desc})")- resp = self.send_and_retry_on_timeout(query, session_id=session_id)+ resp = self.send_and_retry_on_timeout(query, session_id=session_id, timeout=300)self.assertAnyKeywordInResponse(resp, expected_keywords, case_sensitive=False)@@ -93,7 +93,7 @@ class TestMemoryUpdate(BaseOpenClawCLITest):)self.logger.info("[3/4] 验证更新是否生效")- resp1 = self.send_and_retry_on_timeout("我现在多少岁?我的职业是什么?")+ resp1 = self.send_and_retry_on_timeout("我现在多少岁?我的职业是什么?", timeout=300)self.assertAnyKeywordInResponse(resp1, [["29", "二十九"], ["数据科学家"]], case_sensitive=False)@@ -132,7 +132,9 @@ class TestMemoryDelete(BaseOpenClawCLITest):)self.logger.info("[2/4] 确认信息已存在")- resp1 = self.send_and_retry_on_timeout("我的临时密码是什么?", session_id=session_id)+ resp1 = self.send_and_retry_on_timeout(+ "我的临时密码是什么?", session_id=session_id, timeout=300+ )self.assertAnyKeywordInResponse(resp1, [["temp12345"]], case_sensitive=False)self.logger.info("[3/4] 请求删除临时密码信息并 commit")@@ -150,6 +152,7 @@ class TestMemoryDelete(BaseOpenClawCLITest):resp2 = self.send_and_retry_on_timeout("我的临时密码是什么?请根据你记住的信息回答,不要调用外部工具",session_id=session_id,+ timeout=300,)self.logger.info("删除验证完成,检查响应是否表明密码已过期或已删除")self.assertAnyKeywordInResponse(@@ -210,7 +213,7 @@ class TestMemoryUpdateOverwrite(BaseOpenClawCLITest):self.logger.info("[3/4] 查询并验证记忆信息")response = self.send_and_retry_on_timeout(- "我今年几岁?生日是什么时候?", session_id=session_a+ "我今年几岁?生日是什么时候?", session_id=session_a, timeout=300)self.logger.info("[4/4] 验证结果:应包含新信息(31岁、8月),不应包含旧信息(30岁)")diff --git a/tests/oc2ov_test/tests/p0/test_memory_v2_full_suite.py b/tests/oc2ov_test/tests/p0/test_memory_v2_full_suite.pyindex f43a14280..9f7009d38 100644--- a/tests/oc2ov_test/tests/p0/test_memory_v2_full_suite.py+++ b/tests/oc2ov_test/tests/p0/test_memory_v2_full_suite.py@@ -25,15 +25,28 @@ from utils.test_utils import SessionIdManagerSERVER_URL = os.environ.get("SERVER_URL", "http://127.0.0.1:1933")OPENVIKING_API_KEY = os.environ.get("OPENVIKING_API_KEY", "test-root-api-key")+OPENVIKING_ACCOUNT = os.environ.get("OPENVIKING_ACCOUNT", "default")+OPENVIKING_USER = os.environ.get("OPENVIKING_USER", "default")TASK_POLL_INTERVAL = 5TASK_POLL_MAX_WAIT = 120+OV_MODE = os.environ.get("OV_MODE", "local")+++def _is_remote_mode() -> bool:+ return OV_MODE == "remote" or SERVER_URL not in (+ "http://127.0.0.1:1933",+ "http://localhost:1933",+ )def _get_api_headers() -> Dict[str, str]:- return {- "X-OpenViking-API-Key": OPENVIKING_API_KEY,+ headers = {+ "X-API-Key": OPENVIKING_API_KEY,+ "X-OpenViking-Account": OPENVIKING_ACCOUNT,+ "X-OpenViking-User": OPENVIKING_USER,"Content-Type": "application/json",}+ return headersdef get_viking_data_dir() -> Path:@@ -181,6 +194,51 @@ class OpenVikingAPIClient:time.sleep(TASK_POLL_INTERVAL)return {"status": "timeout", "task_id": task_id}+ def get_memory_stats(self) -> Dict[str, Any]:+ try:+ resp = requests.get(+ f"{self.server_url}/api/v1/stats/memories",+ headers=self.headers,+ timeout=10,+ )+ if resp.status_code != 200:+ return {}+ return resp.json().get("result", {})+ except Exception:+ return {}++ def search_memories(self, query: str, limit: int = 10) -> List[Dict[str, Any]]:+ try:+ resp = requests.post(+ f"{self.server_url}/api/v1/search/find",+ headers=self.headers,+ json={"query": query, "limit": limit},+ timeout=15,+ )+ if resp.status_code != 200:+ return []+ return resp.json().get("result", {}).get("memories", [])+ except Exception:+ return []++ def list_memory_files(self, memory_type: str) -> List[str]:+ try:+ uri = f"viking://user/default/memories/{memory_type}"+ resp = requests.get(+ f"{self.server_url}/api/v1/fs/ls",+ headers=self.headers,+ params={"uri": uri, "recursive": "true", "simple": "true"},+ timeout=10,+ )+ if resp.status_code != 200:+ return []+ result = resp.json().get("result", [])+ if isinstance(result, list):+ return [str(r) for r in result if str(r).endswith(".md")]+ return []+ except Exception:+ return []+class MemoryV2TestSuite:"""Memory V2 全面测试套件 - OpenClaw 对话 + OV API commit"""@@ -283,7 +341,9 @@ class MemoryV2TestSuite:"all_files": [],}- # 先检查目标类型目录+ if _is_remote_mode():+ return self._check_memory_files_remote(memory_type, before_files)+target_result = self._check_target_type(memory_type, before_files)result["new_files"].extend(target_result["new_files"])result["modified_files"].extend(target_result["modified_files"])@@ -293,7 +353,6 @@ class MemoryV2TestSuite:result["found"] = Truereturn result- # 目标目录无变化,扫描全目录查找新增/修改的文件print(f" ⚠ {memory_type} 目录无直接变化,扫描全目录...")after_files = self._snapshot_all_memory_files()@@ -315,6 +374,70 @@ class MemoryV2TestSuite:print(" ✗ 全目录扫描均无新增或修改的记忆文件")return result+ def _check_memory_files_remote(+ self, memory_type: str, before_files: Dict[str, float]+ ) -> Dict[str, Any]:+ """远端模式:通过 OV API 验证记忆是否写入成功"""+ result = {+ "memory_type": memory_type,+ "found": False,+ "new_files": [],+ "modified_files": [],+ "all_files": [],+ }++ print(" [远端模式] 通过 OV API 验证记忆...")++ before_uris = set(before_files.get("_remote_uris", []))+ before_count = before_files.get("_remote_category_count", 0)++ after_files_list = self.api.list_memory_files(memory_type)+ after_uris = set(after_files_list)+ new_uris = after_uris - before_uris++ stats = self.api.get_memory_stats()+ by_category = stats.get("by_category", {})+ after_count = by_category.get(memory_type, 0)+ count_diff = after_count - before_count+ print(+ f" /api/v1/stats/memories → {memory_type}: {before_count} → {after_count} (增量: {count_diff})"+ )+ print(+ f" /api/v1/fs/ls → {memory_type}: 文件 {len(before_uris)} → {len(after_uris)} (新增: {len(new_uris)})"+ )++ if new_uris:+ result["found"] = True+ result["new_files"] = list(new_uris)+ print(f" ✓ {memory_type} 目录新增 {len(new_uris)} 个文件")+ for uri in list(new_uris)[:3]:+ print(f" + {uri}")++ if count_diff > 0:+ result["found"] = True+ print(f" ✓ {memory_type} 类别计数增加 {count_diff} 条")++ if not result["found"]:+ scenario = next(+ (s for s in self.test_scenarios if s["memory_type"] == memory_type), None+ )+ if scenario:+ search_keywords = scenario["test_message"][:30]+ memories = self.api.search_memories(search_keywords, limit=5)+ if memories:+ result["found"] = True+ result["new_files"] = [m.get("uri", "") for m in memories]+ print(f" ✓ 通过 search/find 找到 {len(memories)} 条相关记忆")+ for m in memories[:3]:+ uri = m.get("uri", "")+ score = m.get("score", 0)+ abstract = (m.get("abstract", "") or "")[:60]+ print(f" - {uri} (score={score:.3f}) {abstract}...")++ if not result["found"]:+ print(f" ✗ 远端验证失败:{memory_type} 无新增记忆 (计数无变化且无新文件)")+ return result+def _relative_display(self, file_str: str) -> str:"""生成相对路径用于显示"""try:@@ -450,9 +573,23 @@ class MemoryV2TestSuite:# 步骤 1: 记录当前 OV sessions 快照和全目录记忆文件快照print("\n[步骤 1/5] 记录快照")before_session_ids = self.api.list_session_ids()- before_memory_files = self._snapshot_all_memory_files()- print(f" 当前 session 数量: {len(before_session_ids)}")- print(f" 当前全目录记忆文件数量: {len(before_memory_files)}")+ if _is_remote_mode():+ before_stats = self.api.get_memory_stats()+ before_count = before_stats.get("by_category", {}).get(scenario["memory_type"], 0)+ before_uris = self.api.list_memory_files(scenario["memory_type"])+ before_memory_files = {+ "_remote_uris": before_uris,+ "_remote_category_count": before_count,+ }+ print(f" 当前 session 数量: {len(before_session_ids)}")+ print(f" [远端模式] 记忆统计: {before_stats.get('by_category', {})}")+ print(+ f" [远端模式] {scenario['memory_type']} 文件数: {len(before_uris)}, 计数: {before_count}"+ )+ else:+ before_memory_files = self._snapshot_all_memory_files()+ print(f" 当前 session 数量: {len(before_session_ids)}")+ print(f" 当前全目录记忆文件数量: {len(before_memory_files)}")print(f" 场景 session ID: {scenario_session_id}")result["steps"]["snapshot"] = "success"@@ -462,21 +599,34 @@ class MemoryV2TestSuite:self.run_openclaw_command(scenario["test_message"], scenario_session_id)print("✓ OpenClaw 对话完成")result["steps"]["openclaw_chat"] = "success"- time.sleep(2)+ time.sleep(5)# 步骤 3: 找到 OV session 并 commitprint("\n[步骤 3/5] 查找 OV session 并 commit")ov_session_id = self.api.find_new_session_id(before_session_ids)if not ov_session_id:- print(" ⚠ 未找到新 session,在已有 session 中查找消息最多的")- ov_session_id = self.api.find_session_with_most_messages()-+ print(" ⚠ 未找到新 session,等待后重试...")+ time.sleep(5)+ ov_session_id = self.api.find_new_session_id(before_session_ids)if not ov_session_id:- print(" ✗ 无可用 session")- result["steps"]["commit"] = "failed"- result["status"] = "error"- result["error"] = "未找到 OV session"- return False, result+ print(" ⚠ 仍未找到新 session,跳过 commit 步骤,直接检查记忆文件")+ result["steps"]["commit"] = "skipped"+ result["ov_session_id"] = None+ print("\n[步骤 4/5] 跳过 (无 OV session)")+ print("\n[步骤 5/5] 验证记忆文件变化")+ memory_files_result = self.check_memory_files(+ scenario["memory_type"], before_memory_files+ )+ result["memory_files"] = memory_files_result+ if memory_files_result["found"]:+ result["steps"]["memory_files"] = "success"+ result["status"] = "passed"+ return True, result+ else:+ result["steps"]["memory_files"] = "failed"+ result["status"] = "failed"+ result["error"] = f"{scenario['memory_type']}: 未找到 OV session 且无新增记忆"+ return False, resultprint(f" OV session ID: {ov_session_id}")commit_resp = self.api.commit_session(ov_session_id)@@ -484,11 +634,65 @@ class MemoryV2TestSuite:commit_result = commit_data.get("result", {})task_id = commit_result.get("task_id")+ if not task_id and commit_result.get("status") == "accepted":+ print(+ " ⚠ Commit 返回 accepted 但无 task_id(对话 token 数可能不足阈值),补充对话后重试..."+ )+ follow_ups = [+ "请详细总结一下我刚才告诉你的所有信息,逐条列出。",+ "你能复述一下我的个人情况吗?越详细越好。",+ ]+ for follow_up in follow_ups:+ try:+ self.run_openclaw_command(follow_up, scenario_session_id)+ time.sleep(2)+ except Exception:+ pass+ commit_resp = self.api.commit_session(ov_session_id)+ commit_data = commit_resp.get("data", {})+ commit_result = commit_data.get("result", {})+ task_id = commit_result.get("task_id")+if commit_resp["status_code"] == 200 and task_id:print(f"✓ Commit 成功 (task_id: {task_id})")result["steps"]["commit"] = "success"result["ov_session_id"] = ov_session_idresult["task_id"] = task_id+ elif commit_resp["status_code"] == 200 and not task_id:+ print(" ⚠ Commit 返回 task_id=None (session 可能无待处理消息)")+ print(" 等待 10 秒后重试 commit...")+ time.sleep(10)+ commit_resp = self.api.commit_session(ov_session_id)+ commit_data = commit_resp.get("data", {})+ commit_result = commit_data.get("result", {})+ task_id = commit_result.get("task_id")+ if task_id:+ print(f"✓ 重试 Commit 成功 (task_id: {task_id})")+ result["steps"]["commit"] = "success"+ result["ov_session_id"] = ov_session_id+ result["task_id"] = task_id+ else:+ print(" ⚠ 重试仍无 task_id,跳过记忆提取步骤")+ result["steps"]["commit"] = "accepted_no_task"+ result["ov_session_id"] = ov_session_id+ result["steps"]["memory_extraction"] = "skipped"+ print("\n[步骤 4/5] 跳过 (无 task_id)")+ print("\n[步骤 5/5] 验证记忆文件变化")+ memory_files_result = self.check_memory_files(+ scenario["memory_type"], before_memory_files+ )+ result["memory_files"] = memory_files_result+ if memory_files_result["found"]:+ result["steps"]["memory_files"] = "success"+ result["status"] = "passed"+ return True, result+ else:+ result["steps"]["memory_files"] = "failed"+ result["status"] = "failed"+ result["error"] = (+ f"{scenario['memory_type']}: Commit 无 task_id 且无新增记忆"+ )+ return False, resultelse:print(f"✗ Commit 失败: {commit_resp}")result["steps"]["commit"] = "failed"diff --git a/tests/oc2ov_test/utils/openclaw_cli_client.py b/tests/oc2ov_test/utils/openclaw_cli_client.pyindex d7ec6f3d5..56f04ff63 100644--- a/tests/oc2ov_test/utils/openclaw_cli_client.py+++ b/tests/oc2ov_test/utils/openclaw_cli_client.py@@ -52,15 +52,20 @@ class OpenClawCLIClient:初始化客户端"""self.session_id = session_id or "test_session_default"- self.timeout = 180+ self.timeout = 300def send_message(- self, message: str, session_id: Optional[str] = None, agent_id: Optional[str] = None+ self,+ message: str,+ session_id: Optional[str] = None,+ agent_id: Optional[str] = None,+ timeout: Optional[int] = None,) -> Dict[str, Any]:"""使用 openclaw agent 命令发送消息"""target_session_id = session_id or self.session_id+ cmd_timeout = timeout or self.timeoutcmd = ["openclaw",@@ -89,9 +94,9 @@ class OpenClawCLIClient:if not lock_released:logger.warning("Session lock not released, request may fail with lock timeout")- logger.info(f"⏳ 等待响应 (超时: {self.timeout}秒)...")+ logger.info(f"⏳ 等待响应 (超时: {cmd_timeout}秒)...")- result = subprocess.run(cmd, capture_output=True, text=True, timeout=self.timeout)+ result = subprocess.run(cmd, capture_output=True, text=True, timeout=cmd_timeout)logger.info(f"✅ 命令执行完成 - 返回码: {result.returncode}")@@ -131,7 +136,7 @@ class OpenClawCLIClient:return response_dataexcept subprocess.TimeoutExpired:- error_msg = f"命令执行超时 (超时: {self.timeout}秒)"+ error_msg = f"命令执行超时 (超时: {cmd_timeout}秒)"logger.error("=" * 80)logger.error(error_msg)logger.error("=" * 80)