[app-builder] provide sync entry for store app (#348)

* [app-builder] add AppSyncInvokerService

* [app-builder] apply AppSyncInvokerService to invoke the store app

* [app-builder] apply ToolExecuteService to the agent

* [app-builder] apply ToolExecuteService to the loop node plugin

* [app-builder] apply ToolExecuteService to the parallel node plugin

* [app-builder] improve store app timeout config name

* [app-builder] improve app identifier naming

* [app-builder] polish code

Author: loveTsong

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

@@ -0,0 +1,24 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) 2025 Huawei Technologies Co., Ltd. All rights reserved.
+ *  This file is a part of the ModelEngine Project.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+package modelengine.fit.jober.aipp.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+/**
+ * 应用标识信息。
+ *
+ * @author 宋永坦
+ * @since 2025-07-24
+ */
+@Data
+@AllArgsConstructor
+public class AppIdentifier {
+    private String tenantId;
+    private String aippId;
+    private String version;
+}

app-builder/jane/plugins/aipp-plugin/src/main/java/modelengine/fit/jober/aipp/fel/FelComponentConfig.java

@@ -10,14 +10,14 @@
 import modelengine.fel.core.chat.Prompt;
 import modelengine.fel.engine.operators.patterns.AbstractAgent;
 import modelengine.fel.tool.mcp.client.McpClientFactory;
-import modelengine.fit.jade.tool.SyncToolCall;
+import modelengine.fel.tool.service.ToolExecuteService;
 import modelengine.fit.jober.aipp.constants.AippConst;
 import modelengine.fitframework.annotation.Bean;
 import modelengine.fitframework.annotation.Component;
 import modelengine.fitframework.annotation.Fit;
 
 /**
- * FelComponentConfig
+ * {@link AbstractAgent} 的实例提供器。
  *
  * @author 易文渊
  * @since 2024-04-23
@@ -27,14 +27,14 @@ public class FelComponentConfig {
     /**
      * 注入 WaterFlow 场景的 Agent。
      *
-     * @param syncToolCall 表示同步工具调用服务的 {@link SyncToolCall}。
+     * @param toolExecuteService 表示工具调用服务的 {@link ToolExecuteService}。
      * @param chatModel 表示模型流式服务的 {@link ChatModel}。
      * @param mcpClientFactory 表示大模型上下文客户端工厂的 {@link McpClientFactory}。
      * @return 返回 WaterFlow 场景的 Agent 服务的 {@link AbstractAgent}{@code <}{@link Prompt}{@code ,
      * }{@link Prompt}{@code >}。
      */
     @Bean(AippConst.WATER_FLOW_AGENT_BEAN)
-    public AbstractAgent getWaterFlowAgent(@Fit SyncToolCall syncToolCall, ChatModel chatModel, McpClientFactory mcpClientFactory) {
-        return new WaterFlowAgent(syncToolCall, chatModel, mcpClientFactory);
+    public AbstractAgent getWaterFlowAgent(@Fit ToolExecuteService toolExecuteService, ChatModel chatModel, McpClientFactory mcpClientFactory) {
+        return new WaterFlowAgent(toolExecuteService, chatModel, mcpClientFactory);
     }
 }

app-builder/jane/plugins/aipp-plugin/src/main/java/modelengine/fit/jober/aipp/fel/WaterFlowAgent.java

@@ -24,7 +24,7 @@
 import modelengine.fel.engine.operators.patterns.AbstractAgent;
 import modelengine.fel.tool.mcp.client.McpClient;
 import modelengine.fel.tool.mcp.client.McpClientFactory;
-import modelengine.fit.jade.tool.SyncToolCall;
+import modelengine.fel.tool.service.ToolExecuteService;
 import modelengine.fit.jober.aipp.common.exception.AippErrCode;
 import modelengine.fit.jober.aipp.common.exception.AippException;
 import modelengine.fit.jober.aipp.constants.AippConst;
@@ -53,20 +53,20 @@ public class WaterFlowAgent extends AbstractAgent {
     private static final String GOTO_NODE_ID = "ahead_llm_node";
 
     private final String agentMsgKey;
-    private final SyncToolCall syncToolCall;
+    private final ToolExecuteService toolExecuteService;
     private final McpClientFactory mcpClientFactory;
 
     /**
      * {@link WaterFlowAgent} 的构造方法。
      *
-     * @param syncToolCall 表示工具调用服务的 {@link SyncToolCall}。
+     * @param toolExecuteService 表示工具调用服务的 {@link ToolExecuteService}。
      * @param chatStreamModel 表示流式对话大模型的 {@link ChatModel}。
      * @param mcpClientFactory 表示大模型上下文客户端工厂的 {@link McpClientFactory}。
      */
-    public WaterFlowAgent(@Fit SyncToolCall syncToolCall, ChatModel chatStreamModel,
+    public WaterFlowAgent(@Fit ToolExecuteService toolExecuteService, ChatModel chatStreamModel,
             McpClientFactory mcpClientFactory) {
         super(new ChatFlowModel(chatStreamModel, null));
-        this.syncToolCall = Validation.notNull(syncToolCall, "The tool sync tool call cannot be null.");
+        this.toolExecuteService = Validation.notNull(toolExecuteService, "The tool execute service cannot be null.");
         this.mcpClientFactory = Validation.notNull(mcpClientFactory, "The mcp client factory cannot be null.");
         this.agentMsgKey = AGENT_MSG_KEY;
     }
@@ -145,7 +145,7 @@ private ChatMessage callTool(ToolCall toolCall, Map<String, ToolInfo> toolsMap,
                 throw new AippException(AippErrCode.CALL_MCP_SERVER_FAILED, exception.getMessage());
             }
         }
-        return new ToolMessage(toolCall.id(), this.syncToolCall.call(toolRealName, toolCall.arguments(), toolContext));
+        return new ToolMessage(toolCall.id(), this.toolExecuteService.execute(toolRealName, toolCall.arguments()));
     }
 
     private ChatMessages getAgentMsg(ChatMessage input, StateContext ctx) {

app-builder/jane/plugins/aipp-plugin/src/main/java/modelengine/fit/jober/aipp/fitable/WaterFlowInvoke.java

@@ -9,49 +9,67 @@
 import modelengine.fit.jane.common.entity.OperationContext;
 import modelengine.fit.jober.WaterFlowService;
 import modelengine.fit.jober.aipp.constants.AippConst;
-import modelengine.fit.jober.aipp.genericable.AippRunTimeService;
+import modelengine.fit.jober.aipp.dto.AppIdentifier;
+import modelengine.fit.jober.aipp.service.AppSyncInvokerService;
 import modelengine.fitframework.annotation.Component;
 import modelengine.fitframework.annotation.Fit;
 import modelengine.fitframework.annotation.Fitable;
+import modelengine.fitframework.annotation.Value;
+import modelengine.fitframework.inspection.Validation;
+import modelengine.fitframework.serialization.ObjectSerializer;
 import modelengine.fitframework.util.MapBuilder;
 import modelengine.fitframework.util.ObjectUtils;
 import modelengine.fitframework.util.StringUtils;
 
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
 /**
- * 工具流接口实现
+ * 注册到 store 中应用调用的入口实现.
  *
  * @author 李鑫
  * @since 2024/4/24
  */
 @Component
 public class WaterFlowInvoke implements WaterFlowService {
-    private final AippRunTimeService aippRunTimeService;
+    private final AppSyncInvokerService appSyncInvokerService;
+    private final ObjectSerializer objectSerializer;
+    private final long timeout;
 
-    public WaterFlowInvoke(@Fit AippRunTimeService aippRunTimeService) {
-        this.aippRunTimeService = aippRunTimeService;
+    /**
+     * 基于应用同步执行服务的构造方法。
+     *
+     * @param appSyncInvokerService 表示应用同步执行服务的 {@link AppSyncInvokerService}。
+     * @param objectSerializer 表示序列化器的 {@link ObjectSerializer}。
+     * @param timeout 表示执行超时时间（单位秒）的 {@code long}。
+     */
+    public WaterFlowInvoke(@Fit AppSyncInvokerService appSyncInvokerService,
+            @Fit(alias = "json") ObjectSerializer objectSerializer,
+            @Value("${app-engine.app.store.timeout:300}") long timeout) {
+        this.appSyncInvokerService = appSyncInvokerService;
+        this.objectSerializer = objectSerializer;
+        this.timeout = TimeUnit.SECONDS.toMillis(Validation.greaterThan(timeout, 0, "The timeout should > 0."));
     }
 
     @Override
     @Fitable(id = "water.flow.invoke")
     public String invoke(String tenantId, String aippId, String version, Map<String, Object> inputParams) {
-        Map<String, Object> initContext = this.buildInitContext(inputParams);
-        return this.aippRunTimeService.createAippInstance(aippId, version, initContext,
-                this.buildOperationContext(tenantId, initContext));
+        return this.objectSerializer.serialize(this.appSyncInvokerService.invoke(new AppIdentifier(tenantId,
+                        aippId,
+                        version),
+                this.buildInitContext(inputParams),
+                this.timeout,
+                this.buildOperationContext(tenantId, inputParams)));
     }
 
-    private OperationContext buildOperationContext(String tenantId, Map<String, Object> initContext) {
-        Map<String, Object> businessData = (Map<String, Object>) initContext.get(AippConst.BS_INIT_CONTEXT_KEY);
-        String userId = ObjectUtils.cast(businessData.getOrDefault(AippConst.CONTEXT_USER_ID, StringUtils.EMPTY));
+    private OperationContext buildOperationContext(String tenantId, Map<String, Object> inputParams) {
+        String userId = ObjectUtils.cast(inputParams.getOrDefault(AippConst.CONTEXT_USER_ID, StringUtils.EMPTY));
         OperationContext context = new OperationContext();
         context.setTenantId(tenantId);
         context.setOperator(userId);
-        context.setGlobalUserId(null);
-        context.setAccount("dmx000000");
-        context.setEmployeeNumber(null);
-        context.setName("大模型");
-        context.setOperatorIp("0:0:0:0:0:0:0:1");
+        context.setAccount(userId);
+        context.setName(userId);
+        context.setOperatorIp(StringUtils.EMPTY);
         context.setSourcePlatform(StringUtils.EMPTY);
         context.setLanguage(StringUtils.EMPTY);
         return context;

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

@@ -0,0 +1,26 @@
+package modelengine.fit.jober.aipp.service;
+
+import modelengine.fit.jane.common.entity.OperationContext;
+import modelengine.fit.jober.aipp.dto.AppIdentifier;
+
+import java.util.Map;
+
+/**
+ * 表示应用同步执行服务。
+ *
+ * @author 宋永坦
+ * @since 2025-07-24
+ */
+public interface AppSyncInvokerService {
+    /**
+     * 执行应用并获取结果。
+     *
+     * @param appIdentifier 表示应用标识的 {@link AppIdentifier}。
+     * @param initContext 表示应用启动参数的 {@link Map}{@code <}{@link String}{@code , }{@link Object}{@code >}。
+     * @param timeout 表示超时时间（单位秒）的 {@code long}。
+     * @param operationContext 表示操作上下文的 {@link OperationContext}。
+     * @return 表示应用返回结果。
+     */
+    Object invoke(AppIdentifier appIdentifier, Map<String, Object> initContext, long timeout,
+            OperationContext operationContext);
+}