Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions relay/channel/aws/constants.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ var awsModelIDMap = map[string]string{
"claude-opus-4-6": "anthropic.claude-opus-4-6-v1",
"claude-opus-4-7": "anthropic.claude-opus-4-7",
"claude-opus-4-8": "anthropic.claude-opus-4-8",
"claude-fable-5": "anthropic.claude-fable-5",
"claude-sonnet-5": "anthropic.claude-sonnet-5",
"claude-opus-5": "anthropic.claude-opus-5",
// Nova models
"nova-micro-v1:0": "amazon.nova-micro-v1:0",
"nova-lite-v1:0": "amazon.nova-lite-v1:0",
Expand Down Expand Up @@ -103,6 +106,21 @@ var awsModelCanCrossRegionMap = map[string]map[string]bool{
"ap": true,
"eu": true,
},
"anthropic.claude-fable-5": {
"us": true,
"ap": true,
"eu": true,
},
"anthropic.claude-sonnet-5": {
"us": true,
"ap": true,
"eu": true,
},
"anthropic.claude-opus-5": {
"us": true,
"ap": true,
"eu": true,
},
"anthropic.claude-haiku-4-5-20251001-v1:0": {
"us": true,
"ap": true,
Expand Down
3 changes: 3 additions & 0 deletions relay/channel/claude/constants.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ var ModelList = []string{
"claude-opus-4-8-medium",
"claude-opus-4-8-low",
"claude-opus-4-8-thinking",
"claude-fable-5",
"claude-sonnet-5",
"claude-opus-5",
}

var ChannelName = "claude"
31 changes: 31 additions & 0 deletions relay/channel/claude/relay_claude_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -374,3 +374,34 @@ func TestOpenAIChatRequestToClaudeMessages_ClaudeOpus48ThinkingUsesAdaptiveHighE
require.Nil(t, claudeRequest.TopP)
require.Nil(t, claudeRequest.TopK)
}

func TestOpenAIChatRequestToClaudeMessages_Claude5OmitsSamplingParameters(t *testing.T) {
for _, model := range []string{"claude-fable-5", "claude-sonnet-5", "claude-opus-5"} {
t.Run(model, func(t *testing.T) {
request := dto.GeneralOpenAIRequest{
Model: model,
Temperature: commonPointer(0.7),
TopP: commonPointer(0.9),
TopK: commonPointer(40),
Messages: []dto.Message{
{Role: "user", Content: "hello"},
},
}

claudeRequest, err := relayconvert.OpenAIChatRequestToClaudeMessages(nil, &relaycommon.RelayInfo{}, request)
require.NoError(t, err)
require.Equal(t, model, claudeRequest.Model)
require.Nil(t, claudeRequest.Temperature)
require.Nil(t, claudeRequest.TopP)
require.Nil(t, claudeRequest.TopK)
})
}
}

func TestAdaptorGetModelListIncludesClaude5Models(t *testing.T) {
models := (&Adaptor{}).GetModelList()

require.Contains(t, models, "claude-fable-5")
require.Contains(t, models, "claude-sonnet-5")
require.Contains(t, models, "claude-opus-5")
}
3 changes: 3 additions & 0 deletions relay/channel/vertex/adaptor.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ var claudeModelMap = map[string]string{
"claude-opus-4-6": "claude-opus-4-6",
"claude-opus-4-7": "claude-opus-4-7",
"claude-opus-4-8": "claude-opus-4-8",
"claude-fable-5": "claude-fable-5",
"claude-sonnet-5": "claude-sonnet-5",
"claude-opus-5": "claude-opus-5",
}

const anthropicVersion = "vertex-2023-10-16"
Expand Down
8 changes: 8 additions & 0 deletions relay/claude_handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,14 @@ func ClaudeHelper(c *gin.Context, info *relaycommon.RelayInfo) (newAPIError *typ
request.MaxTokens = &defaultMaxTokens
}

if strings.HasPrefix(request.Model, "claude-fable-5") ||
strings.HasPrefix(request.Model, "claude-sonnet-5") ||
strings.HasPrefix(request.Model, "claude-opus-5") {
request.Temperature = nil
request.TopP = nil
request.TopK = nil
}

if baseModel, effortLevel, ok := reasoning.TrimEffortSuffix(request.Model); ok && effortLevel != "" &&
(strings.HasPrefix(request.Model, "claude-opus-4-6") ||
strings.HasPrefix(request.Model, "claude-opus-4-7") ||
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,14 @@ func OpenAIChatRequestToClaudeMessages(c context.Context, info convmeta.Meta, te
}
}

if strings.HasPrefix(textRequest.Model, "claude-fable-5") ||
strings.HasPrefix(textRequest.Model, "claude-sonnet-5") ||
strings.HasPrefix(textRequest.Model, "claude-opus-5") {
claudeRequest.Temperature = nil
claudeRequest.TopP = nil
claudeRequest.TopK = nil
}

if baseModel, effortLevel, ok := reasoning.TrimEffortSuffix(textRequest.Model); ok && effortLevel != "" &&
(strings.HasPrefix(textRequest.Model, "claude-opus-4-6") ||
strings.HasPrefix(textRequest.Model, "claude-opus-4-7") ||
Expand Down
6 changes: 6 additions & 0 deletions setting/ratio_setting/cache_ratio.go
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,9 @@ var defaultCacheRatio = map[string]float64{
"claude-opus-4-8-high": 0.1,
"claude-opus-4-8-medium": 0.1,
"claude-opus-4-8-low": 0.1,
"claude-fable-5": 0.1,
"claude-sonnet-5": 0.1,
"claude-opus-5": 0.1,
}

var defaultCreateCacheRatio = map[string]float64{
Expand Down Expand Up @@ -123,6 +126,9 @@ var defaultCreateCacheRatio = map[string]float64{
"claude-opus-4-8-high": 1.25,
"claude-opus-4-8-medium": 1.25,
"claude-opus-4-8-low": 1.25,
"claude-fable-5": 1.25,
"claude-sonnet-5": 1.25,
"claude-opus-5": 1.25,
}

//var defaultCreateCacheRatio = map[string]float64{}
Expand Down
39 changes: 39 additions & 0 deletions setting/ratio_setting/claude_5_ratio_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
package ratio_setting

import (
"testing"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)

func TestClaude5DefaultRatios(t *testing.T) {
InitRatioSettings()

tests := []struct {
model string
modelRatio float64
}{
{model: "claude-fable-5", modelRatio: 5.0},
{model: "claude-sonnet-5", modelRatio: 1.5},
{model: "claude-opus-5", modelRatio: 2.5},
}

for _, test := range tests {
t.Run(test.model, func(t *testing.T) {
modelRatio, found, matchedModel := GetModelRatio(test.model)
require.True(t, found)
assert.Equal(t, test.model, matchedModel)
assert.Equal(t, test.modelRatio, modelRatio)
assert.Equal(t, 5.0, GetCompletionRatio(test.model))

cacheRatio, found := GetCacheRatio(test.model)
require.True(t, found)
assert.Equal(t, 0.1, cacheRatio)

createCacheRatio, found := GetCreateCacheRatio(test.model)
require.True(t, found)
assert.Equal(t, 1.25, createCacheRatio)
})
}
}
6 changes: 5 additions & 1 deletion setting/ratio_setting/model_ratio.go
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,9 @@ var defaultModelRatio = map[string]float64{
"claude-opus-4-8-high": 2.5,
"claude-opus-4-8-medium": 2.5,
"claude-opus-4-8-low": 2.5,
"claude-fable-5": 5.0,
"claude-sonnet-5": 1.5,
"claude-opus-5": 2.5,
"claude-3-opus-20240229": 7.5, // $15 / 1M tokens
"claude-opus-4-20250514": 7.5,
"claude-opus-4-1-20250805": 7.5,
Expand Down Expand Up @@ -539,7 +542,8 @@ func getHardcodedCompletionModelRatio(name string) (float64, bool) {

if strings.Contains(name, "claude-3") {
return 5, true
} else if strings.Contains(name, "claude-sonnet-4") || strings.Contains(name, "claude-opus-4") || strings.Contains(name, "claude-haiku-4") {
} else if strings.Contains(name, "claude-sonnet-4") || strings.Contains(name, "claude-opus-4") || strings.Contains(name, "claude-haiku-4") ||
strings.Contains(name, "claude-fable-5") || strings.Contains(name, "claude-sonnet-5") || strings.Contains(name, "claude-opus-5") {
return 5, true
}

Expand Down