Merge pull request #38 from modelcontextprotocol/davidsp/mcp

rename mcp_python to mcp

Author: dsp-ant

pyproject.toml

@@ -3,7 +3,7 @@ requires = ["hatchling"]
 build-backend = "hatchling.build"
 
 [project]
-name = "mcp-python"
+name = "mcp"
 version = "0.7.0.dev"
 description = "Model Context Protocol implementation for Python"
 readme = "README.md"
@@ -18,10 +18,10 @@ dependencies = [
 ]
 
 [tool.hatch.build.targets.wheel]
-packages = ["mcp_python"]
+packages = ["src/mcp"]
 
 [tool.pyright]
-include = ["mcp_python", "tests"]
+include = ["src/mcp", "tests"]
 venvPath = "."
 venv = ".venv"
 
@@ -31,14 +31,14 @@ ignore = []
 
 [tool.ruff]
 line-length = 88
-target-version = "py38"
+target-version = "py310"
 
 [tool.ruff.lint.per-file-ignores]
 "__init__.py" = ["F401"]
 
 [tool.uv]
 dev-dependencies = [
-    "pyright>=1.1.384",
+    "pyright>=1.1.378",
     "pytest>=8.3.3",
     "ruff>=0.6.9",
     "trio>=0.26.2",

mcp_python/__init__.py renamed to src/mcp/__init__.py

@@ -6,9 +6,9 @@
 import anyio
 import click
 
-from mcp_python.client.session import ClientSession
-from mcp_python.client.sse import sse_client
-from mcp_python.client.stdio import StdioServerParameters, stdio_client
+from mcp.client.session import ClientSession
+from mcp.client.sse import sse_client
+from mcp.client.stdio import StdioServerParameters, stdio_client
 
 if not sys.warnoptions:
     import warnings

mcp_python/client/__init__.py renamed to src/mcp/client/__init__.py

@@ -3,9 +3,9 @@
 from anyio.streams.memory import MemoryObjectReceiveStream, MemoryObjectSendStream
 from pydantic import AnyUrl
 
-from mcp_python.shared.session import BaseSession
-from mcp_python.shared.version import SUPPORTED_PROTOCOL_VERSIONS
-from mcp_python.types import (
+from mcp.shared.session import BaseSession
+from mcp.shared.version import SUPPORTED_PROTOCOL_VERSIONS
+from mcp.types import (
     LATEST_PROTOCOL_VERSION,
     CallToolResult,
     ClientCapabilities,
@@ -56,7 +56,7 @@ def __init__(
         )
 
     async def initialize(self) -> InitializeResult:
-        from mcp_python.types import (
+        from mcp.types import (
             InitializeRequest,
             InitializeRequestParams,
         )
@@ -77,7 +77,7 @@ async def initialize(self) -> InitializeResult:
                                 listChanged=True
                             ),
                         ),
-                        clientInfo=Implementation(name="mcp_python", version="0.1.0"),
+                        clientInfo=Implementation(name="mcp", version="0.1.0"),
                     ),
                 )
             ),
@@ -100,7 +100,7 @@ async def initialize(self) -> InitializeResult:
 
     async def send_ping(self) -> EmptyResult:
         """Send a ping request."""
-        from mcp_python.types import PingRequest
+        from mcp.types import PingRequest
 
         return await self.send_request(
             ClientRequest(
@@ -115,7 +115,7 @@ async def send_progress_notification(
         self, progress_token: str | int, progress: float, total: float | None = None
     ) -> None:
         """Send a progress notification."""
-        from mcp_python.types import (
+        from mcp.types import (
             ProgressNotification,
             ProgressNotificationParams,
         )
@@ -135,7 +135,7 @@ async def send_progress_notification(
 
     async def set_logging_level(self, level: LoggingLevel) -> EmptyResult:
         """Send a logging/setLevel request."""
-        from mcp_python.types import (
+        from mcp.types import (
             SetLevelRequest,
             SetLevelRequestParams,
         )
@@ -152,7 +152,7 @@ async def set_logging_level(self, level: LoggingLevel) -> EmptyResult:
 
     async def list_resources(self) -> ListResourcesResult:
         """Send a resources/list request."""
-        from mcp_python.types import (
+        from mcp.types import (
             ListResourcesRequest,
         )
 
@@ -167,7 +167,7 @@ async def list_resources(self) -> ListResourcesResult:
 
     async def read_resource(self, uri: AnyUrl) -> ReadResourceResult:
         """Send a resources/read request."""
-        from mcp_python.types import (
+        from mcp.types import (
             ReadResourceRequest,
             ReadResourceRequestParams,
         )
@@ -184,7 +184,7 @@ async def read_resource(self, uri: AnyUrl) -> ReadResourceResult:
 
     async def subscribe_resource(self, uri: AnyUrl) -> EmptyResult:
         """Send a resources/subscribe request."""
-        from mcp_python.types import (
+        from mcp.types import (
             SubscribeRequest,
             SubscribeRequestParams,
         )
@@ -201,7 +201,7 @@ async def subscribe_resource(self, uri: AnyUrl) -> EmptyResult:
 
     async def unsubscribe_resource(self, uri: AnyUrl) -> EmptyResult:
         """Send a resources/unsubscribe request."""
-        from mcp_python.types import (
+        from mcp.types import (
             UnsubscribeRequest,
             UnsubscribeRequestParams,
         )
@@ -220,7 +220,7 @@ async def call_tool(
         self, name: str, arguments: dict | None = None
     ) -> CallToolResult:
         """Send a tools/call request."""
-        from mcp_python.types import (
+        from mcp.types import (
             CallToolRequest,
             CallToolRequestParams,
         )
@@ -237,7 +237,7 @@ async def call_tool(
 
     async def list_prompts(self) -> ListPromptsResult:
         """Send a prompts/list request."""
-        from mcp_python.types import ListPromptsRequest
+        from mcp.types import ListPromptsRequest
 
         return await self.send_request(
             ClientRequest(
@@ -252,7 +252,7 @@ async def get_prompt(
         self, name: str, arguments: dict[str, str] | None = None
     ) -> GetPromptResult:
         """Send a prompts/get request."""
-        from mcp_python.types import GetPromptRequest, GetPromptRequestParams
+        from mcp.types import GetPromptRequest, GetPromptRequestParams
 
         return await self.send_request(
             ClientRequest(
@@ -268,7 +268,7 @@ async def complete(
         self, ref: ResourceReference | PromptReference, argument: dict
     ) -> CompleteResult:
         """Send a completion/complete request."""
-        from mcp_python.types import (
+        from mcp.types import (
             CompleteRequest,
             CompleteRequestParams,
             CompletionArgument,
@@ -289,7 +289,7 @@ async def complete(
 
     async def list_tools(self) -> ListToolsResult:
         """Send a tools/list request."""
-        from mcp_python.types import ListToolsRequest
+        from mcp.types import ListToolsRequest
 
         return await self.send_request(
             ClientRequest(
@@ -302,7 +302,7 @@ async def list_tools(self) -> ListToolsResult:
 
     async def send_roots_list_changed(self) -> None:
         """Send a roots/list_changed notification."""
-        from mcp_python.types import RootsListChangedNotification
+        from mcp.types import RootsListChangedNotification
 
         await self.send_notification(
             ClientNotification(

mcp_python/client/__main__.py renamed to src/mcp/client/__main__.py

@@ -9,7 +9,7 @@
 from anyio.streams.memory import MemoryObjectReceiveStream, MemoryObjectSendStream
 from httpx_sse import aconnect_sse
 
-from mcp_python.types import JSONRPCMessage
+from mcp.types import JSONRPCMessage
 
 logger = logging.getLogger(__name__)
 

mcp_python/client/session.py renamed to src/mcp/client/session.py

@@ -8,7 +8,7 @@
 from anyio.streams.text import TextReceiveStream
 from pydantic import BaseModel, Field
 
-from mcp_python.types import JSONRPCMessage
+from mcp.types import JSONRPCMessage
 
 # Environment variables to inherit by default
 DEFAULT_INHERITED_ENV_VARS = (

mcp_python/client/sse.py renamed to src/mcp/client/sse.py

@@ -7,12 +7,12 @@
 from anyio.streams.memory import MemoryObjectReceiveStream, MemoryObjectSendStream
 from pydantic import AnyUrl
 
-from mcp_python.server import types
-from mcp_python.server.session import ServerSession
-from mcp_python.server.stdio import stdio_server as stdio_server
-from mcp_python.shared.context import RequestContext
-from mcp_python.shared.session import RequestResponder
-from mcp_python.types import (
+from mcp.server import types
+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.session import RequestResponder
+from mcp.types import (
     METHOD_NOT_FOUND,
     CallToolRequest,
     ClientNotification,
@@ -101,7 +101,7 @@ def pkg_version(package: str) -> str:
 
         return types.InitializationOptions(
             server_name=self.name,
-            server_version=pkg_version("mcp_python"),
+            server_version=pkg_version("mcp"),
             capabilities=self.get_capabilities(
                 notification_options or NotificationOptions(),
                 experimental_capabilities or {},
@@ -168,12 +168,12 @@ async def handler(_: Any):
         return decorator
 
     def get_prompt(self):
-        from mcp_python.types import (
+        from mcp.types import (
             GetPromptRequest,
             GetPromptResult,
             ImageContent,
         )
-        from mcp_python.types import (
+        from mcp.types import (
             Role as Role,
         )
 
@@ -232,7 +232,7 @@ async def handler(_: Any):
         return decorator
 
     def read_resource(self):
-        from mcp_python.types import (
+        from mcp.types import (
             BlobResourceContents,
             TextResourceContents,
         )
@@ -270,7 +270,7 @@ async def handler(req: ReadResourceRequest):
         return decorator
 
     def set_logging_level(self):
-        from mcp_python.types import EmptyResult
+        from mcp.types import EmptyResult
 
         def decorator(func: Callable[[LoggingLevel], Awaitable[None]]):
             logger.debug("Registering handler for SetLevelRequest")
@@ -285,7 +285,7 @@ async def handler(req: SetLevelRequest):
         return decorator
 
     def subscribe_resource(self):
-        from mcp_python.types import EmptyResult
+        from mcp.types import EmptyResult
 
         def decorator(func: Callable[[AnyUrl], Awaitable[None]]):
             logger.debug("Registering handler for SubscribeRequest")
@@ -300,7 +300,7 @@ async def handler(req: SubscribeRequest):
         return decorator
 
     def unsubscribe_resource(self):
-        from mcp_python.types import EmptyResult
+        from mcp.types import EmptyResult
 
         def decorator(func: Callable[[AnyUrl], Awaitable[None]]):
             logger.debug("Registering handler for UnsubscribeRequest")
@@ -328,7 +328,7 @@ async def handler(_: Any):
         return decorator
 
     def call_tool(self):
-        from mcp_python.types import (
+        from mcp.types import (
             CallToolResult,
             EmbeddedResource,
             ImageContent,
@@ -337,7 +337,8 @@ def call_tool(self):
 
         def decorator(
             func: Callable[
-                ..., Awaitable[Sequence[str | types.ImageContent | types.EmbeddedResource]]
+                ...,
+                Awaitable[Sequence[str | types.ImageContent | types.EmbeddedResource]],
             ],
         ):
             logger.debug("Registering handler for CallToolRequest")
@@ -397,7 +398,7 @@ async def handler(req: ProgressNotification):
 
     def completion(self):
         """Provides completions for prompts and resource templates"""
-        from mcp_python.types import CompleteResult, Completion, CompletionArgument
+        from mcp.types import CompleteResult, Completion, CompletionArgument
 
         def decorator(
             func: Callable[

mcp_python/client/stdio.py renamed to src/mcp/client/stdio.py

@@ -4,10 +4,10 @@
 
 import anyio
 
-from mcp_python.server.session import ServerSession
-from mcp_python.server.stdio import stdio_server
-from mcp_python.server.types import InitializationOptions
-from mcp_python.types import ServerCapabilities
+from mcp.server.session import ServerSession
+from mcp.server.stdio import stdio_server
+from mcp.server.types import InitializationOptions
+from mcp.types import ServerCapabilities
 
 if not sys.warnoptions:
     import warnings
@@ -29,14 +29,14 @@ async def receive_loop(session: ServerSession):
 
 
 async def main():
-    version = importlib.metadata.version("mcp_python")
+    version = importlib.metadata.version("mcp")
     async with stdio_server() as (read_stream, write_stream):
         async with (
             ServerSession(
                 read_stream,
                 write_stream,
                 InitializationOptions(
-                    server_name="mcp_python",
+                    server_name="mcp",
                     server_version=version,
                     capabilities=ServerCapabilities(),
                 ),