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

Co-authored-by: wuayee <[email protected]>

Author: wuayee

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>