refactor(ai-web): 使用输入节点代替inputSchema
将输入表单放在流程图中一起定义,方便统一参数的处理,不需要单独为输入表单的变量进行合并和操作
This commit is contained in:
@@ -89,7 +89,10 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.yomahub</groupId>
|
<groupId>com.yomahub</groupId>
|
||||||
<artifactId>liteflow-script-graaljs</artifactId>
|
<artifactId>liteflow-script-graaljs</artifactId>
|
||||||
<version>${liteflow.version}</version>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.yomahub</groupId>
|
||||||
|
<artifactId>liteflow-script-python</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
package com.lanyuanxiaoyao.service.ai.web.controller.task;
|
package com.lanyuanxiaoyao.service.ai.web.controller.task;
|
||||||
|
|
||||||
|
import cn.hutool.core.util.ObjectUtil;
|
||||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
import com.fasterxml.jackson.core.JsonProcessingException;
|
||||||
import com.fasterxml.jackson.core.type.TypeReference;
|
import com.fasterxml.jackson.core.type.TypeReference;
|
||||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||||
@@ -41,6 +42,12 @@ public class TaskTemplateController extends SimpleControllerSupport<FlowTaskTemp
|
|||||||
return AmisResponse.responseSuccess(mapper.readValue(template.getInputSchema(), Map.class));
|
return AmisResponse.responseSuccess(mapper.readValue(template.getInputSchema(), Map.class));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@GetMapping("flow_graph/{id}")
|
||||||
|
public AmisResponse<?> getFlowGraph(@PathVariable("id") Long id) throws JsonProcessingException {
|
||||||
|
var template = flowTaskTemplateService.detailOrThrow(id);
|
||||||
|
return AmisResponse.responseSuccess(mapper.readValue(template.getFlowGraph(), Map.class));
|
||||||
|
}
|
||||||
|
|
||||||
@PostMapping("update_flow_graph")
|
@PostMapping("update_flow_graph")
|
||||||
public AmisResponse<?> updateFlowGraph(@RequestBody UpdateGraphItem item) throws JsonProcessingException {
|
public AmisResponse<?> updateFlowGraph(@RequestBody UpdateGraphItem item) throws JsonProcessingException {
|
||||||
flowTaskTemplateService.updateFlowGraph(item.getId(), mapper.writeValueAsString(item.getGraph()));
|
flowTaskTemplateService.updateFlowGraph(item.getId(), mapper.writeValueAsString(item.getGraph()));
|
||||||
@@ -49,8 +56,7 @@ public class TaskTemplateController extends SimpleControllerSupport<FlowTaskTemp
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected SaveItemMapper<FlowTaskTemplate, SaveItem> saveItemMapper() {
|
protected SaveItemMapper<FlowTaskTemplate, SaveItem> saveItemMapper() {
|
||||||
var map = Mappers.getMapper(SaveItem.Mapper.class);
|
return Mappers.getMapper(SaveItem.Mapper.class);
|
||||||
return item -> map.from(item, mapper);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -69,15 +75,9 @@ public class TaskTemplateController extends SimpleControllerSupport<FlowTaskTemp
|
|||||||
private Long id;
|
private Long id;
|
||||||
private String name;
|
private String name;
|
||||||
private String description;
|
private String description;
|
||||||
private Map<String, Object> inputSchema;
|
|
||||||
|
|
||||||
@org.mapstruct.Mapper
|
@org.mapstruct.Mapper
|
||||||
public static abstract class Mapper {
|
public interface Mapper extends SaveItemMapper<FlowTaskTemplate, SaveItem> {
|
||||||
public abstract FlowTaskTemplate from(SaveItem saveItem, @Context ObjectMapper mapper) throws Exception;
|
|
||||||
|
|
||||||
protected String mapInputSchema(Map<String, Object> inputSchema, @Context ObjectMapper mapper) throws JsonProcessingException {
|
|
||||||
return mapper.writeValueAsString(inputSchema);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -105,6 +105,9 @@ public class TaskTemplateController extends SimpleControllerSupport<FlowTaskTemp
|
|||||||
public abstract DetailItem from(FlowTaskTemplate template, @Context ObjectMapper mapper) throws Exception;
|
public abstract DetailItem from(FlowTaskTemplate template, @Context ObjectMapper mapper) throws Exception;
|
||||||
|
|
||||||
public Map<String, Object> mapJson(String source, @Context ObjectMapper mapper) throws Exception {
|
public Map<String, Object> mapJson(String source, @Context ObjectMapper mapper) throws Exception {
|
||||||
|
if (ObjectUtil.isNull(source)) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
return mapper.readValue(source, new TypeReference<>() {
|
return mapper.readValue(source, new TypeReference<>() {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -47,11 +47,6 @@ public class FlowHelper {
|
|||||||
throw new RuntimeException(StrUtil.format("Target node variable not found: {}.{}", targetNodeId, targetVariableName));
|
throw new RuntimeException(StrUtil.format("Target node variable not found: {}.{}", targetNodeId, targetVariableName));
|
||||||
}
|
}
|
||||||
return targetNodeData.get(targetVariableName);
|
return targetNodeData.get(targetVariableName);
|
||||||
} else if (context.getInput().containsKey(expression)) {
|
|
||||||
if (!context.getInput().containsKey(expression)) {
|
|
||||||
throw new RuntimeException(StrUtil.format("Target variable not found in input {}", expression));
|
|
||||||
}
|
|
||||||
return context.getInput().get(expression);
|
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,12 +2,10 @@ package com.lanyuanxiaoyao.service.ai.web.engine.entity;
|
|||||||
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import org.eclipse.collections.api.factory.Maps;
|
import org.eclipse.collections.api.factory.Maps;
|
||||||
import org.eclipse.collections.api.map.ImmutableMap;
|
|
||||||
import org.eclipse.collections.api.map.MutableMap;
|
import org.eclipse.collections.api.map.MutableMap;
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
public class FlowContext {
|
public class FlowContext {
|
||||||
private ImmutableMap<String, Object> input = Maps.immutable.empty();
|
|
||||||
private MutableMap<String, MutableMap<String, Object>> data = Maps.mutable.<String, MutableMap<String, Object>>empty().asSynchronized();
|
private MutableMap<String, MutableMap<String, Object>> data = Maps.mutable.<String, MutableMap<String, Object>>empty().asSynchronized();
|
||||||
|
|
||||||
public MutableMap<String, Object> get(String key) {
|
public MutableMap<String, Object> get(String key) {
|
||||||
|
|||||||
@@ -0,0 +1,16 @@
|
|||||||
|
package com.lanyuanxiaoyao.service.ai.web.engine.node;
|
||||||
|
|
||||||
|
import com.lanyuanxiaoyao.service.ai.web.engine.FlowNodeRunner;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author lanyuanxiaoyao
|
||||||
|
* @version 20250711
|
||||||
|
*/
|
||||||
|
@Slf4j
|
||||||
|
public class InputNode extends FlowNodeRunner {
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
// 入参相关的内容在启动流程的时候已经注入了
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
package com.lanyuanxiaoyao.service.ai.web.entity.vo;
|
||||||
|
|
||||||
|
import com.lanyuanxiaoyao.service.ai.web.engine.entity.FlowEdge;
|
||||||
|
import com.lanyuanxiaoyao.service.ai.web.engine.entity.FlowNode;
|
||||||
|
import lombok.Data;
|
||||||
|
import org.eclipse.collections.api.map.MutableMap;
|
||||||
|
import org.eclipse.collections.api.set.ImmutableSet;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public class FlowGraphVo {
|
||||||
|
private ImmutableSet<FlowNode> nodes;
|
||||||
|
private ImmutableSet<FlowEdge> edges;
|
||||||
|
private MutableMap<String, MutableMap<String, Object>> data;
|
||||||
|
}
|
||||||
@@ -7,9 +7,7 @@ import com.lanyuanxiaoyao.service.ai.web.entity.context.FeedbackContext;
|
|||||||
import com.lanyuanxiaoyao.service.ai.web.repository.FeedbackRepository;
|
import com.lanyuanxiaoyao.service.ai.web.repository.FeedbackRepository;
|
||||||
import com.yomahub.liteflow.core.FlowExecutor;
|
import com.yomahub.liteflow.core.FlowExecutor;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.concurrent.TimeUnit;
|
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.scheduling.annotation.Scheduled;
|
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
@@ -24,7 +22,7 @@ import org.springframework.transaction.annotation.Transactional;
|
|||||||
this.executor = executor;
|
this.executor = executor;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Scheduled(initialDelay = 1, fixedDelay = 1, timeUnit = TimeUnit.MINUTES)
|
// @Scheduled(initialDelay = 1, fixedDelay = 1, timeUnit = TimeUnit.MINUTES)
|
||||||
public void analysis() {
|
public void analysis() {
|
||||||
List<Feedback> feedbacks = repository.findAll(
|
List<Feedback> feedbacks = repository.findAll(
|
||||||
builder -> builder
|
builder -> builder
|
||||||
|
|||||||
@@ -1,30 +1,29 @@
|
|||||||
package com.lanyuanxiaoyao.service.ai.web.service.task;
|
package com.lanyuanxiaoyao.service.ai.web.service.task;
|
||||||
|
|
||||||
import cn.hutool.core.util.IdUtil;
|
import cn.hutool.core.util.IdUtil;
|
||||||
|
import cn.hutool.core.util.ObjectUtil;
|
||||||
|
import cn.hutool.core.util.StrUtil;
|
||||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
import com.fasterxml.jackson.core.JsonProcessingException;
|
||||||
import com.fasterxml.jackson.core.type.TypeReference;
|
import com.fasterxml.jackson.core.type.TypeReference;
|
||||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||||
import com.lanyuanxiaoyao.service.ai.web.base.service.SimpleServiceSupport;
|
import com.lanyuanxiaoyao.service.ai.web.base.service.SimpleServiceSupport;
|
||||||
import com.lanyuanxiaoyao.service.ai.web.engine.FlowExecutor;
|
import com.lanyuanxiaoyao.service.ai.web.engine.FlowExecutor;
|
||||||
import com.lanyuanxiaoyao.service.ai.web.engine.entity.FlowContext;
|
import com.lanyuanxiaoyao.service.ai.web.engine.entity.FlowContext;
|
||||||
import com.lanyuanxiaoyao.service.ai.web.engine.entity.FlowEdge;
|
|
||||||
import com.lanyuanxiaoyao.service.ai.web.engine.entity.FlowGraph;
|
import com.lanyuanxiaoyao.service.ai.web.engine.entity.FlowGraph;
|
||||||
import com.lanyuanxiaoyao.service.ai.web.engine.entity.FlowNode;
|
|
||||||
import com.lanyuanxiaoyao.service.ai.web.engine.node.CodeNode;
|
import com.lanyuanxiaoyao.service.ai.web.engine.node.CodeNode;
|
||||||
|
import com.lanyuanxiaoyao.service.ai.web.engine.node.InputNode;
|
||||||
import com.lanyuanxiaoyao.service.ai.web.engine.node.LlmNode;
|
import com.lanyuanxiaoyao.service.ai.web.engine.node.LlmNode;
|
||||||
import com.lanyuanxiaoyao.service.ai.web.engine.node.LoopNode;
|
import com.lanyuanxiaoyao.service.ai.web.engine.node.LoopNode;
|
||||||
import com.lanyuanxiaoyao.service.ai.web.engine.node.OutputNode;
|
import com.lanyuanxiaoyao.service.ai.web.engine.node.OutputNode;
|
||||||
import com.lanyuanxiaoyao.service.ai.web.engine.node.SwitchNode;
|
import com.lanyuanxiaoyao.service.ai.web.engine.node.SwitchNode;
|
||||||
import com.lanyuanxiaoyao.service.ai.web.engine.store.InMemoryFlowStore;
|
import com.lanyuanxiaoyao.service.ai.web.engine.store.InMemoryFlowStore;
|
||||||
import com.lanyuanxiaoyao.service.ai.web.entity.FlowTask;
|
import com.lanyuanxiaoyao.service.ai.web.entity.FlowTask;
|
||||||
|
import com.lanyuanxiaoyao.service.ai.web.entity.vo.FlowGraphVo;
|
||||||
import com.lanyuanxiaoyao.service.ai.web.repository.FlowTaskRepository;
|
import com.lanyuanxiaoyao.service.ai.web.repository.FlowTaskRepository;
|
||||||
import java.lang.reflect.InvocationTargetException;
|
import java.lang.reflect.InvocationTargetException;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import lombok.Data;
|
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.eclipse.collections.api.factory.Maps;
|
import org.eclipse.collections.api.factory.Maps;
|
||||||
import org.eclipse.collections.api.map.MutableMap;
|
|
||||||
import org.eclipse.collections.api.set.ImmutableSet;
|
|
||||||
import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
|
import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
@@ -42,7 +41,6 @@ public class FlowTaskService extends SimpleServiceSupport<FlowTask> {
|
|||||||
var flowTask = detailOrThrow(id);
|
var flowTask = detailOrThrow(id);
|
||||||
var graphVo = mapper.readValue(flowTask.getTemplateFlowGraph(), FlowGraphVo.class);
|
var graphVo = mapper.readValue(flowTask.getTemplateFlowGraph(), FlowGraphVo.class);
|
||||||
var flowGraph = new FlowGraph(IdUtil.fastUUID(), graphVo.getNodes(), graphVo.getEdges());
|
var flowGraph = new FlowGraph(IdUtil.fastUUID(), graphVo.getNodes(), graphVo.getEdges());
|
||||||
log.info("Graph: {}", flowGraph);
|
|
||||||
|
|
||||||
var store = new InMemoryFlowStore();
|
var store = new InMemoryFlowStore();
|
||||||
var executor = new FlowExecutor(
|
var executor = new FlowExecutor(
|
||||||
@@ -52,19 +50,25 @@ public class FlowTaskService extends SimpleServiceSupport<FlowTask> {
|
|||||||
"switch-node", SwitchNode.class,
|
"switch-node", SwitchNode.class,
|
||||||
"code-node", CodeNode.class,
|
"code-node", CodeNode.class,
|
||||||
"llm-node", LlmNode.class,
|
"llm-node", LlmNode.class,
|
||||||
|
"input-node", InputNode.class,
|
||||||
"output-node", OutputNode.class
|
"output-node", OutputNode.class
|
||||||
))
|
))
|
||||||
);
|
);
|
||||||
FlowContext context = new FlowContext();
|
FlowContext context = new FlowContext();
|
||||||
context.setInput(mapper.readValue(flowTask.getInput(), new TypeReference<>() {}));
|
|
||||||
context.setData(graphVo.getData());
|
context.setData(graphVo.getData());
|
||||||
|
|
||||||
|
// 如果发现输入节点,将相关数据注入到对应节点的上下文中
|
||||||
|
var inputNode = flowGraph.nodes()
|
||||||
|
.detectOptional(node -> StrUtil.equals(node.type(), "input-node") && ObjectUtil.isEmpty(node.parentId()))
|
||||||
|
.orElse(null);
|
||||||
|
if (ObjectUtil.isNotNull(inputNode)) {
|
||||||
|
if (!context.getData().containsKey(inputNode.id())) {
|
||||||
|
context.getData().put(inputNode.id(), Maps.mutable.empty());
|
||||||
|
}
|
||||||
|
context.getData().get(inputNode.id()).putAll(mapper.readValue(flowTask.getInput(), new TypeReference<>() {
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
executor.execute(flowGraph, context);
|
executor.execute(flowGraph, context);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Data
|
|
||||||
public static final class FlowGraphVo {
|
|
||||||
private ImmutableSet<FlowNode> nodes;
|
|
||||||
private ImmutableSet<FlowEdge> edges;
|
|
||||||
private MutableMap<String, MutableMap<String, Object>> data;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,22 +1,47 @@
|
|||||||
package com.lanyuanxiaoyao.service.ai.web.service.task;
|
package com.lanyuanxiaoyao.service.ai.web.service.task;
|
||||||
|
|
||||||
|
import cn.hutool.core.util.ObjectUtil;
|
||||||
|
import cn.hutool.core.util.StrUtil;
|
||||||
|
import com.fasterxml.jackson.core.JsonProcessingException;
|
||||||
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||||
import com.lanyuanxiaoyao.service.ai.web.base.service.SimpleServiceSupport;
|
import com.lanyuanxiaoyao.service.ai.web.base.service.SimpleServiceSupport;
|
||||||
import com.lanyuanxiaoyao.service.ai.web.entity.FlowTaskTemplate;
|
import com.lanyuanxiaoyao.service.ai.web.entity.FlowTaskTemplate;
|
||||||
|
import com.lanyuanxiaoyao.service.ai.web.entity.vo.FlowGraphVo;
|
||||||
import com.lanyuanxiaoyao.service.ai.web.repository.FlowTaskTemplateRepository;
|
import com.lanyuanxiaoyao.service.ai.web.repository.FlowTaskTemplateRepository;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
@Slf4j
|
@Slf4j
|
||||||
@Service
|
@Service
|
||||||
public class FlowTaskTemplateService extends SimpleServiceSupport<FlowTaskTemplate> {
|
public class FlowTaskTemplateService extends SimpleServiceSupport<FlowTaskTemplate> {
|
||||||
public FlowTaskTemplateService(FlowTaskTemplateRepository flowTaskTemplateRepository) {
|
private final ObjectMapper mapper;
|
||||||
|
|
||||||
|
public FlowTaskTemplateService(FlowTaskTemplateRepository flowTaskTemplateRepository, Jackson2ObjectMapperBuilder builder) {
|
||||||
super(flowTaskTemplateRepository);
|
super(flowTaskTemplateRepository);
|
||||||
|
this.mapper = builder.build();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Transactional(rollbackFor = Exception.class)
|
@Transactional(rollbackFor = Exception.class)
|
||||||
public void updateFlowGraph(Long id, String flowGraph) {
|
public void updateFlowGraph(Long id, String flowGraph) throws JsonProcessingException {
|
||||||
var template = detailOrThrow(id);
|
var template = detailOrThrow(id);
|
||||||
|
|
||||||
|
var graph = mapper.readValue(flowGraph, FlowGraphVo.class);
|
||||||
|
// 如果发现输入节点,就单独提取出来
|
||||||
|
var inputNode = graph.getNodes()
|
||||||
|
.detectOptional(node -> StrUtil.equals(node.type(), "input-node") && ObjectUtil.isEmpty(node.parentId()))
|
||||||
|
.orElse(null);
|
||||||
|
if (ObjectUtil.isNotNull(inputNode)) {
|
||||||
|
var nodeId = inputNode.id();
|
||||||
|
var nodeData = graph.getData().getOrDefault(nodeId, null);
|
||||||
|
if (ObjectUtil.isNotNull(nodeData) && nodeData.containsKey("inputs")) {
|
||||||
|
template.setInputSchema(mapper.writeValueAsString(nodeData.get("inputs")));
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
template.setInputSchema("{}");
|
||||||
|
}
|
||||||
|
|
||||||
template.setFlowGraph(flowGraph);
|
template.setFlowGraph(flowGraph);
|
||||||
save(template);
|
save(template);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ export const checkAddNode: (type: string, parentId: string | undefined, nodes: N
|
|||||||
throw typeNotFound(type)
|
throw typeNotFound(type)
|
||||||
}
|
}
|
||||||
for (const checker of nodeDefine.checkers.add) {
|
for (const checker of nodeDefine.checkers.add) {
|
||||||
let checkResult = checker(type, parentId, {}, nodes, edges, undefined)
|
let checkResult = checker(type, parentId, nodes, edges, undefined)
|
||||||
if (checkResult.error) {
|
if (checkResult.error) {
|
||||||
throw addNodeError(checkResult.message)
|
throw addNodeError(checkResult.message)
|
||||||
}
|
}
|
||||||
@@ -86,7 +86,7 @@ export const nodeTypeNotFound = () => new CheckError(302, '节点类型不存在
|
|||||||
export const saveNodeError = (nodeId: string, reason?: string) => new CheckError(303, reason ?? `节点配置存在错误:${nodeId}`)
|
export const saveNodeError = (nodeId: string, reason?: string) => new CheckError(303, reason ?? `节点配置存在错误:${nodeId}`)
|
||||||
|
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
export const checkSave: (inputSchema: Record<string, Record<string, any>>, nodes: Node[], edges: Edge[], data: any) => void = (inputSchema, nodes, edges, data) => {
|
export const checkSave: (nodes: Node[], edges: Edge[], data: any) => void = (nodes, edges, data) => {
|
||||||
if (isEmpty(nodes)) {
|
if (isEmpty(nodes)) {
|
||||||
throw atLeastOneNode()
|
throw atLeastOneNode()
|
||||||
}
|
}
|
||||||
@@ -102,7 +102,7 @@ export const checkSave: (inputSchema: Record<string, Record<string, any>>, nodes
|
|||||||
let nodeType = node.type!
|
let nodeType = node.type!
|
||||||
let nodeDefine = NodeRegistryMap[nodeType]
|
let nodeDefine = NodeRegistryMap[nodeType]
|
||||||
for (let checker of nodeDefine.checkers.save) {
|
for (let checker of nodeDefine.checkers.save) {
|
||||||
let checkResult = checker(node.id, node.parentId, inputSchema, nodes, edges, data)
|
let checkResult = checker(node.id, node.parentId, nodes, edges, data)
|
||||||
if (checkResult.error) {
|
if (checkResult.error) {
|
||||||
throw saveNodeError(node.id, checkResult.message)
|
throw saveNodeError(node.id, checkResult.message)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,7 +11,6 @@ import AddNodeButton from './component/AddNodeButton.tsx'
|
|||||||
import {checkAddConnection, checkSave} from './FlowChecker.tsx'
|
import {checkAddConnection, checkSave} from './FlowChecker.tsx'
|
||||||
import {useNodeDrag} from './Helper.tsx'
|
import {useNodeDrag} from './Helper.tsx'
|
||||||
import {NodeRegistryMap} from './NodeRegistry.tsx'
|
import {NodeRegistryMap} from './NodeRegistry.tsx'
|
||||||
import {useContextStore} from './store/ContextStore.ts'
|
|
||||||
import {useDataStore} from './store/DataStore.ts'
|
import {useDataStore} from './store/DataStore.ts'
|
||||||
import {useFlowStore} from './store/FlowStore.ts'
|
import {useFlowStore} from './store/FlowStore.ts'
|
||||||
import {flowDotColor, type FlowEditorProps} from './types.ts'
|
import {flowDotColor, type FlowEditorProps} from './types.ts'
|
||||||
@@ -58,8 +57,6 @@ function FlowEditor(props: FlowEditorProps) {
|
|||||||
onConnect,
|
onConnect,
|
||||||
} = useFlowStore()
|
} = useFlowStore()
|
||||||
|
|
||||||
const {inputSchema, setInputSchema} = useContextStore()
|
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
// language=JSON
|
// language=JSON
|
||||||
// let initialData = JSON.parse('{"nodes":[{"id":"TCxPixrdkI","type":"start-node","position":{"x":-256,"y":109.5},"data":{},"measured":{"width":256,"height":83},"selected":false,"dragging":false},{"id":"tGs78_ietp","type":"llm-node","position":{"x":108,"y":-2.5},"data":{},"measured":{"width":256,"height":105},"selected":false,"dragging":false},{"id":"OeZdaU7LpY","type":"llm-node","position":{"x":111,"y":196},"data":{},"measured":{"width":256,"height":105},"selected":false,"dragging":false},{"id":"LjfoCYZo-E","type":"knowledge-node","position":{"x":497.62196259607214,"y":-10.792497317791003},"data":{},"measured":{"width":256,"height":75},"selected":false,"dragging":false},{"id":"sQM_22GYB5","type":"end-node","position":{"x":874.3164534765615,"y":151.70316541496913},"data":{},"measured":{"width":256,"height":75},"selected":false,"dragging":false},{"id":"KpMH_xc3ZZ","type":"llm-node","position":{"x":529.6286840434341,"y":150.4721376669937},"data":{},"measured":{"width":256,"height":75},"selected":false,"dragging":false},{"id":"pOrR6EMVbe","type":"switch-node","position":{"x":110.33793030183864,"y":373.9551529987239},"data":{},"measured":{"width":256,"height":157},"selected":false,"dragging":false}],"edges":[{"source":"TCxPixrdkI","sourceHandle":"source","target":"tGs78_ietp","targetHandle":"target","id":"xy-edge__TCxPixrdkIsource-tGs78_ietptarget"},{"source":"TCxPixrdkI","sourceHandle":"source","target":"OeZdaU7LpY","targetHandle":"target","id":"xy-edge__TCxPixrdkIsource-OeZdaU7LpYtarget"},{"source":"tGs78_ietp","sourceHandle":"source","target":"LjfoCYZo-E","targetHandle":"target","id":"xy-edge__tGs78_ietpsource-LjfoCYZo-Etarget"},{"source":"LjfoCYZo-E","sourceHandle":"source","target":"KpMH_xc3ZZ","targetHandle":"target","id":"xy-edge__LjfoCYZo-Esource-KpMH_xc3ZZtarget"},{"source":"OeZdaU7LpY","sourceHandle":"source","target":"KpMH_xc3ZZ","targetHandle":"target","id":"xy-edge__OeZdaU7LpYsource-KpMH_xc3ZZtarget"},{"source":"KpMH_xc3ZZ","sourceHandle":"source","target":"sQM_22GYB5","targetHandle":"target","id":"xy-edge__KpMH_xc3ZZsource-sQM_22GYB5target"},{"source":"TCxPixrdkI","sourceHandle":"source","target":"pOrR6EMVbe","id":"xy-edge__TCxPixrdkIsource-pOrR6EMVbe"},{"source":"pOrR6EMVbe","sourceHandle":"3","target":"sQM_22GYB5","targetHandle":"target","id":"xy-edge__pOrR6EMVbe3-sQM_22GYB5target"},{"source":"pOrR6EMVbe","sourceHandle":"1","target":"KpMH_xc3ZZ","targetHandle":"target","id":"xy-edge__pOrR6EMVbe1-KpMH_xc3ZZtarget"}],"data":{"tGs78_ietp":{"model":"qwen3","outputs":{"text":{"type":"string"}},"systemPrompt":"你是个聪明人"},"OeZdaU7LpY":{"model":"qwen3","outputs":{"text":{"type":"string"}},"systemPrompt":"你也是个聪明人"}}}')
|
// let initialData = JSON.parse('{"nodes":[{"id":"TCxPixrdkI","type":"start-node","position":{"x":-256,"y":109.5},"data":{},"measured":{"width":256,"height":83},"selected":false,"dragging":false},{"id":"tGs78_ietp","type":"llm-node","position":{"x":108,"y":-2.5},"data":{},"measured":{"width":256,"height":105},"selected":false,"dragging":false},{"id":"OeZdaU7LpY","type":"llm-node","position":{"x":111,"y":196},"data":{},"measured":{"width":256,"height":105},"selected":false,"dragging":false},{"id":"LjfoCYZo-E","type":"knowledge-node","position":{"x":497.62196259607214,"y":-10.792497317791003},"data":{},"measured":{"width":256,"height":75},"selected":false,"dragging":false},{"id":"sQM_22GYB5","type":"end-node","position":{"x":874.3164534765615,"y":151.70316541496913},"data":{},"measured":{"width":256,"height":75},"selected":false,"dragging":false},{"id":"KpMH_xc3ZZ","type":"llm-node","position":{"x":529.6286840434341,"y":150.4721376669937},"data":{},"measured":{"width":256,"height":75},"selected":false,"dragging":false},{"id":"pOrR6EMVbe","type":"switch-node","position":{"x":110.33793030183864,"y":373.9551529987239},"data":{},"measured":{"width":256,"height":157},"selected":false,"dragging":false}],"edges":[{"source":"TCxPixrdkI","sourceHandle":"source","target":"tGs78_ietp","targetHandle":"target","id":"xy-edge__TCxPixrdkIsource-tGs78_ietptarget"},{"source":"TCxPixrdkI","sourceHandle":"source","target":"OeZdaU7LpY","targetHandle":"target","id":"xy-edge__TCxPixrdkIsource-OeZdaU7LpYtarget"},{"source":"tGs78_ietp","sourceHandle":"source","target":"LjfoCYZo-E","targetHandle":"target","id":"xy-edge__tGs78_ietpsource-LjfoCYZo-Etarget"},{"source":"LjfoCYZo-E","sourceHandle":"source","target":"KpMH_xc3ZZ","targetHandle":"target","id":"xy-edge__LjfoCYZo-Esource-KpMH_xc3ZZtarget"},{"source":"OeZdaU7LpY","sourceHandle":"source","target":"KpMH_xc3ZZ","targetHandle":"target","id":"xy-edge__OeZdaU7LpYsource-KpMH_xc3ZZtarget"},{"source":"KpMH_xc3ZZ","sourceHandle":"source","target":"sQM_22GYB5","targetHandle":"target","id":"xy-edge__KpMH_xc3ZZsource-sQM_22GYB5target"},{"source":"TCxPixrdkI","sourceHandle":"source","target":"pOrR6EMVbe","id":"xy-edge__TCxPixrdkIsource-pOrR6EMVbe"},{"source":"pOrR6EMVbe","sourceHandle":"3","target":"sQM_22GYB5","targetHandle":"target","id":"xy-edge__pOrR6EMVbe3-sQM_22GYB5target"},{"source":"pOrR6EMVbe","sourceHandle":"1","target":"KpMH_xc3ZZ","targetHandle":"target","id":"xy-edge__pOrR6EMVbe1-KpMH_xc3ZZtarget"}],"data":{"tGs78_ietp":{"model":"qwen3","outputs":{"text":{"type":"string"}},"systemPrompt":"你是个聪明人"},"OeZdaU7LpY":{"model":"qwen3","outputs":{"text":{"type":"string"}},"systemPrompt":"你也是个聪明人"}}}')
|
||||||
@@ -72,7 +69,6 @@ function FlowEditor(props: FlowEditorProps) {
|
|||||||
setNodes(initialNodes)
|
setNodes(initialNodes)
|
||||||
setEdges(initialEdges)
|
setEdges(initialEdges)
|
||||||
|
|
||||||
setInputSchema(props.inputSchema)
|
|
||||||
}, [props.graphData])
|
}, [props.graphData])
|
||||||
|
|
||||||
const {
|
const {
|
||||||
@@ -127,7 +123,7 @@ function FlowEditor(props: FlowEditorProps) {
|
|||||||
if (commonInfo.debug) {
|
if (commonInfo.debug) {
|
||||||
console.info('Save', JSON.stringify({nodes, edges, data}))
|
console.info('Save', JSON.stringify({nodes, edges, data}))
|
||||||
}
|
}
|
||||||
checkSave(inputSchema, nodes, edges, data)
|
checkSave(nodes, edges, data)
|
||||||
props.onGraphDataChange({nodes, edges, data})
|
props.onGraphDataChange({nodes, edges, data})
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ import type {Option} from 'amis/lib/Schema'
|
|||||||
import {contain, find, has, isEqual, max, min, unique} from 'licia'
|
import {contain, find, has, isEqual, max, min, unique} from 'licia'
|
||||||
import {type DependencyList, type MouseEvent as ReactMouseEvent, useCallback, useRef} from 'react'
|
import {type DependencyList, type MouseEvent as ReactMouseEvent, useCallback, useRef} from 'react'
|
||||||
import Queue from 'yocto-queue'
|
import Queue from 'yocto-queue'
|
||||||
import {originTypeMap} from '../../pages/ai/task/InputSchema.tsx'
|
|
||||||
import {useFlowStore} from './store/FlowStore.ts'
|
import {useFlowStore} from './store/FlowStore.ts'
|
||||||
import {type OutputVariable, type OutputVariableType} from './types.ts'
|
import {type OutputVariable, type OutputVariableType} from './types.ts'
|
||||||
|
|
||||||
@@ -21,17 +20,10 @@ export const getAllIncomerNodeById: (id: string, nodes: Node[], edges: Edge[]) =
|
|||||||
return unique(result, (a, b) => isEqual(a, b))
|
return unique(result, (a, b) => isEqual(a, b))
|
||||||
}
|
}
|
||||||
|
|
||||||
export const getAllIncomerNodeOutputVariables: (id: string, inputSchema: Record<string, Record<string, any>>, nodes: Node[], edges: Edge[], data: any) => OutputVariable[] = (id, inputSchema, nodes, edges, data) => {
|
export const getAllIncomerNodeOutputVariables: (id: string, nodes: Node[], edges: Edge[], data: any) => OutputVariable[] = (id, nodes, edges, data) => {
|
||||||
let inputSchemaVariables: OutputVariable[] = Object.keys(inputSchema).map(key => ({
|
|
||||||
group: '流程入参',
|
|
||||||
name: `${key}${inputSchema[key]?.label ? ` (${inputSchema[key].label})` : ''}`,
|
|
||||||
type: originTypeMap[inputSchema[key]?.type ?? ''],
|
|
||||||
variable: key,
|
|
||||||
}))
|
|
||||||
|
|
||||||
let currentNode = find(nodes, n => isEqual(id, n.id))
|
let currentNode = find(nodes, n => isEqual(id, n.id))
|
||||||
if (!currentNode) {
|
if (!currentNode) {
|
||||||
return inputSchemaVariables
|
return []
|
||||||
}
|
}
|
||||||
|
|
||||||
let incomerIds = getAllIncomerNodeById(id, nodes, edges)
|
let incomerIds = getAllIncomerNodeById(id, nodes, edges)
|
||||||
@@ -63,7 +55,6 @@ export const getAllIncomerNodeOutputVariables: (id: string, inputSchema: Record<
|
|||||||
}
|
}
|
||||||
|
|
||||||
return [
|
return [
|
||||||
...inputSchemaVariables,
|
|
||||||
...(currentNode.parentId ? [
|
...(currentNode.parentId ? [
|
||||||
{
|
{
|
||||||
group: '循环入参',
|
group: '循环入参',
|
||||||
@@ -82,9 +73,9 @@ export const getAllIncomerNodeOutputVariables: (id: string, inputSchema: Record<
|
|||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
export const generateAllIncomerOutputVariablesFormOptions: (id: string, inputSchema: Record<string, Record<string, any>>, nodes: Node[], edges: Edge[], data: any, targetTypes?: OutputVariableType[]) => Option[] = (id, inputSchema, nodes, edges, data, targetTypes) => {
|
export const generateAllIncomerOutputVariablesFormOptions: (id: string, nodes: Node[], edges: Edge[], data: any, targetTypes?: OutputVariableType[]) => Option[] = (id, nodes, edges, data, targetTypes) => {
|
||||||
let optionMap: Record<string, Option[]> = {}
|
let optionMap: Record<string, Option[]> = {}
|
||||||
for (const item of getAllIncomerNodeOutputVariables(id, inputSchema, nodes, edges, data)) {
|
for (const item of getAllIncomerNodeOutputVariables(id, nodes, edges, data)) {
|
||||||
if (targetTypes && !contain(targetTypes, item.type)) {
|
if (targetTypes && !contain(targetTypes, item.type)) {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
@@ -120,9 +111,9 @@ const numberDefaultOperator: string = 'equal'
|
|||||||
const arrayOperators: ConditionOperator[] = ['is_empty', 'is_not_empty']
|
const arrayOperators: ConditionOperator[] = ['is_empty', 'is_not_empty']
|
||||||
const arrayDefaultOperator: string = 'is_empty'
|
const arrayDefaultOperator: string = 'is_empty'
|
||||||
|
|
||||||
export const generateAllIncomerOutputVariablesConditions: (id: string, inputSchema: Record<string, Record<string, any>>, nodes: Node[], edges: Edge[], data: any) => Option[] = (id, inputSchema, nodes, edges, data) => {
|
export const generateAllIncomerOutputVariablesConditions: (id: string, nodes: Node[], edges: Edge[], data: any) => Option[] = (id, nodes, edges, data) => {
|
||||||
let optionMap: Record<string, Option[]> = {}
|
let optionMap: Record<string, Option[]> = {}
|
||||||
for (const item of getAllIncomerNodeOutputVariables(id, inputSchema, nodes, edges, data)) {
|
for (const item of getAllIncomerNodeOutputVariables(id, nodes, edges, data)) {
|
||||||
if (!optionMap[item.group]) {
|
if (!optionMap[item.group]) {
|
||||||
optionMap[item.group] = []
|
optionMap[item.group] = []
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,12 +11,12 @@ import type {AddNodeChecker, NodeDefine, SaveNodeChecker} from './types.ts'
|
|||||||
import InputNode from './node/InputNode.tsx'
|
import InputNode from './node/InputNode.tsx'
|
||||||
|
|
||||||
const inputSingleVariableChecker: (field: string) => SaveNodeChecker = field => {
|
const inputSingleVariableChecker: (field: string) => SaveNodeChecker = field => {
|
||||||
return (id, _parentId, inputSchema, nodes, edges, data) => {
|
return (id, _parentId, nodes, edges, data) => {
|
||||||
let nodeData = data[id] ?? {}
|
let nodeData = data[id] ?? {}
|
||||||
if (has(nodeData, field)) {
|
if (has(nodeData, field)) {
|
||||||
let expression = nodeData?.[field] ?? ''
|
let expression = nodeData?.[field] ?? ''
|
||||||
if (!isEmpty(expression)) {
|
if (!isEmpty(expression)) {
|
||||||
let outputVariables = new Set(getAllIncomerNodeOutputVariables(id, inputSchema, nodes, edges, data).map(i => i.variable))
|
let outputVariables = new Set(getAllIncomerNodeOutputVariables(id, nodes, edges, data).map(i => i.variable))
|
||||||
if (!outputVariables.has(expression)) {
|
if (!outputVariables.has(expression)) {
|
||||||
return {
|
return {
|
||||||
error: true,
|
error: true,
|
||||||
@@ -29,12 +29,12 @@ const inputSingleVariableChecker: (field: string) => SaveNodeChecker = field =>
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const inputMultiVariableChecker: SaveNodeChecker = (id, _parentId, inputSchema, nodes, edges, data) => {
|
const inputMultiVariableChecker: SaveNodeChecker = (id, _parentId, nodes, edges, data) => {
|
||||||
let nodeData = data[id] ?? {}
|
let nodeData = data[id] ?? {}
|
||||||
if (has(nodeData, 'inputs')) {
|
if (has(nodeData, 'inputs')) {
|
||||||
let inputs = nodeData?.inputs ?? {}
|
let inputs = nodeData?.inputs ?? {}
|
||||||
if (!isEmpty(inputs)) {
|
if (!isEmpty(inputs)) {
|
||||||
let outputVariables = new Set(getAllIncomerNodeOutputVariables(id, inputSchema, nodes, edges, data).map(i => i.variable))
|
let outputVariables = new Set(getAllIncomerNodeOutputVariables(id, nodes, edges, data).map(i => i.variable))
|
||||||
for (const key of Object.keys(inputs)) {
|
for (const key of Object.keys(inputs)) {
|
||||||
let variable = inputs[key]?.variable ?? ''
|
let variable = inputs[key]?.variable ?? ''
|
||||||
if (!outputVariables.has(variable)) {
|
if (!outputVariables.has(variable)) {
|
||||||
@@ -49,7 +49,7 @@ const inputMultiVariableChecker: SaveNodeChecker = (id, _parentId, inputSchema,
|
|||||||
return {error: false}
|
return {error: false}
|
||||||
}
|
}
|
||||||
|
|
||||||
const noMoreThanOneNodeType: AddNodeChecker = (type, parentId, _inputSchema, nodes) => {
|
const noMoreThanOneNodeType: AddNodeChecker = (type, parentId, nodes) => {
|
||||||
return {
|
return {
|
||||||
error: nodes.filter(n => isEqual(n.parentId, parentId) && isEqual(n.type, type)).length > 0,
|
error: nodes.filter(n => isEqual(n.parentId, parentId) && isEqual(n.type, type)).length > 0,
|
||||||
message: `同一个流程(子流程)中类型为 ${type} 的节点至多有一个`
|
message: `同一个流程(子流程)中类型为 ${type} 的节点至多有一个`
|
||||||
|
|||||||
@@ -12,7 +12,6 @@ import {type FormSchema, OutputVariableTypeMap} from '../types.ts'
|
|||||||
|
|
||||||
export function inputsFormColumns(
|
export function inputsFormColumns(
|
||||||
nodeId: string,
|
nodeId: string,
|
||||||
inputSchema: Record<string, Record<string, any>>,
|
|
||||||
nodes: Node[],
|
nodes: Node[],
|
||||||
edges: Edge[],
|
edges: Edge[],
|
||||||
data: any,
|
data: any,
|
||||||
@@ -38,7 +37,6 @@ export function inputsFormColumns(
|
|||||||
selectMode: 'group',
|
selectMode: 'group',
|
||||||
options: generateAllIncomerOutputVariablesFormOptions(
|
options: generateAllIncomerOutputVariablesFormOptions(
|
||||||
nodeId,
|
nodeId,
|
||||||
inputSchema,
|
|
||||||
nodes,
|
nodes,
|
||||||
edges,
|
edges,
|
||||||
data,
|
data,
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
import type {NodeProps} from '@xyflow/react'
|
import type {NodeProps} from '@xyflow/react'
|
||||||
import {Tag} from 'antd'
|
import {Tag} from 'antd'
|
||||||
import React, {useCallback, useMemo} from 'react'
|
import React, {useCallback, useMemo} from 'react'
|
||||||
import {useContextStore} from '../store/ContextStore.ts'
|
|
||||||
import {useDataStore} from '../store/DataStore.ts'
|
import {useDataStore} from '../store/DataStore.ts'
|
||||||
import {useFlowStore} from '../store/FlowStore.ts'
|
import {useFlowStore} from '../store/FlowStore.ts'
|
||||||
import AmisNode, {inputsFormColumns, nodeClassName, NormalNodeHandler, outputsFormColumns} from './AmisNode.tsx'
|
import AmisNode, {inputsFormColumns, nodeClassName, NormalNodeHandler, outputsFormColumns} from './AmisNode.tsx'
|
||||||
@@ -16,13 +15,12 @@ const languageMap: Record<string, string> = {
|
|||||||
const CodeNode = (props: NodeProps) => {
|
const CodeNode = (props: NodeProps) => {
|
||||||
const {getNodes, getEdges} = useFlowStore()
|
const {getNodes, getEdges} = useFlowStore()
|
||||||
const {getData, getDataById} = useDataStore()
|
const {getData, getDataById} = useDataStore()
|
||||||
const {getInputSchema} = useContextStore()
|
|
||||||
|
|
||||||
const nodeData = getDataById(props.id)
|
const nodeData = getDataById(props.id)
|
||||||
|
|
||||||
const formSchema: () => FormSchema = useCallback(() => ({
|
const formSchema: () => FormSchema = useCallback(() => ({
|
||||||
columns: [
|
columns: [
|
||||||
...inputsFormColumns(props.id, getInputSchema(), getNodes(), getEdges(), getData()),
|
...inputsFormColumns(props.id, getNodes(), getEdges(), getData()),
|
||||||
{
|
{
|
||||||
type: 'divider',
|
type: 'divider',
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
import type {NodeProps} from '@xyflow/react'
|
import type {NodeProps} from '@xyflow/react'
|
||||||
import React, {useCallback, useEffect} from 'react'
|
import React, {useCallback, useEffect} from 'react'
|
||||||
import {commonInfo} from '../../../util/amis.tsx'
|
import {commonInfo} from '../../../util/amis.tsx'
|
||||||
import {useContextStore} from '../store/ContextStore.ts'
|
|
||||||
import {useDataStore} from '../store/DataStore.ts'
|
import {useDataStore} from '../store/DataStore.ts'
|
||||||
import {useFlowStore} from '../store/FlowStore.ts'
|
import {useFlowStore} from '../store/FlowStore.ts'
|
||||||
import AmisNode, {inputsFormColumns, nodeClassName, NormalNodeHandler, outputsFormColumns} from './AmisNode.tsx'
|
import AmisNode, {inputsFormColumns, nodeClassName, NormalNodeHandler, outputsFormColumns} from './AmisNode.tsx'
|
||||||
@@ -10,7 +9,6 @@ import type {FormSchema} from '../types.ts'
|
|||||||
const KnowledgeNode = (props: NodeProps) => {
|
const KnowledgeNode = (props: NodeProps) => {
|
||||||
const {getNodes, getEdges} = useFlowStore()
|
const {getNodes, getEdges} = useFlowStore()
|
||||||
const {getData, mergeDataById} = useDataStore()
|
const {getData, mergeDataById} = useDataStore()
|
||||||
const {getInputSchema} = useContextStore()
|
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
mergeDataById(
|
mergeDataById(
|
||||||
@@ -27,7 +25,7 @@ const KnowledgeNode = (props: NodeProps) => {
|
|||||||
|
|
||||||
const formSchema: () => FormSchema = useCallback(() => ({
|
const formSchema: () => FormSchema = useCallback(() => ({
|
||||||
columns: [
|
columns: [
|
||||||
...inputsFormColumns(props.id, getInputSchema(), getNodes(), getEdges(), getData()),
|
...inputsFormColumns(props.id, getNodes(), getEdges(), getData()),
|
||||||
{
|
{
|
||||||
type: 'divider',
|
type: 'divider',
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
import type {NodeProps} from '@xyflow/react'
|
import type {NodeProps} from '@xyflow/react'
|
||||||
import {Tag} from 'antd'
|
import {Tag} from 'antd'
|
||||||
import React, {useCallback, useEffect, useMemo} from 'react'
|
import React, {useCallback, useEffect, useMemo} from 'react'
|
||||||
import {useContextStore} from '../store/ContextStore.ts'
|
|
||||||
import {useDataStore} from '../store/DataStore.ts'
|
import {useDataStore} from '../store/DataStore.ts'
|
||||||
import {useFlowStore} from '../store/FlowStore.ts'
|
import {useFlowStore} from '../store/FlowStore.ts'
|
||||||
import AmisNode, {inputsFormColumns, nodeClassName, NormalNodeHandler, outputsFormColumns} from './AmisNode.tsx'
|
import AmisNode, {inputsFormColumns, nodeClassName, NormalNodeHandler, outputsFormColumns} from './AmisNode.tsx'
|
||||||
@@ -15,7 +14,6 @@ const modelMap: Record<string, string> = {
|
|||||||
const LlmNode = (props: NodeProps) => {
|
const LlmNode = (props: NodeProps) => {
|
||||||
const {getNodes, getEdges} = useFlowStore()
|
const {getNodes, getEdges} = useFlowStore()
|
||||||
const {getData, mergeDataById, getDataById} = useDataStore()
|
const {getData, mergeDataById, getDataById} = useDataStore()
|
||||||
const {getInputSchema} = useContextStore()
|
|
||||||
|
|
||||||
const nodeData = getDataById(props.id)
|
const nodeData = getDataById(props.id)
|
||||||
|
|
||||||
@@ -34,7 +32,7 @@ const LlmNode = (props: NodeProps) => {
|
|||||||
|
|
||||||
const formSchema: () => FormSchema = useCallback(() => ({
|
const formSchema: () => FormSchema = useCallback(() => ({
|
||||||
columns: [
|
columns: [
|
||||||
...inputsFormColumns(props.id, getInputSchema(), getNodes(), getEdges(), getData()),
|
...inputsFormColumns(props.id, getNodes(), getEdges(), getData()),
|
||||||
{
|
{
|
||||||
type: 'divider',
|
type: 'divider',
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ import {classnames} from 'amis'
|
|||||||
import React, {useCallback, useEffect, useMemo} from 'react'
|
import React, {useCallback, useEffect, useMemo} from 'react'
|
||||||
import AddNodeButton from '../component/AddNodeButton.tsx'
|
import AddNodeButton from '../component/AddNodeButton.tsx'
|
||||||
import {generateAllIncomerOutputVariablesFormOptions} from '../Helper.tsx'
|
import {generateAllIncomerOutputVariablesFormOptions} from '../Helper.tsx'
|
||||||
import {useContextStore} from '../store/ContextStore.ts'
|
|
||||||
import {useDataStore} from '../store/DataStore.ts'
|
import {useDataStore} from '../store/DataStore.ts'
|
||||||
import {useFlowStore} from '../store/FlowStore.ts'
|
import {useFlowStore} from '../store/FlowStore.ts'
|
||||||
import {flowBackgroundColor, flowDotColor, type FormSchema} from '../types.ts'
|
import {flowBackgroundColor, flowDotColor, type FormSchema} from '../types.ts'
|
||||||
@@ -12,7 +11,6 @@ import AmisNode, {nodeClassName, NormalNodeHandler, outputsFormColumns} from './
|
|||||||
const LoopNode = (props: NodeProps) => {
|
const LoopNode = (props: NodeProps) => {
|
||||||
const {getNodes, getEdges} = useFlowStore()
|
const {getNodes, getEdges} = useFlowStore()
|
||||||
const {getData, mergeDataById} = useDataStore()
|
const {getData, mergeDataById} = useDataStore()
|
||||||
const {getInputSchema} = useContextStore()
|
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
mergeDataById(
|
mergeDataById(
|
||||||
@@ -85,7 +83,6 @@ const LoopNode = (props: NodeProps) => {
|
|||||||
selectMode: 'group',
|
selectMode: 'group',
|
||||||
options: generateAllIncomerOutputVariablesFormOptions(
|
options: generateAllIncomerOutputVariablesFormOptions(
|
||||||
props.id,
|
props.id,
|
||||||
getInputSchema(),
|
|
||||||
getNodes(),
|
getNodes(),
|
||||||
getEdges(),
|
getEdges(),
|
||||||
getData(),
|
getData(),
|
||||||
@@ -101,7 +98,6 @@ const LoopNode = (props: NodeProps) => {
|
|||||||
selectMode: 'group',
|
selectMode: 'group',
|
||||||
options: generateAllIncomerOutputVariablesFormOptions(
|
options: generateAllIncomerOutputVariablesFormOptions(
|
||||||
props.id,
|
props.id,
|
||||||
getInputSchema(),
|
|
||||||
getNodes(),
|
getNodes(),
|
||||||
getEdges(),
|
getEdges(),
|
||||||
getData(),
|
getData(),
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
import type {NodeProps} from '@xyflow/react'
|
import type {NodeProps} from '@xyflow/react'
|
||||||
import React, {useCallback} from 'react'
|
import React, {useCallback} from 'react'
|
||||||
import {generateAllIncomerOutputVariablesFormOptions} from '../Helper.tsx'
|
import {generateAllIncomerOutputVariablesFormOptions} from '../Helper.tsx'
|
||||||
import {useContextStore} from '../store/ContextStore.ts'
|
|
||||||
import {useDataStore} from '../store/DataStore.ts'
|
import {useDataStore} from '../store/DataStore.ts'
|
||||||
import {useFlowStore} from '../store/FlowStore.ts'
|
import {useFlowStore} from '../store/FlowStore.ts'
|
||||||
import AmisNode, {EndNodeHandler, nodeClassName} from './AmisNode.tsx'
|
import AmisNode, {EndNodeHandler, nodeClassName} from './AmisNode.tsx'
|
||||||
@@ -10,7 +9,6 @@ import type {FormSchema} from '../types.ts'
|
|||||||
const OutputNode = (props: NodeProps) => {
|
const OutputNode = (props: NodeProps) => {
|
||||||
const {getNodes, getEdges} = useFlowStore()
|
const {getNodes, getEdges} = useFlowStore()
|
||||||
const {getData} = useDataStore()
|
const {getData} = useDataStore()
|
||||||
const {getInputSchema} = useContextStore()
|
|
||||||
|
|
||||||
const formSchema: () => FormSchema = useCallback(() => ({
|
const formSchema: () => FormSchema = useCallback(() => ({
|
||||||
columns: [
|
columns: [
|
||||||
@@ -22,7 +20,6 @@ const OutputNode = (props: NodeProps) => {
|
|||||||
selectMode: 'group',
|
selectMode: 'group',
|
||||||
options: generateAllIncomerOutputVariablesFormOptions(
|
options: generateAllIncomerOutputVariablesFormOptions(
|
||||||
props.id,
|
props.id,
|
||||||
getInputSchema(),
|
|
||||||
getNodes(),
|
getNodes(),
|
||||||
getEdges(),
|
getEdges(),
|
||||||
getData(),
|
getData(),
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ import {Tag} from 'antd'
|
|||||||
import {contain, isEqual} from 'licia'
|
import {contain, isEqual} from 'licia'
|
||||||
import React, {useCallback, useMemo} from 'react'
|
import React, {useCallback, useMemo} from 'react'
|
||||||
import {generateAllIncomerOutputVariablesConditions} from '../Helper.tsx'
|
import {generateAllIncomerOutputVariablesConditions} from '../Helper.tsx'
|
||||||
import {useContextStore} from '../store/ContextStore.ts'
|
|
||||||
import {useDataStore} from '../store/DataStore.ts'
|
import {useDataStore} from '../store/DataStore.ts'
|
||||||
import {useFlowStore} from '../store/FlowStore.ts'
|
import {useFlowStore} from '../store/FlowStore.ts'
|
||||||
import AmisNode, {nodeClassName} from './AmisNode.tsx'
|
import AmisNode, {nodeClassName} from './AmisNode.tsx'
|
||||||
@@ -13,7 +12,6 @@ import type {FormSchema} from '../types.ts'
|
|||||||
const SwitchNode = (props: NodeProps) => {
|
const SwitchNode = (props: NodeProps) => {
|
||||||
const {getNodes, getEdges, removeEdges} = useFlowStore()
|
const {getNodes, getEdges, removeEdges} = useFlowStore()
|
||||||
const {getData, getDataById} = useDataStore()
|
const {getData, getDataById} = useDataStore()
|
||||||
const {getInputSchema} = useContextStore()
|
|
||||||
|
|
||||||
const nodeData = getDataById(props.id)
|
const nodeData = getDataById(props.id)
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
@@ -37,7 +35,6 @@ const SwitchNode = (props: NodeProps) => {
|
|||||||
showANDOR: true,
|
showANDOR: true,
|
||||||
fields: generateAllIncomerOutputVariablesConditions(
|
fields: generateAllIncomerOutputVariablesConditions(
|
||||||
props.id,
|
props.id,
|
||||||
getInputSchema(),
|
|
||||||
getNodes(),
|
getNodes(),
|
||||||
getEdges(),
|
getEdges(),
|
||||||
getData(),
|
getData(),
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
import type {NodeProps} from '@xyflow/react'
|
import type {NodeProps} from '@xyflow/react'
|
||||||
import {Tag} from 'antd'
|
import {Tag} from 'antd'
|
||||||
import React, {useCallback, useEffect, useMemo} from 'react'
|
import React, {useCallback, useEffect, useMemo} from 'react'
|
||||||
import {useContextStore} from '../store/ContextStore.ts'
|
|
||||||
import {useDataStore} from '../store/DataStore.ts'
|
import {useDataStore} from '../store/DataStore.ts'
|
||||||
import {useFlowStore} from '../store/FlowStore.ts'
|
import {useFlowStore} from '../store/FlowStore.ts'
|
||||||
import AmisNode, {inputsFormColumns, nodeClassName, NormalNodeHandler, outputsFormColumns} from './AmisNode.tsx'
|
import AmisNode, {inputsFormColumns, nodeClassName, NormalNodeHandler, outputsFormColumns} from './AmisNode.tsx'
|
||||||
@@ -17,7 +16,6 @@ const typeMap: Record<string, string> = {
|
|||||||
const TemplateNode = (props: NodeProps) => {
|
const TemplateNode = (props: NodeProps) => {
|
||||||
const {getNodes, getEdges} = useFlowStore()
|
const {getNodes, getEdges} = useFlowStore()
|
||||||
const {getData, getDataById, mergeDataById} = useDataStore()
|
const {getData, getDataById, mergeDataById} = useDataStore()
|
||||||
const {getInputSchema} = useContextStore()
|
|
||||||
|
|
||||||
const nodeData = getDataById(props.id)
|
const nodeData = getDataById(props.id)
|
||||||
|
|
||||||
@@ -36,7 +34,7 @@ const TemplateNode = (props: NodeProps) => {
|
|||||||
|
|
||||||
const formSchema: () => FormSchema = useCallback(() => ({
|
const formSchema: () => FormSchema = useCallback(() => ({
|
||||||
columns: [
|
columns: [
|
||||||
...inputsFormColumns(props.id, getInputSchema(), getNodes(), getEdges(), getData()),
|
...inputsFormColumns(props.id, getNodes(), getEdges(), getData()),
|
||||||
{
|
{
|
||||||
type: 'divider',
|
type: 'divider',
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -1,11 +0,0 @@
|
|||||||
import {create} from 'zustand/react'
|
|
||||||
|
|
||||||
export const useContextStore = create<{
|
|
||||||
inputSchema: Record<string, Record<string, any>>,
|
|
||||||
getInputSchema: () => Record<string, Record<string, any>>,
|
|
||||||
setInputSchema: (inputSchema: Record<string, Record<string, any>>) => void,
|
|
||||||
}>((set, get) => ({
|
|
||||||
inputSchema: {},
|
|
||||||
getInputSchema: () => get().inputSchema,
|
|
||||||
setInputSchema: (inputSchema: Record<string, Record<string, any>>) => set({inputSchema}),
|
|
||||||
}))
|
|
||||||
@@ -20,13 +20,12 @@ export type NodeError = {
|
|||||||
message?: string,
|
message?: string,
|
||||||
}
|
}
|
||||||
|
|
||||||
export type AddNodeChecker = (type: string, parentId: string | undefined, inputSchema: Record<string, Record<string, any>>, nodes: Node[], edges: Edge[], data: any) => NodeError
|
export type AddNodeChecker = (type: string, parentId: string | undefined, nodes: Node[], edges: Edge[], data: any) => NodeError
|
||||||
export type SaveNodeChecker = (id: string, parentId: string | undefined, inputSchema: Record<string, Record<string, any>>, nodes: Node[], edges: Edge[], data: any) => NodeError
|
export type SaveNodeChecker = (id: string, parentId: string | undefined, nodes: Node[], edges: Edge[], data: any) => NodeError
|
||||||
|
|
||||||
export type GraphData = { nodes: Node[], edges: Edge[], data: any }
|
export type GraphData = { nodes: Node[], edges: Edge[], data: any }
|
||||||
|
|
||||||
export type FlowEditorProps = {
|
export type FlowEditorProps = {
|
||||||
inputSchema: Record<string, Record<string, any>>,
|
|
||||||
graphData: GraphData,
|
graphData: GraphData,
|
||||||
onGraphDataChange: (graphData: GraphData) => void,
|
onGraphDataChange: (graphData: GraphData) => void,
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
import type {Schema} from 'amis'
|
import type {Schema} from 'amis'
|
||||||
import type {OutputVariableType} from '../../../components/flow/types.ts'
|
|
||||||
import {commonInfo, formInputFileStaticColumns} from '../../../util/amis.tsx'
|
import {commonInfo, formInputFileStaticColumns} from '../../../util/amis.tsx'
|
||||||
|
|
||||||
export const typeMap: Record<string, string> = {
|
export const typeMap: Record<string, string> = {
|
||||||
@@ -9,13 +8,6 @@ export const typeMap: Record<string, string> = {
|
|||||||
files: '文件',
|
files: '文件',
|
||||||
}
|
}
|
||||||
|
|
||||||
export const originTypeMap: Record<string, OutputVariableType> = {
|
|
||||||
text: 'text',
|
|
||||||
textarea: 'text',
|
|
||||||
number: 'number',
|
|
||||||
files: 'array-text',
|
|
||||||
}
|
|
||||||
|
|
||||||
export type InputField = {
|
export type InputField = {
|
||||||
type: string
|
type: string
|
||||||
label: string
|
label: string
|
||||||
|
|||||||
@@ -1,9 +1,8 @@
|
|||||||
import {isEmpty, isEqual} from 'licia'
|
import {isEqual} from 'licia'
|
||||||
import React from 'react'
|
import React from 'react'
|
||||||
import {useNavigate, useParams} from 'react-router'
|
import {useNavigate, useParams} from 'react-router'
|
||||||
import styled from 'styled-components'
|
import styled from 'styled-components'
|
||||||
import {amisRender, commonInfo, horizontalFormOptions} from '../../../../util/amis.tsx'
|
import {amisRender, commonInfo, horizontalFormOptions} from '../../../../util/amis.tsx'
|
||||||
import {generateInputForm, typeMap} from '../InputSchema.tsx'
|
|
||||||
|
|
||||||
const TemplateEditDiv = styled.div`
|
const TemplateEditDiv = styled.div`
|
||||||
.antd-EditorControl {
|
.antd-EditorControl {
|
||||||
@@ -39,31 +38,6 @@ const FlowTaskTemplateEdit: React.FC = () => {
|
|||||||
wrapWithPanel: false,
|
wrapWithPanel: false,
|
||||||
...horizontalFormOptions(),
|
...horizontalFormOptions(),
|
||||||
onEvent: {
|
onEvent: {
|
||||||
change: {
|
|
||||||
actions: [
|
|
||||||
{
|
|
||||||
actionType: 'validate',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
actionType: 'custom',
|
|
||||||
// @ts-ignore
|
|
||||||
script: (context, doAction, event) => {
|
|
||||||
let data = event?.data ?? {}
|
|
||||||
let inputSchema = data.inputSchema ?? []
|
|
||||||
if (!isEmpty(inputSchema) && isEmpty(data?.validateResult?.error ?? undefined)) {
|
|
||||||
doAction({
|
|
||||||
actionType: 'setValue',
|
|
||||||
args: {
|
|
||||||
value: {
|
|
||||||
inputPreview: generateInputForm(inputSchema, '入参表单预览'),
|
|
||||||
},
|
|
||||||
},
|
|
||||||
})
|
|
||||||
}
|
|
||||||
},
|
|
||||||
},
|
|
||||||
],
|
|
||||||
},
|
|
||||||
submitSucc: {
|
submitSucc: {
|
||||||
actions: [
|
actions: [
|
||||||
{
|
{
|
||||||
@@ -99,71 +73,6 @@ const FlowTaskTemplateEdit: React.FC = () => {
|
|||||||
maxLength: 500,
|
maxLength: 500,
|
||||||
showCounter: true,
|
showCounter: true,
|
||||||
},
|
},
|
||||||
{
|
|
||||||
type: 'group',
|
|
||||||
body: [
|
|
||||||
{
|
|
||||||
type: 'wrapper',
|
|
||||||
size: 'none',
|
|
||||||
body: [
|
|
||||||
{
|
|
||||||
type: 'input-kvs',
|
|
||||||
name: 'inputSchema',
|
|
||||||
label: '输入变量',
|
|
||||||
addButtonText: '新增入参',
|
|
||||||
draggable: false,
|
|
||||||
keyItem: {
|
|
||||||
label: '参数名称',
|
|
||||||
...horizontalFormOptions(),
|
|
||||||
validations: {
|
|
||||||
isAlphanumeric: true,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
valueItems: [
|
|
||||||
{
|
|
||||||
...horizontalFormOptions(),
|
|
||||||
type: 'input-text',
|
|
||||||
name: 'label',
|
|
||||||
required: true,
|
|
||||||
label: '中文名称',
|
|
||||||
clearValueOnEmpty: true,
|
|
||||||
clearable: true,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
...horizontalFormOptions(),
|
|
||||||
type: 'input-text',
|
|
||||||
name: 'description',
|
|
||||||
label: '参数描述',
|
|
||||||
clearValueOnEmpty: true,
|
|
||||||
clearable: true,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
...horizontalFormOptions(),
|
|
||||||
type: 'select',
|
|
||||||
name: 'type',
|
|
||||||
label: '参数类型',
|
|
||||||
required: true,
|
|
||||||
selectFirst: true,
|
|
||||||
options: Object.keys(typeMap).map(key => ({label: typeMap[key], value: key})),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
...horizontalFormOptions(),
|
|
||||||
type: 'switch',
|
|
||||||
name: 'required',
|
|
||||||
label: '是否必填',
|
|
||||||
required: true,
|
|
||||||
value: true,
|
|
||||||
},
|
|
||||||
],
|
|
||||||
},
|
|
||||||
],
|
|
||||||
},
|
|
||||||
{
|
|
||||||
type: 'amis',
|
|
||||||
name: 'inputPreview',
|
|
||||||
},
|
|
||||||
],
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
type: 'button-toolbar',
|
type: 'button-toolbar',
|
||||||
buttons: [
|
buttons: [
|
||||||
|
|||||||
@@ -13,7 +13,6 @@ const FlowTaskTemplateFlowEditDiv = styled.div`
|
|||||||
const FlowTaskTemplateFlowEdit: React.FC = () => {
|
const FlowTaskTemplateFlowEdit: React.FC = () => {
|
||||||
const navigate = useNavigate()
|
const navigate = useNavigate()
|
||||||
const {template_id} = useParams()
|
const {template_id} = useParams()
|
||||||
const [inputSchema, setInputSchema] = useState<Record<string, Record<string, any>>>({})
|
|
||||||
const [graphData, setGraphData] = useState<GraphData>({nodes: [], edges: [], data: {}})
|
const [graphData, setGraphData] = useState<GraphData>({nodes: [], edges: [], data: {}})
|
||||||
|
|
||||||
useMount(async () => {
|
useMount(async () => {
|
||||||
@@ -23,14 +22,12 @@ const FlowTaskTemplateFlowEdit: React.FC = () => {
|
|||||||
headers: commonInfo.authorizationHeaders,
|
headers: commonInfo.authorizationHeaders,
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
setInputSchema(data?.data?.inputSchema)
|
|
||||||
setGraphData(data?.data?.flowGraph)
|
setGraphData(data?.data?.flowGraph)
|
||||||
})
|
})
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<FlowTaskTemplateFlowEditDiv className="h-full w-full">
|
<FlowTaskTemplateFlowEditDiv className="h-full w-full">
|
||||||
<FlowEditor
|
<FlowEditor
|
||||||
inputSchema={inputSchema}
|
|
||||||
graphData={graphData}
|
graphData={graphData}
|
||||||
onGraphDataChange={async data => {
|
onGraphDataChange={async data => {
|
||||||
await axios.post(
|
await axios.post(
|
||||||
|
|||||||
Reference in New Issue
Block a user