Revert import changes

Author: cclauss

README.md

@@ -643,7 +643,7 @@ The lifespan API provides:
 
 ```python
 import mcp.server.stdio
-from mcp import types
+import mcp.types as types
 from mcp.server.lowlevel import NotificationOptions, Server
 from mcp.server.models import InitializationOptions
 

examples/servers/simple-prompt/mcp_simple_prompt/server.py

@@ -1,6 +1,6 @@
 import anyio
 import click
-from mcp import types
+import mcp.types as types
 from mcp.server.lowlevel import Server
 
 

examples/servers/simple-resource/mcp_simple_resource/server.py

@@ -1,6 +1,6 @@
 import anyio
 import click
-from mcp import types
+import mcp.types as types
 from mcp.server.lowlevel import Server
 from pydantic import AnyUrl
 

src/mcp/client/__main__.py

@@ -7,7 +7,7 @@
 import anyio
 from anyio.streams.memory import MemoryObjectReceiveStream, MemoryObjectSendStream
 
-from mcp import types
+import mcp.types as types
 from mcp.client.session import ClientSession
 from mcp.client.sse import sse_client
 from mcp.client.stdio import StdioServerParameters, stdio_client

src/mcp/client/session.py

@@ -5,7 +5,7 @@
 from anyio.streams.memory import MemoryObjectReceiveStream, MemoryObjectSendStream
 from pydantic import AnyUrl, TypeAdapter
 
-from mcp import types
+import mcp.types as types
 from mcp.shared.context import RequestContext
 from mcp.shared.message import SessionMessage
 from mcp.shared.session import BaseSession, ProgressFnT, RequestResponder

src/mcp/client/sse.py

@@ -9,7 +9,7 @@
 from anyio.streams.memory import MemoryObjectReceiveStream, MemoryObjectSendStream
 from httpx_sse import aconnect_sse
 
-from mcp import types
+import mcp.types as types
 from mcp.shared._httpx_utils import McpHttpClientFactory, create_mcp_http_client
 from mcp.shared.message import SessionMessage
 

src/mcp/client/stdio/__init__.py

@@ -10,7 +10,7 @@
 from anyio.streams.text import TextReceiveStream
 from pydantic import BaseModel, Field
 
-from mcp import types
+import mcp.types as types
 from mcp.shared.message import SessionMessage
 
 from .win32 import (

src/mcp/client/websocket.py

@@ -9,7 +9,7 @@
 from websockets.asyncio.client import connect as ws_connect
 from websockets.typing import Subprotocol
 
-from mcp import types
+import mcp.types as types
 from mcp.shared.message import SessionMessage
 
 logger = logging.getLogger(__name__)

src/mcp/server/lowlevel/server.py

@@ -78,10 +78,11 @@ async def main():
 from anyio.streams.memory import MemoryObjectReceiveStream, MemoryObjectSendStream
 from pydantic import AnyUrl
 
-from mcp import types
+import mcp.types as types
 from mcp.server.lowlevel.helper_types import ReadResourceContents
 from mcp.server.models import InitializationOptions
 from mcp.server.session import ServerSession
+from mcp.server.stdio import stdio_server as stdio_server
 from mcp.shared.context import RequestContext
 from mcp.shared.exceptions import McpError
 from mcp.shared.message import SessionMessage

src/mcp/server/session.py

@@ -45,7 +45,7 @@ async def handle_list_prompts(ctx: RequestContext) -> list[types.Prompt]:
 from anyio.streams.memory import MemoryObjectReceiveStream, MemoryObjectSendStream
 from pydantic import AnyUrl
 
-from mcp import types
+import mcp.types as types
 from mcp.server.models import InitializationOptions
 from mcp.shared.message import ServerMessageMetadata, SessionMessage
 from mcp.shared.session import (