修复:智能分析空回答与工具结束条件冲突

统一自主分析工具范围与执行前校验,严格核验正常结束、最终正文和图表恢复状态,并显示空回答及恢复失败原因。

包含两次已上线修复及回归测试,保留已有回答与业务数据。

验证:1101 项 Python、469 项前端、97 项后端测试通过;前后端构建和真实模型、页面验收通过。
This commit is contained in:
2026-11-03 08:56:49 +08:00
parent 7ffb5cdb9c
commit 52d92c95d8
20 changed files with 387 additions and 37 deletions
@@ -326,8 +326,16 @@ public class AnalysisProtocolService {
metadata.put("sourceStatus",input.get("sourceStatus"));metadata.put("queryRefs",checked.get("queryRefs"));metadata.put("missingEvidence",checked.get("missingEvidence"));
var overlay=new LinkedHashMap<String,Object>();for(String key:List.of("visualSchemaVersion","visualState","visuals"))overlay.put(key,checked.get(key));overlay.put("visualRecovery",metadata);
boolean originalComplete="COMPLETED".equals(input.get("sourceStatus"));
boolean factsComplete=Boolean.TRUE.equals(map(map(input.get("sourceAnswer")).get("factCoverage")).get("complete"))&&Boolean.TRUE.equals(input.get("factsStillCovered"));
if(!originalComplete&&factsComplete&&Boolean.TRUE.equals(checked.get("chartsComplete"))) {
var sourceAnswer=map(input.get("sourceAnswer"));var quality=new LinkedHashMap<>(map(sourceAnswer.get("answerQuality")));
boolean chartsComplete=Boolean.TRUE.equals(checked.get("chartsComplete"));
if(!quality.isEmpty()){quality.put("chartsComplete",chartsComplete);overlay.put("answerQuality",quality);}
boolean factsComplete=Boolean.TRUE.equals(map(sourceAnswer.get("factCoverage")).get("complete"))&&Boolean.TRUE.equals(input.get("factsStillCovered"));
boolean narrativeComplete=Boolean.TRUE.equals(quality.get("narrativeComplete"))&&Boolean.TRUE.equals(quality.get("dataComplete"))
&&!Boolean.FALSE.equals(sourceAnswer.get("nativeStopSucceeded"))
&&!Boolean.FALSE.equals(quality.get("citationComplete"))&&list(quality.get("unresolvedEvidenceRefs")).isEmpty()
&&!Objects.toString(sourceAnswer.get("answer"),"").isBlank();
if(!originalComplete&&"PARTIAL".equals(input.get("sourceStatus"))&&factsComplete&&narrativeComplete&&chartsComplete) {
metadata.put("priorMissingEvidence",list(quality.get("missingEvidence")));quality.put("missingEvidence",List.of());
overlay.put("status","COMPLETED");overlay.put("originalStatus",input.get("sourceStatus"));
overlay.put("completion",Map.of("completed",true,"reason","visual_recovery_complete"));overlay.put("stopReason","visual_recovery_complete");
}
@@ -13,6 +13,7 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.ConcurrentHashMap;
@@ -429,6 +430,26 @@ public class NaoAnalysisRunner {
status = "FAILED";
if (reason.isBlank()) reason = "原装 NAO 返回了无效结束状态";
}
boolean conflictingExit=Boolean.FALSE.equals(message.get("nativeStopSucceeded"))
|| message.get("finishReason") instanceof String finish&&!finish.isBlank()&&!"stop".equalsIgnoreCase(finish)
|| message.get("toolCalls") instanceof List<?> calls&&calls.stream().anyMatch(raw->raw instanceof Map<?,?> call&&"started".equals(call.get("status")))
|| message.get("answerQuality") instanceof Map<?,?> quality&&Boolean.FALSE.equals(quality.get("narrativeComplete"));
if(Set.of("COMPLETED","PARTIAL").contains(status)&&conflictingExit) {
if("COMPLETED".equals(status)){status="PARTIAL";reason="incomplete_finish";}
var quality=new LinkedHashMap<String,Object>();
if(message.get("answerQuality") instanceof Map<?,?> prior)prior.forEach((k,v)->quality.put(String.valueOf(k),v));
quality.put("version",1);quality.put("narrativeComplete",false);details.put("answerQuality",quality);
}
boolean visibleBody=!answer.isBlank()
|| message.get("reportMarkdown") instanceof String markdown&&!markdown.isBlank()
|| message.get("reportHtml") instanceof String html&&!html.isBlank()
|| message.get("memberList") instanceof Map<?,?> || message.get("recordList") instanceof Map<?,?>;
if("COMPLETED".equals(status)&&!visibleBody) {
status="PARTIAL";reason="answer_missing";
var quality=new LinkedHashMap<String,Object>();
if(message.get("answerQuality") instanceof Map<?,?> prior)prior.forEach((k,v)->quality.put(String.valueOf(k),v));
quality.put("version",1);quality.put("narrativeComplete",false);details.put("answerQuality",quality);
}
if ("FAILED".equals(status) && safeMessage != null) {
details.put("message", safeMessage);
if (answer.isBlank()) answer = safeMessage;
@@ -437,6 +458,7 @@ public class NaoAnalysisRunner {
details.remove("message");
}
details.put("status", status);
details.put("stopReason", reason);
details.put("answer", answer);
details.put("engine", "NAO");
return new Result(status, answer, details, reason);