Fixed pre-commit errors

Author: jessesanford

examples/servers/proxy_oauth/server.py

@@ -1,14 +1,16 @@
 # pyright: reportMissingImports=false
-import os
+import base64
+import json
 import logging
-from dotenv import load_dotenv  # type: ignore
-from typing import Any, cast
-import base64, json, time
-from starlette.requests import Request  # type: ignore
+import os
+import time
+from typing import Any
 
-from mcp.server.fastmcp.server import Context
-from mcp.server.auth.proxy.server import build_proxy_server  # noqa: E402
+from dotenv import load_dotenv  # type: ignore
 from mcp.server.auth.providers.transparent_proxy import ProxySettings  # type: ignore
+from mcp.server.auth.proxy.server import build_proxy_server  # noqa: E402
+from mcp.server.fastmcp.server import Context
+from starlette.requests import Request  # type: ignore
 
 # Load environment variables from .env if present
 load_dotenv()
@@ -178,7 +180,8 @@ def _b64decode(segment: str) -> bytes:
     }
 
     if jwt_claims:
-        # Prefer the `userid` claim used in FastMCP examples; fall back to `sub` if absent.
+        # Prefer the `userid` claim used in FastMCP examples; fall back to `sub` if
+        # absent.
         uid = jwt_claims.get("userid") or jwt_claims.get("sub")
         if uid is not None:
             response["userid"] = uid  # camelCase variant used in FastMCP reference

src/mcp/client/websocket.py

@@ -1,3 +1,4 @@
+# pyright: reportMissingImports=false, reportUnknownVariableType=false, reportUnknownArgumentType=false, reportUnknownMemberType=false
 import json
 import logging
 from collections.abc import AsyncGenerator

src/mcp/server/auth/providers/transparent_proxy.py

@@ -1,5 +1,34 @@
+# pyright: reportUnknownMemberType=false, reportUnknownVariableType=false, reportAttributeAccessIssue=false, reportUnknownArgumentType=false, reportCallIssue=false, reportUnnecessaryIsInstance=false
 from __future__ import annotations
 
+import logging
+import os
+import time
+import uuid
+from collections.abc import Mapping
+from typing import Any, cast
+from urllib.parse import urlencode
+
+import httpx  # type: ignore
+from pydantic import AnyHttpUrl, AnyUrl, Field
+from pydantic_settings import BaseSettings, SettingsConfigDict
+from starlette.responses import Response
+from starlette.routing import Route
+
+from mcp.server.auth.handlers.token import TokenHandler
+from mcp.server.auth.middleware.client_auth import ClientAuthenticator
+from mcp.server.auth.provider import (
+    AccessToken,
+    AuthorizationCode,
+    AuthorizationParams,
+    OAuthAuthorizationServerProvider,
+)
+from mcp.server.auth.proxy.routes import create_proxy_routes
+from mcp.server.auth.routes import create_auth_routes
+from mcp.server.auth.settings import ClientRegistrationOptions
+from mcp.server.fastmcp.utilities.logging import redact_sensitive_data
+from mcp.shared.auth import OAuthClientInformationFull, OAuthToken
+
 """Transparent OAuth proxy provider for FastMCP (Anthropic SDK).
 
 This provider mimics the behaviour of fastapi_mcp's `setup_proxies=True` and the
@@ -23,42 +52,6 @@
 A simple helper ``TransparentOAuthProxyProvider.from_env()`` reads these vars.
 """
 
-import os
-import time
-import uuid
-import json
-import urllib.parse
-from typing import Any, cast
-from collections.abc import Mapping
-from urllib.parse import urlencode
-
-import httpx  # type: ignore
-import logging
-from pydantic import AnyHttpUrl, Field, AnyUrl
-from pydantic_settings import BaseSettings, SettingsConfigDict
-from starlette.routing import Route
-from starlette.requests import Request
-from starlette.responses import Response
-
-from mcp.server.auth.provider import (
-    AccessToken,
-    AuthorizationCode,
-    AuthorizationParams,
-    OAuthAuthorizationServerProvider,
-)
-from mcp.server.auth.settings import ClientRegistrationOptions
-from mcp.shared.auth import OAuthClientInformationFull, OAuthToken
-from mcp.server.auth.routes import create_auth_routes
-from mcp.server.auth.middleware.client_auth import ClientAuthenticator
-from mcp.server.auth.handlers.token import TokenHandler
-from starlette.requests import Request
-from starlette.responses import Response
-
-# New: route factory for proxy endpoints
-from mcp.server.auth.proxy.routes import create_proxy_routes  # noqa: E402
-
-from mcp.server.fastmcp.utilities.logging import configure_logging, redact_sensitive_data
-
 __all__ = ["TransparentOAuthProxyProvider"]
 
 logger = logging.getLogger("transparent_oauth_proxy")
@@ -74,15 +67,13 @@ class ProxyTokenHandler(TokenHandler):
     back to the caller.
     """
 
-    def __init__(self, provider: "TransparentOAuthProxyProvider"):
+    def __init__(self, provider: TransparentOAuthProxyProvider):
         # We provide a dummy ClientAuthenticator that will accept any client –
         # we are not going to invoke the base-class logic anyway.
         super().__init__(provider=provider, client_authenticator=ClientAuthenticator(provider))
         self.provider = provider  # keep for easy access
 
-    async def handle(self, request):  # type: ignore[override]
-        from starlette.responses import Response
-
+    async def handle(self, request) -> Response:  # type: ignore[override]
         correlation_id = str(uuid.uuid4())[:8]
         start_time = time.time()
 
@@ -157,7 +148,7 @@ class ProxySettings(BaseSettings):
     default_scope: str = Field("openid", alias="PROXY_DEFAULT_SCOPE")
 
     @classmethod
-    def load(cls) -> "ProxySettings":
+    def load(cls) -> ProxySettings:
         """Instantiate settings from environment variables (for backwards compatibility)."""
         return cls()
 
@@ -342,7 +333,7 @@ async def revoke_token(self, token: object) -> None:  # noqa: D401
     # ------------------------------------------------------------------
 
     @classmethod
-    def from_env(cls) -> "TransparentOAuthProxyProvider":
+    def from_env(cls) -> TransparentOAuthProxyProvider:
         """Construct provider using :class:`ProxySettings` populated from the environment."""
         return cls(settings=ProxySettings.load())
 

src/mcp/server/auth/proxy/routes.py

@@ -3,14 +3,14 @@
 
 from __future__ import annotations
 
-import os
 import logging
+import os
 import urllib.parse
 from typing import Any
 
 import httpx  # type: ignore
-from starlette.responses import JSONResponse, RedirectResponse, Response
 from starlette.requests import Request
+from starlette.responses import JSONResponse, RedirectResponse, Response
 from starlette.routing import Route
 
 from mcp.server.fastmcp.utilities.logging import configure_logging

src/mcp/server/auth/proxy/server.py

@@ -5,9 +5,10 @@
 
 from typing import TYPE_CHECKING, Literal
 
-from mcp.server.fastmcp import FastMCP
-from mcp.server.auth.settings import AuthSettings, ClientRegistrationOptions
 from pydantic import AnyHttpUrl
+
+from mcp.server.auth.settings import AuthSettings, ClientRegistrationOptions
+from mcp.server.fastmcp import FastMCP
 from mcp.server.fastmcp.utilities.logging import configure_logging
 
 from ..providers.transparent_proxy import TransparentOAuthProxyProvider
@@ -29,7 +30,7 @@ def build_proxy_server(  # noqa: D401,E501
     port: int = 8000,
     issuer_url: str | None = None,
     log_level: Literal["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"] = "DEBUG",
-    settings: "ProxySettings | None" = None,
+    settings: ProxySettings | None = None,
 ) -> FastMCP:
     """Return a fully-configured FastMCP instance running the proxy.
 
@@ -39,7 +40,7 @@ def build_proxy_server(  # noqa: D401,E501
     """
 
     # Runtime import to avoid circular dependency at module import time.
-    from ..providers.transparent_proxy import _Settings as ProxySettings  # noqa: WPS433
+    from ..providers.transparent_proxy import _Settings as ProxySettings
 
     if settings is None:
         settings = ProxySettings.load()

src/mcp/server/fastmcp/server.py

@@ -9,7 +9,7 @@
     AbstractAsyncContextManager,
     asynccontextmanager,
 )
-from typing import Any, Generic, Literal, cast
+from typing import Any, Generic, Literal
 
 import anyio
 import pydantic_core
@@ -1132,6 +1132,7 @@ async def error(self, message: str, **extra: Any) -> None:
 # ---------------------------------------------------------------------------
 
 
+# pyright: reportUnknownArgumentType=false, reportUnknownParameterType=false
 def _build_provider_auth_routes(provider: OAuthAuthorizationServerProvider[Any, Any, Any], auth_settings: AuthSettings):
     """Return the list of Starlette routes for the given provider.
 

src/mcp/server/fastmcp/utilities/logging.py

@@ -1,9 +1,8 @@
 """Logging utilities for FastMCP."""
 
 import logging
-from typing import Literal
 from collections.abc import Mapping
-from typing import Any
+from typing import Any, Literal
 
 
 def get_logger(name: str) -> logging.Logger:

tests/test_proxy_builder.py

@@ -3,16 +3,15 @@
 
 from __future__ import annotations
 
-import pytest  # type: ignore
-import httpx  # type: ignore
-import os
-
 from typing import cast
+
+import httpx  # type: ignore
+import pytest  # type: ignore
 from pydantic import AnyHttpUrl
 
-from mcp.server.auth.proxy.server import build_proxy_server
+from mcp.server.auth.providers.transparent_proxy import _Settings as ProxySettings
 from mcp.server.auth.proxy import routes as proxy_routes
-from mcp.server.auth.providers.transparent_proxy import _Settings as ProxySettings  # noqa: WPS433
+from mcp.server.auth.proxy.server import build_proxy_server
 
 
 @pytest.mark.anyio

tests/test_proxy_oauth_endpoints.py

@@ -8,7 +8,8 @@
 import base64
 import json
 import urllib.parse
-from typing import Any, AsyncGenerator
+from collections.abc import AsyncGenerator
+from typing import Any
 
 import httpx  # type: ignore
 import pytest  # type: ignore
@@ -29,10 +30,10 @@ def proxy_server(monkeypatch):
     os.environ.setdefault("UPSTREAM_CLIENT_SECRET", "secret123")
 
     # Deferred import so the env vars above are in effect.
-    from examples.servers.proxy_oauth import server as proxy_server_module  # noqa: WPS433 (runtime import for tests)
+    from examples.servers.proxy_oauth import server as proxy_server_module
 
     # Stub library-level fetch_upstream_metadata to avoid network I/O.
-    from mcp.server.auth.proxy import routes as proxy_routes  # noqa: WPS433
+    from mcp.server.auth.proxy import routes as proxy_routes
 
     async def _fake_metadata() -> dict[str, Any]:  # noqa: D401
         return {
@@ -118,7 +119,7 @@ async def test_authorize_redirect(client, proxy_server):
 async def test_revoke_proxy(client, monkeypatch, proxy_server):
     original_post = httpx.AsyncClient.post
 
-    async def _mock_post(self, url, data=None, timeout=10, **kwargs):  # noqa: D401,WPS110
+    async def _mock_post(self, url, data=None, timeout=10, **kwargs):  # noqa: D401
         if url.endswith("/revoke"):
             return httpx.Response(200, json={"revoked": True})
         # For the test client's own request to /revoke, delegate to original implementation
@@ -140,7 +141,7 @@ async def test_token_passthrough(client, monkeypatch, proxy_server):
 
     original_post = httpx.AsyncClient.post
 
-    async def _mock_post(self, url, *args, **kwargs):  # noqa: D401,WPS110
+    async def _mock_post(self, url, *args, **kwargs):  # noqa: D401
         if str(url).startswith(proxy_server.UPSTREAM_TOKEN):
             # Record exactly what was sent upstream
             captured["url"] = str(url)
@@ -198,8 +199,8 @@ async def test_user_info_tool(monkeypatch, proxy_server):
     )
     dummy_token = f"header.{payload}.signature"
 
-    from mcp.server.auth.provider import AccessToken  # local import to avoid cycles
     from mcp.server.auth.middleware import auth_context
+    from mcp.server.auth.provider import AccessToken  # local import to avoid cycles
 
     def _fake_get_access_token():  # noqa: D401
         return AccessToken(token=dummy_token, client_id="client123", scopes=["openid"], expires_at=None)