opensource/mateclaw
2
0
Fork 0
mirror of https://gitee.com/mateos/mateclaw.git synced 2026-09-15 03:55:09 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(agent): skip SVG in multimodal injection and stop retrying 400 errors

Browse Source
This commit is contained in:
matevip 2026-04-06 08:38:39 +08:00
parent 7bcdbf4523
commit 49aae91e90
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mateclaw-server/src/main/java/vip/mate/agent/BaseAgent.java
View File

@ -241,6 +241,12 @@ public abstract class BaseAgent {
if (contentType == null || !contentType.startsWith("image/")) { if (contentType == null || !contentType.startsWith("image/")) {
continue; continue;
} }
// SVG 是 XML 文本，不是光栅图片，LLM multimodal API 不支持
if (contentType.contains("svg")) {
log.debug("[{}] Skipping SVG attachment (not supported by multimodal API): {}",
agentName, part.getFileName());
continue;
}
// 解析图片文件路径：先尝试原始 path，再尝试拼接工作目录 // 解析图片文件路径：先尝试原始 path，再尝试拼接工作目录
Path imagePath = resolveImagePath(part.getPath()); Path imagePath = resolveImagePath(part.getPath());
if (imagePath == null) { if (imagePath == null) {

20
mateclaw-server/src/main/java/vip/mate/agent/graph/NodeStreamingChatHelper.java
View File

@ -139,6 +139,11 @@ public class NodeStreamingChatHelper {
|| msg.contains("Too Many Requests") || msg.contains("engine_overloaded")) { || msg.contains("Too Many Requests") || msg.contains("engine_overloaded")) {
return ErrorType.RATE_LIMIT; return ErrorType.RATE_LIMIT;
} }
// Client errors (400 Bad Request — unsupported format, invalid params, etc.) — NOT retryable
if (msg.contains("400") || msg.contains("Bad Request")
|| msg.contains("invalid_request_error") || msg.contains("unsupported")) {
return ErrorType.CLIENT_ERROR;
}
// Server errors // Server errors
if (msg.contains("500") || msg.contains("502") || msg.contains("503") || msg.contains("504") if (msg.contains("500") || msg.contains("502") || msg.contains("503") || msg.contains("504")
|| msg.contains("APITimeoutError") || msg.contains("APIConnectionError") || msg.contains("APITimeoutError") || msg.contains("APIConnectionError")
@ -185,6 +190,10 @@ public class NodeStreamingChatHelper {
if (lastResult.errorType() == ErrorType.AUTH_ERROR) { if (lastResult.errorType() == ErrorType.AUTH_ERROR) {
return lastResult; return lastResult;
} }
// CLIENT_ERROR (400 Bad Request): 不重试（参数/格式错误重试也不会变）
if (lastResult.errorType() == ErrorType.CLIENT_ERROR) {
return lastResult;
}
// 成功或不可重试 // 成功或不可重试
if (lastResult.errorMessage() == null || lastResult.errorType() == ErrorType.NONE) { if (lastResult.errorMessage() == null || lastResult.errorType() == ErrorType.NONE) {
return lastResult; return lastResult;
@ -394,6 +403,13 @@ public class NodeStreamingChatHelper {
conversationId, phase, errorType); conversationId, phase, errorType);
} }
// Client error (400): 不重试（参数/格式错误重试也不会变）
if (errorType == ErrorType.CLIENT_ERROR) {
log.error("[{}] Client error (400), not retrying: {}", phase, error.getMessage());
return buildErrorResultWithType("请求参数错误: " + extractUserFriendlyError(error),
conversationId, phase, errorType);
}
// Rate limit / Server error: 重试 // Rate limit / Server error: 重试
if (attempt < MAX_RETRIES && (errorType == ErrorType.RATE_LIMIT || errorType == ErrorType.SERVER_ERROR)) { if (attempt < MAX_RETRIES && (errorType == ErrorType.RATE_LIMIT || errorType == ErrorType.SERVER_ERROR)) {
log.warn("[{}] Retryable error (attempt {}/{}, type={}): {}", log.warn("[{}] Retryable error (attempt {}/{}, type={}): {}",
@ -542,6 +558,8 @@ public class NodeStreamingChatHelper {
if (msg == null) return error.getClass().getSimpleName(); if (msg == null) return error.getClass().getSimpleName();
// 对 Jackson 反序列化错误，提取关键信息 // 对 Jackson 反序列化错误，提取关键信息
if (msg.contains("engine_overloaded")) return "模型服务过载，请稍后重试"; if (msg.contains("engine_overloaded")) return "模型服务过载，请稍后重试";
if (msg.contains("unsupported image format") || msg.contains("unsupported")) return "不支持的文件格式（如 SVG），请使用 PNG/JPG 等光栅图片";
if (msg.contains("invalid_request_error") || msg.contains("400 Bad Request")) return "请求参数错误，请检查输入";
if (msg.contains("rate_limit") || msg.contains("429")) return "请求频率过高，请稍后重试"; if (msg.contains("rate_limit") || msg.contains("429")) return "请求频率过高，请稍后重试";
if (msg.contains("timeout") || msg.contains("Timeout")) return "请求超时，请重试"; if (msg.contains("timeout") || msg.contains("Timeout")) return "请求超时，请重试";
if (msg.contains("502") || msg.contains("503") || msg.contains("504")) return "模型服务暂时不可用"; if (msg.contains("502") || msg.contains("503") || msg.contains("504")) return "模型服务暂时不可用";
@ -563,6 +581,8 @@ public class NodeStreamingChatHelper {
PROMPT_TOO_LONG, PROMPT_TOO_LONG,
/** 认证错误 */ /** 认证错误 */
AUTH_ERROR, AUTH_ERROR,
/** 客户端错误 (400 Bad Request, 不支持的格式等) — 不应重试 */
CLIENT_ERROR,
/** 其他未知错误 */ /** 其他未知错误 */
UNKNOWN UNKNOWN
} }