mirror of
https://github.com/router-for-me/CLIProxyAPI.git
synced 2026-02-03 04:50:52 +08:00
Fixed: #655
refactor(antigravity): clean up tool key filtering and improve signature caching logic
This commit is contained in:
@@ -121,32 +121,31 @@ func ConvertClaudeRequestToAntigravity(modelName string, inputRawJSON []byte, _
|
|||||||
// Use GetThinkingText to handle wrapped thinking objects
|
// Use GetThinkingText to handle wrapped thinking objects
|
||||||
thinkingText := util.GetThinkingText(contentResult)
|
thinkingText := util.GetThinkingText(contentResult)
|
||||||
signatureResult := contentResult.Get("signature")
|
signatureResult := contentResult.Get("signature")
|
||||||
clientSignature := ""
|
clientSignature := ""
|
||||||
if signatureResult.Exists() && signatureResult.String() != "" {
|
if signatureResult.Exists() && signatureResult.String() != "" {
|
||||||
clientSignature = signatureResult.String()
|
clientSignature = signatureResult.String()
|
||||||
}
|
|
||||||
|
|
||||||
// Always try cached signature first (more reliable than client-provided)
|
|
||||||
// Client may send stale or invalid signatures from different sessions
|
|
||||||
signature := ""
|
|
||||||
if sessionID != "" && thinkingText != "" {
|
|
||||||
if cachedSig := cache.GetCachedSignature(sessionID, thinkingText); cachedSig != "" {
|
|
||||||
signature = cachedSig
|
|
||||||
log.Debugf("Using cached signature for thinking block")
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
// Fallback to client signature only if cache miss and client signature is valid
|
// Always try cached signature first (more reliable than client-provided)
|
||||||
if signature == "" && cache.HasValidSignature(clientSignature) {
|
// Client may send stale or invalid signatures from different sessions
|
||||||
signature = clientSignature
|
signature := ""
|
||||||
log.Debugf("Using client-provided signature for thinking block")
|
if sessionID != "" && thinkingText != "" {
|
||||||
}
|
if cachedSig := cache.GetCachedSignature(sessionID, thinkingText); cachedSig != "" {
|
||||||
|
signature = cachedSig
|
||||||
|
log.Debugf("Using cached signature for thinking block")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Store for subsequent tool_use in the same message
|
// Fallback to client signature only if cache miss and client signature is valid
|
||||||
if cache.HasValidSignature(signature) {
|
if signature == "" && cache.HasValidSignature(clientSignature) {
|
||||||
currentMessageThinkingSignature = signature
|
signature = clientSignature
|
||||||
}
|
log.Debugf("Using client-provided signature for thinking block")
|
||||||
|
}
|
||||||
|
|
||||||
|
// Store for subsequent tool_use in the same message
|
||||||
|
if cache.HasValidSignature(signature) {
|
||||||
|
currentMessageThinkingSignature = signature
|
||||||
|
}
|
||||||
|
|
||||||
// Skip trailing unsigned thinking blocks on last assistant message
|
// Skip trailing unsigned thinking blocks on last assistant message
|
||||||
isUnsigned := !cache.HasValidSignature(signature)
|
isUnsigned := !cache.HasValidSignature(signature)
|
||||||
@@ -321,6 +320,7 @@ func ConvertClaudeRequestToAntigravity(modelName string, inputRawJSON []byte, _
|
|||||||
// tools
|
// tools
|
||||||
toolsJSON := ""
|
toolsJSON := ""
|
||||||
toolDeclCount := 0
|
toolDeclCount := 0
|
||||||
|
allowedToolKeys := []string{"name", "description", "behavior", "parameters", "parametersJsonSchema", "response", "responseJsonSchema"}
|
||||||
toolsResult := gjson.GetBytes(rawJSON, "tools")
|
toolsResult := gjson.GetBytes(rawJSON, "tools")
|
||||||
if toolsResult.IsArray() {
|
if toolsResult.IsArray() {
|
||||||
toolsJSON = `[{"functionDeclarations":[]}]`
|
toolsJSON = `[{"functionDeclarations":[]}]`
|
||||||
@@ -333,10 +333,12 @@ func ConvertClaudeRequestToAntigravity(modelName string, inputRawJSON []byte, _
|
|||||||
inputSchema := util.CleanJSONSchemaForAntigravity(inputSchemaResult.Raw)
|
inputSchema := util.CleanJSONSchemaForAntigravity(inputSchemaResult.Raw)
|
||||||
tool, _ := sjson.Delete(toolResult.Raw, "input_schema")
|
tool, _ := sjson.Delete(toolResult.Raw, "input_schema")
|
||||||
tool, _ = sjson.SetRaw(tool, "parametersJsonSchema", inputSchema)
|
tool, _ = sjson.SetRaw(tool, "parametersJsonSchema", inputSchema)
|
||||||
tool, _ = sjson.Delete(tool, "strict")
|
for toolKey := range gjson.Parse(tool).Map() {
|
||||||
tool, _ = sjson.Delete(tool, "input_examples")
|
if util.InArray(allowedToolKeys, toolKey) {
|
||||||
tool, _ = sjson.Delete(tool, "type")
|
continue
|
||||||
tool, _ = sjson.Delete(tool, "cache_control")
|
}
|
||||||
|
tool, _ = sjson.Delete(tool, toolKey)
|
||||||
|
}
|
||||||
toolsJSON, _ = sjson.SetRaw(toolsJSON, "0.functionDeclarations.-1", tool)
|
toolsJSON, _ = sjson.SetRaw(toolsJSON, "0.functionDeclarations.-1", tool)
|
||||||
toolDeclCount++
|
toolDeclCount++
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user