统一:DSH 智能分析、Top100 与图表静默恢复

接入 DSH 专用运行时和对话界面,保留模型原始回答,支持会话分页、连续追问与显式报告。
补齐组合筛选、各维度 Top100、分组查询到排名图的转换,图表故障静默省略并基于保存数据自动恢复。
优化报告风格、图表顺序和表格换行,更新接入说明及构建输入。

验证:独立目录前后端构建通过;118 项 Java、102 项前端、102 项图表、14 项 DSH 应用和 13 项组合筛选检查通过。
仅提交相关源码、锁定依赖与测试;不包含凭据、会话、业务数据或本地产物。
This commit is contained in:
2026-11-12 11:57:41 +08:00
parent cc8832c8e5
commit f1a2fbd494
166 changed files with 26281 additions and 2248 deletions
@@ -0,0 +1,21 @@
package cn.yunsheng.quality.analysis;
import cn.yunsheng.quality.common.DepartmentLabels;
import java.util.*;
/** Agent-visible organization directory; historical source data stays intact. */
final class AnalysisAgentCatalog {
static Map<String,Object> active(Map<String,Object> source) {
var result=new LinkedHashMap<>(source);
result.put("departments",AnalysisProtocolService.list(source.get("departments")).stream()
.filter(x->x instanceof String name&&!DepartmentLabels.isRetired(name)).toList());
var owners=new LinkedHashMap<String,Object>();
AnalysisProtocolService.map(source.get("groupDepartments")).forEach((group,department)->{
if(department instanceof String name&&!DepartmentLabels.isRetired(name))owners.put(group,department);
});
result.put("groupDepartments",owners);
result.put("groups",AnalysisProtocolService.list(source.get("groups")).stream()
.filter(group->!AnalysisProtocolService.map(source.get("groupDepartments")).containsKey(group)||owners.containsKey(group)).toList());
return result;
}
}
@@ -61,7 +61,7 @@ public class AnalysisApiSettingsService {
String configured = property != null && !property.isBlank() ? property : environment;
if (configured != null && !configured.isBlank()) return Path.of(configured).toAbsolutePath().normalize();
for (Path p = start.toAbsolutePath().normalize(); p != null; p = p.getParent())
if (Files.isRegularFile(p.resolve("scripts/nao_quality_runtime.py"))) return p;
if (Files.isRegularFile(p.resolve("scripts/quality_analysis_runtime.py"))) return p;
throw new IllegalStateException("Quality project root was not found");
}
@@ -70,11 +70,18 @@ public class AnalysisApiSettingsService {
return view(c, profiles(c));
}
/** Returns the selected analysis engine without exposing any model credentials. */
public synchronized String runtimeEngine() {
return AnalysisRuntimeEngine.DSH;
}
public synchronized Map<String, Object> save(Settings request) {
Config current = load();
if (request == null || request.revision() == null) throw bad("请先读取当前 API 配置");
if (!current.revision().equals(request.revision()))
throw new ResponseStatusException(HttpStatus.CONFLICT, "API 配置已被修改,请重新打开后再保存");
if (request.runtimeEngine() != null && !AnalysisRuntimeEngine.DSH.equalsIgnoreCase(request.runtimeEngine().strip()))
throw bad("线上分析引擎固定为 DeepSeek Harness");
List<Profile> profiles = profiles(current);
Profile selected = selectedProfile(request.profileId(), current, profiles);
Config next = resolve(request, selected.config());
@@ -87,13 +94,13 @@ public class AnalysisApiSettingsService {
try {
Files.createDirectories(target.getParent());
if (Files.isSymbolicLink(target.getParent()) || Files.isSymbolicLink(target)) throw new IOException();
temp = Files.createTempFile(target.getParent(), ".nao-model-", ".tmp");
temp = Files.createTempFile(target.getParent(), ".quality-model-", ".tmp");
if (Files.getFileStore(temp).supportsFileAttributeView("posix")) {
Files.setPosixFilePermissions(temp, PosixFilePermissions.fromString("rw-------"));
}
List<Map<String,Object>> storedProfiles = updated.stream().map(p -> Map.<String,Object>of(
"id",p.id(),"name",p.name(),"baseUrl",p.config().baseUrl(),"apiKey",p.config().apiKey(),"model",p.config().model(),"thinkingEnabled",p.config().thinkingEnabled(),"thinkingEffort",p.config().thinkingEffort())).toList();
Files.writeString(temp, json.writeValueAsString(Map.of("schemaVersion", 3, "baseUrl", next.baseUrl(),
Files.writeString(temp, json.writeValueAsString(Map.of("schemaVersion", 4, "baseUrl", next.baseUrl(),
"apiKey", next.apiKey(), "model", next.model(), "revision", next.revision(),
"activeProfileId", selected.id(), "profiles", storedProfiles,"thinkingEnabled",next.thinkingEnabled(),"thinkingEffort",next.thinkingEffort())), StandardCharsets.UTF_8);
Files.move(temp, target, StandardCopyOption.ATOMIC_MOVE, StandardCopyOption.REPLACE_EXISTING);
@@ -251,8 +258,8 @@ public class AnalysisApiSettingsService {
}
private Path settingsPath() {
String selected=System.getenv("QUALITY_NAO_MODEL_CONFIG_FILE");
return selected==null||selected.isBlank()?root.resolve(".runtime/nao-model-config.json"):Path.of(selected).toAbsolutePath().normalize();
String selected=System.getenv("QUALITY_ANALYSIS_MODEL_CONFIG_FILE");
return selected==null||selected.isBlank()?root.resolve(".runtime/quality-model-config.json"):Path.of(selected).toAbsolutePath().normalize();
}
private List<Profile> profiles(Config current) {
try {
@@ -310,6 +317,8 @@ public class AnalysisApiSettingsService {
private Map<String, Object> view(Config c,List<Profile> profiles) {
var result = new LinkedHashMap<String,Object>();
result.putAll(Map.of("baseUrl", c.baseUrl(), "model", c.model(), "hasApiKey", !c.apiKey().isBlank(), "revision", c.revision(),"thinkingEnabled",c.thinkingEnabled(),"thinkingEffort",c.thinkingEffort()));
result.put("runtimeEngine", AnalysisRuntimeEngine.DSH);
result.put("runtimeEngineLocked", true);
result.put("maxOutputTokens",AnalysisRuntimePolicy.MAX_OUTPUT_TOKENS);
result.put("activeProfileId",activeProfileId(c,profiles));
result.put("profiles",profiles.stream().map(p->Map.of("id",p.id(),"name",p.name(),"baseUrl",p.config().baseUrl(),
@@ -328,7 +337,10 @@ public class AnalysisApiSettingsService {
return text;
}
private static ResponseStatusException bad(String message) { return new ResponseStatusException(HttpStatus.BAD_REQUEST, message); }
public record Settings(String baseUrl, String apiKey, String model, String revision, String profileId, Boolean thinkingEnabled, String thinkingEffort) {
public record Settings(String baseUrl, String apiKey, String model, String revision, String profileId, Boolean thinkingEnabled, String thinkingEffort, String runtimeEngine) {
public Settings(String baseUrl,String apiKey,String model,String revision,String profileId,Boolean thinkingEnabled,String thinkingEffort) {
this(baseUrl,apiKey,model,revision,profileId,thinkingEnabled,thinkingEffort,null);
}
public Settings(String baseUrl,String apiKey,String model,String revision,String profileId) { this(baseUrl,apiKey,model,revision,profileId,null,null); }
public Settings(String baseUrl,String apiKey,String model,String revision) { this(baseUrl,apiKey,model,revision,null); }
@Override public String toString() { return "Settings[credentials redacted]"; }
@@ -639,7 +639,7 @@ public class AnalysisChangesService {
String sort = body.containsKey("sort") ? text(body.get("sort"), "sort") : "rate_drop";
if (!SORTS.contains(sort)) throw bad("sort 只支持 rate_drop、current_rate、scrap_delta、current_scrap");
int limit = body.containsKey("limit") ? integer(body.get("limit"), "limit") : 10;
if (limit < 1 || limit > 10) throw bad("limit 必须在 1 到 10 之间");
if (limit < 1 || limit > 100) throw bad("limit 必须在 1 到 100 之间");
List<String> fields = fields(body.get("fields"), body.containsKey("fields"));
return new Request(releaseId, current, comparison, filters, dimension, stage, sort, limit, fields);
}
@@ -21,6 +21,7 @@ import java.util.Objects;
import java.util.UUID;
import java.util.Set;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.security.core.annotation.AuthenticationPrincipal;
@@ -33,8 +34,10 @@ import org.springframework.web.bind.annotation.PatchMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.server.ResponseStatusException;
import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
import tools.jackson.databind.JsonNode;
import tools.jackson.databind.json.JsonMapper;
@@ -52,8 +55,11 @@ public class AnalysisController {
private final TransactionTemplate transaction;
private final AnalysisApiSettingsService apiSettings;
private AnalysisProtocolService protocol;
private AnalysisTurnService turnService;
@org.springframework.beans.factory.annotation.Autowired
public void setProtocol(AnalysisProtocolService protocol){this.protocol=protocol;}
@org.springframework.beans.factory.annotation.Autowired
public void setTurnService(AnalysisTurnService turnService) { this.turnService = turnService; }
@org.springframework.beans.factory.annotation.Value("${quality.analysis.visuals-enabled:true}")
private boolean visualsEnabled = true;
@@ -89,9 +95,9 @@ public class AnalysisController {
String host = URI.create(baseUrl).getHost();
if (host == null || host.isBlank()) return unconfiguredModelStatus();
return Map.of("configured", true, "model", configuredModel, "serviceHost", host,
"mode", "NAO_AGENT_SERVER_TOOLS", "businessResultsSentToModel", true,
"mode", "DSH_AGENT_SERVER_TOOLS", "businessResultsSentToModel", true,
"authorizedQueryResultsMayBeSentToModel", true,
"capabilities", List.of("nativeNaoRuntime", "authorizedServerTools", "structuredQuery",
"capabilities", List.of("nativeDshRuntime", "authorizedServerTools", "structuredQuery",
"statistics", "periodicReports"));
} catch (RuntimeException invalidOrUnavailable) {
return unconfiguredModelStatus();
@@ -99,7 +105,7 @@ public class AnalysisController {
}
private static Map<String, Object> unconfiguredModelStatus() {
return Map.of("configured", false, "mode", "NAO_NOT_CONFIGURED",
return Map.of("configured", false, "mode", "DSH_NOT_CONFIGURED",
"businessResultsSentToModel", false, "authorizedQueryResultsMayBeSentToModel", false);
}
@@ -147,35 +153,86 @@ public class AnalysisController {
@GetMapping("/sessions/{id}")
public Map<String, Object> history(@PathVariable String id, @AuthenticationPrincipal AppUserPrincipal actor) {
return historyWindow(id, actor, null, null);
}
@GetMapping("/sessions/{id}/history")
public Map<String, Object> historyPage(@PathVariable String id,
@RequestParam(required = false) String before,
@AuthenticationPrincipal AppUserPrincipal actor) {
if (before != null && !before.matches("[a-fA-F0-9-]{36}"))
throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "历史游标无效");
return historyWindow(id, actor, 6, before);
}
@GetMapping(value = "/sessions/{id}/follow", produces = MediaType.TEXT_EVENT_STREAM_VALUE)
public SseEmitter follow(@PathVariable String id, @AuthenticationPrincipal AppUserPrincipal actor) {
// This authorization and the turn-plus-cursor read run before sending any SSE bytes.
Map<String, Object> snapshot = historyWindow(id, actor, 6, null);
return turnService.followSession(snapshot, actor);
}
private record SavedTurn(String id, String question, String answer, String steps, String plan,
String status, BigDecimal created, BigDecimal started, BigDecimal finished, String eventCursor) {}
private Map<String, Object> historyWindow(String id, AppUserPrincipal actor, Integer pageSize, String before) {
governance.requireDetail(actor);
governance.requireBoundAction("QUERY", "query.detail");
Session session = ownedSession(id, actor);
// A retained version alone never grants access; re-run the scoped query before returning stored evidence.
if(protocol!=null&&protocol.ownsSession(id))protocol.authorizeHistory(id,actor);
boolean protocolSession = protocol != null && protocol.ownsSession(id);
if(protocolSession)protocol.authorizeHistory(id,actor);
else metrics.calculate(toQuery(session.context(), session.releaseId()), actor);
Set<String> allowedFields = governance.allowedFields(actor);
Set<String> visibleFilterKeys = AnalysisVisualSnapshotAccess.visibleExtraFilterKeys(jdbc, allowedFields);
List<Map<String, Object>> turns = jdbc.query("SELECT id,question,answer_json,steps_json,plan_json,created_at,status FROM analysis_turn WHERE session_id=? AND user_id=? ORDER BY created_at",
(rs, n) -> {
String turnId = rs.getString("id");
Map<String, Object> plan = rs.getString("plan_json") == null ? Map.of() : read(rs.getString("plan_json"));
if(protocol!=null&&protocol.ownsSession(id)&&"report".equals(AnalysisProtocolService.map(plan.get("task")).get("kind"))
&&Set.of("COMPLETED","PARTIAL").contains(Objects.toString(rs.getString("status"),"")))
protocol.authorizeReportSnapshot(turnId,actor);
if(protocol!=null&&protocol.ownsSession(id)&&AnalysisProtocolInspection.KIND.equals(AnalysisProtocolService.map(plan.get("task")).get("kind"))
&&Set.of("COMPLETED","PARTIAL").contains(Objects.toString(rs.getString("status"),"")))protocol.authorizeInspectionSnapshot(turnId,actor);
Map<String, Object> expectedScope = new LinkedHashMap<>(AnalysisTurnService.retryContext(plan));
expectedScope.remove("_task");
var visible=visibleAnswer(rs.getString("answer_json"),turnId,expectedScope,allowedFields,visibleFilterKeys);
if(visualsEnabled&&protocol!=null&&protocol.ownsTurn(turnId)&&Set.of("COMPLETED","PARTIAL").contains(rs.getString("status")))
visible.putAll(protocol.visualRecoveryOverlay(turnId,actor));
return Map.of("id", turnId, "question", rs.getString("question"),
"result", visible,
"steps", rs.getString("steps_json") == null ? List.of() : mapper.readValue(rs.getString("steps_json"), List.class),
"plan", plan, "createdAt", rs.getTimestamp("created_at").toInstant().toString());
},
session.id(), actor.getId().toString());
return Map.of("id", session.id(), "title", session.title(), "releaseId", session.releaseId(), "context", session.context(), "turns", turns, "readOnly",protocol!=null&&protocol.legacyReadOnly(id));
String owner = actor.getId().toString();
var arguments = new ArrayList<Object>(List.of(session.id(), owner));
String sql = """
SELECT id,question,answer_json,steps_json,plan_json,status,
UNIX_TIMESTAMP(created_at)*1000,UNIX_TIMESTAMP(started_at)*1000,UNIX_TIMESTAMP(finished_at)*1000,
(SELECT MAX(e.id) FROM analysis_turn_event e WHERE e.turn_id=analysis_turn.id)
FROM analysis_turn WHERE session_id=? AND user_id=?
""";
if (before != null) {
sql += " AND (created_at,id) < (SELECT created_at,id FROM analysis_turn WHERE id=? AND session_id=? AND user_id=?)";
arguments.addAll(List.of(before, session.id(), owner));
}
sql += pageSize == null ? " ORDER BY created_at,id" : " ORDER BY created_at DESC,id DESC LIMIT ?";
if (pageSize != null) arguments.add(pageSize + 1);
List<SavedTurn> saved = jdbc.query(sql, (rs, n) -> new SavedTurn(rs.getString("id"),
rs.getString("question"), rs.getString("answer_json"), rs.getString("steps_json"), rs.getString("plan_json"),
rs.getString("status"), rs.getBigDecimal(7), rs.getBigDecimal(8), rs.getBigDecimal(9), rs.getString(10)), arguments.toArray());
boolean hasMore = pageSize != null && saved.size() > pageSize;
if (hasMore) saved = saved.subList(0, pageSize);
if (pageSize != null) saved = saved.reversed();
List<Map<String, Object>> turns = new ArrayList<>();
for (SavedTurn row : saved) {
Map<String, Object> plan = row.plan() == null ? Map.of() : read(row.plan());
boolean settled = "COMPLETED".equals(row.status()) || "PARTIAL".equals(row.status());
Object taskKind = AnalysisProtocolService.map(plan.get("task")).get("kind");
if (protocolSession && settled && "report".equals(taskKind)) protocol.authorizeReportSnapshot(row.id(), actor);
if (protocolSession && settled && AnalysisProtocolInspection.KIND.equals(taskKind)) protocol.authorizeInspectionSnapshot(row.id(), actor);
Map<String, Object> scope = new LinkedHashMap<>(AnalysisTurnService.retryContext(plan));
scope.remove("_task");
var visible = visibleAnswer(row.answer(), row.id(), scope, allowedFields, visibleFilterKeys);
if (visualsEnabled && settled && protocol != null && protocol.ownsTurn(row.id()))
visible.putAll(protocol.visualRecoveryOverlay(row.id(), actor));
var turn = new LinkedHashMap<String, Object>();
turn.put("id", row.id()); turn.put("question", row.question()); turn.put("status", row.status());
turn.put("result", AnalysisRuntimeEngine.publicMetadata(visible));
turn.put("plan", AnalysisRuntimeEngine.publicMetadata(plan));
turn.put("steps", row.steps() == null ? List.of() : mapper.readValue(row.steps(), List.class));
turn.putAll(AnalysisTurnService.turnTimes(row.created(), row.started(), row.finished()));
if (row.eventCursor() != null) turn.put("eventCursor", row.eventCursor());
if (!AnalysisRuntimeEngine.canExecute(plan)) turn.put("retryAvailable", false);
turns.add(turn);
}
String activeTurnId = turns.stream()
.filter(turn -> "QUEUED".equals(turn.get("status")) || "RUNNING".equals(turn.get("status")))
.map(turn -> (String) turn.get("id")).findFirst().orElse("");
return Map.of("id", session.id(), "title", session.title(), "releaseId", session.releaseId(),
"context", session.context(), "turns", turns, "before", hasMore ? saved.getFirst().id() : "",
"readOnly", protocol != null && protocol.legacyReadOnly(id), "activeTurnId", activeTurnId);
}
private Map<String, Object> visibleAnswer(String encoded, String turnId, Map<String, Object> expectedScope,
@@ -33,7 +33,7 @@ final class AnalysisDirectConversation {
static Map<String,Object> answer(Map<String,Object> task,String release,Map<String,Object> context) {
validate(task);
var answer=new LinkedHashMap<String,Object>();answer.put("answer",AnalysisProtocolService.map(task.get("directResponse")).get("answer"));
answer.put("engine","NAO");answer.put("releaseId",release);answer.put("context",context);answer.put("task",task);
answer.put("engine",AnalysisRuntimeEngine.DSH);answer.put("releaseId",release);answer.put("context",context);answer.put("task",task);
answer.put("completionMethod","direct_conversation");answer.put("businessResultsSentToModel",false);answer.put("stopReason","direct_conversation");
for(String key:List.of("results","visuals","queryEvidenceRefs","protocolQueryIds"))answer.put(key,List.of());
answer.put("visualSchemaVersion",1);answer.put("visualState","not_requested");return answer;
@@ -14,7 +14,7 @@ final class AnalysisProtocolChanges {
static Map<String,Object> request(String release,Map<String,Object> child) {
Map<String,Object> query=map(child.get("changeQuery"));
if(!query.keySet().equals(Set.of("dimension","sort","limit"))||!Set.of("group","department","product").contains(query.get("dimension"))
||!SORTS.contains(query.get("sort"))||count(query.get("limit"),-1)<1||count(query.get("limit"),-1)>10)
||!SORTS.contains(query.get("sort"))||count(query.get("limit"),-1)<1||count(query.get("limit"),-1)>100)
throw invalid("变化节点缺少明确的分组、排序或展示上限");
List<?> stages=list(child.get("stages"));
if(stages.size()>1||!Set.of("black","bright").containsAll(stages))throw invalid("变化节点仅支持综合或单个阶段");
@@ -38,7 +38,7 @@ final class AnalysisProtocolExploration {
}
var task=new LinkedHashMap<>(root);task.put("filters",selected);task.put("queryPlan",List.of(next));
var dimensions=new LinkedHashSet<Object>();
if(Set.of("ranking","changes").contains(purpose))dimensions.add(node.get("dimension"));
if(Set.of("ranking","changes").contains(purpose)||"metrics".equals(purpose)&&node.containsKey("dimension"))dimensions.add(node.get("dimension"));
if("defects".equals(purpose)){dimensions.add("defect");if("product".equals(node.get("dimension")))dimensions.add("product");}
task.put("dimensions",List.copyOf(dimensions));task.put("fields",Set.of("source","records").contains(purpose)?List.of():node.get("fields"));
task.put("stages",next.get("stages"));task.put("trendRequired","trend".equals(purpose));
@@ -44,7 +44,6 @@ final class AnalysisProtocolQueryPlan {
if(stages.isEmpty()&&!fields.equals(List.of("rate"))&&!changesPurpose&&!combinedRanking)throw invalid("重量和报废率节点必须明确阶段;合计排名仅支持报废总重及综合合格率");
boolean compare=bool(node.getOrDefault("comparisonRequired",false));
if(compare&&(!Set.of("metrics","source","records","defects","changes").contains(purpose)||!(task.get("comparisonPeriod") instanceof Map<?,?>)))throw invalid("期间比较节点需要两个已确认期间");
if("trend".equals(purpose)&&map(task.get("period")).containsKey("month"))throw invalid("月度趋势需要多个月份范围");
String preference=string(node.getOrDefault("visualPreference",task.getOrDefault("visualPreference","auto")));
if(!Set.of("auto","required","none").contains(preference))throw invalid("节点图表偏好无效");
Object visual=node.get("visualType");
@@ -90,7 +89,7 @@ final class AnalysisProtocolQueryPlan {
case "previous_ranking" -> {
if(!selector.keySet().equals(Set.of("kind","queryId","stage","metric","ranks")))throw invalid("历史排名选择器格式无效");
String query=string(selector.get("queryId")),stage=string(selector.get("stage")),metric=string(selector.get("metric"));
List<Integer> ranks=integers(selector.get("ranks"),1,10);count=ranks.size();
List<Integer> ranks=integers(selector.get("ranks"),1,100);count=ranks.size();
Map<String,Object> available=availableRankings.stream().filter(row->query.equals(row.get("queryId"))&&stage.equals(row.get("stage"))&&metric.equals(row.get("metric"))&&"product".equals(row.get("dimension"))).findFirst().orElseThrow(()->invalid("旧排名缺少当前授权的真实快照,请重新查询排名"));
for(int rank:ranks)if(list(available.get("rows")).stream().noneMatch(row->Objects.equals(map(row).get("rank"),rank)))throw invalid("选择序号不在上轮实际展示排名中");
requestedDimensions.add("product");cleanSelector.put("queryId",query);cleanSelector.put("stage",stage);cleanSelector.put("metric",metric);cleanSelector.put("ranks",ranks);
@@ -108,7 +107,7 @@ final class AnalysisProtocolQueryPlan {
if("ranking".equals(purpose)) {
String dimension=string(node.get("dimension"));
if(!DIMENSIONS.contains(dimension)||!(combinedRanking||WEIGHTS.containsAll(fields)&&!stages.isEmpty())||compare||!kind.equals("base"))throw invalid("排名节点需要正式重量和基础分组;合计口径使用空阶段");
requestedDimensions.add(dimension);clean.put("dimension",dimension);clean.put("limit",integer(node.getOrDefault("limit",10),1,10));
requestedDimensions.add(dimension);clean.put("dimension",dimension);clean.put("limit",integer(node.getOrDefault("limit",10),1,100));
} else if(changesPurpose) {
String dimension=string(node.get("dimension")),sort=string(node.get("sort"));
if(!DIMENSIONS.contains(dimension)||!AnalysisProtocolChanges.SORTS.contains(sort)||stages.size()>1||!compare
@@ -116,12 +115,16 @@ final class AnalysisProtocolQueryPlan {
||Set.of("rate_drop","current_rate").contains(sort)&&!fields.contains("rate")
||Set.of("scrap_delta","current_scrap").contains(sort)&&!fields.contains("scrapWeight")
||!Set.of("base","changes_top").contains(kind))throw invalid("变化节点需要两个期间、正式率、综合或单阶段及明确排序");
requestedDimensions.add(dimension);clean.put("dimension",dimension);clean.put("sort",sort);clean.put("limit",integer(node.getOrDefault("limit",10),1,10));
requestedDimensions.add(dimension);clean.put("dimension",dimension);clean.put("sort",sort);clean.put("limit",integer(node.getOrDefault("limit",10),1,100));
} else if(defectPurpose) {
if(!fields.equals(List.of("scrapWeight")))throw invalid("缺陷节点只接受来源细项重量");
Map<String,Object> query=AnalysisProtocolDefects.normalizeNode(node,stages,catalog);
clean.putAll(query);requestedDimensions.add("defect");
if("product".equals(query.get("dimension")))requestedDimensions.add("product");
} else if("metrics".equals(purpose)&&node.containsKey("dimension")) {
String dimension=string(node.get("dimension"));
if(!Set.of("department","group","product").contains(dimension)||compare||!kind.equals("base"))throw invalid("批量汇总只支持当前基础范围的产业部、业务分组或产品");
requestedDimensions.add(dimension);clean.put("dimension",dimension);clean.put("limit",integer(node.getOrDefault("limit",100),1,500));
} else if(node.containsKey("dimension")||node.containsKey("limit"))throw invalid("指标或趋势节点不能伪装为分组排名");
int periodCount=compare?2:1;
int readsPerScope=changesPurpose||combinedRanking?1:"ranking".equals(purpose)?fields.size()*stages.size():rawPurpose||defectPurpose?stages.size()*periodCount:periodCount;
@@ -248,7 +251,8 @@ final class AnalysisProtocolQueryPlan {
Map<String,Object> child=new LinkedHashMap<>(parent);child.remove("queryPlan");child.remove("comparisonMode");
String purpose=string(node.get("purpose"));boolean ranking="ranking".equals(purpose),changes="changes".equals(purpose),defects="defects".equals(purpose),source="source".equals(purpose),records="records".equals(purpose),compare=Boolean.TRUE.equals(node.get("comparisonRequired"));
child.put("kind",source?"source_verify":records?"details":singleObjectMetricRanking(parent,node,filters)?"metrics":ranking||defects||changes?"analysis":"metrics");child.put("filters",filters);child.put("fields",node.get("fields"));child.put("stages",node.get("stages"));
child.put("dimensions",ranking?List.of(node.get("dimension")):List.of());child.put("dimensionStages",ranking?Map.of(string(node.get("dimension")),node.get("stages")):Map.of());
boolean breakdown="metrics".equals(purpose)&&node.containsKey("dimension");
child.put("dimensions",ranking||breakdown?List.of(node.get("dimension")):List.of());child.put("dimensionStages",ranking||breakdown?Map.of(string(node.get("dimension")),node.get("stages")):Map.of());
child.remove("defectQuery");child.remove("changeQuery");
if(changes){child.put("dimensions",List.of(node.get("dimension")));child.put("dimensionStages",Map.of(string(node.get("dimension")),node.get("stages")));child.put("changeQuery",Map.of("dimension",node.get("dimension"),"sort",node.get("sort"),"limit",node.get("limit")));}
if(defects) {
@@ -64,7 +64,7 @@ final class AnalysisProtocolRankArtifact {
if(denominator.signum()<0)return Map.of();
List<Map<String,Object>> rows=new ArrayList<>();
BigDecimal cumulative=BigDecimal.ZERO;
for(int i=0;i<Math.min(10,positive.size());i++) {
for(int i=0;i<Math.min(100,positive.size());i++) {
var row=new LinkedHashMap<>(positive.get(i));cumulative=cumulative.add((BigDecimal)row.get("weight"));
row.put("rank",i+1);row.put("share",((BigDecimal)row.get("weight")).divide(denominator,java.math.MathContext.DECIMAL128));
row.put("cumulativeShare",cumulative.divide(denominator,java.math.MathContext.DECIMAL128));rows.add(row);
@@ -96,7 +96,7 @@ final class AnalysisProtocolRankArtifact {
}
positive.sort((a,b)->{int weight=((BigDecimal)b.get("weight")).compareTo((BigDecimal)a.get("weight"));return weight!=0?weight:codePointCompare(a.get("key").toString(),b.get("key").toString());});
List<Map<String,Object>> rows=new ArrayList<>();
for(int i=0;i<Math.min(10,positive.size());i++){Map<String,Object> row=new LinkedHashMap<>(positive.get(i));row.put("rank",i+1);rows.add(row);}
for(int i=0;i<Math.min(100,positive.size());i++){Map<String,Object> row=new LinkedHashMap<>(positive.get(i));row.put("rank",i+1);rows.add(row);}
Map<String,Object> rank=new LinkedHashMap<>();rank.put("stage",stage);rank.put("metric",field);rank.put("rows",rows);rank.put("totalRows",positive.size());
rank.put("denominator",AnalysisProtocolService.map(AnalysisProtocolService.map(response.get("summary")).get(stage)).get(field));
rank.put("negativeGroups",negativeCount);rank.put("negativeWeight",negative);rank.put("orderPolicy","weight_desc_key_codepoint_asc");rank.put("completeRanking",true);rankings.add(rank);
@@ -17,7 +17,7 @@ import org.springframework.web.server.ResponseStatusException;
import tools.jackson.databind.json.JsonMapper;
import tools.jackson.databind.DeserializationFeature;
/** Authoritative state and publication boundary for explicitly opted-in NAO sessions. */
/** Authoritative state and publication boundary for delegated DSH sessions. */
@Service
public class AnalysisProtocolService {
private static final Set<String> FILTERS = Set.of("department", "group", "product", "projectGroup", "extraFilters", "columnFilters", "exclusions", "includeUnassigned");
@@ -136,8 +136,8 @@ public class AnalysisProtocolService {
attemptId,sessionId,turnId,write(input));
jdbc.update("UPDATE analysis_protocol_session SET current_attempt_id=? WHERE session_id=?",attemptId,sessionId);
Map<String,Object> plan=new LinkedHashMap<>();
plan.put("protocolVersion",1); plan.put("attemptId",attemptId); plan.put("nativeRuntime",true); plan.put("engine","NAO");
plan.put("status","NATIVE_NAO_PENDING"); plan.put("steps",List.of());
plan.put("protocolVersion",1); plan.put("attemptId",attemptId); plan.put("nativeRuntime",true); plan.put("engine",AnalysisRuntimeEngine.DSH);
plan.put("status",AnalysisRuntimeEngine.pendingStatus(AnalysisRuntimeEngine.DSH)); plan.put("steps",List.of());
plan.put("releaseId",inputContext(input).get("releaseId")); plan.put("frozenContext",inputContext(input));
Long floor=jdbc.queryForObject("SELECT COALESCE(MAX(id),0) FROM analysis_turn_event WHERE turn_id=?",Long.class,turnId);
plan.put("nativeEventFloor",floor==null?0:floor);
@@ -185,7 +185,9 @@ public class AnalysisProtocolService {
if(count!=1)throw conflict("任务状态已变化");
jdbc.update("UPDATE analysis_protocol_attempt SET status='PLANNING' WHERE attempt_id=?",a.attemptId());
inspection.updateAssociation(a,"RUNNING");
event(a.attemptId(),"progress",Map.of("turnId",turnId,"status","RUNNING","message","正在理解并验证当前任务…"));
var startedAt = jdbc.queryForObject("SELECT started_at FROM analysis_turn WHERE id=?", java.sql.Timestamp.class, turnId);
event(a.attemptId(),"progress",Map.of("turnId",turnId,"status","RUNNING","message","正在理解并验证当前任务…",
"startedAt", startedAt.toInstant().toString()));
return require(a.attemptId(),actor,false);
}
@@ -429,7 +431,7 @@ public class AnalysisProtocolService {
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);
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));
Map<String,Object> answer=Map.of("answer",nativeConversation?"":reason,"results",List.of(),"releaseId",a.releaseId(),"engine",frozenTurnEngine(a),"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));
@@ -582,7 +584,7 @@ public class AnalysisProtocolService {
int returned=list(data.get("rows")).size();
coverage.put("rowCount",map(data.get("context")).getOrDefault("rowCount",returned));
coverage.put("returnedRows",returned);
if(list(child.get("dimensions")).contains(params.get("view"))) {
if(!"metrics".equals(plannedScope.get("purpose"))&&list(child.get("dimensions")).contains(params.get("view"))) {
boolean complete=AnalysisProtocolRankingCoverage.complete(data,child,params.get("view"));
if(declared.containsKey("queryPlan")||AnalysisProtocolExploration.nativeAgent(declared)) {
Map<String,Object> summaryTask=new LinkedHashMap<>(child);summaryTask.put("trendRequired",false);
@@ -607,6 +609,7 @@ public class AnalysisProtocolService {
@Transactional
public void progress(String attemptId,Map<String,Object> progress,AppUserPrincipal actor) {
if (progress.containsKey("dshDraft")) throw conflict("临时输出不能写入分析记录");
lock(sessionForAttempt(attemptId));
Attempt a=require(attemptId,actor,false);
if(!"RUNNING".equals(a.turnStatus()))throw conflict("本轮已结束");
@@ -617,6 +620,8 @@ public class AnalysisProtocolService {
if(!delta.isEmpty())event(attemptId,"progress",Map.of("turnId",a.turnId(),"status","RUNNING","thinkingDelta",delta));
} else {
plan.put("progressMessage",Objects.toString(progress.get("message"),"正在分析…"));
if(progress.containsKey("dshActivity"))plan.put("dshActivity",progress.get("dshActivity"));
else plan.remove("dshActivity");
if(progress.containsKey("steps"))plan.put("steps",progress.get("steps"));
if(progress.containsKey("timeline"))plan.put("timeline",progress.get("timeline"));
jdbc.update("UPDATE analysis_turn SET plan_json=CAST(? AS JSON),steps_json=CAST(? AS JSON) WHERE id=?",write(plan),write(plan.getOrDefault("steps",List.of())),a.turnId());
@@ -633,6 +638,11 @@ public class AnalysisProtocolService {
if(!actor.getId().toString().equals(a.userId()) || !a.scopeHash().equals(AuthorizationFingerprint.of(actor,governance)))throw denied("授权范围已变化");
governance.requireBoundAction("QUERY","query.detail");if(!a.input().containsKey("controlledInspection"))governance.requireBoundAction("MODEL","model.intent.parse");
options.options(a.releaseId(),actor);
String frozenEngine=frozenTurnEngine(a);
Map<String,Object> originalOutput = new LinkedHashMap<>(details);
originalOutput.putAll(answer);
String original = modelAnswer(details, answer);
if (!original.isBlank()) originalOutput.put("modelAnswer", original);
answer=new LinkedHashMap<>(answer);for(String reserved:List.of("memberList","recordList","protocolQueryIds","executionScopes","executionCoverage","factCoverage","attemptProtocolQueryIds"))answer.remove(reserved);
String status=requestedStatus;
if(!Set.of("COMPLETED","PARTIAL","FAILED","CANCELLED","NEEDS_CLARIFICATION").contains(status))status="FAILED";
@@ -640,24 +650,33 @@ public class AnalysisProtocolService {
binding.current(a.sessionId(),a.turnId(),a.userId(),a.revision(),a.executionId());
Map<String,Object> task=read(store.revision(a.sessionId(),a.revision()).taskJson());
if(!Objects.equals(canonical(task),canonical(details.get("agentTask")))) throw denied("最终答复没有绑定当前任务");
if(Set.of("COMPLETED","PARTIAL").contains(status)&&AnalysisDirectConversation.applies(task)) {
boolean directDsh = !a.input().containsKey("controlledInspection")
&& AnalysisRuntimeEngine.DSH.equals(frozenEngine)
&& "dsh_direct_answer".equals(details.get("completionMethod"));
if(Set.of("COMPLETED","PARTIAL").contains(status)&&directDsh) {
// The worker publishes the original DSH body. Keep real query
// IDs for history, without post-answer content/coverage review.
answer.put("protocolQueryIds",jdbc.query(
"SELECT query_id FROM analysis_protocol_query WHERE attempt_id=? ORDER BY created_at,query_id",
(rs,n)->rs.getString(1),a.attemptId()));
for(String key:List.of("answerQuality","factCoverage","executionCoverage","scopeCoverage","explorationWarnings"))
answer.remove(key);
answer.put("answerValidation",Map.of("mode","disabled","originalPreserved",true));
if("report".equals(task.get("kind")))
for(String key:List.of("historySources","historySections","historyCoverage","historyEvidence","historyVisualSources"))
if(details.containsKey(key))answer.put(key,details.get(key));
} else if(Set.of("COMPLETED","PARTIAL").contains(status)&&AnalysisDirectConversation.applies(task)) {
answer=AnalysisDirectConversation.answer(task,a.releaseId(),taskContext(a.releaseId(),task));
status="COMPLETED";
} else 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",original!=null?original:noProofFailureReason(details));
answer.put("answer",noProofFailureReason(details));
answer.put("results",List.of());
answer.put("releaseId",a.releaseId());
answer.put("engine","NAO");
answer.put("engine",frozenEngine);
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"))) {
@@ -735,11 +754,30 @@ public class AnalysisProtocolService {
if(!Boolean.TRUE.equals(map(details.get("evidenceCompletion")).get("serverCoverageSufficient")))status="PARTIAL";
if(!task.containsKey("queryPlan")&&!AnalysisProtocolExploration.nativeAgent(task)&&Boolean.TRUE.equals(task.get("trendRequired"))&&!"none".equals(task.get("visualPreference"))&&!"ready".equals(answer.get("visualState")))status="PARTIAL";
answer.put("factCoverage",Map.of("version",1,"complete",factsComplete));
// The exportable artifact must be the exact evidence-checked body
// that survived server-side redaction and coverage handling.
retainCheckedDeliverable(answer);
}
}
} else if("COMPLETED".equals(status) || "PARTIAL".equals(status)) status="FAILED";
} else if("COMPLETED".equals(status) || "PARTIAL".equals(status)) {
status="FAILED";
answer.clear();
answer.put("answer",noProofFailureReason(details));
answer.put("results",List.of());
answer.put("releaseId",a.releaseId());
answer.put("stopReason","formal_query_evidence_missing");
}
if("CLARIFICATION".equals(a.status()) && !"NEEDS_CLARIFICATION".equals(status))status="FAILED";
answer=new LinkedHashMap<>(answer);answer.put("completion",Map.of("completed","COMPLETED".equals(status),"reason",Objects.toString(answer.get("stopReason"),"")));
if(!Set.of("COMPLETED","PARTIAL").contains(status))
for(String key:List.of("reportMarkdown","reportHtml","reportTitle"))answer.remove(key);
boolean modelAuthored = !a.input().containsKey("controlledInspection");
if (modelAuthored) preserveModelOutput(answer, originalOutput);
if (modelAuthored && originalOutput.containsKey("modelAnswer") && original.isBlank()) {
answer.put("answer", "");
answer.put("modelAnswer", "");
for (String key : List.of("reportMarkdown","reportHtml","reportTitle")) answer.remove(key);
}
answer=new LinkedHashMap<>(answer);answer.put("engine",frozenEngine);answer.put("completion",Map.of("completed","COMPLETED".equals(status),"reason",Objects.toString(answer.get("stopReason"),"")));
answer.put("protocol",identity(a));
if(a.executionId()!=null) {
var outcome="COMPLETED".equals(status)?AnalysisExecutionProtocolStore.Outcome.COMPLETED:
@@ -748,6 +786,7 @@ public class AnalysisProtocolService {
}
jdbc.update("UPDATE analysis_protocol_attempt SET status=? WHERE attempt_id=?",status,attemptId);
Map<String,Object> plan=read(jdbc.queryForObject("SELECT plan_json FROM analysis_turn WHERE id=?",String.class,a.turnId()));
plan.remove("dshActivity");
if(answer.get("context") instanceof Map<?,?>)plan.put("context",answer.get("context"));
List<Map<String,Object>> steps=AnalysisTurnService.nativeSteps(details.get("toolCalls"));plan.put("steps",steps);
jdbc.update("UPDATE analysis_turn SET status=?,answer_json=CAST(? AS JSON),plan_json=CAST(? AS JSON),steps_json=CAST(? AS JSON),stop_reason=?,finished_at=CURRENT_TIMESTAMP(6) WHERE id=? AND status='RUNNING'",
@@ -756,18 +795,104 @@ public class AnalysisProtocolService {
event(attemptId,status.toLowerCase(Locale.ROOT),Map.of("turnId",a.turnId(),"status",status,"result",answer));
}
static void retainCheckedDeliverable(Map<String,Object> answer) {
answer.remove("reportHtml");
if (!(answer.get("reportMarkdown") instanceof String markdown)
|| markdown.isBlank() || !markdown.equals(answer.get("answer"))) {
answer.remove("reportMarkdown");
answer.remove("reportTitle");
}
}
@SafeVarargs
static String modelAnswer(Map<String,Object>... sources) {
boolean explicit = false;
for (String field : List.of("modelAnswer", "answer")) {
if (field.equals("answer") && explicit) return "";
for (Map<String,Object> source : sources) {
if (source.get(field) instanceof String original) {
if (field.equals("modelAnswer")) explicit = true;
if (!original.isBlank()) return DshAnalysisRunner.publicText(original);
}
}
}
return "";
}
static void preserveModelOutput(Map<String,Object> answer, Map<String,Object> output) {
String original = modelAnswer(output);
if (original.isBlank()) return;
answer.put("modelAnswer", original);
answer.put("answer", original);
if (output.get("answerOrigin") instanceof String origin && origin.matches("[a-z_]{1,80}")) answer.put("answerOrigin",origin);
if (output.get("answerValidation") instanceof Map<?,?> validation) {
var safe = new LinkedHashMap<String,Object>();
for (String field : List.of("mode", "status", "stopReason", "originalPreserved")) {
Object value = validation.get(field);
if (value instanceof String text) safe.put(field,DshAnalysisRunner.publicText(text.substring(0,Math.min(text.length(),1000))));
else if (value instanceof Boolean) safe.put(field,value);
}
answer.put("answerValidation",safe);
}
if (output.get("reportMarkdown") instanceof String markdown && original.equals(DshAnalysisRunner.publicText(markdown))) {
answer.put("reportMarkdown", original);
answer.remove("reportHtml");
if (output.get("reportTitle") instanceof String title && !title.isBlank() && title.length() <= 160)
answer.put("reportTitle", DshAnalysisRunner.publicText(title));
} else if (answer.get("reportMarkdown") instanceof String markdown && !original.equals(markdown)) {
for (String field : List.of("reportMarkdown", "reportHtml", "reportTitle")) answer.remove(field);
}
}
/** Recovery keeps the same authorized attempt's model prose after a stop or a failed validation. */
@Transactional
public void preserveStoppedModelOutput(String id, Map<String,Object> output, AppUserPrincipal actor) {
if (modelAnswer(output).isBlank()) return;
lock(sessionForAttempt(id));
Attempt a = attempt(id);
if (!a.attemptId().equals(a.currentAttempt()) || !Set.of("FAILED", "CANCELLED").contains(a.turnStatus())) return;
if (!actor.getId().toString().equals(a.userId()) || !a.scopeHash().equals(AuthorizationFingerprint.of(actor,governance)))
throw denied("授权范围已变化");
governance.requireDetail(actor);
governance.requireBoundAction("QUERY", "query.detail");
options.options(a.releaseId(),actor);
Map<String,Object> saved = new LinkedHashMap<>(read(jdbc.queryForObject("SELECT answer_json FROM analysis_turn WHERE id=?",String.class,a.turnId())));
preserveModelOutput(saved, output);
saved.put("engine",frozenTurnEngine(a));
saved.put("releaseId",a.releaseId());
saved.put("protocol",identity(a));
saved.putIfAbsent("completion",Map.of("completed",false,"reason",a.turnStatus()));
jdbc.update("UPDATE analysis_turn SET answer_json=CAST(? AS JSON) WHERE id=? AND status IN ('FAILED','CANCELLED')",write(saved),a.turnId());
event(id,a.turnStatus().toLowerCase(Locale.ROOT),Map.of("turnId",a.turnId(),"status",a.turnStatus(),"result",saved));
}
/** Final result labels always come from the immutable server plan, never the worker payload. */
private String frozenTurnEngine(Attempt attempt) {
Map<String,Object> plan=read(jdbc.queryForObject("SELECT plan_json FROM analysis_turn WHERE id=?",String.class,attempt.turnId()));
if(attempt.input().containsKey("controlledInspection")||"CONTROLLED_INSPECTION_PROTOCOL".equals(plan.get("engine")))
return "CONTROLLED_INSPECTION_PROTOCOL";
return AnalysisRuntimeEngine.fromPlan(plan);
}
@Transactional
public Map<String,Object> cancel(String turnId,AppUserPrincipal actor,String reason) {
return cancel(turnId,actor,reason,Map.of());
}
@Transactional
public Map<String,Object> cancel(String turnId,AppUserPrincipal actor,String reason,Map<String,Object> output) {
String id=currentAttemptIdForTurn(turnId);lock(sessionForAttempt(id));
Attempt a=attempt(id);
if(!a.userId().equals(actor.getId().toString()))throw denied("会话不属于当前用户");
if(!a.scopeHash().equals(AuthorizationFingerprint.of(actor,governance)))throw denied("授权范围已变化");
if(!Set.of("QUEUED","PLANNING","RUNNING","CLARIFICATION").contains(a.status()))return Map.of("turnId",turnId,"status",a.turnStatus(),"cancelled",false);
var state=store.state(a.sessionId());
store.cancel(a.sessionId(),state.version());
jdbc.update("UPDATE analysis_protocol_attempt SET status='CANCELLED' WHERE attempt_id=?",a.attemptId());
jdbc.update("UPDATE analysis_turn SET status='CANCELLED',cancel_requested=TRUE,stop_reason=?,finished_at=CURRENT_TIMESTAMP(6) WHERE id=?",reason,turnId);
inspection.updateAssociation(a,"CANCELLED");
event(a.attemptId(),"cancelled",Map.of("turnId",turnId,"status","CANCELLED","stopReason",reason));
if (!modelAnswer(output).isBlank()) preserveStoppedModelOutput(id,output,actor);
else event(a.attemptId(),"cancelled",Map.of("turnId",turnId,"status","CANCELLED","stopReason",reason));
return Map.of("turnId",turnId,"status","CANCELLED","cancelRequested",true);
}
@@ -1008,7 +1133,7 @@ public class AnalysisProtocolService {
if("GET /api/metrics".equals(target)) {
requireHistoricalMetricContext(release,child,parameters,response);
coverage.putAll(AnalysisProtocolMetricCoverage.inspect(response,child,queriedPeriod(parameters)));
if(list(child.get("dimensions")).contains(parameters.get("view"))) {
if(!"metrics".equals(scope.get("purpose"))&&list(child.get("dimensions")).contains(parameters.get("view"))) {
boolean complete=AnalysisProtocolRankingCoverage.complete(response,child,parameters.get("view"));coverage.put("weightsComplete",complete);
if(complete) {artifact=new LinkedHashMap<>(AnalysisProtocolRankArtifact.build(response,child,parameters.get("view"),release));artifact.put("displayLimit",scope.getOrDefault("limit",10));}
}
@@ -1057,7 +1182,7 @@ public class AnalysisProtocolService {
return new AnalysisProtocolQueryPlan(json).resolve(task,a.executionId(),a.releaseId(),planCatalog(a,task,actor),records,availableRankings(a,actor));
}
private Map<String,Object> planCatalog(Attempt a,Map<String,Object> task,AppUserPrincipal actor) {
Map<String,Object> catalog=new LinkedHashMap<>(options.options(a.releaseId(),actor));
Map<String,Object> catalog=new LinkedHashMap<>(AnalysisAgentCatalog.active(options.options(a.releaseId(),actor)));
if(Boolean.TRUE.equals(task.get("verifySource"))||Boolean.TRUE.equals(task.get("fullDetails"))) {
governance.requireEvidence(actor);
if(sourceColumns==null)throw conflict("源表调查目录当前不可用");
@@ -1100,7 +1225,7 @@ public class AnalysisProtocolService {
.map(body->Map.of("body",write(canonical(body)))).toList();
Map<String,Object> child=map(scope.get("task"));
List<Map<String,String>> requests=new ArrayList<>();Map<String,String> current=new LinkedHashMap<>(metricParameters(release,child));
if("ranking".equals(scope.get("purpose")))current.put("view",list(child.get("dimensions")).getFirst().toString());
if(("ranking".equals(scope.get("purpose"))||"metrics".equals(scope.get("purpose")))&&!list(child.get("dimensions")).isEmpty())current.put("view",list(child.get("dimensions")).getFirst().toString());
requests.add(current);
if(Boolean.TRUE.equals(child.get("comparisonRequired"))) {
Map<String,Object> previous=new LinkedHashMap<>(child);previous.put("period",child.get("comparisonPeriod"));requests.add(metricParameters(release,previous));
@@ -1632,7 +1757,7 @@ public class AnalysisProtocolService {
if(!rows.isEmpty()&&!rows.getFirst().get("scope").equals(AuthorizationFingerprint.of(actor,governance)))throw denied("历史结果的授权范围已变化");
governance.requireBoundAction("QUERY","query.aggregate");
String release=jdbc.queryForObject("SELECT release_id FROM analysis_session WHERE id=? AND user_id=?",String.class,sessionId,actor.getId().toString());
options.options(release,actor);
options.requirePublishedRelease(release);
}
/** Only called inside the existing, explicitly requested session-delete transaction. */
@Transactional
@@ -1905,6 +2030,7 @@ public class AnalysisProtocolService {
catch(NumberFormatException e){throw denied("行数限制无效");}
}
if(out.containsKey("rowOffset")&&!Objects.equals(out.remove("rowOffset"),"0"))throw denied("当前总体查询不允许分页偏移");
if(out.containsKey("rowOrder")&&(!Set.of("department","group").contains(out.get("view"))||!Objects.equals(out.remove("rowOrder"),"scrapDesc")))throw denied("批量汇总排序方式无效");
for(String key:List.of("extraFilters","exclusions"))if(out.containsKey(key))out.put(key,write(canonical(read(out.get(key)))));
if(out.containsKey("columnFilters"))out.put("columnFilters",write(canonical(cn.yunsheng.quality.filters.SourceColumnQueries.parse(out.get("columnFilters")))));
return out;
@@ -19,9 +19,9 @@ import org.springframework.security.core.userdetails.UsernameNotFoundException;
import org.springframework.stereotype.Service;
import org.springframework.web.server.ResponseStatusException;
/** Short-lived, in-memory delegation for one native NAO turn. */
/** Short-lived, in-memory delegation for one native DSH turn. */
@Service
public class NaoRuntimeAccessService {
public class AnalysisRuntimeAccessService {
private static final Duration TOKEN_TTL = AnalysisRuntimePolicy.DELEGATION_TTL;
private static final SecureRandom RANDOM = new SecureRandom();
@@ -36,12 +36,12 @@ public class NaoRuntimeAccessService {
public void setProtocol(AnalysisProtocolService protocol) { this.protocol=protocol; }
@Autowired
public NaoRuntimeAccessService(JdbcTemplate jdbc, JdbcAppUserDetailsService users,
public AnalysisRuntimeAccessService(JdbcTemplate jdbc, JdbcAppUserDetailsService users,
GovernanceAccessService governance) {
this(jdbc, users, governance, Clock.systemUTC());
}
NaoRuntimeAccessService(JdbcTemplate jdbc, JdbcAppUserDetailsService users,
AnalysisRuntimeAccessService(JdbcTemplate jdbc, JdbcAppUserDetailsService users,
GovernanceAccessService governance, Clock clock) {
this.jdbc = jdbc;
this.users = users;
@@ -122,7 +122,7 @@ public class NaoRuntimeAccessService {
private TurnState turnState(String turnId, UUID actorId) {
return jdbc.query("SELECT status,cancel_requested,auth_scope_hash FROM analysis_turn WHERE id=? AND user_id=?",
(rs, row) -> new TurnState(rs.getString(1), rs.getBoolean(2), rs.getString(3)), turnId, actorId.toString())
.stream().findFirst().orElseThrow(NaoRuntimeAccessService::denied);
.stream().findFirst().orElseThrow(AnalysisRuntimeAccessService::denied);
}
public void revokeTurn(String turnId) {
@@ -139,7 +139,7 @@ public class NaoRuntimeAccessService {
private AppUserPrincipal freshPrincipal(UUID actorId) {
String username = jdbc.query("SELECT username FROM app_user WHERE id=? AND active=TRUE",
(rs, row) -> rs.getString(1), actorId.toString()).stream().findFirst()
.orElseThrow(NaoRuntimeAccessService::denied);
.orElseThrow(AnalysisRuntimeAccessService::denied);
try {
UserDetails details = users.loadUserByUsername(username);
if (!(details instanceof AppUserPrincipal principal) || !principal.isEnabled()) throw denied();
@@ -162,7 +162,7 @@ public class NaoRuntimeAccessService {
}
private static ResponseStatusException denied() {
return new ResponseStatusException(HttpStatus.FORBIDDEN, "NAO 查询授权已失效");
return new ResponseStatusException(HttpStatus.FORBIDDEN, "DSH 查询授权已失效");
}
public record Delegation(AppUserPrincipal actor, String releaseId, String turnId, String attemptId) {
@@ -0,0 +1,56 @@
package cn.yunsheng.quality.analysis;
import java.util.LinkedHashMap;
import java.util.Map;
/** Server-owned analysis runtime identifiers. These values are never accepted from client input. */
final class AnalysisRuntimeEngine {
static final String DSH = "DSH";
static final String HISTORICAL = "HISTORICAL";
static final String INSPECTION = "CONTROLLED_INSPECTION_PROTOCOL";
private AnalysisRuntimeEngine() {}
static boolean canExecute(Map<String, Object> plan) {
String engine = fromPlan(plan);
return DSH.equals(engine) || INSPECTION.equals(engine);
}
static String require(Object value) {
if (value == null || DSH.equalsIgnoreCase(value.toString().strip())) return DSH;
throw new IllegalArgumentException("Unsupported analysis runtime engine");
}
/** Saved plans keep provenance. Earlier engine identifiers are displayed as historical. */
static String fromPlan(Map<String, Object> plan) {
if (plan == null) return HISTORICAL;
Object engine = plan.get("engine");
if (DSH.equals(engine) || INSPECTION.equals(engine) || "CONTROLLED".equals(engine)) return (String) engine;
if (engine == null && ("NATIVE_DSH".equals(plan.get("status")) || "NATIVE_DSH_PENDING".equals(plan.get("status")))) return DSH;
return HISTORICAL;
}
static boolean isRuntimePlan(Map<String, Object> plan) {
if (plan == null) return false;
return DSH.equals(plan.get("engine"))
|| Boolean.TRUE.equals(plan.get("nativeRuntime"))
|| (plan.get("status") instanceof String status && status.startsWith("NATIVE_"));
}
static Map<String, Object> publicMetadata(Map<String, Object> source) {
var result = new LinkedHashMap<>(source);
if (source.containsKey("engine")) result.put("engine", fromPlan(source));
if (HISTORICAL.equals(fromPlan(source)) && source.get("status") instanceof String status && status.startsWith("NATIVE_"))
result.put("status", HISTORICAL);
result.remove("runtimeEngine");
return result;
}
static String pendingStatus(String engine) { return "NATIVE_" + require(engine) + "_PENDING"; }
static String runningStatus(String engine) { return "NATIVE_" + require(engine); }
static String progressLabel(String engine) { return require(engine) + " 正在处理"; }
static String runtimeName(String engine) { return require(engine) + " runtime"; }
}
@@ -26,17 +26,17 @@ import org.springframework.web.server.ResponseStatusException;
import org.springframework.web.util.UriComponentsBuilder;
import jakarta.servlet.http.HttpServletRequest;
/** Narrow local bridge used only by the delegated native NAO runtime. */
/** Narrow local bridge used only by the delegated native DSH runtime. */
@RestController
@RequestMapping("/api/analysis/runtime")
public class NaoRuntimeQueryController {
public class AnalysisRuntimeQueryController {
private static final Set<String> METRIC_QUERY = Set.of("year", "month", "monthStart", "monthEnd", "quarter", "department", "group",
"product", "projectGroup", "extraFilters", "columnFilters", "exclusions", "view", "includeUnassigned", "releaseId", "trendGranularity",
"rowLimit", "rowOffset", "rowOrder");
private static final Set<String> TOP_QUERY = Set.of("stage", "dimension", "category", "releaseId", "year",
"month", "quarter", "department", "group", "product", "projectGroup", "extraFilters", "includeUnassigned", "limit");
private final NaoRuntimeAccessService access;
private final AnalysisRuntimeAccessService access;
private final ReleaseController releases;
private final OptionsController options;
private final MetricsController metrics;
@@ -56,7 +56,7 @@ public class NaoRuntimeQueryController {
@org.springframework.beans.factory.annotation.Autowired(required=false)
public void setChanges(AnalysisChangesController changes){this.changes=changes;}
public NaoRuntimeQueryController(NaoRuntimeAccessService access, ReleaseController releases,
public AnalysisRuntimeQueryController(AnalysisRuntimeAccessService access, ReleaseController releases,
OptionsController options, MetricsController metrics,
AnalysisToolsController tools, AnalyticsController analytics,
AnalysisFineDefectsController defects, AnalysisInvestigationController investigation) {
@@ -73,8 +73,8 @@ public class NaoRuntimeQueryController {
@PostMapping("/query")
public Object query(@RequestBody RuntimeQuery request, HttpServletRequest servletRequest) {
requireLoopback(servletRequest);
if (request == null) throw bad("NAO 查询请求无效");
NaoRuntimeAccessService.Delegation delegation = access.authorize(request.token());
if (request == null) throw bad("DSH 查询请求无效");
AnalysisRuntimeAccessService.Delegation delegation = access.authorize(request.token());
ParsedTarget target = parseTarget(request.method(), request.path());
if ("GET".equals(target.method()) && request.payload() != null) throw bad("GET 查询不能包含请求体");
if ("POST".equals(target.method()) && !target.query().isEmpty()) throw bad("POST 查询不能包含 URL 参数");
@@ -96,7 +96,7 @@ public class NaoRuntimeQueryController {
}
private Object dispatch(ParsedTarget target, Map<String, Object> payload,
NaoRuntimeAccessService.Delegation delegation) {
AnalysisRuntimeAccessService.Delegation delegation) {
String releaseId = delegation.releaseId();
return switch (target.method() + " " + target.path()) {
case "POST /api/analysis/protocol/history" -> {
@@ -127,7 +127,7 @@ public class NaoRuntimeQueryController {
case "GET /api/options" -> {
rejectUnknown(target.query(), Set.of("releaseId"));
requireBoundRelease(target.query().get("releaseId"), releaseId);
yield options.options(releaseId, delegation.actor());
yield AnalysisAgentCatalog.active(options.options(releaseId, delegation.actor()));
}
case "GET /api/metrics" -> metricQuery(target.query(), releaseId, delegation);
case "GET /api/analysis/tools/catalog" -> {
@@ -163,7 +163,7 @@ public class NaoRuntimeQueryController {
Map<String, Object> bound = boundPayload(payload, releaseId);
yield defects.query(bound, delegation.actor());
}
default -> throw new ResponseStatusException(HttpStatus.NOT_FOUND, "NAO 查询路由未开放");
default -> throw new ResponseStatusException(HttpStatus.NOT_FOUND, "DSH 查询路由未开放");
};
}
@@ -178,7 +178,7 @@ public class NaoRuntimeQueryController {
}
private Object metricQuery(Map<String, String> query, String releaseId,
NaoRuntimeAccessService.Delegation delegation) {
AnalysisRuntimeAccessService.Delegation delegation) {
rejectUnknown(query, METRIC_QUERY);
requireBoundRelease(query.get("releaseId"), releaseId);
if(query.containsKey("monthStart")||query.containsKey("monthEnd"))return metrics.calculateRange(
@@ -199,7 +199,7 @@ public class NaoRuntimeQueryController {
}
private Object topQuery(Map<String, String> query, String releaseId,
NaoRuntimeAccessService.Delegation delegation) {
AnalysisRuntimeAccessService.Delegation delegation) {
rejectUnknown(query, TOP_QUERY);
requireBoundRelease(query.get("releaseId"), releaseId);
return analytics.top(required(query, "stage"), query.getOrDefault("dimension", "category"),
@@ -210,7 +210,7 @@ public class NaoRuntimeQueryController {
}
private Map<String, Object> boundPayload(Map<String, Object> payload, String releaseId) {
if (payload == null) throw bad("NAO 查询参数无效");
if (payload == null) throw bad("DSH 查询参数无效");
Object requested = payload.get("releaseId");
requireBoundRelease(requested == null ? null : requested.toString(), releaseId);
Map<String, Object> bound = new LinkedHashMap<>(payload);
@@ -220,31 +220,31 @@ public class NaoRuntimeQueryController {
private ParsedTarget parseTarget(String method, String rawPath) {
if (method == null || rawPath == null || rawPath.length() > 4096 || !rawPath.startsWith("/")
|| rawPath.startsWith("//") || rawPath.contains("#")) throw bad("NAO 查询目标无效");
|| rawPath.startsWith("//") || rawPath.contains("#")) throw bad("DSH 查询目标无效");
String normalizedMethod = method.toUpperCase(java.util.Locale.ROOT);
if (!List.of("GET", "POST").contains(normalizedMethod)) throw bad("NAO 查询方法未开放");
if (!List.of("GET", "POST").contains(normalizedMethod)) throw bad("DSH 查询方法未开放");
URI uri;
try { uri = URI.create(rawPath); }
catch (RuntimeException invalid) { throw bad("NAO 查询目标无效"); }
catch (RuntimeException invalid) { throw bad("DSH 查询目标无效"); }
if (uri.isAbsolute() || uri.getRawUserInfo() != null || uri.getRawAuthority() != null)
throw bad("NAO 查询目标无效");
throw bad("DSH 查询目标无效");
String path = uri.getRawPath();
if (path == null || !path.startsWith("/") || path.contains("%") || path.contains("..") || path.contains("\\"))
throw bad("NAO 查询路径无效");
throw bad("DSH 查询路径无效");
Map<String, String> query = new LinkedHashMap<>();
String rawQuery = uri.getRawQuery();
if (rawQuery != null && !rawQuery.isEmpty()) for (String pair : rawQuery.split("&", -1)) {
int separator = pair.indexOf('=');
String key = decode(separator < 0 ? pair : pair.substring(0, separator));
String value = decode(separator < 0 ? "" : pair.substring(separator + 1));
if (key.isBlank() || query.putIfAbsent(key, value) != null) throw bad("NAO 查询参数重复或无效");
if (key.isBlank() || query.putIfAbsent(key, value) != null) throw bad("DSH 查询参数重复或无效");
}
return new ParsedTarget(normalizedMethod, path, Map.copyOf(query));
}
private String decode(String raw) {
try { return URLDecoder.decode(raw, StandardCharsets.UTF_8); }
catch (IllegalArgumentException invalid) { throw bad("NAO 查询参数编码无效"); }
catch (IllegalArgumentException invalid) { throw bad("DSH 查询参数编码无效"); }
}
private <T> T asActor(cn.yunsheng.quality.identity.AppUserPrincipal actor,
@@ -261,33 +261,33 @@ public class NaoRuntimeQueryController {
private void requireLoopback(HttpServletRequest request) {
try {
InetAddress remote = InetAddress.getByName(request.getRemoteAddr());
if (!remote.isLoopbackAddress()) throw new ResponseStatusException(HttpStatus.FORBIDDEN, "NAO 查询仅允许本机访问");
if (!remote.isLoopbackAddress()) throw new ResponseStatusException(HttpStatus.FORBIDDEN, "DSH 查询仅允许本机访问");
} catch (java.net.UnknownHostException invalid) {
throw new ResponseStatusException(HttpStatus.FORBIDDEN, "NAO 查询仅允许本机访问");
throw new ResponseStatusException(HttpStatus.FORBIDDEN, "DSH 查询仅允许本机访问");
}
}
private void requireBoundRelease(String requested, String bound) {
if (requested != null && !requested.isBlank() && !bound.equals(requested))
throw new ResponseStatusException(HttpStatus.FORBIDDEN, "NAO 查询不能切换固定发布版本");
throw new ResponseStatusException(HttpStatus.FORBIDDEN, "DSH 查询不能切换固定发布版本");
}
private void rejectUnknown(Map<String, ?> values, Set<String> allowed) {
if (!allowed.containsAll(values.keySet())) throw bad("NAO 查询包含未开放参数");
if (!allowed.containsAll(values.keySet())) throw bad("DSH 查询包含未开放参数");
}
private String required(Map<String, String> values, String key) {
String value = values.get(key);
if (value == null || value.isBlank()) throw bad("NAO 查询缺少必要参数");
if (value == null || value.isBlank()) throw bad("DSH 查询缺少必要参数");
return value;
}
private Integer integer(Map<String, String> values, String key) {
String raw = values.get(key);
if (raw == null || raw.isBlank()) return null;
if (!raw.matches("-?\\d{1,5}")) throw bad("NAO 查询数字参数无效");
if (!raw.matches("-?\\d{1,5}")) throw bad("DSH 查询数字参数无效");
try { return Integer.valueOf(raw); }
catch (NumberFormatException invalid) { throw bad("NAO 查询数字参数无效"); }
catch (NumberFormatException invalid) { throw bad("DSH 查询数字参数无效"); }
}
private boolean bool(Map<String, String> values, String key, boolean fallback) {
@@ -295,7 +295,7 @@ public class NaoRuntimeQueryController {
if (raw == null || raw.isBlank()) return fallback;
if ("true".equalsIgnoreCase(raw)) return true;
if ("false".equalsIgnoreCase(raw)) return false;
throw bad("NAO 查询布尔参数无效");
throw bad("DSH 查询布尔参数无效");
}
private ResponseStatusException bad(String message) {
@@ -58,8 +58,8 @@ public class AnalysisTurnService {
private static final int TOOL_CALLS_MAX = 12;
private static final int PLAN_REVISIONS_MAX = 8;
private static final int DEADLINE_SECONDS = 240;
private static final int NAO_DEADLINE_SECONDS = Math.toIntExact(AnalysisRuntimePolicy.WATCHDOG_TIMEOUT.toSeconds());
private static final int NAO_TOOL_CALLS_MAX = 1000;
private static final int RUNTIME_DEADLINE_SECONDS = Math.toIntExact(AnalysisRuntimePolicy.WATCHDOG_TIMEOUT.toSeconds());
private static final int RUNTIME_TOOL_CALLS_MAX = 1000;
private static final int NATIVE_HISTORY_QUERY_LIMIT = 12;
private static final int NATIVE_HISTORY_ENTRY_LIMIT = 8;
private static final int NATIVE_HISTORY_CONTEXT_LIMIT = 16_000;
@@ -75,11 +75,13 @@ public class AnalysisTurnService {
private final GovernanceAccessService governance;
private final MetricsResponseAccess responseAccess;
private final AnalysisExplorationTools exploration;
private final NaoAnalysisRunner naoRunner;
private final NaoRuntimeAccessService naoAccess;
private final DshAnalysisRunner dshRunner;
private final AnalysisRuntimeAccessService runtimeAccess;
private AnalysisProtocolService protocol;
@org.springframework.beans.factory.annotation.Autowired
public void setProtocol(AnalysisProtocolService protocol){this.protocol=protocol;}
private final Map<String, String> runtimeDrafts = new java.util.concurrent.ConcurrentHashMap<>();
private final Map<String, Map<String, Object>> runtimeModelOutputs = new java.util.concurrent.ConcurrentHashMap<>();
@org.springframework.beans.factory.annotation.Value("${quality.analysis.visuals-enabled:true}")
private boolean visualsEnabled = true;
private final ThreadPoolExecutor executor = new ThreadPoolExecutor(2, 2, 0, TimeUnit.MILLISECONDS,
@@ -100,13 +102,13 @@ public class AnalysisTurnService {
@org.springframework.beans.factory.annotation.Autowired
public AnalysisTurnService(JdbcTemplate jdbc, JsonMapper json, MetricsService metrics, AnalyticsController analytics, AnalysisModelGateway model,
JdbcAppUserDetailsService users, GovernanceAccessService governance, MetricsResponseAccess responseAccess,
AnalysisExplorationTools exploration, NaoAnalysisRunner naoRunner,
NaoRuntimeAccessService naoAccess) {
AnalysisExplorationTools exploration, DshAnalysisRunner dshRunner,
AnalysisRuntimeAccessService runtimeAccess) {
this.jdbc = jdbc; this.json = json; this.metrics = metrics; this.analytics = analytics; this.model = model; this.users = users; this.governance = governance;
this.responseAccess = responseAccess;
this.exploration = exploration;
this.naoRunner = naoRunner;
this.naoAccess = naoAccess;
this.dshRunner = dshRunner;
this.runtimeAccess = runtimeAccess;
}
@EventListener(ApplicationReadyEvent.class)
@@ -131,7 +133,8 @@ public class AnalysisTurnService {
@Transactional
public Map<String, Object> createSession(CreateSessionRequest request, AppUserPrincipal actor) {
requireAnalysisAccess(actor);
if(protocol!=null&&protocol.enabled()&&naoRunner==null)throw conflict("分析服务尚未就绪,请稍后新建会话");
if (protocol != null && (!protocol.enabled() || dshRunner == null))
throw conflict("DSH 分析协议尚未启用,请稍后新建会话");
Map<String, Object> context = sanitizeContext(request == null ? null : request.context());
String releaseId = request == null ? null : clean(request.releaseId());
if (releaseId == null) releaseId = clean(context.get("releaseId"));
@@ -145,7 +148,7 @@ public class AnalysisTurnService {
jdbc.update("INSERT INTO analysis_session(id,user_id,title,release_id,auth_scope_hash,context_json) VALUES(?,?,?,?,?,CAST(? AS JSON))",
id, actor.getId().toString(), title == null ? "新质量分析" : cap(title, 160), releaseId,
scopeHash(actor), write(context));
if(protocol!=null&&protocol.enabled()&&naoRunner!=null)protocol.initialize(id,context);
if(protocol!=null&&protocol.enabled()&&dshRunner!=null)protocol.initialize(id,context);
return Map.of("session", Map.of("id", id, "releaseId", releaseId, "context", context, "status", "ACTIVE",
"createdAt", Instant.now().toString()));
}
@@ -230,7 +233,7 @@ public class AnalysisTurnService {
@Transactional
public Map<String, Object> createTurn(String sessionId, TurnRequest request, AppUserPrincipal actor) {
requireAnalysisAccess(actor);
if (naoRunner != null) governance.requireBoundAction("MODEL", "model.intent.parse");
if (dshRunner != null) governance.requireBoundAction("MODEL", "model.intent.parse");
if (request == null || request.question() == null || request.question().isBlank() || request.question().length() > 1600)
throw bad("请输入不超过1600字的质量分析问题");
String question = request.question().strip();
@@ -242,6 +245,7 @@ public class AnalysisTurnService {
if (requestedReleaseId != null && !session.releaseId().equals(requestedReleaseId))
throw conflict("会话已固定数据版本,请新建会话后切换版本");
boolean unified=protocol!=null&&protocol.ownsSession(sessionId);
if (protocol != null && !unified) throw conflict("DSH 会话缺少有效的协议绑定,请新建会话");
Map<String, Object> context = new LinkedHashMap<>(unified?protocol.baseContext(sessionId):session.context());
if(!unified){merge(context, submittedContext);bindResultReference(context, request.context(), session.releaseId(), actor);}
String requestedRelease = clean(context.get("releaseId"));
@@ -260,16 +264,18 @@ public class AnalysisTurnService {
}
Integer active = jdbc.queryForObject("SELECT COUNT(*) FROM analysis_turn WHERE session_id=? AND status IN ('QUEUED','RUNNING')", Integer.class, sessionId);
if (active != null && active > 0) throw conflict("当前会话仍有分析任务,请等待完成或停止后继续");
Map<String, Object> task = naoRunner == null
Map<String, Object> task = dshRunner == null
? AnalysisTaskState.resolve(question, mapValue(context.get("_task")), submittedContext)
: new LinkedHashMap<>();
context.put("_task", task);
String runtimeEngine = AnalysisRuntimeEngine.DSH;
String turnId = UUID.randomUUID().toString();
Map<String, Object> budget = budget();
Map<String, Object> plan = new LinkedHashMap<>();
plan.put("status", "PENDING_INTENT"); plan.put("steps", List.of()); plan.put("maxPlanRevisions", PLAN_REVISIONS_MAX);
if (naoRunner != null) {
plan.put("status", "NATIVE_NAO_PENDING"); plan.put("engine", "NAO"); plan.put("nativeRuntime", true);
if (dshRunner != null) {
plan.put("status", AnalysisRuntimeEngine.pendingStatus(runtimeEngine));
plan.put("engine", runtimeEngine); plan.put("nativeRuntime", true);
}
// Freeze the complete effective context at submission time. Session context is mutable
// conversational state and must never silently change the meaning of a retried turn.
@@ -289,8 +295,11 @@ public class AnalysisTurnService {
}
throw conflict("分析任务已重复提交");
}
if(unified)protocol.prepare(sessionId,turnId,actor,false);
else appendEvent(turnId, "progress", Map.of("turnId", turnId, "status", "QUEUED", "message", "分析任务已排队"));
if(unified) {
protocol.prepare(sessionId,turnId,actor,false);
}
else appendEvent(turnId, "progress", Map.of("turnId", turnId, "status", "QUEUED", "message", "分析任务已排队",
"engine", dshRunner == null ? "CONTROLLED" : runtimeEngine));
TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
@Override public void afterCommit() {
try { submitWorker(turnId); }
@@ -325,12 +334,12 @@ public class AnalysisTurnService {
public Map<String,Object> recoverVisuals(String turnId,AppUserPrincipal submittedActor) {
AppUserPrincipal actor=currentUser(submittedActor.getId());requireAnalysisAccess(actor);requireTurn(turnId,actor);
if(!visualsEnabled||protocol==null||!protocol.ownsTurn(turnId)||naoRunner==null)throw conflict("该分析暂不支持独立恢复图表");
if(!visualsEnabled||protocol==null||!protocol.ownsTurn(turnId)||dshRunner==null)throw conflict("该分析暂不支持独立恢复图表");
var claim=asSecurityActor(actor,()->protocol.beginVisualRecovery(turnId,actor));
if(Boolean.TRUE.equals(claim.get("claimed"))) {
String id=claim.get("id").toString(),token=claim.get("token").toString();
try {
var rebuilt=naoRunner.rebuildVisuals(id,mapValue(claim.get("input")));
var rebuilt=dshRunner.rebuildVisuals(id,mapValue(claim.get("input")));
AppUserPrincipal fresh=currentUser(submittedActor.getId());requireAnalysisAccess(fresh);requireTurn(turnId,fresh);
asSecurityActor(fresh,()->{protocol.completeVisualRecovery(id,token,rebuilt,fresh);return null;});
if(!"ready".equals(rebuilt.get("visualState")))throw new ResponseStatusException(HttpStatus.UNPROCESSABLE_ENTITY,"原结果尚不能完整恢复图表,已保留原分析");
@@ -363,7 +372,20 @@ public class AnalysisTurnService {
Map<String, Object> result = new LinkedHashMap<>();
result.put("id", turn.id()); result.put("turnId", turn.id()); result.put("sessionId", turn.sessionId()); result.put("status", turn.status());
result.put("readOnly",protocol!=null&&protocol.legacyReadOnly(turn.sessionId()));
result.put("question", turn.question()); result.put("plan", readNullable(turn.planJson(), Map.of()));
result.put("question", turn.question()); result.put("plan", AnalysisRuntimeEngine.publicMetadata(plan));
if (!AnalysisRuntimeEngine.canExecute(plan)) result.put("retryAvailable", false);
Map<String,Object> nativeTask=mapValue(plan.get("task"));
boolean dshNativeTurn=AnalysisRuntimeEngine.DSH.equals(AnalysisRuntimeEngine.fromPlan(plan))
&&("native_agent".equals(answer.get("executionMode"))
||"native_agent".equals(plan.get("executionMode"))
||"native_agent".equals(nativeTask.get("executionMode")));
Object storedTimeline=answer.get("timeline") instanceof List<?> ? answer.get("timeline") : plan.get("timeline");
if(dshNativeTurn&&terminal(turn.status())&&storedTimeline instanceof List<?> timeline)
// Session history restores answer.timeline. Prefer that persisted timeline
// when it contains the final assistant entry; older turns may only have the
// progress timeline in plan.timeline. Keep the same source at turn detail
// and snapshot boundaries so export identity checks compare one snapshot.
result.put("timeline",timeline);
result.put("steps", readAny(turn.stepsJson(), List.of()));
try { governance.requireEvidence(actor); result.put("evidence", readAny(turn.evidenceJson(), List.of())); }
catch (ResponseStatusException denied) { result.put("evidence", List.of()); result.put("evidenceAvailable", false); }
@@ -371,7 +393,7 @@ public class AnalysisTurnService {
result.putAll(visibleVisuals(answer, turn, actor, context,authorizedHistoryReport));
for (String field : List.of("engine", "explanationEngine", "explanationWarning", "warning",
"businessResultsSentToModel", "releaseId", "task", "analysisChecks", "agentDecisions", "completion",
"reportMarkdown", "reportHtml", "reportTitle", "nativeChatId", "toolCallCount", "protocol", "queryEvidenceRefs", "actualModel", "phaseTimingsMs", "executionMode", "completionMethod", "readingSummary", "answerQuality", "scopeCoverage", "explorationWarnings", "conclusionProtocolQueryIds", "attemptProtocolQueryIds", "memberList", "recordList", "historySources", "historySections", "historyCoverage", "historyEvidence", "historyVisualSources", "inspectionCoverage", "controlledInspection"))
"modelAnswer", "answerOrigin", "answerValidation", "reportMarkdown", "reportHtml", "reportTitle", "nativeChatId", "toolCallCount", "protocol", "queryEvidenceRefs", "actualModel", "phaseTimingsMs", "executionMode", "completionMethod", "readingSummary", "answerQuality", "scopeCoverage", "explorationWarnings", "conclusionProtocolQueryIds", "attemptProtocolQueryIds", "memberList", "recordList", "historySources", "historySections", "historyCoverage", "historyEvidence", "historyVisualSources", "inspectionCoverage", "controlledInspection"))
if (answer.containsKey(field)) result.put(field, answer.get(field));
result.put("stopReason", turn.stopReason()); result.put("budget", budget);
result.putAll(jdbc.queryForObject("SELECT UNIX_TIMESTAMP(created_at)*1000,UNIX_TIMESTAMP(started_at)*1000,UNIX_TIMESTAMP(finished_at)*1000 FROM analysis_turn WHERE id=? AND user_id=?",
@@ -379,7 +401,7 @@ public class AnalysisTurnService {
result.put("feedback", feedback(turn.id()));
if(visualsEnabled&&protocol!=null&&protocol.ownsTurn(turn.id())&&Set.of("COMPLETED","PARTIAL").contains(turn.status()))
result.putAll(protocol.visualRecoveryOverlay(turn.id(),actor));
return result;
return AnalysisRuntimeEngine.publicMetadata(result);
}
@Transactional
@@ -389,6 +411,9 @@ public class AnalysisTurnService {
jdbc.queryForObject("SELECT id FROM analysis_session WHERE id=? FOR UPDATE", String.class, turn.sessionId());
turn = requireTurn(turnId, actor);
requireWritableSession(turn.sessionId());
if (protocol != null && !protocol.ownsTurn(turnId)) throw conflict("此轮次缺少有效的协议绑定,请新建会话");
if (dshRunner != null && !AnalysisRuntimeEngine.canExecute(readNullable(turn.planJson(), Map.of())))
throw conflict("此历史轮次使用旧引擎,请重新发送问题以使用 DeepSeek Harness");
if (!List.of("FAILED", "CANCELLED", "PARTIAL").contains(turn.status())) throw conflict("仅未完成的分析任务可以重试");
Integer active = jdbc.queryForObject("SELECT COUNT(*) FROM analysis_turn WHERE session_id=? AND status IN ('QUEUED','RUNNING') AND id<>?",
Integer.class, turn.sessionId(), turnId);
@@ -402,7 +427,7 @@ public class AnalysisTurnService {
return Map.of("turn",turnEnvelope(turnId,turn.sessionId(),""));
}
Map<String, Object> storedPlan = readNullable(turn.planJson(), Map.of());
if (naoRunner != null && isNativePlan(storedPlan))
if (dshRunner != null && isNativePlan(storedPlan))
return retryNative(turn, session, actor, storedPlan);
Map<String, Object> storedSemantic = mapValue(storedPlan.get("semantic"));
if (!storedPlan.containsKey("frozenContext") && storedSemantic.isEmpty())
@@ -458,8 +483,9 @@ public class AnalysisTurnService {
WHERE id=? AND user_id=? AND status IN ('FAILED','CANCELLED','PARTIAL') AND auth_scope_hash=?
""", write(retryPlan), write(budget()), turn.id(), actor.getId().toString(), turn.authScopeHash());
if (updated != 1) throw conflict("任务状态或授权已变化,请刷新后再试");
appendEvent(turn.id(), "progress", Map.of("turnId", turn.id(), "status", "QUEUED",
"message", "已重新校验原查询条件,将从原装 NAO 重新分析。"));
String retryEngine=AnalysisRuntimeEngine.fromPlan(retryPlan);
appendEvent(turn.id(), "progress", Map.of("turnId", turn.id(), "status", "QUEUED", "engine",retryEngine,
"message", "已重新校验原查询条件,将从"+AnalysisRuntimeEngine.runtimeName(retryEngine)+"重新分析。"));
submitAfterCommit(turn.id());
return Map.of("turn", turnEnvelope(turn.id(), turn.sessionId(), ""));
}
@@ -486,9 +512,7 @@ public class AnalysisTurnService {
private record NativeTurnOrder(String id, Long firstEventId) {}
static boolean isNativePlan(Map<String, Object> plan) {
return Boolean.TRUE.equals(plan.get("nativeRuntime"))
|| "NAO".equals(plan.get("engine"))
|| "NATIVE_NAO".equals(plan.get("status"));
return AnalysisRuntimeEngine.isRuntimePlan(plan);
}
static Map<String, Object> nativeRetryPlan(Map<String, Object> storedPlan, String fixedReleaseId) {
@@ -498,7 +522,7 @@ public class AnalysisTurnService {
static Map<String, Object> nativeRetryPlan(Map<String, Object> storedPlan, String fixedReleaseId, Long eventFloor) {
Map<String, Object> source = stringMapOrEmpty(storedPlan.get("frozenContext"));
if (source.isEmpty()) source = stringMapOrEmpty(storedPlan.get("context"));
if (source.isEmpty()) throw new IllegalArgumentException("原装 NAO 任务未保存原始查询条件,不能安全重试");
if (source.isEmpty()) throw new IllegalArgumentException("原分析任务未保存原始查询条件,不能安全重试");
String planRelease = text(storedPlan.get("releaseId"));
String contextRelease = text(source.get("releaseId"));
@@ -521,9 +545,10 @@ public class AnalysisTurnService {
context.put("releaseId", fixedReleaseId);
Map<String, Object> plan = new LinkedHashMap<>();
plan.put("status", "NATIVE_NAO_PENDING");
String engine = AnalysisRuntimeEngine.require(storedPlan.get("engine"));
plan.put("status", AnalysisRuntimeEngine.pendingStatus(engine));
plan.put("nativeRuntime", true);
plan.put("engine", "NAO");
plan.put("engine", engine);
plan.put("releaseId", fixedReleaseId);
plan.put("context", context);
plan.put("frozenContext", context);
@@ -560,14 +585,15 @@ public class AnalysisTurnService {
Turn turn = requireTurn(turnId, actor);
if(protocol!=null&&protocol.ownsTurn(turnId)) {
String attemptId=protocol.latest(turnId).attemptId();
Map<String,Object> result=protocol.cancel(turnId,actor,cap(clean(reason)==null?"用户请求停止":reason,1000));
naoAccess.revokeAttempt(attemptId);naoRunner.requestCancel(attemptId);return result;
Map<String,Object> result=protocol.cancel(turnId,actor,cap(clean(reason)==null?"用户请求停止":reason,1000),
runtimeModelOutputs.getOrDefault(attemptId,Map.of()));
runtimeAccess.revokeAttempt(attemptId);dshRunner.requestCancel(attemptId);return result;
}
if (!List.of("QUEUED", "RUNNING").contains(turn.status())) return Map.of("turnId", turnId, "status", turn.status(), "cancelled", false);
jdbc.update("UPDATE analysis_turn SET cancel_requested=TRUE,stop_reason=? WHERE id=? AND user_id=? AND status IN ('QUEUED','RUNNING')",
cap(clean(reason) == null ? "用户请求停止" : reason, 1000), turnId, actor.getId().toString());
if (naoAccess != null) naoAccess.revokeTurn(turnId);
if (naoRunner != null) naoRunner.requestCancel(turnId);
if (runtimeAccess != null) runtimeAccess.revokeTurn(turnId);
if (dshRunner != null) dshRunner.requestCancel(turnId);
appendEvent(turnId, "progress", Map.of("turnId", turnId, "status", turn.status(), "message", "已收到停止请求"));
return Map.of("turnId", turnId, "status", turn.status(), "cancelRequested", true);
}
@@ -589,41 +615,94 @@ public class AnalysisTurnService {
requireTurn(turnId, actor);
SseEmitter emitter = new SseEmitter(60_000L);
long initial = lastEventId == null || lastEventId < 0 ? 0 : lastEventId;
try { java.util.concurrent.ForkJoinPool.commonPool().execute(() -> stream(turnId, initial, actor.getId(), emitter)); }
catch (RuntimeException e) { emitter.completeWithError(e); }
startStream(turnId, initial, actor.getId(), emitter);
return emitter;
}
private void stream(String turnId, long cursor, UUID userId, SseEmitter emitter) {
SseEmitter followSession(Map<String, Object> snapshot, AppUserPrincipal actor) {
SseEmitter emitter = new SseEmitter(60_000L);
try { emitter.send(SseEmitter.event().name("snapshot").data(snapshot)); }
catch (java.io.IOException error) { emitter.completeWithError(error); return emitter; }
String turnId = Objects.toString(snapshot.get("activeTurnId"), "");
if (turnId.isBlank()) {
emitter.complete();
} else {
// The history query reads the row and its event cursor in one consistent statement.
// Events committed after that read remain in the durable stream.
long cursor = mapList(snapshot.get("turns")).stream().filter(row -> turnId.equals(row.get("id")))
.map(row -> row.get("eventCursor")).filter(Objects::nonNull)
.mapToLong(value -> Long.parseLong(value.toString())).findFirst().orElse(0L);
startStream(turnId, cursor, actor.getId(), emitter);
}
return emitter;
}
private void startStream(String turnId, long cursor, UUID userId, SseEmitter emitter) {
var closed = new java.util.concurrent.atomic.AtomicBoolean();
emitter.onCompletion(() -> closed.set(true));
emitter.onTimeout(() -> closed.set(true));
emitter.onError(error -> closed.set(true));
Thread.startVirtualThread(() -> stream(turnId, cursor, userId, emitter, closed));
}
private void stream(String turnId, long cursor, UUID userId, SseEmitter emitter,
java.util.concurrent.atomic.AtomicBoolean closed) {
long stopAt = System.currentTimeMillis() + 55_000L;
String priorDraft = "";
String priorAttempt = "";
try {
while (System.currentTimeMillis() < stopAt) {
while (!closed.get() && System.currentTimeMillis() < stopAt) {
AppUserPrincipal current = currentUser(userId);
requireAnalysisAccess(current);
Turn turn = requireTurn(turnId, current);
cursor = nativeEventCursor(cursor, readNullable(turn.planJson(), Map.of()));
Map<String, Object> plan = readNullable(turn.planJson(), Map.of());
cursor = nativeEventCursor(cursor, plan);
List<Event> events = jdbc.query("SELECT id,event_type,payload_json FROM analysis_turn_event WHERE turn_id=? AND id>? ORDER BY id LIMIT 100",
(rs, n) -> new Event(rs.getLong(1), rs.getString(2), read(rs.getString(3))), turnId, cursor);
boolean sentTerminal = false;
for (Event event : events) {
if (closed.get()) return;
AppUserPrincipal sendAs = currentUser(userId);
requireAnalysisAccess(sendAs);
Turn sendTurn = requireTurn(turnId, sendAs);
Object payload = event.payload();
if (payload instanceof Map<?, ?> map && map.get("result") instanceof Map<?, ?> result) {
Map<String, Object> safe = new LinkedHashMap<>(event.payload());
Map<String, Object> safeResult = stringMap(result);
Map<String, Object> payload = AnalysisRuntimeEngine.publicMetadata(event.payload());
if (payload.get("result") instanceof Map<?, ?> result) {
String status = Objects.toString(payload.get("status"), "");
if (Set.of("COMPLETED", "PARTIAL").contains(status) && protocol != null && protocol.ownsTurn(turnId)) {
Object kind = mapValue(readNullable(sendTurn.planJson(), Map.of()).get("task")).get("kind");
if ("report".equals(kind) || AnalysisProtocolInspection.KIND.equals(kind)) {
asSecurityActor(sendAs, () -> {
if ("report".equals(kind)) protocol.authorizeReportSnapshot(turnId, sendAs);
else protocol.authorizeInspectionSnapshot(turnId, sendAs);
return null;
});
}
}
Map<String, Object> safeResult = AnalysisRuntimeEngine.publicMetadata(stringMap(result));
if (safeResult.get("results") instanceof List<?> values) safeResult.put("results", filterResultList(values, sendAs));
if (safeResult.containsKey("visualSchemaVersion") || safeResult.containsKey("visualState") || safeResult.containsKey("visuals")) {
safeResult.putAll(visibleVisuals(safeResult, sendTurn, sendAs, queryContext(sendTurn)));
}
safe.put("result", safeResult);
payload = safe;
payload.put("result", safeResult);
}
emitter.send(SseEmitter.event().id(Long.toString(event.id())).name(event.type()).data(payload));
cursor = event.id();
sentTerminal |= terminal(Objects.toString(payload.get("status"), ""));
}
if (terminal(turn.status()) && events.isEmpty()) { emitter.complete(); return; }
if (!sentTerminal && "RUNNING".equals(turn.status())) {
String attempt = Objects.toString(plan.get("attemptId"), turnId);
String draft = runtimeDrafts.getOrDefault(attempt, "");
if ((!draft.isEmpty() || !priorDraft.isEmpty())
&& (!attempt.equals(priorAttempt) || !draft.equals(priorDraft))) {
emitter.send(SseEmitter.event().name("draft").data(Map.of("turnId", turnId, "attemptId", attempt, "text", draft)));
priorAttempt = attempt;
priorDraft = draft;
}
}
Thread.sleep(300L);
}
emitter.send(SseEmitter.event().comment("heartbeat")); emitter.complete();
if (!closed.get()) emitter.complete();
} catch (InterruptedException e) {
Thread.currentThread().interrupt(); emitter.complete();
} catch (Exception e) { emitter.completeWithError(e); }
@@ -673,21 +752,17 @@ public class AnalysisTurnService {
appendEvent(turnId,"cancelled",Map.of("turnId",turnId,"status","CANCELLED","stopReason",reason));
return;
}
if(protocol!=null&&readNullable(turn.planJson(),Map.of()).containsKey("protocolVersion")) {
if (dshRunner != null && !AnalysisRuntimeEngine.canExecute(readNullable(turn.planJson(), Map.of())))
throw conflict("此历史轮次使用旧引擎,请重新发送问题以使用 DeepSeek Harness");
if(protocol!=null&&protocol.ownsTurn(turnId)) {
runProtocolNative(turn,actor,session);return;
}
if(protocol!=null&&protocol.ownsSession(turn.sessionId()))throw conflict("任务缺少有效执行绑定,请在新会话中重新分析");
if (dshRunner != null || (protocol != null && protocol.ownsSession(turn.sessionId())))
throw conflict("任务缺少有效执行绑定,请在新会话中重新分析");
if (cancelRequested(turnId)) { finishCancelled(turnId); return; }
// Native NAO has its own system-policy execution budget, initialized once its worker starts;
// do not let the legacy 240-second queue-time deadline expire before it can run.
if (naoRunner == null) ensureWithinDeadline(turn);
ensureWithinDeadline(turn);
jdbc.update("UPDATE analysis_turn SET status='RUNNING',started_at=CURRENT_TIMESTAMP(6) WHERE id=? AND status='QUEUED'", turnId);
appendEvent(turnId, "progress", Map.of("turnId", turnId, "status", "RUNNING", "message",
naoRunner == null ? "正在解析受控查询计划" : "正在连接原装 NAO"));
if (naoRunner != null) {
runNative(turn, actor, session);
return;
}
appendEvent(turnId, "progress", Map.of("turnId", turnId, "status", "RUNNING", "message", "正在解析受控查询计划", "engine", "CONTROLLED"));
Map<String, Object> persistedPlan = readNullable(turn.planJson(), Map.of());
Map<String, Object> persistedSemantic = mapValue(persistedPlan.get("semantic"));
Map<String, Object> task = new LinkedHashMap<>(mapValue(persistedPlan.get("task")));
@@ -942,145 +1017,92 @@ public class AnalysisTurnService {
String attemptId=attempt.attemptId();
try {
if(attempt.input().containsKey("controlledInspection")) {asSecurityActor(actor,()->{runProtocolInspection(attempt,actor,session);return null;});return;}
String engine=AnalysisRuntimeEngine.fromPlan(readNullable(turn.planJson(),Map.of()));
initializeNativeBudget(turn.id(),turn.budgetJson());
NaoAnalysisRunner.Result result=naoRunner.run(turn.id(),session.id(),actor,turn.question(),session.releaseId(),protocol.runtimeContext(attempt,actor),
Map<String,Object> runtimeContext=new LinkedHashMap<>(protocol.runtimeContext(attempt,actor));
runtimeContext.put("_runtimeEngine",engine);
DshAnalysisRunner.Result result=dshRunner.run(turn.id(),session.id(),actor,turn.question(),session.releaseId(),runtimeContext,
progress->{
if(progress.isEmpty()||protocol.isStopped(attemptId))return;
AppUserPrincipal fresh=currentUser(actor.getId());
protocol.progress(attemptId,progress,fresh);
},answer->{ /* Only a verified terminal answer is published in protocol v1. */ },
if(progress.get("dshDraft") instanceof String draft) {
requireTurn(turn.id(), fresh);
runtimeDrafts.put(attemptId, draft);
rememberModelOutput(attemptId, progress.containsKey("modelAnswer") ? progress : Map.of("modelAnswer", draft));
} else protocol.progress(attemptId,progress,fresh);
},answer->rememberModelOutput(attemptId,Map.of("modelAnswer",answer)),
()->protocol.isStopped(attemptId));
if(protocol.isStopped(attemptId))return;
Map<String,Object> output = new LinkedHashMap<>(result.details());
String original = AnalysisProtocolService.modelAnswer(result.details(), Map.of("answer", result.answer()));
if (original.isBlank()) original = AnalysisProtocolService.modelAnswer(runtimeModelOutputs.getOrDefault(attemptId,Map.of()));
output.put("modelAnswer", original);
rememberModelOutput(attemptId, output);
if(protocol.isStopped(attemptId)) {
preserveStoppedModelOutput(attemptId,actor.getId());
return;
}
if("FAILED".equals(result.status())) {
String reason=result.details().get("message") instanceof String message?message:"本轮分析未完成,请重试";
protocol.fail(attemptId,cap(reason,600));return;
protocol.fail(attemptId,cap(reason,600));
preserveStoppedModelOutput(attemptId,actor.getId());
return;
}
AppUserPrincipal fresh=currentUser(actor.getId());
var current=protocol.attempt(attemptId);
Map<String,Object> task=protocol.task(current);
Map<String,Object> context=AnalysisProtocolService.taskContext(session.releaseId(),task);
Map<String,Object> details=new LinkedHashMap<>(result.details());
Map<String,Object> details=new LinkedHashMap<>(output);
if(!Objects.equals(AnalysisProtocolService.canonical(task),AnalysisProtocolService.canonical(details.get("agentTask"))))
throw conflict("本次执行返回的任务与后台修订不一致");
if(Set.of("COMPLETED","PARTIAL").contains(result.status())&&!"report".equals(task.get("kind"))
&&!Objects.equals(AnalysisProtocolService.canonical(context),AnalysisProtocolService.canonical(details.get("agentContext"))))
throw conflict("本次执行返回的查询范围与后台修订不一致");
Map<String,Object> answer=nativeAnswer(details,result.answer(),context,session.releaseId(),result.status(),result.stopReason(),turn.id(),fresh);
Map<String,Object> answer=nativeAnswer(details,result.answer(),context,session.releaseId(),result.status(),result.stopReason(),turn.id(),fresh,engine);
answer.put("task",task);
asSecurityActor(fresh,()->{protocol.finish(attemptId,result.status(),answer,details,fresh);return null;});
} catch(InterruptedException interrupted) {
Thread.currentThread().interrupt();protocol.fail(attemptId,"执行被中断,请重试");
preserveStoppedModelOutput(attemptId,actor.getId());
} catch(Exception failure) {
LOGGER.warn("Protocol NAO attempt failed safely: attemptId={} exceptionType={}",attemptId,failure.getClass().getName());
LOGGER.warn("Protocol analysis runtime attempt failed safely: attemptId={} exceptionType={}",attemptId,failure.getClass().getName());
String frames=java.util.Arrays.stream(failure.getStackTrace()).limit(6).map(frame->frame.getClassName()+"#"+frame.getMethodName()+":"+frame.getLineNumber()).collect(java.util.stream.Collectors.joining(" <- "));
LOGGER.warn("Protocol analysis failed: turnId={} exceptionType={} frames={}",turn.id(),failure.getClass().getName(),frames);
protocol.fail(attemptId,failure instanceof ResponseStatusException status&&status.getReason()!=null?cap(status.getReason(),600):"本轮分析未完成,请在当前授权范围内重试");
} finally {if(naoAccess!=null)naoAccess.revokeAttempt(attemptId);}
preserveStoppedModelOutput(attemptId,actor.getId());
} finally {
runtimeDrafts.remove(attemptId);
runtimeModelOutputs.remove(attemptId);
if(runtimeAccess!=null)runtimeAccess.revokeAttempt(attemptId);
}
}
private void runNative(Turn turn, AppUserPrincipal actor, Session session) {
String turnId = turn.id();
Map<String, Object> plan = new LinkedHashMap<>();
Map<String, Object> submittedPlan = readNullable(turn.planJson(), Map.of());
Map<String, Object> context = nativeContext(submittedPlan, session.releaseId());
initializeNativeBudget(turnId,turn.budgetJson());
plan.put("status", "NATIVE_NAO");
plan.put("nativeRuntime", true);
plan.put("engine", "NAO");
plan.put("releaseId", session.releaseId());
plan.put("startedAt", Instant.now().toString());
plan.put("context", context);
plan.put("frozenContext", context);
plan.put("steps", List.of());
preserveNativeEventFloor(submittedPlan, plan);
persistState(turnId, "RUNNING", plan, List.of(), List.of(), null);
long[] lastThinkingPersist = {0};
private void rememberModelOutput(String attemptId, Map<String,Object> output) {
String original = AnalysisProtocolService.modelAnswer(output);
if (original.isBlank()) return;
var saved = new LinkedHashMap<String,Object>();
saved.put("modelAnswer", original);
for (String field : List.of("reportMarkdown", "reportTitle", "answerOrigin"))
if (output.get(field) instanceof String text) saved.put(field, text);
if (output.get("answerValidation") instanceof Map<?,?> validation) saved.put("answerValidation",validation);
runtimeModelOutputs.put(attemptId, Map.copyOf(saved));
}
private void preserveStoppedModelOutput(String attemptId, UUID userId) {
Map<String,Object> output = runtimeModelOutputs.getOrDefault(attemptId,Map.of());
if (output.isEmpty()) return;
try {
Map<String, Object> runtimeContext = nativeRuntimeContext(context, submittedPlan);
assertScope(currentUser(actor.getId()), turn.authScopeHash());
runtimeContext.put("_serverHistory", nativeServerHistory(
turn.sessionId(), turn.userId(), turn.id(), session.releaseId(), turn.authScopeHash()));
runtimeContext.put("_serverQuestions", nativeServerQuestions(
turn.sessionId(), turn.userId(), turn.id()));
NaoAnalysisRunner.Result result = naoRunner.run(turnId, session.id(), actor, turn.question(),
session.releaseId(), runtimeContext,
progress -> {
if(progress.isEmpty())return;
if(progress.get("thinkingUpdate") instanceof Map<?,?> update) {
var next=AnalysisThinking.safe(update);
if(next.isEmpty())return;
long now=System.nanoTime();
boolean checkpoint=now-lastThinkingPersist[0]>=java.util.concurrent.TimeUnit.SECONDS.toNanos(5)
|| !"running".equals(next.get("status"));
var delta=AnalysisThinking.merge(plan,next,checkpoint);
if(delta.isEmpty())return;
if(checkpoint) {
persistState(turnId,"RUNNING",plan,mapList(plan.get("steps")),List.of(),null);
lastThinkingPersist[0]=now;
}
appendEvent(turnId,"progress",Map.of("turnId",turnId,"status","RUNNING","thinkingDelta",delta));
return;
}
String message = Objects.toString(progress.getOrDefault("message", "正在分析质量数据…"), "正在分析质量数据…");
if (progress.get("steps") instanceof List<?> steps) plan.put("steps", steps);
if (progress.get("timeline") instanceof List<?> timeline) plan.put("timeline", timeline);
plan.put("toolCount", progress.getOrDefault("toolCount", 0));
plan.put("progressMessage", message);
plan.put("updatedAt", Instant.now().toString());
List<Map<String, Object>> steps = mapList(plan.get("steps"));
persistState(turnId, "RUNNING", plan, steps, List.of(), null);
Map<String, Object> event = new LinkedHashMap<>();
event.put("turnId", turnId); event.put("status", "RUNNING");
event.put("message", message); event.put("toolCount", plan.get("toolCount")); event.put("steps", steps);
event.put("startedAt", plan.get("startedAt")); event.put("updatedAt", plan.get("updatedAt"));
if (plan.containsKey("timeline")) event.put("timeline", plan.get("timeline"));
appendEvent(turnId, "progress", event);
},
answer -> persistNativeAnswer(turnId, UUID.fromString(turn.userId()), turn.authScopeHash(),
session.releaseId(), context, answer),
() -> cancelRequested(turnId));
AppUserPrincipal finalActor = currentUser(UUID.fromString(turn.userId()));
assertScope(finalActor, turn.authScopeHash());
String status = cancelRequested(turnId) ? "CANCELLED" : result.status();
String answerText = result.answer();
String stopReason = result.stopReason();
if ("COMPLETED".equals(status) && answerText.isBlank()) {
status = "PARTIAL";
stopReason = "原装 NAO 未提供最终回答";
}
List<Map<String, Object>> steps = nativeSteps(result.details().get("toolCalls"));
plan.put("steps", steps);
plan.put("toolCount", steps.size());
plan.put("stopReason", stopReason);
if (result.details().get("timeline") instanceof List<?>) plan.put("timeline", NaoAnalysisRunner.safeTimeline(result.details().get("timeline")));
Map<String, Object> answer = nativeAnswer(result.details(), answerText, context, session.releaseId(), status, stopReason,
turn.id(), finalActor);
Map<String, Object> answerContext = mapValue(answer.get("context"));
// The mutable plan context is the trusted displayed/effective scope. Keep
// frozenContext untouched so retry still means the originally submitted turn.
plan.put("context", answerContext);
persistContext(session.id(), finalActor, answerContext);
assertScope(currentUser(UUID.fromString(turn.userId())), turn.authScopeHash());
finish(turnId, status, plan, steps, List.of(), stopReason, answer);
} catch (InterruptedException interrupted) {
Thread.currentThread().interrupt();
naoAccess.revokeTurn(turnId);
finishNativeError(turnId, plan, context, session.releaseId(), cancelRequested(turnId) ? "CANCELLED" : "FAILED",
cancelRequested(turnId) ? "用户请求停止" : "NAO runtime 已中断");
} catch (Exception failure) {
// Do not log subprocess output, model text, token material, or raw exception messages.
naoAccess.revokeTurn(turnId);
LOGGER.warn("Native NAO turn failed safely: turnId={} exceptionType={}", turnId, failure.getClass().getName());
finishNativeError(turnId, plan, context, session.releaseId(), cancelRequested(turnId) ? "CANCELLED" : "FAILED",
cancelRequested(turnId) ? "用户请求停止" : "原装 NAO runtime 未能完成本次分析");
AppUserPrincipal fresh = currentUser(userId);
asSecurityActor(fresh, () -> { protocol.preserveStoppedModelOutput(attemptId,output,fresh); return null; });
} catch (RuntimeException unavailable) {
LOGGER.warn("Stopped model output remains unavailable: attemptId={} exceptionType={}",attemptId,unavailable.getClass().getName());
}
}
void initializeNativeBudget(String turnId,String currentBudgetJson) {
Map<String,Object> nativeBudget=readNullable(currentBudgetJson,Map.of());
nativeBudget.put("toolCallsMax",NAO_TOOL_CALLS_MAX);
nativeBudget.put("toolCallsMax",RUNTIME_TOOL_CALLS_MAX);
nativeBudget.put("toolCallsUsed",0);
nativeBudget.put("toolCallsRemaining",NAO_TOOL_CALLS_MAX);
nativeBudget.put("toolCallsRemaining",RUNTIME_TOOL_CALLS_MAX);
nativeBudget.put("planRevisionsMax",0);
nativeBudget.put("planRevisionsUsed",0);
nativeBudget.put("maxOutputTokens",AnalysisRuntimePolicy.MAX_OUTPUT_TOKENS);
@@ -1091,23 +1113,6 @@ public class AnalysisTurnService {
write(nativeBudget),turnId);
}
private Map<String, Object> nativeContext(Map<String, Object> persistedPlan, String releaseId) {
Map<String, Object> frozen = mapValue(persistedPlan.get("frozenContext"));
if (frozen.isEmpty()) frozen = mapValue(persistedPlan.get("context"));
Map<String, Object> context = new LinkedHashMap<>();
for (String key : List.of("year", "month", "monthStart", "monthEnd", "quarter", "department", "group", "product", "projectGroup",
"view", "includeUnassigned", "extraFilters", "stage", "category", "defect", "trendGranularity")) {
if (!frozen.containsKey(key)) continue;
Object value = frozen.get(key);
if ("extraFilters".equals(key)) context.put(key, cn.yunsheng.quality.filters.QueryFilterFields.parse(value));
else if (value instanceof String || value instanceof Number || value instanceof Boolean) context.put(key, value);
}
if (frozen.get("comparisonPeriod") != null)
context.put("comparisonPeriod", validatedAgentPeriod(frozen.get("comparisonPeriod")));
context.put("releaseId", releaseId);
return context;
}
static Map<String, Object> nativeAnswerContext(Object rawAgentContext, Map<String, Object> originalContext,
String fixedReleaseId) {
Map<String, Object> fallback = sanitizeNativeAnswerContext(originalContext, fixedReleaseId);
@@ -1569,34 +1574,31 @@ public class AnalysisTurnService {
return text.substring(0, text.offsetByCodePoints(0, visiblePoints)) + "…";
}
private void persistNativeAnswer(String turnId, UUID userId, String expectedScopeHash,
String releaseId, Map<String, Object> context, String text) {
if (cancelRequested(turnId)) return;
assertScope(currentUser(userId), expectedScopeHash);
Map<String, Object> answer = new LinkedHashMap<>();
answer.put("answer", text);
answer.put("results", List.of());
answer.put("context", context);
answer.put("releaseId", releaseId);
answer.put("engine", "NAO");
answer.put("businessResultsSentToModel", true);
jdbc.update("UPDATE analysis_turn SET answer_json=CAST(? AS JSON) WHERE id=? AND status='RUNNING'", write(answer), turnId);
appendEvent(turnId, "answer", Map.of("turnId", turnId, "status", "RUNNING", "result", answer));
Map<String, Object> nativeAnswer(Map<String, Object> details, String text, Map<String, Object> context,
String releaseId, String status, String stopReason, String turnId, AppUserPrincipal actor) {
return nativeAnswer(details,text,context,releaseId,status,stopReason,turnId,actor,AnalysisRuntimeEngine.DSH);
}
Map<String, Object> nativeAnswer(Map<String, Object> details, String text, Map<String, Object> context,
String releaseId, String status, String stopReason, String turnId, AppUserPrincipal actor) {
String releaseId, String status, String stopReason, String turnId,
AppUserPrincipal actor, String runtimeEngine) {
String engine=AnalysisRuntimeEngine.require(runtimeEngine);
Object runtimeAgentContext = List.of("COMPLETED", "PARTIAL").contains(status) ? details.get("agentContext") : null;
Map<String, Object> answerContext = nativeAnswerContext(runtimeAgentContext, context, releaseId);
Map<String,Object> protocolTask=stringMapOrEmpty(details.get("agentTask"));
if(protocolTask.get("sourceFieldLabels") instanceof Map<?,?> labels&&!labels.isEmpty())answerContext.put("columnLabels",labels);
if(!protocolTask.containsKey("queryPlan")&&protocolTask.get("stages") instanceof List<?> stages&&stages.size()==1&&Set.of("black","bright").contains(stages.getFirst()))answerContext.put("stage",stages.getFirst());
Map<String, Object> answer = new LinkedHashMap<>();
answer.put("answer", text);
String original = AnalysisProtocolService.modelAnswer(details, Map.of("answer", text));
answer.put("answer", original);
if (!original.isBlank()) answer.put("modelAnswer", original);
if (details.get("answerOrigin") instanceof String origin && origin.matches("[a-z_]{1,80}")) answer.put("answerOrigin",origin);
if (details.get("answerValidation") instanceof Map<?,?> validation && write(validation).length() <= 16000)
answer.put("answerValidation",read(DshAnalysisRunner.publicText(write(validation))));
answer.put("results", List.of());
answer.put("context", answerContext);
answer.put("releaseId", releaseId);
answer.put("engine", "NAO");
answer.put("engine", engine);
answer.put("businessResultsSentToModel", true);
if("NEEDS_CLARIFICATION".equals(status)&&protocolTask.get("clarificationRequest") instanceof Map<?,?>)
answer.put("clarificationRequest",protocolTask.get("clarificationRequest"));
@@ -1612,12 +1614,17 @@ public class AnalysisTurnService {
allowedFields, filterKeys, turnId, cleanContext(answerContext));
answer.putAll(snapshot.asMap());
}
for (String key : List.of("reportMarkdown", "reportHtml", "reportTitle", "nativeChatId"))
if (details.get(key) instanceof String value && value.length() <= 2_000_000) answer.put(key, value);
if (details.get("reportMarkdown") instanceof String markdown
&& !markdown.isBlank() && markdown.length() <= 2_000_000 && markdown.equals(original)) {
answer.put("reportMarkdown", markdown);
if (details.get("reportTitle") instanceof String title && !title.isBlank() && title.length() <= 160)
answer.put("reportTitle", title);
}
if (details.get("nativeChatId") instanceof String chatId && chatId.length() <= 256) answer.put("nativeChatId", chatId);
if (details.get("queryEvidenceRefs") instanceof List<?> refs)
answer.put("queryEvidenceRefs", refs.stream().filter(value -> value instanceof String queryRef
&& queryRef.matches("Q[A-F0-9]{8}")).distinct().limit(100).toList());
if (details.get("timeline") instanceof List<?>) answer.put("timeline", NaoAnalysisRunner.safeTimeline(details.get("timeline")));
if (details.get("timeline") instanceof List<?>) answer.put("timeline", DshAnalysisRunner.safeTimeline(details.get("timeline")));
if(AnalysisProtocolExploration.nativeAgent(protocolTask))answer.put("executionMode","native_agent");
var summary=boundedReadingSummary(details.get("readingSummary"),answer.get("queryEvidenceRefs"));if(!summary.isEmpty())answer.put("readingSummary",summary);
if(details.get("answerQuality") instanceof Map<?,?> quality) {
@@ -1643,7 +1650,7 @@ public class AnalysisTurnService {
if(details.get("phaseTimingsMs") instanceof Map<?,?> timings) {
Map<String,Long> safe=new LinkedHashMap<>();
for(String key:List.of("planningAndReview","taskConfirmation","formalQuery","memberQuery","historySnapshot","historyHeadline","synthesis","visuals","nativeStartup","investigation","firstUsefulMs"))
if(timings.get(key) instanceof Number n&&n.longValue()>=0&&n.longValue()<=NAO_DEADLINE_SECONDS*1000L)safe.put(key,n.longValue());
if(timings.get(key) instanceof Number n&&n.longValue()>=0&&n.longValue()<=RUNTIME_DEADLINE_SECONDS*1000L)safe.put(key,n.longValue());
answer.put("phaseTimingsMs",safe);
}
return answer;
@@ -1686,7 +1693,7 @@ public class AnalysisTurnService {
if (call.get(field) instanceof String text) step.put(field, cap(text, 500));
if (call.get("input") instanceof Map<?, ?> input) {
Map<String, Object> safeInput = new LinkedHashMap<>();
for (String field : List.of("mode", "scope", "period", "comparisonPeriod", "filters", "view", "stage", "dimension", "defect", "category", "limit", "sort", "action", "offset", "recordFilter")) {
for (String field : List.of("mode", "scope", "period", "comparisonPeriod", "filters", "view", "stage", "dimension", "defect", "category", "metric", "limit", "sort", "action", "offset", "recordFilter")) {
Object item = input.get(field);
if (item instanceof Map<?, ?> nested) {
Map<String, Object> safeNested = new LinkedHashMap<>();
@@ -21,7 +21,7 @@ public final class AnalysisVisualSnapshotAccess {
public static final int SCHEMA_VERSION = 1;
public static final int MAX_SNAPSHOT_BYTES = 256 * 1024;
private static final int MAX_VISUALS = 12;
private static final int MAX_CATEGORIES = 36;
private static final int MAX_CATEGORIES = 100;
private static final int MAX_SERIES = 1;
private static final int MAX_TEXT_BYTES = 2048;
private static final Pattern SAFE_KEY = Pattern.compile("[A-Za-z0-9][A-Za-z0-9_.:-]{0,119}");
@@ -135,8 +135,8 @@ public final class AnalysisVisualSnapshotAccess {
Long totalRows = longInteger(ranking.get("totalRows"));
BigDecimal denominator = decimal(ranking.get("denominator"));
List<?> rows = ranking.get("rows") instanceof List<?> values ? values : null;
if (totalRows == null || totalRows < 0 || rows == null || rows.size() != Math.min(10L,totalRows)
|| denominator == null || denominator.signum() <= 0 || limit < 1 || limit > 10) return false;
if (totalRows == null || totalRows < 0 || rows == null || (rows.size() != Math.min(100L,totalRows) && rows.size() != Math.min(10L,totalRows) || rows.size() < Math.min((long)limit,totalRows))
|| denominator == null || denominator.signum() <= 0 || limit < 1 || limit > 100) return false;
List<?> categories = chart.get("categories") instanceof List<?> values ? values : null;
List<?> series = chart.get("series") instanceof List<?> values ? values : null;
if (categories == null || series == null || series.size() != 1) return false;
@@ -349,7 +349,7 @@ public final class AnalysisVisualSnapshotAccess {
private static List<Map<String, Object>> normalizeCategories(Object raw, String type, MetricSemantics semantics,
Set<String> requiredFields, boolean productLabels) {
if (!(raw instanceof List<?> values) || values.isEmpty() || values.size() > MAX_CATEGORIES
|| Set.of("bar", "column").contains(type) && values.size() > 10) return null;
|| Set.of("bar", "column").contains(type) && values.size() > 100) return null;
List<Map<String, Object>> result = new ArrayList<>();
Set<String> keys = new LinkedHashSet<>();
for (Object value : values) {
@@ -613,7 +613,7 @@ public final class AnalysisVisualSnapshotAccess {
if ("pareto".equals(type) && "all_scope_weight".equals(coverage.get("shareBasis"))) {
if (!Set.of("black_total_weight","bright_total_weight","black_scrap_weight","bright_scrap_weight","current_scrap_weight").contains(metric)
|| !"kg".equals(unit) || semantics.stage() == null&&!"current_scrap_weight".equals(metric) || comparisonPeriod != null
|| categories.isEmpty() || categories.size() > 10 || series.size() != 1
|| categories.isEmpty() || categories.size() > 100 || series.size() != 1
|| !integerEquals(coverage.get("returnedRows"),categories.size())) return false;
BigDecimal denominator = decimal(coverage.get("denominator")), sum = BigDecimal.ZERO, previous = null;
if (denominator == null || denominator.signum() <= 0) return false;
@@ -698,6 +698,9 @@ public final class AnalysisVisualSnapshotAccess {
&& dimension != null && Set.of("department","group","product").contains(dimension))
return section == null || section.equals(dimension);
boolean grouped = Set.of("bar", "column").contains(type);
if (Set.of("black_scrap_rate", "bright_scrap_rate").contains(metric) && grouped
&& dimension != null && Set.of("department", "group", "product").contains(dimension))
return section == null || section.equals(dimension);
boolean sourceMetric = Set.of("source_defect_weight", "source_defect_delta_weight").contains(metric)
&& semantics.sourceDefect();
if (dimension != null && section == null) {
@@ -24,20 +24,20 @@ import org.springframework.stereotype.Component;
import tools.jackson.databind.json.JsonMapper;
import jakarta.annotation.PreDestroy;
/** Starts the local original NAO bridge and consumes its strict NDJSON protocol. */
/** Starts the delegated DSH runtime and consumes its strict NDJSON protocol. */
@Component
public class NaoAnalysisRunner {
public class DshAnalysisRunner {
private static final long WATCHDOG_MILLIS = AnalysisRuntimePolicy.WATCHDOG_TIMEOUT.toMillis();
private static final long CANCEL_GRACE_MILLIS = Duration.ofSeconds(8).toMillis();
private static final String STDOUT_EOF = "\u0000<NAO_STDOUT_EOF>";
private static final String STDOUT_EOF = "\u0000<ANALYSIS_RUNTIME_STDOUT_EOF>";
private final JsonMapper json;
private final NaoRuntimeAccessService access;
private final AnalysisRuntimeAccessService access;
private final Map<String, Process> active = new ConcurrentHashMap<>();
private final java.util.Set<String> cancellationRequested = ConcurrentHashMap.newKeySet();
private final java.util.concurrent.Semaphore visualRecoverySlots=new java.util.concurrent.Semaphore(2);
public NaoAnalysisRunner(JsonMapper json, NaoRuntimeAccessService access) {
public DshAnalysisRunner(JsonMapper json, AnalysisRuntimeAccessService access) {
this.json = json;
this.access = access;
}
@@ -48,6 +48,9 @@ public class NaoAnalysisRunner {
BooleanSupplier cancellationRequested) throws IOException, InterruptedException {
String attemptId=null;
if(context!=null&&context.get("_protocol") instanceof Map<?,?> p&&p.get("attemptId") instanceof String id)attemptId=id;
final String engine;
try { engine = AnalysisRuntimeEngine.require(context == null ? null : context.get("_runtimeEngine")); }
catch (IllegalArgumentException invalidEngine) { throw new IOException("Unsupported analysis runtime engine"); }
String processKey=attemptId==null?turnId:attemptId;
String token = attemptId==null?access.issue(actor, releaseId, turnId):access.issueProtocol(actor,releaseId,turnId,attemptId);
Process process = null;
@@ -66,11 +69,12 @@ public class NaoAnalysisRunner {
request.put("question", question);
request.put("releaseId", releaseId);
request.put("context", context == null ? Map.of() : context);
request.put("runtimeEngine", engine);
request.put("accessToken", token);
stdin.write(json.writeValueAsString(request));
stdin.newLine();
stdin.flush();
return readProtocol(processKey, token, process, stdin, onProgress, onAnswer, cancellationRequested,attemptId);
return readProtocol(processKey, token, process, stdin, onProgress, onAnswer, cancellationRequested,attemptId,engine);
}
} finally {
if(attemptId==null)access.revokeTurn(turnId);else access.revokeAttempt(attemptId);
@@ -93,7 +97,7 @@ public class NaoAnalysisRunner {
if(!visualRecoverySlots.tryAcquire())throw new IOException("图表恢复繁忙,请稍后重试");
Process process=null;String key="visual-recovery:"+recoveryId;
try {
Path root=projectRoot(),script=root.resolve("scripts/nao_visual_recovery.py");
Path root=projectRoot(),script=analysisScript(root).resolveSibling("quality_visual_recovery.py");
if(!Files.isRegularFile(script)||!Files.isReadable(script))throw new IOException("图表恢复组件不可用");
process=new ProcessBuilder("python3",script.toString()).directory(root.toFile()).redirectError(ProcessBuilder.Redirect.DISCARD).start();
active.put(key,process);Process running=process;
@@ -126,10 +130,10 @@ public class NaoAnalysisRunner {
private Result readProtocol(String turnId, String token, Process process, BufferedWriter stdin,
Consumer<Map<String, Object>> onProgress, Consumer<String> onAnswer,
BooleanSupplier databaseCancellation,String attemptId) throws IOException, InterruptedException {
BooleanSupplier databaseCancellation,String attemptId,String engine) throws IOException, InterruptedException {
BlockingQueue<String> lines = new ArrayBlockingQueue<>(128);
Thread stdoutReader = new Thread(() -> pumpStdout(process, lines), "nao-runtime-stdout-" + shortId(turnId));
Thread stderrReader = new Thread(() -> drainStderr(process), "nao-runtime-stderr-" + shortId(turnId));
Thread stdoutReader = new Thread(() -> pumpStdout(process, lines), "quality-analysis-runtime-stdout-" + shortId(turnId));
Thread stderrReader = new Thread(() -> drainStderr(process), "quality-analysis-runtime-stderr-" + shortId(turnId));
stdoutReader.setDaemon(true);
stderrReader.setDaemon(true);
stdoutReader.start();
@@ -160,34 +164,33 @@ public class NaoAnalysisRunner {
cancelAt = System.nanoTime();
}
}
if (!cancelSent && System.nanoTime() >= deadline) throw new IOException("NAO runtime watchdog expired");
if (!cancelSent && System.nanoTime() >= deadline) throw new IOException(AnalysisRuntimeEngine.runtimeName(engine) + " watchdog expired");
if (cancelSent && System.nanoTime() - cancelAt > TimeUnit.MILLISECONDS.toNanos(CANCEL_GRACE_MILLIS))
throw new IOException("NAO runtime did not stop after cancellation");
throw new IOException(AnalysisRuntimeEngine.runtimeName(engine) + " did not stop after cancellation");
String line = lines.poll(250, TimeUnit.MILLISECONDS);
if (line == null) {
if (!process.isAlive() && lines.isEmpty()) throw new IOException("NAO runtime exited without a result");
if (!process.isAlive() && lines.isEmpty()) throw new IOException(AnalysisRuntimeEngine.runtimeName(engine) + " exited without a result");
continue;
}
if (STDOUT_EOF.equals(line)) throw new IOException("NAO runtime closed stdout without a result");
if (STDOUT_EOF.equals(line)) throw new IOException(AnalysisRuntimeEngine.runtimeName(engine) + " closed stdout without a result");
Map<String, Object> message = parseMessage(line);
String type = Objects.toString(message.get("type"), "");
switch (type) {
case "progress" -> onProgress.accept(safeProgress(message));
case "progress" -> onProgress.accept(safeProgress(message, engine));
case "answer" -> {
lastAnswer = Objects.toString(message.get("answer"), "");
lastAnswer = AnalysisProtocolService.modelAnswer(message);
onAnswer.accept(lastAnswer);
}
case "result" -> {
if (!lastAnswer.isBlank()) lastAnswer = Objects.toString(message.getOrDefault("answer", lastAnswer), lastAnswer);
else lastAnswer = Objects.toString(message.get("answer"), "");
lastAnswer = AnalysisProtocolService.modelAnswer(message, Map.of("answer", lastAnswer));
onAnswer.accept(lastAnswer);
int exitCode = waitAfterResult(process);
Result result = Result.from(message, lastAnswer, cancelSent || databaseCancellation.getAsBoolean());
Result result = Result.from(message, lastAnswer, cancelSent || databaseCancellation.getAsBoolean(), engine);
if (modelRevoked) return new Result("FAILED", result.answer(), result.details(), "模型服务授权已失效,本轮分析已停止");
return enforceExitStatus(result, exitCode);
return enforceExitStatus(result, exitCode, engine);
}
default -> throw new IOException("NAO runtime emitted an unsupported message type");
default -> throw new IOException(AnalysisRuntimeEngine.runtimeName(engine) + " emitted an unsupported message type");
}
}
}
@@ -210,24 +213,46 @@ public class NaoAnalysisRunner {
}
private Map<String, Object> parseMessage(String line) throws IOException {
if (line == null || line.isBlank() || line.length() > 2_000_000) throw new IOException("Invalid NAO runtime output");
if (line == null || line.isBlank() || line.length() > 2_000_000) throw new IOException("Invalid analysis runtime output");
try {
Map<?, ?> raw = json.readValue(line, Map.class);
Map<String, Object> decoded = new LinkedHashMap<>();
raw.forEach((key, value) -> decoded.put(String.valueOf(key), value));
return decoded;
} catch (Exception invalid) {
throw new IOException("NAO runtime output was not valid NDJSON", invalid);
throw new IOException("Analysis runtime output was not valid NDJSON", invalid);
}
}
static Map<String, Object> safeProgress(Map<String, Object> message) {
return safeProgress(message, AnalysisRuntimeEngine.DSH);
}
static Map<String, Object> safeProgress(Map<String, Object> message, String runtimeEngine) {
String engine = AnalysisRuntimeEngine.require(runtimeEngine);
if (message.get("modelAnswer") instanceof String original) {
String publicAnswer = publicText(original);
return Map.of("modelAnswer", publicAnswer, "dshDraft",
message.get("dshDraft") instanceof String draft ? cap(publicText(draft),4000) : cap(publicAnswer,4000));
}
if (message.get("dshDraft") instanceof String draft) {
String publicDraft = publicText(draft).replaceAll("[\\p{Cntrl}&&[^\\r\\n\\t]]", "");
return Map.of("dshDraft", cap(publicDraft, 4000));
}
if (message.get("dshActivity") instanceof String activity) {
return switch (activity) {
case "generating" -> Map.of("engine", engine, "dshActivity", activity, "message", "DSH 正在生成分析…");
case "checking" -> Map.of("engine", engine, "dshActivity", activity, "message", "正在整理回答…");
default -> Map.of();
};
}
if (message.containsKey("thinkingUpdate")) {
var thinking=AnalysisThinking.safe(message.get("thinkingUpdate"));
return thinking.isEmpty()?Map.of():Map.of("thinkingUpdate",thinking);
}
Map<String, Object> safe = new LinkedHashMap<>();
safe.put("message", cap(Objects.toString(message.getOrDefault("message", "原装 NAO 正在处理"), "原装 NAO 正在处理"), 500));
safe.put("message", cap(Objects.toString(message.getOrDefault("message", AnalysisRuntimeEngine.progressLabel(engine)), AnalysisRuntimeEngine.progressLabel(engine)), 500));
safe.put("engine", engine);
Object count = message.get("toolCount");
if (count instanceof Number number && number.intValue() >= 0 && number.intValue() <= 1000)
safe.put("toolCount", number.intValue());
@@ -264,8 +289,9 @@ public class NaoAnalysisRunner {
return List.copyOf(safe);
}
private static String publicText(String value) {
return value.replaceAll("(?i)Bearer\\s+[A-Za-z0-9._~+/-]+", "Bearer [REDACTED]")
static String publicText(String value) {
return value.replaceAll("(?i)quality-turn:[0-9a-f-]{36}", "")
.replaceAll("(?i)Bearer\\s+[A-Za-z0-9._~+/-]+", "Bearer [REDACTED]")
.replaceAll("(?i)(api[_-]?key|password|token|secret|authorization)(\\s*[=::]\\s*)[^\\s,,;;]+", "$1$2[REDACTED]");
}
@@ -284,37 +310,46 @@ public class NaoAnalysisRunner {
}
static Result enforceExitStatus(Result result, int exitCode) {
return enforceExitStatus(result, exitCode, AnalysisRuntimeEngine.DSH);
}
static Result enforceExitStatus(Result result, int exitCode, String engine) {
if (exitCode == 0 || "FAILED".equals(result.status()) || "CANCELLED".equals(result.status())) return result;
return new Result("FAILED", result.answer(), result.details(), "NAO runtime exited abnormally");
return new Result("FAILED", result.answer(), result.details(), AnalysisRuntimeEngine.runtimeName(engine) + " exited abnormally");
}
private Path analysisScript(Path root) {
String configuredScript = firstNonBlank(System.getProperty("quality.analysis.runtime.script"), System.getenv("QUALITY_ANALYSIS_RUNTIME_SCRIPT"));
return (configuredScript == null ? root.resolve("scripts/quality_analysis_runtime.py") : Path.of(configuredScript))
.toAbsolutePath().normalize();
}
private RuntimeLocation runtimeLocation() throws IOException {
Path root=projectRoot();
String configuredScript = firstNonBlank(System.getProperty("quality.analysis.nao.script"), System.getenv("QUALITY_ANALYSIS_NAO_SCRIPT"));
Path script = configuredScript == null ? root.resolve("scripts/nao_quality_runtime.py") : Path.of(configuredScript).toAbsolutePath().normalize();
if (!Files.isRegularFile(script) || !Files.isReadable(script)) throw new IOException("NAO runtime script is missing or unreadable");
return new RuntimeLocation(root, script.toAbsolutePath().normalize());
Path root = projectRoot();
Path script = analysisScript(root);
if (!Files.isRegularFile(script) || !Files.isReadable(script)) throw new IOException("DSH runtime script is missing or unreadable");
return new RuntimeLocation(root, script);
}
private Path projectRoot() throws IOException {
String configuredRoot = firstNonBlank(System.getProperty("quality.project.root"), System.getenv("QUALITY_PROJECT_ROOT"));
Path root = configuredRoot == null ? findProjectRoot(Path.of("").toAbsolutePath()) : Path.of(configuredRoot).toAbsolutePath().normalize();
if (root == null || !Files.isDirectory(root)) throw new IOException("NAO project root was not found");
if (root == null || !Files.isDirectory(root)) throw new IOException("Quality analysis project root was not found");
return root;
}
private Path findProjectRoot(Path start) {
Path candidate = start;
for (int depth = 0; depth <= 8 && candidate != null; depth++, candidate = candidate.getParent()) {
if (Files.isRegularFile(candidate.resolve("scripts/nao_quality_runtime.py"))) return candidate;
if (Files.isRegularFile(candidate.resolve("scripts/quality_analysis_runtime.py"))) return candidate;
}
return null;
}
private List<String> command(RuntimeLocation location) throws IOException {
String override = firstNonBlank(System.getProperty("quality.analysis.nao.command"), System.getenv("QUALITY_ANALYSIS_NAO_COMMAND"));
String override = firstNonBlank(System.getProperty("quality.analysis.runtime.command"), System.getenv("QUALITY_ANALYSIS_RUNTIME_COMMAND"));
if (override == null) return List.of("python3", location.script().toString());
List<String> parsed = tokenizeCommand(override);
if (parsed.isEmpty()) throw new IOException("Configured NAO command is empty");
if (parsed.isEmpty()) throw new IOException("Configured analysis runtime command is empty");
return parsed;
}
@@ -366,11 +401,21 @@ public class NaoAnalysisRunner {
public record Result(String status, String answer, Map<String, Object> details, String stopReason) {
static Result from(Map<String, Object> message, String streamedAnswer, boolean cancellationRequested) {
return from(message, streamedAnswer, cancellationRequested, AnalysisRuntimeEngine.DSH);
}
static Result from(Map<String, Object> message, String streamedAnswer, boolean cancellationRequested, String selectedEngine) {
String engine = AnalysisRuntimeEngine.require(selectedEngine);
Map<String, Object> details = new LinkedHashMap<>(message);
details.remove("type");
String status = Objects.toString(message.get("status"), "FAILED").toUpperCase(java.util.Locale.ROOT);
String reason = Objects.toString(message.getOrDefault("stopReason", ""), "");
String answer = Objects.toString(message.getOrDefault("answer", streamedAnswer), streamedAnswer);
String answer = message.get("modelAnswer") instanceof String original
? original : Objects.toString(message.getOrDefault("answer", streamedAnswer), streamedAnswer);
if (!answer.isBlank()) {
answer = publicText(answer);
details.put("modelAnswer", answer);
}
String safeMessage = "result".equals(message.get("type")) && "FAILED".equals(status)
? safeWorkerMessage(message.get("message")) : null;
if (cancellationRequested || "CANCELLED".equals(status)) {
@@ -384,7 +429,7 @@ public class NaoAnalysisRunner {
|| !"needs_clarification".equals(reason)
|| !(message.get("answer") instanceof String prompt) || prompt.isBlank()) {
status = "FAILED";
reason = "原装 NAO 返回了无效澄清请求";
reason = AnalysisRuntimeEngine.runtimeName(engine) + " 返回了无效澄清请求";
}
} else if ("COMPLETED".equals(status) && !"stop".equalsIgnoreCase(reason)
&& !("evidence_finalized".equals(reason)
@@ -425,10 +470,10 @@ public class NaoAnalysisRunner {
&& message.get("protocolEvidence") instanceof List<?> proofs&&!proofs.isEmpty()
&& message.get("evidenceCompletion") instanceof Map<?,?> coverage&&Boolean.TRUE.equals(coverage.get("serverCoverageSufficient")))) {
status = "PARTIAL";
if (reason.isBlank()) reason = "原装 NAO 未以 stop 原因正常结束";
if (reason.isBlank()) reason = AnalysisRuntimeEngine.runtimeName(engine) + " 未以 stop 原因正常结束";
} else if (!List.of("COMPLETED", "PARTIAL", "FAILED").contains(status)) {
status = "FAILED";
if (reason.isBlank()) reason = "原装 NAO 返回了无效结束状态";
if (reason.isBlank()) reason = AnalysisRuntimeEngine.runtimeName(engine) + " 返回了无效结束状态";
}
boolean conflictingExit=Boolean.FALSE.equals(message.get("nativeStopSucceeded"))
|| message.get("finishReason") instanceof String finish&&!finish.isBlank()&&!"stop".equalsIgnoreCase(finish)
@@ -452,7 +497,6 @@ public class NaoAnalysisRunner {
}
if ("FAILED".equals(status) && safeMessage != null) {
details.put("message", safeMessage);
if (answer.isBlank()) answer = safeMessage;
if (reason.isBlank() || "runtime_error".equals(reason) || "invalid_request".equals(reason)) reason = safeMessage;
} else {
details.remove("message");
@@ -460,7 +504,7 @@ public class NaoAnalysisRunner {
details.put("status", status);
details.put("stopReason", reason);
details.put("answer", answer);
details.put("engine", "NAO");
details.put("engine", engine);
return new Result(status, answer, details, reason);
}
@@ -127,6 +127,11 @@ public class OptionsController {
return response;
}
/** Rechecks that the release behind a saved result is still published. */
public void requirePublishedRelease(String releaseId) {
releases.resolvePublishedRelease(releaseId);
}
@SuppressWarnings("unchecked")
private Map<String, Object> mappingDefinition(String releaseId) {
String raw = jdbc.queryForObject("SELECT CAST(m.definition AS CHAR) FROM data_release r JOIN mapping_version m ON m.id=r.mapping_version WHERE r.id=?", String.class, releaseId);
@@ -0,0 +1,14 @@
package cn.yunsheng.quality.analysis;
import static org.junit.jupiter.api.Assertions.*;
import java.util.*;
import org.junit.jupiter.api.Test;
class AnalysisAgentCatalogTest {
@Test void retiredOrganizationsAndTheirGroupsAreAbsentWithoutMutatingBusinessCatalog() {
var original=Map.<String,Object>of("departments",List.of("工业电机产业部","欧洲磁钢","欧洲产业部","美洲产业部"),
"groups",List.of("有效组","历史组"),"groupDepartments",Map.of("有效组","工业电机产业部","历史组","欧洲磁钢"));
var result=AnalysisAgentCatalog.active(original);
assertEquals(List.of("工业电机产业部"),result.get("departments"));
assertEquals(List.of("有效组"),result.get("groups"));
assertEquals(4,AnalysisProtocolService.list(original.get("departments")).size());
}
}
@@ -41,8 +41,41 @@ class AnalysisApiSettingsTest {
@Test void loadsSelectedLegacyProfileWithoutReturningSecrets() throws Exception {
legacy(); Map<String, Object> m = service().metadata();
assertEquals("second-model", m.get("model")); assertEquals("http://second.invalid/v1", m.get("baseUrl"));
assertEquals("DSH", m.get("runtimeEngine"));
assertEquals(true, m.get("hasApiKey")); assertFalse(json.writeValueAsString(m).contains("private-key"));
}
@Test void dshIsFixedAcrossProfileSwitchesAndCompatibilityRequests() throws Exception {
legacy(); var s = service(); var initial = s.metadata();
var dsh = s.save(new AnalysisApiSettingsService.Settings("http://second.invalid/v1", "", "second-model",
(String) initial.get("revision"), "profile-2", null, null, "DSH"));
assertEquals("DSH", dsh.get("runtimeEngine"));
assertEquals("DSH", s.runtimeEngine());
Map<?, ?> file = json.readValue(Files.readString(root.resolve(".runtime/quality-model-config.json")), Map.class);
assertFalse(file.containsKey("runtimeEngine"));
for (Object raw : (List<?>) file.get("profiles")) assertFalse(((Map<?, ?>) raw).containsKey("runtimeEngine"));
// The legacy constructor omits the engine; profile selection must retain the top-level choice.
var switched = s.save(new AnalysisApiSettingsService.Settings("http://first.invalid/v1", "", "first-model",
(String) dsh.get("revision"), "profile-1"));
assertEquals("DSH", switched.get("runtimeEngine"));
assertEquals("DSH", service().metadata().get("runtimeEngine"));
assertFalse(json.writeValueAsString(switched).contains("private-key"));
}
@Test void settingsWithoutEngineUseDshAndRejectOtherEngines() throws Exception {
Files.createDirectories(root.resolve(".runtime"));
Files.writeString(root.resolve(".runtime/quality-model-config.json"),
"{\"baseUrl\":\"http://saved.invalid/v1\",\"apiKey\":\"saved-private-key\",\"model\":\"saved-model\",\"revision\":\"old-revision\"}");
var s = service(); var old = s.metadata();
assertEquals("DSH", old.get("runtimeEngine"));
assertEquals("DSH", s.runtimeEngine());
var invalid = new AnalysisApiSettingsService.Settings("http://saved.invalid/v1", "", "saved-model",
(String) old.get("revision"), null, null, null, "NAO");
assertEquals(400, assertThrows(ResponseStatusException.class, () -> s.save(invalid)).getStatusCode().value());
assertEquals("DSH", s.metadata().get("runtimeEngine"));
var saved = s.save(new AnalysisApiSettingsService.Settings("http://saved.invalid/v1", "", "saved-model",
(String) old.get("revision")));
assertEquals("DSH", saved.get("runtimeEngine"));
}
@Test void mimoLegacyStrengthIsNormalizedToAutomaticWithoutDisablingThinking() throws Exception {
legacy(); var s=service();var current=s.metadata();
var saved=s.save(new AnalysisApiSettingsService.Settings("http://second.invalid/v1","","mimo-v2.6-flash",
@@ -82,21 +115,21 @@ class AnalysisApiSettingsTest {
var invalid=new AnalysisApiSettingsService.Settings("http://first.invalid/v1","","first-model",
(String)again.get("revision"),"profile-1",true,"extreme");
assertEquals(400,assertThrows(ResponseStatusException.class,()->s.save(invalid)).getStatusCode().value());
Map<?,?> file=json.readValue(Files.readString(root.resolve(".runtime/nao-model-config.json")),Map.class);
Map<?,?> file=json.readValue(Files.readString(root.resolve(".runtime/quality-model-config.json")),Map.class);
assertEquals("first-private-key",file.get("apiKey"));
}
@Test void switchesBothSavedProfilesWithoutReturningOrMixingTheirKeys() throws Exception {
legacy(); var s=service();var original=s.metadata();
assertEquals(2,((List<?>)original.get("profiles")).size());
assertEquals("profile-2",original.get("activeProfileId"));
assertFalse(Files.exists(root.resolve(".runtime/nao-model-config.json")));
assertFalse(Files.exists(root.resolve(".runtime/quality-model-config.json")));
var first=s.save(new AnalysisApiSettingsService.Settings("http://first.invalid/v1","","first-model",(String)original.get("revision"),"profile-1"));
assertEquals("profile-1",first.get("activeProfileId"));
Map<?,?> file=json.readValue(Files.readString(root.resolve(".runtime/nao-model-config.json")),Map.class);
Map<?,?> file=json.readValue(Files.readString(root.resolve(".runtime/quality-model-config.json")),Map.class);
assertEquals("first-private-key",file.get("apiKey"));
var second=s.save(new AnalysisApiSettingsService.Settings("http://second.invalid/v1","","updated-model",(String)first.get("revision"),"profile-2"));
assertEquals("profile-2",second.get("activeProfileId"));
file=json.readValue(Files.readString(root.resolve(".runtime/nao-model-config.json")),Map.class);
file=json.readValue(Files.readString(root.resolve(".runtime/quality-model-config.json")),Map.class);
assertEquals("second-private-key",file.get("apiKey"));
var fresh=service().metadata();
assertEquals("updated-model",fresh.get("model"));assertEquals(2,((List<?>)fresh.get("profiles")).size());
@@ -116,7 +149,7 @@ class AnalysisApiSettingsTest {
}
@Test void preservesLegacyCustomPathAndFindsRootFromBackend() throws Exception {
Files.createDirectories(root.resolve("scripts")); Files.createDirectories(root.resolve("backend"));
Files.writeString(root.resolve("scripts/nao_quality_runtime.py"), "# fixture");
Files.writeString(root.resolve("scripts/quality_analysis_runtime.py"), "# fixture");
assertEquals(root, AnalysisApiSettingsService.projectRoot(root.resolve("backend"), null, null));
assertEquals(root, AnalysisApiSettingsService.projectRoot(root.resolve("backend"), root.toString(), "/ignored"));
Files.writeString(root.resolve("apikey.txt"), "http://old.invalid/openai\nlegacy-key\nlegacy-model\n");
@@ -143,7 +176,7 @@ class AnalysisApiSettingsTest {
legacy(); var s = service(); var m = s.metadata();
var saved = s.save(input(m, "http://second.invalid/v1/chat/completions", "", "new-model"));
assertEquals("new-model", saved.get("model")); assertNotEquals(m.get("revision"), saved.get("revision"));
Path p = root.resolve(".runtime/nao-model-config.json");
Path p = root.resolve(".runtime/quality-model-config.json");
Map<?, ?> file = json.readValue(Files.readString(p), Map.class);
assertEquals("second-private-key", file.get("apiKey")); assertEquals("http://second.invalid/v1", file.get("baseUrl"));
assertEquals(java.nio.file.attribute.PosixFilePermissions.fromString("rw-------"), Files.getPosixFilePermissions(p));
@@ -154,7 +187,7 @@ class AnalysisApiSettingsTest {
legacy(); var s = service(); var request = input(s.metadata(), "http://different.invalid/v1", "", "second-model");
assertEquals(400, assertThrows(ResponseStatusException.class, () -> s.save(request)).getStatusCode().value());
assertEquals(400, assertThrows(ResponseStatusException.class, () -> s.test(request)).getStatusCode().value());
assertFalse(Files.exists(root.resolve(".runtime/nao-model-config.json")));
assertFalse(Files.exists(root.resolve(".runtime/quality-model-config.json")));
}
@Test void supportsFirstSetupAndRejectsUnsafeUrls() {
var s = service(); var m = s.metadata(); assertEquals(false, m.get("hasApiKey"));
@@ -166,15 +199,17 @@ class AnalysisApiSettingsTest {
HttpServer server = HttpServer.create(new InetSocketAddress("127.0.0.1", 0), 0);
server.createContext("/v1/chat/completions", exchange -> {
String body = new String(exchange.getRequestBody().readAllBytes(), StandardCharsets.UTF_8);
assertTrue(body.contains("probe-model")); assertFalse(body.contains("releaseId"));
assertTrue(body.contains("probe-model")); assertFalse(body.contains("releaseId")); assertFalse(body.contains("runtimeEngine"));
byte[] bytes = "{\"choices\":[{\"message\":{\"content\":\"provider-private-content\"}}]}".getBytes(StandardCharsets.UTF_8);
exchange.sendResponseHeaders(200, bytes.length); exchange.getResponseBody().write(bytes); exchange.close();
});
server.start();
try {
var s = service(); var result = s.test(input(s.metadata(), "http://127.0.0.1:" + server.getAddress().getPort(), "probe-key", "probe-model"));
var s = service(); var metadata = s.metadata();
var result = s.test(new AnalysisApiSettingsService.Settings("http://127.0.0.1:" + server.getAddress().getPort(),
"probe-key", "probe-model", (String) metadata.get("revision"), null, null, null, "DSH"));
assertEquals(true, result.get("success")); assertFalse(json.writeValueAsString(result).contains("provider-private-content"));
assertFalse(Files.exists(root.resolve(".runtime/nao-model-config.json")));
assertFalse(Files.exists(root.resolve(".runtime/quality-model-config.json")));
} finally { server.stop(0); }
}
@Configuration @EnableMethodSecurity static class Secured { }
@@ -16,6 +16,7 @@ import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.core.RowMapper;
import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.web.server.ResponseStatusException;
import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
import tools.jackson.databind.json.JsonMapper;
class AnalysisControllerHistoryAccessTest {
@@ -54,10 +55,30 @@ class AnalysisControllerHistoryAccessTest {
doThrow(new ResponseStatusException(HttpStatus.FORBIDDEN,"巡检来源已变化")).when(f.protocol).authorizeInspectionSnapshot(f.turn,f.actor);
assertEquals(403,assertThrows(ResponseStatusException.class,()->f.controller.history(f.session,f.actor)).getStatusCode().value());
}
@Test void followSnapshotHandsOffTheActiveTurnAndItsDurableCursor() throws Exception {
var f = new Fixture(true, "metrics", "RUNNING");
var emitter = new SseEmitter();
when(f.turns.followSession(anyMap(), eq(f.actor))).thenReturn(emitter);
assertSame(emitter, f.controller.follow(f.session, f.actor));
verify(f.protocol).authorizeHistory(f.session, f.actor);
verify(f.turns).followSession(argThat(snapshot -> {
var turn = (Map<?, ?>) ((List<?>) snapshot.get("turns")).getFirst();
return f.turn.equals(snapshot.get("activeTurnId")) && "42".equals(turn.get("eventCursor"));
}), eq(f.actor));
}
@Test void followAuthorizesSavedReportBeforeStartingTheStream() throws Exception {
var f = new Fixture(true, "report", "COMPLETED");
doThrow(new ResponseStatusException(HttpStatus.FORBIDDEN, "来源已变化"))
.when(f.protocol).authorizeReportSnapshot(f.turn, f.actor);
assertEquals(403, assertThrows(ResponseStatusException.class, () -> f.controller.follow(f.session, f.actor))
.getStatusCode().value());
verifyNoInteractions(f.turns);
}
private static final class Fixture {
final String session=UUID.randomUUID().toString(),turn=UUID.randomUUID().toString(),release=UUID.randomUUID().toString();
final AppUserPrincipal actor=new AppUserPrincipal(UUID.randomUUID(),"history-viewer","unused","测试",true,false,List.of("USER"),List.of(),List.of(),List.of());
final AnalysisProtocolService protocol=mock(AnalysisProtocolService.class);
final AnalysisTurnService turns=mock(AnalysisTurnService.class);
final MetricsService metrics=mock(MetricsService.class);
final AnalysisController controller;
@SuppressWarnings({"unchecked","rawtypes"}) Fixture(boolean unified,String kind,String status) throws Exception {
@@ -69,8 +90,11 @@ class AnalysisControllerHistoryAccessTest {
var row=mock(ResultSet.class);when(row.getString("id")).thenReturn(turn);when(row.getString("question")).thenReturn("整理已有结果");when(row.getString("status")).thenReturn(status);
when(row.getString("answer_json")).thenReturn(json.writeValueAsString(Map.of("answer","saved","reportHtml","<h1>cached report</h1>")));
when(row.getString("plan_json")).thenReturn(json.writeValueAsString(Map.of("task",Map.of("kind",kind))));when(row.getString("steps_json")).thenReturn("[]");when(row.getTimestamp("created_at")).thenReturn(Timestamp.from(Instant.now()));
when(row.getString(10)).thenReturn("42");
doAnswer(invocation->List.of(((RowMapper)invocation.getArgument(1)).mapRow(row,0))).when(jdbc).query(startsWith("SELECT id,question,answer_json"),any(RowMapper.class),eq(session),eq(actor.getId().toString()));
doAnswer(invocation->List.of(((RowMapper)invocation.getArgument(1)).mapRow(row,0))).when(jdbc).query(startsWith("SELECT id,question,answer_json"),any(RowMapper.class),eq(session),eq(actor.getId().toString()),eq(7));
controller=new AnalysisController(metrics,null,jdbc,json,mock(PlatformTransactionManager.class),governance,null,null);controller.setProtocol(protocol);
controller.setTurnService(turns);
when(protocol.ownsSession(session)).thenReturn(unified);
}
}
@@ -34,7 +34,7 @@ class AnalysisControllerStatusTest {
});
provider.start();
try {
Path config = root.resolve(".runtime/nao-model-config.json");
Path config = root.resolve(".runtime/quality-model-config.json");
Files.createDirectories(config.getParent());
Files.writeString(config, json.writeValueAsString(Map.of(
"schemaVersion", 2,
@@ -49,10 +49,10 @@ class AnalysisControllerStatusTest {
assertEquals(true, status.get("configured"));
assertEquals("nao-ui-model", status.get("model"));
assertEquals("127.0.0.1", status.get("serviceHost"));
assertEquals("NAO_AGENT_SERVER_TOOLS", status.get("mode"));
assertEquals("DSH_AGENT_SERVER_TOOLS", status.get("mode"));
assertEquals(true, status.get("businessResultsSentToModel"));
assertEquals(true, status.get("authorizedQueryResultsMayBeSentToModel"));
assertTrue(((java.util.List<?>) status.get("capabilities")).contains("nativeNaoRuntime"));
assertTrue(((java.util.List<?>) status.get("capabilities")).contains("nativeDshRuntime"));
assertFalse(json.writeValueAsString(status).contains("status-secret-canary"));
assertEquals(0, providerRequests.get(), "status must only read local metadata, never probe the model");
} finally {
@@ -65,16 +65,16 @@ class AnalysisControllerStatusTest {
Path missingRoot = root.resolve("missing");
Map<String, Object> missing = controller(missingRoot).status();
assertEquals(false, missing.get("configured"));
assertEquals("NAO_NOT_CONFIGURED", missing.get("mode"));
assertEquals("DSH_NOT_CONFIGURED", missing.get("mode"));
assertEquals(false, missing.get("authorizedQueryResultsMayBeSentToModel"));
Path invalidRoot = root.resolve("invalid");
Path config = invalidRoot.resolve(".runtime/nao-model-config.json");
Path config = invalidRoot.resolve(".runtime/quality-model-config.json");
Files.createDirectories(config.getParent());
Files.writeString(config, "{\"baseUrl\":\"file:///private\",\"apiKey\":\"invalid-secret-canary\",\"model\":\"\",\"revision\":\"bad\"}");
Map<String, Object> invalid = controller(invalidRoot).status();
assertEquals(false, invalid.get("configured"));
assertEquals("NAO_NOT_CONFIGURED", invalid.get("mode"));
assertEquals("DSH_NOT_CONFIGURED", invalid.get("mode"));
assertFalse(json.writeValueAsString(invalid).contains("invalid-secret-canary"));
}
}
@@ -0,0 +1,34 @@
package cn.yunsheng.quality.analysis;
import static org.junit.jupiter.api.Assertions.*;
import java.util.LinkedHashMap;
import java.util.Map;
import org.junit.jupiter.api.Test;
class AnalysisModelAnswerTest {
@Test void modelOriginalTakesPrecedenceOverAnyFallbackAndRetainsFullLength() {
String original = "# 原文\n\n" + "模型业务结论。".repeat(1200);
var output = Map.<String,Object>of("modelAnswer",original,"answer","固定回退摘要",
"reportMarkdown",original,"reportTitle","模型报告");
var answer = new LinkedHashMap<String,Object>(Map.of("answer","校验失败诊断","reportHtml","<p>固定报告</p>"));
AnalysisProtocolService.preserveModelOutput(answer, output);
assertEquals(original,answer.get("answer"));assertEquals(original,answer.get("modelAnswer"));
assertEquals(original,answer.get("reportMarkdown"));assertFalse(answer.containsKey("reportHtml"));
var progress = DshAnalysisRunner.safeProgress(output);
assertEquals(original,progress.get("modelAnswer"));assertEquals(4000,((String)progress.get("dshDraft")).length());
}
@Test void explicitMissingOriginalDoesNotTurnAStatusMessageIntoModelProse() {
assertEquals("",AnalysisProtocolService.modelAnswer(Map.of("modelAnswer","","answer","固定诊断")));
var result = DshAnalysisRunner.Result.from(Map.of("type","result","status","FAILED","modelAnswer","",
"answer","固定回退摘要","message","模型未产生正文","stopReason","runtime_error"),"",false);
assertEquals("",result.answer());
}
@Test void originalProseOnlyRedactsActualCredentials() {
String original = "结论为 99.9%。 api_key=private-key";
var answer = new LinkedHashMap<String,Object>();
AnalysisProtocolService.preserveModelOutput(answer,Map.of("modelAnswer",original));
assertEquals("结论为 99.9%。 api_key=[REDACTED]",answer.get("answer"));
}
}
@@ -36,9 +36,13 @@ class AnalysisNativeAgentContextTest {
Method sanitize=AnalysisTurnService.class.getDeclaredMethod("sanitizeContext",Map.class);sanitize.setAccessible(true);
Map<?,?> accepted=(Map<?,?>)sanitize.invoke(service,restored);
assertEquals(Map.of("year",2026,"month",8),accepted.get("comparisonPeriod"));
Method nativeContext=AnalysisTurnService.class.getDeclaredMethod("nativeContext",Map.class,String.class);nativeContext.setAccessible(true);
Map<?,?> forwarded=(Map<?,?>)nativeContext.invoke(service,Map.of("context",accepted),RELEASE);
var protocol = new AnalysisProtocolService(mock(JdbcTemplate.class), JsonMapper.builder().build(),
null, null, null, null, mock(GovernanceAccessService.class), true);
var attempt = new AnalysisProtocolService.Attempt("attempt", "session", TURN, "PLANNING", null, null,
Map.of("baseContext", accepted), "actor", RELEASE, "scope", false, "RUNNING", "attempt");
Map<?,?> forwarded = protocol.runtimeContext(attempt);
assertEquals(accepted.get("comparisonPeriod"),forwarded.get("comparisonPeriod"));
assertEquals(1, ((Map<?, ?>) forwarded.get("_protocol")).get("version"));
}
@Test void callerCannotSmuggleRuntimeMetadataInsideComparisonPeriod() throws Exception {
@@ -13,11 +13,20 @@ import org.junit.jupiter.api.Test;
class AnalysisNativeRetryTest {
private static final String RELEASE = "release-fixed";
@Test void historicalEngineCanBeReadButCannotBeReplayed() {
Map<String, Object> old = Map.of("status", "NATIVE_NAO", "engine", "NAO", "releaseId", RELEASE,
"context", Map.of("releaseId", RELEASE, "year", 2026));
assertTrue(AnalysisTurnService.isNativePlan(old));
assertFalse(AnalysisRuntimeEngine.canExecute(old));
assertEquals("HISTORICAL", AnalysisRuntimeEngine.publicMetadata(old).get("status"));
assertThrows(IllegalArgumentException.class, () -> AnalysisTurnService.nativeRetryPlan(old, RELEASE));
}
@Test
void restoresLegacyNativePlanContextWithoutBorrowingSessionContextOrLegacySemanticPlan() {
void restoresDshPlanContextWithoutBorrowingSessionContextOrSemanticPlan() {
Map<String, Object> oldNativePlan = new LinkedHashMap<>();
oldNativePlan.put("status", "NATIVE_NAO");
oldNativePlan.put("engine", "NAO");
oldNativePlan.put("status", "NATIVE_DSH");
oldNativePlan.put("engine", "DSH");
oldNativePlan.put("releaseId", RELEASE);
oldNativePlan.put("context", Map.of("releaseId", RELEASE, "year", 2025, "department", "北方事业部",
"view", "department", "_task", Map.of("conditions", Map.of("department", "新会话部门"))));
@@ -27,7 +36,7 @@ class AnalysisNativeRetryTest {
Map<String, Object> retryPlan = AnalysisTurnService.nativeRetryPlan(oldNativePlan, RELEASE);
assertEquals(true, retryPlan.get("nativeRuntime"));
assertEquals("NAO", retryPlan.get("engine"));
assertEquals("DSH", retryPlan.get("engine"));
assertEquals(RELEASE, retryPlan.get("releaseId"));
assertEquals(Map.of("year", 2025, "department", "北方事业部", "view", "department", "releaseId", RELEASE),
retryPlan.get("context"));
@@ -36,9 +45,20 @@ class AnalysisNativeRetryTest {
assertFalse(retryPlan.containsKey("semantic"));
}
@Test
void dshNativePlansRemainRetryableAndKeepTheirFrozenEngine() {
Map<String,Object> stored=Map.of("status","NATIVE_DSH","engine","DSH","nativeRuntime",true,
"releaseId",RELEASE,"frozenContext",Map.of("releaseId",RELEASE,"year",2026));
assertTrue(AnalysisTurnService.isNativePlan(stored));
Map<String,Object> retry=AnalysisTurnService.nativeRetryPlan(stored,RELEASE);
assertEquals("DSH",retry.get("engine"));
assertEquals("NATIVE_DSH_PENDING",retry.get("status"));
assertEquals(Map.of("releaseId",RELEASE,"year",2026),retry.get("context"));
}
@Test
void prefersTurnFrozenContextAndRejectsReleaseChanges() {
Map<String, Object> plan = Map.of("status", "NATIVE_NAO", "engine", "NAO", "releaseId", RELEASE,
Map<String, Object> plan = Map.of("status", "NATIVE_DSH", "engine", "DSH", "releaseId", RELEASE,
"context", Map.of("releaseId", RELEASE, "department", "后续会话条件"),
"frozenContext", Map.of("releaseId", RELEASE, "department", "原始轮次条件", "quarter", 2));
@@ -54,13 +74,13 @@ class AnalysisNativeRetryTest {
Map<String, Object> baseline = Map.of("year", 2026, "month", 8);
Map<String, Object> frozen = Map.of("releaseId", RELEASE, "year", 2026, "month", 9,
"department", "新能源汽车磁钢", "comparisonPeriod", baseline);
Map<String, Object> plan = Map.of("engine", "NAO", "releaseId", RELEASE, "frozenContext", frozen,
Map<String, Object> plan = Map.of("engine", "DSH", "releaseId", RELEASE, "frozenContext", frozen,
"context", Map.of("releaseId", RELEASE, "comparisonPeriod", Map.of("year", 2025, "month", 1)));
Map<?, ?> restored = (Map<?, ?>) AnalysisTurnService.nativeRetryPlan(plan, RELEASE).get("context");
assertEquals(baseline, restored.get("comparisonPeriod"));
assertEquals("新能源汽车磁钢", restored.get("department"));
Map<String, Object> invalid = Map.of("engine", "NAO", "releaseId", RELEASE,
Map<String, Object> invalid = Map.of("engine", "DSH", "releaseId", RELEASE,
"frozenContext", Map.of("releaseId", RELEASE, "comparisonPeriod", Map.of("year", 2026, "month", 13)));
assertThrows(IllegalArgumentException.class, () -> AnalysisTurnService.nativeRetryPlan(invalid, RELEASE));
}
@@ -68,14 +88,14 @@ class AnalysisNativeRetryTest {
@Test
void doesNotMisclassifyLegacyPlansOrRetryNativeTurnsWithoutSavedQueryContext() {
assertFalse(AnalysisTurnService.isNativePlan(Map.of("status", "FAILED", "semantic", Map.of("intent", "compare"))));
Map<String, Object> nativeWithoutContext = Map.of("status", "NATIVE_NAO", "engine", "NAO", "releaseId", RELEASE);
Map<String, Object> nativeWithoutContext = Map.of("status", "NATIVE_DSH", "engine", "DSH", "releaseId", RELEASE);
assertThrows(IllegalArgumentException.class,
() -> AnalysisTurnService.nativeRetryPlan(nativeWithoutContext, RELEASE));
}
@Test
void nativeRetrySseCursorSkipsPriorAttemptEventsAndPreservesNewAttemptFloor() {
Map<String, Object> oldPlan = Map.of("status", "NATIVE_NAO", "engine", "NAO", "releaseId", RELEASE,
Map<String, Object> oldPlan = Map.of("status", "NATIVE_DSH", "engine", "DSH", "releaseId", RELEASE,
"frozenContext", Map.of("releaseId", RELEASE, "year", 2026));
Map<String, Object> retryPlan = AnalysisTurnService.nativeRetryPlan(oldPlan, RELEASE, 41L);
@@ -92,7 +112,7 @@ class AnalysisNativeRetryTest {
@Test
void oldPlansAndInvalidFloorsKeepExistingLastEventIdBehavior() {
assertEquals(9L, AnalysisTurnService.nativeEventCursor(9, Map.of("engine", "NAO")));
assertEquals(9L, AnalysisTurnService.nativeEventCursor(9, Map.of("engine", "DSH")));
assertEquals(9L, AnalysisTurnService.nativeEventCursor(9, Map.of("nativeEventFloor", -1)));
assertEquals(9L, AnalysisTurnService.nativeEventCursor(9, Map.of("nativeEventFloor", "41")));
assertEquals(41L, AnalysisTurnService.nativeEventCursor(0, Map.of("nativeEventFloor", 41)));
@@ -79,7 +79,7 @@ class AnalysisNativeRuntimeRecoveryTest {
h.status = "RUNNING";
h.storedScope = "revoked-scope";
h.failure("FAILED");
assertEquals("原装 NAO runtime 未能完成本次分析", h.savedAnswer.get("answer"));
assertEquals("DSH runtime 未能完成本次分析", h.savedAnswer.get("answer"));
assertFalse(h.savedAnswer.toString().contains(PARTIAL));
}
@@ -101,7 +101,7 @@ class AnalysisNativeRuntimeRecoveryTest {
h.status = "RUNNING";
h.partial = "";
h.failure("FAILED");
assertEquals("原装 NAO runtime 未能完成本次分析", h.savedAnswer.get("answer"));
assertEquals("DSH runtime 未能完成本次分析", h.savedAnswer.get("answer"));
assertEquals("FAILED", h.savedStatus);
}
@@ -110,7 +110,7 @@ class AnalysisNativeRuntimeRecoveryTest {
final MetricsService metrics = mock(MetricsService.class);
final JdbcAppUserDetailsService users = mock(JdbcAppUserDetailsService.class);
final GovernanceAccessService governance = mock(GovernanceAccessService.class);
final NaoAnalysisRunner runner = mock(NaoAnalysisRunner.class);
final DshAnalysisRunner runner = mock(DshAnalysisRunner.class);
final AppUserPrincipal actor = new AppUserPrincipal(UUID.fromString("32cd8848-cfa1-4b10-8d2f-91c7bf433103"),
"runtime-review", "unused", "隔离测试", true, false, List.of("USER"), List.of("D"), List.of("G"), List.of());
final JsonMapper json = JsonMapper.builder().build();
@@ -162,7 +162,7 @@ class AnalysisNativeRuntimeRecoveryTest {
when(rs.getString(3)).thenReturn(actor.getId().toString()); when(rs.getString(4)).thenReturn("分析原始问题");
when(rs.getString(5)).thenReturn(status);
when(rs.getString(6)).thenReturn(json.writeValueAsString(Map.of("answer", partial, "results", List.of())));
when(rs.getString(7)).thenReturn(json.writeValueAsString(Map.of("engine", "NAO", "nativeRuntime", true,
when(rs.getString(7)).thenReturn(json.writeValueAsString(Map.of("engine", "DSH", "nativeRuntime", true,
"frozenContext", Map.of("year", 2026, "month", 1, "releaseId", RELEASE))));
when(rs.getString(8)).thenReturn("[]"); when(rs.getString(9)).thenReturn("[]"); when(rs.getString(10)).thenReturn("{}");
when(rs.getString(12)).thenReturn(storedScope);
@@ -208,7 +208,7 @@ class AnalysisNativeRuntimeRecoveryTest {
String.class, String.class, String.class);
method.setAccessible(true);
try { method.invoke(service, TURN, new LinkedHashMap<>(Map.of("steps", List.of())), Map.of("year", 2026), RELEASE,
terminal, terminal.equals("CANCELLED") ? "用户请求停止" : "原装 NAO runtime 未能完成本次分析"); }
terminal, terminal.equals("CANCELLED") ? "用户请求停止" : "DSH runtime 未能完成本次分析"); }
finally { service.shutdown(); }
}
}
@@ -6,6 +6,30 @@ import org.junit.jupiter.api.Test;
import tools.jackson.databind.json.JsonMapper;
class AnalysisProtocolExplorationTest {
@Test void departmentAndGroupBreakdownCompileToOneImmutableMetricScope() {
for(String dimension:List.of("department","group")) {
var root=root();root.put("dimensions",List.of(dimension));
var node=node();node.put("purpose","metrics");node.put("dimension",dimension);node.put("limit",100);
node.put("fields",List.of("rate"));node.put("stages",List.of());node.put("selector",Map.of("kind","base"));
var before=json.writeValueAsString(root);
var result=AnalysisProtocolExploration.compile(json,root,node,AnalysisProtocolService.map(root.get("filters")),"e","r",catalog());
assertEquals(1,result.scopes().size());
var child=AnalysisProtocolService.map(result.scopes().getFirst().get("task"));
assertEquals(List.of(dimension),child.get("dimensions"));
assertEquals(root.get("filters"),child.get("filters"));
assertEquals(root.get("period"),child.get("period"));
assertEquals(before,json.writeValueAsString(root));
}
}
@Test void singleMonthPresentationIntentDoesNotBlockAnAuthorizedQuery() {
var root=root();root.put("period",Map.of("year",2026,"month",10));root.put("trendRequired",true);
var node=node();node.put("purpose","trend");node.put("fields",List.of("rate"));node.put("stages",List.of());
node.put("selector",Map.of("kind","base"));
var result=AnalysisProtocolExploration.compile(json,root,node,AnalysisProtocolService.map(root.get("filters")),"e","r",catalog());
assertEquals(1,result.scopes().size());
assertEquals(root.get("period"),AnalysisProtocolService.map(result.scopes().getFirst().get("task")).get("period"));
assertTrue(AnalysisProtocolExploration.goalGaps(root,result.scopes()).isEmpty());
}
private final JsonMapper json=JsonMapper.builder().build();
private Map<String,Object> root(){var root=new LinkedHashMap<String,Object>();root.put("goal","调查下降原因");root.put("filters",Map.of("department","A","extraFilters",Map.of("customer",List.of("1")),"exclusions",Map.of("product",List.of("excluded"))));root.put("period",Map.of("year",2026));root.put("fields",List.of("rate"));root.put("stages",List.of());root.put("dimensions",List.of());root.put("trendRequired",false);root.put("visualPreference","none");return root;}
private Map<String,Object> node(){return new LinkedHashMap<>(Map.of("nodeId","next","purpose","metrics","fields",List.of("scrapWeight"),"stages",List.of("black"),"selector",Map.of("kind","catalog_members","dimension","product","names",List.of("P")),"visualPreference","none"));}
@@ -215,4 +215,22 @@ class AnalysisProtocolQueryPlanTest {
}
}
@Test void top100RankingAndProductBatchPreserveFrozenScope() {
var ranked=ranking();ranked.put("limit",100);
var task=root(List.of(ranked),List.of("totalWeight"),List.of("product"),false);
var normalized=compiler.normalize(task,catalog,List.of());
assertEquals(100,normalized.getFirst().get("limit"));
task.put("queryPlan",normalized);
var child=AnalysisProtocolService.map(compiler.resolve(task,"e","r",catalog,List.of(),List.of()).scopes().getFirst().get("task"));
assertEquals(task.get("filters"),child.get("filters"));assertEquals(task.get("period"),child.get("period"));
ranked.put("limit",101);task.put("queryPlan",List.of(ranked));
assertThrows(IllegalArgumentException.class,()->compiler.normalize(task,catalog,List.of()));
var batch=node("products","metrics",List.of("rate","totalWeight"),List.of("black","bright"),Map.of("kind","base"));
batch.put("dimension","product");batch.put("limit",500);
var all=root(List.of(batch),List.of("rate","totalWeight"),List.of("product"),false);all.put("stages",List.of("black","bright"));
all.put("queryPlan",compiler.normalize(all,catalog,List.of()));
var scope=compiler.resolve(all,"e","r",catalog,List.of(),List.of()).scopes().getFirst();
assertEquals("metrics",scope.get("purpose"));assertEquals(all.get("filters"),AnalysisProtocolService.map(scope.get("task")).get("filters"));
}
}
@@ -12,6 +12,8 @@ import org.junit.jupiter.api.*;
import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
import org.springframework.core.io.ClassPathResource;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.http.HttpStatus;
import org.springframework.web.server.ResponseStatusException;
import org.springframework.jdbc.datasource.DataSourceTransactionManager;
import org.springframework.jdbc.datasource.DriverManagerDataSource;
import org.springframework.transaction.support.TransactionTemplate;
@@ -69,6 +71,22 @@ class AnalysisProtocolServiceMySqlTest {
}
@AfterEach void cleanup(){if(created&&database.matches("quality_protocol_test_[0-9a-f]{32}"))cn.yunsheng.quality.testsupport.OwnedTestDatabase.drop(admin.getDataSource(),database);}
@Test void directDshDeliveryRetainsOriginalWithoutPostAnswerEvidenceOrCoverageReview() {
String turn=newTurn("2026年综合合格率报告");var a=claim(turn,false);
var confirmed=AnalysisProtocolService.map(tx.execute(s->service.confirm(a.attemptId(),task(turn,Map.of(),false),actor)).get("task"));
String original="## 模型原始报告\n\n这里保留未经平台额外核查的原文。";
var output=new LinkedHashMap<String,Object>();output.put("answer",original);output.put("modelAnswer",original);
output.put("reportMarkdown",original);output.put("stopReason","stop");
output.put("answerValidation",Map.of("mode","disabled","originalPreserved",true));
tx.executeWithoutResult(s->service.finish(a.attemptId(),"COMPLETED",output,
Map.of("agentTask",confirmed,"completionMethod","dsh_direct_answer","modelAnswer",original),actor));
assertEquals("COMPLETED",turnStatus(turn));
var saved=json.readValue(jdbc.queryForObject("SELECT answer_json FROM analysis_turn WHERE id=?",String.class,turn),Map.class);
assertEquals(original,saved.get("modelAnswer"));assertEquals(original,saved.get("reportMarkdown"));
assertEquals("disabled",AnalysisProtocolService.map(saved.get("answerValidation")).get("mode"));
assertFalse(saved.containsKey("answerQuality"));assertFalse(saved.containsKey("executionCoverage"));
}
@Test void clarificationTrendClearAndCancellationUseOneAuthority() {
String first=newTurn("今年18×15×4综合合格率变化趋势");var a=claim(first,false);
assertThrows(RuntimeException.class,()->service.checkTarget(a.attemptId(),"GET","/api/metrics",params("18X15X4+T"),actor));
@@ -230,7 +248,7 @@ class AnalysisProtocolServiceMySqlTest {
}
private record LegacyFixture(String session,String turn,AnalysisTurnService turns,
cn.yunsheng.quality.metrics.MetricsService metrics,NaoAnalysisRunner runner) {}
cn.yunsheng.quality.metrics.MetricsService metrics,DshAnalysisRunner runner) {}
private LegacyFixture legacyTurnFixture(String status) {
jdbc.execute("ALTER TABLE analysis_session ADD title VARCHAR(160),ADD context_json JSON,ADD auth_scope_hash CHAR(64)");
jdbc.execute("ALTER TABLE analysis_turn ADD budget_json JSON,ADD idempotency_key VARCHAR(190),ADD request_hash CHAR(64)");
@@ -238,7 +256,7 @@ class AnalysisProtocolServiceMySqlTest {
jdbc.update("INSERT INTO app_user VALUES(?,?,TRUE)",actor.getId().toString(),actor.getUsername());
var users=mock(cn.yunsheng.quality.identity.JdbcAppUserDetailsService.class);
when(users.loadUserByUsername(actor.getUsername())).thenReturn(actor);when(governance.resolvePrincipal(actor)).thenReturn(actor);
var metrics=mock(cn.yunsheng.quality.metrics.MetricsService.class);var runner=mock(NaoAnalysisRunner.class);
var metrics=mock(cn.yunsheng.quality.metrics.MetricsService.class);var runner=mock(DshAnalysisRunner.class);
var turns=new AnalysisTurnService(jdbc,json,metrics,null,null,users,governance,null,null,runner,null);turns.setProtocol(service);
String legacy=UUID.randomUUID().toString(),turn=UUID.randomUUID().toString();
var oldContext=Map.of("releaseId",release,"year",2026,"month",8,"product","18X15X4+T","extraFilters",Map.of("customerCode",List.of("800001")));
@@ -585,7 +603,14 @@ class AnalysisProtocolServiceMySqlTest {
var facts=AnalysisProtocolService.list(snapshot.get("facts"));
return Map.of("agentTask",task,"historyEvidence",snapshot.get("historyEvidence"),"historyHeadlineFactIds",facts.isEmpty()?List.of():List.of(AnalysisProtocolService.map(facts.getFirst()).get("id")),"reportTitle","历史质量分析汇总报告","titleGeneratedByModel",true,"protocolEvidence",List.of());
}
private void finishHistory(AnalysisProtocolService.Attempt a,Map<String,Object> details) {tx.executeWithoutResult(s->service.finish(a.attemptId(),"COMPLETED",answer(),details,actor));}
private void finishHistory(AnalysisProtocolService.Attempt a,Map<String,Object> details) {
var output = new LinkedHashMap<>(details);
if (details.get("answer") instanceof String original) {
output.put("modelAnswer",original);
output.put("reportMarkdown",original);
}
tx.executeWithoutResult(s->service.finish(a.attemptId(),"COMPLETED",Map.of(),output,actor));
}
@Test void formalResponseSnapshotRetainsTheExactProofBytesAndDetectsDatabaseMutation() {
String turn=newTurn("保存正式查询的可核对历史快照");var attempt=claim(turn,false);
@@ -817,9 +842,11 @@ class AnalysisProtocolServiceMySqlTest {
assertEquals("FAILED",turnStatus(turn));
var saved=json.readValue(jdbc.queryForObject("SELECT answer_json FROM analysis_turn WHERE id=?",String.class,turn),Map.class);
assertEquals("当前已确认范围没有可用的正式来源数据,本轮未提交业务结论。",saved.get("answer"));
assertEquals("伪造业务结论 secret=[REDACTED]",saved.get("answer"));
assertEquals(saved.get("answer"),saved.get("modelAnswer"));
assertEquals("formal_query_evidence_missing",saved.get("stopReason"));
assertEquals(List.of(),saved.get("results"));
assertFalse(saved.toString().contains("伪造业务结论"));
assertTrue(saved.toString().contains("伪造业务结论"));
assertFalse(saved.toString().contains("hidden"));
}
@@ -872,7 +899,8 @@ class AnalysisProtocolServiceMySqlTest {
var stored=json.readValue(jdbc.queryForObject("SELECT answer_json FROM analysis_turn WHERE id=?",String.class,turn),Map.class);
assertEquals(false,AnalysisProtocolService.map(stored.get("recordList")).get("queryComplete"));
assertEquals(2,AnalysisProtocolService.map(stored.get("recordList")).get("loadedRows"));
assertTrue(stored.get("answer").toString().contains("尚未查全"));
assertEquals(invented.get("answer"),stored.get("answer"));
assertEquals(invented.get("answer"),stored.get("modelAnswer"));
for(String field:List.of("reportMarkdown","reportHtml","reportTitle"))assertFalse(stored.containsKey(field));
jdbc.update("UPDATE analysis_turn SET status='QUEUED',cancel_requested=FALSE WHERE id=?",turn);
var retry=claim(turn,true);tx.execute(s->service.confirm(retry.attemptId(),confirmed,actor));
@@ -1128,6 +1156,23 @@ class AnalysisProtocolServiceMySqlTest {
String next=newTurn("新问题");var b=claim(next,false);assertEquals(Map.of(),b.input().get("previousTask"));
tx.execute(s->service.confirm(b.attemptId(),nativeTask(next,Map.of()),actor));assertThrows(RuntimeException.class,()->step(b,"old_parent",Map.of("kind","base"),List.of(proof.get("queryId"))));
}
@Test void nativeBatchViewIsOneFormalReadWithinTheFrozenParent() {
enableAutonomous();String turn=newTurn("产业部内的业务分组批量汇总");var a=claim(turn,false);
tx.execute(s->service.confirm(a.attemptId(),nativeTask(turn,Map.of("department","新能源汽车磁钢")),actor));
var node=Map.<String,Object>of("nodeId","batch","purpose","metrics","dimension","group","limit",100,
"fields",List.of("rate"),"stages",List.of(),"visualPreference","none","selector",Map.of("kind","base"));
var registered=tx.execute(s->service.explorationStep(a.attemptId(),Map.of("requestKey","batch","node",node),actor));
var parameters=scopeParams(AnalysisProtocolService.map(registered.get("scope")));
parameters.put("view","group");parameters.put("rowLimit","100");parameters.put("rowOffset","0");parameters.put("rowOrder","scrapDesc");
String scope=registered.get("scopeId").toString();
assertDoesNotThrow(()->service.checkTarget(a.attemptId(),"GET","/api/metrics",parameters,actor,"batch",scope));
tx.execute(s->service.recordQuery(a.attemptId(),"GET","/api/metrics",parameters,Map.of(),actor,"batch",scope));
assertEquals(1,jdbc.queryForObject("SELECT COUNT(*) FROM analysis_protocol_query",Integer.class));
assertNull(jdbc.queryForObject("SELECT rank_artifact_json FROM analysis_protocol_query",String.class));
var widened=new LinkedHashMap<>(parameters);widened.remove("department");
assertThrows(RuntimeException.class,()->service.checkTarget(a.attemptId(),"GET","/api/metrics",widened,actor,"batch",scope));
}
@Test void concurrentAutonomousRegistrationReusesOneImmutableStep() throws Exception {
enableAutonomous();String turn=newTurn("并发自主调查");var a=claim(turn,false);tx.execute(s->service.confirm(a.attemptId(),nativeTask(turn,Map.of()),actor));
var ready=new CountDownLatch(2);var start=new CountDownLatch(1);var pool=Executors.newFixedThreadPool(2);
@@ -1148,17 +1193,54 @@ class AnalysisProtocolServiceMySqlTest {
assertEquals(40,jdbc.queryForObject("SELECT COUNT(*) FROM analysis_protocol_query",Integer.class));
} finally {pool.shutdownNow();}
}
@Test void nativeWithoutFormalEvidenceKeepsOriginalBodyButCannotPublishMetricsOrSucceed() throws Exception {
@Test void nativeWithoutFormalEvidenceKeepsOriginalModelBodyAndReportWithFailedStatus() throws Exception {
enableAutonomous();String turn=newTurn("原生回答缺少正式证据");var a=claim(turn,false);
var task=AnalysisProtocolService.map(tx.execute(s->service.confirm(a.attemptId(),nativeTask(turn,Map.of()),actor)).get("task"));
String original="## 结论\n\n模型完整原文,不用平台错误句替换。";
tx.executeWithoutResult(s->service.finish(a.attemptId(),"PARTIAL",Map.of("answer",original,"visuals",List.of(Map.of("id","unproved"))),Map.of("agentTask",task,"protocolEvidence",List.of()),actor));
String original="## 结论\n\n模型原文";
tx.executeWithoutResult(s->service.finish(a.attemptId(),"PARTIAL",Map.of("answer",original,"reportMarkdown",original,
"reportTitle","模型报告","visuals",List.of(Map.of("id","unproved"))),Map.of("agentTask",task,"protocolEvidence",List.of()),actor));
var saved=json.readValue(jdbc.queryForObject("SELECT answer_json FROM analysis_turn WHERE id=?",String.class,turn),Map.class);
assertEquals("FAILED",turnStatus(turn));assertEquals(original,saved.get("answer"));assertFalse(saved.containsKey("visuals"));
assertEquals("native_agent",saved.get("executionMode"));
assertEquals(false,AnalysisProtocolService.map(saved.get("answerQuality")).get("dataComplete"));
assertEquals(original,saved.get("modelAnswer"));assertEquals(original,saved.get("reportMarkdown"));assertEquals("模型报告",saved.get("reportTitle"));
assertEquals("formal_query_evidence_missing",saved.get("stopReason"));
}
@Test void dshWithoutFormalEvidenceKeepsOriginalProseAndValidationStatusInTheTerminalEvent() throws Exception {
enableAutonomous();String turn=newTurn("DSH无正式证据不得发布原文");var a=claim(turn,false);freezeEngine(turn,"DSH");
var task=AnalysisProtocolService.map(tx.execute(s->service.confirm(a.attemptId(),nativeTask(turn,Map.of()),actor)).get("task"));
String unverified="本月综合合格率为99.9%,原因是产品甲报废增加。";
tx.executeWithoutResult(s->service.finish(a.attemptId(),"PARTIAL",Map.of("answer",unverified),Map.of("agentTask",task,"protocolEvidence",List.of()),actor));
var saved=storedAnswer(turn);var event=latestEventResult(turn);
assertEquals("FAILED",turnStatus(turn));assertEquals("DSH",saved.get("engine"));assertEquals("formal_query_evidence_missing",saved.get("stopReason"));
assertEquals(unverified,saved.get("answer"));assertEquals(unverified,saved.get("modelAnswer"));
assertEquals("DSH",event.get("engine"));assertEquals(saved.get("answer"),event.get("answer"));
}
@Test void failedAndCancelledAttemptsKeepCompleteModelOutputAndOriginalReport() throws Exception {
enableAutonomous();
String original = "# 模型报告\n\n" + "原始模型业务正文。".repeat(900);
Map<String,Object> output = Map.of("modelAnswer",original,"reportMarkdown",original,"reportTitle","原始报告");
for (String status : List.of("FAILED","CANCELLED")) {
String turn=newTurn("保存停止前模型原文");var a=claim(turn,false);
if (status.equals("CANCELLED")) tx.executeWithoutResult(s->service.cancel(turn,actor,"用户停止",output));
else {
tx.executeWithoutResult(s->service.fail(a.attemptId(),"校验未通过"));
tx.executeWithoutResult(s->service.preserveStoppedModelOutput(a.attemptId(),output,actor));
}
var saved=storedAnswer(turn);var event=latestEventResult(turn);
assertEquals(status,turnStatus(turn));assertEquals(original,saved.get("modelAnswer"));assertEquals(original,saved.get("answer"));
assertEquals(original,saved.get("reportMarkdown"));assertEquals(original,event.get("modelAnswer"));
}
}
@Test void stoppedOriginalModelOutputStillRequiresCurrentSourceAndScopeAuthorization() throws Exception {
enableAutonomous();String turn=newTurn("停止后的授权检查");var a=claim(turn,false);
tx.executeWithoutResult(s->service.fail(a.attemptId(),"执行失败"));
when(governance.policy(actor.getId().toString())).thenReturn(Map.of("rowVersion",2,"detailAllowed",true));
assertThrows(ResponseStatusException.class,()->tx.executeWithoutResult(s->service.preserveStoppedModelOutput(a.attemptId(),Map.of("modelAnswer","原文"),actor)));
assertFalse(storedAnswer(turn).containsKey("modelAnswer"));
when(governance.policy(actor.getId().toString())).thenReturn(Map.of("rowVersion",1,"detailAllowed",true));
when(options.options(release,actor)).thenThrow(new ResponseStatusException(HttpStatus.FORBIDDEN,"来源不可用"));
assertThrows(ResponseStatusException.class,()->tx.executeWithoutResult(s->service.preserveStoppedModelOutput(a.attemptId(),Map.of("modelAnswer","原文"),actor)));
assertFalse(storedAnswer(turn).containsKey("modelAnswer"));
}
@Test void nativePlanningFailureStoresReasonWithoutReplacingAnswerWithSystemError() throws Exception {
enableAutonomous();String turn=newTurn("原生规划失败");var a=claim(turn,false);
tx.executeWithoutResult(s->service.fail(a.attemptId(),"本轮分析未完成,请重试"));
@@ -1167,6 +1249,13 @@ class AnalysisProtocolServiceMySqlTest {
assertEquals("本轮分析未完成,请重试",jdbc.queryForObject("SELECT stop_reason FROM analysis_turn WHERE id=?",String.class,turn));
assertEquals(false,AnalysisProtocolService.map(saved.get("completion")).get("completed"));
}
@Test void dshPlanningFailureStoresTheFrozenEngineInTheAnswerAndFailureEvent() throws Exception {
enableAutonomous();String turn=newTurn("DSH规划失败");var a=claim(turn,false);freezeEngine(turn,"DSH");
tx.executeWithoutResult(s->service.fail(a.attemptId(),"DSH runtime 未能启动"));
var saved=storedAnswer(turn);var event=latestEventResult(turn);
assertEquals("FAILED",turnStatus(turn));assertEquals("DSH",saved.get("engine"));assertEquals("DSH",event.get("engine"));
assertEquals("",saved.get("answer"));assertEquals("DSH runtime 未能启动",jdbc.queryForObject("SELECT stop_reason FROM analysis_turn WHERE id=?",String.class,turn));
}
@Test void ordinaryConversationCompletesWithoutPeriodOrFormalQueriesAndUsesConfirmedModelReply() throws Exception {
enableAutonomous();String turn=newTurn("你好");var a=claim(turn,false);var proposal=task(turn,Map.of("columnFilters",List.of()),false);
proposal.put("kind","explain");proposal.put("period",null);proposal.put("fields",List.of());proposal.put("trendRequired",false);
@@ -1178,10 +1267,23 @@ class AnalysisProtocolServiceMySqlTest {
assertThrows(RuntimeException.class,()->tx.executeWithoutResult(s->service.checkTarget(a.attemptId(),"GET","/api/metrics",params(null),actor)));
tx.executeWithoutResult(s->service.finish(a.attemptId(),"COMPLETED",Map.of("answer","不能替换已确认的原文","visuals",List.of(Map.of("id","forged"))),Map.of("agentTask",confirmed,"protocolEvidence",List.of()),actor));
var saved=json.readValue(jdbc.queryForObject("SELECT answer_json FROM analysis_turn WHERE id=?",String.class,turn),Map.class);
assertEquals("COMPLETED",turnStatus(turn));assertEquals(original,saved.get("answer"));assertEquals("direct_conversation",saved.get("completionMethod"));
assertEquals("COMPLETED",turnStatus(turn));assertEquals("不能替换已确认的原文",saved.get("answer"));assertEquals(saved.get("answer"),saved.get("modelAnswer"));assertEquals("direct_conversation",saved.get("completionMethod"));
assertEquals(List.of(),saved.get("visuals"));assertEquals(0,jdbc.queryForObject("SELECT COUNT(*) FROM analysis_protocol_query",Integer.class));
String next=newTurn("继续分析");var nextAttempt=claim(next,false);assertEquals(Map.of(),nextAttempt.input().get("previousTask"));
}
@Test void dshGreetingKeepsTheConfirmedReplyAndFrozenEngineInTheTerminalEvent() throws Exception {
enableAutonomous();String turn=newTurn("DSH选择后问候");var a=claim(turn,false);freezeEngine(turn,"DSH");var proposal=task(turn,Map.of(),false);
proposal.put("kind","explain");proposal.put("period",null);proposal.put("fields",List.of());proposal.put("trendRequired",false);
for(String key:List.of("freshQuery","comparisonRequired","verifySource","fullDetails"))proposal.put(key,false);
proposal.put("visualPreference","none");proposal.put("historyMode","none");
String original="您好!我可以协助您查询质量指标、比较期间变化。";
proposal.put("directResponse",Map.of("purpose","greeting","answer",original,"requiresMemory",false));
var confirmed=AnalysisProtocolService.map(tx.execute(s->service.confirm(a.attemptId(),proposal,actor)).get("task"));
tx.executeWithoutResult(s->service.finish(a.attemptId(),"COMPLETED",Map.of("answer","不可覆盖的worker答复"),Map.of("agentTask",confirmed,"protocolEvidence",List.of()),actor));
var saved=storedAnswer(turn);var event=latestEventResult(turn);
assertEquals("COMPLETED",turnStatus(turn));assertEquals("不可覆盖的worker答复",saved.get("answer"));assertEquals(saved.get("answer"),saved.get("modelAnswer"));assertEquals("DSH",saved.get("engine"));
assertEquals("DSH",event.get("engine"));assertEquals(saved.get("answer"),event.get("answer"));assertEquals("direct_conversation",saved.get("completionMethod"));
}
@Test void thanksDoesNotReplaceTheBusinessGoalOrBecomeAHistoryReportSource() throws Exception {
enableAutonomous();String business=completedHistoryMetric("18X15X4+T",9,"35.055");
var before=AnalysisProtocolService.map(json.readValue(jdbc.queryForObject("SELECT plan_json FROM analysis_turn WHERE id=?",String.class,business),Map.class).get("task"));
@@ -1378,7 +1480,7 @@ class AnalysisProtocolServiceMySqlTest {
enableAutonomous();completedHistoryMetric(null,9,"35.055");String turn=newTurn("解释历史结果并生成报告");var a=claim(turn,false);var task=historyTask(a,turn,"all");var snapshot=tx.execute(s->service.history(a.attemptId(),actor));
String ref=AnalysisProtocolService.map(AnalysisProtocolService.list(snapshot.get("facts")).getFirst()).get("id").toString();var details=new LinkedHashMap<>(historyDetails(task,snapshot));details.put("reportTitle","历史质量分析汇总报告");details.put("titleSource","verified_history_summary");details.put("titleGeneratedByModel",false);details.put("answer","报废规模需要结合当前范围理解["+ref+"]");details.put("readingSummary",Map.of("version",1,"lead","报废规模观察["+ref+"]","evidence",List.of("对应正式历史值["+ref+"]"),"notices",List.of(),"evidenceRefs",List.of(ref)));
finishHistory(a,details);assertEquals("COMPLETED",turnStatus(turn));var saved=json.readValue(jdbc.queryForObject("SELECT answer_json FROM analysis_turn WHERE id=?",String.class,turn),Map.class);
assertEquals("报废规模需要结合当前范围理解",saved.get("answer"));assertEquals(List.of(ref),saved.get("queryEvidenceRefs"));var normalized=AnalysisProtocolService.map(saved.get("readingSummary"));assertEquals("报废规模观察",normalized.get("lead"));assertEquals(List.of("对应正式历史值"),normalized.get("evidence"));String html=saved.get("reportHtml").toString();String markdown=saved.get("reportMarkdown").toString();assertTrue(html.contains("<table"));assertTrue(html.contains("35.055"));assertFalse(html.contains("history-facts"));assertFalse(html.contains("data-history-fact-id"));assertFalse(html.contains(ref));assertFalse(markdown.contains(ref));assertFalse(saved.get("answer").toString().contains("turn:"));assertFalse(normalized.toString().contains("turn:"));assertFalse(AnalysisProtocolService.list(saved.get("historySections")).isEmpty());assertEquals(false,saved.get("titleGeneratedByModel"));service.authorizeReportSnapshot(turn,actor);
assertEquals(details.get("answer"),saved.get("answer"));assertEquals(details.get("answer"),saved.get("reportMarkdown"));assertEquals(List.of(ref),saved.get("queryEvidenceRefs"));var normalized=AnalysisProtocolService.map(saved.get("readingSummary"));assertEquals("报废规模观察",normalized.get("lead"));assertEquals(List.of("对应正式历史值"),normalized.get("evidence"));assertFalse(saved.containsKey("reportHtml"));assertFalse(normalized.toString().contains("turn:"));assertFalse(AnalysisProtocolService.list(saved.get("historySections")).isEmpty());assertEquals(false,saved.get("titleGeneratedByModel"));service.authorizeReportSnapshot(turn,actor);
}
@Test void autonomousHistoryMissingTitleKeepsVerifiedBodyAndMarksOnlyTitleGap() {
enableAutonomous();completedHistoryMetric(null,9,"35.055");String turn=newTurn("报告标题缺失但正文已过审");var a=claim(turn,false);var task=historyTask(a,turn,"all");var snapshot=tx.execute(s->service.history(a.attemptId(),actor));
@@ -1390,10 +1492,11 @@ class AnalysisProtocolServiceMySqlTest {
String verifiedBody="已核验正文保留正式报废重量35.055 kg。";
String titleGap="尚未解决:报告标题尚未生成或未通过内容核验,报告保持部分完成。";
String answerText=Objects.toString(saved.get("answer"),"");
assertEquals(verifiedBody+"\n\n"+titleGap,answerText);
assertEquals(answerText.indexOf(titleGap),answerText.lastIndexOf(titleGap));
assertEquals(details.get("answer"),answerText);
assertEquals(details.get("answer"),saved.get("modelAnswer"));
assertFalse(answerText.contains(titleGap));
assertTrue(saved.get("reportMarkdown").toString().contains("35.055"));
assertFalse(saved.get("answer").toString().contains(ref));assertFalse(saved.get("answer").toString().contains("正文解释未完成事实核验"));assertFalse(saved.get("reportMarkdown").toString().contains("分组键"));
assertTrue(saved.get("answer").toString().contains(ref));assertFalse(saved.get("answer").toString().contains("正文解释未完成事实核验"));assertFalse(saved.get("reportMarkdown").toString().contains("分组键"));
var summary=AnalysisProtocolService.map(saved.get("readingSummary"));assertTrue(summary.get("lead").toString().contains("已核验正文保留"));assertFalse(summary.toString().contains("正文解释未完成事实核验"));
assertTrue(AnalysisProtocolService.list(summary.get("notices")).stream().anyMatch(value->value.toString().contains("标题尚未生成")));
assertFalse(AnalysisProtocolService.list(summary.get("notices")).stream().anyMatch(value->value.toString().contains("事实核验")));
@@ -1403,7 +1506,7 @@ class AnalysisProtocolServiceMySqlTest {
enableAutonomous();completedHistoryMetric(null,9,"35.055");String turn=newTurn("解释历史结果并生成报告");var a=claim(turn,false);var task=historyTask(a,turn,"all");var snapshot=tx.execute(s->service.history(a.attemptId(),actor));
String ref=AnalysisProtocolService.map(AnalysisProtocolService.list(snapshot.get("facts")).getFirst()).get("id").toString();var details=new LinkedHashMap<>(historyDetails(task,snapshot));details.put("titleSource","verified_history_summary");details.put("titleGeneratedByModel",false);details.put("answer","history-fact:forged filters={\"department\":\"伪造\"} 0.1234567890123456789");details.put("readingSummary",Map.of("version",1,"lead","伪造正文","evidence",List.of(),"notices",List.of(),"evidenceRefs",List.of(ref)));details.put("evidenceCompletion",Map.of("modelDeclaredEvidenceSufficient",false));
finishHistory(a,details);assertEquals("PARTIAL",turnStatus(turn));var saved=json.readValue(jdbc.queryForObject("SELECT answer_json FROM analysis_turn WHERE id=?",String.class,turn),Map.class);String answerText=Objects.toString(saved.get("answer"),"");
assertTrue(answerText.contains("35.055"));assertFalse(answerText.contains("history-fact:"));assertFalse(answerText.contains("filters="));assertFalse(answerText.contains("筛选 {"));assertFalse(answerText.contains("分组键"));assertFalse(answerText.contains(ref));assertFalse(answerText.contains("0.1234567890123456789"));assertTrue(saved.get("reportMarkdown").toString().contains("|"));assertEquals(List.of(),saved.get("queryEvidenceRefs"));assertFalse(saved.get("readingSummary").toString().contains(ref));assertEquals(false,AnalysisProtocolService.map(saved.get("historyCoverage")).get("complete"));assertTrue(AnalysisProtocolService.list(AnalysisProtocolService.map(saved.get("historyCoverage")).get("missingEvidence")).stream().anyMatch(item->item.toString().contains("正文解释未完成事实核验")));var completion=AnalysisProtocolService.map(saved.get("evidenceCompletion"));assertEquals(false,completion.get("bodyEvidenceSufficient"));assertEquals(false,completion.get("titleValid"));assertEquals(true,completion.get("titleRequired"));
assertEquals(details.get("answer"),answerText);assertEquals(answerText,saved.get("modelAnswer"));assertEquals(answerText,saved.get("reportMarkdown"));assertEquals(List.of(),saved.get("queryEvidenceRefs"));assertFalse(saved.get("readingSummary").toString().contains(ref));assertEquals(false,AnalysisProtocolService.map(saved.get("historyCoverage")).get("complete"));assertTrue(AnalysisProtocolService.list(AnalysisProtocolService.map(saved.get("historyCoverage")).get("missingEvidence")).stream().anyMatch(item->item.toString().contains("正文解释未完成事实核验")));var completion=AnalysisProtocolService.map(saved.get("evidenceCompletion"));assertEquals(false,completion.get("bodyEvidenceSufficient"));assertEquals(false,completion.get("titleValid"));assertEquals(true,completion.get("titleRequired"));
}
@Test void historyDisplayFactsLinkToGlobalSectionsWithMatchingRealSourceFrames() {
enableAutonomous();completedHistoryMetric("18X15X4+T",8,"35.055");completedHistoryMetric("18X15X4+Z",9,"12.345");String turn=newTurn("整理两个历史范围");var a=claim(turn,false);historyTask(a,turn,"all");var snapshot=tx.execute(s->service.history(a.attemptId(),actor));
@@ -1428,12 +1531,24 @@ class AnalysisProtocolServiceMySqlTest {
@Test void autonomousHistoryFiltersUnknownRefsAndHtmlAndMakesLimitsVisible() {
enableAutonomous();completedHistoryMetric(null,9,"35.055");String turn=newTurn("解释历史但携带坏引用");var a=claim(turn,false);var task=historyTask(a,turn,"all");var snapshot=tx.execute(s->service.history(a.attemptId(),actor));String ref=AnalysisProtocolService.map(AnalysisProtocolService.list(snapshot.get("facts")).getFirst()).get("id").toString();var details=new LinkedHashMap<>(historyDetails(task,snapshot));details.put("reportTitle","历史质量分析汇总报告");details.put("titleSource","verified_history_summary");details.put("titleGeneratedByModel",false);details.put("answer","有效["+ref+"]\n\n错误[unknown]");details.put("readingSummary",Map.of("version",1,"lead","<script>alert(1)</script>有效["+ref+"]","evidence",List.of("错误[unknown]"),"notices",List.of(),"evidenceRefs",List.of(ref,"unknown")));
finishHistory(a,details);assertEquals("PARTIAL",turnStatus(turn));var saved=json.readValue(jdbc.queryForObject("SELECT answer_json FROM analysis_turn WHERE id=?",String.class,turn),Map.class);assertFalse(saved.get("answer").toString().contains("错误"));assertFalse(saved.get("readingSummary").toString().contains("script"));assertEquals(List.of(ref),saved.get("queryEvidenceRefs"));assertFalse(AnalysisProtocolService.list(AnalysisProtocolService.map(saved.get("readingSummary")).get("notices")).isEmpty());assertTrue(saved.get("answer").toString().contains("尚未解决"));
finishHistory(a,details);assertEquals("PARTIAL",turnStatus(turn));var saved=json.readValue(jdbc.queryForObject("SELECT answer_json FROM analysis_turn WHERE id=?",String.class,turn),Map.class);assertEquals(details.get("answer"),saved.get("answer"));assertEquals(details.get("answer"),saved.get("modelAnswer"));assertFalse(saved.get("readingSummary").toString().contains("script"));assertEquals(List.of(ref),saved.get("queryEvidenceRefs"));assertFalse(AnalysisProtocolService.list(AnalysisProtocolService.map(saved.get("readingSummary")).get("notices")).isEmpty());assertFalse(saved.get("answer").toString().contains("尚未解决"));
}
@Test void staticHistoryCannotClaimAutonomousWorkerTitleOrSummary() {
completedHistoryMetric(null,9,"35.055");String turn=newTurn("旧模式历史报告");var a=claim(turn,false);var task=historyTask(a,turn,"all");var snapshot=tx.execute(s->service.history(a.attemptId(),actor));var details=new LinkedHashMap<>(historyDetails(task,snapshot));details.put("titleGeneratedByModel",false);details.put("titleSource","verified_history_summary");details.put("answer","不得绕过旧模式");details.put("readingSummary",Map.of("version",1,"lead","forged","evidence",List.of(),"notices",List.of(),"evidenceRefs",List.of()));finishHistory(a,details);assertEquals("PARTIAL",turnStatus(turn));var saved=json.readValue(jdbc.queryForObject("SELECT answer_json FROM analysis_turn WHERE id=?",String.class,turn),Map.class);assertNotEquals(details.get("answer"),saved.get("answer"));var summary=AnalysisProtocolService.map(saved.get("readingSummary"));assertFalse(summary.get("lead").toString().contains("forged"));assertEquals(List.of(),summary.get("evidenceRefs"));
completedHistoryMetric(null,9,"35.055");String turn=newTurn("旧模式历史报告");var a=claim(turn,false);var task=historyTask(a,turn,"all");var snapshot=tx.execute(s->service.history(a.attemptId(),actor));var details=new LinkedHashMap<>(historyDetails(task,snapshot));details.put("titleGeneratedByModel",false);details.put("titleSource","verified_history_summary");details.put("answer","不得绕过旧模式");details.put("readingSummary",Map.of("version",1,"lead","forged","evidence",List.of(),"notices",List.of(),"evidenceRefs",List.of()));finishHistory(a,details);assertEquals("PARTIAL",turnStatus(turn));var saved=json.readValue(jdbc.queryForObject("SELECT answer_json FROM analysis_turn WHERE id=?",String.class,turn),Map.class);assertEquals(details.get("answer"),saved.get("answer"));assertEquals(details.get("answer"),saved.get("modelAnswer"));var summary=AnalysisProtocolService.map(saved.get("readingSummary"));assertFalse(summary.get("lead").toString().contains("forged"));assertEquals(List.of(),summary.get("evidenceRefs"));
}
private void enableAutonomous(){jdbc.update("UPDATE analysis_protocol_session SET autonomous_enabled=TRUE WHERE session_id=?",session);}
private void freezeEngine(String turn,String engine) {
var plan=new LinkedHashMap<String,Object>(json.readValue(jdbc.queryForObject("SELECT plan_json FROM analysis_turn WHERE id=?",String.class,turn),Map.class));
plan.put("nativeRuntime",true);plan.put("engine",engine);plan.put("status",AnalysisRuntimeEngine.runningStatus(engine));
jdbc.update("UPDATE analysis_turn SET plan_json=CAST(? AS JSON) WHERE id=?",json.writeValueAsString(plan),turn);
}
private Map<String,Object> storedAnswer(String turn) {
return json.readValue(jdbc.queryForObject("SELECT answer_json FROM analysis_turn WHERE id=?",String.class,turn),Map.class);
}
private Map<String,Object> latestEventResult(String turn) {
String payload=jdbc.queryForObject("SELECT payload_json FROM analysis_turn_event WHERE turn_id=? ORDER BY id DESC LIMIT 1",String.class,turn);
return AnalysisProtocolService.map(json.readValue(payload,Map.class).get("result"));
}
private Map<String,Object> nativeTask(String turn,Map<String,Object> filters){var t=task(turn,filters,false);t.put("kind","analysis");t.put("executionMode","native_agent");t.put("trendRequired",false);t.put("visualPreference","none");return t;}
private Map<String,Object> step(AnalysisProtocolService.Attempt a,String id,Map<String,Object> selector,List<?> parents){return tx.execute(s->service.explorationStep(a.attemptId(),Map.of("requestKey",id,"node",Map.of("nodeId",id,"purpose","metrics","fields",List.of("rate"),"stages",List.of(),"visualPreference","none","selector",selector),"parentQueryIds",parents),actor));}
@@ -29,7 +29,7 @@ import org.springframework.jdbc.core.RowMapper;
import org.springframework.security.core.authority.SimpleGrantedAuthority;
import org.springframework.web.server.ResponseStatusException;
class NaoRuntimeAccessServiceTest {
class AnalysisRuntimeAccessServiceTest {
private static final UUID USER_ID = UUID.fromString("722e1189-2f4c-4f59-b789-1871d7f50f10");
private static final String TURN_ID = "9f87aaf0-90ae-4d9a-a878-3488ec2c5a5f";
@@ -52,7 +52,7 @@ class NaoRuntimeAccessServiceTest {
@Test
void rejectsForgedTokenBeforeAnyDelegatedLookup() {
NaoRuntimeAccessService access = new NaoRuntimeAccessService(null, null, null);
AnalysisRuntimeAccessService access = new AnalysisRuntimeAccessService(null, null, null);
ResponseStatusException denied = assertThrows(ResponseStatusException.class, () -> access.authorize("not-a-real-token-012345678901234567890123"));
assertEquals(403, denied.getStatusCode().value());
}
@@ -105,7 +105,7 @@ class NaoRuntimeAccessServiceTest {
private final JdbcTemplate jdbc = mock(JdbcTemplate.class);
private final JdbcAppUserDetailsService users = mock(JdbcAppUserDetailsService.class);
private final GovernanceAccessService governance = mock(GovernanceAccessService.class);
private final NaoRuntimeAccessService access = new NaoRuntimeAccessService(jdbc, users, governance, clock);
private final AnalysisRuntimeAccessService access = new AnalysisRuntimeAccessService(jdbc, users, governance, clock);
private final String storedFingerprint;
private Fixture() {
@@ -0,0 +1,71 @@
package cn.yunsheng.quality.analysis;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import cn.yunsheng.quality.identity.AppUserPrincipal;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
import tools.jackson.databind.json.JsonMapper;
class AnalysisRuntimeEngineRoutingTest {
@TempDir Path root;
@Test void dshUsesTheGenericEntryAndFreezesTheEngineIntoResultAndProgress() throws Exception {
Path scripts=Files.createDirectories(root.resolve("scripts"));
Files.writeString(scripts.resolve("quality_analysis_runtime.py"), """
import json,sys
request=json.loads(sys.stdin.readline())
assert request['runtimeEngine']=='DSH'
assert request['context']['_runtimeEngine']=='DSH'
print(json.dumps({'type':'progress','message':'正在研究'}),flush=True)
print(json.dumps({'type':'result','status':'COMPLETED','answer':'已完成','stopReason':'stop','engine':'NAO'}),flush=True)
""");
var access=mock(AnalysisRuntimeAccessService.class);
when(access.issue(any(),anyString(),anyString())).thenReturn("test-token");
var actor=new AppUserPrincipal(UUID.randomUUID(),"test","unused","测试",true,false,List.of("USER"),List.of(),List.of(),List.of());
var runner=new DshAnalysisRunner(JsonMapper.builder().build(),access);
var progress=new ArrayList<Map<String,Object>>();
Map<String,String> previous=new java.util.LinkedHashMap<>();
List<String> properties=List.of("quality.project.root","quality.analysis.runtime.script","quality.analysis.runtime.command",
"quality.analysis.nao.script","quality.analysis.nao.command");
for(String key:properties)previous.put(key,System.getProperty(key));
try {
System.setProperty("quality.project.root",root.toString());
System.clearProperty("quality.analysis.runtime.script");System.clearProperty("quality.analysis.runtime.command");
System.clearProperty("quality.analysis.nao.script");System.clearProperty("quality.analysis.nao.command");
DshAnalysisRunner.Result result=runner.run(UUID.randomUUID().toString(),UUID.randomUUID().toString(),actor,
"test","release",Map.of("_runtimeEngine","DSH"),progress::add,ignored->{},()->false);
assertEquals("COMPLETED",result.status());
assertEquals("DSH",result.details().get("engine"));
assertEquals("DSH",progress.getFirst().get("engine"));
} finally {
runner.shutdown();
for(String key:properties)if(previous.get(key)==null)System.clearProperty(key);else System.setProperty(key,previous.get(key));
}
}
@Test void dshEngineIsRetainedInTheNormalizedAnswerSnapshot() {
var service=new AnalysisTurnService(null,JsonMapper.builder().build(),null,null,null,null,null,null);
var answer=service.nativeAnswer(Map.of(),"已完成",Map.of(),"release","COMPLETED","stop","turn",null,"DSH");
assertEquals("DSH",answer.get("engine"));
}
@Test void runtimeSelectionAcceptsOnlyDsh() {
assertEquals("DSH",AnalysisRuntimeEngine.require(null));
assertThrows(IllegalArgumentException.class,()->AnalysisRuntimeEngine.require("NAO"));
assertEquals("DSH",AnalysisRuntimeEngine.require("dsh"));
assertThrows(IllegalArgumentException.class,()->AnalysisRuntimeEngine.require("python3 scripts/anything.py"));
}
}
@@ -21,14 +21,14 @@ import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.security.core.authority.SimpleGrantedAuthority;
import org.springframework.web.server.ResponseStatusException;
class NaoRuntimeQueryControllerTest {
class AnalysisRuntimeQueryControllerTest {
@Test void newSourceCapabilitiesAreAdvertisedOnlyToProtocolAttempts() {
Fixture f=new Fixture();var source=mock(AnalysisSourceQueryController.class);
f.controller.setSource(source);when(f.tools.catalog(ACTOR)).thenReturn(Map.of("kind","analysis_catalog"));
assertEquals(Map.of("kind","analysis_catalog"),f.query("GET","/api/analysis/tools/catalog",null));
org.mockito.Mockito.verifyNoInteractions(source);
f.controller.setProtocol(mock(AnalysisProtocolService.class));
when(f.access.authorize("token")).thenReturn(new NaoRuntimeAccessService.Delegation(ACTOR,"release-a","turn-a","attempt-a"));
when(f.access.authorize("token")).thenReturn(new AnalysisRuntimeAccessService.Delegation(ACTOR,"release-a","turn-a","attempt-a"));
when(source.catalog("release-a",ACTOR)).thenReturn(Map.of("sourceFields",List.of(Map.of("key","src_any"))));
Map<?,?> result=(Map<?,?>)f.query("GET","/api/analysis/tools/catalog",null);
assertEquals(List.of(Map.of("key","src_any")),result.get("sourceFields"));
@@ -36,7 +36,7 @@ class NaoRuntimeQueryControllerTest {
@Test void plannedResolverRequiresProtocolExecutionAndCannotAcceptAnInjectedQueryBody() {
Fixture f=new Fixture();assertThrows(ResponseStatusException.class,()->f.query("POST","/api/analysis/protocol/queries",Map.of()));
var protocol=mock(AnalysisProtocolService.class);f.controller.setProtocol(protocol);
when(f.access.authorize("token")).thenReturn(new NaoRuntimeAccessService.Delegation(ACTOR,"release-a","turn-a","attempt-a"));
when(f.access.authorize("token")).thenReturn(new AnalysisRuntimeAccessService.Delegation(ACTOR,"release-a","turn-a","attempt-a"));
var frames=Map.<String,Object>of("scopes",List.of(Map.of("nodeId","rank","scopeId","signed")),"version",1);
when(protocol.queries("attempt-a",ACTOR)).thenReturn(frames);
assertEquals(frames,f.query("POST","/api/analysis/protocol/queries",Map.of()));
@@ -46,7 +46,7 @@ class NaoRuntimeQueryControllerTest {
@Test void historyImportRequiresProtocolAndAnEmptyBodyAndDoesNotCreateAQueryProof() {
Fixture f=new Fixture();assertThrows(ResponseStatusException.class,()->f.query("POST","/api/analysis/protocol/history",Map.of()));
var protocol=mock(AnalysisProtocolService.class);f.controller.setProtocol(protocol);
when(f.access.authorize("token")).thenReturn(new NaoRuntimeAccessService.Delegation(ACTOR,"release-a","turn-a","attempt-a"));
when(f.access.authorize("token")).thenReturn(new AnalysisRuntimeAccessService.Delegation(ACTOR,"release-a","turn-a","attempt-a"));
var snapshot=Map.<String,Object>of("kind","protocol_history_snapshot","historyEvidence",Map.of("importId","current"));
when(protocol.history("attempt-a",ACTOR)).thenReturn(snapshot);
assertEquals(snapshot,f.query("POST","/api/analysis/protocol/history",Map.of()));
@@ -146,7 +146,7 @@ class NaoRuntimeQueryControllerTest {
MockHttpServletRequest request = fixture.request();
request.setRemoteAddr("192.0.2.10");
ResponseStatusException rejected = assertThrows(ResponseStatusException.class, () -> fixture.controller.query(
new NaoRuntimeQueryController.RuntimeQuery("token", "GET", "/api/analysis/tools/catalog", null), request));
new AnalysisRuntimeQueryController.RuntimeQuery("token", "GET", "/api/analysis/tools/catalog", null), request));
assertEquals(403, rejected.getStatusCode().value());
}
@@ -158,21 +158,21 @@ class NaoRuntimeQueryControllerTest {
}
private static final class Fixture {
private final NaoRuntimeAccessService access = mock(NaoRuntimeAccessService.class);
private final AnalysisRuntimeAccessService access = mock(AnalysisRuntimeAccessService.class);
private final AnalysisToolsController tools=mock(AnalysisToolsController.class);
private final NaoRuntimeQueryController controller;
private final AnalysisRuntimeQueryController controller;
private Fixture() { this(mock(MetricsController.class)); }
private Fixture(MetricsController metrics) {
when(access.authorize("token")).thenReturn(new NaoRuntimeAccessService.Delegation(ACTOR, "release-a", "turn-a"));
controller = new NaoRuntimeQueryController(access, mock(ReleaseController.class), mock(OptionsController.class),
when(access.authorize("token")).thenReturn(new AnalysisRuntimeAccessService.Delegation(ACTOR, "release-a", "turn-a"));
controller = new AnalysisRuntimeQueryController(access, mock(ReleaseController.class), mock(OptionsController.class),
metrics, tools, mock(AnalyticsController.class),
mock(AnalysisFineDefectsController.class), mock(AnalysisInvestigationController.class));
}
private Object query(String method, String path, Map<String, Object> payload) {
return controller.query(new NaoRuntimeQueryController.RuntimeQuery("token", method, path, payload), request());
return controller.query(new AnalysisRuntimeQueryController.RuntimeQuery("token", method, path, payload), request());
}
private MockHttpServletRequest request() {
@@ -12,7 +12,7 @@ class AnalysisThinkingTest {
}
@Test void fullThinkingIsNotSubjectToTheOldEightThousandCharacterSummaryLimit() {
String text="接口实际返回文本".repeat(3000);
var value=NaoAnalysisRunner.safeProgress(Map.of("thinkingUpdate",block(1,text,"running"),"reasoning","not-an-api-field"));
var value=DshAnalysisRunner.safeProgress(Map.of("thinkingUpdate",block(1,text,"running"),"reasoning","not-an-api-field"));
assertEquals(text,((Map<?,?>)value.get("thinkingUpdate")).get("text"));
assertFalse(value.containsKey("reasoning"));
assertEquals(1,value.size());
@@ -41,7 +41,7 @@ class AnalysisThinkingTest {
assertEquals(raw.get("startedAt"),((Map<?,?>)((List<?>)plan.get("modelThinking")).getFirst()).get("startedAt"));
}
@Test void onlyProviderFieldsAreAcceptedAndCredentialsAreMasked() {
assertEquals(Map.of(),NaoAnalysisRunner.safeProgress(Map.of("thinkingUpdate",Map.of("reasoning","private internal event"))));
assertEquals(Map.of(),DshAnalysisRunner.safeProgress(Map.of("thinkingUpdate",Map.of("reasoning","private internal event"))));
var value=AnalysisThinking.safe(block(1,"token=do-not-show Bearer hidden-key","running"));
assertFalse(value.get("text").toString().contains("do-not-show"));
assertFalse(value.get("text").toString().contains("hidden-key"));
@@ -40,7 +40,7 @@ class AnalysisTurnNativeBudgetTest {
Instant deadline=Instant.parse((String)budget.get("deadlineAt"));
Instant expected=started.plus(AnalysisRuntimePolicy.WATCHDOG_TIMEOUT);
assertTrue(Duration.between(expected,deadline).abs().compareTo(Duration.ofSeconds(2))<0,
"deadline metadata uses the shared NAO watchdog policy");
"deadline metadata uses the shared DSH watchdog policy");
assertEquals("keep",budget.get("custom"));
}
@@ -48,14 +48,16 @@ class AnalysisTurnNativeBudgetTest {
JdbcTemplate jdbc=mock(JdbcTemplate.class);
JsonMapper json=JsonMapper.builder().build();
AnalysisProtocolService protocol=mock(AnalysisProtocolService.class);
NaoAnalysisRunner runner=mock(NaoAnalysisRunner.class);
DshAnalysisRunner runner=mock(DshAnalysisRunner.class);
String turnId="turn-id",sessionId="session-id",attemptId="attempt-id";
AppUserPrincipal actor=mock(AppUserPrincipal.class);
when(actor.getId()).thenReturn(java.util.UUID.randomUUID());
var attempt=new AnalysisProtocolService.Attempt(attemptId,sessionId,turnId,"RUNNING",1L,"execution-id",
Map.of(),"user-id","release-id","scope",false,"RUNNING",attemptId);
when(protocol.claim(turnId,null)).thenReturn(attempt);
when(protocol.runtimeContext(attempt,null)).thenReturn(Map.of());
when(runner.run(eq(turnId),eq(sessionId),isNull(),eq("question"),eq("release-id"),anyMap(),any(),any(),any()))
.thenReturn(new NaoAnalysisRunner.Result("FAILED","",Map.of(),"failed"));
when(protocol.claim(turnId,actor)).thenReturn(attempt);
when(protocol.runtimeContext(attempt,actor)).thenReturn(Map.of());
when(runner.run(eq(turnId),eq(sessionId),eq(actor),eq("question"),eq("release-id"),anyMap(),any(),any(),any()))
.thenReturn(new DshAnalysisRunner.Result("FAILED","",Map.of(),"failed"));
var service=new AnalysisTurnService(jdbc,json,null,null,null,null,null,null,null,runner,null);
service.setProtocol(protocol);
@@ -72,7 +74,7 @@ class AnalysisTurnNativeBudgetTest {
run.setAccessible(true);
Instant started=Instant.now();
run.invoke(service,turn,null,session);
run.invoke(service,turn,actor,session);
ArgumentCaptor<Object[]> args=ArgumentCaptor.forClass(Object[].class);
verify(jdbc).update(eq("UPDATE analysis_turn SET budget_json=CAST(? AS JSON) WHERE id=? AND status='RUNNING'"),args.capture());
@@ -83,6 +85,6 @@ class AnalysisTurnNativeBudgetTest {
Instant deadline=Instant.parse((String)budget.get("deadlineAt"));
assertTrue(Duration.between(started.plus(AnalysisRuntimePolicy.WATCHDOG_TIMEOUT),deadline).abs()
.compareTo(Duration.ofSeconds(2))<0);
verify(runner).run(eq(turnId),eq(sessionId),isNull(),eq("question"),eq("release-id"),anyMap(),any(),any(),any());
verify(runner).run(eq(turnId),eq(sessionId),eq(actor),eq("question"),eq("release-id"),anyMap(),any(),any(),any());
}
}
@@ -67,6 +67,74 @@ class AnalysisTurnSnapshotTest {
verifyNoInteractions(harness.metrics);
}
@Test void dshNativeSnapshotPublishesItsStoredTimelineBesideTheCheckedAnswer() {
List<Map<String,Object>> canonicalTimeline = List.of(
Map.of("sequence", 1, "kind", "tool_result", "status", "completed", "text", "已完成授权查询"));
List<Map<String,Object>> answerTimeline = List.of(
Map.of("sequence", 1, "kind", "tool_result", "status", "completed", "text", "已完成授权查询"),
Map.of("sequence", 2, "kind", "assistant", "text", "未审阅草稿,仅属于原始时间线"));
for(String status:List.of("COMPLETED","PARTIAL","FAILED")) {
Harness harness = new Harness("valid");
harness.statusOverride=status;
harness.planOverride = Map.of("context", Map.of("releaseId", "release-1"), "engine", "DSH",
"task", Map.of("kind", "analysis", "executionMode", "native_agent"),
"timeline", canonicalTimeline);
harness.storedOverride = Map.of("answer", "已核验的正式正文", "engine", "DSH",
"executionMode", "native_agent", "timeline", answerTimeline,
"visualSchemaVersion", 1, "visualState", "not_requested", "visuals", List.of());
harness.enableNativeSnapshot();
Map<String,Object> turn = harness.service.getTurn(TURN_ID, harness.freshActor);
Map<String,Object> snapshot = harness.service.getSnapshot(TURN_ID, harness.freshActor);
assertEquals(status, turn.get("status"));
assertEquals("已核验的正式正文", turn.get("answer"));
assertEquals(answerTimeline, turn.get("timeline"));
assertEquals(turn.get("timeline"), snapshot.get("timeline"));
assertEquals(turn.get("answer"), snapshot.get("answer"));
assertEquals(canonicalTimeline, AnalysisProtocolService.map(snapshot.get("plan")).get("timeline"));
verifyNoInteractions(harness.metrics);
}
}
@Test void dshNativeSnapshotFallsBackToPlanTimelineWhenAnswerHasNoTimeline() {
Harness harness = new Harness("valid");
List<Map<String,Object>> timeline = List.of(
Map.of("sequence", 1, "kind", "tool_result", "status", "completed", "text", "已完成授权查询"));
harness.planOverride = Map.of("context", Map.of("releaseId", "release-1"), "engine", "DSH",
"task", Map.of("kind", "analysis", "executionMode", "native_agent"), "timeline", timeline);
harness.storedOverride = Map.of("answer", "已核验的正式正文", "engine", "DSH",
"executionMode", "native_agent", "visualSchemaVersion", 1,
"visualState", "not_requested", "visuals", List.of());
harness.enableNativeSnapshot();
Map<String,Object> snapshot = harness.service.getSnapshot(TURN_ID, harness.freshActor);
assertEquals(timeline, snapshot.get("timeline"));
assertEquals(timeline, AnalysisProtocolService.map(snapshot.get("plan")).get("timeline"));
verifyNoInteractions(harness.metrics);
}
@Test void formerEngineSnapshotKeepsItsHistoricalBodyAndNeutralizesEngineMetadata() {
Harness harness = new Harness("valid");
List<Map<String,Object>> timeline = List.of(
Map.of("sequence", 1, "kind", "assistant", "text", "NAO 原始回答"));
harness.planOverride = Map.of("context", Map.of("releaseId", "release-1"), "engine", "NAO",
"task", Map.of("kind", "analysis", "executionMode", "native_agent"), "timeline", timeline);
harness.storedOverride = Map.of("answer", "NAO 原始回答", "engine", "NAO",
"executionMode", "native_agent", "visualSchemaVersion", 1,
"visualState", "not_requested", "visuals", List.of());
Map<String,Object> snapshot = harness.service.getSnapshot(TURN_ID, harness.submittedActor);
assertEquals(false, snapshot.containsKey("timeline"));
assertEquals("HISTORICAL", snapshot.get("engine"));
assertEquals("HISTORICAL", AnalysisProtocolService.map(snapshot.get("plan")).get("engine"));
assertEquals(false, snapshot.get("retryAvailable"));
assertEquals(timeline, AnalysisProtocolService.map(snapshot.get("plan")).get("timeline"));
verifyNoInteractions(harness.metrics);
}
@Test
void snapshotReadRejectsRevokedAggregatePermissionWithoutRequerying() {
Harness harness = new Harness("valid");
@@ -229,6 +297,7 @@ class AnalysisTurnSnapshotTest {
private final AnalysisProtocolService protocol=mock(AnalysisProtocolService.class);
private Map<String,Object> storedOverride;
private Map<String,Object> planOverride;
private String statusOverride;
private Harness(String storedScope) {
when(governance.policy(freshActor.getId().toString())).thenReturn(Map.of(
@@ -296,13 +365,19 @@ class AnalysisTurnSnapshotTest {
service.setProtocol(protocol);
}
private void enableNativeSnapshot() {
when(protocol.ownsTurn(TURN_ID)).thenReturn(true);
when(protocol.visualRecoveryOverlay(anyString(),any())).thenReturn(Map.of());
service.setProtocol(protocol);
}
private ResultSet turnRow(String answer, String plan, String savedHash) throws Exception {
ResultSet rs = mock(ResultSet.class);
when(rs.getString(1)).thenReturn(TURN_ID);
when(rs.getString(2)).thenReturn(SESSION_ID);
when(rs.getString(3)).thenReturn(freshActor.getId().toString());
when(rs.getString(4)).thenReturn("question");
when(rs.getString(5)).thenReturn("COMPLETED");
when(rs.getString(5)).thenReturn(statusOverride==null?"COMPLETED":statusOverride);
when(rs.getString(6)).thenReturn(answer);
when(rs.getString(7)).thenReturn(plan);
when(rs.getString(8)).thenReturn("[]");
@@ -23,6 +23,31 @@ import org.springframework.jdbc.core.RowMapper;
import tools.jackson.databind.json.JsonMapper;
class AnalysisVisualSnapshotAccessTest {
@Test void groupedPublishedScrapRatesKeepStagePermissionsAndChapterBinding() {
var fields=Set.of("black_scrap_weight","black_total_weight");
for(String dimension:List.of("department","group","product")) {
var value=chart("black_scrap_rate","ratio","black",List.copyOf(fields),List.of(.02,.03));
value.put("dimension",dimension);value.put("sectionKey",dimension);
assertEquals("ready",normalize(List.of(value),fields,SCOPE).state());
assertEquals("failed",normalize(List.of(value),Set.of("black_total_weight"),SCOPE).state());
value.put("sectionKey","overview");
assertEquals("failed",normalize(List.of(value),fields,SCOPE).state());
}
}
@Test void fullTop100BarSurvivesSavingAndTop101IsRejected() {
var points=new ArrayList<Double>();var categories=new ArrayList<Map<String,Object>>();
for(int i=0;i<100;i++){points.add(.8+i*.001);categories.add(Map.of("key","product-"+i,"label","产品"+i));}
var value=chart("black_rate","ratio","black",List.copyOf(RATE_FIELDS),points);
value.put("categories",categories);value.put("dimension","product");value.put("sectionKey","product");
value.put("coverage",Map.of("totalRows",100,"returnedRows",100,"truncated",false));
var saved=normalize(List.of(value),RATE_FIELDS,SCOPE);
assertEquals("ready",saved.state());assertEquals(100,((List<?>)saved.visuals().getFirst().get("categories")).size());
points.add(.99);categories.add(Map.of("key","product-100","label","产品100"));
value.put("coverage",Map.of("totalRows",101,"returnedRows",101,"truncated",false));
assertEquals("failed",normalize(List.of(value),RATE_FIELDS,SCOPE).state());
}
@Test void combinedScrapRankingSurvivesSnapshotValidationWithBothStagePermissions() {
var fields=List.of("black_scrap_weight","bright_scrap_weight");
var chart=chart("current_scrap_weight","kg",null,fields,List.of(65,41));
@@ -5,50 +5,56 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
import java.util.UUID;
import org.springframework.jdbc.core.JdbcTemplate;
import org.junit.jupiter.api.Test;
import org.springframework.test.util.ReflectionTestUtils;
import tools.jackson.databind.json.JsonMapper;
class NaoAnalysisProgressTest {
class DshAnalysisProgressTest {
@Test void rankMetricSurvivesBothStepAndTimelineSanitization() {
var input=Map.of("mode","rank","metric","totalWeight","dimension","product","stage","black","apiKey","hidden");
var steps=AnalysisTurnService.nativeSteps(List.of(Map.of("input",input)));
assertEquals("totalWeight",((Map<?,?>)steps.getFirst().get("input")).get("metric"));
var timeline=DshAnalysisRunner.safeTimeline(List.of(Map.of("sequence",1,"kind","tool_start","input",input)));
assertEquals("totalWeight",((Map<?,?>)timeline.getFirst().get("input")).get("metric"));
assertFalse(steps.toString().contains("hidden"));
assertFalse(timeline.toString().contains("hidden"));
}
@Test void boundedEvidenceCompletionRequiresItsOwnVerifiedStopContract() {
var message = Map.<String,Object>of("status", "COMPLETED", "answer", "已核验的答复",
"stopReason", "evidence_finalized", "completionMethod", "bounded_evidence_finalization",
"finishReason", "stop", "nativeStopSucceeded", true);
assertEquals("COMPLETED", NaoAnalysisRunner.Result.from(message, "", false).status());
assertEquals("CANCELLED", NaoAnalysisRunner.Result.from(message, "", true).status());
assertEquals("COMPLETED", DshAnalysisRunner.Result.from(message, "", false).status());
assertEquals("CANCELLED", DshAnalysisRunner.Result.from(message, "", true).status());
var invalid = new java.util.LinkedHashMap<>(message);
invalid.put("finishReason", "length");
assertEquals("PARTIAL", NaoAnalysisRunner.Result.from(invalid, "", false).status());
assertEquals("PARTIAL", DshAnalysisRunner.Result.from(invalid, "", false).status());
invalid.put("finishReason", "stop"); invalid.put("nativeStopSucceeded", false);
assertEquals("PARTIAL", NaoAnalysisRunner.Result.from(invalid, "", false).status());
assertEquals("PARTIAL", DshAnalysisRunner.Result.from(invalid, "", false).status());
invalid.remove("completionMethod");
assertEquals("PARTIAL", NaoAnalysisRunner.Result.from(invalid, "", false).status());
assertEquals("PARTIAL", DshAnalysisRunner.Result.from(invalid, "", false).status());
}
@Test void hiddenReasoningIsNotPublishedAndTimelineIsSanitized() {
var safe = NaoAnalysisRunner.safeProgress(Map.of("message", "分析中", "modelReasoning", "private",
var safe = DshAnalysisRunner.safeProgress(Map.of("message", "分析中", "modelReasoning", "private",
"timeline", List.of(Map.of("sequence", 1, "kind", "assistant", "text", "先核查覆盖 token=secret"),
Map.of("sequence", 2, "kind", "tool_start", "input", Map.of("mode", "query", "apiKey", "hidden")))));
assertFalse(safe.containsKey("modelReasoning"));
assertFalse(safe.toString().contains("secret")); assertFalse(safe.toString().contains("hidden"));
assertEquals(2, ((List<?>)safe.get("timeline")).size());
assertEquals(1, NaoAnalysisRunner.safeTimeline(List.of(Map.of("sequence", 2, "kind", "assistant"),
assertEquals(1, DshAnalysisRunner.safeTimeline(List.of(Map.of("sequence", 2, "kind", "assistant"),
Map.of("sequence", 1, "kind", "assistant"), Map.of("sequence", 2, "kind", "assistant"))).size());
}
@Test void lateAnswerAfterStopDoesNotAbortTheNativeResultCleanup() {
var jdbc = mock(JdbcTemplate.class);
when(jdbc.queryForObject("SELECT cancel_requested FROM analysis_turn WHERE id=?", Boolean.class, "stopped")).thenReturn(true);
var service = new AnalysisTurnService(jdbc, JsonMapper.builder().build(), null, null, null, null, null, null);
assertDoesNotThrow(() -> ReflectionTestUtils.invokeMethod(service, "persistNativeAnswer", "stopped", UUID.randomUUID(), "scope", "release", Map.of(), "late answer"));
verify(jdbc).queryForObject("SELECT cancel_requested FROM analysis_turn WHERE id=?", Boolean.class, "stopped");
verifyNoMoreInteractions(jdbc);
@Test void draftContainsOnlyBoundedPublicTextAndSupportsClearing() {
var publicDraft = DshAnalysisRunner.safeProgress(Map.of(
"dshDraft", "初稿\u0000\napi_key=private-key\n" + "文".repeat(5000),
"answer", "unverified output", "reportMarkdown", "unverified artifact"));
assertEquals(Set.of("dshDraft"), publicDraft.keySet());
String text = (String) publicDraft.get("dshDraft");
assertEquals(4000, text.length());
assertTrue(text.startsWith("初稿\napi_key=[REDACTED]\n"));
assertEquals(Map.of("dshDraft", ""), DshAnalysisRunner.safeProgress(Map.of("dshDraft", "")));
}
@Test void queuedCancellationCannotPoisonTheRetriedProcess() {
var runner = new NaoAnalysisRunner(JsonMapper.builder().build(), mock(NaoRuntimeAccessService.class));
var runner = new DshAnalysisRunner(JsonMapper.builder().build(), mock(AnalysisRuntimeAccessService.class));
runner.requestCancel("queued");
var markers = (Set<?>)ReflectionTestUtils.getField(runner, "cancellationRequested");
assertTrue(markers.isEmpty());
@@ -57,7 +63,7 @@ class NaoAnalysisProgressTest {
var calls = List.of(Map.of("tool", "mcp_call", "status", "failed", "recovered", true,
"label", "比较期间变化", "input", Map.of("mode", "compare", "releaseId", "hidden", "apiKey", "secret",
"period", Map.of("year", 2026), "filters", Map.of("product", "N52", "token", "secret"))));
var safe = NaoAnalysisRunner.safeProgress(Map.of("message", "正在比较", "toolCalls", calls, "toolCount", 1));
var safe = DshAnalysisRunner.safeProgress(Map.of("message", "正在比较", "toolCalls", calls, "toolCount", 1));
String encoded = safe.toString();
assertFalse(encoded.contains("hidden")); assertFalse(encoded.contains("secret"));
assertTrue(encoded.contains("N52")); assertTrue(encoded.contains("recovered=true"));
@@ -5,48 +5,58 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.Map;
import org.junit.jupiter.api.Test;
class NaoAnalysisRunnerResultTest {
class DshAnalysisRunnerResultTest {
@Test void aStopReasonCannotOverrideConflictingFinishOrPendingTools() {
for(var conflict:java.util.List.of(Map.<String,Object>of("finishReason","tool-calls"),
Map.<String,Object>of("nativeStopSucceeded",false),
Map.<String,Object>of("toolCalls",java.util.List.of(Map.of("tool","mcp_call","status","started"))),
Map.<String,Object>of("answerQuality",Map.of("narrativeComplete",false)))) {
var message=new java.util.LinkedHashMap<String,Object>();message.put("type","result");message.put("status","COMPLETED");message.put("stopReason","stop");message.put("answer","正在查询。");message.putAll(conflict);
assertEquals("PARTIAL",NaoAnalysisRunner.Result.from(message,"",false).status());
assertEquals("PARTIAL",DshAnalysisRunner.Result.from(message,"",false).status());
}
}
@Test void anEmptyStopResultCannotCompleteUnlessItHasAVisibleStructuredBody() {
var empty=NaoAnalysisRunner.Result.from(Map.of("type","result","status","COMPLETED","answer","", "stopReason","stop"),"",false);
var empty=DshAnalysisRunner.Result.from(Map.of("type","result","status","COMPLETED","answer","", "stopReason","stop"),"",false);
assertEquals("PARTIAL",empty.status());assertEquals("answer_missing",empty.stopReason());
assertEquals(false,AnalysisProtocolService.map(empty.details().get("answerQuality")).get("narrativeComplete"));
var report=NaoAnalysisRunner.Result.from(Map.of("type","result","status","COMPLETED","answer","", "stopReason","stop","reportMarkdown","已生成的报告"),"",false);
var report=DshAnalysisRunner.Result.from(Map.of("type","result","status","COMPLETED","answer","", "stopReason","stop","reportMarkdown","已生成的报告"),"",false);
assertEquals("COMPLETED",report.status());
}
@Test
void onlyNativeStopFinishReasonCanComplete() {
NaoAnalysisRunner.Result completed = NaoAnalysisRunner.Result.from(Map.of(
DshAnalysisRunner.Result completed = DshAnalysisRunner.Result.from(Map.of(
"type", "result", "status", "COMPLETED", "answer", "已完成", "stopReason", "stop"), "", false);
NaoAnalysisRunner.Result truncated = NaoAnalysisRunner.Result.from(Map.of(
DshAnalysisRunner.Result truncated = DshAnalysisRunner.Result.from(Map.of(
"type", "result", "status", "COMPLETED", "answer", "截断", "stopReason", "length"), "", false);
assertEquals("COMPLETED", completed.status());
assertEquals("PARTIAL", truncated.status());
assertEquals("NAO", completed.details().get("engine"));
assertEquals("DSH", completed.details().get("engine"));
}
@Test void resultAndProgressUseTheFrozenDshEngineInsteadOfTheWorkerMarker() {
var message=new java.util.LinkedHashMap<String,Object>();message.put("type","result");message.put("status","COMPLETED");
message.put("answer","已完成");message.put("stopReason","stop");message.put("engine","NAO");
var result=DshAnalysisRunner.Result.from(message,"",false,"DSH");
assertEquals("DSH",result.details().get("engine"));
var progress=DshAnalysisRunner.safeProgress(Map.of("message","正在研究"),"DSH");
assertEquals("DSH",progress.get("engine"));
assertEquals("DSH 正在处理",DshAnalysisRunner.safeProgress(Map.of(),"DSH").get("message"));
}
@Test void nativeAutonomousCompletionRequiresCurrentScopedProofsAndNativeStop() {
var message=new java.util.LinkedHashMap<String,Object>();message.put("type","result");message.put("status","COMPLETED");message.put("answer","已核实");message.put("stopReason","evidence_finalized");message.put("completionMethod","native_autonomous_analysis");message.put("finishReason","stop");message.put("nativeStopSucceeded",true);message.put("nativeStopReason","stop");
message.put("agentTask",Map.of("executionMode","native_agent"));message.put("protocol",Map.of("executionId","e"));message.put("protocolEvidence",java.util.List.of(Map.of("nodeId","n","scopeId","s")));message.put("evidenceCompletion",Map.of("serverCoverageSufficient",true));
assertEquals("COMPLETED",NaoAnalysisRunner.Result.from(message,"",false).status());
message.remove("nativeStopSucceeded");assertEquals("COMPLETED",NaoAnalysisRunner.Result.from(message,"",false).status());
message.put("nativeStopReason","mcp_error");message.put("nativeFinishReason","stop");assertEquals("COMPLETED",NaoAnalysisRunner.Result.from(message,"",false).status());
message.put("nativeStopSucceeded",false);assertEquals("PARTIAL",NaoAnalysisRunner.Result.from(message,"",false).status());
message.put("nativeStopSucceeded",true);message.put("protocolEvidence",java.util.List.of());assertEquals("PARTIAL",NaoAnalysisRunner.Result.from(message,"",false).status());
assertEquals("COMPLETED",DshAnalysisRunner.Result.from(message,"",false).status());
message.remove("nativeStopSucceeded");assertEquals("COMPLETED",DshAnalysisRunner.Result.from(message,"",false).status());
message.put("nativeStopReason","mcp_error");message.put("nativeFinishReason","stop");assertEquals("COMPLETED",DshAnalysisRunner.Result.from(message,"",false).status());
message.put("nativeStopSucceeded",false);assertEquals("PARTIAL",DshAnalysisRunner.Result.from(message,"",false).status());
message.put("nativeStopSucceeded",true);message.put("protocolEvidence",java.util.List.of());assertEquals("PARTIAL",DshAnalysisRunner.Result.from(message,"",false).status());
}
@Test
void cancellationOverridesACompletedRuntimeResult() {
NaoAnalysisRunner.Result cancelled = NaoAnalysisRunner.Result.from(Map.of(
DshAnalysisRunner.Result cancelled = DshAnalysisRunner.Result.from(Map.of(
"type", "result", "status", "COMPLETED", "answer", "部分文本", "stopReason", "stop"), "", true);
assertEquals("CANCELLED", cancelled.status());
@@ -55,7 +65,7 @@ class NaoAnalysisRunnerResultTest {
@Test
void unknownRuntimeStatusFailsClosed() {
NaoAnalysisRunner.Result rejected = NaoAnalysisRunner.Result.from(Map.of(
DshAnalysisRunner.Result rejected = DshAnalysisRunner.Result.from(Map.of(
"type", "result", "status", "SOMETHING_NEW", "answer", "输出", "stopReason", "unknown"), "", false);
assertEquals("FAILED", rejected.status());
@@ -63,35 +73,35 @@ class NaoAnalysisRunnerResultTest {
@Test
void keepsOnlyStructuredSafeWorkerFailureMessageWhenProcessExitsNonzero() {
String safeMessage = "原装 NAO 本地项目初始化失败,请重试。";
NaoAnalysisRunner.Result failed = NaoAnalysisRunner.Result.from(Map.of(
String safeMessage = "DSH 本地项目初始化失败,请重试。";
DshAnalysisRunner.Result failed = DshAnalysisRunner.Result.from(Map.of(
"type", "result", "status", "FAILED", "answer", "", "stopReason", "runtime_error",
"message", safeMessage), "", false);
NaoAnalysisRunner.Result afterExit = NaoAnalysisRunner.enforceExitStatus(failed, 1);
DshAnalysisRunner.Result afterExit = DshAnalysisRunner.enforceExitStatus(failed, 1);
assertEquals("FAILED", afterExit.status());
assertEquals(safeMessage, afterExit.answer());
assertEquals("", afterExit.answer());
assertEquals(safeMessage, afterExit.stopReason());
assertEquals(safeMessage, afterExit.details().get("message"));
}
@Test
void nonzeroExitStillOverridesAClaimedCompletedResult() {
NaoAnalysisRunner.Result completed = NaoAnalysisRunner.Result.from(Map.of(
DshAnalysisRunner.Result completed = DshAnalysisRunner.Result.from(Map.of(
"type", "result", "status", "COMPLETED", "answer", "回答", "stopReason", "stop"), "", false);
NaoAnalysisRunner.Result afterExit = NaoAnalysisRunner.enforceExitStatus(completed, 1);
DshAnalysisRunner.Result afterExit = DshAnalysisRunner.enforceExitStatus(completed, 1);
assertEquals("FAILED", afterExit.status());
assertEquals("NAO runtime exited abnormally", afterExit.stopReason());
assertEquals("DSH runtime exited abnormally", afterExit.stopReason());
}
@Test
void ignoresUnstructuredOrUnsafeWorkerMessages() {
NaoAnalysisRunner.Result unstructured = NaoAnalysisRunner.Result.from(Map.of(
DshAnalysisRunner.Result unstructured = DshAnalysisRunner.Result.from(Map.of(
"status", "FAILED", "answer", "", "stopReason", "runtime_error",
"message", "should be hidden"), "", false);
NaoAnalysisRunner.Result withControlChars = NaoAnalysisRunner.Result.from(Map.of(
DshAnalysisRunner.Result withControlChars = DshAnalysisRunner.Result.from(Map.of(
"type", "result", "status", "FAILED", "answer", "", "stopReason", "runtime_error",
"message", "unsafe\nmessage"), "", false);
@@ -16,12 +16,12 @@ import org.springframework.http.HttpStatus;
import org.springframework.web.server.ResponseStatusException;
import tools.jackson.databind.json.JsonMapper;
class NaoAnalysisRunnerRevocationTest {
class DshAnalysisRunnerRevocationTest {
@TempDir Path root;
@Test void runningWorkerIsCancelledAndDelegationRevokedAfterModelAuthorizationChanges() throws Exception {
Path scripts = Files.createDirectories(root.resolve("scripts"));
Path worker = scripts.resolve("nao_quality_runtime.py");
Path worker = scripts.resolve("quality_analysis_runtime.py");
Files.writeString(worker, """
import json,sys
request=json.loads(sys.stdin.readline())
@@ -32,7 +32,7 @@ class NaoAnalysisRunnerRevocationTest {
""");
String priorRoot = System.getProperty("quality.project.root");
String priorCommand = System.getProperty("quality.analysis.nao.command");
NaoRuntimeAccessService access = mock(NaoRuntimeAccessService.class);
AnalysisRuntimeAccessService access = mock(AnalysisRuntimeAccessService.class);
when(access.issue(any(), anyString(), anyString())).thenReturn("offline-delegation");
AtomicInteger checks = new AtomicInteger();
doAnswer(call -> {
@@ -41,11 +41,11 @@ class NaoAnalysisRunnerRevocationTest {
}).when(access).authorizeModel("offline-delegation");
AppUserPrincipal actor = new AppUserPrincipal(UUID.randomUUID(), "offline", "unused", "测试", true, false,
List.of("USER"), List.of("D"), List.of(), List.of());
NaoAnalysisRunner runner = new NaoAnalysisRunner(JsonMapper.builder().build(), access);
DshAnalysisRunner runner = new DshAnalysisRunner(JsonMapper.builder().build(), access);
try {
System.setProperty("quality.project.root", root.toString());
System.clearProperty("quality.analysis.nao.command");
NaoAnalysisRunner.Result result = runner.run("offline-turn", "offline-session", actor, "本地测试", "release", Map.of(),
DshAnalysisRunner.Result result = runner.run("offline-turn", "offline-session", actor, "本地测试", "release", Map.of(),
progress -> {}, answer -> {}, () -> false);
assertEquals("FAILED", result.status());
assertEquals("模型服务授权已失效,本轮分析已停止", result.stopReason());
@@ -10,21 +10,21 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
import tools.jackson.databind.json.JsonMapper;
class NaoProtocolRunnerTest {
class DshProtocolRunnerTest {
@TempDir Path root;
@Test void processAndCredentialCleanupStayBoundToTheAttempt() throws Exception {
String attempt=UUID.randomUUID().toString(),turn=UUID.randomUUID().toString(),session=UUID.randomUUID().toString();
Path scripts=Files.createDirectories(root.resolve("scripts"));
Files.writeString(scripts.resolve("nao_quality_runtime.py"),"""
Files.writeString(scripts.resolve("quality_analysis_runtime.py"),"""
import json,sys
r=json.loads(sys.stdin.readline())
assert r['sessionId']==r['context']['_protocol']['attemptId']
assert r['sessionId']!=r['context']['_protocol']['sessionId']
print(json.dumps({'type':'result','status':'COMPLETED','answer':'verified','stopReason':'stop'}),flush=True)
""");
var access=mock(NaoRuntimeAccessService.class);when(access.issueProtocol(any(),anyString(),anyString(),anyString())).thenReturn("synthetic-token");
var access=mock(AnalysisRuntimeAccessService.class);when(access.issueProtocol(any(),anyString(),anyString(),anyString())).thenReturn("synthetic-token");
var actor=new AppUserPrincipal(UUID.randomUUID(),"test","unused","测试",true,false,List.of("USER"),List.of(),List.of(),List.of());
var runner=new NaoAnalysisRunner(JsonMapper.builder().build(),access);
var runner=new DshAnalysisRunner(JsonMapper.builder().build(),access);
String prior=System.getProperty("quality.project.root"),command=System.getProperty("quality.analysis.nao.command");
try {
System.setProperty("quality.project.root",root.toString());System.clearProperty("quality.analysis.nao.command");
@@ -11,7 +11,7 @@ import org.springframework.context.annotation.AnnotationConfigApplicationContext
import org.springframework.jdbc.core.JdbcTemplate;
import tools.jackson.databind.json.JsonMapper;
class NaoRuntimeSpringConstructionTest {
class DshRuntimeSpringConstructionTest {
@Test
void springCanConstructTheNativeRuntimeBeanChain() {
try (AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext()) {
@@ -22,12 +22,12 @@ class NaoRuntimeSpringConstructionTest {
context.registerBean(OptionsController.class,()->mock(OptionsController.class));
context.registerBean(AnalysisToolsController.class,()->mock(AnalysisToolsController.class));
context.register(AnalysisExecutionProtocolStore.class,AnalysisProtocolTurnBinding.class,AnalysisProtocolService.class,
NaoRuntimeAccessService.class, NaoAnalysisRunner.class);
AnalysisRuntimeAccessService.class, DshAnalysisRunner.class);
context.refresh();
assertNotNull(context.getBean(NaoRuntimeAccessService.class));
assertNotNull(context.getBean(NaoAnalysisRunner.class));
assertNotNull(context.getBean(AnalysisRuntimeAccessService.class));
assertNotNull(context.getBean(DshAnalysisRunner.class));
assertNotNull(context.getBean(AnalysisProtocolService.class));
}
}
@@ -7,36 +7,36 @@ import java.util.List;
import java.util.Map;
import org.junit.jupiter.api.Test;
class NaoSemanticCompletionTest {
class DshSemanticCompletionTest {
@Test void historyCompletionNeedsCurrentImportAndCompleteCoverage() {
var message=new LinkedHashMap<String,Object>(Map.of("type","result","status","COMPLETED","answer","历史报告证据已完整核对。","stopReason","history_report_complete","finishReason","stop","completionMethod","confirmed_history_report","agentTask",Map.of("kind","report"),"historyEvidence",Map.of("importId","current"),"historyCoverage",Map.of("complete",true)));
assertEquals("COMPLETED",NaoAnalysisRunner.Result.from(message,"",false).status());
assertEquals("COMPLETED",DshAnalysisRunner.Result.from(message,"",false).status());
var blank = new LinkedHashMap<>(message); blank.put("answer", "");
assertEquals("PARTIAL", NaoAnalysisRunner.Result.from(blank,"",false).status());
message.put("historyCoverage",Map.of("complete",false));assertEquals("PARTIAL",NaoAnalysisRunner.Result.from(message,"",false).status());
message.put("historyCoverage",Map.of("complete",true));message.remove("historyEvidence");assertEquals("PARTIAL",NaoAnalysisRunner.Result.from(message,"",false).status());
assertEquals("PARTIAL", DshAnalysisRunner.Result.from(blank,"",false).status());
message.put("historyCoverage",Map.of("complete",false));assertEquals("PARTIAL",DshAnalysisRunner.Result.from(message,"",false).status());
message.put("historyCoverage",Map.of("complete",true));message.remove("historyEvidence");assertEquals("PARTIAL",DshAnalysisRunner.Result.from(message,"",false).status());
}
@Test void authorizedMemberListCompletionRequiresItsExecutionAndCoverageProof() {
var message=new LinkedHashMap<String,Object>(Map.of("type","result","status","COMPLETED","answer","已查全",
"stopReason","members_list_complete","finishReason","stop","completionMethod","bounded_authorized_member_list",
"agentTask",Map.of("kind","members"),"protocol",Map.of("executionId","current"),
"protocolEvidence",List.of(Map.of("queryId","page")),"evidenceCompletion",Map.of("serverCoverageSufficient",true)));
assertEquals("COMPLETED",NaoAnalysisRunner.Result.from(message,"",false).status());
assertEquals("CANCELLED",NaoAnalysisRunner.Result.from(message,"",true).status());
assertEquals("COMPLETED",DshAnalysisRunner.Result.from(message,"",false).status());
assertEquals("CANCELLED",DshAnalysisRunner.Result.from(message,"",true).status());
message.remove("protocolEvidence");
assertEquals("PARTIAL",NaoAnalysisRunner.Result.from(message,"",false).status());
assertEquals("PARTIAL",DshAnalysisRunner.Result.from(message,"",false).status());
}
@Test void scopedPlanCompletionNeedsItsOwnBoundedProofAndCoverageEnvelope() {
var message=new LinkedHashMap<String,Object>(Map.of("type","result","status","COMPLETED","answer","按范围核对完成",
"stopReason","evidence_finalized","finishReason","stop","completionMethod","bounded_scoped_query_plan",
"agentTask",Map.of("queryPlan",List.of(Map.of("nodeId","rank"))),"protocol",Map.of("executionId","current"),
"protocolEvidence",List.of(Map.of("queryId","q","nodeId","rank","scopeId","bound")),"evidenceCompletion",Map.of("serverCoverageSufficient",true)));
assertEquals("COMPLETED",NaoAnalysisRunner.Result.from(message,"",false).status());
assertEquals("CANCELLED",NaoAnalysisRunner.Result.from(message,"",true).status());
assertEquals("COMPLETED",DshAnalysisRunner.Result.from(message,"",false).status());
assertEquals("CANCELLED",DshAnalysisRunner.Result.from(message,"",true).status());
for(String key:List.of("agentTask","protocol","protocolEvidence","evidenceCompletion")) {
var missing=new LinkedHashMap<>(message);missing.remove(key);assertEquals("PARTIAL",NaoAnalysisRunner.Result.from(missing,"",false).status());
var missing=new LinkedHashMap<>(message);missing.remove(key);assertEquals("PARTIAL",DshAnalysisRunner.Result.from(missing,"",false).status());
}
message.put("protocolEvidence",List.of(Map.of("queryId","q")));assertEquals("PARTIAL",NaoAnalysisRunner.Result.from(message,"",false).status());
message.put("protocolEvidence",List.of(Map.of("queryId","q")));assertEquals("PARTIAL",DshAnalysisRunner.Result.from(message,"",false).status());
}
private Map<String, Object> clarification() {
return new LinkedHashMap<>(Map.of(
@@ -47,59 +47,59 @@ class NaoSemanticCompletionTest {
@Test void acceptsAnExplicitClarificationPromptWithoutCompletingTheAnalysis() {
Map<String, Object> message = clarification();
NaoAnalysisRunner.Result result = NaoAnalysisRunner.Result.from(message, "此前的流式文本", false);
DshAnalysisRunner.Result result = DshAnalysisRunner.Result.from(message, "此前的流式文本", false);
assertEquals("NEEDS_CLARIFICATION", result.status());
assertEquals(message.get("answer"), result.answer());
assertEquals("needs_clarification", result.stopReason());
assertEquals("NEEDS_CLARIFICATION", result.details().get("status"));
assertEquals("NAO", result.details().get("engine"));
assertEquals("DSH", result.details().get("engine"));
}
@Test void rejectsBlankMissingOrNonTextClarificationAnswersEvenWithStreamedText() {
for (Object invalid : List.of("", " \n\t ", 42, false)) {
Map<String, Object> message = clarification();
message.put("answer", invalid);
assertEquals("FAILED", NaoAnalysisRunner.Result.from(message, "流式文本不能替代澄清请求", false).status());
assertEquals("FAILED", DshAnalysisRunner.Result.from(message, "流式文本不能替代澄清请求", false).status());
}
Map<String, Object> missing = clarification();
missing.remove("answer");
assertEquals("FAILED", NaoAnalysisRunner.Result.from(missing, "流式文本不能替代澄清请求", false).status());
assertEquals("FAILED", DshAnalysisRunner.Result.from(missing, "流式文本不能替代澄清请求", false).status());
}
@Test void rejectsMissingBlankOrUnrelatedClarificationReasons() {
for (String invalid : List.of("", " ", "stop", "length", "history_report")) {
Map<String, Object> message = clarification();
message.put("stopReason", invalid);
assertEquals("FAILED", NaoAnalysisRunner.Result.from(message, "", false).status());
assertEquals("FAILED", DshAnalysisRunner.Result.from(message, "", false).status());
}
Map<String, Object> missing = clarification();
missing.remove("stopReason");
assertEquals("FAILED", NaoAnalysisRunner.Result.from(missing, "", false).status());
assertEquals("FAILED", DshAnalysisRunner.Result.from(missing, "", false).status());
}
@Test void onlyAStructuredResultCanRequestClarification() {
Map<String, Object> message = clarification();
message.put("type", "progress");
assertEquals("FAILED", NaoAnalysisRunner.Result.from(message, "", false).status());
assertEquals("FAILED", DshAnalysisRunner.Result.from(message, "", false).status());
message.remove("type");
assertEquals("FAILED", NaoAnalysisRunner.Result.from(message, "", false).status());
assertEquals("FAILED", DshAnalysisRunner.Result.from(message, "", false).status());
}
@Test void cancellationOverridesBothValidAndInvalidClarification() {
Map<String, Object> message = clarification();
for (String answer : List.of("请确认要查询的业务范围。", "")) {
message.put("answer", answer);
NaoAnalysisRunner.Result result = NaoAnalysisRunner.Result.from(message, "", true);
DshAnalysisRunner.Result result = DshAnalysisRunner.Result.from(message, "", true);
assertEquals("CANCELLED", result.status());
assertEquals("用户请求停止", result.stopReason());
}
message.put("status", "CANCELLED");
assertEquals("CANCELLED", NaoAnalysisRunner.Result.from(message, "", false).status());
assertEquals("CANCELLED", DshAnalysisRunner.Result.from(message, "", false).status());
}
@Test void verifiedHistoricalReportWithNormalStopCanComplete() {
NaoAnalysisRunner.Result result = NaoAnalysisRunner.Result.from(Map.of(
DshAnalysisRunner.Result result = DshAnalysisRunner.Result.from(Map.of(
"type", "result", "status", "COMPLETED", "answer", "已整合前述已核对依据。",
"stopReason", "stop", "completionMethod", "verified_conversation_report",
"finishReason", "stop"), "", false);
@@ -110,7 +110,7 @@ class NaoSemanticCompletionTest {
@Test void unrelatedCompletionReasonsStillRemainPartial() {
for (String reason : List.of("", "length", "timeout", "history_report", "needs_clarification")) {
NaoAnalysisRunner.Result result = NaoAnalysisRunner.Result.from(Map.of(
DshAnalysisRunner.Result result = DshAnalysisRunner.Result.from(Map.of(
"type", "result", "status", "COMPLETED", "answer", "尚待核对的文本",
"stopReason", reason, "completionMethod", "verified_conversation_report"), "", false);
assertEquals("PARTIAL", result.status());
@@ -120,8 +120,8 @@ class NaoSemanticCompletionTest {
@Test void unknownStatusesAndAbnormalWorkerExitStillFailClosed() {
Map<String, Object> message = clarification();
message.put("status", "NEEDS_OTHER_STATE");
assertEquals("FAILED", NaoAnalysisRunner.Result.from(message, "", false).status());
NaoAnalysisRunner.Result valid = NaoAnalysisRunner.Result.from(clarification(), "", false);
assertEquals("FAILED", NaoAnalysisRunner.enforceExitStatus(valid, 1).status());
assertEquals("FAILED", DshAnalysisRunner.Result.from(message, "", false).status());
DshAnalysisRunner.Result valid = DshAnalysisRunner.Result.from(clarification(), "", false);
assertEquals("FAILED", DshAnalysisRunner.enforceExitStatus(valid, 1).status());
}
}
@@ -9,7 +9,7 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
import tools.jackson.databind.json.JsonMapper;
class NaoVisualRecoveryRunnerTest {
class DshVisualRecoveryRunnerTest {
@TempDir Path root;
@Test void conversionIsLocalAndNeverIssuesModelOrQueryCredentials() throws Exception {
runWithScript("import json,sys\nr=json.load(sys.stdin)\nassert r['source']=='frozen'\nprint(json.dumps({'visualState':'ready','visuals':[]}))\n",runner->{
@@ -24,10 +24,10 @@ class NaoVisualRecoveryRunnerTest {
@Test void oversizedSourceIsRejectedBeforeAProcessCanStart() throws Exception {
runWithScript("raise RuntimeError('must not run')\n",runner->assertThrows(IOException.class,()->runner.rebuildVisuals("test",Map.of("value","x".repeat(16*1024*1024)))));
}
private interface Check {void run(NaoAnalysisRunner runner)throws Exception;}
private interface Check {void run(DshAnalysisRunner runner)throws Exception;}
private void runWithScript(String script,Check check)throws Exception {
Files.createDirectories(root.resolve("scripts"));Files.writeString(root.resolve("scripts/nao_visual_recovery.py"),script);
var access=mock(NaoRuntimeAccessService.class);var runner=new NaoAnalysisRunner(JsonMapper.builder().build(),access);
Files.createDirectories(root.resolve("scripts"));Files.writeString(root.resolve("scripts/quality_visual_recovery.py"),script);
var access=mock(AnalysisRuntimeAccessService.class);var runner=new DshAnalysisRunner(JsonMapper.builder().build(),access);
String prior=System.getProperty("quality.project.root");
try{System.setProperty("quality.project.root",root.toString());check.run(runner);verifyNoInteractions(access);}
finally{runner.shutdown();if(prior==null)System.clearProperty("quality.project.root");else System.setProperty("quality.project.root",prior);}