Consolidated a bunch of reused code to agents

2025-03-26 00:21:19 -04:00
parent 5407c1a7cc
commit 5d2c350acf
33 changed files with 2866 additions and 803 deletions
--- a/cmd/agent/cmd.go
+++ b/cmd/agent/cmd.go
@@ -7,14 +7,8 @@ import (
 	"os"
 	"strings"

-	knowledge2 "gitea.stevedudenhoeffer.com/steve/answer/pkg/agents"
-
+	"gitea.stevedudenhoeffer.com/steve/answer/pkg/agents"
 	gollm "gitea.stevedudenhoeffer.com/steve/go-llm"
-
-	"gitea.stevedudenhoeffer.com/steve/answer/pkg/agents/shared"
-
-	"gitea.stevedudenhoeffer.com/steve/answer/pkg/agents/searcher"
-
 	"github.com/joho/godotenv"
 	"github.com/urfave/cli"
 )
@@ -102,18 +96,9 @@ func main() {
 			}
 			question := strings.Join(c.Args(), " ")

-			search := searcher.Agent{
-				Model: m,
+			agent := agents.NewAgent(m, nil).WithMaxCalls(200)

-				OnDone: func(ctx context.Context, knowledge shared.Knowledge) error {
-					slog.Info("done", "knowledge", knowledge)
-					return nil
-				},
-				MaxReads: 20,
-			}
-
-			processor := knowledge2.KnowledgeProcessor{Model: m}
-			knowledge, err := search.Search(ctx, question, question)
+			knowledge, err := agent.SearchAndRead(ctx, question, []string{question}, true, 10)

 			if err != nil {
 				panic(err)
@@ -121,9 +106,12 @@ func main() {

 			slog.Info("knowledge", "knowledge", knowledge)

-			sum, err := processor.Process(ctx, knowledge)
+			res, err := agent.AnswerQuestionWithKnowledge(ctx, knowledge)
+			if err != nil {
+				panic(err)
+			}

-			fmt.Println(sum)
+			fmt.Println(res)
 			return nil
 		},
 	}
--- a/cmd/console/cmd.go
+++ b/cmd/console/cmd.go
@@ -0,0 +1,151 @@
+package main
+
+import (
+	"context"
+	"fmt"
+	"log/slog"
+	"os"
+	"strings"
+	"time"
+
+	"gitea.stevedudenhoeffer.com/steve/answer/pkg/agents"
+
+	"gitea.stevedudenhoeffer.com/steve/answer/pkg/agents/console"
+
+	gollm "gitea.stevedudenhoeffer.com/steve/go-llm"
+
+	"github.com/joho/godotenv"
+	"github.com/urfave/cli"
+)
+
+func getKey(key string, env string) string {
+	if key != "" {
+		return key
+	}
+
+	return os.Getenv(env)
+}
+
+func main() {
+	// Usage: go run cmd/answer.go question...
+	// - flags:
+	//   --model=[model string such as openai/gpt-4o, anthropic/claude..., google/gemini-1.5.  Default: openai/gpt-4o]
+	//   --search-provider=[search provider string such as google, duckduckgo.  Default: google]
+	//	 --cache-provider=[cache provider string such as memory, redis, file.  Default: memory]
+
+	var app = cli.App{
+		Name:        "console",
+		Usage:       "has an llm control a console for you",
+		Version:     "0.1",
+		Description: "",
+
+		Flags: []cli.Flag{
+			&cli.StringFlag{
+				Name:  "env-file",
+				Value: ".env",
+				Usage: "file to read environment variables from",
+			},
+
+			&cli.StringFlag{
+				Name:  "model",
+				Value: "openai/gpt-4o-mini",
+				Usage: "model to use for answering the question, syntax: provider/model such as openai/gpt-4o",
+			},
+
+			&cli.StringFlag{
+				Name:  "llm-key",
+				Value: "",
+				Usage: "key for the llm model (if empty, will use env var of PROVIDER_API_KEY, such as OPENAI_API_KEY)",
+			},
+		},
+
+		Action: func(ctx *cli.Context) error {
+			// if there is no question to answer, print usage
+			if ctx.NArg() == 0 {
+				return cli.ShowAppHelp(ctx)
+			}
+
+			if ctx.String("env-file") != "" {
+				_ = godotenv.Load(ctx.String("env-file"))
+			}
+
+			var llm gollm.LLM
+
+			model := ctx.String("model")
+
+			a := strings.Split(model, "/")
+
+			if len(a) != 2 {
+				panic("invalid model, expected: provider/model (such as openai/gpt-4o)")
+			}
+
+			switch a[0] {
+			case "openai":
+				llm = gollm.OpenAI(getKey(ctx.String("llm-key"), "OPENAI_API_KEY"))
+
+			case "anthropic":
+				llm = gollm.Anthropic(getKey(ctx.String("llm-key"), "ANTHROPI_API_KEY"))
+
+			case "google":
+				llm = gollm.Google(getKey(ctx.String("llm-key"), "GOOGLE_API_KEY"))
+
+			default:
+				panic("unknown model provider")
+			}
+
+			m, err := llm.ModelVersion(a[1])
+
+			if err != nil {
+				panic(err)
+			}
+			question := strings.Join(ctx.Args(), " ")
+
+			c := console.Agent{
+				Model:  m,
+				OnDone: func(ctx context.Context, knowledge agents.Knowledge) error { return nil },
+				OnCommandStart: func(ctx context.Context, command string) error {
+					slog.Info("command", "command", command)
+					return nil
+				},
+				OnCommandDone: func(ctx context.Context, command string, output string, err error) error {
+					slog.Info("command done", "command", command, "output", output, "err", err)
+					return nil
+				},
+				ContextualInformation: []string{
+					fmt.Sprintf("The current time is %s", time.Now().Format(time.RFC3339)),
+				},
+				MaxCommands: 0,
+			}
+
+			res, err := c.Answer(context.Background(), []string{question})
+
+			if res.Directory != "" {
+				defer func() {
+					_ = os.RemoveAll(res.Directory)
+				}()
+			}
+			if err != nil {
+				panic(err)
+			}
+
+			fmt.Println("Results: ", fmt.Sprintf("%+v", res))
+
+			answer, err := agents.AnswerQuestionWithKnowledge(context.Background(), res.Knowledge, m, []string{
+				fmt.Sprintf("The current time is %s", time.Now().Format(time.RFC3339)),
+			})
+
+			if err != nil {
+				panic(err)
+			}
+
+			fmt.Println("Answer: ", answer)
+			return nil
+		},
+	}
+
+	err := app.Run(os.Args)
+
+	if err != nil {
+		slog.Error("Error: ", err)
+	}
+}
--- a/cmd/steps/cmd.go
+++ b/cmd/steps/cmd.go
@@ -0,0 +1,118 @@
+package main
+
+import (
+	"context"
+	"fmt"
+	"gitea.stevedudenhoeffer.com/steve/answer/pkg/agents"
+	"log/slog"
+	"os"
+	"strings"
+
+	gollm "gitea.stevedudenhoeffer.com/steve/go-llm"
+
+	"github.com/joho/godotenv"
+	"github.com/urfave/cli"
+)
+
+func getKey(key string, env string) string {
+	if key != "" {
+		return key
+	}
+
+	return os.Getenv(env)
+}
+
+func main() {
+	// Usage: go run cmd/answer.go question...
+	// - flags:
+	//   --model=[model string such as openai/gpt-4o, anthropic/claude..., google/gemini-1.5.  Default: openai/gpt-4o]
+	//   --search-provider=[search provider string such as google, duckduckgo.  Default: google]
+	//	 --cache-provider=[cache provider string such as memory, redis, file.  Default: memory]
+
+	var app = cli.App{
+		Name:        "console",
+		Usage:       "has an llm control a console for you",
+		Version:     "0.1",
+		Description: "",
+
+		Flags: []cli.Flag{
+			&cli.StringFlag{
+				Name:  "env-file",
+				Value: ".env",
+				Usage: "file to read environment variables from",
+			},
+
+			&cli.StringFlag{
+				Name:  "model",
+				Value: "openai/gpt-4o-mini",
+				Usage: "model to use for answering the question, syntax: provider/model such as openai/gpt-4o",
+			},
+
+			&cli.StringFlag{
+				Name:  "llm-key",
+				Value: "",
+				Usage: "key for the llm model (if empty, will use env var of PROVIDER_API_KEY, such as OPENAI_API_KEY)",
+			},
+		},
+
+		Action: func(ctx *cli.Context) error {
+			// if there is no question to answer, print usage
+			if ctx.NArg() == 0 {
+				return cli.ShowAppHelp(ctx)
+			}
+
+			if ctx.String("env-file") != "" {
+				_ = godotenv.Load(ctx.String("env-file"))
+			}
+
+			var llm gollm.LLM
+
+			model := ctx.String("model")
+
+			a := strings.Split(model, "/")
+
+			if len(a) != 2 {
+				panic("invalid model, expected: provider/model (such as openai/gpt-4o)")
+			}
+
+			switch a[0] {
+			case "openai":
+				llm = gollm.OpenAI(getKey(ctx.String("llm-key"), "OPENAI_API_KEY"))
+
+			case "anthropic":
+				llm = gollm.Anthropic(getKey(ctx.String("llm-key"), "ANTHROPI_API_KEY"))
+
+			case "google":
+				llm = gollm.Google(getKey(ctx.String("llm-key"), "GOOGLE_API_KEY"))
+
+			default:
+				panic("unknown model provider")
+			}
+
+			m, err := llm.ModelVersion(a[1])
+
+			if err != nil {
+				panic(err)
+			}
+			question := strings.Join(ctx.Args(), " ")
+
+			ag := agents.NewAgent(m, nil)
+
+			steps, err := ag.SplitQuestion(context.Background(), question)
+
+			fmt.Println("Input question: ", question)
+			fmt.Println("Steps: ")
+			for i, s := range steps {
+				fmt.Println("  - Step ", i+1, ": ", s)
+			}
+			fmt.Println("Error: ", err)
+			return nil
+		},
+	}
+
+	err := app.Run(os.Args)
+
+	if err != nil {
+		slog.Error("Error: ", err)
+	}
+}