Merge branch 'main' into feat/client-credentials

Author: LucaButBoring

src/mcp/client/session.py

@@ -15,7 +15,6 @@
 
 DEFAULT_CLIENT_INFO = types.Implementation(name="mcp", version="0.1.0")
 
-logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger("client")
 
 

src/mcp/server/auth/routes.py

@@ -32,7 +32,11 @@ def validate_issuer_url(url: AnyHttpUrl):
     """
 
     # RFC 8414 requires HTTPS, but we allow localhost HTTP for testing
-    if url.scheme != "https" and url.host != "localhost" and not url.host.startswith("127.0.0.1"):
+    if (
+        url.scheme != "https"
+        and url.host != "localhost"
+        and (url.host is not None and not url.host.startswith("127.0.0.1"))
+    ):
         raise ValueError("Issuer URL must be HTTPS")
 
     # No fragments or query parameters allowed

tests/issues/test_188_concurrency.py

@@ -14,29 +14,38 @@
 @pytest.mark.anyio
 async def test_messages_are_executed_concurrently():
     server = FastMCP("test")
+    call_timestamps = []
 
     @server.tool("sleep")
     async def sleep_tool():
+        call_timestamps.append(("tool_start_time", anyio.current_time()))
         await anyio.sleep(_sleep_time_seconds)
+        call_timestamps.append(("tool_end_time", anyio.current_time()))
         return "done"
 
     @server.resource(_resource_name)
     async def slow_resource():
+        call_timestamps.append(("resource_start_time", anyio.current_time()))
         await anyio.sleep(_sleep_time_seconds)
+        call_timestamps.append(("resource_end_time", anyio.current_time()))
         return "slow"
 
     async with create_session(server._mcp_server) as client_session:
-        start_time = anyio.current_time()
         async with anyio.create_task_group() as tg:
             for _ in range(10):
                 tg.start_soon(client_session.call_tool, "sleep")
                 tg.start_soon(client_session.read_resource, AnyUrl(_resource_name))
 
-        end_time = anyio.current_time()
-
-        duration = end_time - start_time
-        assert duration < 10 * _sleep_time_seconds
-        print(duration)
+        active_calls = 0
+        max_concurrent_calls = 0
+        for call_type, _ in sorted(call_timestamps, key=lambda x: x[1]):
+            if "start" in call_type:
+                active_calls += 1
+                max_concurrent_calls = max(max_concurrent_calls, active_calls)
+            else:
+                active_calls -= 1
+        print(f"Max concurrent calls: {max_concurrent_calls}")
+        assert max_concurrent_calls > 1, "No concurrent calls were executed"
 
 
 def main():

tests/server/fastmcp/test_func_metadata.py

@@ -203,6 +203,7 @@ def func_dict_any() -> dict[str, Any]:
 
     meta = func_metadata(func_dict_any)
     assert meta.output_schema == {
+        "additionalProperties": True,
         "type": "object",
         "title": "func_dict_anyDictOutput",
     }