[appBuilder] 实现新版的 ToolRepository 接口，迁移部分内部接口到 store-service

app-builder/jane/plugins/aipp-plugin/pom.xml

@@ -180,11 +180,6 @@
             <groupId>org.fitframework.extension</groupId>
             <artifactId>fit-schedule</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.fitframework.fel</groupId>
-            <artifactId>tool-service</artifactId>
-            <version>3.5.0-M2.1</version>
-        </dependency>
         <dependency>
             <groupId>modelengine.fit.jade.service</groupId>
             <artifactId>store-service</artifactId>

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

@@ -70,13 +70,13 @@
 import modelengine.fitframework.util.MapBuilder;
 import modelengine.fitframework.util.ObjectUtils;
 import modelengine.fitframework.util.StringUtils;
-import modelengine.fel.tool.service.ToolService;
 import modelengine.jade.store.entity.transfer.AppData;
 import modelengine.jade.store.entity.transfer.AppPublishData;
 import modelengine.jade.store.entity.transfer.PluginData;
 import modelengine.jade.store.entity.transfer.PluginToolData;
 import modelengine.jade.store.service.AppService;
 import modelengine.jade.store.service.PluginService;
+import modelengine.jade.store.service.ToolService;
 import modelengine.jade.store.service.support.DeployStatus;
 
 import java.time.LocalDateTime;

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

@@ -58,9 +58,9 @@
 import modelengine.fitframework.util.MapBuilder;
 import modelengine.fitframework.util.ObjectUtils;
 import modelengine.fitframework.util.StringUtils;
-import modelengine.fel.tool.service.ToolService;
 import modelengine.jade.store.entity.transfer.PluginData;
 import modelengine.jade.store.service.AppService;
+import modelengine.jade.store.service.ToolService;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;

app-builder/plugins/aipp-document-extract-node/pom.xml

@@ -19,9 +19,8 @@
             <artifactId>aipp-service</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.fitframework.fel</groupId>
-            <artifactId>tool-service</artifactId>
-            <version>3.5.0-M2.1</version>
+            <groupId>modelengine.fit.jade.service</groupId>
+            <artifactId>store-service</artifactId>
         </dependency>
         <dependency>
             <groupId>modelengine.fit.jade.fel</groupId>

app-builder/plugins/aipp-document-extract-node/src/main/java/modelengine/fit/jade/aipp/document/extractor/TextExtractor.java

@@ -10,12 +10,12 @@
 
 import modelengine.fel.tool.model.transfer.ToolData;
 import modelengine.fel.tool.service.ToolExecuteService;
-import modelengine.fel.tool.service.ToolService;
 import modelengine.fit.jober.aipp.service.OperatorService.FileType;
 import modelengine.fitframework.annotation.Component;
 import modelengine.fitframework.util.CollectionUtils;
 import modelengine.fitframework.util.MapBuilder;
 import modelengine.jade.common.exception.ModelEngineException;
+import modelengine.jade.store.service.ToolService;
 
 import java.util.List;
 import java.util.Map;

app-builder/plugins/aipp-document-extract-node/src/test/java/modelengine/fit/jade/aipp/document/extractor/ExtractorTest.java

@@ -15,7 +15,7 @@
 
 import modelengine.fel.tool.model.transfer.ToolData;
 import modelengine.fel.tool.service.ToolExecuteService;
-import modelengine.fel.tool.service.ToolService;
+import modelengine.jade.store.service.ToolService;
 import modelengine.jade.voice.service.VoiceService;
 
 import modelengine.fel.core.chat.ChatMessage;

app-builder/plugins/tool-waterflow/pom.xml

@@ -28,11 +28,6 @@
         </dependency>
 
         <!-- Services -->
-        <dependency>
-            <groupId>org.fitframework.fel</groupId>
-            <artifactId>tool-service</artifactId>
-            <version>3.5.0-M2.1</version>
-        </dependency>
         <dependency>
             <groupId>modelengine.fit.jade.service</groupId>
             <artifactId>store-service</artifactId>

app-builder/plugins/tool-waterflow/src/main/java/modelengine/jade/carver/tool/waterflow/WaterFlowToolProvider.java

@@ -12,7 +12,6 @@
 import modelengine.fel.core.tool.ToolInfo;
 import modelengine.fel.core.tool.ToolProvider;
 import modelengine.fel.tool.model.transfer.ToolData;
-import modelengine.fel.tool.service.ToolService;
 import modelengine.fit.jade.tool.SyncToolCall;
 import modelengine.fit.jober.aipp.constants.AippConst;
 import modelengine.fitframework.annotation.Component;
@@ -23,6 +22,7 @@
 import modelengine.fitframework.util.StringUtils;
 import modelengine.fitframework.util.UuidUtils;
 import modelengine.jade.carver.tool.waterflow.invoker.ToolInvoker;
+import modelengine.jade.store.service.ToolService;
 
 import java.util.List;
 import java.util.Map;

app-builder/plugins/tool-waterflow/src/test/java/modelengine/jade/carver/tool/waterflow/WaterFlowToolProviderTest.java

@@ -11,9 +11,9 @@
 import modelengine.fel.core.tool.ToolInfo;
 import modelengine.fel.tool.Tool;
 import modelengine.fel.tool.model.transfer.ToolData;
-import modelengine.fel.tool.service.ToolService;
 import modelengine.fitframework.util.MapBuilder;
 import modelengine.jade.carver.tool.waterflow.invoker.ToolInvoker;
+import modelengine.jade.store.service.ToolService;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;

app-eval/plugins/eval-task/pom.xml

@@ -41,9 +41,8 @@
             <artifactId>jade-common-service</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.fitframework.fel</groupId>
-            <artifactId>tool-service</artifactId>
-            <version>3.5.0-M2.1</version>
+            <groupId>modelengine.fit.jade.service</groupId>
+            <artifactId>store-service</artifactId>
         </dependency>
         <dependency>
             <groupId>modelengine.fit.jade.service</groupId>

app-eval/plugins/eval-task/src/main/java/modelengine/jade/app/engine/task/fitable/AlgorithmComponent.java

@@ -13,7 +13,6 @@
 
 import modelengine.fit.waterflow.spi.FlowableService;
 import modelengine.fel.tool.service.ToolExecuteService;
-import modelengine.fel.tool.service.ToolService;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -30,6 +29,7 @@
 import modelengine.jade.app.engine.task.exception.EvalTaskException;
 import modelengine.jade.app.engine.task.service.EvalAlgorithmService;
 import modelengine.jade.app.engine.task.service.EvalInstanceService;
+import modelengine.jade.store.service.ToolService;
 
 import java.util.Collections;
 import java.util.List;

app-eval/plugins/eval-task/src/test/java/modelengine/jade/app/engine/task/fitable/AlgorithmComponentTest.java

@@ -21,14 +21,14 @@
 import modelengine.jade.app.engine.task.service.EvalInstanceService;
 import modelengine.fel.tool.model.transfer.ToolData;
 import modelengine.fel.tool.service.ToolExecuteService;
-import modelengine.fel.tool.service.ToolService;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import modelengine.fitframework.annotation.Fit;
 import modelengine.fitframework.serialization.ObjectSerializer;
 import modelengine.fitframework.test.annotation.FitTestWithJunit;
 import modelengine.fitframework.util.ObjectUtils;
+import modelengine.jade.store.service.ToolService;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;

app-knowledge/plugins/knowledge-manager/pom.xml

@@ -38,6 +38,10 @@
             <groupId>modelengine.fit.jade.service</groupId>
             <artifactId>knowledge-service</artifactId>
         </dependency>
+        <dependency>
+            <groupId>modelengine.fit.jade.service</groupId>
+            <artifactId>store-service</artifactId>
+        </dependency>
 
         <!-- Lombok -->
         <dependency>

app-knowledge/plugins/knowledge-manager/src/main/java/modelengine/jade/knowledge/controller/KnowledgeController.java

@@ -16,7 +16,6 @@
 import modelengine.fit.jane.task.gateway.Authenticator;
 import modelengine.fitframework.annotation.Component;
 import modelengine.fitframework.validation.Validated;
-import modelengine.fel.tool.service.ToolGroupService;
 import modelengine.jade.common.vo.PageVo;
 import modelengine.jade.knowledge.KnowledgeCenterService;
 import modelengine.jade.knowledge.KnowledgeI18nInfo;
@@ -31,6 +30,7 @@
 import modelengine.jade.knowledge.dto.KnowledgeDto;
 import modelengine.jade.knowledge.enums.IndexType;
 import modelengine.jade.knowledge.router.KnowledgeServiceRouter;
+import modelengine.jade.store.service.ToolGroupService;
 
 import java.util.Arrays;
 import java.util.List;

app-knowledge/plugins/knowledge-manager/src/test/java/modelengine/jade/knowledge/KnowledgeControllerTest.java

@@ -18,7 +18,6 @@
 import modelengine.fitframework.util.ObjectUtils;
 import modelengine.fitframework.util.TypeUtils;
 import modelengine.jade.authentication.AuthenticationService;
-import modelengine.fel.tool.service.ToolGroupService;
 import modelengine.jade.common.filter.support.LoginFilter;
 import modelengine.jade.common.vo.PageVo;
 import modelengine.jade.knowledge.config.KnowledgeConfig;
@@ -28,6 +27,7 @@
 import modelengine.jade.knowledge.enums.IndexType;
 import modelengine.jade.knowledge.router.KnowledgeServiceRouter;
 import modelengine.jade.knowledge.support.FlatFilterConfig;
+import modelengine.jade.store.service.ToolGroupService;
 
 import org.assertj.core.api.Assertions;
 import org.assertj.core.groups.Tuple;

carver/plugins/tool-execution/pom.xml

@@ -29,9 +29,8 @@
             <version>${fit.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.fitframework.fel</groupId>
-            <artifactId>tool-service</artifactId>
-            <version>3.5.0-M2.1</version>
+            <groupId>modelengine.fit.jade.service</groupId>
+            <artifactId>store-service</artifactId>
         </dependency>
 
         <!-- Test -->

carver/plugins/tool-execution/src/main/java/modelengine/jade/carver/tool/execution/support/DefaultToolExecuteService.java

@@ -14,14 +14,14 @@
 import modelengine.fel.tool.ToolFactoryRepository;
 import modelengine.fel.tool.model.transfer.DefinitionData;
 import modelengine.fel.tool.model.transfer.ToolData;
-import modelengine.fel.tool.service.DefinitionService;
 import modelengine.fel.tool.service.ToolExecuteService;
-import modelengine.fel.tool.service.ToolService;
 import modelengine.fitframework.annotation.Component;
 import modelengine.fitframework.annotation.Fit;
 import modelengine.fitframework.annotation.Fitable;
 import modelengine.fitframework.serialization.ObjectSerializer;
 import modelengine.fitframework.util.StringUtils;
+import modelengine.jade.store.service.DefinitionService;
+import modelengine.jade.store.service.ToolService;
 
 import java.util.Map;
 import java.util.Optional;

carver/plugins/tool-execution/src/test/java/modelengine/jade/carver/tool/execution/support/DefaultToolExecuteServiceTest.java

@@ -17,10 +17,10 @@
 import modelengine.fel.tool.ToolFactoryRepository;
 import modelengine.fel.tool.model.transfer.DefinitionData;
 import modelengine.fel.tool.model.transfer.ToolData;
-import modelengine.fel.tool.service.DefinitionService;
-import modelengine.fel.tool.service.ToolService;
 import modelengine.fit.serialization.json.jackson.JacksonObjectSerializer;
 import modelengine.fitframework.util.MapBuilder;
+import modelengine.jade.store.service.DefinitionService;
+import modelengine.jade.store.service.ToolService;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;

carver/plugins/tool-repository-postgresql/pom.xml

@@ -45,9 +45,8 @@
             <version>1.0.0-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>org.fitframework.fel</groupId>
-            <artifactId>tool-service</artifactId>
-            <version>3.5.0-M2.1</version>
+            <groupId>modelengine.fit.jade.service</groupId>
+            <artifactId>store-service</artifactId>
         </dependency>
 
         <!-- MyBatis -->
@@ -110,7 +109,7 @@
                 <version>${fit.version}</version>
                 <configuration>
                     <category>user</category>
-                    <level>3</level>
+                    <level>1</level>
                 </configuration>
                 <executions>
                     <execution>

carver/plugins/tool-repository-postgresql/src/main/java/modelengine/jade/carver/tool/repository/pgsql/repository/ToolRepository.java → carver/plugins/tool-repository-postgresql/src/main/java/modelengine/jade/carver/tool/repository/pgsql/repository/ToolRepositoryInner.java

@@ -18,7 +18,7 @@
  * @author 王攀博
  * @since 2024-04-27
  */
-public interface ToolRepository {
+public interface ToolRepositoryInner {
     /**
      * 添加工具。
      *