Repository navigation
fix(relay): stop injecting empty tools into Claude requests that omit them - #6837
Conversation
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Organization UI Review profile: CHILL Plan: Pro Plus Run ID: 📒 Files selected for processing (2)
WalkthroughThe Claude request converter now omits the top-level ChangesClaude tool conversion
Estimated code review effort: 2 (Simple) | ~10 minutes Mergeability Score: ⚪ Minimal · up to The fix prevents invalid empty tools fields while preserving explicitly supplied tools. Tests and builds are reported passing, and no actionable merge-blocking risk remains after normal checks. Possibly related issues
Possibly related PRs
Poem
🚥 Pre-merge checks | ✅ 5✅ Passed checks (5 passed)
✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
源请求未携带 tools 时保持 Tools 为 nil,避免 omitempty 失效后序列化出 tools:[] 被上游拒绝。 Co-authored-by: Cursor <cursoragent@cursor.com>
b098b18 to
34bed08
Compare
Important
📝 变更描述 / Description
问题现象
当 OpenAI 格式的 Chat 请求经 new-api 转发到 Anthropic 兼容渠道时,如果客户端没有传
tools,转换后的 Claude 请求里却会出现一个空的"tools": []字段。部分 Anthropic 兼容上游不接受空数组,会直接返回 400「tools 低于允许下限」。同一个渠道上可以稳定复现出三种结果:
tools:200 正常;tools: []:400;根本原因
转换函数里用
make([]any, 0, len(tools))创建了非 nil 的空切片,然后无条件赋给ClaudeRequest.Tools。虽然该字段的 json tag 带omitempty,但它的类型是any,Go 对非 nil 的 interface 值不会做省略,所以即使客户端根本没有传tools,最终序列化时仍然会输出"tools": []。修复方案
只有当转换结果中确实存在 tool(function 或 web_search)时才给
ClaudeRequest.Tools赋值;没有 tool 时保持nil,让omitempty正常生效,请求体里不再出现tools字段。显式传入 tools 的请求行为不受影响。与 #6698 的关系
#6698 已经让
endpoint_type=anthropic的渠道测试走原生 Claude 请求,不再经过本次转换;但当endpoint_type为空时,测试仍会构建GeneralOpenAIRequest,而业务侧 OpenAI Chat 打到 Claude 渠道走的也是同一个转换函数,空tools: []依然会被注入。因此本 PR 直接在转换层修复,既能覆盖渠道测试的自动检测,也能修复正常转发路径。🚀 变更类型 / Type of change
🔗 关联任务 / Related Issue
✅ 提交前检查项 / Checklist
tools序列化成空数组。Tools赋值:有 function / web_search 时仍下发tools,没有时字段省略,显式传入的行为不变。relaykit/relayconvert/internal/oai_chat/to_claude_messages_req.go,并在现有claude_default_max_tokens_test.go中增加回归测试。📸 运行证明 / Proof of Work
TestOpenAIChatRequestToClaudeMessagesOmitsEmptyTools通过:覆盖未传tools、显式空数组tools: []、function tool、仅WebSearchOptions四种输入,go test全部 PASS。TestClaudeDefaultMaxTokensPresence、TestClaudeThinkingAdapterSatisfiesMaxTokensWithoutCallback均 PASS。gofmt -l对本次改动的两个文件无输出。relaykit模块校验通过:GOWORK=off go vet ./...、GOWORK=off go build ./...无输出。GOWORK=off go vet ./...、GOWORK=off go build ./...无输出。Summary by CodeRabbit
Bug Fixes
toolsfield when no tools are configured.Tests