mirror of
https://github.com/Finesssee/ProxyPilot.git
synced 2026-11-20 12:23:26 +00:00
refactor(antigravity): remove unused client signature handling in thinking objects
- Comment out client signature extraction (incompatible across model families)
- Use only cached signatures for thinking blocks
- Switch to thinking.GetThinkingText for text extraction
- Add explanatory comment about cross-model signature issues
Cherry-picked from d4bb4e66.
This commit is contained in:
@@ -12,6 +12,7 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/router-for-me/CLIProxyAPI/v6/internal/cache"
|
"github.com/router-for-me/CLIProxyAPI/v6/internal/cache"
|
||||||
|
"github.com/router-for-me/CLIProxyAPI/v6/internal/thinking"
|
||||||
"github.com/router-for-me/CLIProxyAPI/v6/internal/translator/gemini/common"
|
"github.com/router-for-me/CLIProxyAPI/v6/internal/translator/gemini/common"
|
||||||
"github.com/router-for-me/CLIProxyAPI/v6/internal/util"
|
"github.com/router-for-me/CLIProxyAPI/v6/internal/util"
|
||||||
log "github.com/sirupsen/logrus"
|
log "github.com/sirupsen/logrus"
|
||||||
@@ -122,31 +123,30 @@ func ConvertClaudeRequestToAntigravity(modelName string, inputRawJSON []byte, _
|
|||||||
contentResult := contentResults[j]
|
contentResult := contentResults[j]
|
||||||
contentTypeResult := contentResult.Get("type")
|
contentTypeResult := contentResult.Get("type")
|
||||||
if contentTypeResult.Type == gjson.String && contentTypeResult.String() == "thinking" {
|
if contentTypeResult.Type == gjson.String && contentTypeResult.String() == "thinking" {
|
||||||
thinkingText := contentResult.Get("thinking").String()
|
// Use GetThinkingText to handle wrapped thinking objects
|
||||||
if thinkingText == "" {
|
thinkingText := thinking.GetThinkingText(contentResult)
|
||||||
thinkingText = util.GetThinkingText(contentResult)
|
// signatureResult := contentResult.Get("signature")
|
||||||
}
|
// clientSignature := ""
|
||||||
signatureResult := contentResult.Get("signature")
|
// if signatureResult.Exists() && signatureResult.String() != "" {
|
||||||
clientSignature := ""
|
// clientSignature = signatureResult.String()
|
||||||
if signatureResult.Exists() && signatureResult.String() != "" {
|
// }
|
||||||
clientSignature = signatureResult.String()
|
|
||||||
}
|
|
||||||
|
|
||||||
// Prefer client-provided signature to avoid invalidating signed blocks.
|
// Always try cached signature first (more reliable than client-provided)
|
||||||
|
// Client may send stale or invalid signatures from different sessions
|
||||||
signature := ""
|
signature := ""
|
||||||
if cache.HasValidSignature(clientSignature) {
|
if sessionID != "" && thinkingText != "" {
|
||||||
signature = clientSignature
|
|
||||||
log.Debugf("Using client-provided signature for thinking block")
|
|
||||||
}
|
|
||||||
|
|
||||||
// Fallback to cached signature only when client signature is missing/invalid.
|
|
||||||
if signature == "" && sessionID != "" && thinkingText != "" {
|
|
||||||
if cachedSig := cache.GetCachedSignature(sessionID, thinkingText); cachedSig != "" {
|
if cachedSig := cache.GetCachedSignature(sessionID, thinkingText); cachedSig != "" {
|
||||||
signature = cachedSig
|
signature = cachedSig
|
||||||
log.Debugf("Using cached signature for thinking block")
|
// log.Debugf("Using cached signature for thinking block")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// NOTE: We do NOT fallback to client signature anymore.
|
||||||
|
// Client signatures from Claude models are incompatible with Antigravity/Gemini API.
|
||||||
|
// When switching between models (e.g., Claude Opus -> Gemini Flash), the Claude
|
||||||
|
// signatures will cause "Corrupted thought signature" errors.
|
||||||
|
// If we have no cached signature, the thinking block will be skipped below.
|
||||||
|
|
||||||
// Store for subsequent tool_use in the same message
|
// Store for subsequent tool_use in the same message
|
||||||
if cache.HasValidSignature(signature) {
|
if cache.HasValidSignature(signature) {
|
||||||
currentMessageThinkingSignature = signature
|
currentMessageThinkingSignature = signature
|
||||||
|
|||||||
Reference in New Issue
Block a user