Merge branch 'main' into test

backend/internal/service/gateway_cached_tokens_test.go

@@ -102,8 +102,10 @@ func TestStreamingReconcile_MessageStart(t *testing.T) {
 	}
 
 	// 验证 cache_read_input_tokens 已被填充
-	msg := event["message"].(map[string]any)
-	usage := msg["usage"].(map[string]any)
+	msg, ok := event["message"].(map[string]any)
+	require.True(t, ok)
+	usage, ok := msg["usage"].(map[string]any)
+	require.True(t, ok)
 	assert.Equal(t, float64(23), usage["cache_read_input_tokens"])
 
 	// 验证重新序列化后 JSON 也包含正确值
@@ -134,8 +136,10 @@ func TestStreamingReconcile_MessageStart_NativeClaude(t *testing.T) {
 		}
 	}
 
-	msg := event["message"].(map[string]any)
-	usage := msg["usage"].(map[string]any)
+	msg, ok := event["message"].(map[string]any)
+	require.True(t, ok)
+	usage, ok := msg["usage"].(map[string]any)
+	require.True(t, ok)
 	assert.Equal(t, float64(30), usage["cache_read_input_tokens"])
 }
 
@@ -159,11 +163,9 @@ func TestStreamingReconcile_MessageDelta(t *testing.T) {
 	require.Equal(t, "message_delta", eventType)
 
 	// 模拟 processSSEEvent 中的 reconcile 逻辑
-	if u, ok := event["usage"].(map[string]any); ok {
-		reconcileCachedTokens(u)
-	}
-
-	usage := event["usage"].(map[string]any)
+	usage, ok := event["usage"].(map[string]any)
+	require.True(t, ok)
+	reconcileCachedTokens(usage)
 	assert.Equal(t, float64(15), usage["cache_read_input_tokens"])
 }
 
@@ -179,11 +181,9 @@ func TestStreamingReconcile_MessageDelta_NativeClaude(t *testing.T) {
 	var event map[string]any
 	require.NoError(t, json.Unmarshal([]byte(eventJSON), &event))
 
-	if u, ok := event["usage"].(map[string]any); ok {
-		reconcileCachedTokens(u)
-	}
-
-	usage := event["usage"].(map[string]any)
+	usage, ok := event["usage"].(map[string]any)
+	require.True(t, ok)
+	reconcileCachedTokens(usage)
 	_, hasCacheRead := usage["cache_read_input_tokens"]
 	assert.False(t, hasCacheRead, "不应为原生 Claude 响应注入 cache_read_input_tokens")
 }
@@ -251,20 +251,8 @@ func TestNonStreamingReconcile_NativeClaude(t *testing.T) {
 	}
 	require.NoError(t, json.Unmarshal(body, &response))
 
-	originalBody := make([]byte, len(body))
-	copy(originalBody, body)
-
-	if response.Usage.CacheReadInputTokens == 0 {
-		cachedTokens := gjson.GetBytes(body, "usage.cached_tokens").Int()
-		if cachedTokens > 0 {
-			response.Usage.CacheReadInputTokens = int(cachedTokens)
-			if newBody, err := sjson.SetBytes(body, "usage.cache_read_input_tokens", cachedTokens); err == nil {
-				body = newBody
-			}
-		}
-	}
-
-	// 不应修改
+	// CacheReadInputTokens == 30，条件不成立，整个 reconcile 分支不会执行
+	assert.NotZero(t, response.Usage.CacheReadInputTokens)
 	assert.Equal(t, 30, response.Usage.CacheReadInputTokens)
 }
 

backend/internal/service/pricing_service.go

@@ -579,6 +579,7 @@ func (s *PricingService) extractBaseName(model string) string {
 func (s *PricingService) matchByModelFamily(model string) *LiteLLMModelPricing {
 	// Claude模型系列匹配规则
 	familyPatterns := map[string][]string{
+		"opus-4.6":   {"claude-opus-4.6", "claude-opus-4-6"},
 		"opus-4.5":   {"claude-opus-4.5", "claude-opus-4-5"},
 		"opus-4":     {"claude-opus-4", "claude-3-opus"},
 		"sonnet-4.5": {"claude-sonnet-4.5", "claude-sonnet-4-5"},