From 8efb54691dca7560be99ec6c38b7e3025d4f4efa Mon Sep 17 00:00:00 2001 From: Rob Findley Date: Tue, 6 May 2025 15:31:39 +0000 Subject: [PATCH] internal/mcp/protocol: move out of mcp/internal, as it's used in the API The generated protocol package is part of the SDK API, so it shouldn't be internal. Change-Id: I5306af48019b1599707b939b348eb6ae4f766ca9 Reviewed-on: https://go-review.googlesource.com/c/tools/+/670356 LUCI-TryBot-Result: Go LUCI Reviewed-by: Jonathan Amsterdam --- examples/hello/main.go | 2 +- mcp/client.go | 2 +- mcp/cmd_test.go | 2 +- mcp/content.go | 2 +- mcp/content_test.go | 2 +- mcp/mcp_test.go | 2 +- mcp/prompt.go | 2 +- mcp/prompt_test.go | 2 +- {internal => mcp}/protocol/content.go | 0 {internal => mcp}/protocol/doc.go | 0 {internal => mcp}/protocol/generate.go | 0 {internal => mcp}/protocol/protocol.go | 0 mcp/server.go | 2 +- mcp/sse_test.go | 2 +- mcp/tool.go | 2 +- mcp/transport.go | 2 +- 16 files changed, 12 insertions(+), 12 deletions(-) rename {internal => mcp}/protocol/content.go (100%) rename {internal => mcp}/protocol/doc.go (100%) rename {internal => mcp}/protocol/generate.go (100%) rename {internal => mcp}/protocol/protocol.go (100%) diff --git a/examples/hello/main.go b/examples/hello/main.go index fcdd70e..693b345 100644 --- a/examples/hello/main.go +++ b/examples/hello/main.go @@ -12,7 +12,7 @@ import ( "os" "github.com/modelcontextprotocol/go-sdk/mcp" - "github.com/modelcontextprotocol/go-sdk/internal/protocol" + "github.com/modelcontextprotocol/go-sdk/mcp/protocol" ) var httpAddr = flag.String("http", "", "if set, use SSE HTTP at this address, instead of stdin/stdout") diff --git a/mcp/client.go b/mcp/client.go index b9311dd..48c2c0c 100644 --- a/mcp/client.go +++ b/mcp/client.go @@ -12,7 +12,7 @@ import ( "sync" "github.com/modelcontextprotocol/go-sdk/internal/jsonrpc2" - "github.com/modelcontextprotocol/go-sdk/internal/protocol" + "github.com/modelcontextprotocol/go-sdk/mcp/protocol" ) // A Client is an MCP client, which may be connected to an MCP server diff --git a/mcp/cmd_test.go b/mcp/cmd_test.go index a42a7b0..762754a 100644 --- a/mcp/cmd_test.go +++ b/mcp/cmd_test.go @@ -13,7 +13,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/modelcontextprotocol/go-sdk/mcp" - "github.com/modelcontextprotocol/go-sdk/internal/protocol" + "github.com/modelcontextprotocol/go-sdk/mcp/protocol" ) const runAsServer = "_MCP_RUN_AS_SERVER" diff --git a/mcp/content.go b/mcp/content.go index 093b939..8ea7555 100644 --- a/mcp/content.go +++ b/mcp/content.go @@ -7,7 +7,7 @@ package mcp import ( "fmt" - "github.com/modelcontextprotocol/go-sdk/internal/protocol" + "github.com/modelcontextprotocol/go-sdk/mcp/protocol" ) // Content is the union of supported content types: [TextContent], diff --git a/mcp/content_test.go b/mcp/content_test.go index d9774ff..0ba41a0 100644 --- a/mcp/content_test.go +++ b/mcp/content_test.go @@ -9,7 +9,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/modelcontextprotocol/go-sdk/mcp" - "github.com/modelcontextprotocol/go-sdk/internal/protocol" + "github.com/modelcontextprotocol/go-sdk/mcp/protocol" ) func TestContent(t *testing.T) { diff --git a/mcp/mcp_test.go b/mcp/mcp_test.go index 0452fac..69aa45a 100644 --- a/mcp/mcp_test.go +++ b/mcp/mcp_test.go @@ -16,8 +16,8 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - "github.com/modelcontextprotocol/go-sdk/internal/protocol" "github.com/modelcontextprotocol/go-sdk/jsonschema" + "github.com/modelcontextprotocol/go-sdk/mcp/protocol" ) type hiParams struct { diff --git a/mcp/prompt.go b/mcp/prompt.go index 62d0a45..56fde10 100644 --- a/mcp/prompt.go +++ b/mcp/prompt.go @@ -11,9 +11,9 @@ import ( "reflect" "slices" - "github.com/modelcontextprotocol/go-sdk/internal/protocol" "github.com/modelcontextprotocol/go-sdk/internal/util" "github.com/modelcontextprotocol/go-sdk/jsonschema" + "github.com/modelcontextprotocol/go-sdk/mcp/protocol" ) // A PromptHandler handles a call to prompts/get. diff --git a/mcp/prompt_test.go b/mcp/prompt_test.go index ca7f48d..9ef99f5 100644 --- a/mcp/prompt_test.go +++ b/mcp/prompt_test.go @@ -10,7 +10,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/modelcontextprotocol/go-sdk/mcp" - "github.com/modelcontextprotocol/go-sdk/internal/protocol" + "github.com/modelcontextprotocol/go-sdk/mcp/protocol" ) // testPromptHandler is used for type inference in TestMakePrompt. diff --git a/internal/protocol/content.go b/mcp/protocol/content.go similarity index 100% rename from internal/protocol/content.go rename to mcp/protocol/content.go diff --git a/internal/protocol/doc.go b/mcp/protocol/doc.go similarity index 100% rename from internal/protocol/doc.go rename to mcp/protocol/doc.go diff --git a/internal/protocol/generate.go b/mcp/protocol/generate.go similarity index 100% rename from internal/protocol/generate.go rename to mcp/protocol/generate.go diff --git a/internal/protocol/protocol.go b/mcp/protocol/protocol.go similarity index 100% rename from internal/protocol/protocol.go rename to mcp/protocol/protocol.go diff --git a/mcp/server.go b/mcp/server.go index 6c590ab..89dfb7f 100644 --- a/mcp/server.go +++ b/mcp/server.go @@ -13,7 +13,7 @@ import ( "sync" "github.com/modelcontextprotocol/go-sdk/internal/jsonrpc2" - "github.com/modelcontextprotocol/go-sdk/internal/protocol" + "github.com/modelcontextprotocol/go-sdk/mcp/protocol" ) // A Server is an instance of an MCP server. diff --git a/mcp/sse_test.go b/mcp/sse_test.go index e1ec72f..c208ba4 100644 --- a/mcp/sse_test.go +++ b/mcp/sse_test.go @@ -12,7 +12,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/modelcontextprotocol/go-sdk/internal/protocol" + "github.com/modelcontextprotocol/go-sdk/mcp/protocol" ) func TestSSEServer(t *testing.T) { diff --git a/mcp/tool.go b/mcp/tool.go index e225952..b889254 100644 --- a/mcp/tool.go +++ b/mcp/tool.go @@ -9,9 +9,9 @@ import ( "encoding/json" "slices" - "github.com/modelcontextprotocol/go-sdk/internal/protocol" "github.com/modelcontextprotocol/go-sdk/internal/util" "github.com/modelcontextprotocol/go-sdk/jsonschema" + "github.com/modelcontextprotocol/go-sdk/mcp/protocol" ) // A ToolHandler handles a call to tools/call. diff --git a/mcp/transport.go b/mcp/transport.go index 7a629b4..313f0b0 100644 --- a/mcp/transport.go +++ b/mcp/transport.go @@ -15,7 +15,7 @@ import ( "sync" "github.com/modelcontextprotocol/go-sdk/internal/jsonrpc2" - "github.com/modelcontextprotocol/go-sdk/internal/protocol" + "github.com/modelcontextprotocol/go-sdk/mcp/protocol" "github.com/modelcontextprotocol/go-sdk/internal/xcontext" )