修复:完整展示AI原文并穿插图表,统一运行反馈与变化符号
This commit is contained in:
@@ -415,7 +415,8 @@ public class AnalysisProtocolService {
|
||||
jdbc.update("UPDATE analysis_protocol_execution SET status='FAILED' WHERE execution_id=? AND status='RUNNING'",a.executionId());
|
||||
jdbc.update("UPDATE analysis_protocol_session SET status='FAILED',version=version+1 WHERE session_id=?",a.sessionId());
|
||||
jdbc.update("UPDATE analysis_protocol_attempt SET status='FAILED' WHERE attempt_id=?",id);
|
||||
Map<String,Object> answer=Map.of("answer",reason,"results",List.of(),"releaseId",a.releaseId(),"engine",a.input().containsKey("controlledInspection")?"CONTROLLED_INSPECTION_PROTOCOL":"NAO","completion",Map.of("completed",false,"reason",reason));
|
||||
boolean nativeConversation=autonomousSession(a.sessionId())&&!a.input().containsKey("controlledInspection");
|
||||
Map<String,Object> answer=Map.of("answer",nativeConversation?"":reason,"results",List.of(),"releaseId",a.releaseId(),"engine",a.input().containsKey("controlledInspection")?"CONTROLLED_INSPECTION_PROTOCOL":"NAO","completion",Map.of("completed",false,"reason",reason));
|
||||
jdbc.update("UPDATE analysis_turn SET status='FAILED',answer_json=CAST(? AS JSON),stop_reason=?,finished_at=CURRENT_TIMESTAMP(6) WHERE id=?",write(answer),reason,a.turnId());
|
||||
inspection.updateAssociation(a,"FAILED");
|
||||
event(id,"failed",Map.of("turnId",a.turnId(),"status","FAILED","result",answer,"stopReason",reason));
|
||||
@@ -628,12 +629,18 @@ public class AnalysisProtocolService {
|
||||
if(Set.of("COMPLETED","PARTIAL").contains(status)&&!"report".equals(task.get("kind"))
|
||||
&&!hasProtocolEvidence(details)) {
|
||||
status="FAILED";
|
||||
String original=AnalysisProtocolExploration.nativeAgent(task)?Objects.toString(answer.get("answer"),""):null;
|
||||
answer.clear();
|
||||
answer.put("answer",noProofFailureReason(details));
|
||||
answer.put("answer",original!=null?original:noProofFailureReason(details));
|
||||
answer.put("results",List.of());
|
||||
answer.put("releaseId",a.releaseId());
|
||||
answer.put("engine","NAO");
|
||||
answer.put("stopReason","formal_query_evidence_missing");
|
||||
if(original!=null) {
|
||||
answer.put("executionMode","native_agent");
|
||||
answer.put("answerQuality",Map.of("version",1,"dataComplete",false,"narrativeFactBinding","not_assessed",
|
||||
"missingEvidence",List.of(noProofFailureReason(details))));
|
||||
}
|
||||
} else if(Set.of("COMPLETED","PARTIAL").contains(status)) {
|
||||
governance.requireBoundAction("QUERY","query.aggregate");
|
||||
if(AnalysisProtocolInspection.KIND.equals(task.get("kind"))) {
|
||||
@@ -672,7 +679,7 @@ public class AnalysisProtocolService {
|
||||
answer.put("answerQuality",quality);
|
||||
}
|
||||
if(AnalysisProtocolExploration.nativeAgent(task)){for(String key:List.of("scopeCoverage","explorationWarnings","conclusionProtocolQueryIds","attemptProtocolQueryIds"))if(checked.containsKey(key))answer.put(key,checked.get(key));}
|
||||
if(Boolean.TRUE.equals(task.get("verifySource"))||Boolean.TRUE.equals(task.get("fullDetails"))) {
|
||||
if(!AnalysisProtocolExploration.nativeAgent(task)&&(Boolean.TRUE.equals(task.get("verifySource"))||Boolean.TRUE.equals(task.get("fullDetails")))) {
|
||||
for(String field:List.of("reportMarkdown","reportHtml","reportTitle"))answer.remove(field);
|
||||
String rawStatus=rawStatusText(checked,map(recordList));
|
||||
if(planResolution(a,task,actor).scopes().stream().allMatch(AnalysisProtocolService::rawScope))answer.put("answer",rawStatus);
|
||||
@@ -680,7 +687,7 @@ public class AnalysisProtocolService {
|
||||
}
|
||||
if(!Boolean.TRUE.equals(checked.get("complete"))) {
|
||||
status="PARTIAL";answer.put("stopReason","evidence_incomplete");
|
||||
if(AnalysisProtocolExploration.nativeAgent(task))appendCoverageNotices(answer,list(checked.get("missingEvidence")));
|
||||
if(AnalysisProtocolExploration.nativeAgent(task))appendNativeCoverageDiagnostics(answer,list(checked.get("missingEvidence")));
|
||||
}
|
||||
} else {
|
||||
validateMetricEvidence(a,task,details);
|
||||
@@ -801,6 +808,15 @@ public class AnalysisProtocolService {
|
||||
}
|
||||
return result;
|
||||
}
|
||||
/** Native model prose is immutable; coverage gaps belong to the saved execution metadata. */
|
||||
static void appendNativeCoverageDiagnostics(Map<String,Object> answer,List<?> missing) {
|
||||
var gaps=new LinkedHashSet<String>();
|
||||
var quality=new LinkedHashMap<>(map(answer.get("answerQuality")));
|
||||
for(Object raw:list(quality.get("missingEvidence")))if(raw instanceof String gap&&!gap.isBlank())gaps.add(gap);
|
||||
for(Object raw:missing)if(raw instanceof String gap&&!gap.isBlank())gaps.add(gap);
|
||||
if(gaps.isEmpty())return;
|
||||
quality.putIfAbsent("version",1);quality.put("missingEvidence",List.copyOf(gaps));answer.put("answerQuality",quality);
|
||||
}
|
||||
/** A server downgrade must remain visible even when the model omitted its own limitations. */
|
||||
private void appendCoverageNotices(Map<String,Object> answer,List<?> missing) {
|
||||
var gaps=missing.stream().filter(String.class::isInstance).map(String.class::cast).filter(s->!s.isBlank()).distinct().toList();
|
||||
|
||||
@@ -1626,6 +1626,15 @@ public class AnalysisTurnService {
|
||||
if(quality.get(field) instanceof Boolean value)safe.put(field,value);
|
||||
if(quality.get("missingEvidence") instanceof List<?> gaps)safe.put("missingEvidence",gaps.stream()
|
||||
.filter(value->value instanceof String gap&&!gap.isBlank()&&gap.length()<=1000).distinct().limit(20).toList());
|
||||
if("not_assessed".equals(quality.get("narrativeFactBinding")))safe.put("narrativeFactBinding","not_assessed");
|
||||
for(String field:List.of("citedEvidenceRefs","unresolvedEvidenceRefs"))if(quality.get(field) instanceof List<?> refs) {
|
||||
var visible=refs.stream().filter(value->value instanceof String ref&&ref.matches("Q[A-F0-9]{8}")
|
||||
&&(!field.equals("citedEvidenceRefs")||(answer.get("queryEvidenceRefs") instanceof List<?> allowed?allowed:List.of()).contains(ref))).distinct().limit(100).toList();
|
||||
safe.put(field,visible);
|
||||
if(field.equals("unresolvedEvidenceRefs"))safe.put("citationComplete",visible.isEmpty());
|
||||
}
|
||||
if(quality.get("notices") instanceof List<?> notices)safe.put("notices",notices.stream()
|
||||
.filter(value->value instanceof String notice&&!notice.isBlank()&¬ice.length()<=1000).distinct().limit(20).toList());
|
||||
answer.put("answerQuality",safe);
|
||||
}
|
||||
Object count = details.get("toolCount");
|
||||
|
||||
Reference in New Issue
Block a user