Skip to content

feat:Added the parameter parsing mode to parse any to the specified type #148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 19, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ go 1.23

require (
github.com/google/uuid v1.6.0
github.com/spf13/cast v1.7.1
github.com/stretchr/testify v1.9.0
github.com/yosida95/uritemplate/v3 v3.0.2
)
Expand Down
12 changes: 12 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,9 +1,21 @@
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
github.com/spf13/cast v1.7.1 h1:cuNEagBQEHWN1FnbGEjCXL2szYEXqfJPbP2HNUaca9Y=
github.com/spf13/cast v1.7.1/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo=
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
github.com/yosida95/uritemplate/v3 v3.0.2 h1:Ed3Oyj9yrmi9087+NczuL5BwkIc4wvTb5zIM+UJPGz4=
Expand Down
68 changes: 68 additions & 0 deletions mcp/tools_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package mcp

import (
"encoding/json"
"fmt"
"testing"

"github.com/stretchr/testify/assert"
Expand Down Expand Up @@ -240,3 +241,70 @@ func TestToolWithObjectAndArray(t *testing.T) {
assert.True(t, ok)
assert.Contains(t, required, "books")
}

func TestParseToolCallToolRequest(t *testing.T) {
request := CallToolRequest{}
request.Params.Name = "test-tool"
request.Params.Arguments = map[string]interface{}{
"bool_value": "true",
"int64_value": "123456789",
"int32_value": "123456789",
"int16_value": "123456789",
"int8_value": "123456789",
"int_value": "123456789",
"uint_value": "123456789",
"uint64_value": "123456789",
"uint32_value": "123456789",
"uint16_value": "123456789",
"uint8_value": "123456789",
"float32_value": "3.14",
"float64_value": "3.1415926",
"string_value": "hello",
}
param1 := ParseBoolean(request, "bool_value", false)
assert.Equal(t, fmt.Sprintf("%T", param1), "bool")

param2 := ParseInt64(request, "int64_value", 1)
assert.Equal(t, fmt.Sprintf("%T", param2), "int64")

param3 := ParseInt32(request, "int32_value", 1)
assert.Equal(t, fmt.Sprintf("%T", param3), "int32")

param4 := ParseInt16(request, "int16_value", 1)
assert.Equal(t, fmt.Sprintf("%T", param4), "int16")

param5 := ParseInt8(request, "int8_value", 1)
assert.Equal(t, fmt.Sprintf("%T", param5), "int8")

param6 := ParseInt(request, "int_value", 1)
assert.Equal(t, fmt.Sprintf("%T", param6), "int")

param7 := ParseUInt(request, "uint_value", 1)
assert.Equal(t, fmt.Sprintf("%T", param7), "uint")

param8 := ParseUInt64(request, "uint64_value", 1)
assert.Equal(t, fmt.Sprintf("%T", param8), "uint64")

param9 := ParseUInt32(request, "uint32_value", 1)
assert.Equal(t, fmt.Sprintf("%T", param9), "uint32")

param10 := ParseUInt16(request, "uint16_value", 1)
assert.Equal(t, fmt.Sprintf("%T", param10), "uint16")

param11 := ParseUInt8(request, "uint8_value", 1)
assert.Equal(t, fmt.Sprintf("%T", param11), "uint8")

param12 := ParseFloat32(request, "float32_value", 1.0)
assert.Equal(t, fmt.Sprintf("%T", param12), "float32")

param13 := ParseFloat64(request, "float64_value", 1.0)
assert.Equal(t, fmt.Sprintf("%T", param13), "float64")

param14 := ParseString(request, "string_value", "")
assert.Equal(t, fmt.Sprintf("%T", param14), "string")

param15 := ParseInt64(request, "string_value", 1)
assert.Equal(t, fmt.Sprintf("%T", param15), "int64")
t.Logf("param15 type: %T,value:%v", param15, param15)

}
103 changes: 103 additions & 0 deletions mcp/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package mcp
import (
"encoding/json"
"fmt"
"github.com/spf13/cast"
)

// ClientRequest types
Expand Down Expand Up @@ -594,3 +595,105 @@ func ParseReadResourceResult(rawMessage *json.RawMessage) (*ReadResourceResult,

return &result, nil
}

func ParseArgument(request CallToolRequest, key string, defaultVal any) any {
if _, ok := request.Params.Arguments[key]; !ok {
return defaultVal
} else {
return request.Params.Arguments[key]
}
}

// ParseBoolean extracts and converts a boolean parameter from a CallToolRequest.
// If the key is not found in the Arguments map, the defaultValue is returned.
// The function uses cast.ToBool for conversion which handles various string representations
// such as "true", "yes", "1", etc.
func ParseBoolean(request CallToolRequest, key string, defaultValue bool) bool {
v := ParseArgument(request, key, defaultValue)
return cast.ToBool(v)
}

// ParseInt64 extracts and converts an int64 parameter from a CallToolRequest.
// If the key is not found in the Arguments map, the defaultValue is returned.
func ParseInt64(request CallToolRequest, key string, defaultValue int64) int64 {
v := ParseArgument(request, key, defaultValue)
return cast.ToInt64(v)
}

// ParseInt32 extracts and converts an int32 parameter from a CallToolRequest.
func ParseInt32(request CallToolRequest, key string, defaultValue int32) int32 {
v := ParseArgument(request, key, defaultValue)
return cast.ToInt32(v)
}

// ParseInt16 extracts and converts an int16 parameter from a CallToolRequest.
func ParseInt16(request CallToolRequest, key string, defaultValue int16) int16 {
v := ParseArgument(request, key, defaultValue)
return cast.ToInt16(v)
}

// ParseInt8 extracts and converts an int8 parameter from a CallToolRequest.
func ParseInt8(request CallToolRequest, key string, defaultValue int8) int8 {
v := ParseArgument(request, key, defaultValue)
return cast.ToInt8(v)
}

// ParseInt extracts and converts an int parameter from a CallToolRequest.
func ParseInt(request CallToolRequest, key string, defaultValue int) int {
v := ParseArgument(request, key, defaultValue)
return cast.ToInt(v)
}

// ParseUInt extracts and converts an uint parameter from a CallToolRequest.
func ParseUInt(request CallToolRequest, key string, defaultValue uint) uint {
v := ParseArgument(request, key, defaultValue)
return cast.ToUint(v)
}

// ParseUInt64 extracts and converts an uint64 parameter from a CallToolRequest.
func ParseUInt64(request CallToolRequest, key string, defaultValue uint64) uint64 {
v := ParseArgument(request, key, defaultValue)
return cast.ToUint64(v)
}

// ParseUInt32 extracts and converts an uint32 parameter from a CallToolRequest.
func ParseUInt32(request CallToolRequest, key string, defaultValue uint32) uint32 {
v := ParseArgument(request, key, defaultValue)
return cast.ToUint32(v)
}

// ParseUInt16 extracts and converts an uint16 parameter from a CallToolRequest.
func ParseUInt16(request CallToolRequest, key string, defaultValue uint16) uint16 {
v := ParseArgument(request, key, defaultValue)
return cast.ToUint16(v)
}

// ParseUInt8 extracts and converts an uint8 parameter from a CallToolRequest.
func ParseUInt8(request CallToolRequest, key string, defaultValue uint8) uint8 {
v := ParseArgument(request, key, defaultValue)
return cast.ToUint8(v)
}

// ParseFloat32 extracts and converts a float32 parameter from a CallToolRequest.
func ParseFloat32(request CallToolRequest, key string, defaultValue float32) float32 {
v := ParseArgument(request, key, defaultValue)
return cast.ToFloat32(v)
}

// ParseFloat64 extracts and converts a float64 parameter from a CallToolRequest.
func ParseFloat64(request CallToolRequest, key string, defaultValue float64) float64 {
v := ParseArgument(request, key, defaultValue)
return cast.ToFloat64(v)
}

// ParseString extracts and converts a string parameter from a CallToolRequest.
func ParseString(request CallToolRequest, key string, defaultValue string) string {
v := ParseArgument(request, key, defaultValue)
return cast.ToString(v)
}

// ParseStringMap extracts and converts a string map parameter from a CallToolRequest.
func ParseStringMap(request CallToolRequest, key string, defaultValue map[string]any) map[string]any {
v := ParseArgument(request, key, defaultValue)
return cast.ToStringMap(v)
}