Skip to content

fix(schema): preserve caller-owned JSON parser config #1485

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.

Sign up for GitHub

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

Open
123XieC wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(schema): preserve caller-owned JSON parser config #1485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 7 additions & 6 deletions schema/message_parser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,17 +50,18 @@ type MessageJSONParseConfig struct {

// NewMessageJSONParser creates a new MessageJSONParser.
func NewMessageJSONParser[T any](config *MessageJSONParseConfig) MessageParser[T] {
if config == nil {
config = &MessageJSONParseConfig{}
var parseConfig MessageJSONParseConfig
if config != nil {
parseConfig = *config
}

if config.ParseFrom == "" {
config.ParseFrom = MessageParseFromContent
if parseConfig.ParseFrom == "" {
parseConfig.ParseFrom = MessageParseFromContent
}

return &MessageJSONParser[T]{
ParseFrom: config.ParseFrom,
ParseKeyPath: config.ParseKeyPath,
ParseFrom: parseConfig.ParseFrom,
ParseKeyPath: parseConfig.ParseKeyPath,
}
}

Expand Down
10 changes: 10 additions & 0 deletions schema/message_parser_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,16 @@ func TestMessageJSONParser(t *testing.T) {
assert.Equal(t, 1, parsed.ID)
})

t.Run("default source leaves the config unchanged", func(t *testing.T) {
config := &MessageJSONParseConfig{ParseKeyPath: "id"}
parser := NewMessageJSONParser[int](config)

parsed, err := parser.Parse(ctx, &Message{Content: `{"id": 7}`})
assert.NoError(t, err)
assert.Equal(t, 7, parsed)
assert.Equal(t, &MessageJSONParseConfig{ParseKeyPath: "id"}, config)
})

t.Run("parse from tool call", func(t *testing.T) {
t.Run("only one tool call, default use first tool call", func(t *testing.T) {
parser := NewMessageJSONParser[TestStructForParse](&MessageJSONParseConfig{
Expand Down