Skip to content

Python lint: Ruff rules for pylint and code complexity #525

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -90,18 +90,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", "PLR0402"]
mccabe.max-complexity = 24 # 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 = 23 # Default is 12
max-returns = 13 # Default is 6
max-statements = 99 # Default is 50

[tool.uv.workspace]
members = ["examples/servers/*"]

Expand Down
2 changes: 1 addition & 1 deletion src/mcp/server/lowlevel/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ async def main():
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.server.stdio import stdio_server as stdio_server # noqa: PLC0414
from mcp.shared.context import RequestContext
from mcp.shared.exceptions import McpError
from mcp.shared.message import SessionMessage
Expand Down
27 changes: 13 additions & 14 deletions src/mcp/server/streamable_http.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/shared/test_progress_notifications.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Loading