Merge branch 'main' into main_assistant_v3_to_assistant

Author: wuayee

app-builder/plugins/aipp-custom-model-center/src/main/resources/sql/data/tr_t_model_import.sql

@@ -63,4 +63,5 @@ INSERT INTO "public"."store_app" ("like_count", "download_count", "source", "ico
 INSERT INTO "public"."store_tool" ("name", "schema", "runnables", "extensions", "unique_name", "version", "is_latest", "group_name", "definition_name", "definition_group_name") VALUES ('模型配置应用', '{"name":"模型配置应用","description":"当你想要配置模型的时候，请使用我！","manualIntervention":false,"parameters":{"type":"object","properties":{"aippId":{"description":"the aipp id of the waterFlow tool","default":"0b4fe5a430104edfbe0dc6cff0ebea19","type":"string"},"tenantId":{"description":"the tenant id of the waterFlow tool","default":"31f20efc7e0848deab6a6bc10fc3021e","type":"string"},"inputParams":{"type":"object","properties":{"Question":{"type":"string","description":"这是用户输入的问题。"}},"required":["Question"],"order":["Question"]},"version":{"description":"the aipp version of the waterFlow tool","default":"1.0.0","type":"string"}},"required":["tenantId","aippId","version","inputParams"]},"return":{"type":"object","properties":{}},"order":["tenantId","aippId","version","inputParams"]}', '{"FIT":{"fitableId":"water.flow.invoke","genericableId":"07b51bd246594c159d403164369ce1db"},"APP":{"aippId":"0b4fe5a430104edfbe0dc6cff0ebea19","appCategory":"chatbot","version":"1.0.0","appId":"cec6bfe7cb3a444f8a26a97ea513e501"}}', 'null', '7a76cbd2-881d-469b-b2df-76abed7d0b61', '1.0.0', 't', '7a76cbd2-881d-469b-b2df-76abed7d0b61', '7a76cbd2-881d-469b-b2df-76abed7d0b61', '7a76cbd2-881d-469b-b2df-76abed7d0b61') ON CONFLICT ("unique_name", "version") DO NOTHING;
 
 INSERT INTO "public"."store_tag" ("tool_unique_name", "name") VALUES ('7a76cbd2-881d-469b-b2df-76abed7d0b61', 'APP') ON CONFLICT ("tool_unique_name", "name") DO NOTHING;
-INSERT INTO "public"."store_tag" ("tool_unique_name", "name") VALUES ('7a76cbd2-881d-469b-b2df-76abed7d0b61', 'APP_TYPE_B653EDB7EB5A49BE91ABCD2C5877C6AD') ON CONFLICT ("tool_unique_name", "name") DO NOTHING;
+INSERT INTO "public"."store_tag" ("tool_unique_name", "name") VALUES ('7a76cbd2-881d-469b-b2df-76abed7d0b61', 'APP_TYPE_B653EDB7EB5A49BE91ABCD2C5877C6AD') ON CONFLICT ("tool_unique_name", "name") DO NOTHING;
+INSERT INTO "public"."store_tag" ("tool_unique_name", "name") VALUES ('7a76cbd2-881d-469b-b2df-76abed7d0b61', 'BUILTIN') ON CONFLICT ("tool_unique_name", "name") DO NOTHING;

app-builder/plugins/aipp-plugin/src/main/java/modelengine/fit/jober/aipp/service/impl/AgentInfoGenerateServiceImpl.java

@@ -25,6 +25,7 @@
 import modelengine.fit.jober.aipp.service.AippModelService;
 import modelengine.fit.jober.aipp.util.UUIDUtil;
 import modelengine.fitframework.annotation.Component;
+import modelengine.fitframework.annotation.Value;
 import modelengine.fitframework.log.Logger;
 import modelengine.fitframework.util.IoUtils;
 import modelengine.fitframework.util.MapBuilder;
@@ -40,6 +41,8 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * 表示 {@link AgentInfoGenerateService} 的默认实现。
@@ -65,13 +68,17 @@ public class AgentInfoGenerateServiceImpl implements AgentInfoGenerateService {
 
     private final String agentNameFormat = "^[\\u4E00-\\u9FA5A-Za-z0-9][\\u4E00-\\u9FA5A-Za-z0-9-_]*$";
 
+    private final String systemCreator;
+
     public AgentInfoGenerateServiceImpl(AippModelService aippModelService, AippModelCenter aippModelCenter,
-            PluginToolService toolService, LocaleService localeService, AppBuilderAppRepository appRepository) {
+            PluginToolService toolService, LocaleService localeService, AppBuilderAppRepository appRepository,
+            @Value("${app-engine.plugin.system-creator}") String systemCreator) {
         this.aippModelService = aippModelService;
         this.aippModelCenter = aippModelCenter;
         this.toolService = toolService;
         this.localeService = localeService;
         this.appRepository = appRepository;
+        this.systemCreator = systemCreator;
     }
 
     @Override
@@ -100,7 +107,16 @@ public String generateGreeting(String desc, OperationContext context) {
 
     @Override
     public String generatePrompt(String desc, OperationContext context) {
-        return this.generateByTemplate(desc, "prompt/promptGeneratePrompt.txt", context);
+        String prompt = this.generateByTemplate(desc, "prompt/promptGeneratePrompt.txt", context);
+        String format;
+        try {
+            format = IoUtils.content(AgentInfoGenerateService.class.getClassLoader(),
+                    "prompt/promptGeneratePromptFormat.txt");
+        } catch (IOException e) {
+            log.error("read prompt format file fail.", e);
+            throw new AippException(AippErrCode.EXTRACT_FILE_FAILED);
+        }
+        return StringUtils.format(format, prompt);
     }
 
     @Override
@@ -110,7 +126,9 @@ public List<String> selectTools(String desc, String creator, OperationContext co
 
     private ArrayList<String> getToolsResult(String desc, String creator, OperationContext context) {
         StringBuilder toolsCandidate = new StringBuilder();
-        ListResult<PluginToolData> tools = this.getTools(creator);
+        ListResult<PluginToolData> creatorTools = this.getTools(creator);
+        ListResult<PluginToolData> systemTools = this.getTools(this.systemCreator);
+        ListResult<PluginToolData> tools = this.merge(creatorTools, systemTools);
         int count = tools.getCount();
         List<PluginToolData> toolData = tools.getData();
         for (int i = 0; i < count; i++) {
@@ -136,6 +154,20 @@ private ArrayList<String> getToolsResult(String desc, String creator, OperationC
         return toolsResult;
     }
 
+    private ListResult<PluginToolData> merge(ListResult<PluginToolData> tool1, ListResult<PluginToolData> tools2) {
+        if (tool1 == null || tool1.getCount() == 0) {
+            return tools2;
+        } else if (tools2 == null || tools2.getCount() == 0) {
+            return tool1;
+        }
+        ListResult<PluginToolData> tools = ListResult.create(new ArrayList<>(), 0);
+        tools.setCount(tool1.getCount() + tools2.getCount());
+        List<PluginToolData> mergedData = Stream.concat(tool1.getData().stream(), tools2.getData().stream())
+                .collect(Collectors.toList());
+        tools.setData(mergedData);
+        return tools;
+    }
+
     private ListResult<PluginToolData> getTools(String creator) {
         PluginToolQuery pluginQuery = new PluginToolQuery.Builder().toolName(null).includeTags(new HashSet<String>() {{
             add("FIT");

app-builder/plugins/aipp-plugin/src/main/resources/application.yml

@@ -60,6 +60,8 @@ app-engine:
     max-length: 20000
   user-context:
     max-length: 500
+  plugin:
+    system-creator: 'system'
 elsa:
   endpoint:
   elsaKey:

app-builder/plugins/aipp-plugin/src/main/resources/prompt/promptGeneratePrompt.txt

@@ -1,4 +1,4 @@
-You ara a prompt generator, Your job is to generate prompt from the input of the user.
+You are a prompt generator, Your job is to generate prompt from the input of the user.
 **NOTE THAT THE PROMPT MUST INSTRUCT THE AGENT TO USE TOOL AS MUCH AS POSSIBLE**
 
 The Prompt must follow the style of the example below:

app-builder/plugins/aipp-plugin/src/main/resources/prompt/promptGeneratePromptFormat.txt

@@ -0,0 +1,27 @@
+{0}
+
+<tool_usage>
+你的回答有两种情况：
+
+无需调用外部工具：
+如果问题可通过已有对话历史或直接推理得到答案，直接输出最终结果，不需使用任何标签包装，也不显示详细思考过程。
+
+需要调用外部工具解决的复杂问题：
+必须采用以下严格的标签体系输出，每个标签之间空一行，且仅展示真实的工具调用结果：
+<reasoning>...</reasoning>：展示你内部的思考过程。注意，这部分内容可以展示给用户，但仅限于描述思路，不应包含任何伪造的工具调用结果。
+<step>...</step>：描述你准备调用工具的原因和计划。此处仅说明你需要调用哪个工具以及原因，工具的名称对人类阅读要友好，切勿直接模拟或输出工具返回内容。
+<tool>...</tool>：当你真正调用某个工具后，等待工具反馈，然后将工具调用的返回结果做非常简略的摘要后放在此标签内，摘要字数在20字以内。绝对禁止在未获得真实工具反馈前预先构造。 <tool> 标签内容。
+<final>...</final>：在获取所有真实工具调用结果后，将整合信息给出最终答案。
+重要要求：
+- 无论用户是否明确要求展示思考过程，都要展示思考过程
+- 不要输出tool_call标签。
+- 答案必须详细完整，不仅仅是工具返回结果的简单总结，而是对结果进行深入分析和整合，并提供背景解释、推理过程和可行性分析。
+- 确保所有关键信息得到展开，避免省略任何重要内容。
+- 如果适用，可以提供额外的解释、使用建议或应用场景，以增强回答的实用性。
+- 请使用标准 Markdown 语法输出答案，保证语法完整，不要拆分列表结构。
+- 输出此标签后，不得追加任何其他内容或标签。
+严格要求：
+切勿在中间思考或工具调用计划中，提前生成伪造的 <tool> 或 <final> 标签内容。必须在实际调用工具并获得反馈后，再以 <tool> 标签展示真实结果，再生成 <final> 标签输出最终答案。
+如果历史对话中已包含真实的工具调用结果，应直接使用这些信息构造最终答案，避免重复调用或展示多余标签。
+在所有工具调用完成之前，不得输出 <final> 标签；只有在确认所有真实工具反馈后，才生成最终答案。
+</tool_usage>

app-builder/plugins/aipp-plugin/src/main/resources/sql/data/tr_t_interview.sql

@@ -1,4 +1,4 @@
-INSERT INTO "public"."app_builder_app" ("id", "name", "create_by", "create_at", "update_by", "update_at", "config_id", "flow_graph_id", "tenant_id", "type", "version", "attributes", "state", "app_built_type", "app_category", "collection_usr_cnt", "is_deleted", "path", "app_type", "app_suite_id", "is_active", "status", "unique_name", "publish_at", "app_id", "user_group_id") VALUES ('fd8166b5005e4d66a77d318f3b1dd5e5', '面试助手', 'Jade', '2025-04-28 08:36:13.767496', 'Jade', '2025-04-28 08:37:15.197182', '68da40b4e47e4743a59c2beac9002dc7', '24f72de428124eb19fd12db36ebcfd34', '31f20efc7e0848deab6a6bc10fc3021e', 'app', '1.0.0', '{"icon": "", "name": "面试助手", "greeting": "", "store_id": "e8bbd29c-e529-4c8e-abdb-b355b2d8dcdf", "is_update": false, "description": "", "publishedUpdateLog": "", "publishedDescription": ""}', 'active', 'workflow', 'chatbot', 0, 0, '3v8ZU1cMRV0oRcqu', '4db152b24f94473ab683b1acbfe3c865', 'ec6f8e93a80541bb930fc22678ef7043', 't', 'published', 'e8bbd29c-e529-4c8e-abdb-b355b2d8dcdf', '2025-04-28 08:39:03', 'fd8166b5005e4d66a77d318f3b1dd5e5', '*') ON CONFLICT (id) DO NOTHING;
+INSERT INTO "public"."app_builder_app" ("id", "name", "create_by", "create_at", "update_by", "update_at", "config_id", "flow_graph_id", "tenant_id", "type", "version", "attributes", "state", "app_built_type", "app_category", "collection_usr_cnt", "is_deleted", "path", "app_type", "app_suite_id", "is_active", "status", "unique_name", "publish_at", "app_id", "user_group_id") VALUES ('fd8166b5005e4d66a77d318f3b1dd5e5', '面试助手', 'system', '2025-04-28 08:36:13.767496', 'system', '2025-04-28 08:37:15.197182', '68da40b4e47e4743a59c2beac9002dc7', '24f72de428124eb19fd12db36ebcfd34', '31f20efc7e0848deab6a6bc10fc3021e', 'app', '1.0.0', '{"icon": "", "name": "面试助手", "greeting": "", "store_id": "e8bbd29c-e529-4c8e-abdb-b355b2d8dcdf", "is_update": false, "description": "", "publishedUpdateLog": "", "publishedDescription": ""}', 'active', 'workflow', 'chatbot', 0, 0, '3v8ZU1cMRV0oRcqu', '4db152b24f94473ab683b1acbfe3c865', 'ec6f8e93a80541bb930fc22678ef7043', 't', 'published', 'e8bbd29c-e529-4c8e-abdb-b355b2d8dcdf', '2025-04-28 08:39:03', 'fd8166b5005e4d66a77d318f3b1dd5e5', '*') ON CONFLICT (id) DO NOTHING;
 
 INSERT INTO "public"."app_builder_config" ("id", "form_id", "app_id", "tenant_id", "create_by", "create_at", "update_by", "update_at", "is_deleted") VALUES ('68da40b4e47e4743a59c2beac9002dc7', 'b8986770a6ffef44bbf2a9f26d6fc1be', 'fd8166b5005e4d66a77d318f3b1dd5e5', '31f20efc7e0848deab6a6bc10fc3021e', 'Jade', '2025-04-28 08:36:13.767496', 'Jade', '2025-04-28 08:37:15.197182', 0) ON CONFLICT (id) DO NOTHING;
 

app-builder/plugins/aipp-plugin/src/test/java/modelengine/fit/jober/aipp/service/AgentInfoGenerateServiceImplTest.java

@@ -25,6 +25,7 @@
 import modelengine.jade.store.service.PluginToolService;
 
 import org.jetbrains.annotations.NotNull;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
@@ -68,7 +69,7 @@ void beforeAll() {
                 this.aippModelCenter,
                 this.toolService,
                 this.localeService,
-                this.appRepository);
+                this.appRepository, "system");
     }
 
     @Test
@@ -101,7 +102,7 @@ void shouldOkWhenGeneratePrompt() {
         when(model.getTag()).thenReturn("llm_tag");
         when(this.aippModelCenter.getDefaultModel(any(), any())).thenReturn(model);
         when(aippModelService.chat(anyString(), anyString(), anyDouble(), anyString())).thenReturn("PROMPT");
-        assertThat(this.agentInfoGenerateService.generatePrompt("DESC", null)).isEqualTo("PROMPT");
+        assertThat(this.agentInfoGenerateService.generatePrompt("DESC", null)).startsWith("PROMPT");
     }
 
     @Test
@@ -135,6 +136,81 @@ void shouldOkWhenSelectTools() {
                 "UNIQUENAME3");
     }
 
+    @Test
+    void testMerge_tool1IsNull_returnsTools2() {
+        ListResult<PluginToolData> tools2 = new ListResult<>(List.of(new PluginToolData()), 1);
+        ListResult<PluginToolData> result = this.invokeMerge(null, tools2);
+        Assertions.assertSame(tools2, result);
+    }
+
+    /**
+     * 测试当 tool1 的 count 为 0 时是否正确返回 tools2
+     */
+    @Test
+    void testMerge_tool1IsEmpty_returnsTools2() {
+        ListResult<PluginToolData> tool1 = new ListResult<>(new ArrayList<>(), 0);
+        ListResult<PluginToolData> tools2 = new ListResult<>(List.of(new PluginToolData()), 1);
+        ListResult<PluginToolData> result = this.invokeMerge(tool1, tools2);
+        Assertions.assertSame(tools2, result);
+    }
+
+    /**
+     * 测试当 tools2 为 null 时是否正确返回 tool1
+     */
+    @Test
+    void testMerge_tools2IsNull_returnsTool1() {
+        ListResult<PluginToolData> tool1 = new ListResult<>(List.of(new PluginToolData()), 1);
+        ListResult<PluginToolData> result = invokeMerge(tool1, null);
+        Assertions.assertSame(tool1, result);
+    }
+
+    /**
+     * 测试当 tools2 的 count 为 0 时是否正确返回 tool1
+     */
+    @Test
+    void testMerge_tools2IsEmpty_returnsTool1() {
+        ListResult<PluginToolData> tool1 = new ListResult<>(List.of(new PluginToolData()), 1);
+        ListResult<PluginToolData> tools2 = new ListResult<>(new ArrayList<>(), 0);
+        ListResult<PluginToolData> result = invokeMerge(tool1, tools2);
+        Assertions.assertSame(tool1, result);
+    }
+
+    /**
+     * 测试正常情况下两个列表能否成功合并
+     */
+    @Test
+    void testMerge_bothValid_mergeCorrectly() {
+        PluginToolData data1 = new PluginToolData();
+        PluginToolData data2 = new PluginToolData();
+        ListResult<PluginToolData> tool1 = new ListResult<>(List.of(data1), 1);
+        ListResult<PluginToolData> tools2 = new ListResult<>(List.of(data2), 1);
+
+        ListResult<PluginToolData> result = invokeMerge(tool1, tools2);
+
+        Assertions.assertNotNull(result);
+        Assertions.assertEquals(2, result.getCount());
+        Assertions.assertTrue(result.getData().contains(data1));
+        Assertions.assertTrue(result.getData().contains(data2));
+    }
+
+    /**
+     * 利用反射机制调用私有方法 merge
+     *
+     * @param tool1 第一个 ListResult 参数
+     * @param tools2 第二个 ListResult 参数
+     * @return 合并后的 ListResult 结果
+     */
+    private ListResult<PluginToolData> invokeMerge(ListResult<PluginToolData> tool1, ListResult<PluginToolData> tools2) {
+        try {
+            var method = AgentInfoGenerateServiceImpl.class.getDeclaredMethod("merge",
+                    ListResult.class, ListResult.class);
+            method.setAccessible(true);
+            return (ListResult<PluginToolData>) method.invoke(this.agentInfoGenerateService, tool1, tools2);
+        } catch (Exception e) {
+            throw new RuntimeException("Failed to invoke private method 'merge'", e);
+        }
+    }
+
     @NotNull
     private ModelListDto getModelListDto() {
         List<ModelAccessInfo> modelAccessInfos = new ArrayList<>();