Python lint: Ruff rules for pylint and code complexity

cclauss · cclauss · commit 1d069739e709 · 2025-04-15T22:50:02.000+02:00
diff --git a/README.md b/README.md
@@ -492,7 +492,7 @@ The lifespan API provides:
 
 ```python
 import mcp.server.stdio
-import mcp.types as types
+from mcp import types
 from mcp.server.lowlevel import NotificationOptions, Server
 from mcp.server.models import InitializationOptions
 
diff --git a/examples/servers/simple-prompt/mcp_simple_prompt/server.py b/examples/servers/simple-prompt/mcp_simple_prompt/server.py
@@ -1,6 +1,6 @@
 import anyio
 import click
-import mcp.types as types
+from mcp import types
 from mcp.server.lowlevel import Server
 
 
diff --git a/examples/servers/simple-resource/mcp_simple_resource/server.py b/examples/servers/simple-resource/mcp_simple_resource/server.py
@@ -1,6 +1,6 @@
 import anyio
 import click
-import mcp.types as types
+from mcp import types
 from mcp.server.lowlevel import Server
 from pydantic import FileUrl
 
diff --git a/examples/servers/simple-tool/mcp_simple_tool/server.py b/examples/servers/simple-tool/mcp_simple_tool/server.py
@@ -1,7 +1,7 @@
 import anyio
 import click
 import httpx
-import mcp.types as types
+from mcp import types
 from mcp.server.lowlevel import Server
 
 
diff --git a/pyproject.toml b/pyproject.toml
@@ -88,18 +88,26 @@ venvPath = "."
 venv = ".venv"
 strict = ["src/mcp/**/*.py"]
 
-[tool.ruff.lint]
-select = ["C4", "E", "F", "I", "PERF", "UP"]
-ignore = ["PERF203"]
-
 [tool.ruff]
 line-length = 88
 target-version = "py310"
 
+[tool.ruff.lint]
+select = ["C4", "C90", "E", "F", "I", "PERF", "PL", "UP"]
+ignore = ["PERF203"]
+mccabe.max-complexity = 13  # Default is 10
+
 [tool.ruff.lint.per-file-ignores]
 "__init__.py" = ["F401"]
 "tests/server/fastmcp/test_func_metadata.py" = ["E501"]
 
+[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
+
 [tool.uv.workspace]
 members = ["examples/servers/*"]
 
diff --git a/src/mcp/client/__main__.py b/src/mcp/client/__main__.py
@@ -7,7 +7,7 @@
 import anyio
 from anyio.streams.memory import MemoryObjectReceiveStream, MemoryObjectSendStream
 
-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.stdio import StdioServerParameters, stdio_client
diff --git a/src/mcp/client/session.py b/src/mcp/client/session.py
@@ -5,7 +5,7 @@
 from anyio.streams.memory import MemoryObjectReceiveStream, MemoryObjectSendStream
 from pydantic import AnyUrl, TypeAdapter
 
-import mcp.types as types
+from mcp import types
 from mcp.shared.context import RequestContext
 from mcp.shared.session import BaseSession, RequestResponder
 from mcp.shared.version import SUPPORTED_PROTOCOL_VERSIONS
diff --git a/src/mcp/client/sse.py b/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
 
 logger = logging.getLogger(__name__)
 
diff --git a/src/mcp/client/stdio/__init__.py b/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 .win32 import (
     create_windows_process,
diff --git a/src/mcp/client/websocket.py b/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
 
 logger = logging.getLogger(__name__)
 
diff --git a/src/mcp/server/lowlevel/server.py b/src/mcp/server/lowlevel/server.py
@@ -77,11 +77,10 @@ async def main():
 from anyio.streams.memory import MemoryObjectReceiveStream, MemoryObjectSendStream
 from pydantic import AnyUrl
 
-import mcp.types as types
+from mcp import types
 from mcp.server.lowlevel.helper_types import ReadResourceContents
 from mcp.server.models import InitializationOptions
 from mcp.server.session import ServerSession
-from mcp.server.stdio import stdio_server as stdio_server
 from mcp.shared.context import RequestContext
 from mcp.shared.exceptions import McpError
 from mcp.shared.session import RequestResponder
diff --git a/src/mcp/server/session.py b/src/mcp/server/session.py
@@ -45,7 +45,7 @@ async def handle_list_prompts(ctx: RequestContext) -> list[types.Prompt]:
 from anyio.streams.memory import MemoryObjectReceiveStream, MemoryObjectSendStream
 from pydantic import AnyUrl
 
-import mcp.types as types
+from mcp import types
 from mcp.server.models import InitializationOptions
 from mcp.shared.session import (
     BaseSession,
diff --git a/src/mcp/server/sse.py b/src/mcp/server/sse.py
@@ -45,7 +45,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
 
 logger = logging.getLogger(__name__)
 
diff --git a/src/mcp/server/stdio.py b/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
 
 
 @asynccontextmanager
diff --git a/src/mcp/server/websocket.py b/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
 
 logger = logging.getLogger(__name__)
 
diff --git a/src/mcp/shared/memory.py b/src/mcp/shared/memory.py
@@ -10,7 +10,7 @@
 import anyio
 from anyio.streams.memory import MemoryObjectReceiveStream, MemoryObjectSendStream
 
-import mcp.types as types
+from mcp import types
 from mcp.client.session import (
     ClientSession,
     ListRootsFnT,
diff --git a/tests/client/test_config.py b/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()
diff --git a/tests/client/test_logging_callback.py b/tests/client/test_logging_callback.py
@@ -2,7 +2,7 @@
 
 import pytest
 
-import mcp.types as types
+from mcp import types
 from mcp.shared.memory import (
     create_connected_server_and_client_session as create_session,
 )
diff --git a/tests/client/test_session.py b/tests/client/test_session.py
@@ -1,7 +1,7 @@
 import anyio
 import pytest
 
-import mcp.types as types
+from mcp import types
 from mcp.client.session import DEFAULT_CLIENT_INFO, ClientSession
 from mcp.shared.session import RequestResponder
 from mcp.types import (
diff --git a/tests/server/test_read_resource.py b/tests/server/test_read_resource.py
@@ -5,7 +5,7 @@
 import pytest
 from pydantic import AnyUrl, FileUrl
 
-import mcp.types as types
+from mcp import types
 from mcp.server.lowlevel.server import ReadResourceContents, Server
 
 
diff --git a/tests/server/test_session.py b/tests/server/test_session.py
@@ -1,7 +1,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
diff --git a/tests/shared/test_session.py b/tests/shared/test_session.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.lowlevel.server import Server
 from mcp.shared.exceptions import McpError
