mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2025-03-05 20:50:17 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

self review

Browse source
This commit is contained in:
Charlie Kolb 2024-11-18 11:03:01 +01:00
parent e04ae4c82e
commit 175f630b1c
No known key found for this signature in database
3 changed files with 32 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
packages/editor-ui/src/composables/useCanvasOperations.ts
View file

@ -490,7 +490,6 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
} }
async function addNodes(nodes: AddedNodesAndConnections['nodes'], options: AddNodesOptions = {}) { async function addNodes(nodes: AddedNodesAndConnections['nodes'], options: AddNodesOptions = {}) {
// here?
let insertPosition = options.position; let insertPosition = options.position;
let lastAddedNode: INodeUi | undefined; let lastAddedNode: INodeUi | undefined;
const addedNodes: INodeUi[] = []; const addedNodes: INodeUi[] = [];
@ -1116,6 +1115,7 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
return; return;
} }
adjustNewNodes(sourceNode, targetNode, { parentIsNew, childIsNew });
workflowsStore.addConnection({ workflowsStore.addConnection({
connection: mappedConnection, connection: mappedConnection,
}); });
@ -1123,7 +1123,6 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
void nextTick(() => { void nextTick(() => {
nodeHelpers.updateNodeInputIssues(sourceNode); nodeHelpers.updateNodeInputIssues(sourceNode);
nodeHelpers.updateNodeInputIssues(targetNode); nodeHelpers.updateNodeInputIssues(targetNode);
adjustNewNodes(sourceNode, targetNode, { parentIsNew, childIsNew });
}); });
if (!keepPristine) { if (!keepPristine) {

23
packages/editor-ui/src/constants.ts
View file

@ -144,6 +144,12 @@ export const OPEN_AI_NODE_MESSAGE_ASSISTANT_TYPE =
export const OPEN_AI_ASSISTANT_NODE_TYPE = '@n8n/n8n-nodes-langchain.openAiAssistant'; export const OPEN_AI_ASSISTANT_NODE_TYPE = '@n8n/n8n-nodes-langchain.openAiAssistant';
export const BASIC_CHAIN_NODE_TYPE = '@n8n/n8n-nodes-langchain.chainLlm'; export const BASIC_CHAIN_NODE_TYPE = '@n8n/n8n-nodes-langchain.chainLlm';
export const QA_CHAIN_NODE_TYPE = '@n8n/n8n-nodes-langchain.chainRetrievalQa'; export const QA_CHAIN_NODE_TYPE = '@n8n/n8n-nodes-langchain.chainRetrievalQa';
export const MEMORY_BUFFER_WINDOW_NODE_TYPE = '@n8n/n8n-nodes-langchain.memoryBufferWindow';
export const MEMORY_MOTORHEAD_NODE_TYPE = '@n8n/n8n-nodes-langchain.memoryMotorhead';
export const MEMORY_POSTGRES_CHAT_NODE_TYPE = '@n8n/n8n-nodes-langchain.memoryPostgresChat';
export const MEMORY_REDIS_CHAT_NODE_TYPE = '@n8n/n8n-nodes-langchain.memoryRedisChat';
export const MEMORY_XATA_NODE_TYPE = '@n8n/n8n-nodes-langchain.memoryXata';
export const MEMORY_ZEP_NODE_TYPE = '@n8n/n8n-nodes-langchain.memoryZep';
export const MICROSOFT_TEAMS_NODE_TYPE = 'n8n-nodes-base.microsoftTeams'; export const MICROSOFT_TEAMS_NODE_TYPE = 'n8n-nodes-base.microsoftTeams';
export const N8N_NODE_TYPE = 'n8n-nodes-base.n8n'; export const N8N_NODE_TYPE = 'n8n-nodes-base.n8n';
export const NO_OP_NODE_TYPE = 'n8n-nodes-base.noOp'; export const NO_OP_NODE_TYPE = 'n8n-nodes-base.noOp';
@ -234,6 +240,23 @@ export const LIST_LIKE_NODE_OPERATIONS = ['getAll', 'getMany', 'read', 'search']
export const PRODUCTION_ONLY_TRIGGER_NODE_TYPES = [CHAT_TRIGGER_NODE_TYPE]; export const PRODUCTION_ONLY_TRIGGER_NODE_TYPES = [CHAT_TRIGGER_NODE_TYPE];
export const AI_ROOT_NODE_TYPES = [
QA_CHAIN_NODE_TYPE,
AGENT_NODE_TYPE,
BASIC_CHAIN_NODE_TYPE,
OPEN_AI_ASSISTANT_NODE_TYPE,
OPEN_AI_NODE_MESSAGE_ASSISTANT_TYPE,
];
export const AI_MEMORY_NODE_TYPES = [
MEMORY_BUFFER_WINDOW_NODE_TYPE,
MEMORY_MOTORHEAD_NODE_TYPE,
MEMORY_POSTGRES_CHAT_NODE_TYPE,
MEMORY_REDIS_CHAT_NODE_TYPE,
MEMORY_XATA_NODE_TYPE,
MEMORY_ZEP_NODE_TYPE,
];
// Node creator // Node creator
export const NODE_CREATOR_OPEN_SOURCES: Record< export const NODE_CREATOR_OPEN_SOURCES: Record<
Uppercase<NodeCreatorOpenSource>, Uppercase<NodeCreatorOpenSource>,

36
packages/editor-ui/src/utils/connectionNodeUtils.ts
View file

@ -1,32 +1,8 @@
import { type INode } from 'n8n-workflow'; import { type INode } from 'n8n-workflow';
import { import { AI_MEMORY_NODE_TYPES, AI_ROOT_NODE_TYPES, CHAT_TRIGGER_NODE_TYPE } from '@/constants';
AGENT_NODE_TYPE,
BASIC_CHAIN_NODE_TYPE,
CHAT_TRIGGER_NODE_TYPE,
OPEN_AI_ASSISTANT_NODE_TYPE,
OPEN_AI_NODE_MESSAGE_ASSISTANT_TYPE,
QA_CHAIN_NODE_TYPE,
} from '@/constants';
import { useWorkflowsStore } from '@/stores/workflows.store'; import { useWorkflowsStore } from '@/stores/workflows.store';
import type { AddedNode } from '@/Interface'; import type { AddedNode } from '@/Interface';
const AI_NODES = [
QA_CHAIN_NODE_TYPE,
AGENT_NODE_TYPE,
BASIC_CHAIN_NODE_TYPE,
OPEN_AI_ASSISTANT_NODE_TYPE,
OPEN_AI_NODE_MESSAGE_ASSISTANT_TYPE,
];
const MEMORY_NODE_NAMES = [
'@n8n/n8n-nodes-langchain.memoryBufferWindow',
'@n8n/n8n-nodes-langchain.memoryMotorhead',
'@n8n/n8n-nodes-langchain.memoryPostgresChat',
'@n8n/n8n-nodes-langchain.memoryRedisChat',
'@n8n/n8n-nodes-langchain.memoryXata',
'@n8n/n8n-nodes-langchain.memoryZep',
];
const PROMPT_PROVIDER_NODE_NAMES = [CHAT_TRIGGER_NODE_TYPE]; const PROMPT_PROVIDER_NODE_NAMES = [CHAT_TRIGGER_NODE_TYPE];
export function adjustNewNodes( export function adjustNewNodes(
@ -39,22 +15,20 @@ export function adjustNewNodes(
} }
function adjustNewChild(parent: AddedNode, child: AddedNode) { function adjustNewChild(parent: AddedNode, child: AddedNode) {
if (AI_NODES.includes(child.type)) { if (AI_ROOT_NODE_TYPES.includes(child.type) && PROMPT_PROVIDER_NODE_NAMES.includes(parent.type)) {
if (PROMPT_PROVIDER_NODE_NAMES.includes(parent.type)) {
Object.assign<AddedNode, Partial<INode>>(child, { Object.assign<AddedNode, Partial<INode>>(child, {
parameters: { ...child.parameters, promptType: 'auto', text: '={{ $json.chatInput }}' }, parameters: { ...child.parameters, promptType: 'auto', text: '={{ $json.chatInput }}' },
}); });
} }
}
} }
function adjustNewParent(parent: AddedNode, child: AddedNode) { function adjustNewParent(parent: AddedNode, child: AddedNode) {
if (MEMORY_NODE_NAMES.includes(parent.type) && child.name) { if (AI_MEMORY_NODE_TYPES.includes(parent.type) && child.name) {
const { getCurrentWorkflow } = useWorkflowsStore(); const { getCurrentWorkflow } = useWorkflowsStore();
const workflow = getCurrentWorkflow(); const workflow = getCurrentWorkflow();
// If a memory node is added to an Agent, the memory node is actually the parent since it provides input // If a memory node is added to an Agent, the memory node is actually a parent since it provides input
// So we need to look for the Agent's parents to determine if there is a sessionId provider // So we need to look for the Agent's (other) parents to determine if there is a sessionId provider
const ps = workflow.getParentNodesByDepth(child.name, 1); const ps = workflow.getParentNodesByDepth(child.name, 1);
if ( if (
!ps.some((x) => PROMPT_PROVIDER_NODE_NAMES.includes(workflow.getNode(x.name)?.type ?? '')) !ps.some((x) => PROMPT_PROVIDER_NODE_NAMES.includes(workflow.getNode(x.name)?.type ?? ''))