Revert "feat: remove tool choice in model callback input"

components/model/callback_extra.go

@@ -51,6 +51,8 @@ type CallbackInput struct {
 	Messages []*schema.Message
 	// Tools is the tools to be used in the model.
 	Tools []*schema.ToolInfo
+	// ToolChoice is the tool choice, which controls the tool to be used in the model.
+	ToolChoice any // string / *schema.ToolInfo
 	// Config is the config for the model.
 	Config *Config
 	// Extra is the extra information for the callback.

components/model/option.go

@@ -16,8 +16,6 @@
 
 package model
 
-import "github.com/cloudwego/eino/schema"
-
 // Options is the common options for the model.
 type Options struct {
 	// Temperature is the temperature for the model, which controls the randomness of the model.
@@ -30,8 +28,6 @@ type Options struct {
 	TopP *float32
 	// Stop is the stop words for the model, which controls the stopping condition of the model.
 	Stop []string
-	// ToolChoice controls which tool is called by the model.
-	ToolChoice *schema.ToolChoice
 }
 
 // Option is the call option for ChatModel component.
@@ -86,15 +82,6 @@ func WithStop(stop []string) Option {
 	}
 }
 
-// WithToolChoice is the option to set tool choice for the model.
-func WithToolChoice(toolChoice schema.ToolChoice) Option {
-	return Option{
-		apply: func(opts *Options) {
-			opts.ToolChoice = &toolChoice
-		},
-	}
-}
-
 // WrapImplSpecificOptFn is the option to wrap the implementation specific option function.
 func WrapImplSpecificOptFn[T any](optFn func(*T)) Option {
 	return Option{

components/model/option_test.go

@@ -19,7 +19,6 @@ package model
 import (
 	"testing"
 
-	"github.com/cloudwego/eino/schema"
 	"github.com/smartystreets/goconvey/convey"
 )
 
@@ -34,8 +33,6 @@ func TestOptions(t *testing.T) {
 			defaultTemperature float32 = 1.0
 			defaultMaxTokens           = 1000
 			defaultTopP        float32 = 0.5
-
-			toolChoiceForbidden = schema.ToolChoiceForbidden
 		)
 
 		opts := GetCommonOptions(
@@ -50,7 +47,6 @@ func TestOptions(t *testing.T) {
 			WithMaxTokens(maxToken),
 			WithTopP(topP),
 			WithStop([]string{"hello", "bye"}),
-			WithToolChoice(schema.ToolChoiceForbidden),
 		)
 
 		convey.So(opts, convey.ShouldResemble, &Options{
@@ -59,7 +55,6 @@ func TestOptions(t *testing.T) {
 			MaxTokens:   &maxToken,
 			TopP:        &topP,
 			Stop:        []string{"hello", "bye"},
-			ToolChoice:  &toolChoiceForbidden,
 		})
 	})
 }