Skip to content

Commit b5f36e9

Browse files
committed
fix: resolve circular import and ruff lint issues
- utils.py imported from mcp.client.auth (package __init__) instead of mcp.client.auth.exceptions directly, creating a circular dependency that forced authlib_adapter to be imported last in __init__.py (violating import order). Fix by importing directly from the exceptions module. - Reorder __init__.py imports alphabetically (ruff I001) - Remove unused MagicMock import from test file (ruff F401) - Remove extra blank line in test imports (ruff E303)
1 parent 81b0d4d commit b5f36e9

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

src/mcp/client/auth/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
Implements authorization code flow with PKCE and automatic token refresh.
44
"""
55

6+
from mcp.client.auth.authlib_adapter import AuthlibAdapterConfig, AuthlibOAuthAdapter
67
from mcp.client.auth.exceptions import OAuthFlowError, OAuthRegistrationError, OAuthTokenError
78
from mcp.client.auth.oauth2 import (
89
OAuthClientProvider,
910
PKCEParameters,
1011
TokenStorage,
1112
)
12-
from mcp.client.auth.authlib_adapter import AuthlibAdapterConfig, AuthlibOAuthAdapter
1313

1414
__all__ = [
1515
"AuthlibAdapterConfig",

src/mcp/client/auth/utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from httpx import Request, Response
55
from pydantic import AnyUrl, ValidationError
66

7-
from mcp.client.auth import OAuthRegistrationError, OAuthTokenError
7+
from mcp.client.auth.exceptions import OAuthRegistrationError, OAuthTokenError
88
from mcp.client.streamable_http import MCP_PROTOCOL_VERSION
99
from mcp.shared.auth import (
1010
OAuthClientInformationFull,

tests/client/auth/test_authlib_adapter.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
from __future__ import annotations
1111

1212
from typing import Any
13-
from unittest.mock import AsyncMock, MagicMock, patch
13+
from unittest.mock import AsyncMock, patch
1414

1515
import httpx
1616
import pytest
@@ -19,7 +19,6 @@
1919
from mcp.client.auth.exceptions import OAuthFlowError
2020
from mcp.shared.auth import OAuthToken
2121

22-
2322
# ---------------------------------------------------------------------------
2423
# Helpers / fixtures
2524
# ---------------------------------------------------------------------------

0 commit comments

Comments
 (0)