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

fix: remove null/empty values from Kiro API request

Browse source
This commit is contained in:
Sanyela 2025-12-03 13:14:11 +08:00
parent 47df249142
commit 5e6ff1435b
1 changed files with 49 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
src/claude/claude-kiro.js
View file

@ -604,25 +604,23 @@ async initializeAuth(forceRefresh = false) {
let userInputMessage = { let userInputMessage = {
content: '', content: '',
modelId: codewhispererModel, modelId: codewhispererModel,
origin: KIRO_CONSTANTS.ORIGIN_AI_EDITOR, origin: KIRO_CONSTANTS.ORIGIN_AI_EDITOR
userInputMessageContext: {}
}; };
let images = [];
let toolResults = [];
if (Array.isArray(message.content)) { if (Array.isArray(message.content)) {
userInputMessage.images = []; // Initialize images array
for (const part of message.content) { for (const part of message.content) {
if (part.type === 'text') { if (part.type === 'text') {
userInputMessage.content += part.text; userInputMessage.content += part.text;
} else if (part.type === 'tool_result') { } else if (part.type === 'tool_result') {
if (!userInputMessage.userInputMessageContext.toolResults) { toolResults.push({
userInputMessage.userInputMessageContext.toolResults = [];
}
userInputMessage.userInputMessageContext.toolResults.push({
content: [{ text: this.getContentText(part.content) }], content: [{ text: this.getContentText(part.content) }],
status: 'success', status: 'success',
toolUseId: part.tool_use_id toolUseId: part.tool_use_id
}); });
} else if (part.type === 'image') { } else if (part.type === 'image') {
userInputMessage.images.push({ images.push({
format: part.source.media_type.split('/')[1], format: part.source.media_type.split('/')[1],
source: { source: {
bytes: part.source.data bytes: part.source.data
@ -633,18 +631,28 @@ async initializeAuth(forceRefresh = false) {
} else { } else {
userInputMessage.content = this.getContentText(message); userInputMessage.content = this.getContentText(message);
} }
// 只添加非空字段，API 不接受空数组或空对象
if (images.length > 0) {
userInputMessage.images = images;
}
if (toolResults.length > 0) {
userInputMessage.userInputMessageContext = { toolResults };
}
history.push({ userInputMessage }); history.push({ userInputMessage });
} else if (message.role === 'assistant') { } else if (message.role === 'assistant') {
let assistantResponseMessage = { let assistantResponseMessage = {
content: '', content: ''
toolUses: []
}; };
let toolUses = [];
if (Array.isArray(message.content)) { if (Array.isArray(message.content)) {
for (const part of message.content) { for (const part of message.content) {
if (part.type === 'text') { if (part.type === 'text') {
assistantResponseMessage.content += part.text; assistantResponseMessage.content += part.text;
} else if (part.type === 'tool_use') { } else if (part.type === 'tool_use') {
assistantResponseMessage.toolUses.push({ toolUses.push({
input: part.input, input: part.input,
name: part.name, name: part.name,
toolUseId: part.id toolUseId: part.id
@ -654,6 +662,12 @@ async initializeAuth(forceRefresh = false) {
} else { } else {
assistantResponseMessage.content = this.getContentText(message); assistantResponseMessage.content = this.getContentText(message);
} }
// 只添加非空字段
if (toolUses.length > 0) {
assistantResponseMessage.toolUses = toolUses;
}
history.push({ assistantResponseMessage }); history.push({ assistantResponseMessage });
} }
} }
@ -743,17 +757,34 @@ async initializeAuth(forceRefresh = false) {
}; };
// currentMessage 始终是 userInputMessage 类型 // currentMessage 始终是 userInputMessage 类型
request.conversationState.currentMessage.userInputMessage = { // 注意：API 不接受 null 值，空字段应该完全不包含
const userInputMessage = {
content: currentContent, content: currentContent,
modelId: codewhispererModel, modelId: codewhispererModel,
origin: KIRO_CONSTANTS.ORIGIN_AI_EDITOR, origin: KIRO_CONSTANTS.ORIGIN_AI_EDITOR
images: currentImages && currentImages.length > 0 ? currentImages : null,
userInputMessageContext: {
toolResults: currentToolResults.length > 0 ? currentToolResults : null,
tools: Object.keys(toolsContext).length > 0 ? toolsContext.tools : null
}
}; };
// 只有当 images 非空时才添加
if (currentImages && currentImages.length > 0) {
userInputMessage.images = currentImages;
}
// 构建 userInputMessageContext，只包含非空字段
const userInputMessageContext = {};
if (currentToolResults.length > 0) {
userInputMessageContext.toolResults = currentToolResults;
}
if (Object.keys(toolsContext).length > 0 && toolsContext.tools) {
userInputMessageContext.tools = toolsContext.tools;
}
// 只有当 userInputMessageContext 有内容时才添加
if (Object.keys(userInputMessageContext).length > 0) {
userInputMessage.userInputMessageContext = userInputMessageContext;
}
request.conversationState.currentMessage.userInputMessage = userInputMessage;
if (this.authMethod === KIRO_CONSTANTS.AUTH_METHOD_SOCIAL) { if (this.authMethod === KIRO_CONSTANTS.AUTH_METHOD_SOCIAL) {
request.profileArn = this.profileArn; request.profileArn = this.profileArn;
} }