fix: aws arn modelid need use actual name

Author: zijiren233

core/relay/adaptor/antling/adaptor.go

@@ -107,13 +107,7 @@ func (a *Adaptor) SetupRequestHeader(
 	req.Header.Set("Anthropic-Version", anthropicVersion)
 
 	if rawBetas := c.Request.Header.Get(anthropic.AnthropicBeta); rawBetas != "" {
-		req.Header.Set(
-			anthropic.AnthropicBeta,
-			anthropic.FixBetasStringWithModel(
-				anthropic.ResolveModelName(meta.OriginModel, meta.ActualModel),
-				rawBetas,
-			),
-		)
+		req.Header.Set(anthropic.AnthropicBeta, rawBetas)
 	}
 
 	return nil

core/relay/adaptor/antling/adaptor_test.go

@@ -91,7 +91,7 @@ func TestAntLingSetupRequestHeaderAnthropic(t *testing.T) {
 		nil,
 	)
 	ctx.Request.Header.Set("Anthropic-Version", "2023-06-01")
-	ctx.Request.Header.Set("Anthropic-Beta", "test-beta")
+	ctx.Request.Header.Set("Anthropic-Beta", "computer-use-2025-01-24")
 
 	req := httptest.NewRequestWithContext(
 		context.Background(),
@@ -111,5 +111,5 @@ func TestAntLingSetupRequestHeaderAnthropic(t *testing.T) {
 	assert.Equal(t, "Bearer test-key", req.Header.Get("Authorization"))
 	assert.Equal(t, "test-key", req.Header.Get("X-Api-Key"))
 	assert.Equal(t, "2023-06-01", req.Header.Get("Anthropic-Version"))
-	assert.Equal(t, "test-beta", req.Header.Get("Anthropic-Beta"))
+	assert.Equal(t, "computer-use-2025-01-24", req.Header.Get("Anthropic-Beta"))
 }

core/relay/adaptor/aws/claude/adapter.go

@@ -186,10 +186,7 @@ func (a *Adaptor) DoRequest(
 		)
 	}
 
-	awsModelID := awsModelID(
-		anthropic.ResolveModelName(meta.OriginModel, meta.ActualModel),
-		region,
-	)
+	awsModelID := awsModelIDFromMeta(meta, region)
 
 	awsClient, err := utils.AwsClientFromMeta(meta)
 	if err != nil {
@@ -245,6 +242,10 @@ func (a *Adaptor) DoRequest(
 	}, nil
 }
 
+func awsModelIDFromMeta(meta *meta.Meta, region string) string {
+	return awsModelID(meta.ActualModel, region)
+}
+
 func (a *Adaptor) DoResponse(
 	meta *meta.Meta,
 	_ adaptor.Store,

core/relay/adaptor/aws/claude/adapter_test.go

@@ -111,3 +111,49 @@ func TestHandleAnthropicRequest_PreservesLegacyThinkingForOldModels(t *testing.T
 	require.True(t, hasOutputConfig)
 	assert.Equal(t, "low", outputConfig["effort"])
 }
+
+func TestHandleAnthropicRequest_ContextManagementUsesResolvedModel(t *testing.T) {
+	m := meta.NewMeta(nil, mode.Anthropic, "claude-sonnet-4-6", coremodel.ModelConfig{})
+	m.ActualModel = "claude-opus-4-7"
+
+	reqBody := map[string]any{
+		"model":      "claude-sonnet-4-6",
+		"max_tokens": 4096,
+		"messages": []map[string]any{
+			{"role": "user", "content": "hello"},
+		},
+		"context_management": map[string]any{
+			"edits": []map[string]any{
+				{"type": "clear_tool_uses_20250919"},
+				{"type": "unsupported"},
+			},
+		},
+	}
+
+	data, err := sonic.Marshal(reqBody)
+	require.NoError(t, err)
+
+	req, err := http.NewRequestWithContext(
+		t.Context(),
+		http.MethodPost,
+		"http://localhost/v1/messages",
+		bytes.NewBuffer(data),
+	)
+	require.NoError(t, err)
+
+	adaptor := &awsa.Adaptor{}
+	_, err = adaptor.ConvertRequest(m, nil, req)
+	require.NoError(t, err)
+
+	converted, ok := m.Get(awsa.ConvertedRequest)
+	require.True(t, ok)
+
+	body, ok := converted.([]byte)
+	require.True(t, ok)
+
+	var awsReq map[string]any
+	require.NoError(t, sonic.Unmarshal(body, &awsReq))
+
+	_, ok = awsReq["context_management"]
+	assert.False(t, ok)
+}

core/relay/adaptor/aws/claude/model_test.go

@@ -0,0 +1,32 @@
+package aws
+
+import (
+	"testing"
+
+	"github.com/labring/aiproxy/core/relay/meta"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestAWSModelIDFromMetaUsesActualModel(t *testing.T) {
+	m := &meta.Meta{
+		OriginModel: "claude-opus-4-7",
+		ActualModel: "claude-3-haiku-20240307",
+	}
+
+	assert.Equal(
+		t,
+		"us.anthropic.claude-3-haiku-20240307-v1:0",
+		awsModelIDFromMeta(m, "us-east-1"),
+	)
+}
+
+func TestAWSModelIDFromMetaPreservesActualARN(t *testing.T) {
+	const arn = "arn:aws:bedrock:us-east-1:123456789012:provisioned-model/test"
+
+	m := &meta.Meta{
+		OriginModel: "claude-opus-4-7",
+		ActualModel: arn,
+	}
+
+	assert.Equal(t, arn, awsModelIDFromMeta(m, "us-east-1"))
+}