mirror of
https://github.com/PrefectHQ/fastmcp.git
synced 2026-08-29 02:32:09 +02:00
Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> Co-authored-by: Jeremiah Lowin <jlowin@users.noreply.github.com> Co-authored-by: Marvin Context Protocol <41898282+Marvin Context Protocol@users.noreply.github.com> Co-authored-by: voidborne-d <voidborne-d@users.noreply.github.com> Co-authored-by: marvin-context-protocol[bot] <225465937+marvin-context-protocol[bot]@users.noreply.github.com> Co-authored-by: Claude <noreply@anthropic.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: d 🔹 <258577966+voidborne-d@users.noreply.github.com> Co-authored-by: Jeremiah Lowin <153965+jlowin@users.noreply.github.com> Co-authored-by: nightcityblade <nightcityblade@gmail.com> Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com> Co-authored-by: Bill Easton <strawgate@users.noreply.github.com> Co-authored-by: Sumanshu Nankana <sumanshunankana@gmail.com> Co-authored-by: Eric Robinson <ericrobinson@indeed.com> Co-authored-by: Martim Santos <martimfasantos@gmail.com> Co-authored-by: d 🔹 <liusway405@gmail.com> Co-authored-by: Matthieu B <66959271+mtthidoteu@users.noreply.github.com> Co-authored-by: Sascha Buehrle <47737812+saschabuehrle@users.noreply.github.com> Co-authored-by: Hakancan <142545736+hkc5@users.noreply.github.com> Co-authored-by: nightcityblade <jackchen@haloailabs.com> Co-authored-by: Matt Hallowell <17804673+mhallo@users.noreply.github.com> Co-authored-by: nate nowack <thrast36@gmail.com> Co-authored-by: Bill Easton <williamseaston@gmail.com> Co-authored-by: Marcus Shu <46469249+shulkx@users.noreply.github.com> Co-authored-by: Rushabh Doshi <radoshi@gmail.com> Co-authored-by: AIKAWA Shigechika <shige@aikawa.jp> Co-authored-by: Jeremy Simon <simonjer805@gmail.com> Co-authored-by: Miguel Miranda Dias <7780875+pandego@users.noreply.github.com> Co-authored-by: Anthony James Padavano <padavano.anthony@gmail.com> Co-authored-by: Mostafa Kamal <hiremostafa@gmail.com> Fix auto-close MRE script posting comment without closing (#3386) Fix WorkOS token scope verification bypass 🤖 Generated with Codex (#3407) Fix initialize McpError fallthrough 🤖 Generated with Codex (#3413) Fix transform arg collisions with passthrough params (#3431) Fix get_* returning None when latest version is disabled (#3439) Fix get_* returning None when latest version is disabled (#3421) Fix server lifespan overlap teardown (#3415) Fix $ref output schema object detection regression (#3420) resolved annotations (#3429) Fix async partial callables rejected by iscoroutinefunction (#3438) Fix async partial callables rejected by iscoroutinefunction (#3423) fix: add version to components (#3458) fix: use intent-based flag for OIDC scope patch in load_access_token (#3465) Fixes #3461 fix: normalize Google scope shorthands and surface valid_scopes (#3477) fix: resolve ty 0.0.23 type-checking errors and bump pin (#3481) fix: shield lifespan teardown from cancellation (#3480) fix: forward custom_route endpoints from mounted servers (#3462) fix updates _get_additional_http_routes() to traverse providers, Fixes #3457 fix: remove hardcoded version from CLI help text (#3456) fix: monty 0.0.8 compatibility, drop external_functions from constructor (#3468) fix: task test teardown hanging 5s per test (#3499) Closes #3498 fix: validate workspace path is a directory before cursor install (#3440) Fixes #3426 fix: handle re.error from malformed URI templates in build_regex (#3501) fix: reject empty/OIDC-only required_scopes in AzureProvider (#3503) fix: restrict $ref resolution to local refs only (SSRF/LFI) (#3502) fix warnings and timeouts (#3504) close upgrade check issue when build passes (#3505) Closes #3484 fix: URL-encode path params to prevent SSRF/path traversal (GHSA-vv7q-7jx5-f767) (#3507) fix: prevent path traversal in skill download (#3493) fix: prefer IdP-granted scopes over client-requested scopes in OAuthProxy (#3492) fix: remove unrelated transform and http.py changes from PR scope fix: remove forced follow_redirects from httpx_client_factory calls (#3496) fix: stop passing follow_redirects to httpx_client_factory fix: restore follow_redirects=True for custom httpx client factories Closes #3509 fix: CSRF double-submit cookie check in consent flow (#3519) fix: validate server names in install commands (#3522) fix: use raw strings for regex in pytest.raises match (#3523) fix: reject refresh tokens used as Bearer access tokens (#3524) fix: route ResourcesAsTools/PromptsAsTools through server middleware (#3495) fix: resolve Pyright "Module is not callable" on @tool, @resource, @prompt decorators (#3540) fix: filter warnings by message in KEY_PREFIX test (#3549) fix: suppress output schema for ToolResult subclass annotations (#3548) fix: increase sleep duration in proxy cache tests (#3567) fix: store absolute token expiry to prevent stale expires_in on reload (#3572) fix: preserve tool properties named 'title' during schema compression (#3582) Fix loopback redirect URI port matching per RFC 8252 §7.3 (#3589) Fix app tool routing: visibility check and middleware propagation (#3591) Fix query parameter serialization to respect OpenAPI explode/style settings (#3595) Fix dev apps form: union types, textarea support, JSON parsing (#3597) fix(google): replace deprecated /oauth2/v1/tokeninfo with /oauth2/v3/userinfo (#3603) fix: resolve EntraOBOToken dependency injection through MultiAuth (#3609) fix(docs): correct misleading stateless_http header (#3622) fix: filesystem provider import machinery (#3626) Closes #3625 (issues 2, 3, 6) fix: recover StdioTransport after subprocess exits (#3630) fix(server): preserve mounted tool task metadata (#3632) fix: scope deprecation warning filter to FastMCPDeprecationWarning (#3649) fix imports, add PrefabAppConfig (#3650) fix: resolve CurrentFastMCP/ctx.fastmcp to child server in mounted background tasks (#3651) Fix blocking docs issues: chart imports, Select API, Rx consistency (#3652) closed by default (#3657) Fix prompt caching middleware missing wrap/unwrap round-trip (#3666) fix: serialize object query params per OpenAPI style/explode rules (#3662) Fixes #2857 fix: HTTP request headers not accessible in background task workers (#3631) fix: restore HTTP headers in worker execution path for background tasks (#3681) fix: strip discriminator after dereferencing schemas (#3682) fix: remove stale ty:ignore directives for ty 0.0.26 (#3684) Fix docs gaps in app provider pages (#3690) fix: dev apps log panel UX improvements (#3698) fix dev server empty string args (#3700)
318 lines
10 KiB
Python
318 lines
10 KiB
Python
from typing import Any
|
|
from unittest.mock import AsyncMock, MagicMock
|
|
|
|
import pytest
|
|
from mcp.types import (
|
|
AudioContent,
|
|
CreateMessageRequestParams,
|
|
CreateMessageResult,
|
|
ImageContent,
|
|
ModelHint,
|
|
ModelPreferences,
|
|
SamplingMessage,
|
|
TextContent,
|
|
ToolUseContent,
|
|
)
|
|
from openai import AsyncOpenAI
|
|
from openai.types.chat import (
|
|
ChatCompletion,
|
|
ChatCompletionAssistantMessageParam,
|
|
ChatCompletionContentPartImageParam,
|
|
ChatCompletionContentPartInputAudioParam,
|
|
ChatCompletionContentPartTextParam,
|
|
ChatCompletionMessage,
|
|
ChatCompletionSystemMessageParam,
|
|
ChatCompletionUserMessageParam,
|
|
)
|
|
from openai.types.chat.chat_completion import Choice
|
|
|
|
from fastmcp.client.sampling.handlers.openai import (
|
|
OpenAISamplingHandler,
|
|
_audio_content_to_openai_part,
|
|
_image_content_to_openai_part,
|
|
)
|
|
|
|
|
|
def test_convert_sampling_messages_to_openai_messages():
|
|
msgs = OpenAISamplingHandler._convert_to_openai_messages(
|
|
system_prompt="sys",
|
|
messages=[
|
|
SamplingMessage(
|
|
role="user", content=TextContent(type="text", text="hello")
|
|
),
|
|
SamplingMessage(
|
|
role="assistant", content=TextContent(type="text", text="ok")
|
|
),
|
|
],
|
|
)
|
|
|
|
assert msgs == [
|
|
ChatCompletionSystemMessageParam(content="sys", role="system"),
|
|
ChatCompletionUserMessageParam(content="hello", role="user"),
|
|
ChatCompletionAssistantMessageParam(content="ok", role="assistant"),
|
|
]
|
|
|
|
|
|
def test_image_content_to_openai_part():
|
|
part = _image_content_to_openai_part(
|
|
ImageContent(type="image", data="YWJj", mimeType="image/png")
|
|
)
|
|
|
|
assert part == ChatCompletionContentPartImageParam(
|
|
type="image_url",
|
|
image_url={"url": "data:image/png;base64,YWJj"},
|
|
)
|
|
|
|
|
|
def test_audio_content_to_openai_part_wav():
|
|
part = _audio_content_to_openai_part(
|
|
AudioContent(type="audio", data="YWJj", mimeType="audio/wav")
|
|
)
|
|
|
|
assert part == ChatCompletionContentPartInputAudioParam(
|
|
type="input_audio",
|
|
input_audio={"data": "YWJj", "format": "wav"},
|
|
)
|
|
|
|
|
|
def test_audio_content_to_openai_part_mp3():
|
|
part = _audio_content_to_openai_part(
|
|
AudioContent(type="audio", data="YWJj", mimeType="audio/mpeg")
|
|
)
|
|
|
|
assert part["input_audio"]["format"] == "mp3"
|
|
|
|
|
|
def test_audio_content_to_openai_part_unsupported_raises():
|
|
with pytest.raises(ValueError, match="Unsupported audio MIME type"):
|
|
_audio_content_to_openai_part(
|
|
AudioContent(type="audio", data="YWJj", mimeType="audio/ogg")
|
|
)
|
|
|
|
|
|
def test_image_content_to_openai_part_unsupported_raises():
|
|
with pytest.raises(ValueError, match="Unsupported image MIME type"):
|
|
_image_content_to_openai_part(
|
|
ImageContent(type="image", data="YWJj", mimeType="image/bmp")
|
|
)
|
|
|
|
|
|
def test_convert_single_image_content_to_openai_message():
|
|
msgs = OpenAISamplingHandler._convert_to_openai_messages(
|
|
system_prompt=None,
|
|
messages=[
|
|
SamplingMessage(
|
|
role="user",
|
|
content=ImageContent(type="image", data="YWJj", mimeType="image/png"),
|
|
)
|
|
],
|
|
)
|
|
|
|
assert len(msgs) == 1
|
|
assert msgs[0] == ChatCompletionUserMessageParam(
|
|
role="user",
|
|
content=[
|
|
ChatCompletionContentPartImageParam(
|
|
type="image_url",
|
|
image_url={"url": "data:image/png;base64,YWJj"},
|
|
)
|
|
],
|
|
)
|
|
|
|
|
|
def test_convert_single_audio_content_to_openai_message():
|
|
msgs = OpenAISamplingHandler._convert_to_openai_messages(
|
|
system_prompt=None,
|
|
messages=[
|
|
SamplingMessage(
|
|
role="user",
|
|
content=AudioContent(type="audio", data="YWJj", mimeType="audio/wav"),
|
|
)
|
|
],
|
|
)
|
|
|
|
assert len(msgs) == 1
|
|
assert msgs[0] == ChatCompletionUserMessageParam(
|
|
role="user",
|
|
content=[
|
|
ChatCompletionContentPartInputAudioParam(
|
|
type="input_audio",
|
|
input_audio={"data": "YWJj", "format": "wav"},
|
|
)
|
|
],
|
|
)
|
|
|
|
|
|
def test_convert_list_content_with_image_and_text():
|
|
msgs = OpenAISamplingHandler._convert_to_openai_messages(
|
|
system_prompt=None,
|
|
messages=[
|
|
SamplingMessage(
|
|
role="user",
|
|
content=[
|
|
TextContent(type="text", text="What is in this image?"),
|
|
ImageContent(type="image", data="YWJj", mimeType="image/jpeg"),
|
|
],
|
|
)
|
|
],
|
|
)
|
|
|
|
assert len(msgs) == 1
|
|
assert msgs[0] == ChatCompletionUserMessageParam(
|
|
role="user",
|
|
content=[
|
|
ChatCompletionContentPartTextParam(
|
|
type="text", text="What is in this image?"
|
|
),
|
|
ChatCompletionContentPartImageParam(
|
|
type="image_url",
|
|
image_url={"url": "data:image/jpeg;base64,YWJj"},
|
|
),
|
|
],
|
|
)
|
|
|
|
|
|
def test_convert_image_in_assistant_message_raises():
|
|
with pytest.raises(ValueError, match="ImageContent is only supported in user"):
|
|
OpenAISamplingHandler._convert_to_openai_messages(
|
|
system_prompt=None,
|
|
messages=[
|
|
SamplingMessage(
|
|
role="assistant",
|
|
content=ImageContent(
|
|
type="image", data="YWJj", mimeType="image/png"
|
|
),
|
|
)
|
|
],
|
|
)
|
|
|
|
|
|
def test_convert_audio_in_assistant_message_raises():
|
|
with pytest.raises(ValueError, match="AudioContent is only supported in user"):
|
|
OpenAISamplingHandler._convert_to_openai_messages(
|
|
system_prompt=None,
|
|
messages=[
|
|
SamplingMessage(
|
|
role="assistant",
|
|
content=AudioContent(
|
|
type="audio", data="YWJj", mimeType="audio/wav"
|
|
),
|
|
)
|
|
],
|
|
)
|
|
|
|
|
|
def test_convert_list_image_in_assistant_message_raises():
|
|
"""Image/audio in an assistant list-content message should raise, not silently drop."""
|
|
with pytest.raises(ValueError, match="only supported in user messages"):
|
|
OpenAISamplingHandler._convert_to_openai_messages(
|
|
system_prompt=None,
|
|
messages=[
|
|
SamplingMessage(
|
|
role="assistant",
|
|
content=[
|
|
TextContent(type="text", text="Here's the image"),
|
|
ImageContent(type="image", data="YWJj", mimeType="image/png"),
|
|
],
|
|
)
|
|
],
|
|
)
|
|
|
|
|
|
def test_convert_list_tool_calls_with_image_raises():
|
|
"""Image/audio alongside tool_calls in assistant list should raise."""
|
|
with pytest.raises(ValueError, match="only supported in user messages"):
|
|
OpenAISamplingHandler._convert_to_openai_messages(
|
|
system_prompt=None,
|
|
messages=[
|
|
SamplingMessage(
|
|
role="assistant",
|
|
content=[
|
|
ToolUseContent(
|
|
type="tool_use",
|
|
id="call_1",
|
|
name="my_tool",
|
|
input={"arg": "val"},
|
|
),
|
|
ImageContent(type="image", data="YWJj", mimeType="image/png"),
|
|
],
|
|
)
|
|
],
|
|
)
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"prefs,expected",
|
|
[
|
|
("gpt-4o-mini", "gpt-4o-mini"),
|
|
(ModelPreferences(hints=[ModelHint(name="gpt-4o-mini")]), "gpt-4o-mini"),
|
|
(["gpt-4o-mini", "other"], "gpt-4o-mini"),
|
|
(None, "fallback-model"),
|
|
(["unknown-model"], "fallback-model"),
|
|
],
|
|
)
|
|
def test_select_model_from_preferences(prefs: Any, expected: str) -> None:
|
|
mock_client = MagicMock(spec=AsyncOpenAI)
|
|
handler = OpenAISamplingHandler(default_model="fallback-model", client=mock_client) # type: ignore[arg-type] # ty:ignore[invalid-argument-type]
|
|
assert handler._select_model_from_preferences(prefs) == expected
|
|
|
|
|
|
async def test_handler_passes_max_completion_tokens():
|
|
"""Verify the handler uses max_completion_tokens (not max_tokens)."""
|
|
mock_client = MagicMock(spec=AsyncOpenAI)
|
|
mock_client.chat = MagicMock()
|
|
mock_client.chat.completions = MagicMock()
|
|
mock_client.chat.completions.create = AsyncMock(
|
|
return_value=ChatCompletion(
|
|
id="123",
|
|
created=123,
|
|
model="gpt-4o-mini",
|
|
object="chat.completion",
|
|
choices=[
|
|
Choice(
|
|
message=ChatCompletionMessage(content="hi", role="assistant"),
|
|
finish_reason="stop",
|
|
index=0,
|
|
)
|
|
],
|
|
)
|
|
)
|
|
handler = OpenAISamplingHandler(default_model="gpt-4o-mini", client=mock_client)
|
|
messages = [
|
|
SamplingMessage(role="user", content=TextContent(type="text", text="hello"))
|
|
]
|
|
params = CreateMessageRequestParams(messages=messages, maxTokens=300)
|
|
await handler(messages, params, context=None) # type: ignore[arg-type] # ty:ignore[invalid-argument-type]
|
|
|
|
call_kwargs = mock_client.chat.completions.create.call_args
|
|
assert "max_completion_tokens" in call_kwargs.kwargs
|
|
assert call_kwargs.kwargs["max_completion_tokens"] == 300
|
|
assert "max_tokens" not in call_kwargs.kwargs
|
|
|
|
|
|
async def test_chat_completion_to_create_message_result():
|
|
mock_client = MagicMock(spec=AsyncOpenAI)
|
|
handler = OpenAISamplingHandler(default_model="fallback-model", client=mock_client) # type: ignore[arg-type] # ty:ignore[invalid-argument-type]
|
|
mock_client.chat.completions.create.return_value = ChatCompletion(
|
|
id="123",
|
|
created=123,
|
|
model="gpt-4o-mini",
|
|
object="chat.completion",
|
|
choices=[
|
|
Choice(
|
|
message=ChatCompletionMessage(
|
|
content="HELPFUL CONTENT FROM A VERY SMART LLM", role="assistant"
|
|
),
|
|
finish_reason="stop",
|
|
index=0,
|
|
)
|
|
],
|
|
)
|
|
result: CreateMessageResult = handler._chat_completion_to_create_message_result(
|
|
chat_completion=mock_client.chat.completions.create.return_value
|
|
)
|
|
assert result == CreateMessageResult(
|
|
content=TextContent(type="text", text="HELPFUL CONTENT FROM A VERY SMART LLM"),
|
|
role="assistant",
|
|
model="gpt-4o-mini",
|
|
)
|