use require package

Author: WillMatthews

complete.go

@@ -36,7 +36,7 @@ type CompleteResponse struct {
 	Type       string `json:"type"`
 	ID         string `json:"id"`
 	Completion string `json:"completion"`
-	// possible values are: stop_sequence、max_tokens、null
+	// possible values are: stop_sequence, max_tokens, null
 	StopReason string `json:"stop_reason"`
 	Model      Model  `json:"model"`
 }

complete_stream_test.go

@@ -10,13 +10,15 @@ import (
 
 	"github.com/liushuangls/go-anthropic/v2"
 	"github.com/liushuangls/go-anthropic/v2/internal/test"
+	"github.com/stretchr/testify/require"
 )
 
 var (
 	testCompletionStreamContent = []string{"My", " name", " is", " Claude", "."}
 )
 
 func TestCompleteStream(t *testing.T) {
+	is := require.New(t)
 	server := test.NewTestServer()
 	server.RegisterHandler("/v1/complete", handlerCompleteStream)
 
@@ -38,26 +40,21 @@ func TestCompleteStream(t *testing.T) {
 		},
 		OnCompletion: func(data anthropic.CompleteResponse) {
 			receivedContent += data.Completion
-			//t.Logf("CreateCompleteStream OnCompletion data: %+v", data)
 		},
 		OnPing:  func(data anthropic.CompleteStreamPingData) {},
 		OnError: func(response anthropic.ErrorResponse) {},
 	})
-	if err != nil {
-		t.Fatalf("CreateCompleteStream error: %s", err)
-	}
+	is.NoError(err)
 
 	expected := strings.Join(testCompletionStreamContent, "")
-	if receivedContent != expected {
-		t.Fatalf("CreateCompleteStream content not match expected: %s, got: %s", expected, receivedContent)
-	}
-	if resp.Completion != expected {
-		t.Fatalf("CreateCompleteStream content not match expected: %s, got: %s", expected, resp.Completion)
-	}
+	is.Equal(expected, receivedContent)
+	is.Equal(expected, resp.Completion)
+
 	t.Logf("CreateCompleteStream resp: %+v", resp)
 }
 
 func TestCompleteStreamError(t *testing.T) {
+	is := require.New(t)
 	server := test.NewTestServer()
 	server.RegisterHandler("/v1/complete", handlerCompleteStream)
 
@@ -76,25 +73,20 @@ func TestCompleteStreamError(t *testing.T) {
 			Model:             anthropic.ModelClaudeInstant1Dot2,
 			Prompt:            "\n\nHuman: What is your name?\n\nAssistant:",
 			MaxTokensToSample: 1000,
-			//Temperature:       &temperature,
 		},
 		OnCompletion: func(data anthropic.CompleteResponse) {
 			receivedContent += data.Completion
-			//t.Logf("CreateCompleteStream OnCompletion data: %+v", data)
 		},
 		OnPing:  func(data anthropic.CompleteStreamPingData) {},
 		OnError: func(response anthropic.ErrorResponse) {},
 	}
 	param.SetTemperature(2)
 	_, err := client.CreateCompleteStream(context.Background(), param)
-	if err == nil {
-		t.Fatal("should error")
-	}
+	is.Error(err)
+	is.Contains(err.Error(), "Overloaded")
 
 	var e *anthropic.APIError
-	if !errors.As(err, &e) {
-		t.Fatal("should api error")
-	}
+	is.True(errors.As(err, &e), "should api error")
 
 	t.Logf("CreateCompleteStream error: %+v", err)
 }

complete_test.go

@@ -11,9 +11,11 @@ import (
 
 	"github.com/liushuangls/go-anthropic/v2"
 	"github.com/liushuangls/go-anthropic/v2/internal/test"
+	"github.com/stretchr/testify/require"
 )
 
 func TestComplete(t *testing.T) {
+	is := require.New(t)
 	server := test.NewTestServer()
 	server.RegisterHandler("/v1/complete", handleCompleteEndpoint)
 
@@ -30,9 +32,7 @@ func TestComplete(t *testing.T) {
 			Prompt:            "\n\nHuman: What is your name?\n\nAssistant:",
 			MaxTokensToSample: 1000,
 		})
-		if err != nil {
-			t.Fatalf("CreateComplete error: %v", err)
-		}
+		is.NoError(err)
 
 		t.Logf("Create Complete resp: %+v", resp)
 	})
@@ -44,55 +44,51 @@ func TestComplete(t *testing.T) {
 			Prompt:            "\n\nHuman: What is your name?\n\nAssistant:",
 			MaxTokensToSample: 1000,
 		})
-		if err == nil {
-			t.Fatalf("CreateComplete expected error, got nil")
-		}
+		is.Error(err)
+		is.Contains(err.Error(), "401")
 	})
 }
 
 func TestSetTemperature(t *testing.T) {
+	is := require.New(t)
 	cr := anthropic.CompleteRequest{
 		Model:             anthropic.ModelClaudeInstant1Dot2,
 		Prompt:            "\n\nHuman: What is your name?\n\nAssistant:",
 		MaxTokensToSample: 1000,
 	}
 
 	temp := float32(0.5)
-
 	cr.SetTemperature(temp)
-	if *cr.Temperature != temp {
-		t.Fatalf("SetTemperature failed: %v", cr.Temperature)
-	}
+
+	is.Equal(temp, *cr.Temperature)
 }
 
 func TestSetTopP(t *testing.T) {
+	is := require.New(t)
 	cr := anthropic.CompleteRequest{
 		Model:             anthropic.ModelClaudeInstant1Dot2,
 		Prompt:            "\n\nHuman: What is your name?\n\nAssistant:",
 		MaxTokensToSample: 1000,
 	}
 
 	topP := float32(0.5)
-
 	cr.SetTopP(topP)
-	if *cr.TopP != topP {
-		t.Fatalf("SetTopP failed: %v", cr.TopP)
-	}
+
+	is.Equal(topP, *cr.TopP)
 }
 
 func TestSetTopK(t *testing.T) {
+	is := require.New(t)
 	cr := anthropic.CompleteRequest{
 		Model:             anthropic.ModelClaudeInstant1Dot2,
 		Prompt:            "\n\nHuman: What is your name?\n\nAssistant:",
 		MaxTokensToSample: 1000,
 	}
 
 	topK := 5
-
 	cr.SetTopK(topK)
-	if *cr.TopK != topK {
-		t.Fatalf("SetTopK failed: %v", cr.TopK)
-	}
+
+	is.Equal(topK, *cr.TopK)
 }
 
 func handleCompleteEndpoint(w http.ResponseWriter, r *http.Request) {

error_test.go

@@ -4,9 +4,11 @@ import (
 	"testing"
 
 	"github.com/liushuangls/go-anthropic/v2"
+	"github.com/stretchr/testify/require"
 )
 
 func TestIsXError(t *testing.T) {
+	is := require.New(t)
 	countBool := func(bools []bool) int {
 		count := 0
 		for _, b := range bools {
@@ -53,13 +55,9 @@ func TestIsXError(t *testing.T) {
 
 		// Expect only one error type to be true for each error
 		numErrorType := countBool(isErrorType)
-		if numErrorType != 1 {
-			t.Errorf("Expected 1 error type to be true, got %d, for error %d", numErrorType, i)
-		}
+		is.Equal(1, numErrorType, "Expected 1 error type to be true, got %d, for error %T", numErrorType, i)
 
 		// Expect the error type to be true for the correct error
-		if !isErrorType[i] {
-			t.Errorf("Expected error type %T to be true, got false", e)
-		}
+		is.True(isErrorType[i], "Expected error type %T to be true, got false", e)
 	}
 }

go.mod

@@ -1,3 +1,11 @@
 module github.com/liushuangls/go-anthropic/v2
 
 go 1.21
+
+require github.com/stretchr/testify v1.9.0
+
+require (
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+)

go.sum

@@ -0,0 +1,10 @@
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
+github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

message.go

@@ -59,7 +59,6 @@ func (m MessagesRequest) MarshalJSON() ([]byte, error) {
 		Alias: (Alias)(m),
 	}
 
-	// 根据 MultiSystem 是否为空来设置 system 字段
 	if len(m.MultiSystem) > 0 {
 		aux.System = m.MultiSystem
 	} else if len(m.System) > 0 {
@@ -317,7 +316,7 @@ type MessagesUsage struct {
 	// The number of tokens written to the cache when creating a new entry.
 	CacheCreationInputTokens int `json:"cache_creation_input_tokens,omitempty"`
 	// The number of tokens retrieved from the cache for associated request.
-	CacheReadInputTokens     int `json:"cache_read_input_tokens,omitempty"`
+	CacheReadInputTokens int `json:"cache_read_input_tokens,omitempty"`
 }
 
 type ToolDefinition struct {