Skip to content

Commit d3ecbee

Browse files
CodeCasterXCodeCasterX
committed
[app-platform] 使用 fel 的最新版本的 tool-service
1 parent 3cb237d commit d3ecbee

File tree

231 files changed

+762
-6030
lines changed

Some content is hidden

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

231 files changed

+762
-6030
lines changed

‎app-builder/fel/java/fel-core/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
<dependency>
3434
<groupId>org.fitframework.plugin</groupId>
3535
<artifactId>fit-message-serializer-json-jackson</artifactId>
36+
<version>3.5.0-M2.1</version>
3637
</dependency>
3738
<dependency>
3839
<groupId>org.junit.jupiter</groupId>

‎app-builder/fel/java/fel-core/src/main/java/modelengine/fel/core/tool/ToolInfo.java‎

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
/*---------------------------------------------------------------------------------------------
2-
* Copyright (c) 2025 Huawei Technologies Co., Ltd. All rights reserved.
3-
* This file is a part of the ModelEngine Project.
4-
* Licensed under the MIT License. See License.txt in the project root for license information.
5-
*--------------------------------------------------------------------------------------------*/
1+
/*
2+
* Copyright (c) 2024-2025 Huawei Technologies Co., Ltd. All rights reserved.
3+
* This file is a part of the ModelEngine Project.
4+
* Licensed under the MIT License. See License.txt in the project root for license information.
5+
*/
66

77
package modelengine.fel.core.tool;
88

@@ -15,7 +15,8 @@
1515
* 表示可调用工具的实体。
1616
*
1717
* @author 易文渊
18-
* @since 2024-4-8
18+
* @author 季聿阶
19+
* @since 2024-04-08
1920
*/
2021
public interface ToolInfo {
2122
/**
@@ -56,46 +57,46 @@ public interface ToolInfo {
5657
/**
5758
* {@link ToolInfo} 的构建器。
5859
*/
59-
interface Builder {
60+
interface Builder<B extends Builder<B>> {
6061
/**
6162
* 设置工具的命名空间。
6263
*
6364
* @param namespace 表示工具命名空间的 {@link String}。
64-
* @return 表示当前构建器的 {@link Builder}。
65+
* @return 表示当前构建器的 {@link B}。
6566
*/
66-
Builder namespace(String namespace);
67+
B namespace(String namespace);
6768

6869
/**
6970
* 设置工具的名称。
7071
*
7172
* @param name 表示工具名称的 {@link String}。
72-
* @return 表示当前构建器的 {@link Builder}。
73+
* @return 表示当前构建器的 {@link B}。
7374
*/
74-
Builder name(String name);
75+
B name(String name);
7576

7677
/**
7778
* 设置工具的描述。
7879
*
7980
* @param description 表示工具参数描述的 {@link String}。
80-
* @return 表示当前构建器的 {@link Builder}。
81+
* @return 表示当前构建器的 {@link B}。
8182
*/
82-
Builder description(String description);
83+
B description(String description);
8384

8485
/**
8586
* 设置工具的参数描述。
8687
*
8788
* @param parameters 表示工具参数描述的 {@link Map}{@code <}{@link String}{@code , }{@link Object}{@code >}。
88-
* @return 表示当前构建器的 {@link Builder}。
89+
* @return 表示当前构建器的 {@link B}。
8990
*/
90-
Builder parameters(Map<String, Object> parameters);
91+
B parameters(Map<String, Object> parameters);
9192

9293
/**
9394
* 设置工具的扩展属性。
9495
*
9596
* @param extensions 表示工具扩展属性的 {@link Map}{@code <}{@link String}{@code , }{@link Object}{@code >}。
96-
* @return 表示当前构建器的 {@link Builder}。
97+
* @return 表示当前构建器的 {@link B}。
9798
*/
98-
Builder extensions(Map<String, Object> extensions);
99+
B extensions(Map<String, Object> extensions);
99100

100101
/**
101102
* 构建对象。
@@ -110,7 +111,7 @@ interface Builder {
110111
*
111112
* @return 表示 {@link ToolInfo} 的构建器的 {@link Builder}。
112113
*/
113-
static Builder custom() {
114+
static Builder<?> custom() {
114115
return BuilderFactory.get(ToolInfo.class, Builder.class).create(null);
115116
}
116117

‎app-builder/fel/java/fel-flow/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
<dependency>
6060
<groupId>org.fitframework.plugin</groupId>
6161
<artifactId>fit-message-serializer-json-jackson</artifactId>
62+
<version>3.5.0-M2.1</version>
6263
<scope>test</scope>
6364
</dependency>
6465
</dependencies>

‎app-builder/fel/java/fel-pipeline-core/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
<dependency>
4040
<groupId>org.fitframework.plugin</groupId>
4141
<artifactId>fit-message-serializer-json-jackson</artifactId>
42+
<version>3.5.0-M2.1</version>
4243
<scope>test</scope>
4344
</dependency>
4445
<dependency>

‎app-builder/fel/java/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@
145145
<dependency>
146146
<groupId>org.fitframework.plugin</groupId>
147147
<artifactId>fit-message-serializer-json-jackson</artifactId>
148-
<version>${fit.version}</version>
148+
<version>3.5.0-M2.1</version>
149149
<scope>test</scope>
150150
</dependency>
151151
<dependency>

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@
149149
<dependency>
150150
<groupId>org.fitframework.plugin</groupId>
151151
<artifactId>fit-message-serializer-json-jackson</artifactId>
152-
<version>${fit.version}</version>
152+
<version>3.5.0-M2.1</version>
153153
<scope>test</scope>
154154
</dependency>
155155
<dependency>
@@ -181,8 +181,9 @@
181181
<artifactId>fit-schedule</artifactId>
182182
</dependency>
183183
<dependency>
184-
<groupId>modelengine.fit.jade.service</groupId>
184+
<groupId>org.fitframework.fel</groupId>
185185
<artifactId>tool-service</artifactId>
186+
<version>3.5.0-M2.1</version>
186187
</dependency>
187188
<dependency>
188189
<groupId>modelengine.fit.jade.service</groupId>
@@ -221,6 +222,11 @@
221222
<groupId>modelengine.jade.service</groupId>
222223
<artifactId>waterflow-appfactory-service</artifactId>
223224
</dependency>
225+
<dependency>
226+
<groupId>modelengine.fit.jade.service</groupId>
227+
<artifactId>common-service</artifactId>
228+
<version>1.0.0-SNAPSHOT</version>
229+
</dependency>
224230

225231
<!-- Test -->
226232
<dependency>

‎app-builder/jane/plugins/aipp-plugin/src/main/java/modelengine/fit/jober/aipp/dto/AppBuilderWaterFlowInfoDto.java‎

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

77
package modelengine.fit.jober.aipp.dto;
88

9-
import modelengine.jade.carver.tool.model.transfer.ToolData;
9+
import modelengine.fel.tool.model.transfer.ToolData;
1010

1111
import lombok.AllArgsConstructor;
1212
import lombok.Builder;

‎app-builder/jane/plugins/aipp-plugin/src/main/java/modelengine/fit/jober/aipp/dto/ToolModelDto.java‎

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

77
package modelengine.fit.jober.aipp.dto;
88

9-
import modelengine.jade.carver.tool.model.transfer.ToolData;
9+
import modelengine.fel.tool.model.transfer.ToolData;
1010
import modelengine.jade.store.entity.transfer.PluginToolData;
1111

1212
import lombok.AllArgsConstructor;

‎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
@@ -70,7 +70,7 @@
7070
import modelengine.fitframework.util.MapBuilder;
7171
import modelengine.fitframework.util.ObjectUtils;
7272
import modelengine.fitframework.util.StringUtils;
73-
import modelengine.jade.carver.tool.service.ToolService;
73+
import modelengine.fel.tool.service.ToolService;
7474
import modelengine.jade.store.entity.transfer.AppData;
7575
import modelengine.jade.store.entity.transfer.AppPublishData;
7676
import modelengine.jade.store.entity.transfer.PluginData;

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

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,11 @@
66

77
package modelengine.fit.jober.aipp.service.impl;
88

9-
import static modelengine.jade.common.Result.calculateOffset;
109
import static modelengine.fit.jober.aipp.enums.ToolCategoryEnum.HUGGINGFACE;
1110
import static modelengine.fit.jober.aipp.init.serialization.AippComponentInitiator.COMPONENT_DATA;
11+
import static modelengine.jade.common.Result.calculateOffset;
1212

13-
import modelengine.jade.common.locale.LocaleUtil;
14-
import modelengine.jade.store.entity.query.ModelQuery;
15-
import modelengine.jade.store.entity.query.PluginToolQuery;
16-
import modelengine.jade.store.entity.transfer.PluginToolData;
17-
import modelengine.jade.store.entity.transfer.TaskData;
18-
import modelengine.jade.store.service.EcoTaskService;
19-
import modelengine.jade.store.service.HuggingFaceModelService;
20-
import modelengine.jade.store.service.PluginToolService;
21-
22-
import modelengine.jade.carver.ListResult;
23-
import modelengine.jade.carver.tool.model.transfer.ToolData;
13+
import modelengine.fel.tool.model.transfer.ToolData;
2414
import modelengine.fit.jane.common.entity.OperationContext;
2515
import modelengine.fit.jober.aipp.constants.AippConst;
2616
import modelengine.fit.jober.aipp.dto.AppBuilderWaterFlowInfoDto;
@@ -43,6 +33,15 @@
4333
import modelengine.fitframework.util.MapUtils;
4434
import modelengine.fitframework.util.ObjectUtils;
4535
import modelengine.fitframework.util.StringUtils;
36+
import modelengine.jade.carver.ListResult;
37+
import modelengine.jade.common.locale.LocaleUtil;
38+
import modelengine.jade.store.entity.query.ModelQuery;
39+
import modelengine.jade.store.entity.query.PluginToolQuery;
40+
import modelengine.jade.store.entity.transfer.PluginToolData;
41+
import modelengine.jade.store.entity.transfer.TaskData;
42+
import modelengine.jade.store.service.EcoTaskService;
43+
import modelengine.jade.store.service.HuggingFaceModelService;
44+
import modelengine.jade.store.service.PluginToolService;
4645

4746
import java.util.ArrayList;
4847
import java.util.Collections;
@@ -136,9 +135,10 @@ private List<ToolModelDto> getToolModelList(String tag, String mode, int pageNum
136135
return this.buildToolNodesConfig(tag, mode, pageNum, pageSize, version)
137136
.getData()
138137
.stream()
139-
.map(toolData -> ToolModelDto.combine2ToolModelDto(toolData, tag.equalsIgnoreCase(HUGGINGFACE.getName())
140-
? getDefaultModel(toolData, tag)
141-
: StringUtils.EMPTY))
138+
.map(toolData -> ToolModelDto.combine2ToolModelDto(toolData,
139+
tag.equalsIgnoreCase(HUGGINGFACE.getName())
140+
? getDefaultModel(toolData, tag)
141+
: StringUtils.EMPTY))
142142
.collect(Collectors.toList());
143143
}
144144

@@ -197,27 +197,28 @@ private List<StoreNodeInfoDto> buildNodesConfig(String type) {
197197
private void setUniqueName(List<StoreNodeInfoDto> nodeList) {
198198
nodeList.stream()
199199
.filter(nodeInfoDto -> this.tags.containsValue(nodeInfoDto.getType()))
200-
.forEach(nodeInfoDto -> nodeInfoDto.setUniqueName(
201-
uniqueNames.get().getOrDefault(nodeInfoDto.getType(), StringUtils.EMPTY)));
200+
.forEach(nodeInfoDto -> nodeInfoDto.setUniqueName(uniqueNames.get()
201+
.getOrDefault(nodeInfoDto.getType(), StringUtils.EMPTY)));
202202
}
203203

204204
@Override
205205
public List<AppBuilderWaterFlowInfoDto> getWaterFlowInfos(String mode, int pageNum, int pageSize, String version) {
206-
List<PluginToolData> waterFlows = this.buildToolNodesConfig(AppCategory.WATER_FLOW.getTag(), mode, pageNum,
207-
pageSize, version).getData();
206+
List<PluginToolData> waterFlows =
207+
this.buildToolNodesConfig(AppCategory.WATER_FLOW.getTag(), mode, pageNum, pageSize, version).getData();
208208
List<String> storeIds = waterFlows.stream().map(ToolData::getUniqueName).collect(Collectors.toList());
209209
if (storeIds.isEmpty()) {
210210
return Collections.emptyList();
211211
}
212212
List<AppBuilderAppPo> appInfos = appBuilderAppMapper.selectWithStoreId(storeIds);
213213
Map<String, StoreWaterFlowDto> appInfoMap = appInfos.stream()
214-
.collect(
215-
Collectors.toMap(info -> JsonUtils.parseObject(info.getAttributes()).get("store_id").toString(),
216-
info -> StoreWaterFlowDto.builder()
217-
.version(info.getVersion())
218-
.id(info.getId())
219-
.tenantId(info.getTenantId())
220-
.build()));
214+
.collect(Collectors.toMap(info -> JsonUtils.parseObject(info.getAttributes())
215+
.get("store_id")
216+
.toString(),
217+
info -> StoreWaterFlowDto.builder()
218+
.version(info.getVersion())
219+
.id(info.getId())
220+
.tenantId(info.getTenantId())
221+
.build()));
221222
return waterFlows.stream()
222223
.map(waterFlow -> buildWaterFlowInfo(waterFlow, appInfoMap))
223224
.collect(Collectors.toList());

0 commit comments

Comments
 (0)