admin-valentin/AIClient-2-API
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(convert): 修复Claude到Gemini工具转换的结构问题

Browse source 
重构工具转换逻辑以匹配Gemini API要求的格式，确保工具名称和描述为字符串类型，并移除input_schema中的$schema字段。当没有有效工具时正确删除tools数组。
This commit is contained in:
hex2077 2025-09-16 20:21:52 +08:00
parent 7f7fc78072
commit 2930437616
1 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/convert.js
View file

@ -1696,20 +1696,24 @@ export function toGeminiRequestFromClaude(claudeRequest) {
// Handle tools // Handle tools
if (Array.isArray(claudeRequest.tools)) { if (Array.isArray(claudeRequest.tools)) {
geminiRequest.tools = claudeRequest.tools.map(tool => { geminiRequest.tools = [{
// Ensure tool is a valid object and has a name functionDeclarations: claudeRequest.tools.map(tool => {
if (!tool || typeof tool !== 'object' || !tool.name) { // Ensure tool is a valid object and has a name
console.warn("Skipping invalid tool declaration in claudeRequest.tools."); if (!tool || typeof tool !== 'object' || !tool.name) {
return null; // Return null for invalid tools, filter out later console.warn("Skipping invalid tool declaration in claudeRequest.tools.");
} return null; // Return null for invalid tools, filter out later
}
const geminiTool = {}; delete tool.input_schema.$schema;
geminiTool[tool.name] = tool.input_schema && typeof tool.input_schema === 'object' ? tool.input_schema : {}; return {
return geminiTool; name: String(tool.name), // Ensure name is string
}).filter(Boolean); // Filter out any nulls from invalid tool declarations description: String(tool.description || ''), // Ensure description is string
parameters: tool.input_schema && typeof tool.input_schema === 'object' ? tool.input_schema : { type: 'object', properties: {} }
// If no valid tools, remove the tools array };
if (geminiRequest.tools.length === 0) { }).filter(Boolean) // Filter out any nulls from invalid tool declarations
}];
// If no valid functionDeclarations, remove the tools array
if (geminiRequest.tools[0].functionDeclarations.length === 0) {
delete geminiRequest.tools; delete geminiRequest.tools;
} }
} }