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(bot): Fix mention, opt search tool result, Raise the limit count (#1678)
yeshion23333305aa0a71f3d
diff --git a/bot/vikingbot/agent/context.py b/bot/vikingbot/agent/context.pyindex d4d2dfb1c..2f829857c 100644--- a/bot/vikingbot/agent/context.py+++ b/bot/vikingbot/agent/context.py@@ -46,6 +46,7 @@ class ContextBuilder:self._sender_name = sender_nameself._is_group_chat = is_group_chatself._eval = eval+ self.latest_relevant_memories: str | None = None@propertydef memory(self):@@ -203,7 +204,10 @@ Skills with available="false" need dependencies installed first - you can try inf"[READ_USER_MEMORY]: cost {cost}s, memory={viking_memory[:50] if viking_memory else 'None'}")if viking_memory:+ self.latest_relevant_memories = viking_memoryparts.append(f"## openviking_search(query=[user_query])\n{viking_memory}")+ else:+ self.latest_relevant_memories = Noneparts.append("Reply in the same language as the user's query, ignoring the language of the reference materials. User's query:"diff --git a/bot/vikingbot/agent/loop.py b/bot/vikingbot/agent/loop.pyindex d3cc26474..d6e507377 100644--- a/bot/vikingbot/agent/loop.py+++ b/bot/vikingbot/agent/loop.py@@ -604,6 +604,7 @@ class AgentLoop:profile_user_list=profile_user_list,memory_user=memory_user,)+ relevant_memories = message_context.latest_relevant_memories# logger.info(f"New messages: {json.dumps(messages, indent=4)}")# Run agent loop@@ -636,10 +637,13 @@ class AgentLoop:tools_used_names = [tool["tool_name"] for tool in tools_used]else:tools_used_names = []+ response_metadata = dict(msg.metadata or {})+ if relevant_memories is not None:+ response_metadata["relevant_memories"] = relevant_memoriesreturn OutboundMessage(session_key=msg.session_key,content=final_content,- metadata=msg.metadata,+ metadata=response_metadata,token_usage=token_usage,time_cost=time_cost,iteration=iteration,diff --git a/bot/vikingbot/agent/tools/ov_file.py b/bot/vikingbot/agent/tools/ov_file.pyindex 8ccfdaa73..e51da8fb0 100644--- a/bot/vikingbot/agent/tools/ov_file.py+++ b/bot/vikingbot/agent/tools/ov_file.py@@ -1,6 +1,7 @@"""OpenViking file system tools: read, write, list, search resources."""import asyncio+import jsonfrom abc import ABCfrom pathlib import Pathfrom typing import Any, Optional, Union@@ -99,31 +100,157 @@ class VikingSearchTool(OVFileTool):"type": "string","description": "Optional target URI to limit search scope, if is None, then search the entire range.(e.g., viking://resources/)",},+ "min_score": {+ "type": "number",+ "description": "Minimum relevance score threshold",+ "default": 0.35,+ },},"required": ["query"],}+ @staticmethod+ def _extract_search_items(results: Any) -> list[dict[str, Any]]:+ items: list[dict[str, Any]] = []+ group_map = {+ "memories": "memory",+ "resources": "resource",+ "skills": "skill",+ }++ if isinstance(results, dict):+ for key, item_type in group_map.items():+ group = results.get(key, [])+ if not isinstance(group, list):+ continue+ for item in group:+ if isinstance(item, dict):+ items.append({**item, "type": item.get("type", item_type)})+ return items++ if hasattr(results, "memories") or hasattr(results, "resources") or hasattr(results, "skills"):+ for key, item_type in group_map.items():+ for item in getattr(results, key, []) or []:+ items.append(+ {+ "type": item_type,+ "uri": getattr(item, "uri", ""),+ "abstract": getattr(item, "abstract", ""),+ "is_leaf": getattr(item, "is_leaf", False),+ "score": getattr(item, "score", 0.0),+ }+ )+ return items++ if isinstance(results, list):+ for item in results:+ if isinstance(item, dict):+ raw_type = str(item.get("type") or item.get("context_type") or "").lower()+ item_type = "resource"+ if "memory" in raw_type:+ item_type = "memory"+ elif "skill" in raw_type:+ item_type = "skill"+ items.append({**item, "type": item_type})+ else:+ raw_type = str(getattr(item, "context_type", "")).lower()+ item_type = "resource"+ if "memory" in raw_type:+ item_type = "memory"+ elif "skill" in raw_type:+ item_type = "skill"+ items.append(+ {+ "type": item_type,+ "uri": getattr(item, "uri", ""),+ "abstract": getattr(item, "abstract", ""),+ "is_leaf": getattr(item, "is_leaf", False),+ "score": getattr(item, "score", 0.0),+ }+ )++ return items++ @staticmethod+ def _to_float(value: Any) -> float:+ try:+ return float(value)+ except (TypeError, ValueError):+ return 0.0++ def _filter_search_items(self, results: Any, min_score: float) -> dict[str, list[dict[str, Any]]]:+ grouped: dict[str, list[dict[str, Any]]] = {+ "memory": [],+ "resource": [],+ "skill": [],+ }+ for item in self._extract_search_items(results):+ score = self._to_float(item.get("score", 0.0))+ if score < min_score:+ continue+ item_type = str(item.get("type", "resource")).lower()+ if item_type not in grouped:+ item_type = "resource"+ grouped[item_type].append(+ {+ "uri": str(item.get("uri", "") or ""),+ "abstract": str(item.get("abstract", "") or ""),+ "is_leaf": bool(item.get("is_leaf", False)),+ "score": score,+ }+ )+ return grouped++ @staticmethod+ def _build_group_json(items: list[dict[str, Any]]) -> list[dict[str, Any]]:+ group_items: list[dict[str, Any]] = []+ for index, item in enumerate(items, 1):+ group_items.append(+ {+ "index": index,+ "uri": item["uri"],+ "abstract": item["abstract"],+ "is_leaf": item["is_leaf"],+ "score": round(item["score"], 6),+ }+ )+ return group_items++ def _format_search_items_json(self, grouped_items: dict[str, list[dict[str, Any]]], min_score: float) -> str:+ memories = self._build_group_json(grouped_items.get("memory", []))+ resources = self._build_group_json(grouped_items.get("resource", []))+ skills = self._build_group_json(grouped_items.get("skill", []))+ payload = {+ "count": len(memories) + len(resources) + len(skills),+ "memories": memories,+ "resources": resources,+ "skills": skills,+ }+ return json.dumps(payload, ensure_ascii=False, indent=2)+async def execute(self,tool_context: "ToolContext",query: str,target_uri: Optional[str] = "",+ min_score: float = 0.35,**kwargs: Any,) -> str:try:client = await self._get_client(tool_context)- search_client = getattr(client, 'admin_user_client', client)- results = await search_client.search(query, target_uri=target_uri)+ search_client = getattr(client, "admin_user_client", client)+ results = await search_client.search(query, target_uri=target_uri, limit=20)if not results:return f"No results found for query: {query}"- if isinstance(results, list):- result_strs = []- for i, result in enumerate(results, 1):- result_strs.append(f"{i}. {str(result)}")- return "\n".join(result_strs)- else:- return str(results)++ grouped_items = self._filter_search_items(results, min_score=min_score)+ total = sum(len(items) for items in grouped_items.values())+ if total == 0:+ return f"No results found for query: {query}"++ content = self._format_search_items_json(grouped_items, min_score=min_score)+ return contentexcept Exception as e:return f"Error searching Viking: {str(e)}"diff --git a/bot/vikingbot/channels/feishu.py b/bot/vikingbot/channels/feishu.pyindex 66a60c0b5..af487db81 100644--- a/bot/vikingbot/channels/feishu.py+++ b/bot/vikingbot/channels/feishu.py@@ -6,6 +6,7 @@ import jsonimport reimport tempfileimport threading+import timefrom collections import OrderedDictfrom typing import Any@@ -46,6 +47,7 @@ try:CreateMessageRequest,CreateMessageRequestBody,Emoji,+ GetChatMembersRequest,GetChatRequest,GetImageRequest,GetMessageResourceRequest,@@ -61,6 +63,7 @@ except ImportError:Emoji = NoneGetImageRequest = NoneGetUserRequest = None+ GetChatMembersRequest = NoneBatchGetIdUserRequest = NoneBatchGetIdUserRequestBody = None@@ -73,7 +76,6 @@ MSG_TYPE_MAP = {}# Pre-compiled regex patterns-MENTION_PATTERN = re.compile(r"@_user_\d+")OPEN_ID_MENTION_PATTERN = re.compile(r"@ou_[a-f0-9]+")@@ -114,12 +116,16 @@ class FeishuChannel(BaseChannel):self._chat_mode_cache: dict[str, str] = {} # 缓存群类型:group(普通群)/thread(话题群)self._user_name_cache: OrderedDict[str, str] = OrderedDict() # LRU缓存用户ID到姓名的映射self._bot_name_cache: dict[str, str] = {} # 缓存机器人open_id到名称的映射+ self._chat_member_cache: OrderedDict[str, dict[str, Any]] = OrderedDict() # chat_id -> {members, expires_at, last_error_at}self._MAX_USER_CACHE_SIZE = 1000 # 最大缓存1000个用户+ self._CHAT_MEMBER_CACHE_TTL_SEC = 300+ self._CHAT_MEMBER_CACHE_MAX_CHATS = 30+ self._CHAT_MEMBER_FETCH_COOLDOWN_SEC = 60+ self._CHAT_MEMBER_FETCH_PAGE_SIZE = 100+ self._CHAT_MEMBER_FETCH_MAX_PAGES = 500async def _get_tenant_access_token(self) -> str:"""Get tenant access token for Feishu API."""- import time-now = time.time()if (self._tenant_access_token and now < self._token_expire_time - 60@@ -781,37 +787,126 @@ class FeishuChannel(BaseChannel):return True- async def _get_user_name(self, open_id: str) -> str | None:+ def _save_user_name_cache(self, open_id: str, name: str) -> None:+ if open_id in self._user_name_cache:+ self._user_name_cache.pop(open_id)+ elif len(self._user_name_cache) >= self._MAX_USER_CACHE_SIZE:+ self._user_name_cache.popitem(last=False)+ self._user_name_cache[open_id] = name++ def _get_cached_user_name(self, open_id: str) -> str | None:+ if open_id not in self._user_name_cache:+ return None+ name = self._user_name_cache.pop(open_id)+ self._user_name_cache[open_id] = name+ return name++ def _save_chat_member_cache(self, chat_id: str, members: dict[str, str], last_error_at: float = 0) -> None:+ if chat_id in self._chat_member_cache:+ self._chat_member_cache.pop(chat_id)+ elif len(self._chat_member_cache) >= self._CHAT_MEMBER_CACHE_MAX_CHATS:+ self._chat_member_cache.popitem(last=False)++ ttl = self._CHAT_MEMBER_FETCH_COOLDOWN_SEC if last_error_at else self._CHAT_MEMBER_CACHE_TTL_SEC+ self._chat_member_cache[chat_id] = {+ "members": members,+ "expires_at": time.time() + ttl,+ "last_error_at": last_error_at,+ }++ async def _fetch_chat_members(self, chat_id: str) -> dict[str, str]:+ if not self._client or not GetChatMembersRequest:+ return {}++ members: dict[str, str] = {}+ page_token = ""++ for _ in range(self._CHAT_MEMBER_FETCH_MAX_PAGES):+ request_builder = (+ GetChatMembersRequest.builder()+ .chat_id(chat_id)+ .member_id_type("open_id")+ .page_size(self._CHAT_MEMBER_FETCH_PAGE_SIZE)+ )+ if page_token:+ request_builder = request_builder.page_token(page_token)+ request = request_builder.build()+ response = await self._client.im.v1.chat_members.aget(request)+ if not response.success():+ raise RuntimeError(+ f"client.im.v1.chat_members.get failed, code: {response.code}, msg: {response.msg}, log_id: {response.get_log_id()}"+ )++ data = response.data+ items = getattr(data, "items", []) if data else []+ for item in items:+ member_id = getattr(item, "member_id", "")+ name = getattr(item, "name", "")+ if member_id and name:+ members[member_id] = name++ has_more = bool(getattr(data, "has_more", False)) if data else False+ next_page_token = getattr(data, "page_token", "") if data else ""+ if not has_more or not next_page_token:+ break+ page_token = next_page_token++ return members++ async def _get_group_member_name(self, chat_id: str, open_id: str) -> str | None:+ now = time.time()+ entry = self._chat_member_cache.get(chat_id)++ if entry:+ self._chat_member_cache.move_to_end(chat_id)+ members = entry.get("members", {})+ if entry.get("expires_at", 0) > now:+ return members.get(open_id)+ if now - float(entry.get("last_error_at", 0) or 0) < self._CHAT_MEMBER_FETCH_COOLDOWN_SEC:+ return members.get(open_id)++ try:+ members = await self._fetch_chat_members(chat_id)+ self._save_chat_member_cache(chat_id, members)+ return members.get(open_id)+ except Exception as e:+ logger.warning(f"Failed to get chat members for {chat_id}: {e}")+ stale_members: dict[str, str] = {}+ if entry:+ stale_members = entry.get("members", {})+ self._save_chat_member_cache(chat_id, stale_members, last_error_at=now)+ return stale_members.get(open_id)++ async def _get_user_name(self, open_id: str, chat_id: str | None = None) -> str | None:"""Get user name from Feishu API by open_id.Returns user name if found, None otherwise.Uses LRU cache to avoid memory issues."""- # Check cache first- if open_id in self._user_name_cache:- # Move to end (most recently used)- name = self._user_name_cache.pop(open_id)- self._user_name_cache[open_id] = name- return name+ cached_name = self._get_cached_user_name(open_id)+ if cached_name:+ return cached_nametry:- # Directly get user by open_idif GetUserRequest:- # Use open_id directly with user_id_type="open_id"user_request = (GetUserRequest.builder().user_id(open_id).user_id_type("open_id").build())user_response = self._client.contact.v3.user.get(user_request)-if user_response.success() and user_response.data and user_response.data.user:name = user_response.data.user.name- if len(self._user_name_cache) >= self._MAX_USER_CACHE_SIZE:- self._user_name_cache.popitem(last=False)- self._user_name_cache[open_id] = name- return name+ if name:+ self._save_user_name_cache(open_id, name)+ return nameexcept Exception as e:logger.warning(f"Failed to get user name for {open_id}: {e}")+ if chat_id:+ member_name = await self._get_group_member_name(chat_id, open_id)+ if member_name:+ self._save_user_name_cache(open_id, member_name)+ return member_name+return Noneasync def _get_bot_name(self, open_id: str) -> str | None:@@ -829,7 +924,7 @@ class FeishuChannel(BaseChannel):self._bot_name_cache[open_id] = bot_namereturn bot_name- async def _batch_get_user_names(self, open_ids: list[str]) -> dict[str, str]:+ async def _batch_get_user_names(self, open_ids: list[str], chat_id: str | None = None) -> dict[str, str]:"""Get user names from Feishu API by open_ids (fetches individually with LRU cache).Returns a dict mapping open_id to user name.@@ -838,14 +933,11 @@ class FeishuChannel(BaseChannel):return {}result = {}- # Check cache firstmissing_ids = []for open_id in open_ids:- if open_id in self._user_name_cache:- # Move to end (most recently used)- name = self._user_name_cache.pop(open_id)- self._user_name_cache[open_id] = name- result[open_id] = name+ cached_name = self._get_cached_user_name(open_id)+ if cached_name:+ result[open_id] = cached_nameelse:missing_ids.append(open_id)@@ -853,10 +945,9 @@ class FeishuChannel(BaseChannel):return resulttry:- # Fetch missing users one by onefor open_id in missing_ids:try:- name = await self._get_user_name(open_id)+ name = await self._get_user_name(open_id, chat_id=chat_id)if name:result[open_id] = nameexcept Exception as e:@@ -866,7 +957,9 @@ class FeishuChannel(BaseChannel):return result- async def _process_group_message_content(self, content: str, sender_id: str) -> tuple[str, str]:+ async def _process_group_message_content(+ self, content: str, sender_id: str, chat_id: str | None = None+ ) -> tuple[str, str]:"""Process group message content:1. Get sender name and prepend to content@@ -879,7 +972,7 @@ class FeishuChannel(BaseChannel):mentioned_open_ids = [mid[1:] for mid in mentioned_open_ids] if mentioned_open_ids else []all_ids_to_fetch = list({sender_id} | set(mentioned_open_ids))- user_name_map = await self._batch_get_user_names(all_ids_to_fetch)+ user_name_map = await self._batch_get_user_names(all_ids_to_fetch, chat_id=chat_id)processed_content = contentif mentioned_open_ids:@@ -965,28 +1058,31 @@ class FeishuChannel(BaseChannel):if hasattr(message, "mentions") and message.mentions:for idx, mention in enumerate(message.mentions):placeholder = f"@_user_{idx + 1}"- if hasattr(mention, "id") and mention.id and placeholder in content:- # mention.id 是 UserId 对象,直接取 open_id+ if placeholder not in content:+ continue+ mention_name = getattr(mention, "name", "")+ if bot_name and mention_name == bot_name:+ content = content.replace(placeholder, "")+ continue+ if hasattr(mention, "id") and mention.id:user_id = mention.id.open_id- # 保存 name 供后续使用- if hasattr(mention, "name") and mention.name:- mention_name_map[user_id] = mention.name- # 先替换成 @open_id 格式+ if mention_name:+ mention_name_map[user_id] = mention_namecontent = content.replace(placeholder, f"@{user_id}")- if "@_user_" in content:- content = MENTION_PATTERN.sub(f"@{sender_id}", content)# 8.5 群聊场景:处理用户姓名user_name = ""if chat_type == "group":user_name = mention_name_map.get(sender_id, "")if not user_name:- user_name = await self._get_user_name(sender_id) or ""+ user_name = await self._get_user_name(sender_id, chat_id=chat_id) or ""if user_name:content = f"[{user_name}]: {content}"+for user_id, name in mention_name_map.items():if name and f"@{user_id}" in content:content = content.replace(f"@{user_id}", f"@{name}")+ content = re.sub(r"\s{2,}", " ", content).strip()# 9. 构建会话ID(处理话题群)reply_to = chat_id if chat_type == "group" else sender_iddiff --git a/bot/vikingbot/channels/openapi.py b/bot/vikingbot/channels/openapi.pyindex 8ee5ae87c..e22b80a40 100644--- a/bot/vikingbot/channels/openapi.py+++ b/bot/vikingbot/channels/openapi.py@@ -41,6 +41,7 @@ class PendingResponse:def __init__(self):self.events: List[Dict[str, Any]] = []self.final_content: Optional[str] = None+ self.relevant_memories: Optional[str] = Noneself.event = asyncio.Event()self.stream_queue: asyncio.Queue[Optional[ChatStreamEvent]] = asyncio.Queue()@@ -188,6 +189,7 @@ class OpenAPIChannel(BaseChannel):msg.event_type == OutboundEventType.RESPONSEor msg.event_type == OutboundEventType.NO_REPLY):+ pending.relevant_memories = (msg.metadata or {}).get("relevant_memories")await pending.add_event("response", msg.content or "")pending.set_final(msg.content or "")await pending.close_stream()@@ -209,6 +211,7 @@ class OpenAPIChannel(BaseChannel):if msg.event_type == OutboundEventType.RESPONSE:# Final response - add to stream first+ pending.relevant_memories = (msg.metadata or {}).get("relevant_memories")await pending.add_event("response", msg.content or "")pending.set_final(msg.content or "")await pending.close_stream()@@ -454,6 +457,7 @@ class OpenAPIChannel(BaseChannel):session_id=session_id,message=response_content,events=pending.events if pending.events else None,+ relevant_memories=pending.relevant_memories,)except HTTPException:@@ -595,6 +599,7 @@ class OpenAPIChannel(BaseChannel):session_id=session_id,message=response_content,events=pending.events if pending.events else None,+ relevant_memories=pending.relevant_memories,)except HTTPException:diff --git a/bot/vikingbot/channels/openapi_models.py b/bot/vikingbot/channels/openapi_models.pyindex bc0ef6087..c33ff77b8 100644--- a/bot/vikingbot/channels/openapi_models.py+++ b/bot/vikingbot/channels/openapi_models.py@@ -62,6 +62,10 @@ class ChatResponse(BaseModel):events: Optional[List[Dict[str, Any]]] = Field(default=None, description="Intermediate events (thinking, tool calls)")+ relevant_memories: Optional[str] = Field(+ default=None,+ description="OpenViking memories assembled during _process_message",+ )timestamp: datetime = Field(default_factory=datetime.now, description="Response timestamp")diff --git a/bot/vikingbot/openviking_mount/ov_server.py b/bot/vikingbot/openviking_mount/ov_server.pyindex 7acb94beb..c8f73bed8 100644--- a/bot/vikingbot/openviking_mount/ov_server.py+++ b/bot/vikingbot/openviking_mount/ov_server.py@@ -62,6 +62,8 @@ class VikingClient:url=self.openviking_config.server_url,api_key=admin_user_api_key,agent_id=self.agent_id,+ account=self.account_id,+ user=self.admin_user_id,)await self.admin_user_client.initialize()