From 82b670f86d72a2a2cac66986c96725e8757d46fb Mon Sep 17 00:00:00 2001 From: Marcelo Trylesinski Date: Tue, 3 Feb 2026 09:40:31 +0100 Subject: [PATCH] refactor: replace `mcp.types as types` to `from mcp import types` --- README.md | 22 +++++++++---------- README.v2.md | 22 +++++++++---------- .../mcp_simple_pagination/server.py | 2 +- .../simple-prompt/mcp_simple_prompt/server.py | 2 +- .../mcp_simple_resource/server.py | 2 +- .../server.py | 2 +- .../mcp_simple_streamablehttp/server.py | 2 +- .../mcp_simple_task_interactive/server.py | 2 +- .../simple-task/mcp_simple_task/server.py | 2 +- .../simple-tool/mcp_simple_tool/server.py | 2 +- .../mcp_sse_polling_demo/server.py | 2 +- .../__main__.py | 2 +- examples/snippets/servers/lowlevel/basic.py | 2 +- .../lowlevel/direct_call_tool_result.py | 2 +- .../snippets/servers/lowlevel/lifespan.py | 2 +- .../servers/lowlevel/structured_output.py | 2 +- .../snippets/servers/pagination_example.py | 2 +- src/mcp/client/__main__.py | 2 +- src/mcp/client/experimental/task_handlers.py | 2 +- src/mcp/client/experimental/tasks.py | 2 +- src/mcp/client/session.py | 2 +- src/mcp/client/sse.py | 2 +- src/mcp/client/stdio.py | 2 +- .../server/experimental/session_features.py | 2 +- src/mcp/server/lowlevel/server.py | 2 +- src/mcp/server/session.py | 2 +- src/mcp/server/sse.py | 2 +- src/mcp/server/stdio.py | 2 +- src/mcp/server/websocket.py | 2 +- tests/client/test_client.py | 2 +- tests/client/test_http_unicode.py | 2 +- tests/client/test_list_methods_cursor.py | 3 +-- tests/client/test_logging_callback.py | 3 +-- tests/client/test_session.py | 2 +- .../tasks/client/test_capabilities.py | 3 +-- .../tasks/client/test_handlers.py | 2 +- tests/server/test_cancel_handling.py | 3 +-- .../test_lowlevel_exception_handling.py | 2 +- tests/server/test_read_resource.py | 2 +- tests/server/test_session.py | 2 +- tests/server/test_session_race_condition.py | 2 +- tests/server/test_stateless_mode.py | 2 +- tests/shared/test_progress_notifications.py | 3 +-- tests/shared/test_session.py | 3 +-- tests/shared/test_sse.py | 2 +- tests/shared/test_streamable_http.py | 3 +-- 46 files changed, 66 insertions(+), 73 deletions(-) diff --git a/README.md b/README.md index 0f0468a19..863382e94 100644 --- a/README.md +++ b/README.md @@ -682,7 +682,7 @@ The Context object provides the following capabilities: - `ctx.session` - Access to the underlying session for advanced communication (see [Session Properties and Methods](#session-properties-and-methods)) - `ctx.request_context` - Access to request-specific data and lifespan resources (see [Request Context Properties](#request-context-properties)) - `await ctx.debug(message)` - Send debug log message -- `await ctx.info(message)` - Send info log message +- `await ctx.info(message)` - Send info log message - `await ctx.warning(message)` - Send warning log message - `await ctx.error(message)` - Send error log message - `await ctx.log(level, message, logger_name=None)` - Send log with custom level @@ -1110,13 +1110,13 @@ The session object accessible via `ctx.session` provides advanced control over c async def notify_data_update(resource_uri: str, ctx: Context) -> str: """Update data and notify clients of the change.""" # Perform data update logic here - + # Notify clients that this specific resource changed await ctx.session.send_resource_updated(AnyUrl(resource_uri)) - + # If this affects the overall resource list, notify about that too await ctx.session.send_resource_list_changed() - + return f"Updated {resource_uri} and notified clients" ``` @@ -1145,11 +1145,11 @@ def query_with_config(query: str, ctx: Context) -> str: """Execute a query using shared database and configuration.""" # Access typed lifespan context app_ctx: AppContext = ctx.request_context.lifespan_context - + # Use shared resources connection = app_ctx.db settings = app_ctx.config - + # Execute query with configuration result = connection.execute(query, timeout=settings.query_timeout) return str(result) @@ -1644,7 +1644,7 @@ from contextlib import asynccontextmanager from typing import Any 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 @@ -1758,7 +1758,7 @@ uv run examples/snippets/servers/lowlevel/basic.py import asyncio 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 @@ -1837,7 +1837,7 @@ import asyncio from typing import Any 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 @@ -1939,7 +1939,7 @@ import asyncio from typing import Any 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 @@ -2012,7 +2012,7 @@ For servers that need to handle large datasets, the low-level server provides pa ```python """Example of implementing pagination with MCP server decorators.""" -import mcp.types as types +from mcp import types from mcp.server.lowlevel import Server # Initialize the server diff --git a/README.v2.md b/README.v2.md index d34b7832b..a3b728bf5 100644 --- a/README.v2.md +++ b/README.v2.md @@ -684,7 +684,7 @@ The Context object provides the following capabilities: - `ctx.session` - Access to the underlying session for advanced communication (see [Session Properties and Methods](#session-properties-and-methods)) - `ctx.request_context` - Access to request-specific data and lifespan resources (see [Request Context Properties](#request-context-properties)) - `await ctx.debug(message)` - Send debug log message -- `await ctx.info(message)` - Send info log message +- `await ctx.info(message)` - Send info log message - `await ctx.warning(message)` - Send warning log message - `await ctx.error(message)` - Send error log message - `await ctx.log(level, message, logger_name=None)` - Send log with custom level @@ -1112,13 +1112,13 @@ The session object accessible via `ctx.session` provides advanced control over c async def notify_data_update(resource_uri: str, ctx: Context) -> str: """Update data and notify clients of the change.""" # Perform data update logic here - + # Notify clients that this specific resource changed await ctx.session.send_resource_updated(AnyUrl(resource_uri)) - + # If this affects the overall resource list, notify about that too await ctx.session.send_resource_list_changed() - + return f"Updated {resource_uri} and notified clients" ``` @@ -1147,11 +1147,11 @@ def query_with_config(query: str, ctx: Context) -> str: """Execute a query using shared database and configuration.""" # Access typed lifespan context app_ctx: AppContext = ctx.request_context.lifespan_context - + # Use shared resources connection = app_ctx.db settings = app_ctx.config - + # Execute query with configuration result = connection.execute(query, timeout=settings.query_timeout) return str(result) @@ -1646,7 +1646,7 @@ from contextlib import asynccontextmanager from typing import Any 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 @@ -1760,7 +1760,7 @@ uv run examples/snippets/servers/lowlevel/basic.py import asyncio 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 @@ -1839,7 +1839,7 @@ import asyncio from typing import Any 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 @@ -1941,7 +1941,7 @@ import asyncio from typing import Any 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 @@ -2014,7 +2014,7 @@ For servers that need to handle large datasets, the low-level server provides pa ```python """Example of implementing pagination with MCP server decorators.""" -import mcp.types as types +from mcp import types from mcp.server.lowlevel import Server # Initialize the server diff --git a/examples/servers/simple-pagination/mcp_simple_pagination/server.py b/examples/servers/simple-pagination/mcp_simple_pagination/server.py index 74e9e3e82..ff45ae224 100644 --- a/examples/servers/simple-pagination/mcp_simple_pagination/server.py +++ b/examples/servers/simple-pagination/mcp_simple_pagination/server.py @@ -8,7 +8,7 @@ import anyio import click -import mcp.types as types +from mcp import types from mcp.server.lowlevel import Server from starlette.requests import Request diff --git a/examples/servers/simple-prompt/mcp_simple_prompt/server.py b/examples/servers/simple-prompt/mcp_simple_prompt/server.py index 76b598f93..cbc5a9d68 100644 --- 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 from starlette.requests import Request diff --git a/examples/servers/simple-resource/mcp_simple_resource/server.py b/examples/servers/simple-resource/mcp_simple_resource/server.py index f1ab4e4dc..588d1044a 100644 --- 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 mcp.server.lowlevel.helper_types import ReadResourceContents from starlette.requests import Request diff --git a/examples/servers/simple-streamablehttp-stateless/mcp_simple_streamablehttp_stateless/server.py b/examples/servers/simple-streamablehttp-stateless/mcp_simple_streamablehttp_stateless/server.py index 1c3164524..9fed2f0aa 100644 --- a/examples/servers/simple-streamablehttp-stateless/mcp_simple_streamablehttp_stateless/server.py +++ b/examples/servers/simple-streamablehttp-stateless/mcp_simple_streamablehttp_stateless/server.py @@ -5,8 +5,8 @@ import anyio import click -import mcp.types as types import uvicorn +from mcp import types from mcp.server.lowlevel import Server from mcp.server.streamable_http_manager import StreamableHTTPSessionManager from starlette.applications import Starlette diff --git a/examples/servers/simple-streamablehttp/mcp_simple_streamablehttp/server.py b/examples/servers/simple-streamablehttp/mcp_simple_streamablehttp/server.py index bb09c119f..ef03d9b08 100644 --- a/examples/servers/simple-streamablehttp/mcp_simple_streamablehttp/server.py +++ b/examples/servers/simple-streamablehttp/mcp_simple_streamablehttp/server.py @@ -5,7 +5,7 @@ import anyio import click -import mcp.types as types +from mcp import types from mcp.server.lowlevel import Server from mcp.server.streamable_http_manager import StreamableHTTPSessionManager from starlette.applications import Starlette diff --git a/examples/servers/simple-task-interactive/mcp_simple_task_interactive/server.py b/examples/servers/simple-task-interactive/mcp_simple_task_interactive/server.py index 9e8c86eaa..dc689ed94 100644 --- a/examples/servers/simple-task-interactive/mcp_simple_task_interactive/server.py +++ b/examples/servers/simple-task-interactive/mcp_simple_task_interactive/server.py @@ -11,8 +11,8 @@ from typing import Any import click -import mcp.types as types import uvicorn +from mcp import types from mcp.server.experimental.task_context import ServerTaskContext from mcp.server.lowlevel import Server from mcp.server.streamable_http_manager import StreamableHTTPSessionManager diff --git a/examples/servers/simple-task/mcp_simple_task/server.py b/examples/servers/simple-task/mcp_simple_task/server.py index ba0d962de..ec16b15ae 100644 --- a/examples/servers/simple-task/mcp_simple_task/server.py +++ b/examples/servers/simple-task/mcp_simple_task/server.py @@ -6,8 +6,8 @@ import anyio import click -import mcp.types as types import uvicorn +from mcp import types from mcp.server.experimental.task_context import ServerTaskContext from mcp.server.lowlevel import Server from mcp.server.streamable_http_manager import StreamableHTTPSessionManager diff --git a/examples/servers/simple-tool/mcp_simple_tool/server.py b/examples/servers/simple-tool/mcp_simple_tool/server.py index a9a40f4d6..1c253a22e 100644 --- a/examples/servers/simple-tool/mcp_simple_tool/server.py +++ b/examples/servers/simple-tool/mcp_simple_tool/server.py @@ -2,7 +2,7 @@ import anyio import click -import mcp.types as types +from mcp import types from mcp.server.lowlevel import Server from mcp.shared._httpx_utils import create_mcp_http_client from starlette.requests import Request diff --git a/examples/servers/sse-polling-demo/mcp_sse_polling_demo/server.py b/examples/servers/sse-polling-demo/mcp_sse_polling_demo/server.py index 94a9320af..9d7071ca7 100644 --- a/examples/servers/sse-polling-demo/mcp_sse_polling_demo/server.py +++ b/examples/servers/sse-polling-demo/mcp_sse_polling_demo/server.py @@ -19,7 +19,7 @@ import anyio import click -import mcp.types as types +from mcp import types from mcp.server.lowlevel import Server from mcp.server.streamable_http_manager import StreamableHTTPSessionManager from starlette.applications import Starlette diff --git a/examples/servers/structured-output-lowlevel/mcp_structured_output_lowlevel/__main__.py b/examples/servers/structured-output-lowlevel/mcp_structured_output_lowlevel/__main__.py index 49eba9464..fd73a54cd 100644 --- a/examples/servers/structured-output-lowlevel/mcp_structured_output_lowlevel/__main__.py +++ b/examples/servers/structured-output-lowlevel/mcp_structured_output_lowlevel/__main__.py @@ -11,7 +11,7 @@ from typing import Any 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/snippets/servers/lowlevel/basic.py b/examples/snippets/servers/lowlevel/basic.py index ee01b8426..0d4432504 100644 --- a/examples/snippets/servers/lowlevel/basic.py +++ b/examples/snippets/servers/lowlevel/basic.py @@ -5,7 +5,7 @@ import asyncio 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/snippets/servers/lowlevel/direct_call_tool_result.py b/examples/snippets/servers/lowlevel/direct_call_tool_result.py index 967dc0cba..725f5711a 100644 --- a/examples/snippets/servers/lowlevel/direct_call_tool_result.py +++ b/examples/snippets/servers/lowlevel/direct_call_tool_result.py @@ -6,7 +6,7 @@ from typing import Any 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/snippets/servers/lowlevel/lifespan.py b/examples/snippets/servers/lowlevel/lifespan.py index 89ef0385a..da8ff7bdf 100644 --- a/examples/snippets/servers/lowlevel/lifespan.py +++ b/examples/snippets/servers/lowlevel/lifespan.py @@ -7,7 +7,7 @@ from typing import Any 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/snippets/servers/lowlevel/structured_output.py b/examples/snippets/servers/lowlevel/structured_output.py index a99a1ac63..cad8f67da 100644 --- a/examples/snippets/servers/lowlevel/structured_output.py +++ b/examples/snippets/servers/lowlevel/structured_output.py @@ -6,7 +6,7 @@ from typing import Any 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/snippets/servers/pagination_example.py b/examples/snippets/servers/pagination_example.py index 7ed30365c..bb406653e 100644 --- a/examples/snippets/servers/pagination_example.py +++ b/examples/snippets/servers/pagination_example.py @@ -1,6 +1,6 @@ """Example of implementing pagination with MCP server decorators.""" -import mcp.types as types +from mcp import types from mcp.server.lowlevel import Server # Initialize the server diff --git a/src/mcp/client/__main__.py b/src/mcp/client/__main__.py index bef466b30..f3db17906 100644 --- a/src/mcp/client/__main__.py +++ b/src/mcp/client/__main__.py @@ -8,7 +8,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/experimental/task_handlers.py b/src/mcp/client/experimental/task_handlers.py index d6cde09fa..66ab3edf4 100644 --- a/src/mcp/client/experimental/task_handlers.py +++ b/src/mcp/client/experimental/task_handlers.py @@ -16,7 +16,7 @@ from pydantic import TypeAdapter -import mcp.types as types +from mcp import types from mcp.shared.context import RequestContext from mcp.shared.session import RequestResponder diff --git a/src/mcp/client/experimental/tasks.py b/src/mcp/client/experimental/tasks.py index da67c9832..8ddc4face 100644 --- a/src/mcp/client/experimental/tasks.py +++ b/src/mcp/client/experimental/tasks.py @@ -26,7 +26,7 @@ from collections.abc import AsyncIterator from typing import TYPE_CHECKING, Any, TypeVar -import mcp.types as types +from mcp import types from mcp.shared.experimental.tasks.polling import poll_until_terminal from mcp.types._types import RequestParamsMeta diff --git a/src/mcp/client/session.py b/src/mcp/client/session.py index 5080e5385..0c23f093a 100644 --- 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 TypeAdapter -import mcp.types as types +from mcp import types from mcp.client.experimental import ExperimentalClientFeatures from mcp.client.experimental.task_handlers import ExperimentalTaskHandlers from mcp.shared.context import RequestContext diff --git a/src/mcp/client/sse.py b/src/mcp/client/sse.py index 208427c43..8f8e4dadc 100644 --- a/src/mcp/client/sse.py +++ b/src/mcp/client/sse.py @@ -11,7 +11,7 @@ from httpx_sse import aconnect_sse from httpx_sse._exceptions import SSEError -import mcp.types as types +from mcp import types from mcp.shared._httpx_utils import McpHttpClientFactory, create_mcp_http_client from mcp.shared.message import SessionMessage diff --git a/src/mcp/client/stdio.py b/src/mcp/client/stdio.py index bfb5d6c2a..605c5ea24 100644 --- a/src/mcp/client/stdio.py +++ b/src/mcp/client/stdio.py @@ -12,7 +12,7 @@ from anyio.streams.text import TextReceiveStream from pydantic import BaseModel, Field -import mcp.types as types +from mcp import types from mcp.os.posix.utilities import terminate_posix_process_tree from mcp.os.win32.utilities import ( FallbackProcess, diff --git a/src/mcp/server/experimental/session_features.py b/src/mcp/server/experimental/session_features.py index bfede64be..2f9d1b032 100644 --- a/src/mcp/server/experimental/session_features.py +++ b/src/mcp/server/experimental/session_features.py @@ -9,7 +9,7 @@ from collections.abc import AsyncIterator from typing import TYPE_CHECKING, Any, TypeVar -import mcp.types as types +from mcp import types from mcp.server.validation import validate_sampling_tools, validate_tool_use_result_messages from mcp.shared.experimental.tasks.capabilities import ( require_task_augmented_elicitation, diff --git a/src/mcp/server/lowlevel/server.py b/src/mcp/server/lowlevel/server.py index 1dfa47129..f78225912 100644 --- a/src/mcp/server/lowlevel/server.py +++ b/src/mcp/server/lowlevel/server.py @@ -85,7 +85,7 @@ async def main(): from starlette.routing import Mount, Route from typing_extensions import TypeVar -import mcp.types as types +from mcp import types from mcp.server.auth.middleware.auth_context import AuthContextMiddleware from mcp.server.auth.middleware.bearer_auth import BearerAuthBackend, RequireAuthMiddleware from mcp.server.auth.provider import OAuthAuthorizationServerProvider, TokenVerifier diff --git a/src/mcp/server/session.py b/src/mcp/server/session.py index 591da3189..f496121a3 100644 --- a/src/mcp/server/session.py +++ b/src/mcp/server/session.py @@ -44,7 +44,7 @@ async def handle_list_prompts(ctx: RequestContext) -> list[types.Prompt]: from anyio.streams.memory import MemoryObjectReceiveStream, MemoryObjectSendStream from pydantic import AnyUrl, TypeAdapter -import mcp.types as types +from mcp import types from mcp.server.experimental.session_features import ExperimentalServerSessionFeatures from mcp.server.models import InitializationOptions from mcp.server.validation import validate_sampling_tools, validate_tool_use_result_messages diff --git a/src/mcp/server/sse.py b/src/mcp/server/sse.py index ea0c8db4a..5be6b78ca 100644 --- a/src/mcp/server/sse.py +++ b/src/mcp/server/sse.py @@ -50,7 +50,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 from mcp.server.transport_security import ( TransportSecurityMiddleware, TransportSecuritySettings, diff --git a/src/mcp/server/stdio.py b/src/mcp/server/stdio.py index 5a1614545..7f3aa2ac2 100644 --- a/src/mcp/server/stdio.py +++ b/src/mcp/server/stdio.py @@ -25,7 +25,7 @@ async def run_server(): import anyio.lowlevel from anyio.streams.memory import MemoryObjectReceiveStream, MemoryObjectSendStream -import mcp.types as types +from mcp import types from mcp.shared.message import SessionMessage diff --git a/src/mcp/server/websocket.py b/src/mcp/server/websocket.py index 61d314c28..a4c844811 100644 --- a/src/mcp/server/websocket.py +++ b/src/mcp/server/websocket.py @@ -6,7 +6,7 @@ from starlette.types import Receive, Scope, Send from starlette.websockets import WebSocket -import mcp.types as types +from mcp import types from mcp.shared.message import SessionMessage diff --git a/tests/client/test_client.py b/tests/client/test_client.py index 3e6db423b..d483ae54b 100644 --- a/tests/client/test_client.py +++ b/tests/client/test_client.py @@ -8,7 +8,7 @@ import pytest from inline_snapshot import snapshot -import mcp.types as types +from mcp import types from mcp.client._memory import InMemoryTransport from mcp.client.client import Client from mcp.server import Server diff --git a/tests/client/test_http_unicode.py b/tests/client/test_http_unicode.py index fb4ad9408..5cca8c194 100644 --- a/tests/client/test_http_unicode.py +++ b/tests/client/test_http_unicode.py @@ -14,7 +14,7 @@ from starlette.applications import Starlette from starlette.routing import Mount -import mcp.types as types +from mcp import types from mcp.client.session import ClientSession from mcp.client.streamable_http import streamable_http_client from mcp.server import Server diff --git a/tests/client/test_list_methods_cursor.py b/tests/client/test_list_methods_cursor.py index 1e547afed..4d7c53db2 100644 --- a/tests/client/test_list_methods_cursor.py +++ b/tests/client/test_list_methods_cursor.py @@ -2,8 +2,7 @@ import pytest -import mcp.types as types -from mcp import Client +from mcp import Client, types from mcp.server import Server from mcp.server.mcpserver import MCPServer from mcp.types import ListToolsRequest, ListToolsResult diff --git a/tests/client/test_logging_callback.py b/tests/client/test_logging_callback.py index e90dac2c4..31cdeece7 100644 --- a/tests/client/test_logging_callback.py +++ b/tests/client/test_logging_callback.py @@ -2,8 +2,7 @@ import pytest -import mcp.types as types -from mcp import Client +from mcp import Client, types from mcp.server.mcpserver import MCPServer from mcp.shared.session import RequestResponder from mcp.types import ( diff --git a/tests/client/test_session.py b/tests/client/test_session.py index 220c571a5..0b151f7af 100644 --- a/tests/client/test_session.py +++ b/tests/client/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 DEFAULT_CLIENT_INFO, ClientSession from mcp.shared.context import RequestContext from mcp.shared.message import SessionMessage diff --git a/tests/experimental/tasks/client/test_capabilities.py b/tests/experimental/tasks/client/test_capabilities.py index 7bb806696..e01fa601a 100644 --- a/tests/experimental/tasks/client/test_capabilities.py +++ b/tests/experimental/tasks/client/test_capabilities.py @@ -3,8 +3,7 @@ import anyio import pytest -import mcp.types as types -from mcp import ClientCapabilities +from mcp import ClientCapabilities, types from mcp.client.experimental.task_handlers import ExperimentalTaskHandlers from mcp.client.session import ClientSession from mcp.shared.context import RequestContext diff --git a/tests/experimental/tasks/client/test_handlers.py b/tests/experimental/tasks/client/test_handlers.py index 0cac3c736..d5cc1aa9d 100644 --- a/tests/experimental/tasks/client/test_handlers.py +++ b/tests/experimental/tasks/client/test_handlers.py @@ -19,7 +19,7 @@ from anyio.abc import TaskGroup from anyio.streams.memory import MemoryObjectReceiveStream, MemoryObjectSendStream -import mcp.types as types +from mcp import types from mcp.client.experimental.task_handlers import ExperimentalTaskHandlers from mcp.client.session import ClientSession from mcp.shared.context import RequestContext diff --git a/tests/server/test_cancel_handling.py b/tests/server/test_cancel_handling.py index 8775af785..6d1634f2e 100644 --- a/tests/server/test_cancel_handling.py +++ b/tests/server/test_cancel_handling.py @@ -5,8 +5,7 @@ import anyio import pytest -import mcp.types as types -from mcp import Client +from mcp import Client, types from mcp.server.lowlevel.server import Server from mcp.shared.exceptions import MCPError from mcp.types import ( diff --git a/tests/server/test_lowlevel_exception_handling.py b/tests/server/test_lowlevel_exception_handling.py index 4767ea117..848b35b29 100644 --- a/tests/server/test_lowlevel_exception_handling.py +++ b/tests/server/test_lowlevel_exception_handling.py @@ -2,7 +2,7 @@ import pytest -import mcp.types as types +from mcp import types from mcp.server.lowlevel.server import Server from mcp.server.session import ServerSession from mcp.shared.session import RequestResponder diff --git a/tests/server/test_read_resource.py b/tests/server/test_read_resource.py index 10349846c..88fd1e38f 100644 --- a/tests/server/test_read_resource.py +++ b/tests/server/test_read_resource.py @@ -4,7 +4,7 @@ import pytest -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 index db47e78df..d353e46e4 100644 --- a/tests/server/test_session.py +++ b/tests/server/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 import Server from mcp.server.lowlevel import NotificationOptions diff --git a/tests/server/test_session_race_condition.py b/tests/server/test_session_race_condition.py index 18c6b5fc6..81041152b 100644 --- a/tests/server/test_session_race_condition.py +++ b/tests/server/test_session_race_condition.py @@ -9,7 +9,7 @@ import anyio import pytest -import mcp.types as types +from mcp import types from mcp.server.models import InitializationOptions from mcp.server.session import ServerSession from mcp.shared.message import SessionMessage diff --git a/tests/server/test_stateless_mode.py b/tests/server/test_stateless_mode.py index 2a40d6098..3bfc6e674 100644 --- a/tests/server/test_stateless_mode.py +++ b/tests/server/test_stateless_mode.py @@ -13,7 +13,7 @@ import anyio import pytest -import mcp.types as types +from mcp import types from mcp.server.models import InitializationOptions from mcp.server.session import ServerSession from mcp.shared.exceptions import StatelessModeNotSupported diff --git a/tests/shared/test_progress_notifications.py b/tests/shared/test_progress_notifications.py index 81aa1ccbc..8fa623896 100644 --- a/tests/shared/test_progress_notifications.py +++ b/tests/shared/test_progress_notifications.py @@ -4,8 +4,7 @@ import anyio import pytest -import mcp.types as types -from mcp import Client +from mcp import Client, 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 index a2c1797de..182b4671d 100644 --- a/tests/shared/test_session.py +++ b/tests/shared/test_session.py @@ -3,8 +3,7 @@ import anyio import pytest -import mcp.types as types -from mcp import Client +from mcp import Client, types from mcp.client.session import ClientSession from mcp.server.lowlevel.server import Server from mcp.shared.exceptions import MCPError diff --git a/tests/shared/test_sse.py b/tests/shared/test_sse.py index 70b324815..e8ed01b46 100644 --- a/tests/shared/test_sse.py +++ b/tests/shared/test_sse.py @@ -19,7 +19,7 @@ from starlette.routing import Mount, Route import mcp.client.sse -import mcp.types as types +from mcp import types from mcp.client.session import ClientSession from mcp.client.sse import _extract_session_id_from_endpoint, sse_client from mcp.server import Server diff --git a/tests/shared/test_streamable_http.py b/tests/shared/test_streamable_http.py index 70a9fca40..2ebf96998 100644 --- a/tests/shared/test_streamable_http.py +++ b/tests/shared/test_streamable_http.py @@ -25,8 +25,7 @@ from starlette.requests import Request from starlette.routing import Mount -import mcp.types as types -from mcp import MCPError +from mcp import MCPError, types from mcp.client.session import ClientSession from mcp.client.streamable_http import StreamableHTTPTransport, streamable_http_client from mcp.server import Server