chuan/CLIProxyAPI
1
0
Fork 0
mirror of https://github.com/router-for-me/CLIProxyAPI.git synced 2026-02-03 04:50:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(translator): address PR feedback for tool name sanitization

Browse Source 
- Pre-compile sanitization regex for better performance.
- Optimize SanitizeFunctionName for conciseness and correctness.
- Handle 64-char edge cases by truncating before prepending underscore.
- Fix bug in Antigravity translator (incorrect join index).
- Refactor Gemini translators to avoid redundant sanitization calls.
- Add comprehensive unit tests including 64-char edge cases.

Co-authored-by: factory-droid[bot] <138933559+factory-droid[bot]@users.noreply.github.com>
This commit is contained in:
Saboor Hassan
2025-12-31 01:54:41 +05:00
parent f4d4249ba5
commit d241359153
5 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
internal/translator/antigravity/claude/antigravity_claude_request.go
View File

@@ -225,11 +225,12 @@ func ConvertClaudeRequestToAntigravity(modelName string, inputRawJSON []byte, _
} else if contentTypeResult.Type == gjson.String && contentTypeResult.String() == "tool_result" {
toolCallID := contentResult.Get("tool_use_id").String()
if toolCallID != "" {
funcName := util.SanitizeFunctionName(toolCallID)
rawFuncName := toolCallID
toolCallIDs := strings.Split(toolCallID, "-")
if len(toolCallIDs) > 1 {
funcName = util.SanitizeFunctionName(strings.Join(toolCallIDs[0:len(toolCallIDs)-2], "-"))
rawFuncName = strings.Join(toolCallIDs[0:len(toolCallIDs)-1], "-")
}
funcName := util.SanitizeFunctionName(rawFuncName)
functionResponseResult := contentResult.Get("content")
functionResponseJSON := `{}`

5
internal/translator/gemini-cli/claude/gemini-cli_claude_request.go
View File

@@ -107,11 +107,12 @@ func ConvertClaudeRequestToCLI(modelName string, inputRawJSON []byte, _ bool) []
if toolCallID == "" {
return true
}
funcName := util.SanitizeFunctionName(toolCallID)
rawFuncName := toolCallID
toolCallIDs := strings.Split(toolCallID, "-")
if len(toolCallIDs) > 1 {
funcName = util.SanitizeFunctionName(strings.Join(toolCallIDs[0:len(toolCallIDs)-1], "-"))
rawFuncName = strings.Join(toolCallIDs[0:len(toolCallIDs)-1], "-")
}
funcName := util.SanitizeFunctionName(rawFuncName)
responseData := contentResult.Get("content").Raw
part := `{"functionResponse":{"name":"","response":{"result":""}}}`
part, _ = sjson.Set(part, "functionResponse.name", funcName)

5
internal/translator/gemini/claude/gemini_claude_request.go
View File

@@ -100,11 +100,12 @@ func ConvertClaudeRequestToGemini(modelName string, inputRawJSON []byte, _ bool)
if toolCallID == "" {
return true
}
funcName := util.SanitizeFunctionName(toolCallID)
rawFuncName := toolCallID
toolCallIDs := strings.Split(toolCallID, "-")
if len(toolCallIDs) > 1 {
funcName = util.SanitizeFunctionName(strings.Join(toolCallIDs[0:len(toolCallIDs)-1], "-"))
rawFuncName = strings.Join(toolCallIDs[0:len(toolCallIDs)-1], "-")
}
funcName := util.SanitizeFunctionName(rawFuncName)
responseData := contentResult.Get("content").Raw
part := `{"functionResponse":{"name":"","response":{"result":""}}}`
part, _ = sjson.Set(part, "functionResponse.name", funcName)

1
internal/util/sanitize_test.go
View File

@@ -26,6 +26,7 @@ func TestSanitizeFunctionName(t *testing.T) {
{"Exactly 64 chars", "this_is_a_very_long_name_that_exactly_reaches_sixty_four_charact", "this_is_a_very_long_name_that_exactly_reaches_sixty_four_charact"},
{"Too long (65 chars)", "this_is_a_very_long_name_that_exactly_reaches_sixty_four_charactX", "this_is_a_very_long_name_that_exactly_reaches_sixty_four_charact"},
{"Very long", "this_is_a_very_long_name_that_exceeds_the_sixty_four_character_limit_for_function_names", "this_is_a_very_long_name_that_exceeds_the_sixty_four_character_l"},
{"Starts with digit (64 chars total)", "1234567890123456789012345678901234567890123456789012345678901234", "_123456789012345678901234567890123456789012345678901234567890123"},
{"Empty", "", ""},
{"Single character invalid", "@", "_"},
{"Single character valid", "a", "a"},

15
internal/util/util.go
View File

@@ -15,28 +15,29 @@ import (
log "github.com/sirupsen/logrus"
)
var functionNameSanitizer = regexp.MustCompile(`[^a-zA-Z0-9_.:-]`)
// SanitizeFunctionName ensures a function name matches the requirements for Gemini/Vertex AI.
// It replaces invalid characters with underscores, ensures it starts with a letter or underscore,
// and truncates it to 64 characters if necessary.
// Regex Rule: [^a-zA-Z0-9_.:-] replaced with _.
func SanitizeFunctionName(name string) string {
if name == "" {
return name
return ""
}
// Replace invalid characters with underscore
re := regexp.MustCompile(`[^a-zA-Z0-9_.:-]`)
sanitized := re.ReplaceAllString(name, "_")
sanitized := functionNameSanitizer.ReplaceAllString(name, "_")
// Ensure it starts with a letter or underscore
if len(sanitized) > 0 {
first := sanitized[0]
if !((first >= 'a' && first <= 'z') || (first >= 'A' && first <= 'Z') || first == '_') {
// If it starts with an allowed character but not allowed at the beginning,
// we must prepend an underscore.
sanitized = "_" + sanitized
// To stay within the 64-character limit while prepending, we may need to truncate first.
if len(sanitized) >= 64 {
sanitized = sanitized[:63]
}
} else {
sanitized = "_"
sanitized = "_" + sanitized
}
// Truncate to 64 characters