modelcontextprotocol/go-sdk
Watch
1
0
Fork
You've already forked go-sdk
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

mcp: optimize re-marshalling of jsonschema.Schema (#581)

Browse source 
mcp: optimize re-marshalling of jsonschema.Schema

Avoid going through function remarshal when InputSchema/OutputSchema is
of type *jsonschema.Schema.
This commit is contained in:
Haokun Tang 2025-10-16 21:06:15 +08:00 • committed by GitHub
commit 14e776db6f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
mcp/server.go
View file

@ -197,8 +197,10 @@ func (s *Server) AddTool(t *Tool, h ToolHandler) {
// discovered until runtime, when the LLM sent bad data.
panic(fmt.Errorf("AddTool %q: missing input schema", t.Name))
}
if s, ok := t.InputSchema.(*jsonschema.Schema); ok && s.Type != "object" {
panic(fmt.Errorf(`AddTool %q: input schema must have type "object"`, t.Name))
if s, ok := t.InputSchema.(*jsonschema.Schema); ok {
if s.Type != "object" {
panic(fmt.Errorf(`AddTool %q: input schema must have type "object"`, t.Name))
}
} else {
var m map[string]any
if err := remarshal(t.InputSchema, &m); err != nil {
@ -209,8 +211,10 @@ func (s *Server) AddTool(t *Tool, h ToolHandler) {
}
}
if t.OutputSchema != nil {
if s, ok := t.OutputSchema.(*jsonschema.Schema); ok && s.Type != "object" {
panic(fmt.Errorf(`AddTool %q: output schema must have type "object"`, t.Name))
if s, ok := t.OutputSchema.(*jsonschema.Schema); ok {
if s.Type != "object" {
panic(fmt.Errorf(`AddTool %q: output schema must have type "object"`, t.Name))
}
} else {
var m map[string]any
if err := remarshal(t.OutputSchema, &m); err != nil {
@ -370,10 +374,8 @@ func setSchema[T any](sfield *any, rfield **jsonschema.Resolved) (zero any, err
if err == nil {
*sfield = internalSchema
}
} else {
if err := remarshal(*sfield, &internalSchema); err != nil {
return zero, err
}
} else if err := remarshal(*sfield, &internalSchema); err != nil {
return zero, err
}
if err != nil {
return zero, err