n8n-nodes-simple 2.4.13 → 2.5.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/nodes/shared/api/errors.d.ts +45 -0
- package/dist/nodes/shared/api/errors.js +134 -0
- package/dist/nodes/shared/api/errors.js.map +1 -0
- package/dist/nodes/shared/config/parameters.d.ts +1 -1
- package/dist/nodes/shared/config/parameters.js +1 -1
- package/dist/nodes/shared/config/parameters.js.map +1 -1
- package/dist/nodes/shared/config/properties/options.js +17 -46
- package/dist/nodes/shared/config/properties/options.js.map +1 -1
- package/dist/nodes/shared/config/properties/output.js +22 -34
- package/dist/nodes/shared/config/properties/output.js.map +1 -1
- package/dist/nodes/shared/core/execution/errors.d.ts +14 -0
- package/dist/nodes/shared/core/execution/errors.js +65 -0
- package/dist/nodes/shared/core/execution/errors.js.map +1 -0
- package/dist/nodes/shared/core/execution/executor.d.ts +1 -2
- package/dist/nodes/shared/core/execution/executor.js +73 -75
- package/dist/nodes/shared/core/execution/executor.js.map +1 -1
- package/dist/nodes/shared/core/execution/messageOperation.js +1 -1
- package/dist/nodes/shared/core/execution/messageOperation.js.map +1 -1
- package/dist/nodes/shared/core/execution/outputData.d.ts +1 -1
- package/dist/nodes/shared/core/execution/outputData.js +16 -31
- package/dist/nodes/shared/core/execution/outputData.js.map +1 -1
- package/dist/nodes/shared/core/execution/retryHandler.d.ts +9 -0
- package/dist/nodes/shared/core/execution/retryHandler.js +89 -0
- package/dist/nodes/shared/core/execution/retryHandler.js.map +1 -0
- package/dist/nodes/shared/core/execution/router.js +4 -24
- package/dist/nodes/shared/core/execution/router.js.map +1 -1
- package/dist/nodes/shared/core/request/body.d.ts +1 -1
- package/dist/nodes/shared/core/request/body.js +1 -7
- package/dist/nodes/shared/core/request/body.js.map +1 -1
- package/dist/nodes/shared/core/request/validation.d.ts +11 -0
- package/dist/nodes/shared/core/request/validation.js +47 -0
- package/dist/nodes/shared/core/request/validation.js.map +1 -0
- package/dist/nodes/shared/core/request/visualEditor.js +17 -3
- package/dist/nodes/shared/core/request/visualEditor.js.map +1 -1
- package/dist/nodes/shared/core/tools/executor.d.ts +2 -1
- package/dist/nodes/shared/core/tools/executor.js +7 -4
- package/dist/nodes/shared/core/tools/executor.js.map +1 -1
- package/dist/nodes/shared/core/tools/setup.d.ts +1 -1
- package/dist/nodes/shared/core/tools/setup.js +1 -1
- package/dist/nodes/shared/core/tools/setup.js.map +1 -1
- package/dist/package.json +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/request/validation.ts"],"names":[],"mappings":";;AAmBA,4DA2CC;AAUD,oEAaC;AAnFD,8DAAkE;AAiBlE,SAAgB,wBAAwB,CACvC,UAAmC,EACnC,MAAW;IAGX,IAAI,CAAC,UAAU,EAAE,CAAC;QACjB,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC1B,CAAC;IAED,IAAI,CAAC;QAEJ,MAAM,SAAS,GAAG,IAAA,wCAAsB,EAAC,UAAyB,CAAC,CAAC;QAGpE,MAAM,MAAM,GAAG,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAE3C,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YACpB,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;QAC1B,CAAC;aAAM,CAAC;YAEP,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;gBAChD,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;gBACxB,OAAO,EAAE,GAAG,CAAC,OAAO;aACpB,CAAC,CAAC,CAAC;YAGJ,MAAM,YAAY,GAAG,MAAM;iBACzB,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,GAAG,GAAG,CAAC,OAAO,EAAE,CAAC;iBACpE,IAAI,CAAC,IAAI,CAAC,CAAC;YAEb,OAAO;gBACN,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE,uBAAuB,YAAY,EAAE;gBAC5C,MAAM;aACN,CAAC;QACH,CAAC;IACF,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAEhB,OAAO;YACN,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,4BAA4B,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;SAC3F,CAAC;IACH,CAAC;AACF,CAAC;AAUD,SAAgB,4BAA4B,CAC3C,eAAuB,EACvB,aAAqB,EACrB,4BAAqC,KAAK,EAC1C,UAAmB;IAEnB,MAAM,WAAW,GAAG,mCAAmC,aAAa,mHAAmH,eAAe,MAAM,CAAC;IAE7M,IAAI,yBAAyB,IAAI,UAAU,EAAE,CAAC;QAC7C,OAAO,WAAW,GAAG,uBAAuB,UAAU,4EAA4E,CAAC;IACpI,CAAC;SAAM,CAAC;QACP,OAAO,WAAW,GAAG,gEAAgE,CAAC;IACvF,CAAC;AACF,CAAC"}
|
|
@@ -17,10 +17,24 @@ function convertVisualEditorToSchema(visualEditorProperties, structuredOutputIsA
|
|
|
17
17
|
if (!propertyIsArray && visualProperty.description.trim()) {
|
|
18
18
|
property.description = visualProperty.description;
|
|
19
19
|
}
|
|
20
|
-
if (visualProperty.isEnum) {
|
|
21
|
-
|
|
20
|
+
if (visualProperty.isEnum && visualProperty.enumValues) {
|
|
21
|
+
const enumArray = typeof visualProperty.enumValues === 'string'
|
|
22
|
+
? JSON.parse(visualProperty.enumValues || '[]')
|
|
23
|
+
: visualProperty.enumValues;
|
|
24
|
+
if (Array.isArray(enumArray) && enumArray.length > 0) {
|
|
25
|
+
property.enum = enumArray;
|
|
26
|
+
}
|
|
22
27
|
}
|
|
23
28
|
if (propertyIsArray) {
|
|
29
|
+
let itemEnum;
|
|
30
|
+
if (visualProperty.isEnum && visualProperty.enumValues) {
|
|
31
|
+
const enumArray = typeof visualProperty.enumValues === 'string'
|
|
32
|
+
? JSON.parse(visualProperty.enumValues || '[]')
|
|
33
|
+
: visualProperty.enumValues;
|
|
34
|
+
if (Array.isArray(enumArray) && enumArray.length > 0) {
|
|
35
|
+
itemEnum = enumArray;
|
|
36
|
+
}
|
|
37
|
+
}
|
|
24
38
|
const arrayProperty = {
|
|
25
39
|
type: visualProperty.isOptional ? ['array', 'null'] : 'array',
|
|
26
40
|
...(((_a = visualProperty.description) === null || _a === void 0 ? void 0 : _a.trim()) && { description: visualProperty.description }),
|
|
@@ -29,7 +43,7 @@ function convertVisualEditorToSchema(visualEditorProperties, structuredOutputIsA
|
|
|
29
43
|
...(((_b = visualProperty.elementDescription) === null || _b === void 0 ? void 0 : _b.trim()) && {
|
|
30
44
|
description: visualProperty.elementDescription,
|
|
31
45
|
}),
|
|
32
|
-
...(
|
|
46
|
+
...(itemEnum && { enum: itemEnum }),
|
|
33
47
|
},
|
|
34
48
|
};
|
|
35
49
|
properties[visualProperty.name] = arrayProperty;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"visualEditor.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/request/visualEditor.ts"],"names":[],"mappings":";;AAmCA,
|
|
1
|
+
{"version":3,"file":"visualEditor.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/request/visualEditor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { IExecuteFunctions, IDataObject } from 'n8n-workflow';
|
|
2
2
|
import type { ChatCompletion } from '../../api/types';
|
|
3
|
-
export declare function processToolCalls(executeFunctions: IExecuteFunctions, body: IDataObject, messages: IDataObject[], invokableTools: any[], maxToolsIterations: number, structuredOutputTool?: IDataObject, abortSignal?: AbortSignal): Promise<{
|
|
3
|
+
export declare function processToolCalls(executeFunctions: IExecuteFunctions, body: IDataObject, messages: IDataObject[], invokableTools: any[], maxToolsIterations: number, structuredOutputTool?: IDataObject, abortSignal?: AbortSignal, startingIteration?: number): Promise<{
|
|
4
4
|
response: ChatCompletion;
|
|
5
5
|
structuredOutputToolResponse: any;
|
|
6
|
+
finalIteration: number;
|
|
6
7
|
}>;
|
|
@@ -3,13 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.processToolCalls = processToolCalls;
|
|
4
4
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
5
5
|
const openAiApiRequest_1 = require("../../api/openAiApiRequest");
|
|
6
|
-
async function processToolCalls(executeFunctions, body, messages, invokableTools, maxToolsIterations, structuredOutputTool, abortSignal) {
|
|
6
|
+
async function processToolCalls(executeFunctions, body, messages, invokableTools, maxToolsIterations, structuredOutputTool, abortSignal, startingIteration = 1) {
|
|
7
7
|
var _a, _b, _c, _d, _e, _f;
|
|
8
8
|
let response = (await openAiApiRequest_1.openAiApiRequest.call(executeFunctions, 'POST', `/chat/completions`, {
|
|
9
9
|
body,
|
|
10
10
|
}));
|
|
11
11
|
let toolCalls = (_b = (_a = response === null || response === void 0 ? void 0 : response.choices[0]) === null || _a === void 0 ? void 0 : _a.message) === null || _b === void 0 ? void 0 : _b.tool_calls;
|
|
12
|
-
let currentIteration =
|
|
12
|
+
let currentIteration = startingIteration;
|
|
13
13
|
var structuredOutputToolResponse = null;
|
|
14
14
|
const processedToolCallIds = new Set();
|
|
15
15
|
while (toolCalls === null || toolCalls === void 0 ? void 0 : toolCalls.length) {
|
|
@@ -24,7 +24,10 @@ async function processToolCalls(executeFunctions, body, messages, invokableTools
|
|
|
24
24
|
...body,
|
|
25
25
|
messages: messages,
|
|
26
26
|
tools: [structuredOutputTool],
|
|
27
|
-
tool_choice:
|
|
27
|
+
tool_choice: {
|
|
28
|
+
type: 'function',
|
|
29
|
+
function: { name: structuredOutputTool.function.name },
|
|
30
|
+
},
|
|
28
31
|
};
|
|
29
32
|
}
|
|
30
33
|
else {
|
|
@@ -119,6 +122,6 @@ async function processToolCalls(executeFunctions, body, messages, invokableTools
|
|
|
119
122
|
toolCalls = response.choices[0].message.tool_calls;
|
|
120
123
|
currentIteration += 1;
|
|
121
124
|
}
|
|
122
|
-
return { response, structuredOutputToolResponse };
|
|
125
|
+
return { response, structuredOutputToolResponse, finalIteration: currentIteration };
|
|
123
126
|
}
|
|
124
127
|
//# sourceMappingURL=executor.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/tools/executor.ts"],"names":[],"mappings":";;AAQA,
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/tools/executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,6 @@ import type { IExecuteFunctions, IDataObject } from 'n8n-workflow';
|
|
|
2
2
|
export declare function prepareTools(executeFunctions: IExecuteFunctions, structuredOutputToolsMode: boolean, maxToolsIterations: number, responseFormat?: IDataObject): Promise<{
|
|
3
3
|
tools: any[];
|
|
4
4
|
invokableTools: any[];
|
|
5
|
-
tool_choice?: string;
|
|
5
|
+
tool_choice?: string | IDataObject;
|
|
6
6
|
structuredOutputTool?: IDataObject;
|
|
7
7
|
}>;
|
|
@@ -44,7 +44,7 @@ async function prepareTools(executeFunctions, structuredOutputToolsMode, maxTool
|
|
|
44
44
|
function: {
|
|
45
45
|
name: jsonSchema.name,
|
|
46
46
|
description: jsonSchema.description ||
|
|
47
|
-
'
|
|
47
|
+
'Return the final response to the user.',
|
|
48
48
|
parameters: jsonSchema.schema,
|
|
49
49
|
},
|
|
50
50
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/tools/setup.ts"],"names":[],"mappings":";;AAQA,oCAyEC;AA/ED,2CAAgD;AAChD,2CAAqD;AAK9C,KAAK,UAAU,YAAY,CACjC,gBAAmC,EACnC,yBAAkC,EAClC,kBAA0B,EAC1B,cAA4B;IAO5B,IAAI,KAAK,GAAU,EAAE,CAAC;IACtB,IAAI,aAAa,GAAW,EAAE,CAAC;IAC/B,MAAM,kBAAkB,GAAG,IAAI,CAAC;IAChC,IAAI,WAAW,
|
|
1
|
+
{"version":3,"file":"setup.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/tools/setup.ts"],"names":[],"mappings":";;AAQA,oCAyEC;AA/ED,2CAAgD;AAChD,2CAAqD;AAK9C,KAAK,UAAU,YAAY,CACjC,gBAAmC,EACnC,yBAAkC,EAClC,kBAA0B,EAC1B,cAA4B;IAO5B,IAAI,KAAK,GAAU,EAAE,CAAC;IACtB,IAAI,aAAa,GAAW,EAAE,CAAC;IAC/B,MAAM,kBAAkB,GAAG,IAAI,CAAC;IAChC,IAAI,WAAW,GAAqC,SAAS,CAAC;IAC9D,IAAI,oBAAoB,GAAG,SAAS,CAAC;IAErC,IAAI,CAAC;QACJ,aAAa,GAAG,MAAM,IAAA,6BAAiB,EAAC,gBAAgB,EAAE,kBAAkB,EAAE,KAAK,CAAC,CAAC;IACtF,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,OAAO,CAAC,KAAK,CAAC,gCAAgC,EAAE,KAAK,CAAC,CAAC;QAEvD,OAAO,CAAC,KAAK,CAAC,kCAAkC,CAAC,CAAC;QAClD,aAAa,GAAG,EAAE,CAAC;IACpB,CAAC;IAED,IAAI,cAAc,GAAU,EAAE,CAAC;IAE/B,IAAI,aAAa,CAAC,MAAM,EAAE,CAAC;QAE1B,KAAK,MAAM,IAAI,IAAI,aAAa,EAAE,CAAC;YAElC,IAAI,OAAO,IAAI,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;gBAClD,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;oBAClC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBAC9B,CAAC;YACF,CAAC;iBAAM,CAAC;gBACP,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC3B,CAAC;QACF,CAAC;IACF,CAAC;IAGD,IAAI,kBAAkB,KAAK,CAAC,EAAE,CAAC;QAC9B,KAAK,GAAG,EAAE,CAAC;QACX,cAAc,GAAG,EAAE,CAAC;IACrB,CAAC;SAAM,CAAC;QACP,KAAK,GAAG,cAAc,CAAC,GAAG,CAAC,0BAAkB,CAAC,CAAC;IAChD,CAAC;IAED,IAAI,yBAAyB,IAAI,cAAc,IAAI,cAAc,CAAC,WAAW,EAAE,CAAC;QAC/E,MAAM,UAAU,GAAG,cAAc,CAAC,WAA0B,CAAC;QAC7D,oBAAoB,GAAG;YACtB,IAAI,EAAE,UAAmB;YACzB,QAAQ,EAAE;gBACT,IAAI,EAAE,UAAU,CAAC,IAAc;gBAC/B,WAAW,EACT,UAAU,CAAC,WAAsB;oBAClC,wCAAwC;gBACzC,UAAU,EAAE,UAAU,CAAC,MAAqB;aAC5C;SACD,CAAC;QACF,KAAK,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QACjC,cAAc,CAAC,IAAI,CAAC,EAAE,IAAI,EAAG,oBAAoB,CAAC,QAAwB,CAAC,IAAc,EAAE,CAAC,CAAC;QAC7F,WAAW,GAAG,UAAU,CAAC;IAC1B,CAAC;IAED,OAAO;QACN,KAAK;QACL,cAAc;QACd,WAAW;QACX,oBAAoB;KACpB,CAAC;AACH,CAAC"}
|