n8n-nodes-simple 3.1.0 → 3.1.1
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 +3 -2
- package/dist/nodes/shared/api/responsesApiConverter.js +8 -1
- package/dist/nodes/shared/api/responsesApiConverter.js.map +1 -1
- package/dist/nodes/shared/api/types.d.ts +1 -0
- package/dist/nodes/shared/config/parameters.d.ts +4 -2
- package/dist/nodes/shared/config/parameters.js +2 -2
- package/dist/nodes/shared/config/parameters.js.map +1 -1
- package/dist/nodes/shared/config/properties/options.js +1 -1
- package/dist/nodes/shared/config/properties/options.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/modelAttempt.d.ts +2 -1
- package/dist/nodes/shared/core/execution/modelAttempt.js.map +1 -1
- package/dist/nodes/shared/core/execution/outputData.js +4 -15
- package/dist/nodes/shared/core/execution/outputData.js.map +1 -1
- package/dist/nodes/shared/core/messages/chatHistory.d.ts +1 -1
- package/dist/nodes/shared/core/messages/chatHistory.js +3 -10
- package/dist/nodes/shared/core/messages/chatHistory.js.map +1 -1
- package/dist/nodes/shared/core/messages/converter.d.ts +1 -1
- package/dist/nodes/shared/core/messages/converter.js +12 -7
- package/dist/nodes/shared/core/messages/converter.js.map +1 -1
- package/dist/nodes/shared/core/messages/types.d.ts +1 -0
- package/dist/nodes/shared/core/messages/types.js +6 -0
- package/dist/nodes/shared/core/messages/types.js.map +1 -1
- package/dist/nodes/shared/core/tools/executor.d.ts +3 -2
- package/dist/nodes/shared/core/tools/executor.js +4 -4
- package/dist/nodes/shared/core/tools/executor.js.map +1 -1
- package/dist/nodes/shared/core/tools/maxIterationsHandler.d.ts +3 -2
- package/dist/nodes/shared/core/tools/maxIterationsHandler.js +2 -2
- package/dist/nodes/shared/core/tools/maxIterationsHandler.js.map +1 -1
- package/dist/nodes/shared/core/tools/toolCallProcessor.d.ts +1 -1
- package/dist/nodes/shared/core/tools/toolCallProcessor.js +2 -3
- package/dist/nodes/shared/core/tools/toolCallProcessor.js.map +1 -1
- package/dist/package.json +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { IExecuteFunctions, IDataObject } from 'n8n-workflow';
|
|
2
|
-
import type { ChatCompletion } from './types';
|
|
2
|
+
import type { ApiMode, ChatCompletion } from './types';
|
|
3
|
+
import type { PreserveReasoningMode } from '../core/messages/types';
|
|
3
4
|
export declare function convertBodyToResponsesApi(chatBody: IDataObject): IDataObject;
|
|
4
5
|
export declare function convertResponseToCompletion(responsesApiResponse: any): ChatCompletion;
|
|
5
|
-
export declare function sendModelRequest(executeFunctions: IExecuteFunctions, body: IDataObject, apiMode:
|
|
6
|
+
export declare function sendModelRequest(executeFunctions: IExecuteFunctions, body: IDataObject, apiMode: ApiMode, preserveReasoning?: PreserveReasoningMode): Promise<ChatCompletion>;
|
|
@@ -5,6 +5,7 @@ exports.convertResponseToCompletion = convertResponseToCompletion;
|
|
|
5
5
|
exports.sendModelRequest = sendModelRequest;
|
|
6
6
|
const crypto_1 = require("crypto");
|
|
7
7
|
const openAiApiRequest_1 = require("./openAiApiRequest");
|
|
8
|
+
const types_1 = require("../core/messages/types");
|
|
8
9
|
const HANDLED_FIELDS = new Set([
|
|
9
10
|
'model',
|
|
10
11
|
'messages',
|
|
@@ -244,7 +245,13 @@ function convertResponseToCompletion(responsesApiResponse) {
|
|
|
244
245
|
system_fingerprint: '',
|
|
245
246
|
};
|
|
246
247
|
}
|
|
247
|
-
async function sendModelRequest(executeFunctions, body, apiMode) {
|
|
248
|
+
async function sendModelRequest(executeFunctions, body, apiMode, preserveReasoning = 'all') {
|
|
249
|
+
if (preserveReasoning !== 'all') {
|
|
250
|
+
body = {
|
|
251
|
+
...body,
|
|
252
|
+
messages: (0, types_1.filterMessagesReasoning)(body.messages, preserveReasoning),
|
|
253
|
+
};
|
|
254
|
+
}
|
|
248
255
|
if (apiMode === 'responses') {
|
|
249
256
|
const responsesBody = convertBodyToResponsesApi(body);
|
|
250
257
|
const rawResponse = await openAiApiRequest_1.openAiApiRequest.call(executeFunctions, 'POST', '/responses', { body: responsesBody });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"responsesApiConverter.js","sourceRoot":"","sources":["../../../../nodes/shared/api/responsesApiConverter.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"responsesApiConverter.js","sourceRoot":"","sources":["../../../../nodes/shared/api/responsesApiConverter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import type { IExecuteFunctions, IDataObject } from 'n8n-workflow';
|
|
2
2
|
import { VisualEditorProperties } from '../core/request/visualEditor';
|
|
3
3
|
import { RawMessage } from '../core/messages/types';
|
|
4
|
+
import type { PreserveReasoningMode } from '../core/messages/types';
|
|
5
|
+
import type { ApiMode } from '../api/types';
|
|
4
6
|
export type ExtractedParameters = {
|
|
5
7
|
model: string;
|
|
6
8
|
agentType: string;
|
|
@@ -27,8 +29,8 @@ export type ExtractedParameters = {
|
|
|
27
29
|
loadToolCallsFromChatMemory: boolean;
|
|
28
30
|
saveReasoningInChatMemory: boolean;
|
|
29
31
|
loadReasoningFromChatMemory: boolean;
|
|
30
|
-
preserveReasoning:
|
|
31
|
-
apiMode:
|
|
32
|
+
preserveReasoning: PreserveReasoningMode;
|
|
33
|
+
apiMode: ApiMode;
|
|
32
34
|
handoffTools: string[];
|
|
33
35
|
skillTools: string[];
|
|
34
36
|
abortSignal: AbortSignal | undefined;
|
|
@@ -14,8 +14,8 @@ function extractParameters(executeFunctions, index) {
|
|
|
14
14
|
const loadToolCallsFromChatMemory = chatMemoryLoadOptions.includes('toolCalls');
|
|
15
15
|
const apiMode = get('options.apiMode', 'chatCompletions');
|
|
16
16
|
const preserveReasoning = get('options.preserveReasoning', 'all');
|
|
17
|
-
const loadReasoningFromChatMemory =
|
|
18
|
-
const saveReasoningInChatMemory =
|
|
17
|
+
const loadReasoningFromChatMemory = chatMemoryLoadOptions.includes('reasoning');
|
|
18
|
+
const saveReasoningInChatMemory = chatMemorySaveOptions.includes('reasoning');
|
|
19
19
|
const responseFormat = get('responseFormat', '');
|
|
20
20
|
const isStructuredOutput = responseFormat === 'structuredOutputVisual' || responseFormat === 'structuredOutputSchema';
|
|
21
21
|
const extractFirstObjectOnly = get('extractFirstObjectOnly', true);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parameters.js","sourceRoot":"","sources":["../../../../nodes/shared/config/parameters.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"parameters.js","sourceRoot":"","sources":["../../../../nodes/shared/config/parameters.ts"],"names":[],"mappings":"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"}
|
|
@@ -111,7 +111,7 @@ exports.optionsProperties = [
|
|
|
111
111
|
{ name: 'Reasoning Details', value: 'reasoningDetails', description: 'Preserve only reasoning_details field' },
|
|
112
112
|
{ name: 'All', value: 'all', description: 'Preserve all reasoning fields in assistant messages' },
|
|
113
113
|
],
|
|
114
|
-
description: 'Which reasoning fields to preserve
|
|
114
|
+
description: 'Which reasoning fields to preserve when sending assistant messages to the API. Choose the format your provider accepts.',
|
|
115
115
|
},
|
|
116
116
|
{
|
|
117
117
|
displayName: 'Retry Delay',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"options.js","sourceRoot":"","sources":["../../../../../nodes/shared/config/properties/options.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"options.js","sourceRoot":"","sources":["../../../../../nodes/shared/config/properties/options.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,7 @@ const executor_1 = require("./executor");
|
|
|
8
8
|
async function execute(i) {
|
|
9
9
|
const params = (0, parameters_1.extractParameters)(this, i);
|
|
10
10
|
const memory = await (0, io_1.getOptionalMemory)(this);
|
|
11
|
-
const messages = await (0, chatHistory_1.unpackChatHistoryAndMemory)(params.rawMessagesToSend, params.loadToolCallsFromChatMemory, params.loadReasoningFromChatMemory, memory
|
|
11
|
+
const messages = await (0, chatHistory_1.unpackChatHistoryAndMemory)(params.rawMessagesToSend, params.loadToolCallsFromChatMemory, params.loadReasoningFromChatMemory, memory);
|
|
12
12
|
return await (0, executor_1.runModel)(this, params, messages, i, params.model, memory);
|
|
13
13
|
}
|
|
14
14
|
//# sourceMappingURL=messageOperation.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"messageOperation.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/execution/messageOperation.ts"],"names":[],"mappings":";;AAUA,
|
|
1
|
+
{"version":3,"file":"messageOperation.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/execution/messageOperation.ts"],"names":[],"mappings":";;AAUA,0BA2BC;AAnCD,wDAA4D;AAC5D,qCAAiD;AACjD,yDAAqE;AACrE,yCAAsC;AAK/B,KAAK,UAAU,OAAO,CAE5B,CAAS;IAGT,MAAM,MAAM,GAAG,IAAA,8BAAiB,EAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IAG1C,MAAM,MAAM,GAAG,MAAM,IAAA,sBAAiB,EAAC,IAAI,CAAC,CAAC;IAG7C,MAAM,QAAQ,GAAG,MAAM,IAAA,wCAA0B,EAChD,MAAM,CAAC,iBAAiB,EACxB,MAAM,CAAC,2BAA2B,EAClC,MAAM,CAAC,2BAA2B,EAClC,MAAM,CACN,CAAC;IAGF,OAAO,MAAM,IAAA,mBAAQ,EACpB,IAAI,EACJ,MAAM,EACN,QAAQ,EACR,CAAC,EACD,MAAM,CAAC,KAAK,EACZ,MAAM,CACN,CAAC;AACH,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { IExecuteFunctions, INodeExecutionData, IDataObject } from 'n8n-workflow';
|
|
2
2
|
import type { BufferWindowMemory } from 'langchain/memory';
|
|
3
3
|
import type { ExtractedParameters } from '../../config/parameters';
|
|
4
|
+
import type { ApiMode } from '../../api/types';
|
|
4
5
|
import { type AccumulatedUsage } from './usageTracking';
|
|
5
6
|
export interface ModelAttemptContext {
|
|
6
7
|
executeFunctions: IExecuteFunctions;
|
|
@@ -23,6 +24,6 @@ export interface ModelAttemptContext {
|
|
|
23
24
|
memory?: BufferWindowMemory;
|
|
24
25
|
handoffTools: string[];
|
|
25
26
|
skillTools: string[];
|
|
26
|
-
apiMode:
|
|
27
|
+
apiMode: ApiMode;
|
|
27
28
|
}
|
|
28
29
|
export declare function executeModelAttemptWithRetries(context: ModelAttemptContext): Promise<INodeExecutionData[]>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modelAttempt.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/execution/modelAttempt.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"modelAttempt.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/execution/modelAttempt.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.prepareOutputData = prepareOutputData;
|
|
4
4
|
exports.reorderOutputFields = reorderOutputFields;
|
|
5
|
-
const types_1 = require("../messages/types");
|
|
6
5
|
async function prepareOutputData(response, output, messages, messagesBeforeRetries, addToOutput, executeFunctions, index, body, accumulatedUsage, isHandoffScenario) {
|
|
7
6
|
var _a;
|
|
8
7
|
const outputData = [];
|
|
@@ -24,10 +23,9 @@ async function prepareOutputData(response, output, messages, messagesBeforeRetri
|
|
|
24
23
|
}
|
|
25
24
|
if (addToOutput.includes('chatHistory')) {
|
|
26
25
|
const includeInChatHistory = executeFunctions.getNodeParameter('includeInChatHistory', index, []);
|
|
27
|
-
const preserveReasoning = executeFunctions.getNodeParameter('options.preserveReasoning', index, 'all');
|
|
28
26
|
const includeToolCalls = includeInChatHistory.includes('toolCalls');
|
|
29
27
|
const includeSystemMessages = includeInChatHistory.includes('systemMessages');
|
|
30
|
-
const includeReasoning =
|
|
28
|
+
const includeReasoning = includeInChatHistory.includes('reasoning');
|
|
31
29
|
let chatHistoryMessages = structuredClone(messages.slice(0, messagesBeforeRetries));
|
|
32
30
|
if (!includeToolCalls) {
|
|
33
31
|
chatHistoryMessages = chatHistoryMessages
|
|
@@ -58,22 +56,13 @@ async function prepareOutputData(response, output, messages, messagesBeforeRetri
|
|
|
58
56
|
}
|
|
59
57
|
chatHistoryMessages.push(rootMessage);
|
|
60
58
|
}
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
if (
|
|
59
|
+
if (!includeReasoning) {
|
|
60
|
+
for (const msg of chatHistoryMessages) {
|
|
61
|
+
if (msg.role === 'assistant') {
|
|
64
62
|
delete msg.reasoning;
|
|
65
63
|
delete msg.reasoning_content;
|
|
66
64
|
delete msg.reasoning_details;
|
|
67
65
|
}
|
|
68
|
-
else if (preserveReasoning !== 'all') {
|
|
69
|
-
const filtered = (0, types_1.filterReasoningFields)(msg, preserveReasoning);
|
|
70
|
-
if (!('reasoning' in filtered))
|
|
71
|
-
delete msg.reasoning;
|
|
72
|
-
if (!('reasoning_content' in filtered))
|
|
73
|
-
delete msg.reasoning_content;
|
|
74
|
-
if (!('reasoning_details' in filtered))
|
|
75
|
-
delete msg.reasoning_details;
|
|
76
|
-
}
|
|
77
66
|
}
|
|
78
67
|
}
|
|
79
68
|
outputData.forEach((item) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"outputData.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/execution/outputData.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"outputData.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/execution/outputData.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import { Message, RawMessage } from './types';
|
|
2
2
|
import type { BufferWindowMemory } from 'langchain/memory';
|
|
3
|
-
export declare function unpackChatHistoryAndMemory(rawMessagesToSend: RawMessage[], loadToolCallsFromChatMemory?: boolean, loadReasoningFromChatMemory?: boolean, memory?: BufferWindowMemory
|
|
3
|
+
export declare function unpackChatHistoryAndMemory(rawMessagesToSend: RawMessage[], loadToolCallsFromChatMemory?: boolean, loadReasoningFromChatMemory?: boolean, memory?: BufferWindowMemory): Promise<Message[]>;
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.unpackChatHistoryAndMemory = unpackChatHistoryAndMemory;
|
|
4
|
-
const types_1 = require("./types");
|
|
5
4
|
const converter_1 = require("./converter");
|
|
6
5
|
async function getChatMessages(memory) {
|
|
7
6
|
const allMessages = (await memory.loadMemoryVariables({}))[memory.memoryKey];
|
|
@@ -11,7 +10,7 @@ async function getChatMessages(memory) {
|
|
|
11
10
|
}
|
|
12
11
|
return allMessages;
|
|
13
12
|
}
|
|
14
|
-
async function unpackChatHistoryAndMemory(rawMessagesToSend, loadToolCallsFromChatMemory = true, loadReasoningFromChatMemory = true, memory
|
|
13
|
+
async function unpackChatHistoryAndMemory(rawMessagesToSend, loadToolCallsFromChatMemory = true, loadReasoningFromChatMemory = true, memory) {
|
|
15
14
|
const processedMessages = [];
|
|
16
15
|
for (const rawMessage of rawMessagesToSend) {
|
|
17
16
|
if (rawMessage.role === 'chatHistoryRole') {
|
|
@@ -22,18 +21,12 @@ async function unpackChatHistoryAndMemory(rawMessagesToSend, loadToolCallsFromCh
|
|
|
22
21
|
if (!Array.isArray(chatHistory)) {
|
|
23
22
|
throw new Error('Chat History must be an array');
|
|
24
23
|
}
|
|
25
|
-
|
|
26
|
-
processedMessages.push(...chatHistory);
|
|
27
|
-
}
|
|
28
|
-
else {
|
|
29
|
-
processedMessages.push(...chatHistory.map((msg) => (0, types_1.filterReasoningFields)(msg, preserveReasoning)));
|
|
30
|
-
}
|
|
24
|
+
processedMessages.push(...chatHistory);
|
|
31
25
|
}
|
|
32
26
|
else if (rawMessage.role === 'chatMemoryRole' && memory) {
|
|
33
27
|
const rawMemoryMessages = await getChatMessages(memory);
|
|
34
28
|
if (rawMemoryMessages.length > 0) {
|
|
35
|
-
const
|
|
36
|
-
const memoryMessages = (0, converter_1.convertMessages)(rawMemoryMessages, loadToolCallsFromChatMemory, reasoningMode);
|
|
29
|
+
const memoryMessages = (0, converter_1.convertMessages)(rawMemoryMessages, loadToolCallsFromChatMemory, loadReasoningFromChatMemory);
|
|
37
30
|
processedMessages.push(...memoryMessages);
|
|
38
31
|
}
|
|
39
32
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chatHistory.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/messages/chatHistory.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"chatHistory.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/messages/chatHistory.ts"],"names":[],"mappings":";;AAyBA,gEA6CC;AAnED,2CAA8C;AAE9C,KAAK,UAAU,eAAe,CAAC,MAA0B;IACxD,MAAM,WAAW,GAAG,CAAC,MAAM,MAAM,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAkB,CAAC;IAG9F,MAAM,CAAC,GAAI,MAAc,CAAC,CAAC,CAAC;IAC5B,IAAI,CAAC,KAAK,SAAS,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC/C,OAAO,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9B,CAAC;IAED,OAAO,WAAW,CAAC;AACpB,CAAC;AAUM,KAAK,UAAU,0BAA0B,CAC/C,iBAA+B,EAC/B,8BAAuC,IAAI,EAC3C,8BAAuC,IAAI,EAC3C,MAA2B;IAE3B,MAAM,iBAAiB,GAAc,EAAE,CAAC;IAExC,KAAK,MAAM,UAAU,IAAI,iBAAiB,EAAE,CAAC;QAC5C,IAAI,UAAU,CAAC,IAAI,KAAK,iBAAiB,EAAE,CAAC;YAE3C,MAAM,eAAe,GAAG,UAAU,CAAC,eAAe,CAAC;YAGnD,MAAM,WAAW,GAAG,OAAO,eAAe,KAAK,QAAQ;gBACtD,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC;gBAC7B,CAAC,CAAC,eAAe,CAAC;YAGnB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;gBACjC,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;YAClD,CAAC;YAED,iBAAiB,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,CAAC;QAExC,CAAC;aAAM,IAAI,UAAU,CAAC,IAAI,KAAK,gBAAgB,IAAI,MAAM,EAAE,CAAC;YAE3D,MAAM,iBAAiB,GAAkB,MAAM,eAAe,CAAC,MAAM,CAAC,CAAA;YAEtE,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAClC,MAAM,cAAc,GAAc,IAAA,2BAAe,EAChD,iBAAiB,EACjB,2BAA2B,EAC3B,2BAA2B,CAC3B,CAAC;gBACF,iBAAiB,CAAC,IAAI,CAAC,GAAG,cAAc,CAAC,CAAC;YAC3C,CAAC;QACF,CAAC;aAAM,CAAC;YAEP,MAAM,EAAE,eAAe,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,GAAG,YAAY,EAAE,GAAG,UAAU,CAAC;YAC9H,iBAAiB,CAAC,IAAI,CAAC,YAAuB,CAAC,CAAC;QACjD,CAAC;IACF,CAAC;IAED,OAAO,iBAAiB,CAAC;AAC1B,CAAC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import { Message } from './types';
|
|
2
2
|
import { BaseMessage } from '@langchain/core/dist/messages/base';
|
|
3
|
-
export declare function convertMessages(messages: BaseMessage[], loadToolCalls?: boolean,
|
|
3
|
+
export declare function convertMessages(messages: BaseMessage[], loadToolCalls?: boolean, loadReasoning?: boolean): Message[];
|
|
@@ -1,11 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.convertMessages = convertMessages;
|
|
4
|
-
|
|
5
|
-
function convertMessages(messages, loadToolCalls = true, preserveReasoning = 'all') {
|
|
4
|
+
function convertMessages(messages, loadToolCalls = true, loadReasoning = true) {
|
|
6
5
|
var _a, _b;
|
|
7
6
|
const result = [];
|
|
8
|
-
const loadReasoning = preserveReasoning !== 'none';
|
|
9
7
|
for (const message of messages) {
|
|
10
8
|
const role = message.constructor.name === 'AIMessage' ? 'assistant'
|
|
11
9
|
: message.constructor.name === 'SystemMessage' ? 'system'
|
|
@@ -17,8 +15,15 @@ function convertMessages(messages, loadToolCalls = true, preserveReasoning = 'al
|
|
|
17
15
|
if (loadToolCalls &&
|
|
18
16
|
role === 'assistant' &&
|
|
19
17
|
Array.isArray(toolCalls)) {
|
|
20
|
-
|
|
21
|
-
|
|
18
|
+
if (loadReasoning) {
|
|
19
|
+
result.push(...toolCalls);
|
|
20
|
+
}
|
|
21
|
+
else {
|
|
22
|
+
result.push(...toolCalls.map((tc) => {
|
|
23
|
+
const { reasoning, reasoning_content, reasoning_details, ...rest } = tc;
|
|
24
|
+
return rest;
|
|
25
|
+
}));
|
|
26
|
+
}
|
|
22
27
|
const kwargs = (_a = message.additional_kwargs) !== null && _a !== void 0 ? _a : {};
|
|
23
28
|
const assistantMsg = {
|
|
24
29
|
role: 'assistant',
|
|
@@ -27,7 +32,7 @@ function convertMessages(messages, loadToolCalls = true, preserveReasoning = 'al
|
|
|
27
32
|
...(loadReasoning && kwargs.reasoning_content && { reasoning_content: kwargs.reasoning_content }),
|
|
28
33
|
...(loadReasoning && kwargs.reasoning_details && { reasoning_details: kwargs.reasoning_details }),
|
|
29
34
|
};
|
|
30
|
-
result.push(
|
|
35
|
+
result.push(assistantMsg);
|
|
31
36
|
}
|
|
32
37
|
else {
|
|
33
38
|
const kwargs = (_b = message.additional_kwargs) !== null && _b !== void 0 ? _b : {};
|
|
@@ -38,7 +43,7 @@ function convertMessages(messages, loadToolCalls = true, preserveReasoning = 'al
|
|
|
38
43
|
...(loadReasoning && kwargs.reasoning_content && { reasoning_content: kwargs.reasoning_content }),
|
|
39
44
|
...(loadReasoning && kwargs.reasoning_details && { reasoning_details: kwargs.reasoning_details }),
|
|
40
45
|
};
|
|
41
|
-
result.push(
|
|
46
|
+
result.push(msg);
|
|
42
47
|
}
|
|
43
48
|
}
|
|
44
49
|
return result;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"converter.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/messages/converter.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"converter.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/messages/converter.ts"],"names":[],"mappings":";;AAgBA,0CAqDC;AArDD,SAAgB,eAAe,CAAC,QAAuB,EAAE,gBAAyB,IAAI,EAAE,gBAAyB,IAAI;;IACpH,MAAM,MAAM,GAAc,EAAE,CAAC;IAE7B,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAChC,MAAM,IAAI,GAAG,OAAO,CAAC,WAAW,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC,CAAC,WAAW;YAClE,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,KAAK,eAAe,CAAC,CAAC,CAAC,QAAQ;gBACzD,CAAC,CAAC,MAAM,CAAC;QACV,MAAM,OAAO,GAAG,OAAO,OAAO,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO;YACpE,CAAC,CAAC,OAAO,OAAO,CAAC,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE;gBACtC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAGnC,MAAM,SAAS,GAAI,OAAe,CAAC,UAAU,CAAC;QAC9C,IACC,aAAa;YACb,IAAI,KAAK,WAAW;YACpB,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EACvB,CAAC;YAEF,IAAI,aAAa,EAAE,CAAC;gBACnB,MAAM,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,CAAC;YAC3B,CAAC;iBAAM,CAAC;gBACP,MAAM,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,EAAO,EAAE,EAAE;oBACxC,MAAM,EAAE,SAAS,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,CAAC;oBACxE,OAAO,IAAI,CAAC;gBACb,CAAC,CAAC,CAAC,CAAC;YACL,CAAC;YAGD,MAAM,MAAM,GAAG,MAAC,OAAe,CAAC,iBAAiB,mCAAI,EAAE,CAAC;YACxD,MAAM,YAAY,GAAQ;gBACzB,IAAI,EAAE,WAAW;gBACjB,OAAO,EAAE,OAAO;gBAChB,GAAG,CAAC,aAAa,IAAI,MAAM,CAAC,SAAS,IAAI,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,CAAC;gBACzE,GAAG,CAAC,aAAa,IAAI,MAAM,CAAC,iBAAiB,IAAI,EAAE,iBAAiB,EAAE,MAAM,CAAC,iBAAiB,EAAE,CAAC;gBACjG,GAAG,CAAC,aAAa,IAAI,MAAM,CAAC,iBAAiB,IAAI,EAAE,iBAAiB,EAAE,MAAM,CAAC,iBAAiB,EAAE,CAAC;aACjG,CAAC;YACF,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC3B,CAAC;aAAM,CAAC;YAEP,MAAM,MAAM,GAAG,MAAC,OAAe,CAAC,iBAAiB,mCAAI,EAAE,CAAC;YACxD,MAAM,GAAG,GAAQ;gBAChB,IAAI,EAAE,IAAI;gBACV,OAAO,EAAE,OAAO;gBAChB,GAAG,CAAC,aAAa,IAAI,MAAM,CAAC,SAAS,IAAI,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,CAAC;gBACzE,GAAG,CAAC,aAAa,IAAI,MAAM,CAAC,iBAAiB,IAAI,EAAE,iBAAiB,EAAE,MAAM,CAAC,iBAAiB,EAAE,CAAC;gBACjG,GAAG,CAAC,aAAa,IAAI,MAAM,CAAC,iBAAiB,IAAI,EAAE,iBAAiB,EAAE,MAAM,CAAC,iBAAiB,EAAE,CAAC;aACjG,CAAC;YACF,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAClB,CAAC;IACF,CAAC;IAED,OAAO,MAAM,CAAC;AACf,CAAC"}
|
|
@@ -18,6 +18,7 @@ export type Message = {
|
|
|
18
18
|
};
|
|
19
19
|
export type PreserveReasoningMode = 'none' | 'reasoning' | 'reasoningContent' | 'reasoningDetails' | 'all';
|
|
20
20
|
export declare function filterReasoningFields(msg: any, mode: PreserveReasoningMode): any;
|
|
21
|
+
export declare function filterMessagesReasoning(messages: any[], mode: PreserveReasoningMode): any[];
|
|
21
22
|
export type RawMessage = Message & {
|
|
22
23
|
chatHistoryJson?: string | object[] | null;
|
|
23
24
|
chatMemorySaveOptions?: string[];
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.filterReasoningFields = filterReasoningFields;
|
|
4
|
+
exports.filterMessagesReasoning = filterMessagesReasoning;
|
|
4
5
|
exports.validateMessage = validateMessage;
|
|
5
6
|
exports.validateMessages = validateMessages;
|
|
6
7
|
function filterReasoningFields(msg, mode) {
|
|
@@ -16,6 +17,11 @@ function filterReasoningFields(msg, mode) {
|
|
|
16
17
|
...(mode === 'reasoningDetails' && reasoning_details !== undefined && { reasoning_details }),
|
|
17
18
|
};
|
|
18
19
|
}
|
|
20
|
+
function filterMessagesReasoning(messages, mode) {
|
|
21
|
+
if (mode === 'all')
|
|
22
|
+
return messages;
|
|
23
|
+
return messages.map((msg) => msg.role === 'assistant' ? filterReasoningFields(msg, mode) : msg);
|
|
24
|
+
}
|
|
19
25
|
function validateMessage(item, index) {
|
|
20
26
|
const indexStr = index !== undefined ? ` at index ${index}` : '';
|
|
21
27
|
if (typeof item !== 'object' || item === null) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/messages/types.ts"],"names":[],"mappings":";;AA2BA,sDAUC;AA6CD,0CAyBC;AAKD,4CA4BC;
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/messages/types.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import type { IExecuteFunctions, IDataObject } from 'n8n-workflow';
|
|
2
|
-
import type { ChatCompletion } from '../../api/types';
|
|
2
|
+
import type { ApiMode, ChatCompletion } from '../../api/types';
|
|
3
3
|
import type { InvokableTool } from '../execution/executionSetup';
|
|
4
4
|
import { type AccumulatedUsage } from '../execution/usageTracking';
|
|
5
|
-
|
|
5
|
+
import type { PreserveReasoningMode } from '../messages/types';
|
|
6
|
+
export declare function processToolCalls(executeFunctions: IExecuteFunctions, body: IDataObject, messages: IDataObject[], invokableTools: InvokableTool[], maxToolsIterations: number, structuredOutputTool?: IDataObject, abortSignal?: AbortSignal, startingIteration?: number, handoffTools?: string[], skillTools?: string[], preserveReasoning?: PreserveReasoningMode, apiMode?: ApiMode): Promise<{
|
|
6
7
|
response: ChatCompletion;
|
|
7
8
|
structuredOutputToolResponse: any;
|
|
8
9
|
finalIteration: number;
|
|
@@ -18,7 +18,7 @@ async function processToolCalls(executeFunctions, body, messages, invokableTools
|
|
|
18
18
|
let finalBody = body;
|
|
19
19
|
let response;
|
|
20
20
|
try {
|
|
21
|
-
response = await (0, responsesApiConverter_1.sendModelRequest)(executeFunctions, finalBody, apiMode);
|
|
21
|
+
response = await (0, responsesApiConverter_1.sendModelRequest)(executeFunctions, finalBody, apiMode, preserveReasoning);
|
|
22
22
|
if (response.usage) {
|
|
23
23
|
(0, usageTracking_1.mergeUsageData)(accumulatedUsage, response.usage);
|
|
24
24
|
accumulatedUsage.total_requests++;
|
|
@@ -48,14 +48,14 @@ async function processToolCalls(executeFunctions, body, messages, invokableTools
|
|
|
48
48
|
break;
|
|
49
49
|
}
|
|
50
50
|
if (maxIterationsReached) {
|
|
51
|
-
const result = await (0, maxIterationsHandler_1.handleMaxIterationsReached)(executeFunctions, body, messages, structuredOutputTool, structuredOutputToolResponse, accumulatedUsage, apiMode);
|
|
51
|
+
const result = await (0, maxIterationsHandler_1.handleMaxIterationsReached)(executeFunctions, body, messages, structuredOutputTool, structuredOutputToolResponse, accumulatedUsage, apiMode, preserveReasoning);
|
|
52
52
|
response = result.response;
|
|
53
53
|
structuredOutputToolResponse = result.structuredOutputToolResponse;
|
|
54
54
|
break;
|
|
55
55
|
}
|
|
56
56
|
const { reorderedToolCalls, handoffToolToProcess } = (0, toolCallProcessor_1.reorderToolCallsForHandoff)(toolCalls, handoffTools);
|
|
57
57
|
for (const toolCall of reorderedToolCalls) {
|
|
58
|
-
const result = await (0, toolCallProcessor_1.processSingleToolCall)(toolCall, invokableTools, structuredOutputTool, messages, response.choices[0].message, reorderedToolCalls.indexOf(toolCall) === 0, processedToolCallIds, handoffToolToProcess, skillToolNameMap
|
|
58
|
+
const result = await (0, toolCallProcessor_1.processSingleToolCall)(toolCall, invokableTools, structuredOutputTool, messages, response.choices[0].message, reorderedToolCalls.indexOf(toolCall) === 0, processedToolCallIds, handoffToolToProcess, skillToolNameMap);
|
|
59
59
|
if (result.structuredOutputToolResponse) {
|
|
60
60
|
structuredOutputToolResponse = result.structuredOutputToolResponse;
|
|
61
61
|
}
|
|
@@ -78,7 +78,7 @@ async function processToolCalls(executeFunctions, body, messages, invokableTools
|
|
|
78
78
|
messages: messages,
|
|
79
79
|
};
|
|
80
80
|
try {
|
|
81
|
-
response = await (0, responsesApiConverter_1.sendModelRequest)(executeFunctions, finalBody, apiMode);
|
|
81
|
+
response = await (0, responsesApiConverter_1.sendModelRequest)(executeFunctions, finalBody, apiMode, preserveReasoning);
|
|
82
82
|
if (response.usage) {
|
|
83
83
|
(0, usageTracking_1.mergeUsageData)(accumulatedUsage, response.usage);
|
|
84
84
|
accumulatedUsage.total_requests++;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/tools/executor.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/tools/executor.ts"],"names":[],"mappings":";;AAYA,4CA2KC;AAtLD,2EAAmE;AAGnE,8DAAmF;AACnF,iEAAoE;AACpE,2DAAwF;AAMjF,KAAK,UAAU,gBAAgB,CACrC,gBAAmC,EACnC,IAAiB,EACjB,QAAuB,EACvB,cAA+B,EAC/B,kBAA0B,EAC1B,oBAAkC,EAClC,WAAyB,EACzB,oBAA4B,CAAC,EAC7B,eAAyB,EAAE,EAC3B,aAAuB,EAAE,EACzB,oBAA2C,KAAK,EAChD,UAAmB,iBAAiB;;IAYpC,MAAM,gBAAgB,GAAqB;QAC1C,aAAa,EAAE,CAAC;QAChB,iBAAiB,EAAE,CAAC;QACpB,YAAY,EAAE,CAAC;QACf,cAAc,EAAE,CAAC;QACjB,gBAAgB,EAAE,CAAC;QACnB,eAAe,EAAE,EAAE;KACnB,CAAC;IAEF,IAAI,SAAS,GAAG,IAAI,CAAC;IACrB,IAAI,QAAwB,CAAC;IAE7B,IAAI,CAAC;QACJ,QAAQ,GAAG,MAAM,IAAA,wCAAgB,EAAC,gBAAgB,EAAE,SAAS,EAAE,OAAO,EAAE,iBAAiB,CAAC,CAAC;QAG3F,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,CAAC;IACb,CAAC;IAGD,IAAI,SAAS,GAAG,MAAA,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,OAAO,CAAC,CAAC,CAAC,0CAAE,OAAO,0CAAE,UAAU,CAAC;IAC1D,IAAI,gBAAgB,GAAG,iBAAiB,CAAC;IACzC,IAAI,4BAA4B,GAAQ,IAAI,CAAC;IAG7C,MAAM,oBAAoB,GAAG,IAAI,GAAG,EAAU,CAAC;IAG/C,IAAI,eAAe,GAAG,KAAK,CAAC;IAC5B,IAAI,eAAmC,CAAC;IACxC,IAAI,iBAAqC,CAAC;IAG1C,MAAM,gBAAgB,GAAG,IAAI,GAAG,EAAkB,CAAC;IACnD,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC3B,KAAK,MAAM,IAAI,IAAI,cAAc,EAAE,CAAC;YACnC,IAAI,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;gBACpC,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YAC5C,CAAC;QACF,CAAC;IACF,CAAC;IAED,OAAO,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,MAAM,EAAE,CAAC;QAE1B,MAAM,oBAAoB,GAAG,kBAAkB,IAAI,CAAC,IAAI,gBAAgB,GAAG,kBAAkB,CAAC;QAG9F,IAAI,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,OAAO,EAAE,CAAC;YAC1B,MAAM;QACP,CAAC;QAGD,IAAI,oBAAoB,EAAE,CAAC;YAC1B,MAAM,MAAM,GAAG,MAAM,IAAA,iDAA0B,EAC9C,gBAAgB,EAChB,IAAI,EACJ,QAAQ,EACR,oBAAoB,EACpB,4BAA4B,EAC5B,gBAAgB,EAChB,OAAO,EACP,iBAAiB,CACjB,CAAC;YACF,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;YAC3B,4BAA4B,GAAG,MAAM,CAAC,4BAA4B,CAAC;YACnE,MAAM;QACP,CAAC;QAGD,MAAM,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,GAAG,IAAA,8CAA0B,EAC9E,SAAS,EACT,YAAY,CACZ,CAAC;QAGF,KAAK,MAAM,QAAQ,IAAI,kBAAkB,EAAE,CAAC;YAC3C,MAAM,MAAM,GAAG,MAAM,IAAA,yCAAqB,EACzC,QAAQ,EACR,cAAc,EACd,oBAAoB,EACpB,QAAQ,EACR,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,EAC3B,kBAAkB,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,EAC1C,oBAAoB,EACpB,oBAAoB,EACpB,gBAAgB,CAChB,CAAC;YAEF,IAAI,MAAM,CAAC,4BAA4B,EAAE,CAAC;gBACzC,4BAA4B,GAAG,MAAM,CAAC,4BAA4B,CAAC;YACpE,CAAC;YACD,IAAI,MAAM,CAAC,eAAe,EAAE,CAAC;gBAC5B,eAAe,GAAG,IAAI,CAAC;gBACvB,eAAe,GAAG,MAAM,CAAC,eAAe,CAAC;gBACzC,iBAAiB,GAAG,MAAM,CAAC,iBAAiB,CAAC;YAC9C,CAAC;YACD,IAAI,MAAM,CAAC,WAAW;gBAAE,MAAM;QAC/B,CAAC;QAED,IAAI,4BAA4B,EAAE,CAAC;YAClC,MAAM;QACP,CAAC;QAGD,IAAI,eAAe,EAAE,CAAC;YACrB,MAAM;QACP,CAAC;QAGD,SAAS,GAAG;YACX,GAAG,IAAI;YACP,QAAQ,EAAE,QAAQ;SAClB,CAAC;QAGF,IAAI,CAAC;YACJ,QAAQ,GAAG,MAAM,IAAA,wCAAgB,EAAC,gBAAgB,EAAE,SAAS,EAAE,OAAO,EAAE,iBAAiB,CAAC,CAAC;YAG3F,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC;gBACpB,IAAA,8BAAc,EAAC,gBAAgB,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC;gBACjD,gBAAgB,CAAC,cAAc,EAAE,CAAC;YACnC,CAAC;QACF,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,KAAK,CAAC;QACb,CAAC;QAGD,SAAS,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC;QACnD,gBAAgB,IAAI,CAAC,CAAC;IACvB,CAAC;IAED,OAAO;QACN,QAAQ;QACR,4BAA4B;QAC5B,cAAc,EAAE,gBAAgB;QAChC,SAAS;QACT,gBAAgB;QAChB,eAAe;QACf,eAAe;QACf,iBAAiB;KACjB,CAAC;AACH,CAAC"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import type { IExecuteFunctions, IDataObject } from 'n8n-workflow';
|
|
2
|
-
import type { ChatCompletion } from '../../api/types';
|
|
2
|
+
import type { ApiMode, ChatCompletion } from '../../api/types';
|
|
3
3
|
import { type AccumulatedUsage } from '../execution/usageTracking';
|
|
4
|
+
import type { PreserveReasoningMode } from '../messages/types';
|
|
4
5
|
export interface MaxIterationsResult {
|
|
5
6
|
response: ChatCompletion;
|
|
6
7
|
structuredOutputToolResponse: any;
|
|
7
8
|
}
|
|
8
|
-
export declare function handleMaxIterationsReached(executeFunctions: IExecuteFunctions, body: IDataObject, messages: IDataObject[], structuredOutputTool: IDataObject | undefined, existingStructuredOutputResponse: any, accumulatedUsage: AccumulatedUsage, apiMode?:
|
|
9
|
+
export declare function handleMaxIterationsReached(executeFunctions: IExecuteFunctions, body: IDataObject, messages: IDataObject[], structuredOutputTool: IDataObject | undefined, existingStructuredOutputResponse: any, accumulatedUsage: AccumulatedUsage, apiMode?: ApiMode, preserveReasoning?: PreserveReasoningMode): Promise<MaxIterationsResult>;
|
|
@@ -3,7 +3,7 @@ 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
|
-
async function handleMaxIterationsReached(executeFunctions, body, messages, structuredOutputTool, existingStructuredOutputResponse, accumulatedUsage, apiMode = 'chatCompletions') {
|
|
6
|
+
async function handleMaxIterationsReached(executeFunctions, body, messages, structuredOutputTool, existingStructuredOutputResponse, accumulatedUsage, apiMode = 'chatCompletions', preserveReasoning = 'all') {
|
|
7
7
|
var _a, _b, _c;
|
|
8
8
|
let finalBody;
|
|
9
9
|
if (structuredOutputTool && !existingStructuredOutputResponse) {
|
|
@@ -27,7 +27,7 @@ async function handleMaxIterationsReached(executeFunctions, body, messages, stru
|
|
|
27
27
|
}
|
|
28
28
|
let response;
|
|
29
29
|
try {
|
|
30
|
-
response = await (0, responsesApiConverter_1.sendModelRequest)(executeFunctions, finalBody, apiMode);
|
|
30
|
+
response = await (0, responsesApiConverter_1.sendModelRequest)(executeFunctions, finalBody, apiMode, preserveReasoning);
|
|
31
31
|
if (response.usage) {
|
|
32
32
|
(0, usageTracking_1.mergeUsageData)(accumulatedUsage, response.usage);
|
|
33
33
|
accumulatedUsage.total_requests++;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"maxIterationsHandler.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/tools/maxIterationsHandler.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"maxIterationsHandler.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/tools/maxIterationsHandler.ts"],"names":[],"mappings":";;AAgBA,gEA+DC;AA9ED,2EAAmE;AAEnE,8DAAmF;AAa5E,KAAK,UAAU,0BAA0B,CAC/C,gBAAmC,EACnC,IAAiB,EACjB,QAAuB,EACvB,oBAA6C,EAC7C,gCAAqC,EACrC,gBAAkC,EAClC,UAAmB,iBAAiB,EACpC,oBAA2C,KAAK;;IAEhD,IAAI,SAAsB,CAAC;IAE3B,IAAI,oBAAoB,IAAI,CAAC,gCAAgC,EAAE,CAAC;QAE/D,SAAS,GAAG;YACX,GAAG,IAAI;YACP,QAAQ,EAAE,QAAQ;YAClB,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,QAAQ;YAClB,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,EAAE,iBAAiB,CAAC,CAAC;QAE3F,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"}
|