fix toolschemas

Author: jba

examples/server/toolschemas/main.go

@@ -58,11 +58,11 @@ func (t *manualGreeter) greet(_ context.Context, req *mcp.CallToolRequest) (*mcp
 	if err := json.Unmarshal(req.Params.Arguments, &input); err != nil {
 		return errf("failed to unmarshal arguments: %v", err), nil
 	}
-	if err := t.inputSchema.Validate(input); err != nil {
+	if err := validateStruct(input, t.inputSchema); err != nil {
 		return errf("invalid input: %v", err), nil
 	}
 	output := Output{Greeting: "Hi " + input.Name}
-	if err := t.outputSchema.Validate(output); err != nil {
+	if err := validateStruct(output, t.outputSchema); err != nil {
 		return errf("tool produced invalid output: %v", err), nil
 	}
 	outputJSON, err := json.Marshal(output)
@@ -75,6 +75,50 @@ func (t *manualGreeter) greet(_ context.Context, req *mcp.CallToolRequest) (*mcp
 	}, nil
 }
 
+// validateStruct validates x against schema by first changing the struct to
+// a map[string]any, then validating that.
+func validateStruct(x any, res *jsonschema.Resolved) error {
+	data, err := json.Marshal(x)
+	if err != nil {
+		return err
+	}
+	var m map[string]any
+	if err := json.Unmarshal(data, &m); err != nil {
+		return err
+	}
+	return res.Validate(m)
+}
+
+var (
+	inputSchema = &jsonschema.Schema{
+		Type: "object",
+		Properties: map[string]*jsonschema.Schema{
+			"name": {Type: "string", MaxLength: jsonschema.Ptr(10)},
+		},
+	}
+	outputSchema = &jsonschema.Schema{
+		Type: "object",
+		Properties: map[string]*jsonschema.Schema{
+			"greeting": {Type: "string"},
+		},
+	}
+)
+
+func newManualGreeter() (*manualGreeter, error) {
+	resIn, err := inputSchema.Resolve(nil)
+	if err != nil {
+		return nil, err
+	}
+	resOut, err := outputSchema.Resolve(nil)
+	if err != nil {
+		return nil, err
+	}
+	return &manualGreeter{
+		inputSchema:  resIn,
+		outputSchema: resOut,
+	}, nil
+}
+
 func main() {
 	server := mcp.NewServer(&mcp.Implementation{Name: "greeter"}, nil)
 
@@ -90,30 +134,7 @@ func main() {
 	//
 	// We don't need to do all this work: below, we use jsonschema.For to start
 	// from the default schema.
-	var (
-		manual manualGreeter
-		err    error
-	)
-	inputSchema := &jsonschema.Schema{
-		Type: "object",
-		Properties: map[string]*jsonschema.Schema{
-			"name": {Type: "string", MaxLength: jsonschema.Ptr(10)},
-		},
-	}
-	manual.inputSchema, err = inputSchema.Resolve(nil)
-	if err != nil {
-		log.Fatal(err)
-	}
-	outputSchema := &jsonschema.Schema{
-		Type: "object",
-		Properties: map[string]*jsonschema.Schema{
-			"greeting": {Type: "string"},
-		},
-	}
-	manual.outputSchema, err = outputSchema.Resolve(nil)
-	if err != nil {
-		log.Fatal(err)
-	}
+	manual, err := newManualGreeter()
 	server.AddTool(&mcp.Tool{
 		Name:         "manual greeting",
 		InputSchema:  inputSchema,

examples/server/toolschemas/main_test.go

@@ -0,0 +1,31 @@
+// Copyright 2025 The Go MCP SDK Authors. All rights reserved.
+// Use of this source code is governed by an MIT-style
+// license that can be found in the LICENSE file.
+
+package main
+
+import (
+	"context"
+	"encoding/json"
+	"testing"
+
+	"github.com/modelcontextprotocol/go-sdk/mcp"
+)
+
+func TestGreet(t *testing.T) {
+	manual, err := newManualGreeter()
+	if err != nil {
+		t.Fatal(err)
+	}
+	res, err := manual.greet(context.Background(), &mcp.CallToolRequest{
+		Params: &mcp.CallToolParamsRaw{
+			Arguments: json.RawMessage(`{"name": "Bob"}`),
+		},
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+	if res.IsError {
+		t.Fatalf("tool error: %q", res.Content[0].(*mcp.TextContent).Text)
+	}
+}