agents: GetTools added to Agent interface (tmc#831)

* feat: serpapi api key options

* feat: agent tools interface

agents/agents.go

@@ -4,6 +4,7 @@ import (
 	"context"
 
 	"github.com/tmc/langchaingo/schema"
+	"github.com/tmc/langchaingo/tools"
 )
 
 // Agent is the interface all agents must implement.
@@ -13,4 +14,5 @@ type Agent interface {
 	Plan(ctx context.Context, intermediateSteps []schema.AgentStep, inputs map[string]string) ([]schema.AgentAction, *schema.AgentFinish, error) //nolint:lll
 	GetInputKeys() []string
 	GetOutputKeys() []string
+	GetTools() []tools.Tool
 }

agents/conversational.go

@@ -113,6 +113,10 @@ func (a *ConversationalAgent) GetOutputKeys() []string {
 	return []string{a.OutputKey}
 }
 
+func (a *ConversationalAgent) GetTools() []tools.Tool {
+	return a.Tools
+}
+
 func constructScratchPad(steps []schema.AgentStep) string {
 	var scratchPad string
 	if len(steps) > 0 {

agents/executor.go

@@ -17,7 +17,6 @@ const _intermediateStepsOutputKey = "intermediateSteps"
 // Executor is the chain responsible for running agents.
 type Executor struct {
 	Agent            Agent
-	Tools            []tools.Tool
 	Memory           schema.Memory
 	CallbacksHandler callbacks.Handler
 	ErrorHandler     *ParserErrorHandler
@@ -32,15 +31,14 @@ var (
 )
 
 // NewExecutor creates a new agent executor with an agent and the tools the agent can use.
-func NewExecutor(agent Agent, tools []tools.Tool, opts ...Option) *Executor {
+func NewExecutor(agent Agent, opts ...Option) *Executor {
 	options := executorDefaultOptions()
 	for _, opt := range opts {
 		opt(&options)
 	}
 
 	return &Executor{
 		Agent:                   agent,
-		Tools:                   tools,
 		Memory:                  options.memory,
 		MaxIterations:           options.maxIterations,
 		ReturnIntermediateSteps: options.returnIntermediateSteps,
@@ -54,7 +52,7 @@ func (e *Executor) Call(ctx context.Context, inputValues map[string]any, _ ...ch
 	if err != nil {
 		return nil, err
 	}
-	nameToTool := getNameToTool(e.Tools)
+	nameToTool := getNameToTool(e.Agent.GetTools())
 
 	steps := make([]schema.AgentStep, 0)
 	for i := 0; i < e.MaxIterations; i++ {

agents/executor_test.go

@@ -48,6 +48,10 @@ func (a testAgent) GetOutputKeys() []string {
 	return a.outputKeys
 }
 
+func (a *testAgent) GetTools() []tools.Tool {
+	return nil
+}
+
 func TestExecutorWithErrorHandler(t *testing.T) {
 	t.Parallel()
 
@@ -56,7 +60,6 @@ func TestExecutorWithErrorHandler(t *testing.T) {
 	}
 	executor := agents.NewExecutor(
 		a,
-		nil,
 		agents.WithMaxIterations(3),
 		agents.WithParserErrorHandler(agents.NewParserErrorHandler(nil)),
 	)
@@ -129,7 +132,7 @@ func TestExecutorWithOpenAIFunctionAgent(t *testing.T) {
 		}),
 	)
 
-	e := agents.NewExecutor(a, toolList)
+	e := agents.NewExecutor(a)
 	require.NoError(t, err)
 
 	result, err := chains.Run(context.Background(), e, "what is HK singer Eason Chan's years old?") //nolint:lll

agents/initialize.go

@@ -38,5 +38,5 @@ func Initialize(
 	default:
 		return &Executor{}, ErrUnknownAgentType
 	}
-	return NewExecutor(agent, tools, opts...), nil
+	return NewExecutor(agent, opts...), nil
 }

agents/mrkl.go

@@ -115,6 +115,10 @@ func (a *OneShotZeroAgent) GetOutputKeys() []string {
 	return []string{a.OutputKey}
 }
 
+func (a *OneShotZeroAgent) GetTools() []tools.Tool {
+	return a.Tools
+}
+
 func (a *OneShotZeroAgent) parseOutput(output string) ([]schema.AgentAction, *schema.AgentFinish, error) {
 	if strings.Contains(output, _finalAnswerAction) {
 		splits := strings.Split(output, _finalAnswerAction)

agents/openai_functions_agent.go

@@ -157,6 +157,10 @@ func (o *OpenAIFunctionsAgent) GetOutputKeys() []string {
 	return []string{o.OutputKey}
 }
 
+func (o *OpenAIFunctionsAgent) GetTools() []tools.Tool {
+	return o.Tools
+}
+
 func createOpenAIFunctionPrompt(opts Options) prompts.ChatPromptTemplate {
 	messageFormatters := []prompts.MessageFormatter{prompts.NewSystemMessagePromptTemplate(opts.systemMessage, nil)}
 	messageFormatters = append(messageFormatters, opts.extraMessages...)