Increase complexity metrics to match current code complexity

Author: cclauss

pyproject.toml

@@ -97,7 +97,7 @@ target-version = "py310"
 [tool.ruff.lint]
 select = ["C4", "C90", "E", "F", "I", "PERF", "PL", "UP"]
 ignore = ["PERF203"]
-mccabe.max-complexity = 13  # Default is 10
+mccabe.max-complexity = 24  # Default is 10
 
 [tool.ruff.lint.per-file-ignores]
 "__init__.py" = ["F401"]
@@ -106,9 +106,9 @@ mccabe.max-complexity = 13  # Default is 10
 [tool.ruff.lint.pylint]
 allow-magic-value-types = ["bytes", "float", "int", "str"]
 max-args = 20        # Default is 5
-max-branches = 14    # Default is 12
-max-returns = 7      # Default is 6
-max-statements = 69  # Default is 50
+max-branches = 23    # Default is 12
+max-returns = 13      # Default is 6
+max-statements = 99  # Default is 50
 
 [tool.uv.workspace]
 members = ["examples/servers/*"]

src/mcp/client/sse.py

@@ -9,7 +9,7 @@
 from anyio.streams.memory import MemoryObjectReceiveStream, MemoryObjectSendStream
 from httpx_sse import aconnect_sse
 
-import mcp.types as types
+from mcp import types
 from mcp.shared._httpx_utils import McpHttpClientFactory, create_mcp_http_client
 from mcp.shared.message import SessionMessage
 

src/mcp/client/stdio/__init__.py

@@ -10,7 +10,7 @@
 from anyio.streams.text import TextReceiveStream
 from pydantic import BaseModel, Field
 
-import mcp.types as types
+from mcp import types
 from mcp.shared.message import SessionMessage
 
 from .win32 import (

src/mcp/client/websocket.py

@@ -9,7 +9,7 @@
 from websockets.asyncio.client import connect as ws_connect
 from websockets.typing import Subprotocol
 
-import mcp.types as types
+from mcp import types
 from mcp.shared.message import SessionMessage
 
 logger = logging.getLogger(__name__)

src/mcp/server/sse.py

@@ -51,7 +51,7 @@ async def handle_sse(request):
 from starlette.responses import Response
 from starlette.types import Receive, Scope, Send
 
-import mcp.types as types
+from mcp import types
 from mcp.shared.message import SessionMessage
 
 logger = logging.getLogger(__name__)

src/mcp/server/stdio.py

@@ -26,7 +26,7 @@ async def run_server():
 import anyio.lowlevel
 from anyio.streams.memory import MemoryObjectReceiveStream, MemoryObjectSendStream
 
-import mcp.types as types
+from mcp import types
 from mcp.shared.message import SessionMessage
 
 

src/mcp/server/streamable_http.py

@@ -856,20 +856,19 @@ async def message_router():
                             if response_id in self._request_streams:
                                 target_request_id = response_id
 
-                        else:
-                            # Extract related_request_id from meta if it exists
-                            if (
-                                session_message.metadata is not None
-                                and isinstance(
-                                    session_message.metadata,
-                                    ServerMessageMetadata,
-                                )
-                                and session_message.metadata.related_request_id
-                                is not None
-                            ):
-                                target_request_id = str(
-                                    session_message.metadata.related_request_id
-                                )
+                        # Extract related_request_id from meta if it exists
+                        elif (
+                            session_message.metadata is not None
+                            and isinstance(
+                                session_message.metadata,
+                                ServerMessageMetadata,
+                            )
+                            and session_message.metadata.related_request_id
+                            is not None
+                        ):
+                            target_request_id = str(
+                                session_message.metadata.related_request_id
+                            )
 
                         request_stream_id = (
                             target_request_id

src/mcp/server/websocket.py

@@ -7,7 +7,7 @@
 from starlette.types import Receive, Scope, Send
 from starlette.websockets import WebSocket
 
-import mcp.types as types
+from mcp import types
 from mcp.shared.message import SessionMessage
 
 logger = logging.getLogger(__name__)

tests/server/fastmcp/test_integration.py

@@ -14,7 +14,7 @@
 import uvicorn
 from pydantic import AnyUrl
 
-import mcp.types as types
+from mcp import types
 from mcp.client.session import ClientSession
 from mcp.client.sse import sse_client
 from mcp.client.streamable_http import streamablehttp_client

tests/shared/test_progress_notifications.py

@@ -3,7 +3,7 @@
 import anyio
 import pytest
 
-import mcp.types as types
+from mcp import types
 from mcp.client.session import ClientSession
 from mcp.server import Server
 from mcp.server.lowlevel import NotificationOptions
@@ -41,7 +41,7 @@ async def run_server():
                 capabilities=server.get_capabilities(NotificationOptions(), {}),
             ),
         ) as server_session:
-            global serv_sesh
+            global serv_sesh  # noqa: PLW0603
 
             serv_sesh = server_session
             async for message in server_session.incoming_messages: