Merge branch 'main' into feature/add-enable-disable-methods-tools

Author: davila7

pyproject.toml

@@ -109,7 +109,13 @@ members = ["examples/servers/*"]
 mcp = { workspace = true }
 
 [tool.pytest.ini_options]
+log_cli = true
 xfail_strict = true
+addopts = """
+    --color=yes
+    --capture=fd
+    --numprocesses auto
+"""
 filterwarnings = [
     "error",
     # This should be fixed on Uvicorn's side.

src/mcp/server/fastmcp/tools/base.py

@@ -1,5 +1,6 @@
 from __future__ import annotations as _annotations
 
+import functools
 import inspect
 from collections.abc import Callable
 from typing import TYPE_CHECKING, Any, get_origin
@@ -54,7 +55,7 @@ def from_function(
             raise ValueError("You must provide a name for lambda functions")
 
         func_doc = description or fn.__doc__ or ""
-        is_async = inspect.iscoroutinefunction(fn)
+        is_async = _is_async_callable(fn)
 
         if context_kwarg is None:
             sig = inspect.signature(fn)
@@ -125,3 +126,12 @@ async def disable(
                 )
                 server_notification = ServerNotification.model_validate(notification)
                 await context.session.send_notification(server_notification)
+
+
+def _is_async_callable(obj: Any) -> bool:
+    while isinstance(obj, functools.partial):
+        obj = obj.func
+
+    return inspect.iscoroutinefunction(obj) or (
+        callable(obj) and inspect.iscoroutinefunction(getattr(obj, "__call__", None))
+    )

tests/client/test_config.py

@@ -44,7 +44,9 @@ def test_command_execution(mock_config_path: Path):
 
     test_args = [command] + args + ["--help"]
 
-    result = subprocess.run(test_args, capture_output=True, text=True, timeout=5)
+    result = subprocess.run(
+        test_args, capture_output=True, text=True, timeout=5, check=False
+    )
 
     assert result.returncode == 0
     assert "usage" in result.stdout.lower()

tests/server/fastmcp/test_tool_manager.py

@@ -102,6 +102,39 @@ def create_user(user: UserInput, flag: bool) -> dict:
         assert "age" in tool.parameters["$defs"]["UserInput"]["properties"]
         assert "flag" in tool.parameters["properties"]
 
+    def test_add_callable_object(self):
+        """Test registering a callable object."""
+
+        class MyTool:
+            def __init__(self):
+                self.__name__ = "MyTool"
+
+            def __call__(self, x: int) -> int:
+                return x * 2
+
+        manager = ToolManager()
+        tool = manager.add_tool(MyTool())
+        assert tool.name == "MyTool"
+        assert tool.is_async is False
+        assert tool.parameters["properties"]["x"]["type"] == "integer"
+
+    @pytest.mark.anyio
+    async def test_add_async_callable_object(self):
+        """Test registering an async callable object."""
+
+        class MyAsyncTool:
+            def __init__(self):
+                self.__name__ = "MyAsyncTool"
+
+            async def __call__(self, x: int) -> int:
+                return x * 2
+
+        manager = ToolManager()
+        tool = manager.add_tool(MyAsyncTool())
+        assert tool.name == "MyAsyncTool"
+        assert tool.is_async is True
+        assert tool.parameters["properties"]["x"]["type"] == "integer"
+
     def test_add_invalid_tool(self):
         manager = ToolManager()
         with pytest.raises(AttributeError):
@@ -168,6 +201,34 @@ async def double(n: int) -> int:
         result = await manager.call_tool("double", {"n": 5})
         assert result == 10
 
+    @pytest.mark.anyio
+    async def test_call_object_tool(self):
+        class MyTool:
+            def __init__(self):
+                self.__name__ = "MyTool"
+
+            def __call__(self, x: int) -> int:
+                return x * 2
+
+        manager = ToolManager()
+        tool = manager.add_tool(MyTool())
+        result = await tool.run({"x": 5})
+        assert result == 10
+
+    @pytest.mark.anyio
+    async def test_call_async_object_tool(self):
+        class MyAsyncTool:
+            def __init__(self):
+                self.__name__ = "MyAsyncTool"
+
+            async def __call__(self, x: int) -> int:
+                return x * 2
+
+        manager = ToolManager()
+        tool = manager.add_tool(MyAsyncTool())
+        result = await tool.run({"x": 5})
+        assert result == 10
+
     @pytest.mark.anyio
     async def test_call_tool_with_default_args(self):
         def add(a: int, b: int = 1) -> int: