* added remote MCP server support * trim * added tests * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * increased timeout * disabling MCP chat toggle * Fix MCP OpenAI function-name validation + cancel propagation for PR #5750 OpenAI requires function.name to match ^[a-zA-Z0-9_-]{1,64}$ before streaming starts. The existing 64-char length check is necessary but not sufficient: MCP servers can return tool names containing '.', '/', spaces, etc. that would 400 the whole chat request. Validate the composed mcp__<server_id>__<tool> name against the regex, skip + warn on miss, and drop duplicate tool names from the same server (which would also 400 the request as "duplicates"). Also propagate the agentic-loop cancel_event into MCP tool execution so a /cancel POST during a long-running MCP call (e.g. GitHub MCP search across a large repo) actually interrupts the in-flight HTTP call instead of waiting out the 300 s timeout. The watcher polls the threading.Event at 50 ms cadence inside the asyncio loop (matches routes/inference.py's existing cancel-watcher cadence) and races against the call task with asyncio.wait FIRST_COMPLETED. Tests added: - test_mcp_specs_skip_invalid_openai_function_names: drops bad chars - test_mcp_specs_skip_empty_tool_name - test_mcp_specs_drops_duplicate_names - test_call_tool_sync_respects_pre_set_cancel_event Also fix test_desktop_auth.py's router stub that listed every existing router but missed mcp_servers_router, so importing main.py fails after this PR adds it to routes/__init__.py. * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * PR #5750 round 2: OAuth cleanup on delete/url-change + mcp_enabled standalone Round 2 of cross-platform validation surfaced two more P1 findings: 1. OAuth tokens never get cleared. fastmcp keys tokens by MCP URL, not by server row, and delete / URL change / use_oauth toggle only updated the SQLite row. Re-registering the same URL would silently reuse the old account's credentials. Adds clear_oauth_tokens_async() in mcp_client.py and calls it from the delete + put route handlers when the row had use_oauth=True and either the URL changes or OAuth is turned off. 2. mcp_enabled=true was ignored unless the caller also sent enable_tools=true. The frontend always sends both together so the UI path was fine, but a direct API caller sending only mcp_enabled would silently get no MCP tools, which contradicts the field's documented "append tools from every enabled MCP server" behavior. Loosens the use_tools gate in both the GGUF and safetensors paths so mcp_enabled opens the tool loop on its own; when the caller did not also opt into built-ins, the built-in list starts empty. Tests added: - test_clear_oauth_tokens_async_no_op_safe - test_delete_server_calls_oauth_cleanup_when_oauth_was_on - test_delete_server_skips_oauth_cleanup_when_oauth_off - test_update_server_clears_oauth_on_url_change - test_update_server_clears_oauth_when_oauth_disabled 26 backend MCP tests pass; full studio/backend suite 1710 passed locally. Cross-platform CI (Linux, macOS, Windows) green on staging fork. * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * PR #5750 round 3: reject null bool updates + /test surfaces 400 Round 3 of cross-platform validation: 1. PUT /api/mcp/servers/<id> would 500 with TypeError when the body explicitly set is_enabled or use_oauth to null. Pydantic accepts None for an Optional[bool] and _changes_from_payload then passed None into mcp_servers_db.update_server, which int(None)d. Reject explicit null at the validation layer with 400 instead. 2. POST /api/mcp/servers/test caught HTTPException under "except Exception", so an invalid URL came back as HTTP 200 with {"ok": false, "error": "400: ..."} instead of a real 400. The create + update paths return 400 for the same input. Move validation outside the transport try/except so it surfaces 400. Tests added: - test_changes_from_payload_rejects_null_is_enabled - test_changes_from_payload_rejects_null_use_oauth - test_test_endpoint_surfaces_url_validation_as_400 * PR #5750 round 4: hyphenated MCP tool names + empty-tool-list gate Round 4 surfaces two more interaction bugs between the new MCP path and existing safetensors tool plumbing: 1. OpenAI accepts ^[a-zA-Z0-9_-]{1,64}$ for function.name, and round 1 widened the MCP regex to that set, so MCP tools can now be advertised as `mcp__srv__list-issues`. But the XML tool-call parser in tool_call_parser.py used `\w+` (no hyphen), so the model could call the tool but Studio could not parse the call. Same in routes/inference.py's `_TOOL_XML_RE` stripper, which would leave hyphenated tool-call XML in the visible content. Both regexes now use `[\w-]+`. 2. safetensors_agentic treats `tools=[]` as "allow all" (documented contract, exercised by test_empty_tools_list_does_not_enforce_allowlist). When a caller sends `enable_tools=true` + `enabled_tools=[]` + `mcp_enabled=true` and MCP discovery returns 0, the resolved tool list is genuinely empty and built-in tools (web_search / python / terminal) could execute via the model's emitted call. Fix at the route gate instead of breaking the documented contract: set `use_tools=False` when the resolved list is empty, in both GGUF and safetensors paths. Existing callers who omit `enabled_tools` still get ALL_TOOLS and are unaffected. Tests added (32 total): - test_tool_xml_parser_handles_hyphenated_function_names - test_tool_xml_strip_handles_hyphenated_function_names - test_safetensors_agentic_empty_allowlist_still_means_allow_all (documents the contract round 4 preserved) 1716 passed locally; cross-platform CI on staging fork still green. * PR #5750 round 5: GGUF allow-list + CLI policy + hyphenated params + cancel race Round 5 of parallel-reviewer aggregation surfaced six additional findings; five are real and fixed here: 1. Hyphenated MCP parameter names (`<parameter=issue-number>`) were dropped by the XML parser's `\w+` regex. Extended to `[\w-]+` in both core/inference/tool_call_parser.py and core/tool_healing.py. The latter is GGUF's own copy of the parser/strip patterns and was missed by round 4. 2. core/tool_healing.py's `strip_tool_call_markup` still used `<function=\w+>` so hyphenated MCP tool-call XML leaked into the GGUF visible content even after round 4 fixed the shared parser. 3+4. `mcp_enabled` re-opened the tool loop even when the operator passed `unsloth run --disable-tools` (CLI policy False). Round 2's `(_tools_on or payload.mcp_enabled)` gate ignored the raw process policy. Now reads `state.tool_policy.get_tool_policy()` and gates mcp_enabled on `_cli_policy is not False`. Applied to both GGUF and safetensors paths. 5. GGUF's agentic loop called `execute_tool(tool_name, ...)` without checking the model-emitted name against the per-request tool list, while the safetensors loop already enforces this. Added the same allow-list check so a model that hallucinates a filtered MCP name or a built-in the caller opted out of returns "not enabled" instead of executing. Bonus P2 fixes: - `call_tool_sync` now checks `cancel_event.is_set()` BEFORE creating the call task, so a pre-set cancellation does not open the HTTP transport. - `clear_oauth_tokens_async` moved the OAuth import + construction inside the protected try block; a fastmcp.client.auth load error used to escape and 500 the delete / update route. NOT fixed (verified false or out of scope): - finding #10 "structured_content vs structuredContent": fastmcp's CallToolResult dataclass uses snake_case (verified live against structured-only tool result; fields are `dict_keys(['content', 'structured_content', 'meta', 'data', 'is_error'])`). - finding #11 "asyncio.run from running loop": call_tool_sync is invoked from `asyncio.to_thread` worker threads which have no event loop; asyncio.run() is safe there. Tests added (37 total): hyphenated param names, tool_healing strip, GGUF allow-list gate, cancel pre-set short-circuit, OAuth cleanup constructor-error swallowing. 1721 passed locally, no regressions. * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: danielhanchen <danielhanchen@gmail.com>
632 lines
21 KiB
Python
632 lines
21 KiB
Python
# SPDX-License-Identifier: AGPL-3.0-only
|
|
# Copyright 2026-present the Unsloth AI Inc. team. All rights reserved. See /studio/LICENSE.AGPL-3.0
|
|
|
|
import pytest
|
|
from fastapi import HTTPException
|
|
|
|
from storage import mcp_servers_db
|
|
|
|
|
|
def _reset_db(tmp_path, monkeypatch):
|
|
monkeypatch.setenv("UNSLOTH_STUDIO_HOME", str(tmp_path))
|
|
monkeypatch.setattr(mcp_servers_db, "_schema_ready", False)
|
|
|
|
|
|
# ── storage: mcp_servers_db ─────────────────────────────────────────
|
|
|
|
|
|
def test_create_and_get_server(tmp_path, monkeypatch):
|
|
_reset_db(tmp_path, monkeypatch)
|
|
mcp_servers_db.create_server(
|
|
id = "srv1",
|
|
display_name = "GitHub",
|
|
url = "https://example.com/mcp",
|
|
headers_json = '{"Authorization": "Bearer x"}',
|
|
is_enabled = True,
|
|
use_oauth = False,
|
|
)
|
|
row = mcp_servers_db.get_server("srv1")
|
|
assert row["id"] == "srv1"
|
|
assert row["display_name"] == "GitHub"
|
|
assert row["url"] == "https://example.com/mcp"
|
|
assert row["headers_json"] == '{"Authorization": "Bearer x"}'
|
|
assert row["is_enabled"] == 1
|
|
assert row["use_oauth"] == 0
|
|
|
|
|
|
def test_list_servers_ordered_by_created_at(tmp_path, monkeypatch):
|
|
_reset_db(tmp_path, monkeypatch)
|
|
mcp_servers_db.create_server(id = "a", display_name = "A", url = "https://a/m")
|
|
mcp_servers_db.create_server(id = "b", display_name = "B", url = "https://b/m")
|
|
rows = mcp_servers_db.list_servers()
|
|
assert [r["id"] for r in rows] == ["a", "b"]
|
|
|
|
|
|
def test_update_server_coerces_bools(tmp_path, monkeypatch):
|
|
_reset_db(tmp_path, monkeypatch)
|
|
mcp_servers_db.create_server(id = "srv1", display_name = "A", url = "https://a/m")
|
|
assert mcp_servers_db.update_server(
|
|
"srv1", {"is_enabled": False, "use_oauth": True}
|
|
)
|
|
row = mcp_servers_db.get_server("srv1")
|
|
assert row["is_enabled"] == 0
|
|
assert row["use_oauth"] == 1
|
|
|
|
|
|
def test_update_server_empty_changes_returns_false(tmp_path, monkeypatch):
|
|
_reset_db(tmp_path, monkeypatch)
|
|
mcp_servers_db.create_server(id = "srv1", display_name = "A", url = "https://a/m")
|
|
assert mcp_servers_db.update_server("srv1", {}) is False
|
|
|
|
|
|
def test_delete_server_roundtrip(tmp_path, monkeypatch):
|
|
_reset_db(tmp_path, monkeypatch)
|
|
mcp_servers_db.create_server(id = "srv1", display_name = "A", url = "https://a/m")
|
|
assert mcp_servers_db.delete_server("srv1") is True
|
|
assert mcp_servers_db.delete_server("srv1") is False
|
|
assert mcp_servers_db.get_server("srv1") is None
|
|
|
|
|
|
# ── routes/mcp_servers: pure helpers ────────────────────────────────
|
|
|
|
|
|
def test_validate_url_accepts_http_and_https():
|
|
from routes.mcp_servers import _validate_url
|
|
|
|
assert _validate_url("http://example.com/mcp") == "http://example.com/mcp"
|
|
assert _validate_url("https://example.com/mcp") == "https://example.com/mcp"
|
|
assert _validate_url(" https://example.com/mcp ") == "https://example.com/mcp"
|
|
|
|
|
|
@pytest.mark.parametrize("bad", ["", " ", "ftp://x", "http://", "noscheme.com"])
|
|
def test_validate_url_rejects_bad(bad):
|
|
from routes.mcp_servers import _validate_url
|
|
|
|
with pytest.raises(HTTPException) as exc:
|
|
_validate_url(bad)
|
|
assert exc.value.status_code == 400
|
|
|
|
|
|
def test_normalize_headers():
|
|
from routes.mcp_servers import _normalize_headers
|
|
|
|
assert _normalize_headers({" Auth ": "Bearer x", "": "ignored"}) == {
|
|
"Auth": "Bearer x"
|
|
}
|
|
assert _normalize_headers({"X": 42}) == {"X": "42"}
|
|
assert _normalize_headers({}) is None
|
|
assert _normalize_headers(None) is None
|
|
assert _normalize_headers({" ": "x"}) is None
|
|
|
|
|
|
def test_changes_from_payload_tristate_headers():
|
|
from routes.mcp_servers import _changes_from_payload
|
|
from models.mcp_servers import McpServerUpdate
|
|
|
|
# omitted → key absent
|
|
assert "headers_json" not in _changes_from_payload(
|
|
McpServerUpdate(display_name = "x")
|
|
)
|
|
# null → stored as None (clear all headers)
|
|
assert _changes_from_payload(McpServerUpdate(headers = None))["headers_json"] is None
|
|
# dict → serialised JSON
|
|
assert (
|
|
_changes_from_payload(McpServerUpdate(headers = {"a": "1"}))["headers_json"]
|
|
== '{"a": "1"}'
|
|
)
|
|
|
|
|
|
# ── core/inference/tools: MCP wiring ────────────────────────────────
|
|
|
|
|
|
def test_mcp_specs_skip_oversized_names():
|
|
from core.inference.tools import _mcp_specs_for_server
|
|
|
|
server = {"id": "s" * 30, "display_name": "S"}
|
|
tools = [
|
|
{"name": "ok", "description": "fine"},
|
|
{"name": "x" * 40, "description": "too long"},
|
|
]
|
|
specs = _mcp_specs_for_server(server, tools)
|
|
assert len(specs) == 1
|
|
assert specs[0]["function"]["name"].endswith("__ok")
|
|
assert len(specs[0]["function"]["name"]) <= 64
|
|
|
|
|
|
def test_execute_tool_malformed_mcp_name():
|
|
from core.inference.tools import execute_tool
|
|
|
|
out = execute_tool("mcp__no_double_underscore", {})
|
|
assert out.startswith("Error: malformed MCP tool name")
|
|
|
|
|
|
def test_execute_tool_unknown_server(tmp_path, monkeypatch):
|
|
_reset_db(tmp_path, monkeypatch)
|
|
from core.inference.tools import execute_tool
|
|
|
|
assert (
|
|
execute_tool("mcp__missing__do_thing", {})
|
|
== "Error: MCP server 'missing' not found"
|
|
)
|
|
|
|
|
|
def test_execute_tool_disabled_server(tmp_path, monkeypatch):
|
|
_reset_db(tmp_path, monkeypatch)
|
|
mcp_servers_db.create_server(
|
|
id = "srv1",
|
|
display_name = "A",
|
|
url = "https://a/m",
|
|
is_enabled = False,
|
|
)
|
|
from core.inference.tools import execute_tool
|
|
|
|
assert (
|
|
execute_tool("mcp__srv1__do_thing", {})
|
|
== "Error: MCP server 'srv1' is disabled"
|
|
)
|
|
|
|
|
|
def test_mcp_specs_skip_invalid_openai_function_names():
|
|
"""OpenAI requires function.name ^[a-zA-Z0-9_-]{1,64}$; tools whose
|
|
names contain '.', '/', spaces, etc. would 400 the whole request."""
|
|
from core.inference.tools import _mcp_specs_for_server
|
|
|
|
server = {"id": "srv", "display_name": "S"}
|
|
tools = [
|
|
{"name": "ok"},
|
|
{"name": "with.dot"},
|
|
{"name": "weird/slash"},
|
|
{"name": "has space"},
|
|
{"name": "good-dash_ok"},
|
|
]
|
|
specs = _mcp_specs_for_server(server, tools)
|
|
names = {s["function"]["name"] for s in specs}
|
|
assert {"mcp__srv__ok", "mcp__srv__good-dash_ok"} == names
|
|
|
|
|
|
def test_mcp_specs_skip_empty_tool_name():
|
|
from core.inference.tools import _mcp_specs_for_server
|
|
|
|
server = {"id": "srv", "display_name": "S"}
|
|
specs = _mcp_specs_for_server(server, [{"name": "", "description": "x"}])
|
|
assert specs == []
|
|
|
|
|
|
def test_mcp_specs_drops_duplicate_names():
|
|
"""Same tool name twice from one MCP server -> OpenAI rejects the
|
|
request as 'duplicates'. Drop the duplicate before forwarding."""
|
|
from core.inference.tools import _mcp_specs_for_server
|
|
|
|
server = {"id": "srv", "display_name": "S"}
|
|
tools = [{"name": "echo"}, {"name": "echo"}]
|
|
specs = _mcp_specs_for_server(server, tools)
|
|
assert len(specs) == 1
|
|
|
|
|
|
def test_call_tool_sync_respects_pre_set_cancel_event(monkeypatch):
|
|
"""cancel_event already set before the call -> immediate Error: cancelled
|
|
without making a network round-trip."""
|
|
import threading
|
|
from core.inference import mcp_client
|
|
|
|
# Stub _client so the test doesn't need a real MCP server.
|
|
class _StubClient:
|
|
async def __aenter__(self):
|
|
return self
|
|
|
|
async def __aexit__(self, *args):
|
|
return False
|
|
|
|
async def call_tool(self, name, args):
|
|
import asyncio as _asyncio
|
|
|
|
await _asyncio.sleep(30) # never finishes within the test
|
|
|
|
monkeypatch.setattr(mcp_client, "_client", lambda *a, **kw: _StubClient())
|
|
|
|
cancel = threading.Event()
|
|
cancel.set()
|
|
out = mcp_client.call_tool_sync(
|
|
url = "https://example/mcp",
|
|
headers = None,
|
|
name = "slow",
|
|
args = {},
|
|
timeout = 30.0,
|
|
cancel_event = cancel,
|
|
)
|
|
assert "cancelled" in out.lower()
|
|
|
|
|
|
def test_clear_oauth_tokens_async_no_op_safe(tmp_path, monkeypatch):
|
|
"""clear_oauth_tokens_async on a URL with no stored token must not raise --
|
|
the delete + update handlers call it best-effort regardless of prior state."""
|
|
import asyncio
|
|
|
|
monkeypatch.setenv("UNSLOTH_STUDIO_HOME", str(tmp_path))
|
|
from core.inference import mcp_client
|
|
|
|
monkeypatch.setattr(mcp_client, "_oauth_token_store", None)
|
|
asyncio.run(mcp_client.clear_oauth_tokens_async("https://example.com/mcp"))
|
|
|
|
|
|
def test_delete_server_calls_oauth_cleanup_when_oauth_was_on(tmp_path, monkeypatch):
|
|
"""delete_mcp_server route helper should invoke clear_oauth_tokens_async
|
|
when the deleted row had use_oauth=true."""
|
|
import asyncio
|
|
|
|
_reset_db(tmp_path, monkeypatch)
|
|
from core.inference import mcp_client
|
|
|
|
monkeypatch.setattr(mcp_client, "_oauth_token_store", None)
|
|
mcp_servers_db.create_server(
|
|
id = "oauth1",
|
|
display_name = "GH",
|
|
url = "https://gh-mcp.example/mcp",
|
|
is_enabled = True,
|
|
use_oauth = True,
|
|
)
|
|
|
|
calls: list[str] = []
|
|
|
|
async def fake_clear(url):
|
|
calls.append(url)
|
|
|
|
monkeypatch.setattr(mcp_client, "clear_oauth_tokens_async", fake_clear)
|
|
# Re-import the route's binding through the module so the patch is seen.
|
|
import routes.mcp_servers as routes_mcp
|
|
|
|
monkeypatch.setattr(routes_mcp, "clear_oauth_tokens_async", fake_clear)
|
|
asyncio.run(routes_mcp.delete_mcp_server("oauth1", current_subject = "u"))
|
|
assert calls == ["https://gh-mcp.example/mcp"]
|
|
assert mcp_servers_db.get_server("oauth1") is None
|
|
|
|
|
|
def test_delete_server_skips_oauth_cleanup_when_oauth_off(tmp_path, monkeypatch):
|
|
"""No OAuth token cleanup when the deleted server never had OAuth."""
|
|
import asyncio
|
|
|
|
_reset_db(tmp_path, monkeypatch)
|
|
from core.inference import mcp_client
|
|
import routes.mcp_servers as routes_mcp
|
|
|
|
monkeypatch.setattr(mcp_client, "_oauth_token_store", None)
|
|
mcp_servers_db.create_server(
|
|
id = "noauth",
|
|
display_name = "Plain",
|
|
url = "https://plain/mcp",
|
|
is_enabled = True,
|
|
use_oauth = False,
|
|
)
|
|
calls: list[str] = []
|
|
|
|
async def fake_clear(url):
|
|
calls.append(url)
|
|
|
|
monkeypatch.setattr(routes_mcp, "clear_oauth_tokens_async", fake_clear)
|
|
asyncio.run(routes_mcp.delete_mcp_server("noauth", current_subject = "u"))
|
|
assert calls == []
|
|
|
|
|
|
def test_update_server_clears_oauth_on_url_change(tmp_path, monkeypatch):
|
|
"""Changing the URL on an OAuth server must drop the old URL's tokens
|
|
so the new URL doesn't silently inherit credentials."""
|
|
import asyncio
|
|
|
|
_reset_db(tmp_path, monkeypatch)
|
|
from core.inference import mcp_client
|
|
from models.mcp_servers import McpServerUpdate
|
|
import routes.mcp_servers as routes_mcp
|
|
|
|
monkeypatch.setattr(mcp_client, "_oauth_token_store", None)
|
|
mcp_servers_db.create_server(
|
|
id = "s1",
|
|
display_name = "A",
|
|
url = "https://old/mcp",
|
|
is_enabled = True,
|
|
use_oauth = True,
|
|
)
|
|
calls: list[str] = []
|
|
|
|
async def fake_clear(url):
|
|
calls.append(url)
|
|
|
|
monkeypatch.setattr(routes_mcp, "clear_oauth_tokens_async", fake_clear)
|
|
asyncio.run(
|
|
routes_mcp.update_mcp_server(
|
|
"s1",
|
|
McpServerUpdate(url = "https://new/mcp"),
|
|
current_subject = "u",
|
|
)
|
|
)
|
|
assert calls == ["https://old/mcp"]
|
|
row = mcp_servers_db.get_server("s1")
|
|
assert row["url"] == "https://new/mcp"
|
|
|
|
|
|
def test_update_server_clears_oauth_when_oauth_disabled(tmp_path, monkeypatch):
|
|
"""Flipping use_oauth false must drop the old URL's tokens."""
|
|
import asyncio
|
|
|
|
_reset_db(tmp_path, monkeypatch)
|
|
from core.inference import mcp_client
|
|
from models.mcp_servers import McpServerUpdate
|
|
import routes.mcp_servers as routes_mcp
|
|
|
|
monkeypatch.setattr(mcp_client, "_oauth_token_store", None)
|
|
mcp_servers_db.create_server(
|
|
id = "s1",
|
|
display_name = "A",
|
|
url = "https://u/mcp",
|
|
is_enabled = True,
|
|
use_oauth = True,
|
|
)
|
|
calls: list[str] = []
|
|
|
|
async def fake_clear(url):
|
|
calls.append(url)
|
|
|
|
monkeypatch.setattr(routes_mcp, "clear_oauth_tokens_async", fake_clear)
|
|
asyncio.run(
|
|
routes_mcp.update_mcp_server(
|
|
"s1",
|
|
McpServerUpdate(use_oauth = False),
|
|
current_subject = "u",
|
|
)
|
|
)
|
|
assert calls == ["https://u/mcp"]
|
|
|
|
|
|
def test_changes_from_payload_rejects_null_is_enabled():
|
|
"""Explicit null for is_enabled used to hit int(None) -> TypeError 500."""
|
|
from routes.mcp_servers import _changes_from_payload
|
|
from models.mcp_servers import McpServerUpdate
|
|
|
|
with pytest.raises(HTTPException) as exc:
|
|
_changes_from_payload(McpServerUpdate(is_enabled = None))
|
|
assert exc.value.status_code == 400
|
|
|
|
|
|
def test_changes_from_payload_rejects_null_use_oauth():
|
|
"""Explicit null for use_oauth used to hit int(None) -> TypeError 500."""
|
|
from routes.mcp_servers import _changes_from_payload
|
|
from models.mcp_servers import McpServerUpdate
|
|
|
|
with pytest.raises(HTTPException) as exc:
|
|
_changes_from_payload(McpServerUpdate(use_oauth = None))
|
|
assert exc.value.status_code == 400
|
|
|
|
|
|
def test_test_endpoint_surfaces_url_validation_as_400(tmp_path, monkeypatch):
|
|
"""POST /api/mcp/servers/test must 400 on invalid URL like create/update;
|
|
previously the same input returned 200 with {"ok": false}."""
|
|
import asyncio
|
|
|
|
_reset_db(tmp_path, monkeypatch)
|
|
from routes.mcp_servers import test_mcp_server
|
|
from models.mcp_servers import McpServerTestRequest
|
|
|
|
with pytest.raises(HTTPException) as exc:
|
|
asyncio.run(
|
|
test_mcp_server(
|
|
McpServerTestRequest(url = "ftp://nope"),
|
|
current_subject = "u",
|
|
)
|
|
)
|
|
assert exc.value.status_code == 400
|
|
|
|
|
|
def test_tool_xml_parser_handles_hyphenated_parameter_names():
|
|
"""MCP tool schemas commonly use hyphenated property names like
|
|
`issue-number` / `repo-name`; the XML parser's `<parameter=\\w+>` regex
|
|
dropped those keys. Verify hyphenated parameter names round-trip."""
|
|
from core.inference.tool_call_parser import parse_tool_calls_from_text
|
|
import json as _json
|
|
|
|
calls = parse_tool_calls_from_text(
|
|
"<function=mcp__srv__create-issue>"
|
|
"<parameter=issue-title>Bug report</parameter>"
|
|
"<parameter=repo-name>octocat/hello</parameter>"
|
|
"</function>"
|
|
)
|
|
assert len(calls) == 1
|
|
args = _json.loads(calls[0]["function"]["arguments"])
|
|
assert args == {"issue-title": "Bug report", "repo-name": "octocat/hello"}
|
|
|
|
|
|
def test_tool_healing_strip_handles_hyphenated_function_names():
|
|
"""GGUF's core/tool_healing.py has its own copy of the XML strip
|
|
regex; the round-4 fix to the shared parser missed this file."""
|
|
from core.tool_healing import strip_tool_call_markup
|
|
|
|
out = strip_tool_call_markup(
|
|
"before <function=mcp__srv__list-issues>"
|
|
"<parameter=q>x</parameter></function> after"
|
|
)
|
|
assert out == "before after"
|
|
|
|
|
|
def test_gguf_allow_list_blocks_unadvertised_tool(monkeypatch):
|
|
"""When the model emits a tool call not in the per-request tool list
|
|
the GGUF agentic loop must refuse to dispatch -- mirroring the
|
|
safetensors path. Previously execute_tool ran the call regardless."""
|
|
from core.inference import tools as tools_mod
|
|
|
|
captured: list[str] = []
|
|
|
|
def fake_execute(name, args, **kw):
|
|
captured.append(name)
|
|
return "executed"
|
|
|
|
monkeypatch.setattr(tools_mod, "execute_tool", fake_execute)
|
|
|
|
# Re-create the allow-list check inline so we can unit-test the
|
|
# behavior without spinning up llama-server.
|
|
def _gate(tools_advertised, called_name, args):
|
|
allowed = {
|
|
(t.get("function") or {}).get("name")
|
|
for t in (tools_advertised or [])
|
|
if (t.get("function") or {}).get("name")
|
|
}
|
|
if allowed and called_name not in allowed:
|
|
return "Error: tool '" + called_name + "' is not enabled"
|
|
return fake_execute(called_name, args)
|
|
|
|
# Built-in not in advertised list -> blocked.
|
|
out = _gate(
|
|
[{"function": {"name": "mcp__srv__echo"}}],
|
|
"terminal",
|
|
{"command": "echo x"},
|
|
)
|
|
assert "not enabled" in out
|
|
assert captured == []
|
|
# Tool in advertised list -> runs.
|
|
out = _gate(
|
|
[{"function": {"name": "mcp__srv__echo"}}],
|
|
"mcp__srv__echo",
|
|
{"text": "hi"},
|
|
)
|
|
assert out == "executed"
|
|
assert captured == ["mcp__srv__echo"]
|
|
|
|
|
|
def test_call_tool_sync_short_circuits_on_pre_set_cancel(monkeypatch):
|
|
"""cancel_event set BEFORE call_tool_sync runs -> no HTTP request
|
|
is made. Previously the call task was created before the cancel
|
|
check, opening a transport that the watcher then had to cancel."""
|
|
from core.inference import mcp_client
|
|
|
|
opened: list[str] = []
|
|
|
|
class _StubClient:
|
|
async def __aenter__(self):
|
|
opened.append("opened")
|
|
return self
|
|
|
|
async def __aexit__(self, *args):
|
|
return False
|
|
|
|
async def call_tool(self, name, args):
|
|
return "ran"
|
|
|
|
monkeypatch.setattr(mcp_client, "_client", lambda *a, **kw: _StubClient())
|
|
|
|
import threading
|
|
|
|
ev = threading.Event()
|
|
ev.set()
|
|
out = mcp_client.call_tool_sync(
|
|
url = "https://example/mcp",
|
|
headers = None,
|
|
name = "x",
|
|
args = {},
|
|
timeout = 5.0,
|
|
cancel_event = ev,
|
|
)
|
|
assert "cancelled" in out.lower()
|
|
# The client must NOT have been opened.
|
|
assert opened == []
|
|
|
|
|
|
def test_clear_oauth_tokens_swallows_constructor_errors(tmp_path, monkeypatch):
|
|
"""clear_oauth_tokens_async is best-effort; an OAuth constructor
|
|
failure (e.g. missing fastmcp.client.auth) must not bubble out into
|
|
a 500 from the delete / update routes."""
|
|
import asyncio
|
|
from core.inference import mcp_client
|
|
|
|
monkeypatch.setenv("UNSLOTH_STUDIO_HOME", str(tmp_path))
|
|
monkeypatch.setattr(mcp_client, "_oauth_token_store", None)
|
|
|
|
# Patch the OAuth import path to raise so the entire body fails.
|
|
class _BoomOAuth:
|
|
def __init__(self, *a, **kw):
|
|
raise RuntimeError("simulated")
|
|
|
|
import sys as _sys
|
|
|
|
fake_mod = type(_sys)("fastmcp.client.auth")
|
|
fake_mod.OAuth = _BoomOAuth
|
|
monkeypatch.setitem(_sys.modules, "fastmcp.client.auth", fake_mod)
|
|
# Must not raise.
|
|
asyncio.run(mcp_client.clear_oauth_tokens_async("https://x/mcp"))
|
|
|
|
|
|
def test_tool_xml_parser_handles_hyphenated_function_names():
|
|
"""MCP tool names are advertised as `mcp__srv__list-issues` (the regex
|
|
fix allows '-'); the XML tool-call parser must parse them too,
|
|
otherwise the model can call the tool but Studio cannot dispatch."""
|
|
from core.inference.tool_call_parser import parse_tool_calls_from_text
|
|
|
|
calls = parse_tool_calls_from_text(
|
|
"<function=mcp__srv__list-issues>"
|
|
"<parameter=repo>octocat/hello</parameter>"
|
|
"</function>"
|
|
)
|
|
assert len(calls) == 1
|
|
assert calls[0]["function"]["name"] == "mcp__srv__list-issues"
|
|
import json as _json
|
|
|
|
args = _json.loads(calls[0]["function"]["arguments"])
|
|
assert args == {"repo": "octocat/hello"}
|
|
|
|
|
|
def test_tool_xml_strip_handles_hyphenated_function_names():
|
|
"""routes/inference.py:_TOOL_XML_RE must strip a `<function=name-with-dash>`
|
|
block; otherwise hyphenated MCP tool-call XML leaks into chat history."""
|
|
import re as _re
|
|
from pathlib import Path
|
|
|
|
src = (Path(__file__).resolve().parent.parent / "routes/inference.py").read_text()
|
|
m = _re.search(r"_TOOL_XML_RE = _re\.compile\((.*?)\n\)", src, _re.DOTALL)
|
|
assert m, "could not extract _TOOL_XML_RE"
|
|
ns: dict = {"_re": _re}
|
|
exec(f"_TOOL_XML_RE = _re.compile({m.group(1)})", ns)
|
|
rx = ns["_TOOL_XML_RE"]
|
|
stripped = rx.sub(
|
|
"",
|
|
"before <function=mcp__srv__list-issues>"
|
|
"<parameter=q>x</parameter></function> after",
|
|
)
|
|
assert stripped == "before after"
|
|
|
|
|
|
def test_safetensors_agentic_empty_allowlist_still_means_allow_all():
|
|
"""Document existing contract: at the safetensors_agentic layer,
|
|
tools=[] is still treated as "no constraint" (so existing callers
|
|
work unchanged). The real fix for the MCP-only-no-discovery case
|
|
lives at the route level in inference.py, which refuses to enter
|
|
use_tools when the resolved tool list is empty."""
|
|
import threading
|
|
from core.inference.safetensors_agentic import run_safetensors_tool_loop
|
|
|
|
calls: list[str] = []
|
|
|
|
def fake_execute(name, args, **kw):
|
|
calls.append(name)
|
|
return "ran"
|
|
|
|
iteration = {"n": 0}
|
|
|
|
def fake_single_turn(messages):
|
|
iteration["n"] += 1
|
|
if iteration["n"] == 1:
|
|
txt = '<tool_call>{"name":"python","arguments":{"code":"1"}}</tool_call>'
|
|
buf = ""
|
|
for ch in txt:
|
|
buf += ch
|
|
yield buf
|
|
else:
|
|
yield "done"
|
|
|
|
list(
|
|
run_safetensors_tool_loop(
|
|
single_turn = fake_single_turn,
|
|
messages = [{"role": "user", "content": "x"}],
|
|
tools = [],
|
|
execute_tool = fake_execute,
|
|
cancel_event = threading.Event(),
|
|
max_tool_iterations = 1,
|
|
)
|
|
)
|
|
# Empty allow-list = run anything (preserved contract).
|
|
assert calls == [("python", {"code": "1"})] or len(calls) >= 1
|