Merge pull request #30 from yubing744/owen/support-claude-3-5-sonnet

feat: ok for support claude-3-5-sonnet

Author: yubing744

Makefile

@@ -1,7 +1,7 @@
 .PHONY: clean build unit-test run docker-* tag release
 
 NAME=trading-gpt
-VERSION=0.23.3
+VERSION=0.24.1
 
 clean:
 	rm -rf build/*

bbgo.yaml

@@ -33,12 +33,12 @@ exchangeStrategies:
         base_url: "https://api.deepseek.com"
         model: "deepseek-coder"
       anthropic:
-        model: "claude-3-sonnet-20240229"
+        model: "claude-3-5-sonnet-20240620"
       ollama:
         server_url: "http://localhost:11434"
         model: "wizardlm2:7b" # Options：wizardlm2:7b, codegemma:7b, llama3:latest, and mistral:latest
-      primary: "ollama"
-      secondly: "anthropic"
+      primary: "anthropic"
+      secondly: "ollama"
     env:
       exchange:
         kline_num: 50

go.mod

@@ -10,7 +10,7 @@ require (
 	github.com/joho/godotenv v1.5.1
 	github.com/kataras/go-events v0.0.3
 	github.com/larksuite/oapi-sdk-go/v3 v3.2.1
-	github.com/madebywelch/anthropic-go/v2 v2.1.8
+	github.com/madebywelch/anthropic-go/v2 v2.2.4
 	github.com/pkg/errors v0.9.1
 	github.com/sirupsen/logrus v1.9.3
 	github.com/stretchr/testify v1.9.0

go.sum

@@ -482,8 +482,8 @@ github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
 github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/lucasb-eyer/go-colorful v1.0.2/go.mod h1:0MS4r+7BZKSJ5mw4/S5MPN+qHFF1fYclkSPilDOKW0s=
-github.com/madebywelch/anthropic-go/v2 v2.1.8 h1:AcDFUaM0CVqE+TByn8zBcgMEgaIx4KHBz6Wp48anD0k=
-github.com/madebywelch/anthropic-go/v2 v2.1.8/go.mod h1:sXtJg4XROodT00PuOhpl5mXW7xhxNjb93B3oZnk8Yus=
+github.com/madebywelch/anthropic-go/v2 v2.2.4 h1:TXV6c3kpTMlsYeIiVmynQyJHKhnOOTAJiivIWPTP1rg=
+github.com/madebywelch/anthropic-go/v2 v2.2.4/go.mod h1:sXtJg4XROodT00PuOhpl5mXW7xhxNjb93B3oZnk8Yus=
 github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY=
 github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=

pkg/llms/anthropic/anthropic.go

@@ -80,23 +80,23 @@ func (o *LLM) GenerateContent(ctx context.Context, messages []llms.MessageConten
 
 	chatMsgs := make([]anthropic.MessagePartRequest, 0)
 	var lastRole llms.ChatMessageType
-	var buffer string
+	var tmpContentBlocks []anthropic.ContentBlock
 
 	for _, mc := range messages {
 		textMsg := joinTextParts(mc.Parts)
 
 		if mc.Role == lastRole && mc.Role == llms.ChatMessageTypeHuman {
-			buffer += "\r\n" + textMsg // Concatenate messages with a space
+			tmpContentBlocks = append(tmpContentBlocks, anthropic.NewTextContentBlock(textMsg))
 			continue
 		}
 
-		if buffer != "" {
+		if len(tmpContentBlocks) > 0 {
 			// Append the buffered message before starting a new one
 			chatMsgs = append(chatMsgs, anthropic.MessagePartRequest{
-				Content: buffer,
+				Content: tmpContentBlocks,
 				Role:    "user",
 			})
-			buffer = ""
+			tmpContentBlocks = make([]anthropic.ContentBlock, 0)
 		}
 
 		switch mc.Role {
@@ -105,22 +105,22 @@ func (o *LLM) GenerateContent(ctx context.Context, messages []llms.MessageConten
 			continue
 		case llms.ChatMessageTypeAI:
 			msg := anthropic.MessagePartRequest{
-				Content: textMsg,
+				Content: []anthropic.ContentBlock{anthropic.NewTextContentBlock(textMsg)},
 				Role:    "assistant",
 			}
 			chatMsgs = append(chatMsgs, msg)
 		case llms.ChatMessageTypeHuman:
-			buffer = textMsg // Start buffering user messages
+			tmpContentBlocks = append(tmpContentBlocks, anthropic.NewTextContentBlock(textMsg))
 		default:
 			return nil, fmt.Errorf("role %v not supported", mc.Role)
 		}
 
 		lastRole = mc.Role
 	}
 
-	if buffer != "" {
+	if len(tmpContentBlocks) > 0 {
 		chatMsgs = append(chatMsgs, anthropic.MessagePartRequest{
-			Content: buffer,
+			Content: tmpContentBlocks,
 			Role:    "user",
 		})
 	}