Skip to content

Commit 8500c9f

Browse files
wuayeewuayee
andcommitted
[appBuilder] 实现新版的 ToolRepository 接口,迁移部分内部接口到 store-service (ModelEngine-Group#187)
Co-authored-by: wuayee <wuayee@noreply.gitcode.com>
1 parent 083768e commit 8500c9f

53 files changed

Lines changed: 781 additions & 240 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -180,11 +180,6 @@
180180
<groupId>org.fitframework.extension</groupId>
181181
<artifactId>fit-schedule</artifactId>
182182
</dependency>
183-
<dependency>
184-
<groupId>org.fitframework.fel</groupId>
185-
<artifactId>tool-service</artifactId>
186-
<version>3.5.0-M2.1</version>
187-
</dependency>
188183
<dependency>
189184
<groupId>modelengine.fit.jade.service</groupId>
190185
<artifactId>store-service</artifactId>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,13 @@
7878
import modelengine.fitframework.util.MapBuilder;
7979
import modelengine.fitframework.util.ObjectUtils;
8080
import modelengine.fitframework.util.StringUtils;
81-
import modelengine.fel.tool.service.ToolService;
8281
import modelengine.jade.store.entity.transfer.AppData;
8382
import modelengine.jade.store.entity.transfer.AppPublishData;
8483
import modelengine.jade.store.entity.transfer.PluginData;
8584
import modelengine.jade.store.entity.transfer.PluginToolData;
8685
import modelengine.jade.store.service.AppService;
8786
import modelengine.jade.store.service.PluginService;
87+
import modelengine.jade.store.service.ToolService;
8888
import modelengine.jade.store.service.support.DeployStatus;
8989

9090
import java.time.LocalDateTime;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@
6161
import modelengine.fitframework.util.MapBuilder;
6262
import modelengine.fitframework.util.ObjectUtils;
6363
import modelengine.fitframework.util.StringUtils;
64-
import modelengine.fel.tool.service.ToolService;
6564
import modelengine.jade.store.entity.transfer.PluginData;
6665
import modelengine.jade.store.service.AppService;
66+
import modelengine.jade.store.service.ToolService;
6767

6868
import org.junit.jupiter.api.Assertions;
6969
import org.junit.jupiter.api.BeforeEach;

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,8 @@
1919
<artifactId>aipp-service</artifactId>
2020
</dependency>
2121
<dependency>
22-
<groupId>org.fitframework.fel</groupId>
23-
<artifactId>tool-service</artifactId>
24-
<version>3.5.0-M2.1</version>
22+
<groupId>modelengine.fit.jade.service</groupId>
23+
<artifactId>store-service</artifactId>
2524
</dependency>
2625
<dependency>
2726
<groupId>modelengine.fit.jade.fel</groupId>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010

1111
import modelengine.fel.tool.model.transfer.ToolData;
1212
import modelengine.fel.tool.service.ToolExecuteService;
13-
import modelengine.fel.tool.service.ToolService;
1413
import modelengine.fit.jober.aipp.service.OperatorService.FileType;
1514
import modelengine.fitframework.annotation.Component;
1615
import modelengine.fitframework.util.CollectionUtils;
1716
import modelengine.fitframework.util.MapBuilder;
1817
import modelengine.jade.common.exception.ModelEngineException;
18+
import modelengine.jade.store.service.ToolService;
1919

2020
import java.util.List;
2121
import java.util.Map;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
import modelengine.fel.tool.model.transfer.ToolData;
1717
import modelengine.fel.tool.service.ToolExecuteService;
18-
import modelengine.fel.tool.service.ToolService;
18+
import modelengine.jade.store.service.ToolService;
1919
import modelengine.jade.voice.service.VoiceService;
2020

2121
import modelengine.fel.core.chat.ChatMessage;

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,6 @@
2828
</dependency>
2929

3030
<!-- Services -->
31-
<dependency>
32-
<groupId>org.fitframework.fel</groupId>
33-
<artifactId>tool-service</artifactId>
34-
<version>3.5.0-M2.1</version>
35-
</dependency>
3631
<dependency>
3732
<groupId>modelengine.fit.jade.service</groupId>
3833
<artifactId>store-service</artifactId>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import modelengine.fel.core.tool.ToolInfo;
1313
import modelengine.fel.core.tool.ToolProvider;
1414
import modelengine.fel.tool.model.transfer.ToolData;
15-
import modelengine.fel.tool.service.ToolService;
1615
import modelengine.fit.jade.tool.SyncToolCall;
1716
import modelengine.fit.jober.aipp.constants.AippConst;
1817
import modelengine.fitframework.annotation.Component;
@@ -23,6 +22,7 @@
2322
import modelengine.fitframework.util.StringUtils;
2423
import modelengine.fitframework.util.UuidUtils;
2524
import modelengine.jade.carver.tool.waterflow.invoker.ToolInvoker;
25+
import modelengine.jade.store.service.ToolService;
2626

2727
import java.util.List;
2828
import java.util.Map;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
import modelengine.fel.core.tool.ToolInfo;
1212
import modelengine.fel.tool.Tool;
1313
import modelengine.fel.tool.model.transfer.ToolData;
14-
import modelengine.fel.tool.service.ToolService;
1514
import modelengine.fitframework.util.MapBuilder;
1615
import modelengine.jade.carver.tool.waterflow.invoker.ToolInvoker;
16+
import modelengine.jade.store.service.ToolService;
1717

1818
import org.junit.jupiter.api.Assertions;
1919
import org.junit.jupiter.api.BeforeEach;

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,8 @@
4141
<artifactId>jade-common-service</artifactId>
4242
</dependency>
4343
<dependency>
44-
<groupId>org.fitframework.fel</groupId>
45-
<artifactId>tool-service</artifactId>
46-
<version>3.5.0-M2.1</version>
44+
<groupId>modelengine.fit.jade.service</groupId>
45+
<artifactId>store-service</artifactId>
4746
</dependency>
4847
<dependency>
4948
<groupId>modelengine.fit.jade.service</groupId>

0 commit comments

Comments
 (0)