Merge branch 'main' into h2

Author: co63oc

spring-ai-alibaba-graph-core/src/main/java/com/alibaba/cloud/ai/graph/executor/NodeExecutor.java

@@ -181,6 +181,13 @@ private Optional<Flux<GraphResponse<NodeOutput>>> getEmbedFlux(GraphRunnerContex
 						return lastGraphResponse;
 					}
 
+					if (response.getResult() == null) {
+						GraphResponse<NodeOutput> lastGraphResponse = GraphResponse
+								.of(new StreamingOutput("", context.getCurrentNodeId(), context.getOverallState()));
+						lastGraphResponseRef.set(lastGraphResponse);
+						return lastGraphResponse;
+					}
+
 					final var currentMessage = response.getResult().getOutput();
 
 					if (currentMessage.hasToolCalls()) {

spring-ai-alibaba-studio/spring-ai-alibaba-studio-server/docker/middleware/init/mysql/agentscope-schema.sql

@@ -449,3 +449,36 @@ INSERT INTO `model` (`workspace_id`,`icon`,`name`,`type`,`mode`,`model_id`,`prov
 INSERT INTO `model` (`workspace_id`,`icon`,`name`,`type`,`mode`,`model_id`,`provider`,`enable`,`tags`,`source`,`gmt_create`,`gmt_modified`,`creator`,`modifier`) VALUES ('1',null,'gte-rerank-v2','rerank','chat','gte-rerank-v2','Tongyi',1,null,'preset',now(),now(),null,null);
 
 INSERT INTO `model` (`workspace_id`,`icon`,`name`,`type`,`mode`,`model_id`,`provider`,`enable`,`tags`,`source`,`gmt_create`,`gmt_modified`,`creator`,`modifier`) VALUES ('1',null,'deepseek-r1','llm','chat','deepseek-r1','Tongyi',1,'reasoning','preset',now(),now(),null,null);
+
+/******************************************/
+/*   table = agent_schema                 */
+/******************************************/
+DROP TABLE IF EXISTS `agent_schema`;
+CREATE TABLE `agent_schema`
+(
+    `id`           BIGINT(20) UNSIGNED AUTO_INCREMENT NOT NULL COMMENT 'pk',
+    `agent_id`     VARCHAR(64)                                 DEFAULT NULL COMMENT 'agent id',
+    `workspace_id` VARCHAR(64)                        NOT NULL COMMENT 'workspace id',
+    `name`         VARCHAR(255)                       NOT NULL COMMENT 'agent name',
+    `description`  VARCHAR(4096)                               DEFAULT NULL COMMENT 'agent description',
+    `type`         VARCHAR(64)                        NOT NULL COMMENT 'agent type: ReactAgent, ParallelAgent, SequentialAgent, LLMRoutingAgent, LoopAgent',
+    `instruction`  TEXT                                        DEFAULT NULL COMMENT 'system instruction',
+    `input_keys`   TEXT                                        DEFAULT NULL COMMENT 'input keys JSON',
+    `output_key`   VARCHAR(255)                                DEFAULT NULL COMMENT 'output key',
+    `handle`       LONGTEXT                                    DEFAULT NULL COMMENT 'handle configuration JSON',
+    `sub_agents`   LONGTEXT                                    DEFAULT NULL COMMENT 'sub agents configuration JSON',
+    `yaml_schema`  LONGTEXT                                    DEFAULT NULL COMMENT 'generated YAML schema',
+    `status`       VARCHAR(64)                        NOT NULL DEFAULT 'DRAFT' COMMENT 'agent status: DRAFT, PUBLISHED, ARCHIVED',
+    `enabled`      TINYINT(4)                         NOT NULL DEFAULT 1 COMMENT 'enabled: 0-disabled, 1-enabled',
+    `gmt_create`   DATETIME                           NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    `gmt_modified` DATETIME                           NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    `creator`      VARCHAR(64)                        NOT NULL COMMENT 'creator uid',
+    `modifier`     VARCHAR(64)                        NOT NULL COMMENT 'modifier uid',
+    PRIMARY KEY (`id`),
+    UNIQUE KEY `uk_agent_id` (`agent_id`),
+    KEY `idx_workspace_type` (`workspace_id`, `type`),
+    KEY `idx_workspace_status` (`workspace_id`, `status`)
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 10000
+  DEFAULT CHARSET = utf8mb4
+    COMMENT ='agent schema info';

spring-ai-alibaba-studio/spring-ai-alibaba-studio-server/frontend/packages/main/.umirc.ts

@@ -147,6 +147,10 @@ export default defineConfig({
       path: '/setting/apiKeys',
       component: 'Setting/APIKeys',
     },
+    {
+      path: '/agent-schema',
+      component: 'AgentSchema/index',
+    },
   ],
   clickToComponent: {},
   tailwindcss: {},

spring-ai-alibaba-studio/spring-ai-alibaba-studio-server/frontend/packages/main/src/i18n/locales/zh-cn.json

@@ -1330,5 +1330,46 @@
   "main.pages.Knowledge.Detail.components.ChunkViewDrawer.index.close": "关闭",
   "main.pages.Login.components.Login.index.notSupportedAccountPasswordLogin": "暂不支持账号密码登录",
   "main.pages.Login.components.Login.index.otherWaysLogin": "或者",
-  "main.pages.Login.components.Login.index.useGithubLogin": "使用 GitHub 登录"
+  "main.pages.Login.components.Login.index.useGithubLogin": "使用 GitHub 登录",
+  "main.pages.AgentSchema.index.title": "Agent Schema 创建",
+  "main.pages.AgentSchema.index.subtitle": "通过配置 Agent Schema 快速创建和配置智能体",
+  "main.pages.AgentSchema.index.step1.title": "基本信息",
+  "main.pages.AgentSchema.index.step1.description": "配置智能体基本信息",
+  "main.pages.AgentSchema.index.step2.title": "模型配置",
+  "main.pages.AgentSchema.index.step2.description": "选择模型和参数",
+  "main.pages.AgentSchema.index.step3.title": "工具配置",
+  "main.pages.AgentSchema.index.step3.description": "配置智能体工具",
+  "main.pages.AgentSchema.index.step4.title": "完成创建",
+  "main.pages.AgentSchema.index.step4.description": "生成 Agent Schema",
+  "main.pages.AgentSchema.index.agentName": "智能体名称",
+  "main.pages.AgentSchema.index.agentNamePlaceholder": "请输入智能体名称",
+  "main.pages.AgentSchema.index.agentDescription": "智能体描述",
+  "main.pages.AgentSchema.index.agentDescriptionPlaceholder": "请描述智能体的功能和用途",
+  "main.pages.AgentSchema.index.selectModel": "选择模型",
+  "main.pages.AgentSchema.index.selectModelPlaceholder": "请选择模型",
+  "main.pages.AgentSchema.index.systemPrompt": "系统提示词",
+  "main.pages.AgentSchema.index.systemPromptPlaceholder": "请输入系统提示词，定义智能体的角色和行为",
+  "main.pages.AgentSchema.index.temperature": "温度值",
+  "main.pages.AgentSchema.index.maxTokens": "最大令牌数",
+  "main.pages.AgentSchema.index.selectTools": "选择工具",
+  "main.pages.AgentSchema.index.selectToolsPlaceholder": "请选择智能体需要的工具",
+  "main.pages.AgentSchema.index.toolDescription": "工具说明：",
+  "main.pages.AgentSchema.index.toolFileSearch": "文件搜索：智能体可以搜索和读取文件内容",
+  "main.pages.AgentSchema.index.toolCodeExecution": "代码执行：智能体可以执行代码片段",
+  "main.pages.AgentSchema.index.toolWebSearch": "网络搜索：智能体可以搜索网络信息",
+  "main.pages.AgentSchema.index.toolDatabaseQuery": "数据库查询：智能体可以查询数据库",
+  "main.pages.AgentSchema.index.toolApiCall": "API调用：智能体可以调用外部API",
+  "main.pages.AgentSchema.index.toolImageGeneration": "图像生成：智能体可以生成图像",
+  "main.pages.AgentSchema.index.toolDocumentProcessing": "文档处理：智能体可以处理各种文档格式",
+  "main.pages.AgentSchema.index.configPreview": "配置预览",
+  "main.pages.AgentSchema.index.schemaPreview": "Agent Schema 预览",
+  "main.pages.AgentSchema.index.configComplete": "配置完成！点击\"创建 Agent Schema\"按钮将生成并下载配置文件。",
+  "main.pages.AgentSchema.index.downloadDescription": "下载的文件可以导入到 Spring AI Alibaba 项目中使用。",
+  "main.pages.AgentSchema.index.backToHome": "返回首页",
+  "main.pages.AgentSchema.index.previousStep": "上一步",
+  "main.pages.AgentSchema.index.nextStep": "下一步",
+  "main.pages.AgentSchema.index.createSchema": "创建 Agent Schema",
+  "main.pages.AgentSchema.index.creating": "创建中...",
+  "main.pages.AgentSchema.index.createSuccess": "Agent Schema 创建成功！",
+  "main.pages.AgentSchema.index.createFailed": "创建失败，请重试"
 }