Merge branch 'release/v1.5.6'

Author: bububa

agents/agent.go

@@ -694,36 +694,31 @@ func (a *Agent[I, O]) Run(ctx context.Context, userInput *I, output *O, apiResp
 		}
 		return err
 	}
-	mode := a.client.Mode()
-	if mode == instructor.ModeToolCall || mode == instructor.ModeToolCallStrict {
-		a.memory.NewMessage(components.FunctionRole, *output)
-	} else {
-		msg := components.NewMessage(components.AssistantRole, *output)
-		msg.SetMode(a.client.Mode())
-		switch t := apiResp.Details.(type) {
-		case *openai.ChatCompletionResponse:
-			if len(t.Choices) > 0 {
-				msg.SetRaw(t.Choices[0].Message.Content)
-			}
-		case *anthropic.CompleteResponse:
-			msg.SetRaw(t.Completion)
-		case *cohere.NonStreamedChatResponse:
-			msg.SetRaw(t.Text)
-		case *geminiAPI.GenerateContentResponse:
-			for _, candidate := range t.Candidates {
-				if candidate == nil {
-					continue
-				}
-				for _, part := range candidate.Content.Parts {
-					if txt := part.Text; txt != "" {
-						msg.SetRaw(txt)
-						break
-					}
+	msg := components.NewMessage(components.AssistantRole, *output)
+	msg.SetMode(a.client.Mode())
+	switch t := apiResp.Details.(type) {
+	case *openai.ChatCompletionResponse:
+		if len(t.Choices) > 0 {
+			msg.SetRaw(t.Choices[0].Message.Content)
+		}
+	case *anthropic.CompleteResponse:
+		msg.SetRaw(t.Completion)
+	case *cohere.NonStreamedChatResponse:
+		msg.SetRaw(t.Text)
+	case *geminiAPI.GenerateContentResponse:
+		for _, candidate := range t.Candidates {
+			if candidate == nil {
+				continue
+			}
+			for _, part := range candidate.Content.Parts {
+				if txt := part.Text; txt != "" {
+					msg.SetRaw(txt)
+					break
 				}
 			}
 		}
-    a.memory.AddMessage(msg)
 	}
+	a.memory.AddMessage(msg)
 	if fn := a.endHook; fn != nil {
 		fn(ctx, a, userInput, output, apiResp)
 	}

components/message.go

@@ -3,7 +3,6 @@ package components
 import (
 	"bytes"
 	"encoding/base64"
-	"encoding/json"
 	"errors"
 	"fmt"
 	"image"
@@ -448,18 +447,6 @@ func (m Message) toGemini(dist *gemini.Content, idx int) error {
 		}
 	}
 	dist.Role = src.role
-	if dist.Role == FunctionRole {
-		bs := schema.ToBytes(src.content)
-		resp := make(map[string]any)
-		if err := json.Unmarshal(bs, &resp); err == nil {
-			dist.Parts = append(dist.Parts, &gemini.Part{
-				FunctionResponse: &gemini.FunctionResponse{
-					Response: resp,
-				},
-			})
-			return nil
-		}
-	}
 	txt := m.TryAttachChunkPrompt(idx)
 	dist.Parts = append(dist.Parts, &gemini.Part{Text: txt})
 	if attachement := src.Attachement(); attachement != nil && len(attachement.ImageURLs) > 0 {

go.mod

@@ -10,7 +10,7 @@ require (
 	github.com/PuerkitoBio/goquery v1.10.3
 	github.com/aws/aws-sdk-go-v2 v1.36.3
 	github.com/aws/aws-sdk-go-v2/service/s3 v1.79.4
-	github.com/bububa/instructor-go v1.4.6
+	github.com/bububa/instructor-go v1.4.7
 	github.com/bububa/mdencoder v1.0.1
 	github.com/clipperhouse/uax29 v1.14.3
 	github.com/cohere-ai/cohere-go/v2 v2.14.1

go.sum

@@ -47,8 +47,8 @@ github.com/brianvoe/gofakeit/v7 v7.2.1 h1:AGojgaaCdgq4Adzrd2uWdbGNDyX6MWNhHdQBra
 github.com/brianvoe/gofakeit/v7 v7.2.1/go.mod h1:QXuPeBw164PJCzCUZVmgpgHJ3Llj49jSLVkKPMtxtxA=
 github.com/bububa/go-openai v1.0.6 h1:ty+WZWhGJ1/6xfGFzgZOnC3H7jdUlQoRebdnwxDVgGQ=
 github.com/bububa/go-openai v1.0.6/go.mod h1:lj5b/K+zjTSFxVLijLSTDZuP7adOgerWeFyZLUhAKRg=
-github.com/bububa/instructor-go v1.4.6 h1:LNN13J5PqBGS9dat7yZRurXEOWdjNIhDbbGyCCzApYA=
-github.com/bububa/instructor-go v1.4.6/go.mod h1:R8rAed36bnpI1jTh3pFm/ch97Ndx0ZpOgh8a/ThvRr4=
+github.com/bububa/instructor-go v1.4.7 h1:COAiCIc6yJBxEP9ddY2z162uYhmSX8JrE99WYao5t2I=
+github.com/bububa/instructor-go v1.4.7/go.mod h1:R8rAed36bnpI1jTh3pFm/ch97Ndx0ZpOgh8a/ThvRr4=
 github.com/bububa/ljson v1.0.1 h1:KyymkUrbsKQtd9yDYNQ6BIiupievR/7Ol1MPK3VVLgc=
 github.com/bububa/ljson v1.0.1/go.mod h1:V0iyqxoher3R2bQKk7uIpNkbogt8MAqe+hyS8WLlYsc=
 github.com/bububa/mdencoder v1.0.1 h1:RN9T4MZlauww1gTzHKcagWtO8p6JVvvUUCRqxqvkhkE=