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(mcp): bound search's context arguments the way POST /search does (#4892)
alanhuangyoo0f77ab5625a5
diff --git a/openviking/server/mcp_endpoint.py b/openviking/server/mcp_endpoint.pyindex c790bb6c5..0061e4a7d 100644--- a/openviking/server/mcp_endpoint.py+++ b/openviking/server/mcp_endpoint.py@@ -22,7 +22,7 @@ import osfrom contextlib import asynccontextmanagerfrom datetime import datetime, timezonefrom pathlib import PurePosixPath-from typing import Any, Dict, List, Literal, Optional, Union+from typing import Annotated, Any, Dict, List, Literal, Optional, Unionfrom urllib.parse import quotefrom mcp.server.fastmcp import FastMCP@@ -47,6 +47,7 @@ from openviking.parse.mode import ParseMode, normalize_parse_modefrom openviking.resource.processing_mode import DEFAULT_PROCESSING_MODE, ProcessingModefrom openviking.retrieve.context_assembler import (DEFAULT_MAX_TOKENS,+ MAX_EXCLUDE_URIS,AssembleParams,assemble_context,)@@ -283,18 +284,18 @@ async def search(context_type: Optional[Union[str, List[str]]] = None,mode: Literal["list", "context"] = "list",query_expansion: Literal["off", "auto"] = "auto",- max_tokens: int = DEFAULT_MAX_TOKENS,+ max_tokens: Annotated[int, Field(ge=64, le=32000)] = DEFAULT_MAX_TOKENS,quotas: Optional[Dict[str, int]] = None,purpose: Optional[Literal["chat", "coding"]] = None,detail: Literal["auto", "abstract", "overview", "full"] = "auto",detail_by_category: Optional[Dict[str, str]] = None,- dedup_turns: int = 0,- exclude_uris: Optional[List[str]] = None,+ dedup_turns: Annotated[int, Field(ge=0, le=100)] = 0,+ exclude_uris: Annotated[Optional[List[str]], Field(max_length=MAX_EXCLUDE_URIS)] = None,peer_scope: Literal["actor", "all"] = "all",other_peer_penalty: Optional[float] = None,other_peer_penalties: Optional[Dict[str, float]] = None,rewrite: Literal["off", "auto"] = "off",- rewrite_max_bullets: int = 6,+ rewrite_max_bullets: Annotated[int, Field(ge=1, le=20)] = 6,read_content: bool = False,) -> str:"""Deep semantic retrieval with optional session context and intent analysis.diff --git a/tests/server/test_mcp_search_bounds.py b/tests/server/test_mcp_search_bounds.pynew file mode 100644index 000000000..0379bded4--- /dev/null+++ b/tests/server/test_mcp_search_bounds.py@@ -0,0 +1,90 @@+# Copyright (c) 2026 Beijing Volcano Engine Technology Co., Ltd.+# SPDX-License-Identifier: AGPL-3.0++"""The MCP ``search`` tool must bound its context arguments the way ``POST /search`` does.++``SearchRequest`` constrains four of them with pydantic ``Field``; the tool declared them+as plain ints and a plain list, so the MCP face accepted values the REST face rejects.++``exclude_uris`` is the one where that is not merely permissive: ``normalize_exclude_uris``+slices to ``MAX_EXCLUDE_URIS`` regardless, so a caller passing more got the extra ones+dropped in silence and the URIs it asked to exclude came back in the results. Over REST the+same request is a validation error.++Bounds are asserted on the tool's published input schema and through ``call_tool``, which+is the path an MCP client actually takes — a direct call to the undecorated function is not+validated by either face.+"""++import pytest+from pydantic import ValidationError++import openviking.server.mcp_endpoint as mcp_endpoint+from openviking.retrieve.context_assembler import MAX_EXCLUDE_URIS+from openviking.server.routers.search import SearchRequest++# name -> (REST field bound as it appears in the JSON schema, out-of-range value)+BOUNDED = {+ "max_tokens": ({"minimum": 64, "maximum": 32000}, 32001),+ "dedup_turns": ({"minimum": 0, "maximum": 100}, 101),+ "rewrite_max_bullets": ({"minimum": 1, "maximum": 20}, 21),+}+++async def _search_schema() -> dict:+ tools = await mcp_endpoint.mcp.list_tools()+ search = next(tool for tool in tools if tool.name == "search")+ return search.inputSchema["properties"]++[email protected]("name,expected", sorted((n, b) for n, (b, _) in BOUNDED.items()))+async def test_schema_publishes_the_same_bounds_as_rest(name, expected):+ # The bounds have to reach the schema, not just the validator: it is what the model+ # driving the tool reads before it picks a value.+ prop = (await _search_schema())[name]++ assert {key: prop.get(key) for key in expected} == expected+++async def test_exclude_uris_schema_carries_the_shared_cap():+ prop = (await _search_schema())["exclude_uris"]++ assert prop.get("maxItems") == MAX_EXCLUDE_URIS++[email protected]("name,value", sorted((n, v) for n, (_, v) in BOUNDED.items()))+async def test_call_tool_rejects_an_out_of_range_value(name, value):+ with pytest.raises(Exception) as excinfo:+ await mcp_endpoint.mcp.call_tool("search", {"query": "q", "mode": "context", name: value})++ assert name in str(excinfo.value)+++async def test_call_tool_rejects_more_exclusions_than_it_can_apply():+ too_many = [f"viking://user/u/memories/m{i}.md" for i in range(MAX_EXCLUDE_URIS + 1)]++ with pytest.raises(Exception) as excinfo:+ await mcp_endpoint.mcp.call_tool(+ "search", {"query": "q", "mode": "context", "exclude_uris": too_many}+ )++ assert "exclude_uris" in str(excinfo.value)+++def test_rest_rejects_the_same_values():+ # The point of this file is parity, so pin the side being matched too: if a bound is+ # relaxed over REST, this fails next to the tool test that would then be wrong.+ for name, (_, value) in BOUNDED.items():+ with pytest.raises(ValidationError):+ SearchRequest(query="q", mode="context", **{name: value})++ with pytest.raises(ValidationError):+ SearchRequest(+ query="q",+ mode="context",+ exclude_uris=[f"viking://user/u/m{i}.md" for i in range(MAX_EXCLUDE_URIS + 1)],+ )