Consolidated a bunch of reused code to agents

pkg/agents/question_splitter.go

@@ -2,65 +2,31 @@ package agents
 
 import (
 	"context"
-	"fmt"
-	"strings"
 
 	gollm "gitea.stevedudenhoeffer.com/steve/go-llm"
 )
 
-type QuestionSplitter struct {
-	Model          gollm.ChatCompletion
-	ContextualInfo []string
-}
-
-func (q QuestionSplitter) SplitQuestion(ctx context.Context, question string) ([]string, error) {
+// SplitQuestion is a utility function that will ask the LLM to split a question into sub-questions.
+// It is a utility function and as such it does not use the agent's set system prompts, it will however use any
+// contextual information that it has.
+func (a Agent) SplitQuestion(ctx context.Context, question string) ([]string, error) {
 	var res []string
-
-	req := gollm.Request{
-		Toolbox: gollm.NewToolBox(
-			gollm.NewFunction(
-				"questions",
-				"split the provided question by the user into sub-questions",
-				func(ctx *gollm.Context, args struct {
-					Questions []string `description:"The questions to evaluate"`
-				}) (string, error) {
-					res = args.Questions
-					return "", nil
-				}),
-		),
-		Messages: []gollm.Message{
-			{
-				Role: gollm.RoleSystem,
-				Text: `The user is going to ask you a question, if the question would be better answered split into multiple questions, please do so.  
-Respond using the "questions" function. 
-If the question is fine as is, respond with the original question passed to the "questions" function.`,
-			},
-		},
-	}
-
-	if len(q.ContextualInfo) > 0 {
-		req.Messages = append(req.Messages, gollm.Message{
-			Role: gollm.RoleSystem,
-			Text: "Some contextual information you should be aware of: " + strings.Join(q.ContextualInfo, "\n"),
+	fnQuestions := gollm.NewFunction(
+		"questions",
+		"split the provided question by the user into sub-questions",
+		func(ctx *gollm.Context, args struct {
+			Questions []string `description:"The questions to evaluate"`
+		}) (any, error) {
+			res = args.Questions
+			return "", nil
 		})
-	}
 
-	req.Messages = append(req.Messages, gollm.Message{
-		Role: gollm.RoleUser,
-		Text: question,
-	})
+	_, err := a.WithSystemPrompt(`The user is going to ask you a question, if the question would be better answered split into multiple questions, please do so.  
+Respond using the "questions" function. 
+If the question is fine as is, respond with the original question passed to the "questions" function.`).
+		WithSystemPromptSuffix(``).
+		WithToolbox(gollm.NewToolBox(fnQuestions)).
+		CallAndExecute(ctx, question)
 
-	resp, err := q.Model.ChatComplete(ctx, req)
-	if err != nil {
-		return nil, err
-	}
-
-	if len(resp.Choices) == 0 {
-		return nil, fmt.Errorf("no choices found")
-	}
-
-	choice := resp.Choices[0]
-
-	_, _ = req.Toolbox.ExecuteCallbacks(gollm.NewContext(ctx, req, &choice, nil), choice.Calls, nil, nil)
-	return res, nil
+	return res, err
 }