n8n-nodes-simple 3.1.1 → 3.2.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/responsesApiConverter.d.ts +1 -2
- package/dist/nodes/shared/api/responsesApiConverter.js +4 -16
- package/dist/nodes/shared/api/responsesApiConverter.js.map +1 -1
- package/dist/nodes/shared/api/types.d.ts +37 -0
- 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 +1 -39
- package/dist/nodes/shared/config/properties/options.js.map +1 -1
- package/dist/nodes/shared/config/properties/output.js +1 -1
- package/dist/nodes/shared/config/properties/output.js.map +1 -1
- package/dist/nodes/shared/core/execution/executionSetup.js +1 -2
- package/dist/nodes/shared/core/execution/executionSetup.js.map +1 -1
- package/dist/nodes/shared/core/execution/messageOperation.js +20 -0
- package/dist/nodes/shared/core/execution/messageOperation.js.map +1 -1
- package/dist/nodes/shared/core/execution/modelAttempt.js.map +1 -1
- package/dist/nodes/shared/core/messages/converter.js +4 -2
- package/dist/nodes/shared/core/messages/converter.js.map +1 -1
- package/dist/nodes/shared/core/messages/types.d.ts +45 -7
- package/dist/nodes/shared/core/messages/types.js +18 -0
- package/dist/nodes/shared/core/messages/types.js.map +1 -1
- package/dist/nodes/shared/core/request/body.d.ts +2 -1
- package/dist/nodes/shared/core/request/body.js +0 -5
- package/dist/nodes/shared/core/request/body.js.map +1 -1
- package/dist/nodes/shared/core/tools/executor.d.ts +1 -1
- package/dist/nodes/shared/core/tools/executor.js +10 -5
- package/dist/nodes/shared/core/tools/executor.js.map +1 -1
- package/dist/nodes/shared/core/tools/maxIterationsHandler.d.ts +1 -1
- package/dist/nodes/shared/core/tools/maxIterationsHandler.js +8 -4
- package/dist/nodes/shared/core/tools/maxIterationsHandler.js.map +1 -1
- package/dist/package.json +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -5,7 +5,8 @@ const responsesApiConverter_1 = require("../../api/responsesApiConverter");
|
|
|
5
5
|
const usageTracking_1 = require("../execution/usageTracking");
|
|
6
6
|
const maxIterationsHandler_1 = require("./maxIterationsHandler");
|
|
7
7
|
const toolCallProcessor_1 = require("./toolCallProcessor");
|
|
8
|
-
|
|
8
|
+
const types_1 = require("../messages/types");
|
|
9
|
+
async function processToolCalls(executeFunctions, body, messages, invokableTools, maxToolsIterations, structuredOutputTool, abortSignal, startingIteration = 1, handoffTools = [], skillTools = [], preserveReasoning = 'none', apiMode = 'chatCompletions') {
|
|
9
10
|
var _a, _b;
|
|
10
11
|
const accumulatedUsage = {
|
|
11
12
|
prompt_tokens: 0,
|
|
@@ -15,10 +16,12 @@ async function processToolCalls(executeFunctions, body, messages, invokableTools
|
|
|
15
16
|
retried_requests: 0,
|
|
16
17
|
failed_requests: [],
|
|
17
18
|
};
|
|
18
|
-
let finalBody =
|
|
19
|
+
let finalBody = preserveReasoning !== 'all'
|
|
20
|
+
? { ...body, messages: (0, types_1.filterMessagesReasoning)(body.messages, preserveReasoning) }
|
|
21
|
+
: body;
|
|
19
22
|
let response;
|
|
20
23
|
try {
|
|
21
|
-
response = await (0, responsesApiConverter_1.sendModelRequest)(executeFunctions, finalBody, apiMode
|
|
24
|
+
response = await (0, responsesApiConverter_1.sendModelRequest)(executeFunctions, finalBody, apiMode);
|
|
22
25
|
if (response.usage) {
|
|
23
26
|
(0, usageTracking_1.mergeUsageData)(accumulatedUsage, response.usage);
|
|
24
27
|
accumulatedUsage.total_requests++;
|
|
@@ -75,10 +78,12 @@ async function processToolCalls(executeFunctions, body, messages, invokableTools
|
|
|
75
78
|
}
|
|
76
79
|
finalBody = {
|
|
77
80
|
...body,
|
|
78
|
-
messages:
|
|
81
|
+
messages: preserveReasoning !== 'all'
|
|
82
|
+
? (0, types_1.filterMessagesReasoning)(messages, preserveReasoning)
|
|
83
|
+
: messages,
|
|
79
84
|
};
|
|
80
85
|
try {
|
|
81
|
-
response = await (0, responsesApiConverter_1.sendModelRequest)(executeFunctions, finalBody, apiMode
|
|
86
|
+
response = await (0, responsesApiConverter_1.sendModelRequest)(executeFunctions, finalBody, apiMode);
|
|
82
87
|
if (response.usage) {
|
|
83
88
|
(0, usageTracking_1.mergeUsageData)(accumulatedUsage, response.usage);
|
|
84
89
|
accumulatedUsage.total_requests++;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/tools/executor.ts"],"names":[],"mappings":";;AAYA,
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/tools/executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { IExecuteFunctions, IDataObject } from 'n8n-workflow';
|
|
2
2
|
import type { ApiMode, ChatCompletion } from '../../api/types';
|
|
3
3
|
import { type AccumulatedUsage } from '../execution/usageTracking';
|
|
4
|
-
import type
|
|
4
|
+
import { type PreserveReasoningMode } from '../messages/types';
|
|
5
5
|
export interface MaxIterationsResult {
|
|
6
6
|
response: ChatCompletion;
|
|
7
7
|
structuredOutputToolResponse: any;
|
|
@@ -3,13 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.handleMaxIterationsReached = handleMaxIterationsReached;
|
|
4
4
|
const responsesApiConverter_1 = require("../../api/responsesApiConverter");
|
|
5
5
|
const usageTracking_1 = require("../execution/usageTracking");
|
|
6
|
-
|
|
6
|
+
const types_1 = require("../messages/types");
|
|
7
|
+
async function handleMaxIterationsReached(executeFunctions, body, messages, structuredOutputTool, existingStructuredOutputResponse, accumulatedUsage, apiMode = 'chatCompletions', preserveReasoning = 'none') {
|
|
7
8
|
var _a, _b, _c;
|
|
8
9
|
let finalBody;
|
|
10
|
+
const filteredMessages = preserveReasoning !== 'all'
|
|
11
|
+
? (0, types_1.filterMessagesReasoning)(messages, preserveReasoning)
|
|
12
|
+
: messages;
|
|
9
13
|
if (structuredOutputTool && !existingStructuredOutputResponse) {
|
|
10
14
|
finalBody = {
|
|
11
15
|
...body,
|
|
12
|
-
messages:
|
|
16
|
+
messages: filteredMessages,
|
|
13
17
|
tools: [structuredOutputTool],
|
|
14
18
|
tool_choice: {
|
|
15
19
|
type: 'function',
|
|
@@ -20,14 +24,14 @@ async function handleMaxIterationsReached(executeFunctions, body, messages, stru
|
|
|
20
24
|
else {
|
|
21
25
|
finalBody = {
|
|
22
26
|
...body,
|
|
23
|
-
messages:
|
|
27
|
+
messages: filteredMessages,
|
|
24
28
|
tools: [],
|
|
25
29
|
tool_choice: undefined,
|
|
26
30
|
};
|
|
27
31
|
}
|
|
28
32
|
let response;
|
|
29
33
|
try {
|
|
30
|
-
response = await (0, responsesApiConverter_1.sendModelRequest)(executeFunctions, finalBody, apiMode
|
|
34
|
+
response = await (0, responsesApiConverter_1.sendModelRequest)(executeFunctions, finalBody, apiMode);
|
|
31
35
|
if (response.usage) {
|
|
32
36
|
(0, usageTracking_1.mergeUsageData)(accumulatedUsage, response.usage);
|
|
33
37
|
accumulatedUsage.total_requests++;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"maxIterationsHandler.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/tools/maxIterationsHandler.ts"],"names":[],"mappings":";;AAgBA,
|
|
1
|
+
{"version":3,"file":"maxIterationsHandler.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/tools/maxIterationsHandler.ts"],"names":[],"mappings":";;AAgBA,gEAmEC;AAlFD,2EAAmE;AAEnE,8DAAmF;AACnF,6CAAwF;AAYjF,KAAK,UAAU,0BAA0B,CAC/C,gBAAmC,EACnC,IAAiB,EACjB,QAAuB,EACvB,oBAA6C,EAC7C,gCAAqC,EACrC,gBAAkC,EAClC,UAAmB,iBAAiB,EACpC,oBAA2C,MAAM;;IAEjD,IAAI,SAAsB,CAAC;IAE3B,MAAM,gBAAgB,GAAG,iBAAiB,KAAK,KAAK;QACnD,CAAC,CAAC,IAAA,+BAAuB,EAAC,QAAQ,EAAE,iBAAiB,CAAC;QACtD,CAAC,CAAC,QAAQ,CAAC;IAEZ,IAAI,oBAAoB,IAAI,CAAC,gCAAgC,EAAE,CAAC;QAE/D,SAAS,GAAG;YACX,GAAG,IAAI;YACP,QAAQ,EAAE,gBAAgB;YAC1B,KAAK,EAAE,CAAC,oBAAoB,CAAC;YAC7B,WAAW,EAAE;gBACZ,IAAI,EAAE,UAAU;gBAChB,QAAQ,EAAE,EAAE,IAAI,EAAG,oBAAoB,CAAC,QAAwB,CAAC,IAAc,EAAE;aACjF;SACD,CAAC;IACH,CAAC;SAAM,CAAC;QAEP,SAAS,GAAG;YACX,GAAG,IAAI;YACP,QAAQ,EAAE,gBAAgB;YAC1B,KAAK,EAAE,EAAE;YACT,WAAW,EAAE,SAAS;SACtB,CAAC;IACH,CAAC;IAED,IAAI,QAAwB,CAAC;IAC7B,IAAI,CAAC;QACJ,QAAQ,GAAG,MAAM,IAAA,wCAAgB,EAAC,gBAAgB,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;QAExE,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC;YACpB,IAAA,8BAAc,EAAC,gBAAgB,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC;YACjD,gBAAgB,CAAC,cAAc,EAAE,CAAC;QACnC,CAAC;IACF,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,MAAM,KAAK,GAAI,SAAS,CAAC,KAAgB,IAAI,SAAS,CAAC;QACvD,MAAM,YAAY,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC5E,gBAAgB,CAAC,eAAgB,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,CAAC;QACvE,MAAM,KAAK,CAAC;IACb,CAAC;IAED,IAAI,4BAA4B,GAAG,gCAAgC,CAAC;IACpE,IAAI,oBAAoB,IAAI,CAAC,4BAA4B,KAAI,MAAA,MAAA,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,OAAO,0CAAG,CAAC,CAAC,0CAAE,OAAO,0CAAE,UAAU,CAAA,EAAE,CAAC;QAC1G,MAAM,cAAc,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC;QAC9D,KAAK,MAAM,QAAQ,IAAI,cAAc,EAAE,CAAC;YACvC,IACG,oBAAoB,CAAC,QAAwB,CAAC,IAAe;gBAC/D,QAAQ,CAAC,QAAQ,CAAC,IAAI,EACrB,CAAC;gBACF,4BAA4B,GAAG,QAAQ,CAAC,QAAQ,CAAC,SAAS,CAAC;gBAC3D,MAAM;YACP,CAAC;QACF,CAAC;IACF,CAAC;IAED,OAAO,EAAE,QAAQ,EAAE,4BAA4B,EAAE,CAAC;AACnD,CAAC"}
|