Merge pull request #11 from neurocult/experimental

Add streaming

Author: emil14

agency.go

@@ -37,7 +37,7 @@ func NewOperation(handler OperationHandler) *Operation {
 func (p *Operation) Execute(ctx context.Context, input Message) (Message, error) {
 	output, err := p.handler(ctx, input, p.config)
 	if err != nil {
-		return Message{}, err
+		return nil, err
 	}
 	return output, nil
 }

examples/chat/main.go

@@ -30,7 +30,7 @@ func main() {
 			panic(err)
 		}
 
-		input := agency.UserMessage(text)
+		input := agency.NewMessage(agency.UserRole, agency.TextKind, []byte(text))
 		answer, err := assistant.SetMessages(messages).Execute(ctx, input)
 		if err != nil {
 			panic(err)

examples/cli/main.go

@@ -38,7 +38,7 @@ func main() {
 			MaxTokens:   *maxTokens,
 		}).
 		SetPrompt(*prompt).
-		Execute(context.Background(), agency.UserMessage(content))
+		Execute(context.Background(), agency.NewMessage(agency.UserRole, agency.TextKind, []byte(content)))
 
 	if err != nil {
 		fmt.Println(err)

examples/completion_streaming/main.go

@@ -13,7 +13,7 @@ func main() {
 
 	msg, err := agency.NewProcess(
 		increment, increment, increment,
-	).Execute(context.Background(), agency.UserMessage("0"))
+	).Execute(context.Background(), agency.NewMessage(agency.UserRole, agency.TextKind, []byte("0")))
 
 	if err != nil {
 		panic(err)
@@ -23,10 +23,10 @@ func main() {
 }
 
 func incrementFunc(ctx context.Context, msg agency.Message, _ *agency.OperationConfig) (agency.Message, error) {
-	i, err := strconv.ParseInt(string(msg.Content), 10, 10)
+	i, err := strconv.ParseInt(string(msg.Content()), 10, 10)
 	if err != nil {
-		return agency.Message{}, err
+		return nil, err
 	}
 	inc := strconv.Itoa(int(i) + 1)
-	return agency.SystemMessage(inc), nil
+	return agency.NewMessage(agency.ToolRole, agency.TextKind, []byte(inc)), nil
 }

examples/custom_operation/main.go

@@ -23,8 +23,8 @@ func main() {
 				{
 					Name:        "GetMeaningOfLife",
 					Description: "Answer questions about meaning of life",
-					Body: func(ctx context.Context, _ []byte) (any, error) {
-						return 42, nil
+					Body: func(ctx context.Context, _ []byte) (agency.Message, error) {
+						return agency.NewTextMessage(agency.ToolRole, "42"), nil
 					},
 				},
 				// function with parameters
@@ -38,12 +38,15 @@ func main() {
 							"b": {Type: "integer"},
 						},
 					},
-					Body: func(ctx context.Context, params []byte) (any, error) {
+					Body: func(ctx context.Context, params []byte) (agency.Message, error) {
 						var pp struct{ A, B int }
 						if err := json.Unmarshal(params, &pp); err != nil {
 							return nil, err
 						}
-						return (pp.A + pp.B) * 10, nil // *10 is just to distinguish from normal response
+						return agency.NewTextMessage(
+							agency.ToolRole,
+							fmt.Sprintf("%d", (pp.A+pp.B)*10),
+						), nil // *10 is just to distinguish from normal response
 					},
 				},
 			},
@@ -64,30 +67,34 @@ Examples:
 	// test for first function call
 	answer, err := t2tOp.Execute(
 		ctx,
-		agency.UserMessage("what is the meaning of life?"),
+		agency.NewMessage(agency.UserRole, agency.TextKind, []byte("what is the meaning of life?")),
 	)
 	if err != nil {
 		panic(err)
 	}
-	fmt.Println(answer)
+	printAnswer(answer)
 
 	// test for second function call
 	answer, err = t2tOp.Execute(
 		ctx,
-		agency.UserMessage("1+1?"),
+		agency.NewMessage(agency.UserRole, agency.TextKind, []byte("1+1?")),
 	)
 	if err != nil {
 		panic(err)
 	}
-	fmt.Println(answer)
+	printAnswer(answer)
 
 	// test for both function calls at the same time
 	answer, err = t2tOp.Execute(
 		ctx,
-		agency.UserMessage("1+1 and what is the meaning of life?"),
+		agency.NewMessage(agency.UserRole, agency.TextKind, []byte("1+1 and what is the meaning of life?")),
 	)
 	if err != nil {
 		panic(err)
 	}
-	fmt.Println(answer)
+	printAnswer(answer)
+}
+
+func printAnswer(message agency.Message) {
+	fmt.Printf("Role: %s; Type: %s; Data: %s\n", message.Role(), message.Kind(), agency.GetStringContent(message))
 }

examples/func_call/main.go

@@ -0,0 +1,35 @@
+package main
+
+import (
+	"context"
+	"fmt"
+	"os"
+
+	_ "github.com/joho/godotenv/autoload"
+	"github.com/neurocult/agency"
+
+	providers "github.com/neurocult/agency/providers/openai"
+)
+
+func main() {
+	imgBytes, err := os.ReadFile("assets/test.jpg")
+	if err != nil {
+		panic(err)
+	}
+
+	_, err = providers.New(providers.Params{Key: os.Getenv("OPENAI_API_KEY")}).
+		TextToStream(providers.TextToStreamParams{
+			TextToTextParams: providers.TextToTextParams{MaxTokens: 300, Model: "gpt-4o"},
+			StreamHandler: func(delta, total string, isFirst, isLast bool) error {
+				fmt.Println(delta)
+				return nil
+			}}).
+		SetPrompt("describe what you see").
+		Execute(
+			context.Background(),
+			agency.NewMessage(agency.UserRole, agency.ImageKind, imgBytes),
+		)
+	if err != nil {
+		panic(err)
+	}
+}

examples/image_to_stream/main.go

@@ -6,14 +6,13 @@ import (
 	"os"
 
 	_ "github.com/joho/godotenv/autoload"
-
 	"github.com/neurocult/agency"
 	openAIProvider "github.com/neurocult/agency/providers/openai"
 	"github.com/sashabaranov/go-openai"
 )
 
 func main() {
-	imgBytes, err := os.ReadFile("example.png")
+	imgBytes, err := os.ReadFile("../example.png")
 	if err != nil {
 		panic(err)
 	}
@@ -23,7 +22,7 @@ func main() {
 		SetPrompt("describe what you see").
 		Execute(
 			context.Background(),
-			agency.Message{Content: imgBytes},
+			agency.NewMessage(agency.UserRole, agency.ImageKind, imgBytes),
 		)
 	if err != nil {
 		panic(err)

examples/image_to_text/main.go

@@ -22,7 +22,7 @@ func main() {
 	).
 		Execute(
 			context.Background(),
-			agency.UserMessage("Kazakhstan alga!"),
+			agency.NewMessage(agency.UserRole, agency.TextKind, []byte("Kazakhstan alga!")),
 			Logger,
 		)
 

examples/logging/main.go

@@ -22,7 +22,7 @@ func main() {
 		).
 		Execute(
 			context.Background(),
-			agency.UserMessage("%s", "I love programming."),
+			agency.NewMessage(agency.UserRole, agency.TextKind, []byte("I love programming.")),
 		)
 
 	if err != nil {