Go SDK: Upgrade MCP SDK and remove vendored copy (#35)
<!-- Provide a brief summary of your changes -->
Update the Go interceptor SDK to use
`github.com/modelcontextprotocol/go-sdk` v1.7.0 custom method APIs and
remove the vendored Go SDK copy. This shouldn't update the behaviours,
but addding following functions.
Changed public/user-facing interfaces:
extension.Extension.Install now returns an error:
```
// before
ext.Install(mcpServer)
// after
if err := ext.Install(mcpServer); err != nil {
return err
}
```
New helper added:
```
extension.RegisterSendingMethods(client *mcp.Client) error
```
## Motivation and Context
<!-- Why is this change needed? What problem does it solve? -->
Pick up MCP Go SDK 1.7.0. This provides upstream custom method support,
so the local vendored SDK copy is no longer needed.
## How Has This Been Tested?
<!-- Have you tested this in a real application? Which scenarios were
tested? -->
- `go test -v ./...`
## Breaking Changes
<!-- Will users need to update their code or configurations? -->
```go
if err := ext.Install(mcpServer); err != nil {
return err
}
```
The Go SDK module now requires Go 1.25 via
github.com/modelcontextprotocol/go-sdk v1.7.0.
## Types of changes
<!-- What types of changes does your code introduce? Put an `x` in all
the boxes that apply: -->
- [ ] Bug fix (non-breaking change which fixes an issue)
- [x] New feature (non-breaking change which adds functionality)
- [x] Breaking change (fix or feature that would cause existing
functionality to change)
- [x] Documentation update
## Checklist
<!-- Go over all the following points, and put an `x` in all the boxes
that apply. -->
- [x] I have read the [MCP
Documentation](https://modelcontextprotocol.io)
- [x] My code follows the repository's style guidelines
- [x] New and existing tests pass locally
- [x] I have added appropriate error handling
- [x] I have added or updated documentation as needed
## Additional context
<!-- Add any other context, implementation notes, or design decisions
-->
LocalChain now registers interceptor custom sending methods internally.
Manual remote chain setup should call
`extension.RegisterSendingMethods(client)` before connecting the MCP
client session used with chain.AddMCPServer.
Signed-off-by: Ukjae Jeong <jeongukjae@gmail.com>
This commit is contained in:
parent
1a3e5ef459
commit
8704137635
3 changed files with 231 additions and 57228 deletions
|
|
@ -116,12 +116,18 @@ type ExecutionResult struct {
|
|||
// AddMCPServer discovers interceptors from an MCP server via
|
||||
// interceptors/list and adds entries for each. The client session's
|
||||
// transport determines how interceptor/invoke calls are made
|
||||
// (in-memory, stdio, HTTP, etc.).
|
||||
// (in-memory, stdio, HTTP, etc.). The session's client must have been
|
||||
// configured with the interceptor extension's sending methods before connecting.
|
||||
func (c *Chain) AddMCPServer(ctx context.Context, cs *mcp.ClientSession) error {
|
||||
var result interceptors.ListResult
|
||||
if err := cs.CallCustom(ctx, interceptors.MethodList, nil, &result); err != nil {
|
||||
result, err := mcp.CallCustomMethod[*interceptors.ListParams, *interceptors.ListResult](
|
||||
ctx, cs, interceptors.MethodList, nil,
|
||||
)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if result == nil {
|
||||
return nil
|
||||
}
|
||||
|
||||
c.mu.Lock()
|
||||
defer c.mu.Unlock()
|
||||
|
|
@ -142,7 +148,7 @@ func (c *Chain) AddMCPServer(ctx context.Context, cs *mcp.ClientSession) error {
|
|||
// - Sort mutators by priorityHint (ascending, alphabetical tiebreak)
|
||||
// - Request phase: validate (parallel) then mutate (sequential)
|
||||
// - Response phase: mutate (sequential) then validate (parallel)
|
||||
// - Call interceptor/invoke via CallCustom for each entry
|
||||
// - Call interceptor/invoke via the MCP SDK custom-method API for each entry
|
||||
// - For mutators: pass mutated payload from previous to next
|
||||
// - Handle abort, timeout, fail-open
|
||||
func (c *Chain) Execute(ctx context.Context, params *ExecutionParams) (*ExecutionResult, error) {
|
||||
|
|
@ -443,9 +449,13 @@ func (c *Chain) callInvoke(
|
|||
}
|
||||
|
||||
next := func(ctx context.Context, p *interceptors.InvokeParams) (interceptors.InvokeResult, error) {
|
||||
var result interceptors.InvokeResult
|
||||
err := entry.Server.CallCustom(ctx, interceptors.MethodInvoke, p, &result)
|
||||
return result, err
|
||||
result, err := mcp.CallCustomMethod[*interceptors.InvokeParams, *interceptors.InvokeResult](
|
||||
ctx, entry.Server, interceptors.MethodInvoke, p,
|
||||
)
|
||||
if result == nil {
|
||||
return interceptors.InvokeResult{}, err
|
||||
}
|
||||
return *result, err
|
||||
}
|
||||
|
||||
if c.handler != nil {
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@ import (
|
|||
|
||||
"github.com/modelcontextprotocol/ext-interceptors/go/sdk/interceptors"
|
||||
"github.com/modelcontextprotocol/ext-interceptors/go/sdk/interceptors/chain"
|
||||
"github.com/modelcontextprotocol/ext-interceptors/go/sdk/interceptors/extension"
|
||||
)
|
||||
|
||||
// setupChainWithInterceptors creates an MCP server with the given
|
||||
|
|
@ -34,7 +35,7 @@ func setupChainWithOpts(t *testing.T, opts []chain.ChainOption, is ...intercepto
|
|||
Version: "0.1.0",
|
||||
}, nil)
|
||||
|
||||
registerInterceptorMethods(mcpServer, is)
|
||||
registerInterceptorMethods(t, mcpServer, is)
|
||||
|
||||
serverTransport, clientTransport := mcp.NewInMemoryTransports()
|
||||
|
||||
|
|
@ -46,6 +47,7 @@ func setupChainWithOpts(t *testing.T, opts []chain.ChainOption, is ...intercepto
|
|||
Name: "chain-test-client",
|
||||
Version: "0.1.0",
|
||||
}, nil)
|
||||
require.NoError(t, extension.RegisterSendingMethods(client))
|
||||
cs, err := client.Connect(context.Background(), clientTransport, nil)
|
||||
require.NoError(t, err)
|
||||
t.Cleanup(func() { cs.Close() })
|
||||
|
|
@ -60,12 +62,13 @@ func setupChainWithOpts(t *testing.T, opts []chain.ChainOption, is ...intercepto
|
|||
|
||||
// registerInterceptorMethods adds interceptors/list and interceptor/invoke
|
||||
// custom methods to the server, backed by the given interceptor list.
|
||||
func registerInterceptorMethods(server *mcp.Server, is []interceptors.Interceptor) {
|
||||
mcp.AddReceivingCustomMethod(server, interceptors.MethodList,
|
||||
func(_ context.Context, req *mcp.ServerRequest[*interceptors.ListParams]) (*interceptors.ListResult, error) {
|
||||
func registerInterceptorMethods(t *testing.T, server *mcp.Server, is []interceptors.Interceptor) {
|
||||
t.Helper()
|
||||
require.NoError(t, mcp.AddReceivingCustomMethod(server, interceptors.MethodList,
|
||||
func(_ context.Context, _ *mcp.ServerSession, params *interceptors.ListParams) (*interceptors.ListResult, error) {
|
||||
var event string
|
||||
if req.Params != nil {
|
||||
event = req.Params.Event
|
||||
if params != nil {
|
||||
event = params.Event
|
||||
}
|
||||
infos := make([]interceptors.InterceptorInfo, 0, len(is))
|
||||
for _, i := range is {
|
||||
|
|
@ -87,14 +90,13 @@ func registerInterceptorMethods(server *mcp.Server, is []interceptors.Intercepto
|
|||
}
|
||||
return &interceptors.ListResult{Interceptors: infos}, nil
|
||||
},
|
||||
)
|
||||
))
|
||||
|
||||
mcp.AddReceivingCustomMethod(server, interceptors.MethodInvoke,
|
||||
func(ctx context.Context, req *mcp.ServerRequest[*interceptors.InvokeParams]) (*interceptors.InvokeResult, error) {
|
||||
if req.Params == nil {
|
||||
require.NoError(t, mcp.AddReceivingCustomMethod(server, interceptors.MethodInvoke,
|
||||
func(ctx context.Context, _ *mcp.ServerSession, params *interceptors.InvokeParams) (*interceptors.InvokeResult, error) {
|
||||
if params == nil {
|
||||
return nil, fmt.Errorf("params required")
|
||||
}
|
||||
params := req.Params
|
||||
var target interceptors.Interceptor
|
||||
for _, i := range is {
|
||||
if i.GetMetadata().Name == params.Name {
|
||||
|
|
@ -137,7 +139,7 @@ func registerInterceptorMethods(server *mcp.Server, is []interceptors.Intercepto
|
|||
}
|
||||
return result, nil
|
||||
},
|
||||
)
|
||||
))
|
||||
}
|
||||
|
||||
func TestChain_ExecutionHandler(t *testing.T) {
|
||||
|
|
|
|||
|
|
@ -26,6 +26,14 @@
|
|||
// A [Chain] is created with [NewChain] and populated by adding MCP
|
||||
// servers via [Chain.AddMCPServer]:
|
||||
//
|
||||
// client := mcp.NewClient(clientImpl, nil)
|
||||
// if err := extension.RegisterSendingMethods(client); err != nil {
|
||||
// return err
|
||||
// }
|
||||
// clientSession, err := client.Connect(ctx, transport, nil)
|
||||
// if err != nil {
|
||||
// return err
|
||||
// }
|
||||
// chain := chain.NewChain()
|
||||
// chain.AddMCPServer(ctx, clientSession)
|
||||
// mcpServer.AddReceivingMiddleware(
|
||||
|
|
|
|||
Loading…
Reference in a new issue