Merge branch '1.2.x'

CodeCasterX · CodeCasterX · commit 8f29958ebc6d · 2025-07-24T14:33:17.000+08:00
diff --git a/app-builder/jane/plugins/aipp-plugin/src/main/java/modelengine/fit/jober/aipp/domains/appversion/ToolSchemaBuilder.java b/app-builder/jane/plugins/aipp-plugin/src/main/java/modelengine/fit/jober/aipp/domains/appversion/ToolSchemaBuilder.java
@@ -104,7 +104,7 @@ private Map<String, Object> buildInputParamsSchema() {
             List<Map<String, Object>> inputParams = f.getInputParamsByName("input");
             inputParams.forEach(ip -> {
                 String name = ip.getOrDefault("name", StringUtils.EMPTY).toString();
-                String type = ip.getOrDefault("type", StringUtils.EMPTY).toString();
+                String type = ObjectUtils.<String>cast(ip.getOrDefault("type", StringUtils.EMPTY)).toLowerCase();
                 String description = ip.getOrDefault("description", StringUtils.EMPTY).toString();
                 propertiesMapOfInputParam.put(name,
                         MapBuilder.get().put("type", type).put("description", description).build());
diff --git a/carver/plugins/tool-repository-postgresql/src/main/java/modelengine/jade/carver/tool/repository/pgsql/mapper/ToolMapper.java b/carver/plugins/tool-repository-postgresql/src/main/java/modelengine/jade/carver/tool/repository/pgsql/mapper/ToolMapper.java
@@ -141,4 +141,11 @@ public interface ToolMapper {
      * @return 表示工具信息的 {@link List}{@code <}{@link ToolDo}{@code >}。
      */
     List<ToolDo> getToolsByIdentifier(List<ToolIdentifier> toolIdentifiers);
+
+    /**
+     * 查询所有工具信息。
+     *
+     * @return 表示工具信息的 {@link List}{@code <}{@link ToolDo}{@code >}。
+     */
+    List<ToolDo> getAllTools();
 }
diff --git a/carver/plugins/tool-repository-postgresql/src/main/java/modelengine/jade/carver/tool/repository/pgsql/model/entity/ToolDo.java b/carver/plugins/tool-repository-postgresql/src/main/java/modelengine/jade/carver/tool/repository/pgsql/model/entity/ToolDo.java
@@ -14,6 +14,7 @@
 import modelengine.fel.tool.Tool;
 import modelengine.fitframework.serialization.ObjectSerializer;
 import modelengine.fitframework.util.MapUtils;
+import modelengine.fitframework.util.ObjectUtils;
 import modelengine.fitframework.util.StringUtils;
 
 import java.util.Collections;
@@ -31,6 +32,8 @@
 @AllArgsConstructor
 @NoArgsConstructor
 public class ToolDo {
+    public static final String SCHEMA_PARAMETERS_KEY = "parameters";
+    public static final String SCHEMA_DESCRIPTION_KEY = "description";
     /**
      * 表示工具的名字。
      */
@@ -114,13 +117,14 @@ public static ToolDo info2Do(String definitionGroupName, String groupName, Tool.
      * @return 领域类的 {@link Tool.Info}。
      */
     public static Tool.Info do2Info(ToolDo toolDo, ObjectSerializer serializer) {
+        Map<String, Object> schema = ObjectUtils.nullIf(json2obj(toolDo.getSchema(), serializer), new HashMap<>());
         return Tool.Info.custom()
                 .namespace("")
                 .name(toolDo.getName())
-                .description("")
-                .schema(json2obj(toolDo.getSchema(), serializer))
+                .description(ObjectUtils.cast(schema.getOrDefault(SCHEMA_DESCRIPTION_KEY, StringUtils.EMPTY)))
+                .schema(schema)
                 .runnables(upperKeys(json2obj(toolDo.getRunnables(), serializer)))
-                .parameters(new HashMap<>())
+                .parameters(ObjectUtils.cast(schema.getOrDefault(SCHEMA_PARAMETERS_KEY, new HashMap<>())))
                 .extensions(json2obj(toolDo.getExtensions(), serializer))
                 .uniqueName(toolDo.getUniqueName())
                 .version(toolDo.getVersion())
diff --git a/carver/plugins/tool-repository-postgresql/src/main/java/modelengine/jade/carver/tool/repository/pgsql/repository/ToolRepositoryInner.java b/carver/plugins/tool-repository-postgresql/src/main/java/modelengine/jade/carver/tool/repository/pgsql/repository/ToolRepositoryInner.java
@@ -152,4 +152,11 @@ public interface ToolRepositoryInner {
      * @return 表示工具详细信息列表的 {@link List}{@code <}{@link Tool.Info}{@code >}。
      */
     List<Tool.Info> getToolsByIdentifier(List<ToolIdentifier> toolIdentifiers);
+
+    /**
+     * 查询所有工具信息。
+     *
+     * @return 表示工具详细信息列表的 {@link List}{@code <}{@link Tool.Info}{@code >}。
+     */
+    List<Tool.Info> getAllTools();
 }
diff --git a/carver/plugins/tool-repository-postgresql/src/main/java/modelengine/jade/carver/tool/repository/pgsql/repository/support/DefaultToolRepositoryInner.java b/carver/plugins/tool-repository-postgresql/src/main/java/modelengine/jade/carver/tool/repository/pgsql/repository/support/DefaultToolRepositoryInner.java
@@ -160,4 +160,10 @@ public List<Tool.Info> getToolsByIdentifier(List<ToolIdentifier> toolIdentifiers
         List<ToolDo> toolDos = this.toolMapper.getToolsByIdentifier(toolIdentifiers);
         return toolDos.stream().map(toolDo -> ToolDo.do2Info(toolDo, this.serializer)).collect(Collectors.toList());
     }
+
+    @Override
+    public List<Tool.Info> getAllTools() {
+        List<ToolDo> toolDos = this.toolMapper.getAllTools();
+        return toolDos.stream().map(toolDo -> ToolDo.do2Info(toolDo, this.serializer)).collect(Collectors.toList());
+    }
 }
diff --git a/carver/plugins/tool-repository-postgresql/src/main/java/modelengine/jade/carver/tool/repository/pgsql/service/DefaultToolService.java b/carver/plugins/tool-repository-postgresql/src/main/java/modelengine/jade/carver/tool/repository/pgsql/service/DefaultToolService.java
@@ -12,6 +12,7 @@
 import modelengine.fel.tool.model.ListResult;
 import modelengine.fel.tool.model.entity.ToolIdentifier;
 import modelengine.fel.tool.model.transfer.ToolData;
+import modelengine.fel.tool.service.ToolChangedObserver;
 import modelengine.fitframework.annotation.Component;
 import modelengine.fitframework.annotation.Fitable;
 import modelengine.fitframework.exception.FitException;
@@ -38,16 +39,22 @@ public class DefaultToolService implements ToolService {
 
     private final ToolRepositoryInner toolRepo;
     private final DefinitionService definitionService;
+    private final ToolChangedObserver toolChangedObserver;
 
     /**
      * 通过持久层接口来初始化 {@link DefaultToolService} 的实例。
      *
      * @param toolRepo 表示持久层实例的 {@link ToolRepositoryInner}。
      * @param definitionService 表示定义服务的 {@link DefinitionService}。
+     * @param toolChangedObserver 表示工具变更监听服务的 {@link ToolChangedObserver}。
      */
-    public DefaultToolService(ToolRepositoryInner toolRepo, DefinitionService definitionService) {
+    public DefaultToolService(ToolRepositoryInner toolRepo, DefinitionService definitionService,
+            ToolChangedObserver toolChangedObserver) {
         this.toolRepo = toolRepo;
         this.definitionService = definitionService;
+        this.toolChangedObserver = toolChangedObserver;
+        List<Tool.Info> allTools = this.toolRepo.getAllTools();
+        allTools.forEach(this::onToolAdded);
     }
 
     @Override
@@ -57,6 +64,7 @@ public String addTool(ToolData toolData) {
         ToolData.transform(toolData);
         Tool.Info info = ToolData.convertToInfo(toolData);
         this.toolRepo.addTool(info);
+        this.onToolAdded(info);
         return toolData.getUniqueName();
     }
 
@@ -69,6 +77,7 @@ public void addTools(List<ToolData> toolDataList) {
                 .map(ToolData::convertToInfo)
                 .collect(Collectors.toList());
         this.toolRepo.addTools(infos);
+        infos.forEach(this::onToolAdded);
     }
 
     @Override
@@ -80,13 +89,15 @@ public void addTools(String definitionGroupName, String groupName, List<ToolData
                 .map(ToolData::convertToInfo)
                 .collect(Collectors.toList());
         this.toolRepo.addTools(definitionGroupName, groupName, infos);
+        infos.forEach(this::onToolAdded);
     }
 
     @Override
     @Fitable(id = FITABLE_ID)
     @Transactional
     public String deleteTool(String toolUniqueName) {
         this.toolRepo.deleteTool(toolUniqueName);
+        this.onToolRemoved(toolUniqueName);
         return toolUniqueName;
     }
 
@@ -95,36 +106,45 @@ public String deleteTool(String toolUniqueName) {
     @Transactional
     public void deleteTools(List<String> uniqueNames) {
         this.toolRepo.deleteTools(uniqueNames);
+        uniqueNames.forEach(this::onToolRemoved);
     }
 
     @Override
     @Fitable(id = FITABLE_ID)
     @Transactional
     public void deleteTools(String definitionGroupName, String groupName) {
-        this.toolRepo.deleteTools(definitionGroupName, groupName);
+        List<Tool.Info> tools = this.toolRepo.getTools(definitionGroupName, groupName);
+        List<String> uniqueNames = tools.stream().map(Tool.Info::uniqueName).toList();
+        this.deleteTools(uniqueNames);
     }
 
     @Override
     @Fitable(id = FITABLE_ID)
     @Transactional
     public void deleteToolsByDefinitionGroupName(String definitionGroupName) {
-        this.toolRepo.deleteTools(definitionGroupName);
+        List<Tool.Info> tools = this.toolRepo.getTools(definitionGroupName);
+        List<String> uniqueNames = tools.stream().map(Tool.Info::uniqueName).toList();
+        this.deleteTools(uniqueNames);
     }
 
     @Override
     @Fitable(id = FITABLE_ID)
     @Transactional
     public String deleteToolByVersion(String uniqueName, String version) {
         this.toolRepo.deleteToolByVersion(uniqueName, version);
+        this.onToolRemoved(uniqueName);
         return uniqueName;
     }
 
     private void setLatest(String toolUniqueName, String version) {
         this.toolRepo.setLatest(toolUniqueName, version);
+        Optional<Tool.Info> info = this.toolRepo.getToolByVersion(toolUniqueName, version);
+        info.ifPresent(this::onToolAdded);
     }
 
     private void setNotLatest(String toolUniqueName) {
         this.toolRepo.setNotLatest(toolUniqueName);
+        this.onToolRemoved(toolUniqueName);
     }
 
     @Override
@@ -219,4 +239,18 @@ public ListResult<ToolData> getToolsByIdentifier(List<ToolIdentifier> toolIdenti
     private List<ToolData> getToolDataList(List<Tool.Info> infos) {
         return infos.stream().map(ToolData::from).map(ToolData::transform).collect(Collectors.toList());
     }
+
+    private void onToolAdded(Tool.Info toolInfo) {
+        if (this.toolChangedObserver == null) {
+            return;
+        }
+        this.toolChangedObserver.onToolAdded(toolInfo.uniqueName(), toolInfo.description(), toolInfo.parameters());
+    }
+
+    private void onToolRemoved(String toolUniqueName) {
+        if (this.toolChangedObserver == null) {
+            return;
+        }
+        this.toolChangedObserver.onToolRemoved(toolUniqueName);
+    }
 }
diff --git a/carver/plugins/tool-repository-postgresql/src/main/resources/mapper/ToolMapper.xml b/carver/plugins/tool-repository-postgresql/src/main/resources/mapper/ToolMapper.xml
@@ -166,4 +166,7 @@
             (i."unique_name" = #{toolIdentifier.uniqueName} AND i."version" = #{toolIdentifier.version})
         </foreach>
     </select>
+    <select id="getAllTools" parameterType="List" resultMap="Tool">
+        <include refid="selectToolColumns"/>
+    </select>
 </mapper>
diff --git a/carver/plugins/tool-repository-postgresql/src/test/java/modelengine/jade/carver/tool/repository/pgsql/integration/DefinitionGroupIntegrationTest.java b/carver/plugins/tool-repository-postgresql/src/test/java/modelengine/jade/carver/tool/repository/pgsql/integration/DefinitionGroupIntegrationTest.java
@@ -10,8 +10,10 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import modelengine.fel.tool.model.transfer.DefinitionGroupData;
+import modelengine.fel.tool.service.ToolChangedObserver;
 import modelengine.fitframework.annotation.Fit;
 import modelengine.fitframework.test.annotation.IntegrationTest;
+import modelengine.fitframework.test.annotation.Mock;
 import modelengine.fitframework.test.annotation.Spy;
 import modelengine.fitframework.test.annotation.Sql;
 import modelengine.jade.carver.tool.repository.pgsql.mapper.DefinitionMapper;
@@ -33,7 +35,7 @@
  * @since 2024-10-31
  */
 @IntegrationTest(scanPackages = "modelengine.jade.carver.tool")
-@Sql(before = {"sql/create/definition.sql", "sql/create/definition-group.sql"})
+@Sql(before = {"sql/create/definition.sql", "sql/create/definition-group.sql", "sql/create/tool.sql"})
 @DisplayName("Definition group 集成测试")
 public class DefinitionGroupIntegrationTest {
     private static final String GROUP_NAME1 = "depth-estimation-definition-group-name";
@@ -44,6 +46,9 @@ public class DefinitionGroupIntegrationTest {
     @Spy
     private DefinitionMapper definitionMapper;
 
+    @Mock
+    private ToolChangedObserver toolChangedObserver;
+
     @Test
     @Sql(before = {"sql/create/definition.sql", "sql/create/definition-group.sql"})
     @DisplayName("测试插入工具定义组")
diff --git a/carver/plugins/tool-repository-postgresql/src/test/java/modelengine/jade/carver/tool/repository/pgsql/integration/DefinitionIntegrationTest.java b/carver/plugins/tool-repository-postgresql/src/test/java/modelengine/jade/carver/tool/repository/pgsql/integration/DefinitionIntegrationTest.java
@@ -9,8 +9,10 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import modelengine.fel.tool.model.transfer.DefinitionData;
+import modelengine.fel.tool.service.ToolChangedObserver;
 import modelengine.fitframework.annotation.Fit;
 import modelengine.fitframework.test.annotation.IntegrationTest;
+import modelengine.fitframework.test.annotation.Mock;
 import modelengine.fitframework.test.annotation.Spy;
 import modelengine.fitframework.test.annotation.Sql;
 import modelengine.jade.carver.tool.repository.pgsql.ToolDataBuilder;
@@ -43,6 +45,9 @@ public class DefinitionIntegrationTest {
     @Spy
     private DefinitionMapper definitionMapper;
 
+    @Mock
+    private ToolChangedObserver toolChangedObserver;
+
     @Test
     @Sql(before = {"sql/create/definition.sql", "sql/create/tool.sql"})
     @DisplayName("测试插入工具定义")
diff --git a/carver/plugins/tool-repository-postgresql/src/test/java/modelengine/jade/carver/tool/repository/pgsql/integration/ToolGroupIntegrationTest.java b/carver/plugins/tool-repository-postgresql/src/test/java/modelengine/jade/carver/tool/repository/pgsql/integration/ToolGroupIntegrationTest.java
@@ -12,9 +12,11 @@
 
 import modelengine.fel.tool.model.transfer.DefinitionData;
 import modelengine.fel.tool.model.transfer.ToolGroupData;
+import modelengine.fel.tool.service.ToolChangedObserver;
 import modelengine.fitframework.annotation.Fit;
 import modelengine.fitframework.serialization.ObjectSerializer;
 import modelengine.fitframework.test.annotation.IntegrationTest;
+import modelengine.fitframework.test.annotation.Mock;
 import modelengine.fitframework.test.annotation.Spy;
 import modelengine.fitframework.test.annotation.Sql;
 import modelengine.jade.carver.tool.repository.pgsql.ToolDataBuilder;
@@ -64,6 +66,9 @@ public class ToolGroupIntegrationTest {
     @Fit(alias = "json")
     private ObjectSerializer serializer;
 
+    @Mock
+    private ToolChangedObserver toolChangedObserver;
+
     private void mockDefinitionInfo() {
         DefinitionData definitionData = ToolDataBuilder.mockDefinitionData();
         this.definitionService.delete(definitionData.getGroupName(), definitionData.getName());
diff --git a/carver/plugins/tool-repository-postgresql/src/test/java/modelengine/jade/carver/tool/repository/pgsql/integration/ToolIntegrationTest.java b/carver/plugins/tool-repository-postgresql/src/test/java/modelengine/jade/carver/tool/repository/pgsql/integration/ToolIntegrationTest.java
@@ -15,9 +15,11 @@
 import modelengine.fel.tool.model.entity.ToolIdentifier;
 import modelengine.fel.tool.model.transfer.DefinitionData;
 import modelengine.fel.tool.model.transfer.ToolData;
+import modelengine.fel.tool.service.ToolChangedObserver;
 import modelengine.fitframework.annotation.Fit;
 import modelengine.fitframework.serialization.ObjectSerializer;
 import modelengine.fitframework.test.annotation.IntegrationTest;
+import modelengine.fitframework.test.annotation.Mock;
 import modelengine.fitframework.test.annotation.Spy;
 import modelengine.fitframework.test.annotation.Sql;
 import modelengine.jade.carver.tool.repository.pgsql.ToolDataBuilder;
@@ -64,6 +66,9 @@ public class ToolIntegrationTest {
     @Fit(alias = "json")
     private ObjectSerializer serializer;
 
+    @Mock
+    private ToolChangedObserver toolChangedObserver;
+
     private void mockDefinitionInfo() {
         DefinitionData definitionData = ToolDataBuilder.mockDefinitionData();
         this.definitionService.delete(definitionData.getGroupName(), definitionData.getName());
diff --git a/carver/plugins/tool-repository-postgresql/src/test/java/modelengine/jade/carver/tool/repository/pgsql/service/DefaultToolServiceTest.java b/carver/plugins/tool-repository-postgresql/src/test/java/modelengine/jade/carver/tool/repository/pgsql/service/DefaultToolServiceTest.java
@@ -12,6 +12,7 @@
 import static org.mockito.Mockito.verify;
 
 import modelengine.fel.tool.model.transfer.ToolData;
+import modelengine.fel.tool.service.ToolChangedObserver;
 import modelengine.fit.serialization.json.jackson.JacksonObjectSerializer;
 import modelengine.fitframework.serialization.ObjectSerializer;
 import modelengine.jade.carver.tool.repository.pgsql.model.entity.ToolDo;
@@ -48,6 +49,9 @@ public class DefaultToolServiceTest {
     @Mock
     private ToolRepositoryInner toolRepositoryInner;
 
+    @Mock
+    private ToolChangedObserver toolChangedObserver;
+
     @BeforeEach
     void setUp() {
         MockitoAnnotations.openMocks(this);
@@ -64,8 +68,9 @@ private ToolData mockToolData() {
         toolData.setLatest(true);
         toolData.setRunnables(new HashMap<>());
         toolData.setExtensions(new HashMap<>());
-        toolData.setUniqueName("uniqueName");
+        toolData.setUniqueName("testUniqueName");
         toolData.setVersion("1.0.0");
+        toolData.setDescription("description");
         return toolData;
     }
 
@@ -88,16 +93,24 @@ private ToolDo mockToolDo() {
     @DisplayName("验证插入工具成功")
     void shouldSuccessWhenAddTool() {
         ToolData toolData = mockToolData();
+
         this.toolService.addTools(Collections.singletonList(toolData));
-        verify(toolRepositoryInner).addTools(Mockito.anyList());
+
+        verify(this.toolRepositoryInner).addTools(Mockito.anyList());
+        verify(this.toolChangedObserver).onToolAdded(toolData.getUniqueName(),
+                toolData.getDescription(),
+                toolData.getParameters());
     }
 
     @Test
     @DisplayName("验证删除工具列表成功")
     void shouldSuccessWhenDeleteTool() {
-        List<String> uniqueNames = new ArrayList<>();
+        List<String> uniqueNames = Collections.singletonList("tool1");
+
         this.toolService.deleteTools(uniqueNames);
+
         verify(toolRepositoryInner).deleteTools(uniqueNames);
+        verify(this.toolChangedObserver).onToolRemoved(uniqueNames.get(0));
     }
 
     @Test
@@ -125,8 +138,6 @@ void shouldSuccessWhenGetToolByVersion() {
     @Test
     @DisplayName("验证升级工具成功")
     void shouldSuccessWhenUpgradeTool() {
-        String uniqueName = "testUniqueName";
-        String version = "version";
         ToolDo toolDo = mockToolDo();
         ToolData toolData = this.mockToolData();
         Mockito.when(this.toolRepositoryInner.getTool(toolData.getUniqueName()))
@@ -135,6 +146,14 @@ void shouldSuccessWhenUpgradeTool() {
         Mockito.when(this.toolRepositoryInner.getToolByVersion(toolData.getUniqueName(), toolData.getVersion()))
                 .thenReturn(Optional.of(ToolDo.do2Info(toolDo, this.serializer)));
         doNothing().when(this.toolRepositoryInner).addTool(any());
-        assertThat(this.toolService.upgradeTool(toolData)).isEqualTo(toolData.getUniqueName());
+
+        String result = this.toolService.upgradeTool(toolData);
+
+        assertThat(result).isEqualTo(toolData.getUniqueName());
+        assertThat(toolData.getUniqueName()).isEqualTo(toolData.getUniqueName());
+        verify(this.toolChangedObserver).onToolRemoved(toolData.getUniqueName());
+        verify(this.toolChangedObserver).onToolAdded(toolData.getUniqueName(),
+                toolData.getDescription(),
+                toolData.getParameters());
     }
 }
diff --git a/store/plugins/store-repository-postgresql/src/main/resources/sql/data/tr_init_tools.sql b/store/plugins/store-repository-postgresql/src/main/resources/sql/data/tr_init_tools.sql

Original file line number	Diff line number	Diff line change
`@@ -160,4 +160,10 @@ public List<Tool.Info> getToolsByIdentifier(List<ToolIdentifier> toolIdentifiers`
`160`	`160`	`List<ToolDo> toolDos = this.toolMapper.getToolsByIdentifier(toolIdentifiers);`
`161`	`161`	`return toolDos.stream().map(toolDo -> ToolDo.do2Info(toolDo, this.serializer)).collect(Collectors.toList());`
`162`	`162`	`}`
	`163`	`+`
	`164`	`+ @Override`
	`165`	`+ public List<Tool.Info> getAllTools() {`
	`166`	`+ List<ToolDo> toolDos = this.toolMapper.getAllTools();`
	`167`	`+ return toolDos.stream().map(toolDo -> ToolDo.do2Info(toolDo, this.serializer)).collect(Collectors.toList());`
	`168`	`+ }`
`163`	`169`	`}`