refactor: move inline imports to module level #1893
Merged
+58
−122
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Move inline imports to the top of files for consistency. ## src/ changes - server/fastmcp/server.py: Move auth routes and Middleware imports - server/lowlevel/server.py: Move importlib.metadata.version import - server/__main__.py: Move warnings import - client/__main__.py: Move warnings import - client/auth/extensions/client_credentials.py: Move warnings import ## tests/ changes - test_examples.py: Move example imports, rename to avoid conflicts - test_error_handling.py: Move base64, hashlib, secrets, settings imports - test_protected_resource.py: Move urlparse import - test_func_metadata.py: Move InvalidSignature and NamedTuple imports - test_server.py: Move Starlette and ToolError imports - test_integration.py: Move type imports - test_url_elicitation.py: Move elicit_url and pydantic imports - test_auth_integration.py: Remove duplicate base64 imports - test_streamable_http.py: Move traceback import - test_ws.py: Move urlparse import - test_auth_utils.py: Move HttpUrl import - test_sampling_callback.py: Move FastMCP import - test_list_roots_callback.py: Move FastMCP import - test_logging_callback.py: Move FastMCP import - test_auth.py: Consolidate urllib.parse and add auth imports - test_stdio.py: Move _terminate_process_tree import - test_http_unicode.py: Move server-related imports (keep uvicorn inline) - test_session_group.py: Move httpx import - test_output_schema_validation.py: Move jsonschema and inspect imports - test_client_credentials.py: Move warnings import ## Intentionally kept as inline imports - Optional deps (uvicorn, rich, typer, dotenv, jsonschema in src/) - Platform-specific (win32) - TYPE_CHECKING blocks - Circular import avoidance (context_injection.py) Claude-Generated-By: Claude Code (cli/claude-opus-4-5=100%) Claude-Steers: 0 Claude-Permission-Prompts: 2 Claude-Escapes: 0
maxisbey
force-pushed
the
refactor/move-inline-imports-to-top
branch
from
afbae45 to
fbf8461
Compare
Reverting changes to src/mcp/server/fastmcp/server.py as these are being handled in a separate branch. Claude-Generated-By: Claude Code (cli/claude-opus-4-5=100%) Claude-Steers: 0 Claude-Permission-Prompts: 1 Claude-Escapes: 0
Kludex
previously approved these changes
Jan 16, 2026
Co-authored-by: Marcelo Trylesinski <marcelotryle@gmail.com>
Kludex
approved these changes
Jan 16, 2026
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Move inline imports to the top of files for consistency.
Changes
create_auth_routes,build_resource_metadata_url,create_protected_resource_routesfrommcp.server.auth.routesto top-level importsimportlib.metadata.versionto top-level (renamed toimportlib_versionto avoid shadowing)warningsimport to top-levelwarningsimport to top-levelwarningsimport to top-levelIntentionally kept as inline imports
The following patterns were intentionally left as inline imports:
uvicorn,rich,typer,dotenv,jsonschema(lazy-loaded to avoid import errors when not installed)win32imports (only imported on Windows)if TYPE_CHECKING:(for type hints only, not runtime)context_injection.pyimportingContextfromserver.py