fix(schema): add missing json tag for ToolArgument.Text field (#766)

Author: zhuangjie1125

components/tool/callback_extra.go

@@ -48,7 +48,7 @@ func ConvCallbackInput(src callbacks.CallbackInput) *CallbackInput {
 	case string:
 		return &CallbackInput{ArgumentsInJSON: t}
 	case *schema.ToolArgument:
-		return &CallbackInput{ArgumentsInJSON: t.TextArgument}
+		return &CallbackInput{ArgumentsInJSON: t.Text}
 	default:
 		return nil
 	}

components/tool/utils/invokable_func.go

@@ -263,7 +263,7 @@ func (e *enhancedInvokableTool[T]) InvokableRun(ctx context.Context, toolArgumen
 
 	if e.um != nil {
 		var val any
-		val, err = e.um(ctx, toolArgument.TextArgument)
+		val, err = e.um(ctx, toolArgument.Text)
 		if err != nil {
 			return nil, fmt.Errorf("[EnhancedLocalFunc] failed to unmarshal arguments, toolName=%s, err=%w", e.getToolName(), err)
 		}
@@ -275,7 +275,7 @@ func (e *enhancedInvokableTool[T]) InvokableRun(ctx context.Context, toolArgumen
 	} else {
 		inst = generic.NewInstance[T]()
 
-		err = sonic.UnmarshalString(toolArgument.TextArgument, &inst)
+		err = sonic.UnmarshalString(toolArgument.Text, &inst)
 		if err != nil {
 			return nil, fmt.Errorf("[EnhancedLocalFunc] failed to unmarshal arguments in json, toolName=%s, err=%w", e.getToolName(), err)
 		}

components/tool/utils/streamable_func.go

@@ -220,7 +220,7 @@ func (s *enhancedStreamableTool[T]) StreamableRun(ctx context.Context, toolArgum
 	var inst T
 	if s.um != nil {
 		var val any
-		val, err = s.um(ctx, toolArgument.TextArgument)
+		val, err = s.um(ctx, toolArgument.Text)
 		if err != nil {
 			return nil, fmt.Errorf("[EnhancedLocalStreamFunc] failed to unmarshal arguments, toolName=%s, err=%w", s.getToolName(), err)
 		}
@@ -233,7 +233,7 @@ func (s *enhancedStreamableTool[T]) StreamableRun(ctx context.Context, toolArgum
 	} else {
 		inst = generic.NewInstance[T]()
 
-		err = sonic.UnmarshalString(toolArgument.TextArgument, &inst)
+		err = sonic.UnmarshalString(toolArgument.Text, &inst)
 		if err != nil {
 			return nil, fmt.Errorf("[EnhancedLocalStreamFunc] failed to unmarshal arguments in json, toolName=%s, err=%w", s.getToolName(), err)
 		}

components/tool/utils/streamable_func_test.go

@@ -209,7 +209,7 @@ func TestNewEnhancedStreamTool(t *testing.T) {
 		assert.NoError(t, err)
 		assert.Equal(t, "enhanced_stream_search", info.Name)
 
-		sr, err := tl.StreamableRun(ctx, &schema.ToolArgument{TextArgument: `{"query":"test"}`})
+		sr, err := tl.StreamableRun(ctx, &schema.ToolArgument{Text: `{"query":"test"}`})
 		assert.NoError(t, err)
 		defer sr.Close()
 
@@ -281,7 +281,7 @@ func TestInferEnhancedStreamTool(t *testing.T) {
 		assert.NoError(t, err)
 		assert.Equal(t, "infer_enhanced_stream", info.Name)
 
-		sr, err := tl.StreamableRun(ctx, &schema.ToolArgument{TextArgument: `{"query":"hello"}`})
+		sr, err := tl.StreamableRun(ctx, &schema.ToolArgument{Text: `{"query":"hello"}`})
 		assert.NoError(t, err)
 		defer sr.Close()
 
@@ -303,7 +303,7 @@ func TestInferOptionableEnhancedStreamTool(t *testing.T) {
 		assert.NoError(t, err)
 		assert.Equal(t, "infer_optionable_enhanced_stream", info.Name)
 
-		sr, err := tl.StreamableRun(ctx, &schema.ToolArgument{TextArgument: `{"query":"world"}`}, FakeWithEnhancedStreamOption("custom"))
+		sr, err := tl.StreamableRun(ctx, &schema.ToolArgument{Text: `{"query":"world"}`}, FakeWithEnhancedStreamOption("custom"))
 		assert.NoError(t, err)
 		defer sr.Close()
 
@@ -317,7 +317,7 @@ func TestInferOptionableEnhancedStreamTool(t *testing.T) {
 		tl, err := InferOptionableEnhancedStreamTool("infer_optionable_enhanced_stream", "test infer optionable enhanced stream tool", fakeOptionableEnhancedStreamFunc)
 		assert.NoError(t, err)
 
-		sr, err := tl.StreamableRun(ctx, &schema.ToolArgument{TextArgument: `{"query":"test"}`})
+		sr, err := tl.StreamableRun(ctx, &schema.ToolArgument{Text: `{"query":"test"}`})
 		assert.NoError(t, err)
 		defer sr.Close()
 

compose/tool_node.go

@@ -401,7 +401,7 @@ func wrapEnhancedInvokableToolCall(eiTool tool.EnhancedInvokableTool, middleware
 		eiTool = &enhancedInvokableToolWithCallback{eiTool: eiTool}
 	}
 	return middleware(func(ctx context.Context, input *ToolInput) (*EnhancedInvokableToolOutput, error) {
-		result, err := eiTool.InvokableRun(ctx, &schema.ToolArgument{TextArgument: input.Arguments}, input.CallOptions...)
+		result, err := eiTool.InvokableRun(ctx, &schema.ToolArgument{Text: input.Arguments}, input.CallOptions...)
 		if err != nil {
 			return nil, err
 		}
@@ -420,7 +420,7 @@ func wrapEnhancedStreamableToolCall(est tool.EnhancedStreamableTool, middlewares
 		est = &enhancedStreamableToolWithCallback{est: est}
 	}
 	return middleware(func(ctx context.Context, input *ToolInput) (*EnhancedStreamableToolOutput, error) {
-		result, err := est.StreamableRun(ctx, &schema.ToolArgument{TextArgument: input.Arguments}, input.CallOptions...)
+		result, err := est.StreamableRun(ctx, &schema.ToolArgument{Text: input.Arguments}, input.CallOptions...)
 		if err != nil {
 			return nil, err
 		}

compose/tool_node_test.go

@@ -1058,7 +1058,7 @@ func TestEnhancedToolNode(t *testing.T) {
 		fn: func(ctx context.Context, input *schema.ToolArgument) (*schema.ToolResult, error) {
 			return &schema.ToolResult{
 				Parts: []schema.ToolOutputPart{
-					{Type: schema.ToolPartTypeText, Text: "invokable result: " + input.TextArgument},
+					{Type: schema.ToolPartTypeText, Text: "invokable result: " + input.Text},
 				},
 			}, nil
 		},
@@ -1071,7 +1071,7 @@ func TestEnhancedToolNode(t *testing.T) {
 		},
 		fn: func(ctx context.Context, input *schema.ToolArgument) (*schema.StreamReader[*schema.ToolResult], error) {
 			results := []*schema.ToolResult{
-				{Parts: []schema.ToolOutputPart{{Type: schema.ToolPartTypeText, Text: "stream part 1: " + input.TextArgument}}},
+				{Parts: []schema.ToolOutputPart{{Type: schema.ToolPartTypeText, Text: "stream part 1: " + input.Text}}},
 				{Parts: []schema.ToolOutputPart{{Type: schema.ToolPartTypeText, Text: " stream part 2"}}},
 			}
 			return schema.StreamReaderFromArray(results), nil
@@ -1147,7 +1147,7 @@ func TestEnhancedToolConversion(t *testing.T) {
 		fn: func(ctx context.Context, input *schema.ToolArgument) (*schema.ToolResult, error) {
 			return &schema.ToolResult{
 				Parts: []schema.ToolOutputPart{
-					{Type: schema.ToolPartTypeText, Text: "enhanced: " + input.TextArgument},
+					{Type: schema.ToolPartTypeText, Text: "enhanced: " + input.Text},
 				},
 			}, nil
 		},

schema/message.go

@@ -328,8 +328,8 @@ type ToolOutputPart struct {
 // ToolArgument contains the input information for a tool call.
 // It is used to pass tool call arguments to enhanced tools.
 type ToolArgument struct {
-	// TextArgument contains the arguments for the tool call in JSON format.
-	TextArgument string
+	// Text contains the arguments for the tool call in JSON format.
+	Text string `json:"text,omitempty"`
 }
 
 // ToolResult represents the structured multimodal output from a tool execution.