Merge branch 'sashabaranov:master' into master

goodenough227 · web-flow · commit e2226625ca34 · 2025-03-12T13:29:04.000+08:00
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -13,14 +13,14 @@ jobs:
     - name: Setup Go
       uses: actions/setup-go@v5
       with:
-        go-version: '1.21'
+        go-version: '1.24'
     - name: Run vet
       run: |
         go vet .
     - name: Run golangci-lint
-      uses: golangci/golangci-lint-action@v4
+      uses: golangci/golangci-lint-action@v6
       with:
-        version: latest
+        version: v1.64.5
     - name: Run tests
       run: go test -race -covermode=atomic -coverprofile=coverage.out -v .
     - name: Upload coverage reports to Codecov
diff --git a/.golangci.yml b/.golangci.yml
@@ -139,11 +139,6 @@ linters-settings:
     # Default: false
     all: true
 
-  varcheck:
-    # Check usage of exported fields and variables.
-    # Default: false
-    exported-fields: false # default false # TODO: enable after fixing false positives
-
 
 linters:
   disable-all: true
@@ -167,9 +162,7 @@ linters:
     - durationcheck # check for two durations multiplied together
     - errname # Checks that sentinel errors are prefixed with the Err and error types are suffixed with the Error.
     - errorlint # errorlint is a linter for that can be used to find code that will cause problems with the error wrapping scheme introduced in Go 1.13.
-    # Removed execinquery (deprecated). execinquery is a linter about query string checker in Query function which reads your Go src files and warning it finds
     - exhaustive # check exhaustiveness of enum switch statements
-    - exportloopref # checks for pointers to enclosing loop variables
     - forbidigo # Forbids identifiers
     - funlen # Tool for detection of long functions
     # - gochecknoglobals # check that no global variables exist
@@ -201,7 +194,6 @@ linters:
     - rowserrcheck # checks whether Err of rows is checked successfully
     - sqlclosecheck # Checks that sql.Rows and sql.Stmt are closed.
     - stylecheck # Stylecheck is a replacement for golint
-    - tenv # tenv is analyzer that detects using os.Setenv instead of t.Setenv since Go1.17
     - testpackage # linter that makes you use a separate _test package
     - tparallel # tparallel detects inappropriate usage of t.Parallel() method in your Go test codes
     - unconvert # Remove unnecessary type conversions
@@ -239,12 +231,6 @@ linters:
     #- tagliatelle # Checks the struct tags.
     #- thelper # thelper detects golang test helpers without t.Helper() call and checks the consistency of test helpers
     #- wsl # [too strict and mostly code is not more readable] Whitespace Linter - Forces you to use empty lines!
-    ## deprecated
-    #- exhaustivestruct # [deprecated, replaced by exhaustruct] Checks if all struct's fields are initialized
-    #- golint # [deprecated, replaced by revive] Golint differs from gofmt. Gofmt reformats Go source code, whereas golint prints out style mistakes
-    #- interfacer # [deprecated] Linter that suggests narrower interface types
-    #- maligned # [deprecated, replaced by govet fieldalignment] Tool to detect Go structs that would take less memory if their fields were sorted
-    #- scopelint # [deprecated, replaced by exportloopref] Scopelint checks for unpinned variables in go programs
 
 
 issues:
diff --git a/chat.go b/chat.go
@@ -14,6 +14,7 @@ const (
 	ChatMessageRoleAssistant = "assistant"
 	ChatMessageRoleFunction  = "function"
 	ChatMessageRoleTool      = "tool"
+	ChatMessageRoleDeveloper = "developer"
 )
 
 const chatCompletionsSuffix = "/chat/completions"
diff --git a/chat_test.go b/chat_test.go
@@ -106,40 +106,6 @@ func TestO1ModelsChatCompletionsBetaLimitations(t *testing.T) {
 			},
 			expectedError: openai.ErrReasoningModelLimitationsLogprobs,
 		},
-		{
-			name: "message_type_unsupported",
-			in: openai.ChatCompletionRequest{
-				MaxCompletionTokens: 1000,
-				Model:               openai.O1Mini,
-				Messages: []openai.ChatCompletionMessage{
-					{
-						Role: openai.ChatMessageRoleSystem,
-					},
-				},
-			},
-			expectedError: openai.ErrO1BetaLimitationsMessageTypes,
-		},
-		{
-			name: "tool_unsupported",
-			in: openai.ChatCompletionRequest{
-				MaxCompletionTokens: 1000,
-				Model:               openai.O1Mini,
-				Messages: []openai.ChatCompletionMessage{
-					{
-						Role: openai.ChatMessageRoleUser,
-					},
-					{
-						Role: openai.ChatMessageRoleAssistant,
-					},
-				},
-				Tools: []openai.Tool{
-					{
-						Type: openai.ToolTypeFunction,
-					},
-				},
-			},
-			expectedError: openai.ErrO1BetaLimitationsTools,
-		},
 		{
 			name: "set_temperature_unsupported",
 			in: openai.ChatCompletionRequest{
diff --git a/client.go b/client.go
@@ -182,13 +182,21 @@ func sendRequestStream[T streamable](client *Client, req *http.Request) (*stream
 
 func (c *Client) setCommonHeaders(req *http.Request) {
 	// https://learn.microsoft.com/en-us/azure/cognitive-services/openai/reference#authentication
-	// Azure API Key authentication
-	if c.config.APIType == APITypeAzure || c.config.APIType == APITypeCloudflareAzure {
+	switch c.config.APIType {
+	case APITypeAzure, APITypeCloudflareAzure:
+		// Azure API Key authentication
 		req.Header.Set(AzureAPIKeyHeader, c.config.authToken)
-	} else if c.config.authToken != "" {
-		// OpenAI or Azure AD authentication
-		req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", c.config.authToken))
+	case APITypeAnthropic:
+		// https://docs.anthropic.com/en/api/versioning
+		req.Header.Set("anthropic-version", c.config.APIVersion)
+	case APITypeOpenAI, APITypeAzureAD:
+		fallthrough
+	default:
+		if c.config.authToken != "" {
+			req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", c.config.authToken))
+		}
 	}
+
 	if c.config.OrgID != "" {
 		req.Header.Set("OpenAI-Organization", c.config.OrgID)
 	}
diff --git a/client_test.go b/client_test.go
@@ -39,6 +39,21 @@ func TestClient(t *testing.T) {
 	}
 }
 
+func TestSetCommonHeadersAnthropic(t *testing.T) {
+	config := DefaultAnthropicConfig("mock-token", "")
+	client := NewClientWithConfig(config)
+	req, err := http.NewRequest("GET", "http://example.com", nil)
+	if err != nil {
+		t.Fatalf("Failed to create request: %v", err)
+	}
+
+	client.setCommonHeaders(req)
+
+	if got := req.Header.Get("anthropic-version"); got != AnthropicAPIVersion {
+		t.Errorf("Expected anthropic-version header to be %q, got %q", AnthropicAPIVersion, got)
+	}
+}
+
 func TestDecodeResponse(t *testing.T) {
 	stringInput := ""
 
diff --git a/completion.go b/completion.go
@@ -10,41 +10,43 @@ import (
 // GPT3 Models are designed for text-based tasks. For code-specific
 // tasks, please refer to the Codex series of models.
 const (
-	O1Mini                = "o1-mini"
-	O1Mini20240912        = "o1-mini-2024-09-12"
-	O1Preview             = "o1-preview"
-	O1Preview20240912     = "o1-preview-2024-09-12"
-	O1                    = "o1"
-	O120241217            = "o1-2024-12-17"
-	O3Mini                = "o3-mini"
-	O3Mini20250131        = "o3-mini-2025-01-31"
-	GPT432K0613           = "gpt-4-32k-0613"
-	GPT432K0314           = "gpt-4-32k-0314"
-	GPT432K               = "gpt-4-32k"
-	GPT40613              = "gpt-4-0613"
-	GPT40314              = "gpt-4-0314"
-	GPT4o                 = "gpt-4o"
-	GPT4o20240513         = "gpt-4o-2024-05-13"
-	GPT4o20240806         = "gpt-4o-2024-08-06"
-	GPT4o20241120         = "gpt-4o-2024-11-20"
-	GPT4oLatest           = "chatgpt-4o-latest"
-	GPT4oMini             = "gpt-4o-mini"
-	GPT4oMini20240718     = "gpt-4o-mini-2024-07-18"
-	GPT4Turbo             = "gpt-4-turbo"
-	GPT4Turbo20240409     = "gpt-4-turbo-2024-04-09"
-	GPT4Turbo0125         = "gpt-4-0125-preview"
-	GPT4Turbo1106         = "gpt-4-1106-preview"
-	GPT4TurboPreview      = "gpt-4-turbo-preview"
-	GPT4VisionPreview     = "gpt-4-vision-preview"
-	GPT4                  = "gpt-4"
-	GPT3Dot5Turbo0125     = "gpt-3.5-turbo-0125"
-	GPT3Dot5Turbo1106     = "gpt-3.5-turbo-1106"
-	GPT3Dot5Turbo0613     = "gpt-3.5-turbo-0613"
-	GPT3Dot5Turbo0301     = "gpt-3.5-turbo-0301"
-	GPT3Dot5Turbo16K      = "gpt-3.5-turbo-16k"
-	GPT3Dot5Turbo16K0613  = "gpt-3.5-turbo-16k-0613"
-	GPT3Dot5Turbo         = "gpt-3.5-turbo"
-	GPT3Dot5TurboInstruct = "gpt-3.5-turbo-instruct"
+	O1Mini                  = "o1-mini"
+	O1Mini20240912          = "o1-mini-2024-09-12"
+	O1Preview               = "o1-preview"
+	O1Preview20240912       = "o1-preview-2024-09-12"
+	O1                      = "o1"
+	O120241217              = "o1-2024-12-17"
+	O3Mini                  = "o3-mini"
+	O3Mini20250131          = "o3-mini-2025-01-31"
+	GPT432K0613             = "gpt-4-32k-0613"
+	GPT432K0314             = "gpt-4-32k-0314"
+	GPT432K                 = "gpt-4-32k"
+	GPT40613                = "gpt-4-0613"
+	GPT40314                = "gpt-4-0314"
+	GPT4o                   = "gpt-4o"
+	GPT4o20240513           = "gpt-4o-2024-05-13"
+	GPT4o20240806           = "gpt-4o-2024-08-06"
+	GPT4o20241120           = "gpt-4o-2024-11-20"
+	GPT4oLatest             = "chatgpt-4o-latest"
+	GPT4oMini               = "gpt-4o-mini"
+	GPT4oMini20240718       = "gpt-4o-mini-2024-07-18"
+	GPT4Turbo               = "gpt-4-turbo"
+	GPT4Turbo20240409       = "gpt-4-turbo-2024-04-09"
+	GPT4Turbo0125           = "gpt-4-0125-preview"
+	GPT4Turbo1106           = "gpt-4-1106-preview"
+	GPT4TurboPreview        = "gpt-4-turbo-preview"
+	GPT4VisionPreview       = "gpt-4-vision-preview"
+	GPT4                    = "gpt-4"
+	GPT4Dot5Preview         = "gpt-4.5-preview"
+	GPT4Dot5Preview20250227 = "gpt-4.5-preview-2025-02-27"
+	GPT3Dot5Turbo0125       = "gpt-3.5-turbo-0125"
+	GPT3Dot5Turbo1106       = "gpt-3.5-turbo-1106"
+	GPT3Dot5Turbo0613       = "gpt-3.5-turbo-0613"
+	GPT3Dot5Turbo0301       = "gpt-3.5-turbo-0301"
+	GPT3Dot5Turbo16K        = "gpt-3.5-turbo-16k"
+	GPT3Dot5Turbo16K0613    = "gpt-3.5-turbo-16k-0613"
+	GPT3Dot5Turbo           = "gpt-3.5-turbo"
+	GPT3Dot5TurboInstruct   = "gpt-3.5-turbo-instruct"
 	// Deprecated: Model is shutdown. Use gpt-3.5-turbo-instruct instead.
 	GPT3TextDavinci003 = "text-davinci-003"
 	// Deprecated: Model is shutdown. Use gpt-3.5-turbo-instruct instead.
@@ -85,38 +87,40 @@ const (
 
 var disabledModelsForEndpoints = map[string]map[string]bool{
 	"/completions": {
-		O1Mini:               true,
-		O1Mini20240912:       true,
-		O1Preview:            true,
-		O1Preview20240912:    true,
-		O3Mini:               true,
-		O3Mini20250131:       true,
-		GPT3Dot5Turbo:        true,
-		GPT3Dot5Turbo0301:    true,
-		GPT3Dot5Turbo0613:    true,
-		GPT3Dot5Turbo1106:    true,
-		GPT3Dot5Turbo0125:    true,
-		GPT3Dot5Turbo16K:     true,
-		GPT3Dot5Turbo16K0613: true,
-		GPT4:                 true,
-		GPT4o:                true,
-		GPT4o20240513:        true,
-		GPT4o20240806:        true,
-		GPT4o20241120:        true,
-		GPT4oLatest:          true,
-		GPT4oMini:            true,
-		GPT4oMini20240718:    true,
-		GPT4TurboPreview:     true,
-		GPT4VisionPreview:    true,
-		GPT4Turbo1106:        true,
-		GPT4Turbo0125:        true,
-		GPT4Turbo:            true,
-		GPT4Turbo20240409:    true,
-		GPT40314:             true,
-		GPT40613:             true,
-		GPT432K:              true,
-		GPT432K0314:          true,
-		GPT432K0613:          true,
+		O1Mini:                  true,
+		O1Mini20240912:          true,
+		O1Preview:               true,
+		O1Preview20240912:       true,
+		O3Mini:                  true,
+		O3Mini20250131:          true,
+		GPT3Dot5Turbo:           true,
+		GPT3Dot5Turbo0301:       true,
+		GPT3Dot5Turbo0613:       true,
+		GPT3Dot5Turbo1106:       true,
+		GPT3Dot5Turbo0125:       true,
+		GPT3Dot5Turbo16K:        true,
+		GPT3Dot5Turbo16K0613:    true,
+		GPT4:                    true,
+		GPT4Dot5Preview:         true,
+		GPT4Dot5Preview20250227: true,
+		GPT4o:                   true,
+		GPT4o20240513:           true,
+		GPT4o20240806:           true,
+		GPT4o20241120:           true,
+		GPT4oLatest:             true,
+		GPT4oMini:               true,
+		GPT4oMini20240718:       true,
+		GPT4TurboPreview:        true,
+		GPT4VisionPreview:       true,
+		GPT4Turbo1106:           true,
+		GPT4Turbo0125:           true,
+		GPT4Turbo:               true,
+		GPT4Turbo20240409:       true,
+		GPT40314:                true,
+		GPT40613:                true,
+		GPT432K:                 true,
+		GPT432K0314:             true,
+		GPT432K0613:             true,
 	},
 	chatCompletionsSuffix: {
 		CodexCodeDavinci002:     true,
diff --git a/config.go b/config.go
@@ -11,6 +11,8 @@ const (
 
 	azureAPIPrefix         = "openai"
 	azureDeploymentsPrefix = "deployments"
+
+	AnthropicAPIVersion = "2023-06-01"
 )
 
 type APIType string
@@ -20,6 +22,7 @@ const (
 	APITypeAzure           APIType = "AZURE"
 	APITypeAzureAD         APIType = "AZURE_AD"
 	APITypeCloudflareAzure APIType = "CLOUDFLARE_AZURE"
+	APITypeAnthropic       APIType = "ANTHROPIC"
 )
 
 const AzureAPIKeyHeader = "api-key"
@@ -37,7 +40,7 @@ type ClientConfig struct {
 	BaseURL              string
 	OrgID                string
 	APIType              APIType
-	APIVersion           string // required when APIType is APITypeAzure or APITypeAzureAD
+	APIVersion           string // required when APIType is APITypeAzure or APITypeAzureAD or APITypeAnthropic
 	AssistantVersion     string
 	AzureModelMapperFunc func(model string) string // replace model to azure deployment name func
 	HTTPClient           HTTPDoer
@@ -76,6 +79,23 @@ func DefaultAzureConfig(apiKey, baseURL string) ClientConfig {
 	}
 }
 
+func DefaultAnthropicConfig(apiKey, baseURL string) ClientConfig {
+	if baseURL == "" {
+		baseURL = "https://api.anthropic.com/v1"
+	}
+	return ClientConfig{
+		authToken:  apiKey,
+		BaseURL:    baseURL,
+		OrgID:      "",
+		APIType:    APITypeAnthropic,
+		APIVersion: AnthropicAPIVersion,
+
+		HTTPClient: &http.Client{},
+
+		EmptyMessagesLimit: defaultEmptyMessagesLimit,
+	}
+}
+
 func (ClientConfig) String() string {
 	return "<OpenAI API ClientConfig>"
 }
diff --git a/config_test.go b/config_test.go
diff --git a/messages.go b/messages.go
diff --git a/reasoning_validator.go b/reasoning_validator.go

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ const (`
`14`	`14`	`ChatMessageRoleAssistant = "assistant"`
`15`	`15`	`ChatMessageRoleFunction = "function"`
`16`	`16`	`ChatMessageRoleTool = "tool"`
	`17`	`+ ChatMessageRoleDeveloper = "developer"`
`17`	`18`	`)`
`18`	`19`
`19`	`20`	`const chatCompletionsSuffix = "/chat/completions"`