ceos/fastmcp
1
0
Fork 0
mirror of https://github.com/PrefectHQ/fastmcp.git synced 2026-08-09 15:19:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Restore upgraded dependency checks (#4576)

Browse source 
* Restore upgraded dependency checks

Generated with Codex

* Clarify settings loading and teardown logging

Generated with Codex

* Align ty checks on the upgraded version

Generated with Codex

* Preserve simultaneous caller cancellation

Generated with Codex
This commit is contained in:
nate nowack 2026-07-20 17:46:30 -05:00 • committed by GitHub
commit 9d9bf2b717
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 96 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

2
examples/text_me.py
View file

@ -41,7 +41,7 @@ class SurgeSettings(BaseSettings):
# Create server # Create server
mcp = FastMCP("Text me") mcp = FastMCP("Text me")
surge_settings = SurgeSettings() # type: ignore surge_settings = SurgeSettings() # type: ignore[call-arg]
@mcp.tool(name="textme", description="Send a text message to me") @mcp.tool(name="textme", description="Send a text message to me")

17
fastmcp_slim/fastmcp/client/transports/stdio.py
View file

@ -173,9 +173,20 @@ class StdioTransport(ClientTransport):
# signal the connection task to stop # signal the connection task to stop
self._stop_event.set() self._stop_event.set()
# wait for the connection task to finish cleanly # Wait without propagating the connection task's cancellation into
with contextlib.suppress(Exception): # this caller. Cancellation of this wait therefore still belongs to
await self._connect_task # the caller and must propagate normally.
connect_task = self._connect_task
await asyncio.wait({connect_task})
try:
_ = connect_task.result()
except asyncio.CancelledError:
pass
except Exception:
logger.debug(
"Suppressed exception from stdio connection task during disconnect",
exc_info=True,
)
# reset variables and events for potential future reconnects # reset variables and events for potential future reconnects
self._connect_task = None self._connect_task = None

4
fastmcp_slim/fastmcp/server/sampling/run.py
View file

@ -559,9 +559,7 @@ async def sample_step_impl(
f"Invalid tool_choice: {tool_choice!r}. " f"Invalid tool_choice: {tool_choice!r}. "
"Must be 'auto', 'required', or 'none'." "Must be 'auto', 'required', or 'none'."
) )
effective_tool_choice = ToolChoice( effective_tool_choice = ToolChoice.model_validate({"mode": tool_choice})
mode=cast(Literal["auto", "required", "none"], tool_choice)
)
# Effective max_tokens # Effective max_tokens
effective_max_tokens = max_tokens if max_tokens is not None else 512 effective_max_tokens = max_tokens if max_tokens is not None else 512

14
fastmcp_slim/fastmcp/utilities/openapi/parser.py
View file

@ -1,6 +1,6 @@
"""OpenAPI parsing logic for converting OpenAPI specs to HTTPRoute objects.""" """OpenAPI parsing logic for converting OpenAPI specs to HTTPRoute objects."""
from typing import Any, Generic, TypeVar, cast from typing import Any, Generic, TypeVar
from openapi_pydantic import ( from openapi_pydantic import (
OpenAPI, OpenAPI,
@ -145,10 +145,16 @@ class OpenAPIParser(
def _convert_to_parameter_location(self, param_in: str) -> ParameterLocation: def _convert_to_parameter_location(self, param_in: str) -> ParameterLocation:
"""Convert string parameter location to our ParameterLocation type.""" """Convert string parameter location to our ParameterLocation type."""
if param_in in ["path", "query", "header", "cookie"]: locations: dict[str, ParameterLocation] = {
return cast(ParameterLocation, param_in) "path": "path",
"query": "query",
"header": "header",
"cookie": "cookie",
}
if location := locations.get(param_in):
return location
logger.warning(f"Unknown parameter location: {param_in}, defaulting to 'query'") logger.warning(f"Unknown parameter location: {param_in}, defaulting to 'query'")
return cast(ParameterLocation, "query") return "query"
def _resolve_ref(self, item: Any) -> Any: def _resolve_ref(self, item: Any) -> Any:
"""Resolves a reference to its target definition.""" """Resolves a reference to its target definition."""

2
pyproject.toml
View file

@ -97,7 +97,7 @@ dev = [
"pytest-timeout>=2.4.0", "pytest-timeout>=2.4.0",
"pytest-xdist>=3.6.1", "pytest-xdist>=3.6.1",
"ruff>=0.12.8", "ruff>=0.12.8",
"ty>=0.0.55", "ty>=0.0.59",
"prek>=0.2.12", "prek>=0.2.12",
"loq>=0.1.0a3", "loq>=0.1.0a3",
"opentelemetry-exporter-otlp-proto-grpc>=1.39.0", "opentelemetry-exporter-otlp-proto-grpc>=1.39.0",

44
tests/client/test_stdio.py
View file

@ -71,6 +71,50 @@ async def wait_for_process_exit(pid: int | None, timeout: float = 5.0) -> None:
pytest.fail(f"Subprocess {pid} was still alive after {timeout}s") pytest.fail(f"Subprocess {pid} was still alive after {timeout}s")
class TestDisconnect:
async def test_cancelled_connection_task_is_cleaned_up(self):
transport = StdioTransport(command="python", args=[])
connect_task = asyncio.create_task(asyncio.sleep(0))
connect_task.cancel()
transport._connect_task = connect_task
await transport.disconnect()
assert transport._connect_task is None
assert not transport._stop_event.is_set()
async def test_caller_cancellation_is_not_suppressed(self):
transport = StdioTransport(command="python", args=[])
connection_finished = asyncio.Event()
connect_task = asyncio.create_task(connection_finished.wait())
transport._connect_task = connect_task
disconnect_task = asyncio.create_task(transport.disconnect())
await asyncio.sleep(0)
disconnect_task.cancel()
with pytest.raises(asyncio.CancelledError):
await disconnect_task
assert not connect_task.cancelled()
connection_finished.set()
await connect_task
await transport.disconnect()
async def test_caller_cancellation_wins_when_connection_is_also_cancelled(self):
transport = StdioTransport(command="python", args=[])
connect_task = asyncio.create_task(asyncio.Event().wait())
transport._connect_task = connect_task
disconnect_task = asyncio.create_task(transport.disconnect())
await asyncio.sleep(0)
connect_task.cancel()
disconnect_task.cancel()
with pytest.raises(asyncio.CancelledError):
await disconnect_task
class TestParallelCalls: class TestParallelCalls:
@pytest.fixture @pytest.fixture
def stdio_script(self): def stdio_script(self):

6
tests/utilities/json_schema_type/test_json_schema_type.py
View file

@ -4,7 +4,7 @@ import dataclasses
import warnings import warnings
from dataclasses import Field from dataclasses import Field
from enum import Enum from enum import Enum
from typing import Any, Literal from typing import Any, Literal, cast
import pytest import pytest
from pydantic import TypeAdapter, ValidationError from pydantic import TypeAdapter, ValidationError
@ -294,7 +294,7 @@ class TestCrashPrevention:
}, },
} }
T = json_schema_to_type(schema) T = json_schema_to_type(schema)
field_names = [f.name for f in dataclasses.fields(T)] field_names = [f.name for f in dataclasses.fields(cast(Any, T))]
assert len(field_names) == 2 assert len(field_names) == 2
assert len(set(field_names)) == 2 assert len(set(field_names)) == 2
@ -308,7 +308,7 @@ class TestCrashPrevention:
}, },
} }
T = json_schema_to_type(schema) T = json_schema_to_type(schema)
field_names = [f.name for f in dataclasses.fields(T)] field_names = [f.name for f in dataclasses.fields(cast(Any, T))]
assert len(field_names) == 2 assert len(field_names) == 2
assert len(set(field_names)) == 2 assert len(set(field_names)) == 2

40
uv.lock generated
View file

@ -939,7 +939,7 @@ dev = [
{ name = "pytest-timeout", specifier = ">=2.4.0" }, { name = "pytest-timeout", specifier = ">=2.4.0" },
{ name = "pytest-xdist", specifier = ">=3.6.1" }, { name = "pytest-xdist", specifier = ">=3.6.1" },
{ name = "ruff", specifier = ">=0.12.8" }, { name = "ruff", specifier = ">=0.12.8" },
{ name = "ty", specifier = ">=0.0.55" }, { name = "ty", specifier = ">=0.0.59" },
] ]
[[package]] [[package]]
@ -3189,27 +3189,27 @@ wheels = [
[[package]] [[package]]
name = "ty" name = "ty"
version = "0.0.55" version = "0.0.59"
source = { registry = "https://pypi.org/simple" } source = { registry = "https://pypi.org/simple" }
sdist = { url = "https://files.pythonhosted.org/packages/08/48/f687c8d268e3581f2f104d1f2ac5944d5b5e841b3695c613b3f263e5bbf7/ty-0.0.55.tar.gz", hash = "sha256:88ca87073825a79a8327c550efcc86cec94344890244c5946f84c9e44a969f31", size = 6040230, upload-time = "2026-06-27T00:27:29.385Z" } sdist = { url = "https://files.pythonhosted.org/packages/95/b0/84ae7b3bf6e3e9f57eb9635eeff5a80b36e57aa089f40be0fb5c384fa176/ty-0.0.59.tar.gz", hash = "sha256:53e53ffeed78ad59cd237fa8ea1316d2b94e13efdea9a945698acab549e005aa", size = 6145435, upload-time = "2026-07-12T20:22:02.781Z" }
wheels = [ wheels = [
{ url = "https://files.pythonhosted.org/packages/87/a3/1a90ba7e5a61c6d09adb92346ddba97668095fc257b577af433e5ac4f404/ty-0.0.55-py3-none-linux_armv6l.whl", hash = "sha256:31e83eef512d066542fe990fe1a3b814423abd1616376c54e48af7045b3e1749", size = 11677249, upload-time = "2026-06-27T00:26:52.18Z" }, { url = "https://files.pythonhosted.org/packages/57/e8/650b42fbef4d48e6ca682b0b6e9b68fa8fcf55cbb0a6892ab89990018b6f/ty-0.0.59-py3-none-linux_armv6l.whl", hash = "sha256:f8fb08a767ef8f11ea3c537b9d77860726cc2bc39e6f77ad13c02d5b289f20a7", size = 11700328, upload-time = "2026-07-12T20:21:26.046Z" },
{ url = "https://files.pythonhosted.org/packages/82/3a/669f9aa478c38243e213a2684db1502086026cfadc15bb1b29b7cbde030d/ty-0.0.55-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:ab4bca857950608fea73e269e2da369d43e6467131de85160d68e2fa466fa248", size = 11444180, upload-time = "2026-06-27T00:26:54.576Z" }, { url = "https://files.pythonhosted.org/packages/22/ac/0ca3a89d5f59ae5f308e5e83428cac5f9143200767743e052fba90b4b81e/ty-0.0.59-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:c7f4d5630836c8a0ba13dd4ac7bdae080a7d6ebe965b817ff642dc961bcf2a53", size = 11494310, upload-time = "2026-07-12T20:21:28.491Z" },
{ url = "https://files.pythonhosted.org/packages/15/a4/6a4b2507a53ce6530c66c5b4fe0d58551eb1748ffa9e0696c32fdd55bbd4/ty-0.0.55-py3-none-macosx_11_0_arm64.whl", hash = "sha256:55032bfd31bf2c5355ee81bdc6407b144a1cc7ee41e5681dd1368e4cef2ba327", size = 10963134, upload-time = "2026-06-27T00:26:57.348Z" }, { url = "https://files.pythonhosted.org/packages/f3/f8/5076de6001cefbccd8e6dc8472262697e43308ff66b0e87c72abba136357/ty-0.0.59-py3-none-macosx_11_0_arm64.whl", hash = "sha256:872f6fb02c6db5553c4d5fb283b3d50f0985fb9a29a910e4fda4793a775c1926", size = 11026797, upload-time = "2026-07-12T20:21:30.879Z" },
{ url = "https://files.pythonhosted.org/packages/ce/ae/a3b1a0f1cc83b7d258662cb98aa80a720c2e671d0e8fa0d17a4d5d057a7a/ty-0.0.55-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ef1e049f69ce65b3c269af67624607f435e1c32319786c1e453ef9611502f295", size = 11493517, upload-time = "2026-06-27T00:26:59.26Z" }, { url = "https://files.pythonhosted.org/packages/2e/0f/fca28481b6a138e2b798ad9fdc98a095475f9104948ba242fce4b477782b/ty-0.0.59-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2af8eefbfe806337770eec12c0c819c5f1b8f5b85f8369cb1cc9fa25234a2208", size = 11475304, upload-time = "2026-07-12T20:21:33.041Z" },
{ url = "https://files.pythonhosted.org/packages/0d/9f/311ce39065a979ef40a9b847f685c8e02464e53adf1671e081eea90640ca/ty-0.0.55-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:631409975c681d5a280fc5a99b7b32e9e801f33be7567c6b42ec331362f59d7d", size = 11460590, upload-time = "2026-06-27T00:27:01.425Z" }, { url = "https://files.pythonhosted.org/packages/08/4b/1fed8b81b389ef4bbc0400f19e05fc16496b162577779dc0e5fc65ac216c/ty-0.0.59-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:0acf8b76a1c9a7ddef460b42475f6c76193164426ab080783af1c3175b4b999b", size = 11533131, upload-time = "2026-07-12T20:21:35.189Z" },
{ url = "https://files.pythonhosted.org/packages/cd/8f/3bf29aa77bd78aae48275153135a2052fa7d3ccdf1ecabeb99c8773abd66/ty-0.0.55-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e08cb0436e68b9351555ae8f2697138c9009b4d5b4ae4272232988b2a431a98f", size = 12098430, upload-time = "2026-06-27T00:27:03.596Z" }, { url = "https://files.pythonhosted.org/packages/5f/fc/04eec35e05a10e0fea1c6503a290ccc3935efda9c845aff64e83282c1af7/ty-0.0.59-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:043c2e00eb1d7475f928af7dedd71f69b64e69bfca55e36f4c968479e1373fc4", size = 12205932, upload-time = "2026-07-12T20:21:37.324Z" },
{ url = "https://files.pythonhosted.org/packages/bc/6e/e88411a88240b94640bba06fb6d0d92b247fbeef47ee2bc71f39e58c2558/ty-0.0.55-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:16c215ad9f823829409b94ee188cfaa4563f6e1384f6ce3fecb1db75f6c7cf7c", size = 12673086, upload-time = "2026-06-27T00:27:05.589Z" }, { url = "https://files.pythonhosted.org/packages/a9/dd/a61de859659fa11b55917ad38340a8f2c61f5ae17d1874929f29084c6990/ty-0.0.59-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:f0d688d857441df57f48fca66c029d85cf737c510e7be1d01144cdad1e58d968", size = 12758406, upload-time = "2026-07-12T20:21:39.525Z" },
{ url = "https://files.pythonhosted.org/packages/6c/7e/8f1762fb7f9245a68ba5ae338d73c59403ce57554e5d311b8bb55027b0ec/ty-0.0.55-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b510eb8f4032baf11b7aee2f1d53babc3b4ca03939b9cdcf6a9d15761d575188", size = 12242559, upload-time = "2026-06-27T00:27:07.714Z" }, { url = "https://files.pythonhosted.org/packages/c6/e8/fa66f05997eab8ca75fc4f17320140e25467849e0cc75597f898cc22099c/ty-0.0.59-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a96c9f88394a3b42c737e2125b2330543f0d90a43b49761f377d96f8c3ee0d62", size = 12288176, upload-time = "2026-07-12T20:21:41.784Z" },
{ url = "https://files.pythonhosted.org/packages/72/1f/143657daf2670d977dac83435f1fe03d4843efb798d8e1e75950e541aadd/ty-0.0.55-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0ddc05e7959709c3b9b83aa627128a80446865e3c1a4882638dcff6d776dc34a", size = 12021409, upload-time = "2026-06-27T00:27:09.881Z" }, { url = "https://files.pythonhosted.org/packages/15/68/0fca59963bd5123f42d5f7da50667e7a52e8e9615e3a16d8c2c0d3b2d143/ty-0.0.59-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f08dbcb268edcafcb152e59475b5b495ce28d0b340a395c09943557678f4d5a6", size = 12028471, upload-time = "2026-07-12T20:21:43.82Z" },
{ url = "https://files.pythonhosted.org/packages/6d/30/69487c439dd1fad3a4a3d96f0a472193de297eaba6fc4b8ea687ce434ac2/ty-0.0.55-py3-none-manylinux_2_31_riscv64.whl", hash = "sha256:636e8e5078787b8c6916c94e1406719f10189a4ca6b37b813a5922ce5857a8c7", size = 12303807, upload-time = "2026-06-27T00:27:11.986Z" }, { url = "https://files.pythonhosted.org/packages/e1/5b/cd7dabbbab392578f11179919da5c25d8c3322e5388a688f539ea0539603/ty-0.0.59-py3-none-manylinux_2_31_riscv64.whl", hash = "sha256:8812764b9a40fdc98df1272826e73a298ef56b06681135e643bcf90aad1896f7", size = 12297646, upload-time = "2026-07-12T20:21:45.76Z" },
{ url = "https://files.pythonhosted.org/packages/e8/ca/cd88b6493dafc7db077f5e17c0438eb3af6e2d6d08f616dbb52a8ddfd567/ty-0.0.55-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:ef7d6deaacb73fec603666b5471f1dc5a5699aa84e11a6d4d644dd07ca72121e", size = 11441263, upload-time = "2026-06-27T00:27:14.087Z" }, { url = "https://files.pythonhosted.org/packages/1d/37/2e9c94f0b383d8cbe1a35517ab470b7810bc9d7501603ab532bcd5be5e90/ty-0.0.59-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:fd53b8581641d8dad7bfac6d5ea589e91a883d6837e0b9a286fdae30722b7c69", size = 11432519, upload-time = "2026-07-12T20:21:47.694Z" },
{ url = "https://files.pythonhosted.org/packages/aa/fe/66b6915671653ab739f71e4f1b0528e69da64429b7ebf3840c625b6e43f2/ty-0.0.55-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:9aeea0fe5875d3cf37faf0e44d0fdf9669335467749741b8fc0103916fb5cd32", size = 11484584, upload-time = "2026-06-27T00:27:16.311Z" }, { url = "https://files.pythonhosted.org/packages/9d/0a/af93e9785200f11ac416cc20235fc2464c9bd978e791190684ea0e458795/ty-0.0.59-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:86da5872124a41877d95058bc17d33ddcff034b587eb5f1e2917ab88ba227dac", size = 11554993, upload-time = "2026-07-12T20:21:49.671Z" },
{ url = "https://files.pythonhosted.org/packages/4a/4f/7a9c0bbac8b899e9f6c0ec110c6612f52e4db35f6bb17ddc0ef60384fa3e/ty-0.0.55-py3-none-musllinux_1_2_i686.whl", hash = "sha256:0b699c01310dbd2705a07c97c5f4aaeedef61bd9adeea2e7c46aed32401d3576", size = 11759309, upload-time = "2026-06-27T00:27:18.471Z" }, { url = "https://files.pythonhosted.org/packages/4b/dd/651bf87e20d00376c81b19124756491cffaf20eb8bec05a8794e5a8cf641/ty-0.0.59-py3-none-musllinux_1_2_i686.whl", hash = "sha256:6a233eef5f2fd4d894881e4a0aec83c9f172bfae1d787d6596ee1939fcc7723e", size = 11818230, upload-time = "2026-07-12T20:21:51.659Z" },
{ url = "https://files.pythonhosted.org/packages/ca/de/b6f8b1b69aa631b5716ef3f985c3b56de0e46c2499cc00d30c402b41f714/ty-0.0.55-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:32cbeba543e46de2a983ec6d525d8b56514f7422bd1e1b57c44ccf7bfa72c38a", size = 12128755, upload-time = "2026-06-27T00:27:20.55Z" }, { url = "https://files.pythonhosted.org/packages/16/50/c947c4155fea751d135b19affdf734bbce72a94e446b866cf0c62f8bed69/ty-0.0.59-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:7ff678c18b5f1e3128b75a35e50dee7908dea55155baa31cd790619d5014cbf5", size = 12135194, upload-time = "2026-07-12T20:21:53.796Z" },
{ url = "https://files.pythonhosted.org/packages/7d/90/a912531e51ee7e076b42972479290fa687c0f5e747b7e773f3033164acaa/ty-0.0.55-py3-none-win32.whl", hash = "sha256:52b968e24eb4f7a5c3bd251db1f99f60dd385890356d38fc619d84f1b423446a", size = 11117501, upload-time = "2026-06-27T00:27:22.714Z" }, { url = "https://files.pythonhosted.org/packages/b1/13/e5feb138888de1e95037c843571bbbd4ac21bf0a190507468098599a321f/ty-0.0.59-py3-none-win32.whl", hash = "sha256:cf8abb4b8095c5fe39102b8127f5886db308c8d4600909ddbc905512ce9c8163", size = 11179249, upload-time = "2026-07-12T20:21:55.752Z" },
{ url = "https://files.pythonhosted.org/packages/4c/7a/99d59843bf8908a7f9f4d13fda107dbad07b7faa28ecd7860eacf363fb1c/ty-0.0.55-py3-none-win_amd64.whl", hash = "sha256:bf39cbfdc0add44d94bd3fff1f53c351418d134b6a66b87efdb7876d7b7a2224", size = 12150106, upload-time = "2026-06-27T00:27:24.881Z" }, { url = "https://files.pythonhosted.org/packages/76/dd/52914dcbeeba92c207de40ef7109a58dcb5527aeb21c8f8feb7402aa9e29/ty-0.0.59-py3-none-win_amd64.whl", hash = "sha256:1dde20a82243d24407869e5a608c2f15efddd5cefc662aef461a5af84bfb3f8b", size = 12251079, upload-time = "2026-07-12T20:21:58.1Z" },
{ url = "https://files.pythonhosted.org/packages/b3/44/20987505cedf2a865b08482f0eabc181fd9599b062964057ec8a128a4296/ty-0.0.55-py3-none-win_arm64.whl", hash = "sha256:f7f3700a9a060e8f1af11e4fb63fafcaf272b041781f4ccdfda2b3b5c6c1e439", size = 11560157, upload-time = "2026-06-27T00:27:27.332Z" }, { url = "https://files.pythonhosted.org/packages/d4/8f/ac36fde77e223297454c1e0aeb8888c169eaacf3163bb609e3af942c88cb/ty-0.0.59-py3-none-win_arm64.whl", hash = "sha256:987043ee9e021f49493d9135891ac69c1affeee0d4ad4480c5fa4d9c975fc91b", size = 11650921, upload-time = "2026-07-12T20:22:00.348Z" },
] ]
[[package]] [[package]]