添加未清选择改成动态引导语

qianbao
1 parent 6e76fb7b
Showing 5 changed files with 56 additions and 49 deletions
src/main/java/com/xly/service/XlyErpService.java
src/main/java/com/xly/tool/DynamicToolProvider.java
src/main/java/com/xly/tool/ToolSpecificationHolder.java
src/main/java/com/xly/tts/service/PythonTtsProxyService.java
src/main/resources/application.yml
@@ -949,29 +949,37 @@ public class XlyErpService {
             }else {return  null;}
         }
         //  4. 获取/创建用Agent
-        ErpAiAgent aiAgent = UserSceneSessionService.ERP_AGENT_CACHE.get(userId);
-        if(ObjectUtil.isEmpty(aiAgent)){
-            List<ToolSpecificationHolder> dataList =  dynamicToolProvider.sceneToolCacheMap.get(session.getCurrentScene().getSId());
-            Set<String> immediateReturnToolNames = new HashSet<>();
-            Map<ToolSpecification, ToolExecutor> executors = new HashMap<>();
-            if(ObjectUtil.isNotEmpty(dataList)){
-                dataList.forEach(one->{
-                    immediateReturnToolNames.add(one.getsName());
-                    executors.put(one.getToolSpecification(),one.getToolExecutor());
-                });
-            }
-            aiAgent = AiServices.builder(ErpAiAgent.class)
-                    .chatModel(chatModel)
-                    .chatMemoryProvider(operableChatMemoryProvider)
-                    .tools(executors,immediateReturnToolNames)
+      //  ErpAiAgent aiAgent = UserSceneSessionService.ERP_AGENT_CACHE.get(userId);
+//        if(ObjectUtil.isEmpty(aiAgent)){
+        List<ToolSpecificationHolder> dataList =  dynamicToolProvider.sceneToolCacheMap.get(session.getCurrentScene().getSId());
+        List<ToolSpecificationHolder> dataListOne =
+                dataList.stream().filter(m->
+                        userInput.equals(m.getsMethodName().trim()) || ("查询"+userInput).equals(m.getsMethodName().trim())
+                ).collect(Collectors.toUnmodifiableList());
+
+        if(ObjectUtil.isNotEmpty(dataListOne)){
+            dataList = dataListOne;
+        }
+        Set<String> immediateReturnToolNames = new HashSet<>();
+        Map<ToolSpecification, ToolExecutor> executors = new HashMap<>();
+        if(ObjectUtil.isNotEmpty(dataList)){
+            dataList.forEach(one->{
+                immediateReturnToolNames.add(one.getsName());
+                executors.put(one.getToolSpecification(),one.getToolExecutor());
+            });
+        }
+        return AiServices.builder(ErpAiAgent.class)
+                .chatModel(chatModel)
+                .chatMemoryProvider(operableChatMemoryProvider)
+                .tools(executors,immediateReturnToolNames)
 //                    .toolProvider(dynamicToolProvider)
 //                    .returnBehavior(ReturnBehavior.IMMEDIATE)
 //                    .toolChoice(ChatCompletionToolChoice.ofRequired())
-                    .build();
-            UserSceneSessionService.ERP_AGENT_CACHE.put(userId, aiAgent);
-            log.info("用户{}Agent构建完成，已选场景：{},场景ID{}", userId, session.isSceneSelected() ? session.getCurrentScene().getSSceneName() : "未选（全场景匹配）", dynamicToolProvider.sSceneIdMap.get(userId));
-        }
-        return aiAgent;
+                .build();
+//            UserSceneSessionService.ERP_AGENT_CACHE.put(userId, aiAgent);
+//            log.info("用户{}Agent构建完成，已选场景：{},场景ID{}", userId, session.isSceneSelected() ? session.getCurrentScene().getSSceneName() : "未选（全场景匹配）", dynamicToolProvider.sSceneIdMap.get(userId));
+//        }
+//        return aiAgent;
     }
     private ErpAiAgent createConfirmeAgent(UserSceneSession session) {
@@ -83,14 +83,14 @@ public class DynamicToolProvider implements ToolProvider {
                 doSetToolAIshowfieldShow(meta);
                 ToolSpecification spec = buildToolSpecification(meta);
                 ToolExecutor executor = createToolExecutor(meta);
-                toolCache.put(meta.getSMethodNo(), new ToolSpecificationHolder(spec, executor,meta.getSMethodNo()));
+                toolCache.put(meta.getSMethodNo(), new ToolSpecificationHolder(spec, executor,meta.getSMethodNo(),meta.getSMethodName()));
                 log.info("已加载动态工具：{}", meta.getSMethodNo());
                 String sceneId = meta.getSSceneId();
                 List<ToolSpecificationHolder> dataList = new ArrayList<>();
                 if(ObjectUtil.isNotEmpty(sceneToolCacheMap.get(sceneId))) {
                     dataList = sceneToolCacheMap.get(sceneId);
                 }
-                dataList.add(new ToolSpecificationHolder(spec, executor,meta.getSMethodNo()));
+                dataList.add(new ToolSpecificationHolder(spec, executor,meta.getSMethodNo(),meta.getSMethodName()));
                 sceneToolCacheMap.put(sceneId, dataList);
             } catch (Exception e) {
                 e.printStackTrace();
@@ -1016,31 +1016,25 @@ public class DynamicToolProvider implements ToolProvider {
     public String buildDynamicSystemPrompt(UserSceneSession session) {
         String methodNo = session.getCurrentTool().getSMethodNo();
         String rowJson = JSONUtil.toJsonStr(session.getCurrentRowData());
-
         return """
-            【极强约束·必须执行】
-            1. 禁止说话！禁止解释！
-            2. 必须调用工具！
-            3. 只输出标准工具调用JSON！
-
-            表格数据：
-            %s
-
-            【解析规则】
-            1. 用户说“第N行” → 取对应sSlaveId
-            2. 用户说“全部确认” → 取所有sSlaveId
-            3. 多行用英文逗号拼接
-
-            【输出格式·绝对严格·必须照做】
-            你必须输出标准工具调用JSON，只输出这一段，不许加任何文字：
-            {
-              "name": "%s",
-              "parameters": {
-                "operateType": "全部确认/合并确认/单行确认",
-                "sSlaveId": "id1,id2,id3"
-              }
-            }
-            """.formatted(rowJson, methodNo);
+        【极强约束·必须执行】
+        1. 禁止说话！禁止解释！
+        2. 必须调用工具！
+        3. 只输出标准工具调用JSON！
+        
+        表格数据（key是行号）：
+        %s
+        
+        【规则】
+        用户输入如"第N条数据确认"，N为行号。
+        在表格中查找 key = N 的数据，取出 sSlaveId。
+        
+        【输出格式】
+        {"name": "%s", "parameters": {"operateType": "单行确认", "sSlaveId": "取出的ID"}}
+        
+        【警告】
+        禁止编造！必须从表格中提取！
+        """.formatted(rowJson, methodNo);
     }
     private List<Map<String, Object>> findFieldNameByChinese(List<Map<String, Object>> sAIshowfieldShow,List<Map<String, Object>> rows){
@@ -8,10 +8,12 @@ public class ToolSpecificationHolder {
     private final ToolSpecification toolSpecification;
     private final ToolExecutor toolExecutor;
     private final String sName;
-    public ToolSpecificationHolder(ToolSpecification toolSpecification, ToolExecutor toolExecutor,String sName) {
+    private final String sMethodName;
+    public ToolSpecificationHolder(ToolSpecification toolSpecification, ToolExecutor toolExecutor,String sName,String sMethodName) {
         this.toolSpecification = toolSpecification;
         this.toolExecutor = toolExecutor;
         this.sName = sName;
+        this.sMethodName = sMethodName;
     }
     public ToolSpecification getToolSpecification() {
@@ -26,5 +28,8 @@ public class ToolSpecificationHolder {
         return sName;
     }
+    public String getsMethodName() {
+        return sMethodName;
+    }
 }
@@ -4,7 +4,6 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.xly.constant.BusinessCode;
 import com.xly.constant.ReturnTypeCode;
-import com.xly.entity.AiResponseAccumulator;
 import com.xly.entity.AiResponseDTO;
 import com.xly.entity.UserSceneSession;
 import com.xly.service.UserSceneSessionService;
@@ -135,7 +135,8 @@ langchain4j:
   ollama:
     # 聊天模型配置（用于一般对话）
     base-url: http://112.82.245.194:11434
-    chat-model-name: qwen2.5:7b-instruct
+#    chat-model-name: qwen2.5:7b-instruct
+    chat-model-name: qwen2.5:14b
 #    chat-model-name: qwen3:14b
 #    chat-model-name: qwen3.5:9b
     # SQL/代码模型配置（专门用于代码和SQL生成）