修复:普通对话沿用模型原文并保留业务前态
This commit is contained in:
@@ -0,0 +1,42 @@
|
||||
package cn.yunsheng.quality.analysis;
|
||||
|
||||
import java.util.*;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
/** 模型选择的普通对话不产生业务事实;确认与发布使用同一份受限原文。 */
|
||||
final class AnalysisDirectConversation {
|
||||
private static final Pattern FORBIDDEN=Pattern.compile(
|
||||
"(?:\\d+(?:[.,]\\d+)*|[零〇一二两三四五六七八九十百千万点]+)\\s*(?:[%%]|kg\\b|公斤|千克|吨|个百分点|pp\\b)"
|
||||
+"|百分之|(?:合格率|投入|报废|总重|产量|重量|数量)(?:重量|数量|总数|率)?\\s*(?:为|是|有|达到|共|合计|总计|[::])?\\s*(?:\\d|[零〇一二两三四五六七八九十百千万点])"
|
||||
+"|(?:已|已经)(?:查到|查询|核实|统计|生成|保存|记住|修改|设置|完成分析)(?!的)"
|
||||
+"|https?://|Q[A-F0-9]{8}|<[^>]+>|Bearer\\s+|\\bsk-[A-Za-z0-9_-]+|(?:api[_-]?key|token|password)\\s*[:=]",
|
||||
Pattern.CASE_INSENSITIVE|Pattern.UNICODE_CASE);
|
||||
private static final Pattern BUSINESS=Pattern.compile("合格率|报废|投入|产量|重量|分组|规格|产业部|国内|海外|产品");
|
||||
private static final Pattern CLAIM=Pattern.compile("主要是.{0,40}所致|主要来自|主要原因是|所致|远高于|远低于|确实更(?:大|小|差|好)|基本持平|(?:下降|上升|增加|减少|恶化|改善)了|明显.{0,8}(?:下降|上升|增加|减少)|导致.{0,12}(?:下降|上升)");
|
||||
static boolean applies(Map<String,Object> task) {return task.get("directResponse") instanceof Map<?,?>;}
|
||||
static void validate(Map<String,Object> task) {
|
||||
Map<String,Object> reply=AnalysisProtocolService.map(task.get("directResponse"));
|
||||
if(!Set.of("explain","restate").contains(Objects.toString(task.get("kind"),""))
|
||||
||!reply.keySet().equals(Set.of("purpose","answer","requiresMemory"))
|
||||
||!Set.of("greeting","capabilities","acknowledgement").contains(Objects.toString(reply.get("purpose"),""))
|
||||
||!Boolean.FALSE.equals(reply.get("requiresMemory")))throw invalid();
|
||||
for(String key:List.of("freshQuery","comparisonRequired","trendRequired","verifySource","fullDetails","needsClarification"))
|
||||
if(!Boolean.FALSE.equals(task.get(key)))throw invalid();
|
||||
for(String key:List.of("dimensions","stages","fields"))if(!(task.get(key) instanceof List<?> values)||!values.isEmpty())throw invalid();
|
||||
if(task.get("memberFields")!=null&&!(task.get("memberFields") instanceof List<?> values&&values.isEmpty()))throw invalid();
|
||||
if(task.get("dimensionStages")!=null&&!(task.get("dimensionStages") instanceof Map<?,?> values&&values.isEmpty()))throw invalid();
|
||||
if(task.containsKey("queryPlan")||!"none".equals(task.get("visualPreference"))||task.get("visualType")!=null
|
||||
||!"none".equals(task.getOrDefault("historyMode","none"))||"native_agent".equals(task.get("executionMode")))throw invalid();
|
||||
if(!(reply.get("answer") instanceof String text)||text.isBlank()||text.length()>1200||FORBIDDEN.matcher(text).find()
|
||||
||BUSINESS.matcher(text).find()&&CLAIM.matcher(text).find())throw invalid();
|
||||
}
|
||||
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("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;
|
||||
}
|
||||
private static IllegalArgumentException invalid(){return new IllegalArgumentException("普通对话只允许问候、能力介绍或致谢,不得替代业务查询、事实判断或记忆操作");}
|
||||
}
|
||||
@@ -86,8 +86,13 @@ public class AnalysisProtocolService {
|
||||
var state=store.state(sessionId);
|
||||
Long prior="CLARIFICATION".equals(state.status()) ? state.revision() : state.confirmedRevision();
|
||||
if (prior!=null) previous=read(store.revision(sessionId,prior).taskJson());
|
||||
if("report".equals(previous.get("kind"))&&!retry) {
|
||||
var resumed=jdbc.query("SELECT task_json FROM analysis_protocol_revision WHERE session_id=? AND disposition='CONFIRMED' AND JSON_UNQUOTE(JSON_EXTRACT(task_json,'$.kind'))<>'report' ORDER BY revision DESC LIMIT 1",
|
||||
if(AnalysisDirectConversation.applies(previous)&&!retry) {
|
||||
// 取该修订首次确认前冻结的业务前态,保留待澄清任务,且不复活已取消的目标。
|
||||
var frozen=jdbc.query("SELECT input_json FROM analysis_protocol_attempt WHERE session_id=? AND revision=? AND execution_id IS NOT NULL ORDER BY created_at,attempt_id LIMIT 1",
|
||||
(rs,n)->read(rs.getString(1)),sessionId,prior);
|
||||
previous=frozen.isEmpty()?Map.of():map(frozen.getFirst().get("previousTask"));
|
||||
} else if("report".equals(previous.get("kind"))&&!retry) {
|
||||
var resumed=jdbc.query("SELECT task_json FROM analysis_protocol_revision WHERE session_id=? AND disposition='CONFIRMED' AND JSON_UNQUOTE(JSON_EXTRACT(task_json,'$.kind'))<>'report' AND (JSON_EXTRACT(task_json,'$.directResponse') IS NULL OR JSON_TYPE(JSON_EXTRACT(task_json,'$.directResponse'))='NULL') ORDER BY revision DESC LIMIT 1",
|
||||
(rs,n)->read(rs.getString(1)),sessionId);
|
||||
previous=resumed.isEmpty()?Map.of():resumed.getFirst();
|
||||
}
|
||||
@@ -487,6 +492,7 @@ public class AnalysisProtocolService {
|
||||
if(!target.equals("POST /api/analysis/protocol/history")||!params.isEmpty()||nodeId!=null||scopeId!=null)throw denied("历史报告不能执行新的正式查询");
|
||||
return Map.of();
|
||||
}
|
||||
if(AnalysisDirectConversation.applies(task))throw denied("普通对话不能执行正式业务查询");
|
||||
if(target.equals("POST /api/analysis/protocol/queries")) {
|
||||
if(!task.containsKey("queryPlan")&&!AnalysisProtocolExploration.nativeAgent(task)||nodeId!=null||scopeId!=null)throw denied("当前任务未声明分步查询");
|
||||
return Map.of();
|
||||
@@ -626,7 +632,10 @@ 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)&&!"report".equals(task.get("kind"))
|
||||
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;
|
||||
@@ -1684,6 +1693,12 @@ public class AnalysisProtocolService {
|
||||
}
|
||||
}
|
||||
}
|
||||
if(AnalysisDirectConversation.applies(t)) {
|
||||
try {AnalysisDirectConversation.validate(t);}catch(IllegalArgumentException invalid){throw conflict(invalid.getMessage());}
|
||||
if(t.get("period")!=null)period(map(t.get("period")));
|
||||
if(t.get("comparisonPeriod")!=null)period(map(t.get("comparisonPeriod")));
|
||||
return t;
|
||||
}
|
||||
period(map(t.get("period")));
|
||||
if(Boolean.TRUE.equals(t.get("needsClarification"))) {
|
||||
if(!(t.get("clarification") instanceof String s)||s.isBlank())throw conflict("澄清必须说明待确认对象");
|
||||
|
||||
Reference in New Issue
Block a user