n8n-core 1.91.0 → 1.93.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/build.tsbuildinfo +1 -1
- package/dist/constants.d.ts +0 -3
- package/dist/constants.js +1 -5
- package/dist/constants.js.map +1 -1
- package/dist/credentials.js +2 -2
- package/dist/credentials.js.map +1 -1
- package/dist/errors/error-reporter.js +1 -1
- package/dist/errors/error-reporter.js.map +1 -1
- package/dist/execution-engine/node-execution-context/execute-context.js +2 -1
- package/dist/execution-engine/node-execution-context/execute-context.js.map +1 -1
- package/dist/execution-engine/node-execution-context/supply-data-context.d.ts +3 -1
- package/dist/execution-engine/node-execution-context/supply-data-context.js +13 -7
- package/dist/execution-engine/node-execution-context/supply-data-context.js.map +1 -1
- package/dist/execution-engine/node-execution-context/utils/create-node-as-tool.js +2 -17
- package/dist/execution-engine/node-execution-context/utils/create-node-as-tool.js.map +1 -1
- package/dist/execution-engine/node-execution-context/utils/get-input-connection-data.d.ts +1 -1
- package/dist/execution-engine/node-execution-context/utils/get-input-connection-data.js +11 -8
- package/dist/execution-engine/node-execution-context/utils/get-input-connection-data.js.map +1 -1
- package/dist/execution-engine/partial-execution-utils/is-tool.js +13 -1
- package/dist/execution-engine/partial-execution-utils/is-tool.js.map +1 -1
- package/dist/execution-engine/partial-execution-utils/rewire-graph.d.ts +3 -2
- package/dist/execution-engine/partial-execution-utils/rewire-graph.js +18 -2
- package/dist/execution-engine/partial-execution-utils/rewire-graph.js.map +1 -1
- package/dist/execution-engine/workflow-execute.d.ts +3 -3
- package/dist/execution-engine/workflow-execute.js +12 -5
- package/dist/execution-engine/workflow-execute.js.map +1 -1
- package/dist/instance-settings/instance-settings.d.ts +1 -1
- package/dist/instance-settings/instance-settings.js +5 -5
- package/dist/instance-settings/instance-settings.js.map +1 -1
- package/dist/logging/logger.d.ts +1 -2
- package/dist/logging/logger.js +6 -8
- package/dist/logging/logger.js.map +1 -1
- package/dist/nodes-loader/load-class-in-isolation.js +2 -2
- package/dist/nodes-loader/load-class-in-isolation.js.map +1 -1
- package/dist/utils/index.d.ts +0 -1
- package/dist/utils/index.js +0 -3
- package/dist/utils/index.js.map +1 -1
- package/dist/utils/serialized-buffer.js +2 -2
- package/dist/utils/serialized-buffer.js.map +1 -1
- package/package.json +8 -7
- package/dist/instance-settings/instance-settings-config.d.ts +0 -6
- package/dist/instance-settings/instance-settings-config.js +0 -35
- package/dist/instance-settings/instance-settings-config.js.map +0 -1
- package/dist/utils/is-object-literal.d.ts +0 -5
- package/dist/utils/is-object-literal.js +0 -10
- package/dist/utils/is-object-literal.js.map +0 -1
package/dist/constants.d.ts
CHANGED
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
export declare const inProduction: boolean;
|
|
2
|
-
export declare const inDevelopment: boolean;
|
|
3
|
-
export declare const inTest: boolean;
|
|
4
1
|
export declare const CUSTOM_EXTENSION_ENV = "N8N_CUSTOM_EXTENSIONS";
|
|
5
2
|
export declare const PLACEHOLDER_EMPTY_EXECUTION_ID = "__UNKNOWN__";
|
|
6
3
|
export declare const PLACEHOLDER_EMPTY_WORKFLOW_ID = "__EMPTY__";
|
package/dist/constants.js
CHANGED
|
@@ -1,10 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.CREDENTIAL_ERRORS = exports.UM_EMAIL_TEMPLATES_PWRESET = exports.UM_EMAIL_TEMPLATES_INVITE = exports.BINARY_DATA_STORAGE_PATH = exports.CONFIG_FILES = exports.BLOCK_FILE_ACCESS_TO_N8N_FILES = exports.RESTRICT_FILE_ACCESS_TO = exports.HTTP_REQUEST_TOOL_NODE_TYPE = exports.HTTP_REQUEST_AS_TOOL_NODE_TYPE = exports.HTTP_REQUEST_NODE_TYPE = exports.PLACEHOLDER_EMPTY_WORKFLOW_ID = exports.PLACEHOLDER_EMPTY_EXECUTION_ID = exports.CUSTOM_EXTENSION_ENV =
|
|
4
|
-
const { NODE_ENV } = process.env;
|
|
5
|
-
exports.inProduction = NODE_ENV === 'production';
|
|
6
|
-
exports.inDevelopment = !NODE_ENV || NODE_ENV === 'development';
|
|
7
|
-
exports.inTest = NODE_ENV === 'test';
|
|
3
|
+
exports.CREDENTIAL_ERRORS = exports.UM_EMAIL_TEMPLATES_PWRESET = exports.UM_EMAIL_TEMPLATES_INVITE = exports.BINARY_DATA_STORAGE_PATH = exports.CONFIG_FILES = exports.BLOCK_FILE_ACCESS_TO_N8N_FILES = exports.RESTRICT_FILE_ACCESS_TO = exports.HTTP_REQUEST_TOOL_NODE_TYPE = exports.HTTP_REQUEST_AS_TOOL_NODE_TYPE = exports.HTTP_REQUEST_NODE_TYPE = exports.PLACEHOLDER_EMPTY_WORKFLOW_ID = exports.PLACEHOLDER_EMPTY_EXECUTION_ID = exports.CUSTOM_EXTENSION_ENV = void 0;
|
|
8
4
|
exports.CUSTOM_EXTENSION_ENV = 'N8N_CUSTOM_EXTENSIONS';
|
|
9
5
|
exports.PLACEHOLDER_EMPTY_EXECUTION_ID = '__UNKNOWN__';
|
|
10
6
|
exports.PLACEHOLDER_EMPTY_WORKFLOW_ID = '__EMPTY__';
|
package/dist/constants.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,oBAAoB,GAAG,uBAAuB,CAAC;AAC/C,QAAA,8BAA8B,GAAG,aAAa,CAAC;AAC/C,QAAA,6BAA6B,GAAG,WAAW,CAAC;AAC5C,QAAA,sBAAsB,GAAG,4BAA4B,CAAC;AACtD,QAAA,8BAA8B,GAAG,gCAAgC,CAAC;AAClE,QAAA,2BAA2B,GAAG,0CAA0C,CAAC;AAEzE,QAAA,uBAAuB,GAAG,6BAA6B,CAAC;AACxD,QAAA,8BAA8B,GAAG,oCAAoC,CAAC;AACtE,QAAA,YAAY,GAAG,kBAAkB,CAAC;AAClC,QAAA,wBAAwB,GAAG,8BAA8B,CAAC;AAC1D,QAAA,yBAAyB,GAAG,+BAA+B,CAAC;AAC5D,QAAA,0BAA0B,GAAG,gCAAgC,CAAC;AAE9D,QAAA,iBAAiB,GAAG;IAChC,OAAO,EAAE,qCAAqC;IAC9C,iBAAiB,EAChB,yHAAyH;IAC1H,YAAY,EAAE,+CAA+C;IAC7D,YAAY,EAAE,4CAA4C;CAC1D,CAAC"}
|
package/dist/credentials.js
CHANGED
|
@@ -34,12 +34,12 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
34
34
|
})();
|
|
35
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
36
|
exports.Credentials = exports.CredentialDataError = void 0;
|
|
37
|
+
const backend_common_1 = require("@n8n/backend-common");
|
|
37
38
|
const di_1 = require("@n8n/di");
|
|
38
39
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
39
40
|
const a = __importStar(require("node:assert"));
|
|
40
41
|
const constants_1 = require("./constants");
|
|
41
42
|
const cipher_1 = require("./encryption/cipher");
|
|
42
|
-
const utils_1 = require("./utils");
|
|
43
43
|
class CredentialDataError extends n8n_workflow_1.ApplicationError {
|
|
44
44
|
constructor({ name, type, id }, message, cause) {
|
|
45
45
|
super(message, {
|
|
@@ -55,7 +55,7 @@ class Credentials extends n8n_workflow_1.ICredentials {
|
|
|
55
55
|
this.cipher = di_1.Container.get(cipher_1.Cipher);
|
|
56
56
|
}
|
|
57
57
|
setData(data) {
|
|
58
|
-
a.ok((0,
|
|
58
|
+
a.ok((0, backend_common_1.isObjectLiteral)(data));
|
|
59
59
|
this.data = this.cipher.encrypt(data);
|
|
60
60
|
}
|
|
61
61
|
updateData(toUpdate, toDelete = []) {
|
package/dist/credentials.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"credentials.js","sourceRoot":"","sources":["../src/credentials.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gCAAoC;AAEpC,+CAAyE;AACzE,+CAAiC;AAEjC,2CAAgD;AAChD,gDAA6C;
|
|
1
|
+
{"version":3,"file":"credentials.js","sourceRoot":"","sources":["../src/credentials.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wDAAsD;AACtD,gCAAoC;AAEpC,+CAAyE;AACzE,+CAAiC;AAEjC,2CAAgD;AAChD,gDAA6C;AAE7C,MAAa,mBAAoB,SAAQ,+BAAgB;IACxD,YAAY,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAuB,EAAE,OAAe,EAAE,KAAe;QACpF,KAAK,CAAC,OAAO,EAAE;YACd,KAAK,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE;YACzB,KAAK;SACL,CAAC,CAAC;IACJ,CAAC;CACD;AAPD,kDAOC;AAED,MAAa,WAEX,SAAQ,2BAAe;IAFzB;;QAGkB,WAAM,GAAG,cAAS,CAAC,GAAG,CAAC,eAAM,CAAC,CAAC;IA4DjD,CAAC;IAvDA,OAAO,CAAC,IAAO;QACd,CAAC,CAAC,EAAE,CAAC,IAAA,gCAAe,EAAC,IAAI,CAAC,CAAC,CAAC;QAE5B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACvC,CAAC;IAMD,UAAU,CAAC,QAAoB,EAAE,WAA2B,EAAE;QAC7D,MAAM,WAAW,GAAM,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE,EAAE,GAAG,QAAQ,EAAE,CAAC;QAC1D,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;YAC5B,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC;QACzB,CAAC;QACD,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAC3B,CAAC;IAKD,OAAO;QACN,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAC7B,MAAM,IAAI,mBAAmB,CAAC,IAAI,EAAE,6BAAiB,CAAC,OAAO,CAAC,CAAC;QAChE,CAAC;QAED,IAAI,aAAqB,CAAC;QAC1B,IAAI,CAAC;YACJ,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAChD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,IAAI,mBAAmB,CAAC,IAAI,EAAE,6BAAiB,CAAC,iBAAiB,EAAE,KAAK,CAAC,CAAC;QACjF,CAAC;QAED,IAAI,CAAC;YACJ,OAAO,IAAA,wBAAS,EAAC,aAAa,CAAC,CAAC;QACjC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,IAAI,mBAAmB,CAAC,IAAI,EAAE,6BAAiB,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;QAC5E,CAAC;IACF,CAAC;IAKD,aAAa;QACZ,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAC7B,MAAM,IAAI,+BAAgB,CAAC,kCAAkC,CAAC,CAAC;QAChE,CAAC;QAED,OAAO;YACN,EAAE,EAAE,IAAI,CAAC,EAAE;YACX,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,IAAI,EAAE,IAAI,CAAC,IAAI;SACf,CAAC;IACH,CAAC;CACD;AA/DD,kCA+DC"}
|
|
@@ -126,7 +126,7 @@ let ErrorReporter = class ErrorReporter {
|
|
|
126
126
|
beforeSend: this.beforeSend.bind(this),
|
|
127
127
|
integrations: (integrations) => [
|
|
128
128
|
...integrations.filter(({ name }) => enabledIntegrations.includes(name)),
|
|
129
|
-
rewriteFramesIntegration({ root:
|
|
129
|
+
rewriteFramesIntegration({ root: '/' }),
|
|
130
130
|
requestDataIntegration({
|
|
131
131
|
include: {
|
|
132
132
|
cookies: false,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error-reporter.js","sourceRoot":"","sources":["../../src/errors/error-reporter.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"error-reporter.js","sourceRoot":"","sources":["../../src/errors/error-reporter.ts"],"names":[],"mappings":"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"}
|
|
@@ -52,7 +52,8 @@ class ExecuteContext extends base_execute_context_1.BaseExecuteContext {
|
|
|
52
52
|
}
|
|
53
53
|
logNodeOutput(...args) {
|
|
54
54
|
if (this.mode === 'manual') {
|
|
55
|
-
|
|
55
|
+
const parsedLogArgs = args.map((arg) => typeof arg === 'string' ? (0, n8n_workflow_1.jsonParse)(arg, { fallbackValue: arg }) : arg);
|
|
56
|
+
this.sendMessageToUI(...parsedLogArgs);
|
|
56
57
|
return;
|
|
57
58
|
}
|
|
58
59
|
if (process.env.CODE_ENABLE_STDOUT === 'true') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute-context.js","sourceRoot":"","sources":["../../../src/execution-engine/node-execution-context/execute-context.ts"],"names":[],"mappings":";;;AAkBA,+
|
|
1
|
+
{"version":3,"file":"execute-context.js","sourceRoot":"","sources":["../../../src/execution-engine/node-execution-context/execute-context.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,13 +5,15 @@ export declare class SupplyDataContext extends BaseExecuteContext implements ISu
|
|
|
5
5
|
private readonly closeFunctions;
|
|
6
6
|
readonly helpers: ISupplyDataFunctions['helpers'];
|
|
7
7
|
readonly getNodeParameter: ISupplyDataFunctions['getNodeParameter'];
|
|
8
|
-
|
|
8
|
+
readonly parentNode?: INode;
|
|
9
|
+
constructor(workflow: Workflow, node: INode, additionalData: IWorkflowExecuteAdditionalData, mode: WorkflowExecuteMode, runExecutionData: IRunExecutionData, runIndex: number, connectionInputData: INodeExecutionData[], inputData: ITaskDataConnections, connectionType: NodeConnectionType, executeData: IExecuteData, closeFunctions: CloseFunction[], abortSignal?: AbortSignal, parentNode?: INode);
|
|
9
10
|
cloneWith(replacements: {
|
|
10
11
|
runIndex: number;
|
|
11
12
|
inputData: INodeExecutionData[][];
|
|
12
13
|
}): SupplyDataContext;
|
|
13
14
|
getInputConnectionData(connectionType: AINodeConnectionType, itemIndex: number): Promise<unknown>;
|
|
14
15
|
getInputData(inputIndex?: number, connectionType?: NodeConnectionType): INodeExecutionData[];
|
|
16
|
+
getNextRunIndex(): number;
|
|
15
17
|
addInputData(connectionType: AINodeConnectionType, data: INodeExecutionData[][]): {
|
|
16
18
|
index: number;
|
|
17
19
|
};
|
|
@@ -18,10 +18,11 @@ const request_helper_functions_1 = require("./utils/request-helper-functions");
|
|
|
18
18
|
const return_json_array_1 = require("./utils/return-json-array");
|
|
19
19
|
const ssh_tunnel_helper_functions_1 = require("./utils/ssh-tunnel-helper-functions");
|
|
20
20
|
class SupplyDataContext extends base_execute_context_1.BaseExecuteContext {
|
|
21
|
-
constructor(workflow, node, additionalData, mode, runExecutionData, runIndex, connectionInputData, inputData, connectionType, executeData, closeFunctions, abortSignal) {
|
|
21
|
+
constructor(workflow, node, additionalData, mode, runExecutionData, runIndex, connectionInputData, inputData, connectionType, executeData, closeFunctions, abortSignal, parentNode) {
|
|
22
22
|
super(workflow, node, additionalData, mode, runExecutionData, runIndex, connectionInputData, inputData, executeData, abortSignal);
|
|
23
23
|
this.connectionType = connectionType;
|
|
24
24
|
this.closeFunctions = closeFunctions;
|
|
25
|
+
this.parentNode = parentNode;
|
|
25
26
|
this.helpers = {
|
|
26
27
|
createDeferredPromise: n8n_workflow_1.createDeferredPromise,
|
|
27
28
|
copyInputItems: copy_input_items_1.copyInputItems,
|
|
@@ -40,7 +41,7 @@ class SupplyDataContext extends base_execute_context_1.BaseExecuteContext {
|
|
|
40
41
|
this.getNodeParameter = ((parameterName, itemIndex, fallbackValue, options) => this._getNodeParameter(parameterName, itemIndex, fallbackValue, options));
|
|
41
42
|
}
|
|
42
43
|
cloneWith(replacements) {
|
|
43
|
-
const context = new SupplyDataContext(this.workflow, this.node, this.additionalData, this.mode, this.runExecutionData, replacements.runIndex, this.connectionInputData, {}, this.connectionType, this.executeData, this.closeFunctions, this.abortSignal);
|
|
44
|
+
const context = new SupplyDataContext(this.workflow, this.node, this.additionalData, this.mode, this.runExecutionData, replacements.runIndex, this.connectionInputData, {}, this.connectionType, this.executeData, this.closeFunctions, this.abortSignal, this.parentNode);
|
|
44
45
|
context.addInputData(n8n_workflow_1.NodeConnectionTypes.AiTool, replacements.inputData);
|
|
45
46
|
return context;
|
|
46
47
|
}
|
|
@@ -53,12 +54,13 @@ class SupplyDataContext extends base_execute_context_1.BaseExecuteContext {
|
|
|
53
54
|
}
|
|
54
55
|
return super.getInputItems(inputIndex, connectionType) ?? [];
|
|
55
56
|
}
|
|
57
|
+
getNextRunIndex() {
|
|
58
|
+
const nodeName = this.node.name;
|
|
59
|
+
return this.runExecutionData.resultData.runData[nodeName]?.length ?? 0;
|
|
60
|
+
}
|
|
56
61
|
addInputData(connectionType, data) {
|
|
57
62
|
const nodeName = this.node.name;
|
|
58
|
-
|
|
59
|
-
if (this.runExecutionData.resultData.runData.hasOwnProperty(nodeName)) {
|
|
60
|
-
currentNodeRunIndex = this.runExecutionData.resultData.runData[nodeName].length;
|
|
61
|
-
}
|
|
63
|
+
const currentNodeRunIndex = this.getNextRunIndex();
|
|
62
64
|
this.addExecutionDataFunctions('input', data, connectionType, nodeName, currentNodeRunIndex).catch((error) => {
|
|
63
65
|
this.logger.warn(`There was a problem logging input data of node "${nodeName}": ${error.message}`);
|
|
64
66
|
});
|
|
@@ -73,13 +75,16 @@ class SupplyDataContext extends base_execute_context_1.BaseExecuteContext {
|
|
|
73
75
|
async addExecutionDataFunctions(type, data, connectionType, sourceNodeName, currentNodeRunIndex, metadata) {
|
|
74
76
|
const { additionalData, runExecutionData, runIndex: sourceNodeRunIndex, node: { name: nodeName }, } = this;
|
|
75
77
|
let taskData;
|
|
78
|
+
const source = this.parentNode
|
|
79
|
+
? [{ previousNode: this.parentNode.name, previousNodeRun: sourceNodeRunIndex }]
|
|
80
|
+
: [];
|
|
76
81
|
if (type === 'input') {
|
|
77
82
|
taskData = {
|
|
78
83
|
startTime: Date.now(),
|
|
79
84
|
executionTime: 0,
|
|
80
85
|
executionIndex: additionalData.currentNodeExecutionIndex++,
|
|
81
86
|
executionStatus: 'running',
|
|
82
|
-
source
|
|
87
|
+
source,
|
|
83
88
|
};
|
|
84
89
|
}
|
|
85
90
|
else {
|
|
@@ -88,6 +93,7 @@ class SupplyDataContext extends base_execute_context_1.BaseExecuteContext {
|
|
|
88
93
|
return;
|
|
89
94
|
}
|
|
90
95
|
taskData.metadata = metadata;
|
|
96
|
+
taskData.source = source;
|
|
91
97
|
}
|
|
92
98
|
taskData = taskData;
|
|
93
99
|
if (data instanceof Error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"supply-data-context.js","sourceRoot":"","sources":["../../../src/execution-engine/node-execution-context/supply-data-context.ts"],"names":[],"mappings":";;;;;;AAAA,qDAA6B;
|
|
1
|
+
{"version":3,"file":"supply-data-context.js","sourceRoot":"","sources":["../../../src/execution-engine/node-execution-context/supply-data-context.ts"],"names":[],"mappings":"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"}
|
|
@@ -47,28 +47,13 @@ function getSchema(node) {
|
|
|
47
47
|
}, {});
|
|
48
48
|
return zod_1.z.object(schemaObj).required();
|
|
49
49
|
}
|
|
50
|
-
function makeDescription(node, nodeType) {
|
|
51
|
-
if (node.parameters.descriptionType === 'auto') {
|
|
52
|
-
const resource = node.parameters.resource;
|
|
53
|
-
const operation = node.parameters.operation;
|
|
54
|
-
let description = nodeType.description.description;
|
|
55
|
-
if (resource) {
|
|
56
|
-
description += `\n Resource: ${resource}`;
|
|
57
|
-
}
|
|
58
|
-
if (operation) {
|
|
59
|
-
description += `\n Operation: ${operation}`;
|
|
60
|
-
}
|
|
61
|
-
return description.trim();
|
|
62
|
-
}
|
|
63
|
-
return node.parameters.toolDescription ?? nodeType.description.description;
|
|
64
|
-
}
|
|
65
50
|
function nodeNameToToolName(node) {
|
|
66
|
-
return node.name.replace(/ /g, '_');
|
|
51
|
+
return node.name.replace(/[\s.?!=+#@&*()[\]{}:;,<>\/\\'"^%$]/g, '_').replace(/_+/g, '_');
|
|
67
52
|
}
|
|
68
53
|
function createTool(options) {
|
|
69
54
|
const { node, nodeType, handleToolInvocation } = options;
|
|
70
55
|
const schema = getSchema(node);
|
|
71
|
-
const description =
|
|
56
|
+
const description = n8n_workflow_1.NodeHelpers.getToolDescriptionForNode(node, nodeType);
|
|
72
57
|
const nodeName = nodeNameToToolName(node);
|
|
73
58
|
const name = nodeName || nodeType.description.name;
|
|
74
59
|
return new tools_1.DynamicStructuredTool({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-node-as-tool.js","sourceRoot":"","sources":["../../../../src/execution-engine/node-execution-context/utils/create-node-as-tool.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"create-node-as-tool.js","sourceRoot":"","sources":["../../../../src/execution-engine/node-execution-context/utils/create-node-as-tool.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { CloseFunction, IExecuteData, INodeExecutionData, IRunExecutionData, ITaskDataConnections, IWorkflowExecuteAdditionalData, Workflow, WorkflowExecuteMode, AINodeConnectionType, IDataObject, ISupplyDataFunctions, INodeType, INode } from 'n8n-workflow';
|
|
2
2
|
import type { ExecuteContext, WebhookContext } from '../../node-execution-context';
|
|
3
3
|
import { SupplyDataContext } from '../../node-execution-context/supply-data-context';
|
|
4
|
-
export declare function makeHandleToolInvocation(contextFactory: (runIndex: number) => ISupplyDataFunctions, node: INode, nodeType: INodeType): (toolArgs: IDataObject) => Promise<string>;
|
|
4
|
+
export declare function makeHandleToolInvocation(contextFactory: (runIndex: number) => ISupplyDataFunctions, node: INode, nodeType: INodeType, runExecutionData: IRunExecutionData): (toolArgs: IDataObject) => Promise<string>;
|
|
5
5
|
export declare function getInputConnectionData(this: ExecuteContext | WebhookContext | SupplyDataContext, workflow: Workflow, runExecutionData: IRunExecutionData, parentRunIndex: number, connectionInputData: INodeExecutionData[], parentInputData: ITaskDataConnections, additionalData: IWorkflowExecuteAdditionalData, executeData: IExecuteData, mode: WorkflowExecuteMode, closeFunctions: CloseFunction[], connectionType: AINodeConnectionType, itemIndex: number, abortSignal?: AbortSignal): Promise<unknown>;
|
|
@@ -5,11 +5,14 @@ exports.getInputConnectionData = getInputConnectionData;
|
|
|
5
5
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
6
6
|
const create_node_as_tool_1 = require("./create-node-as-tool");
|
|
7
7
|
const supply_data_context_1 = require("../../node-execution-context/supply-data-context");
|
|
8
|
-
function
|
|
9
|
-
|
|
8
|
+
function getNextRunIndex(runExecutionData, nodeName) {
|
|
9
|
+
return runExecutionData.resultData.runData[nodeName]?.length ?? 0;
|
|
10
|
+
}
|
|
11
|
+
function makeHandleToolInvocation(contextFactory, node, nodeType, runExecutionData) {
|
|
12
|
+
let runIndex = getNextRunIndex(runExecutionData, node.name);
|
|
10
13
|
return async (toolArgs) => {
|
|
11
|
-
const
|
|
12
|
-
const context = contextFactory(
|
|
14
|
+
const localRunIndex = runIndex++;
|
|
15
|
+
const context = contextFactory(localRunIndex);
|
|
13
16
|
context.addInputData(n8n_workflow_1.NodeConnectionTypes.AiTool, [[{ json: toolArgs }]]);
|
|
14
17
|
try {
|
|
15
18
|
const result = await nodeType.execute?.call(context);
|
|
@@ -24,12 +27,12 @@ function makeHandleToolInvocation(contextFactory, node, nodeType) {
|
|
|
24
27
|
context.logger.warn(`Response from Tool '${node.name}' included binary data, which is not supported in Agents. The binary data was omitted from the response.`);
|
|
25
28
|
}
|
|
26
29
|
}
|
|
27
|
-
context.addOutputData(n8n_workflow_1.NodeConnectionTypes.AiTool,
|
|
30
|
+
context.addOutputData(n8n_workflow_1.NodeConnectionTypes.AiTool, localRunIndex, [[{ json: { response } }]]);
|
|
28
31
|
return JSON.stringify(response);
|
|
29
32
|
}
|
|
30
33
|
catch (error) {
|
|
31
34
|
const nodeError = new n8n_workflow_1.NodeOperationError(node, error);
|
|
32
|
-
context.addOutputData(n8n_workflow_1.NodeConnectionTypes.AiTool,
|
|
35
|
+
context.addOutputData(n8n_workflow_1.NodeConnectionTypes.AiTool, localRunIndex, nodeError);
|
|
33
36
|
return 'Error during node execution: ' + (nodeError.description ?? nodeError.message);
|
|
34
37
|
}
|
|
35
38
|
};
|
|
@@ -56,13 +59,13 @@ async function getInputConnectionData(workflow, runExecutionData, parentRunIndex
|
|
|
56
59
|
const nodes = [];
|
|
57
60
|
for (const connectedNode of connectedNodes) {
|
|
58
61
|
const connectedNodeType = workflow.nodeTypes.getByNameAndVersion(connectedNode.type, connectedNode.typeVersion);
|
|
59
|
-
const contextFactory = (runIndex, inputData) => new supply_data_context_1.SupplyDataContext(workflow, connectedNode, additionalData, mode, runExecutionData, runIndex, connectionInputData, inputData, connectionType, executeData, closeFunctions, abortSignal);
|
|
62
|
+
const contextFactory = (runIndex, inputData) => new supply_data_context_1.SupplyDataContext(workflow, connectedNode, additionalData, mode, runExecutionData, runIndex, connectionInputData, inputData, connectionType, executeData, closeFunctions, abortSignal, parentNode);
|
|
60
63
|
if (!connectedNodeType.supplyData) {
|
|
61
64
|
if (connectedNodeType.description.outputs.includes(n8n_workflow_1.NodeConnectionTypes.AiTool)) {
|
|
62
65
|
const supplyData = (0, create_node_as_tool_1.createNodeAsTool)({
|
|
63
66
|
node: connectedNode,
|
|
64
67
|
nodeType: connectedNodeType,
|
|
65
|
-
handleToolInvocation: makeHandleToolInvocation((i) => contextFactory(i, {}), connectedNode, connectedNodeType),
|
|
68
|
+
handleToolInvocation: makeHandleToolInvocation((i) => contextFactory(i, {}), connectedNode, connectedNodeType, runExecutionData),
|
|
66
69
|
});
|
|
67
70
|
nodes.push(supplyData);
|
|
68
71
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-input-connection-data.js","sourceRoot":"","sources":["../../../../src/execution-engine/node-execution-context/utils/get-input-connection-data.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"get-input-connection-data.js","sourceRoot":"","sources":["../../../../src/execution-engine/node-execution-context/utils/get-input-connection-data.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,18 @@ exports.isTool = isTool;
|
|
|
4
4
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
5
5
|
function isTool(node, nodeTypes) {
|
|
6
6
|
const type = nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
|
|
7
|
-
|
|
7
|
+
if (node.type.includes('vectorStore')) {
|
|
8
|
+
const mode = node.parameters?.mode;
|
|
9
|
+
return mode === 'retrieve-as-tool';
|
|
10
|
+
}
|
|
11
|
+
for (const output of type.description.outputs) {
|
|
12
|
+
if (typeof output === 'string') {
|
|
13
|
+
return output === n8n_workflow_1.NodeConnectionTypes.AiTool;
|
|
14
|
+
}
|
|
15
|
+
else if (output?.type && output.type === n8n_workflow_1.NodeConnectionTypes.AiTool) {
|
|
16
|
+
return true;
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
return false;
|
|
8
20
|
}
|
|
9
21
|
//# sourceMappingURL=is-tool.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"is-tool.js","sourceRoot":"","sources":["../../../src/execution-engine/partial-execution-utils/is-tool.ts"],"names":[],"mappings":";;AAEA,
|
|
1
|
+
{"version":3,"file":"is-tool.js","sourceRoot":"","sources":["../../../src/execution-engine/partial-execution-utils/is-tool.ts"],"names":[],"mappings":";;AAEA,wBAmBC;AArBD,+CAAgF;AAEhF,SAAgB,MAAM,CAAC,IAAW,EAAE,SAAqB;IACxD,MAAM,IAAI,GAAG,SAAS,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;IAGxE,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC;QACvC,MAAM,IAAI,GAAG,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC;QACnC,OAAO,IAAI,KAAK,kBAAkB,CAAC;IACpC,CAAC;IAGD,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;QAC/C,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;YAChC,OAAO,MAAM,KAAK,kCAAmB,CAAC,MAAM,CAAC;QAC9C,CAAC;aAAM,IAAI,MAAM,EAAE,IAAI,IAAI,MAAM,CAAC,IAAI,KAAK,kCAAmB,CAAC,MAAM,EAAE,CAAC;YACvE,OAAO,IAAI,CAAC;QACb,CAAC;IACF,CAAC;IAED,OAAO,KAAK,CAAC;AACd,CAAC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
-
import { type INode } from 'n8n-workflow';
|
|
1
|
+
import { type AiAgentRequest, type INode } from 'n8n-workflow';
|
|
2
2
|
import { type DirectedGraph } from './directed-graph';
|
|
3
|
-
export declare
|
|
3
|
+
export declare const TOOL_EXECUTOR_NODE_NAME = "PartialExecutionToolExecutor";
|
|
4
|
+
export declare function rewireGraph(tool: INode, graph: DirectedGraph, agentRequest?: AiAgentRequest): DirectedGraph;
|
|
@@ -33,10 +33,12 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
33
33
|
};
|
|
34
34
|
})();
|
|
35
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
|
+
exports.TOOL_EXECUTOR_NODE_NAME = void 0;
|
|
36
37
|
exports.rewireGraph = rewireGraph;
|
|
37
38
|
const a = __importStar(require("assert/strict"));
|
|
38
39
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
39
|
-
|
|
40
|
+
exports.TOOL_EXECUTOR_NODE_NAME = 'PartialExecutionToolExecutor';
|
|
41
|
+
function rewireGraph(tool, graph, agentRequest) {
|
|
40
42
|
const modifiedGraph = graph.clone();
|
|
41
43
|
const children = modifiedGraph.getChildren(tool);
|
|
42
44
|
if (children.size === 0) {
|
|
@@ -47,9 +49,23 @@ function rewireGraph(tool, graph) {
|
|
|
47
49
|
const allIncomingConnection = modifiedGraph
|
|
48
50
|
.getDirectParentConnections(rootNode)
|
|
49
51
|
.filter((cn) => cn.type === n8n_workflow_1.NodeConnectionTypes.Main);
|
|
52
|
+
const toolExecutor = {
|
|
53
|
+
name: exports.TOOL_EXECUTOR_NODE_NAME,
|
|
54
|
+
disabled: false,
|
|
55
|
+
type: '@n8n/n8n-nodes-langchain.toolExecutor',
|
|
56
|
+
parameters: {
|
|
57
|
+
query: agentRequest?.query ?? {},
|
|
58
|
+
toolName: agentRequest?.tool?.name ?? '',
|
|
59
|
+
},
|
|
60
|
+
id: rootNode.id,
|
|
61
|
+
typeVersion: 0,
|
|
62
|
+
position: [0, 0],
|
|
63
|
+
};
|
|
64
|
+
modifiedGraph.addNode(toolExecutor);
|
|
50
65
|
tool.rewireOutputLogTo = n8n_workflow_1.NodeConnectionTypes.AiTool;
|
|
66
|
+
modifiedGraph.addConnection({ from: tool, to: toolExecutor, type: n8n_workflow_1.NodeConnectionTypes.AiTool });
|
|
51
67
|
for (const cn of allIncomingConnection) {
|
|
52
|
-
modifiedGraph.addConnection({ from: cn.from, to:
|
|
68
|
+
modifiedGraph.addConnection({ from: cn.from, to: toolExecutor, type: cn.type });
|
|
53
69
|
}
|
|
54
70
|
modifiedGraph.removeNode(rootNode);
|
|
55
71
|
return modifiedGraph;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rewire-graph.js","sourceRoot":"","sources":["../../../src/execution-engine/partial-execution-utils/rewire-graph.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"rewire-graph.js","sourceRoot":"","sources":["../../../src/execution-engine/partial-execution-utils/rewire-graph.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAOA,kCAkDC;AAzDD,iDAAmC;AACnC,+CAAoF;AAIvE,QAAA,uBAAuB,GAAG,8BAA8B,CAAC;AAEtE,SAAgB,WAAW,CAC1B,IAAW,EACX,KAAoB,EACpB,YAA6B;IAE7B,MAAM,aAAa,GAAG,KAAK,CAAC,KAAK,EAAE,CAAC;IACpC,MAAM,QAAQ,GAAG,aAAa,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IAEjD,IAAI,QAAQ,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,KAAK,CAAC;IACd,CAAC;IAED,MAAM,QAAQ,GAAG,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;IAElC,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;IAEf,MAAM,qBAAqB,GAAG,aAAa;SACzC,0BAA0B,CAAC,QAAQ,CAAC;SACpC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,KAAK,kCAAmB,CAAC,IAAI,CAAC,CAAC;IAGvD,MAAM,YAAY,GAAU;QAC3B,IAAI,EAAE,+BAAuB;QAC7B,QAAQ,EAAE,KAAK;QACf,IAAI,EAAE,uCAAuC;QAC7C,UAAU,EAAE;YACX,KAAK,EAAE,YAAY,EAAE,KAAK,IAAI,EAAE;YAChC,QAAQ,EAAE,YAAY,EAAE,IAAI,EAAE,IAAI,IAAI,EAAE;SACxC;QACD,EAAE,EAAE,QAAQ,CAAC,EAAE;QACf,WAAW,EAAE,CAAC;QACd,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;KAChB,CAAC;IAGF,aAAa,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IAGpC,IAAI,CAAC,iBAAiB,GAAG,kCAAmB,CAAC,MAAM,CAAC;IACpD,aAAa,CAAC,aAAa,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,kCAAmB,CAAC,MAAM,EAAE,CAAC,CAAC;IAGhG,KAAK,MAAM,EAAE,IAAI,qBAAqB,EAAE,CAAC;QACxC,aAAa,CAAC,aAAa,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;IACjF,CAAC;IAGD,aAAa,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IAEnC,OAAO,aAAa,CAAC;AACtB,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { ExecutionBaseError, IConnection, IExecuteData, INode, INodeExecutionData, IPinData, IRun, IRunData, Workflow, IRunExecutionData, IWorkflowExecuteAdditionalData, WorkflowExecuteMode, StartNodeData, IRunNodeResponse, IWorkflowIssues } from 'n8n-workflow';
|
|
1
|
+
import type { ExecutionBaseError, IConnection, IExecuteData, INode, INodeExecutionData, IPinData, IRun, IRunData, Workflow, IRunExecutionData, IWorkflowExecuteAdditionalData, WorkflowExecuteMode, StartNodeData, IRunNodeResponse, IWorkflowIssues, AiAgentRequest, IWorkflowExecutionDataProcess } from 'n8n-workflow';
|
|
2
2
|
import PCancelable from 'p-cancelable';
|
|
3
3
|
export declare class WorkflowExecute {
|
|
4
4
|
private readonly additionalData;
|
|
@@ -7,10 +7,10 @@ export declare class WorkflowExecute {
|
|
|
7
7
|
private status;
|
|
8
8
|
private readonly abortController;
|
|
9
9
|
constructor(additionalData: IWorkflowExecuteAdditionalData, mode: WorkflowExecuteMode, runExecutionData?: IRunExecutionData);
|
|
10
|
-
run(workflow: Workflow, startNode?: INode, destinationNode?: string, pinData?: IPinData): PCancelable<IRun>;
|
|
10
|
+
run(workflow: Workflow, startNode?: INode, destinationNode?: string, pinData?: IPinData, triggerToStartFrom?: IWorkflowExecutionDataProcess['triggerToStartFrom']): PCancelable<IRun>;
|
|
11
11
|
forceInputNodeExecution(workflow: Workflow): boolean;
|
|
12
12
|
runPartialWorkflow(workflow: Workflow, runData: IRunData, startNodes: StartNodeData[], destinationNode?: string, pinData?: IPinData): PCancelable<IRun>;
|
|
13
|
-
runPartialWorkflow2(workflow: Workflow, runData: IRunData, pinData?: IPinData, dirtyNodeNames?: string[], destinationNodeName?: string): PCancelable<IRun>;
|
|
13
|
+
runPartialWorkflow2(workflow: Workflow, runData: IRunData, pinData?: IPinData, dirtyNodeNames?: string[], destinationNodeName?: string, agentRequest?: AiAgentRequest): PCancelable<IRun>;
|
|
14
14
|
moveNodeMetadata(): void;
|
|
15
15
|
incomingConnectionIsEmpty(runData: IRunData, inputConnections: IConnection[], runIndex: number): boolean;
|
|
16
16
|
prepareWaitingToExecution(nodeName: string, numberOfConnections: number, runIndex: number): void;
|
|
@@ -48,6 +48,7 @@ const workflow_has_issues_error_1 = require("../errors/workflow-has-issues.error
|
|
|
48
48
|
const NodeExecuteFunctions = __importStar(require("../node-execute-functions"));
|
|
49
49
|
const node_execution_context_1 = require("./node-execution-context");
|
|
50
50
|
const partial_execution_utils_1 = require("./partial-execution-utils");
|
|
51
|
+
const rewire_graph_1 = require("./partial-execution-utils/rewire-graph");
|
|
51
52
|
const routing_node_1 = require("./routing-node");
|
|
52
53
|
const triggers_and_pollers_1 = require("./triggers-and-pollers");
|
|
53
54
|
class WorkflowExecute {
|
|
@@ -71,7 +72,7 @@ class WorkflowExecute {
|
|
|
71
72
|
this.status = 'new';
|
|
72
73
|
this.abortController = new AbortController();
|
|
73
74
|
}
|
|
74
|
-
run(workflow, startNode, destinationNode, pinData) {
|
|
75
|
+
run(workflow, startNode, destinationNode, pinData, triggerToStartFrom) {
|
|
75
76
|
this.status = 'running';
|
|
76
77
|
startNode = startNode || workflow.getStartNode(destinationNode);
|
|
77
78
|
if (startNode === undefined) {
|
|
@@ -85,7 +86,7 @@ class WorkflowExecute {
|
|
|
85
86
|
const nodeExecutionStack = [
|
|
86
87
|
{
|
|
87
88
|
node: startNode,
|
|
88
|
-
data: {
|
|
89
|
+
data: triggerToStartFrom?.data?.data ?? {
|
|
89
90
|
main: [
|
|
90
91
|
[
|
|
91
92
|
{
|
|
@@ -236,14 +237,20 @@ class WorkflowExecute {
|
|
|
236
237
|
};
|
|
237
238
|
return this.processRunExecutionData(workflow);
|
|
238
239
|
}
|
|
239
|
-
runPartialWorkflow2(workflow, runData, pinData = {}, dirtyNodeNames = [], destinationNodeName) {
|
|
240
|
+
runPartialWorkflow2(workflow, runData, pinData = {}, dirtyNodeNames = [], destinationNodeName, agentRequest) {
|
|
240
241
|
assert.ok(destinationNodeName, 'a destinationNodeName is required for the new partial execution flow');
|
|
241
|
-
|
|
242
|
+
let destination = workflow.getNode(destinationNodeName);
|
|
242
243
|
assert.ok(destination, `Could not find a node with the name ${destinationNodeName} in the workflow.`);
|
|
243
244
|
let graph = partial_execution_utils_1.DirectedGraph.fromWorkflow(workflow);
|
|
244
245
|
if ((0, partial_execution_utils_1.isTool)(destination, workflow.nodeTypes)) {
|
|
245
|
-
graph = (0, partial_execution_utils_1.rewireGraph)(destination, graph);
|
|
246
|
+
graph = (0, partial_execution_utils_1.rewireGraph)(destination, graph, agentRequest);
|
|
246
247
|
workflow = graph.toWorkflow({ ...workflow });
|
|
248
|
+
const toolExecutorNode = workflow.getNode(rewire_graph_1.TOOL_EXECUTOR_NODE_NAME);
|
|
249
|
+
if (!toolExecutorNode) {
|
|
250
|
+
throw new n8n_workflow_1.OperationalError('ToolExecutor can not be found');
|
|
251
|
+
}
|
|
252
|
+
destination = toolExecutorNode;
|
|
253
|
+
destinationNodeName = toolExecutorNode.name;
|
|
247
254
|
}
|
|
248
255
|
else {
|
|
249
256
|
const destinationHasNoParents = graph.getDirectParentConnections(destination).length === 0;
|