feat(cmd): add support for agent and prompt

Author: craftslab

agent/agent.go

@@ -5,21 +5,22 @@ import (
 	"time"
 
 	"github.com/ai-flowx/flowx/gpt"
+	"github.com/ai-flowx/flowx/prompt"
 	"github.com/ai-flowx/flowx/tool"
 )
 
 type Agent interface {
 	Init(context.Context) error
 	Deinit(context.Context) error
-	Run(context.Context) error
+	Run(context.Context, string, string) (string, error)
 }
 
 type Config struct {
 	Role                 string
 	Goal                 string
 	Backstory            string
 	Gpt                  gpt.Gpt
-	Tool                 []tool.Tool
+	Tool                 tool.Tool
 	MaxIter              int
 	MaxRpm               int
 	MaxExecutionTime     time.Duration
@@ -28,6 +29,7 @@ type Config struct {
 	PromptTemplate       string
 	ResponseTemplate     string
 	RespectContextWindow bool
+	Prompt               prompt.Prompt
 }
 
 type agent struct {
@@ -52,6 +54,6 @@ func (a *agent) Deinit(ctx context.Context) error {
 	return nil
 }
 
-func (a *agent) Run(ctx context.Context) error {
-	return nil
+func (a *agent) Run(ctx context.Context, _prompt, _context string) (string, error) {
+	return "", nil
 }

cmd/root.go

@@ -12,10 +12,12 @@ import (
 	"github.com/spf13/viper"
 	"golang.org/x/sync/errgroup"
 
+	"github.com/ai-flowx/flowx/agent"
 	"github.com/ai-flowx/flowx/config"
 	"github.com/ai-flowx/flowx/flow"
 	"github.com/ai-flowx/flowx/gpt"
 	"github.com/ai-flowx/flowx/memory"
+	"github.com/ai-flowx/flowx/prompt"
 	"github.com/ai-flowx/flowx/store"
 	"github.com/ai-flowx/flowx/tool"
 )
@@ -46,6 +48,11 @@ var rootCmd = &cobra.Command{
 			_, _ = fmt.Fprintln(os.Stderr, err.Error())
 			os.Exit(1)
 		}
+		p, err := initPrompt(ctx, &cfg)
+		if err != nil {
+			_, _ = fmt.Fprintln(os.Stderr, err.Error())
+			os.Exit(1)
+		}
 		s, err := initStore(ctx, &cfg)
 		if err != nil {
 			_, _ = fmt.Fprintln(os.Stderr, err.Error())
@@ -61,7 +68,12 @@ var rootCmd = &cobra.Command{
 			_, _ = fmt.Fprintln(os.Stderr, err.Error())
 			os.Exit(1)
 		}
-		f, err := initFlow(ctx, &cfg, g, m, t)
+		a, err := initAgent(ctx, &cfg, g, p, t)
+		if err != nil {
+			_, _ = fmt.Fprintln(os.Stderr, err.Error())
+			os.Exit(1)
+		}
+		f, err := initFlow(ctx, &cfg, g, m, t, a)
 		if err != nil {
 			_, _ = fmt.Fprintln(os.Stderr, err.Error())
 			os.Exit(1)
@@ -116,6 +128,15 @@ func initGpt(ctx context.Context, cfg *config.Config) (gpt.Gpt, error) {
 	return gpt.New(ctx, c), nil
 }
 
+func initPrompt(ctx context.Context, _ *config.Config) (prompt.Prompt, error) {
+	c := prompt.DefaultConfig()
+	if c == nil {
+		return nil, errors.New("failed to config\n")
+	}
+
+	return prompt.New(ctx, c), nil
+}
+
 func initStore(ctx context.Context, cfg *config.Config) (store.Store, error) {
 	c := store.DefaultConfig()
 	if c == nil {
@@ -161,7 +182,21 @@ func initTool(ctx context.Context, cfg *config.Config, _gpt gpt.Gpt) (tool.Tool,
 	return tool.New(ctx, c), nil
 }
 
-func initFlow(ctx context.Context, cfg *config.Config, _gpt gpt.Gpt, mem memory.Memory, _tool tool.Tool) (flow.Flow, error) {
+func initAgent(ctx context.Context, _ *config.Config, _gpt gpt.Gpt, _prompt prompt.Prompt, _tool tool.Tool) (agent.Agent, error) {
+	c := agent.DefaultConfig()
+	if c == nil {
+		return nil, errors.New("failed to config\n")
+	}
+
+	c.Gpt = _gpt
+	c.Prompt = _prompt
+	c.Tool = _tool
+
+	return agent.New(ctx, c), nil
+}
+
+func initFlow(ctx context.Context, cfg *config.Config, _gpt gpt.Gpt, mem memory.Memory,
+	_tool tool.Tool, _agent agent.Agent) (flow.Flow, error) {
 	c := flow.DefaultConfig()
 	if c == nil {
 		return nil, errors.New("failed to config\n")
@@ -172,6 +207,7 @@ func initFlow(ctx context.Context, cfg *config.Config, _gpt gpt.Gpt, mem memory.
 	c.Gpt = _gpt
 	c.Memory = mem
 	c.Tool = _tool
+	c.Agent = _agent
 
 	return flow.New(ctx, c), nil
 }

cmd/root_test.go

@@ -57,6 +57,13 @@ func TestInitGpt(t *testing.T) {
 	assert.Equal(t, nil, err)
 }
 
+func TestInitPrompt(t *testing.T) {
+	ctx := context.Background()
+
+	_, err := initPrompt(ctx, &testConfig)
+	assert.Equal(t, nil, err)
+}
+
 func TestInitStore(t *testing.T) {
 	ctx := context.Background()
 
@@ -82,17 +89,30 @@ func TestInitTool(t *testing.T) {
 	assert.Equal(t, nil, err)
 }
 
+func TestInitAgent(t *testing.T) {
+	ctx := context.Background()
+
+	g, _ := initGpt(ctx, &testConfig)
+	p, _ := initPrompt(ctx, &testConfig)
+	_t, _ := initTool(ctx, &testConfig, g)
+
+	_, err := initAgent(ctx, &testConfig, g, p, _t)
+	assert.Equal(t, nil, err)
+}
+
 func TestInitFlow(t *testing.T) {
 	ctx := context.Background()
 
 	listenPort = ":8080"
 
 	g, _ := initGpt(ctx, &testConfig)
+	p, _ := initPrompt(ctx, &testConfig)
 	s, _ := initStore(ctx, &testConfig)
 	m, _ := initMemory(ctx, &testConfig, s)
 	_t, _ := initTool(ctx, &testConfig, g)
+	a, _ := initAgent(ctx, &testConfig, g, p, _t)
 
-	_, err := initFlow(ctx, &testConfig, g, m, _t)
+	_, err := initFlow(ctx, &testConfig, g, m, _t, a)
 	assert.Equal(t, nil, err)
 }
 

flow/flow.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/pkg/errors"
 
+	"github.com/ai-flowx/flowx/agent"
 	"github.com/ai-flowx/flowx/gpt"
 	"github.com/ai-flowx/flowx/memory"
 	"github.com/ai-flowx/flowx/tool"
@@ -26,6 +27,7 @@ type Config struct {
 	Gpt     gpt.Gpt
 	Memory  memory.Memory
 	Tool    tool.Tool
+	Agent   agent.Agent
 }
 
 type flow struct {