Skip to content

fix: safely append beta query for anthropic target URLs #672

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
gopkg-dev wants to merge 3 commits into from
Closed

fix: safely append beta query for anthropic target URLs #672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
549a666
Initial plan
Copilot Feb 27, 2026
e723e2d
fix: preserve beta query when using custom anthropic base URL
Copilot Feb 27, 2026
092ee31
refactor: safely append beta query for anthropic target URLs
Copilot Feb 27, 2026
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
2 changes: 2 additions & 0 deletions backend/internal/service/gateway_anthropic_apikey_passthrough_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ func TestGatewayService_AnthropicAPIKeyPassthrough_ForwardStreamPreservesBodyAnd
require.Equal(t, "claude-3-7-sonnet-20250219", gjson.GetBytes(upstream.lastBody, "model").String())

require.Equal(t, "upstream-anthropic-key", upstream.lastReq.Header.Get("x-api-key"))
require.Equal(t, "/v1/messages?beta=true", upstream.lastReq.URL.RequestURI())
require.Empty(t, upstream.lastReq.Header.Get("authorization"))
require.Empty(t, upstream.lastReq.Header.Get("x-goog-api-key"))
require.Empty(t, upstream.lastReq.Header.Get("cookie"))
Expand Down Expand Up @@ -256,6 +257,7 @@ func TestGatewayService_AnthropicAPIKeyPassthrough_ForwardCountTokensPreservesBo
require.Equal(t, body, upstream.lastBody, "count_tokens 透传模式不应改写请求体")
require.Equal(t, "claude-3-5-sonnet-latest", gjson.GetBytes(upstream.lastBody, "model").String())
require.Equal(t, "upstream-anthropic-key", upstream.lastReq.Header.Get("x-api-key"))
require.Equal(t, "/v1/messages/count_tokens?beta=true", upstream.lastReq.URL.RequestURI())
require.Empty(t, upstream.lastReq.Header.Get("authorization"))
require.Empty(t, upstream.lastReq.Header.Get("cookie"))
require.Equal(t, http.StatusOK, rec.Code)
Expand Down
24 changes: 20 additions & 4 deletions backend/internal/service/gateway_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"log/slog"
mathrand "math/rand"
"net/http"
"net/url"
"os"
"regexp"
"sort"
Expand Down Expand Up @@ -52,6 +53,21 @@ const (
defaultModelsListCacheTTL = 15 * time.Second
)

func buildAnthropicTargetURL(validatedURL, endpoint string) string {
targetURL := validatedURL + endpoint
parsedURL, err := url.Parse(targetURL)
if err != nil {
if strings.Contains(targetURL, "?") {
return targetURL + "&beta=true"
}
return targetURL + "?beta=true"
}
query := parsedURL.Query()
query.Set("beta", "true")
parsedURL.RawQuery = query.Encode()
return parsedURL.String()
}

const (
claudeMimicDebugInfoKey = "claude_mimic_debug_info"
)
Expand Down Expand Up @@ -3963,7 +3979,7 @@ func (s *GatewayService) buildUpstreamRequestAnthropicAPIKeyPassthrough(
if err != nil {
return nil, err
}
targetURL = validatedURL + "/v1/messages"
targetURL = buildAnthropicTargetURL(validatedURL, "/v1/messages")
}

req, err := http.NewRequestWithContext(ctx, http.MethodPost, targetURL, bytes.NewReader(body))
Expand Down Expand Up @@ -4343,7 +4359,7 @@ func (s *GatewayService) buildUpstreamRequest(ctx context.Context, c *gin.Contex
if err != nil {
return nil, err
}
targetURL = validatedURL + "/v1/messages"
targetURL = buildAnthropicTargetURL(validatedURL, "/v1/messages")
}
}

Expand Down Expand Up @@ -6291,7 +6307,7 @@ func (s *GatewayService) buildCountTokensRequestAnthropicAPIKeyPassthrough(
if err != nil {
return nil, err
}
targetURL = validatedURL + "/v1/messages/count_tokens"
targetURL = buildAnthropicTargetURL(validatedURL, "/v1/messages/count_tokens")
}

req, err := http.NewRequestWithContext(ctx, http.MethodPost, targetURL, bytes.NewReader(body))
Expand Down Expand Up @@ -6338,7 +6354,7 @@ func (s *GatewayService) buildCountTokensRequest(ctx context.Context, c *gin.Con
if err != nil {
return nil, err
}
targetURL = validatedURL + "/v1/messages/count_tokens"
targetURL = buildAnthropicTargetURL(validatedURL, "/v1/messages/count_tokens")
}
}

Expand Down
Loading