refactor: replace mcp.types as types to from mcp import types (#1986)

tests/client/test_client.py

@@ -8,7 +8,7 @@ import anyio
 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

tests/client/test_http_unicode.py

@@ -14,7 +14,7 @@ import pytest
 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

tests/client/test_list_methods_cursor.py

@@ -2,8 +2,7 @@ from collections.abc import Callable
 
 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

tests/client/test_logging_callback.py

@@ -2,8 +2,7 @@ from typing import Any, Literal
 
 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 (

tests/client/test_session.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 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

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

tests/experimental/tasks/client/test_handlers.py

@@ -19,7 +19,7 @@ from anyio import Event
 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

tests/server/test_cancel_handling.py

@@ -5,8 +5,7 @@ from typing import Any
 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 (

tests/server/test_lowlevel_exception_handling.py

@@ -2,7 +2,7 @@ from unittest.mock import AsyncMock, Mock
 
 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

tests/server/test_read_resource.py

@@ -4,7 +4,7 @@ from tempfile import NamedTemporaryFile
 
 import pytest
 
-import mcp.types as types
+from mcp import types
 from mcp.server.lowlevel.server import ReadResourceContents, Server
 
 

tests/server/test_session.py

@@ -3,7 +3,7 @@ from typing import Any
 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

tests/server/test_session_race_condition.py

@@ -9,7 +9,7 @@ This is critical for HTTP transport where requests can arrive in any order.
 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

tests/server/test_stateless_mode.py

@@ -13,7 +13,7 @@ from typing import Any
 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

tests/shared/test_progress_notifications.py

@@ -4,8 +4,7 @@ from unittest.mock import patch
 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

tests/shared/test_session.py

@@ -3,8 +3,7 @@ from typing import Any
 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

tests/shared/test_sse.py

@@ -19,7 +19,7 @@ from starlette.responses import Response
 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

tests/shared/test_streamable_http.py

@@ -25,8 +25,7 @@ from starlette.applications import Starlette
 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