fix: string content

zhu327 · Dec 30, 2023 · f519857 · f519857
1 parent 44be210
commit f519857
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/pkg/adapter/chat.go b/pkg/adapter/chat.go
@@ -49,7 +49,7 @@ func (g *GeminiProAdapter) GenerateContent(
 	cs := model.StartChat()
 	setGenaiChatByOpenaiRequest(cs, req)
 
-	prompt := genai.Text(req.Messages[len(req.Messages)-1].Content)
+	prompt := genai.Text(req.Messages[len(req.Messages)-1].StringContent())
 	genaiResp, err := cs.SendMessage(ctx, prompt)
 	if err != nil {
 		return nil, errors.Wrap(err, "genai send message error")
@@ -69,7 +69,7 @@ func (g *GeminiProAdapter) GenerateStreamContent(
 	cs := model.StartChat()
 	setGenaiChatByOpenaiRequest(cs, req)
 
-	prompt := genai.Text(req.Messages[len(req.Messages)-1].Content)
+	prompt := genai.Text(req.Messages[len(req.Messages)-1].StringContent())
 	iter := cs.SendMessageStream(ctx, prompt)
 
 	dataChan := make(chan string)
@@ -272,7 +272,7 @@ func setGenaiChatByOpenaiRequest(cs *genai.ChatSession, req *ChatCompletionReque
 				cs.History = append(cs.History, []*genai.Content{
 					{
 						Parts: []genai.Part{
-							genai.Text(message.Content),
+							genai.Text(message.StringContent()),
 						},
 						Role: genaiRoleUser,
 					},
@@ -286,14 +286,14 @@ func setGenaiChatByOpenaiRequest(cs *genai.ChatSession, req *ChatCompletionReque
 			case openai.ChatMessageRoleAssistant:
 				cs.History = append(cs.History, &genai.Content{
 					Parts: []genai.Part{
-						genai.Text(message.Content),
+						genai.Text(message.StringContent()),
 					},
 					Role: genaiRoleModel,
 				})
 			case openai.ChatMessageRoleUser:
 				cs.History = append(cs.History, &genai.Content{
 					Parts: []genai.Part{
-						genai.Text(message.Content),
+						genai.Text(message.StringContent()),
 					},
 					Role: genaiRoleUser,
 				})

diff --git a/pkg/adapter/struct.go b/pkg/adapter/struct.go
@@ -2,6 +2,7 @@ package adapter
 
 import (
 	"encoding/json"
+	"strings"
 
 	"github.com/pkg/errors"
 	openai "github.com/sashabaranov/go-openai"
@@ -12,6 +13,10 @@ type ChatCompletionMessage struct {
 	Content json.RawMessage `json:"content"`
 }
 
+func (m *ChatCompletionMessage) StringContent() string {
+	return strings.Trim(string(m.Content), "\"")
+}
+
 func (m *ChatCompletionMessage) MultiContent() (parts []openai.ChatMessagePart, err error) {
 	err = json.Unmarshal(m.Content, &parts)
 	if err != nil {