n8n-nodes-simple 3.3.2 → 4.1.2
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/MemoryPostgresChat/MemoryPostgresChat.node.d.ts +5 -0
- package/dist/nodes/MemoryPostgresChat/MemoryPostgresChat.node.js +162 -0
- package/dist/nodes/MemoryPostgresChat/MemoryPostgresChat.node.js.map +1 -0
- package/dist/nodes/MemoryPostgresChat/postgres.svg +1 -0
- package/dist/nodes/shared/api/responsesApiConverter.d.ts +1 -1
- package/dist/nodes/shared/api/responsesApiConverter.js +4 -3
- package/dist/nodes/shared/api/responsesApiConverter.js.map +1 -1
- package/dist/nodes/shared/config/parameters.d.ts +2 -0
- package/dist/nodes/shared/config/parameters.js +6 -3
- package/dist/nodes/shared/config/parameters.js.map +1 -1
- package/dist/nodes/shared/config/properties/apiMode.js +8 -28
- package/dist/nodes/shared/config/properties/apiMode.js.map +1 -1
- package/dist/nodes/shared/config/properties/options.js +48 -0
- package/dist/nodes/shared/config/properties/options.js.map +1 -1
- package/dist/nodes/shared/core/execution/executionSetup.d.ts +1 -0
- package/dist/nodes/shared/core/execution/executionSetup.js +1 -0
- package/dist/nodes/shared/core/execution/executionSetup.js.map +1 -1
- package/dist/nodes/shared/core/execution/executor.d.ts +1 -1
- package/dist/nodes/shared/core/execution/executor.js +4 -1
- package/dist/nodes/shared/core/execution/executor.js.map +1 -1
- package/dist/nodes/shared/core/execution/messageOperation.js +14 -7
- package/dist/nodes/shared/core/execution/messageOperation.js.map +1 -1
- package/dist/nodes/shared/core/execution/modelAttempt.d.ts +3 -0
- package/dist/nodes/shared/core/execution/modelAttempt.js +7 -5
- package/dist/nodes/shared/core/execution/modelAttempt.js.map +1 -1
- package/dist/nodes/shared/core/memory/io.d.ts +1 -1
- package/dist/nodes/shared/core/memory/io.js +15 -9
- package/dist/nodes/shared/core/memory/io.js.map +1 -1
- package/dist/nodes/shared/core/messages/chatHistory.d.ts +3 -2
- package/dist/nodes/shared/core/messages/chatHistory.js +3 -7
- package/dist/nodes/shared/core/messages/chatHistory.js.map +1 -1
- package/dist/nodes/shared/core/messages/converter.js +7 -6
- package/dist/nodes/shared/core/messages/converter.js.map +1 -1
- package/dist/nodes/shared/core/tools/executor.d.ts +1 -1
- package/dist/nodes/shared/core/tools/executor.js +20 -28
- 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 +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 +13 -5
- package/dist/nodes/shared/core/tools/toolCallProcessor.js.map +1 -1
- package/dist/package.json +7 -3
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +7 -3
|
@@ -23,7 +23,7 @@ function unwrapHandoffResult(value) {
|
|
|
23
23
|
return value;
|
|
24
24
|
}
|
|
25
25
|
async function executeModelAttemptWithRetries(context) {
|
|
26
|
-
var _a, _b;
|
|
26
|
+
var _a, _b, _c;
|
|
27
27
|
const { executeFunctions, params, index, currentModel, maxRetries, customParams, messages, tools, tool_choice, responseFormat, invokableTools, structuredOutputTool, validationSchema, shouldValidate, shouldRetryOnAnyError, totalAccumulatedUsage, memory, apiMode, } = context;
|
|
28
28
|
const retryDelayMs = params.retryDelay * 1000;
|
|
29
29
|
let retryState = {
|
|
@@ -31,9 +31,11 @@ async function executeModelAttemptWithRetries(context) {
|
|
|
31
31
|
attemptNumber: 1,
|
|
32
32
|
};
|
|
33
33
|
let messagesCountBeforeValidationRetries = messages.length;
|
|
34
|
+
const preToolCallMessageCount = messages.length;
|
|
34
35
|
let currentIteration = 1;
|
|
35
36
|
while (true) {
|
|
36
|
-
|
|
37
|
+
const apiMessages = (_a = context.apiMessages) !== null && _a !== void 0 ? _a : messages;
|
|
38
|
+
let body = (0, body_1.prepareRequestBody)(currentModel, apiMessages, tools, tool_choice, responseFormat, params.options, customParams);
|
|
37
39
|
if (params.apiMode === 'responses' && params.stateful) {
|
|
38
40
|
body.store = true;
|
|
39
41
|
if (params.previousResponseId) {
|
|
@@ -49,7 +51,7 @@ async function executeModelAttemptWithRetries(context) {
|
|
|
49
51
|
let handoffToolName;
|
|
50
52
|
let handoffToolResult;
|
|
51
53
|
try {
|
|
52
|
-
const result = await (0, executor_1.processToolCalls)(executeFunctions, body, messages, invokableTools, params.maxToolsIterations, structuredOutputTool, params.abortSignal, currentIteration, context.handoffTools, context.skillTools, params.preserveReasoning, apiMode, params.previousResponseId);
|
|
54
|
+
const result = await (0, executor_1.processToolCalls)(executeFunctions, body, messages, invokableTools, params.maxToolsIterations, structuredOutputTool, params.abortSignal, currentIteration, context.handoffTools, context.skillTools, params.preserveReasoning, apiMode, params.previousResponseId, context.requestTimeoutMs, context.skillInstructionsMessageType, params.stateful);
|
|
53
55
|
response = result.response;
|
|
54
56
|
structuredOutputToolResponse = result.structuredOutputToolResponse;
|
|
55
57
|
finalIteration = result.finalIteration;
|
|
@@ -82,7 +84,7 @@ async function executeModelAttemptWithRetries(context) {
|
|
|
82
84
|
}
|
|
83
85
|
const unwrappedOutput = unwrapHandoffResult(parsedHandoffOutput);
|
|
84
86
|
if (memory && params.saveMessagesInChatMemory) {
|
|
85
|
-
await (0, io_1.saveToMemory)(messages, unwrappedOutput, params.saveToolCallsInChatMemory, params.saveReasoningInChatMemory, params.saveSystemMessagesInChatMemory, memory, response.choices[0].message, (
|
|
87
|
+
await (0, io_1.saveToMemory)(messages, unwrappedOutput, params.saveToolCallsInChatMemory, params.saveReasoningInChatMemory, params.saveSystemMessagesInChatMemory, memory, response.choices[0].message, (_b = response._rawResponse) === null || _b === void 0 ? void 0 : _b.id, preToolCallMessageCount);
|
|
86
88
|
}
|
|
87
89
|
const requestBody = apiMode === 'responses' ? (0, responsesApiConverter_1.convertBodyToResponsesApi)(body) : body;
|
|
88
90
|
const outputData = await (0, outputData_1.prepareOutputData)(response, { output: unwrappedOutput, handoffs: [handoffToolName] }, messages, messages.length, params.addToOutput, executeFunctions, index, requestBody, totalAccumulatedUsage, true);
|
|
@@ -141,7 +143,7 @@ async function executeModelAttemptWithRetries(context) {
|
|
|
141
143
|
});
|
|
142
144
|
}
|
|
143
145
|
if (memory && params.saveMessagesInChatMemory) {
|
|
144
|
-
await (0, io_1.saveToMemory)(messages.slice(0, messagesCountBeforeValidationRetries), parsedOutput, params.saveToolCallsInChatMemory, params.saveReasoningInChatMemory, params.saveSystemMessagesInChatMemory, memory, response.choices[0].message, (
|
|
146
|
+
await (0, io_1.saveToMemory)(messages.slice(0, messagesCountBeforeValidationRetries), parsedOutput, params.saveToolCallsInChatMemory, params.saveReasoningInChatMemory, params.saveSystemMessagesInChatMemory, memory, response.choices[0].message, (_c = response._rawResponse) === null || _c === void 0 ? void 0 : _c.id, preToolCallMessageCount);
|
|
145
147
|
}
|
|
146
148
|
return outputData;
|
|
147
149
|
}
|
|
@@ -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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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import type { IExecuteFunctions, ISupplyDataFunctions, IDataObject } from 'n8n-workflow';
|
|
2
2
|
import type { BufferWindowMemory } from 'langchain/memory';
|
|
3
3
|
export declare function getOptionalMemory(ctx: IExecuteFunctions | ISupplyDataFunctions): Promise<BufferWindowMemory | undefined>;
|
|
4
|
-
export declare function saveToMemory(messages: IDataObject[], output: any, saveToolCallsInChatMemory: boolean, saveReasoningInChatMemory: boolean, saveSystemMessagesInChatMemory: boolean, memory: BufferWindowMemory, finalResponseMessage?: IDataObject, responseId?: string): Promise<void>;
|
|
4
|
+
export declare function saveToMemory(messages: IDataObject[], output: any, saveToolCallsInChatMemory: boolean, saveReasoningInChatMemory: boolean, saveSystemMessagesInChatMemory: boolean, memory: BufferWindowMemory, finalResponseMessage?: IDataObject, responseId?: string, preToolCallMessageCount?: number): Promise<void>;
|
|
@@ -7,13 +7,14 @@ const n8n_workflow_1 = require("n8n-workflow");
|
|
|
7
7
|
async function getOptionalMemory(ctx) {
|
|
8
8
|
return (await ctx.getInputConnectionData(n8n_workflow_1.NodeConnectionTypes.AiMemory, 0));
|
|
9
9
|
}
|
|
10
|
-
function extractMessages(messages) {
|
|
10
|
+
function extractMessages(messages, boundary) {
|
|
11
11
|
if (!Array.isArray(messages) || messages.length === 0) {
|
|
12
12
|
return { lastUser: null, messagesAfter: [] };
|
|
13
13
|
}
|
|
14
|
+
const searchLimit = boundary !== null && boundary !== void 0 ? boundary : messages.length;
|
|
14
15
|
let lastUserIndex = -1;
|
|
15
|
-
for (let i =
|
|
16
|
-
if (messages[i].role ===
|
|
16
|
+
for (let i = searchLimit - 1; i >= 0; i--) {
|
|
17
|
+
if (messages[i].role === 'user' || (messages[i].role === 'system' && i > 0)) {
|
|
17
18
|
lastUserIndex = i;
|
|
18
19
|
break;
|
|
19
20
|
}
|
|
@@ -38,9 +39,9 @@ function buildAdditionalKwargs(saveReasoning, source, responseId) {
|
|
|
38
39
|
kwargs.response_id = responseId;
|
|
39
40
|
return kwargs;
|
|
40
41
|
}
|
|
41
|
-
async function saveToMemory(messages, output, saveToolCallsInChatMemory, saveReasoningInChatMemory, saveSystemMessagesInChatMemory, memory, finalResponseMessage, responseId) {
|
|
42
|
+
async function saveToMemory(messages, output, saveToolCallsInChatMemory, saveReasoningInChatMemory, saveSystemMessagesInChatMemory, memory, finalResponseMessage, responseId, preToolCallMessageCount) {
|
|
42
43
|
var _a, _b;
|
|
43
|
-
const extractedMessages = extractMessages(messages);
|
|
44
|
+
const extractedMessages = extractMessages(messages, preToolCallMessageCount);
|
|
44
45
|
const input = (_a = extractedMessages.lastUser) === null || _a === void 0 ? void 0 : _a.content;
|
|
45
46
|
if (!input) {
|
|
46
47
|
console.log('No user message found; no messages will be stored in the Chat Memory sub-node.');
|
|
@@ -58,8 +59,11 @@ async function saveToMemory(messages, output, saveToolCallsInChatMemory, saveRea
|
|
|
58
59
|
const additional_kwargs = buildAdditionalKwargs(saveReasoningInChatMemory, finalResponseMessage, responseId);
|
|
59
60
|
let aiMessage;
|
|
60
61
|
if (saveToolCallsInChatMemory) {
|
|
61
|
-
const
|
|
62
|
-
.filter(msg => msg.role === 'assistant' ||
|
|
62
|
+
const tool_call_messages = extractedMessages.messagesAfter
|
|
63
|
+
.filter(msg => msg.role === 'assistant' ||
|
|
64
|
+
msg.role === 'tool' ||
|
|
65
|
+
(saveSystemMessagesInChatMemory && msg.role === 'system') ||
|
|
66
|
+
(saveSystemMessagesInChatMemory && msg.role === 'user'))
|
|
63
67
|
.map(msg => ({
|
|
64
68
|
role: msg.role,
|
|
65
69
|
content: msg.content || null,
|
|
@@ -72,8 +76,10 @@ async function saveToMemory(messages, output, saveToolCallsInChatMemory, saveRea
|
|
|
72
76
|
}));
|
|
73
77
|
aiMessage = new messages_1.AIMessage({
|
|
74
78
|
content: stringifiedOutput,
|
|
75
|
-
|
|
76
|
-
|
|
79
|
+
additional_kwargs: {
|
|
80
|
+
...additional_kwargs,
|
|
81
|
+
...(tool_call_messages.length > 0 && { tool_call_messages }),
|
|
82
|
+
},
|
|
77
83
|
response_metadata: {},
|
|
78
84
|
});
|
|
79
85
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"io.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/memory/io.ts"],"names":[],"mappings":";;AAcA,8CAMC;
|
|
1
|
+
{"version":3,"file":"io.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/memory/io.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { Message, RawMessage } from './types';
|
|
2
|
+
import { BaseMessage } from '@langchain/core/messages';
|
|
2
3
|
import type { BufferWindowMemory } from 'langchain/memory';
|
|
3
|
-
export declare function
|
|
4
|
-
export declare function
|
|
4
|
+
export declare function getChatMessages(memory: BufferWindowMemory): Promise<BaseMessage[]>;
|
|
5
|
+
export declare function unpackChatHistoryAndMemory(rawMessagesToSend: RawMessage[], loadToolCallsFromChatMemory?: boolean, loadReasoningFromChatMemory?: boolean, loadSystemMessagesFromChatMemory?: boolean, memory?: BufferWindowMemory, preloadedMemoryMessages?: BaseMessage[]): Promise<Message[]>;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getChatMessages = getChatMessages;
|
|
3
4
|
exports.unpackChatHistoryAndMemory = unpackChatHistoryAndMemory;
|
|
4
|
-
exports.getLatestResponseIdFromMemory = getLatestResponseIdFromMemory;
|
|
5
5
|
const converter_1 = require("./converter");
|
|
6
6
|
async function getChatMessages(memory) {
|
|
7
7
|
const allMessages = (await memory.loadMemoryVariables({}))[memory.memoryKey];
|
|
@@ -11,7 +11,7 @@ async function getChatMessages(memory) {
|
|
|
11
11
|
}
|
|
12
12
|
return allMessages;
|
|
13
13
|
}
|
|
14
|
-
async function unpackChatHistoryAndMemory(rawMessagesToSend, loadToolCallsFromChatMemory = true, loadReasoningFromChatMemory = true, loadSystemMessagesFromChatMemory = true, memory) {
|
|
14
|
+
async function unpackChatHistoryAndMemory(rawMessagesToSend, loadToolCallsFromChatMemory = true, loadReasoningFromChatMemory = true, loadSystemMessagesFromChatMemory = true, memory, preloadedMemoryMessages) {
|
|
15
15
|
const processedMessages = [];
|
|
16
16
|
for (const rawMessage of rawMessagesToSend) {
|
|
17
17
|
if (rawMessage.role === 'chatHistoryRole') {
|
|
@@ -25,7 +25,7 @@ async function unpackChatHistoryAndMemory(rawMessagesToSend, loadToolCallsFromCh
|
|
|
25
25
|
processedMessages.push(...chatHistory);
|
|
26
26
|
}
|
|
27
27
|
else if (rawMessage.role === 'chatMemoryRole' && memory) {
|
|
28
|
-
const rawMemoryMessages = await getChatMessages(memory);
|
|
28
|
+
const rawMemoryMessages = preloadedMemoryMessages !== null && preloadedMemoryMessages !== void 0 ? preloadedMemoryMessages : await getChatMessages(memory);
|
|
29
29
|
if (rawMemoryMessages.length > 0) {
|
|
30
30
|
let memoryMessages = (0, converter_1.convertMessages)(rawMemoryMessages, loadToolCallsFromChatMemory, loadReasoningFromChatMemory);
|
|
31
31
|
if (!loadSystemMessagesFromChatMemory) {
|
|
@@ -41,8 +41,4 @@ async function unpackChatHistoryAndMemory(rawMessagesToSend, loadToolCallsFromCh
|
|
|
41
41
|
}
|
|
42
42
|
return processedMessages;
|
|
43
43
|
}
|
|
44
|
-
async function getLatestResponseIdFromMemory(memory) {
|
|
45
|
-
const messages = await getChatMessages(memory);
|
|
46
|
-
return (0, converter_1.getLatestResponseId)(messages);
|
|
47
|
-
}
|
|
48
44
|
//# sourceMappingURL=chatHistory.js.map
|
|
@@ -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":";;AAKA,0CAUC;AAWD,gEAqDC;AA5ED,2CAA8C;AAEvC,KAAK,UAAU,eAAe,CAAC,MAA0B;IAC/D,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;AAWM,KAAK,UAAU,0BAA0B,CAC/C,iBAA+B,EAC/B,8BAAuC,IAAI,EAC3C,8BAAuC,IAAI,EAC3C,mCAA4C,IAAI,EAChD,MAA2B,EAC3B,uBAAuC;IAEvC,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,uBAAuB,aAAvB,uBAAuB,cAAvB,uBAAuB,GAAI,MAAM,eAAe,CAAC,MAAM,CAAC,CAAA;YAEjG,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAClC,IAAI,cAAc,GAAc,IAAA,2BAAe,EAC9C,iBAAiB,EACjB,2BAA2B,EAC3B,2BAA2B,CAC3B,CAAC;gBAGF,IAAI,CAAC,gCAAgC,EAAE,CAAC;oBACvC,cAAc,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC;gBACxE,CAAC;gBAED,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"}
|
|
@@ -4,20 +4,21 @@ exports.convertMessages = convertMessages;
|
|
|
4
4
|
exports.getLatestResponseId = getLatestResponseId;
|
|
5
5
|
const types_1 = require("./types");
|
|
6
6
|
function convertMessages(messages, loadToolCalls = true, loadReasoning = true) {
|
|
7
|
-
var _a, _b;
|
|
7
|
+
var _a, _b, _c;
|
|
8
8
|
const result = [];
|
|
9
9
|
for (const message of messages) {
|
|
10
10
|
const role = message.constructor.name === 'AIMessage' ? 'assistant'
|
|
11
11
|
: message.constructor.name === 'SystemMessage' ? 'system'
|
|
12
12
|
: 'user';
|
|
13
13
|
const content = typeof message.content === 'string' ? message.content
|
|
14
|
-
: message.content
|
|
14
|
+
: message.content == null ? ''
|
|
15
15
|
: (0, types_1.isContentPartArray)(message.content) ? message.content
|
|
16
16
|
: JSON.stringify(message.content);
|
|
17
|
-
const toolCalls = message.
|
|
17
|
+
const toolCalls = (_a = message.additional_kwargs) === null || _a === void 0 ? void 0 : _a.tool_call_messages;
|
|
18
18
|
if (loadToolCalls &&
|
|
19
19
|
role === 'assistant' &&
|
|
20
|
-
Array.isArray(toolCalls)
|
|
20
|
+
Array.isArray(toolCalls) &&
|
|
21
|
+
toolCalls.length > 0) {
|
|
21
22
|
if (loadReasoning) {
|
|
22
23
|
result.push(...toolCalls);
|
|
23
24
|
}
|
|
@@ -27,7 +28,7 @@ function convertMessages(messages, loadToolCalls = true, loadReasoning = true) {
|
|
|
27
28
|
return rest;
|
|
28
29
|
}));
|
|
29
30
|
}
|
|
30
|
-
const kwargs = (
|
|
31
|
+
const kwargs = (_b = message.additional_kwargs) !== null && _b !== void 0 ? _b : {};
|
|
31
32
|
const assistantMsg = {
|
|
32
33
|
role: 'assistant',
|
|
33
34
|
content: content,
|
|
@@ -38,7 +39,7 @@ function convertMessages(messages, loadToolCalls = true, loadReasoning = true) {
|
|
|
38
39
|
result.push(assistantMsg);
|
|
39
40
|
}
|
|
40
41
|
else {
|
|
41
|
-
const kwargs = (
|
|
42
|
+
const kwargs = (_c = message.additional_kwargs) !== null && _c !== void 0 ? _c : {};
|
|
42
43
|
const msg = {
|
|
43
44
|
role: role,
|
|
44
45
|
content: content,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"converter.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/messages/converter.ts"],"names":[],"mappings":";;AAgBA,
|
|
1
|
+
{"version":3,"file":"converter.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/messages/converter.ts"],"names":[],"mappings":";;AAgBA,0CA0DC;AAMD,kDASC;AAzFD,mCAAsD;AAgBtD,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,CAAC,OAAO,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE;gBAC9B,CAAC,CAAC,IAAA,0BAAkB,EAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO;oBACvD,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAMnC,MAAM,SAAS,GAAG,MAAC,OAAe,CAAC,iBAAiB,0CAAE,kBAAkB,CAAC;QACzE,IACC,aAAa;YACb,IAAI,KAAK,WAAW;YACpB,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC;YACxB,SAAS,CAAC,MAAM,GAAG,CAAC,EACnB,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;AAMD,SAAgB,mBAAmB,CAAC,QAAuB;;IAC1D,KAAK,IAAI,CAAC,GAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QAC/C,MAAM,GAAG,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;QACxB,IAAI,GAAG,CAAC,WAAW,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;YAC1C,MAAM,UAAU,GAAG,MAAC,GAAW,CAAC,iBAAiB,0CAAE,WAAW,CAAC;YAC/D,IAAI,UAAU;gBAAE,OAAO,MAAM,CAAC,UAAU,CAAC,CAAC;QAC3C,CAAC;IACF,CAAC;IACD,OAAO,EAAE,CAAC;AACX,CAAC"}
|
|
@@ -3,7 +3,7 @@ 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, previousResponseId?: string): Promise<{
|
|
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, previousResponseId?: string, requestTimeoutMs?: number, skillInstructionsMessageType?: string, stateful?: boolean): Promise<{
|
|
7
7
|
response: ChatCompletion;
|
|
8
8
|
structuredOutputToolResponse: any;
|
|
9
9
|
finalIteration: number;
|
|
@@ -6,7 +6,7 @@ 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', previousResponseId = '') {
|
|
9
|
+
async function processToolCalls(executeFunctions, body, messages, invokableTools, maxToolsIterations, structuredOutputTool, abortSignal, startingIteration = 1, handoffTools = [], skillTools = [], preserveReasoning = 'none', apiMode = 'chatCompletions', previousResponseId = '', requestTimeoutMs, skillInstructionsMessageType = 'userMessage', stateful = false) {
|
|
10
10
|
var _a, _b, _c, _d;
|
|
11
11
|
const accumulatedUsage = {
|
|
12
12
|
prompt_tokens: 0,
|
|
@@ -18,7 +18,7 @@ async function processToolCalls(executeFunctions, body, messages, invokableTools
|
|
|
18
18
|
};
|
|
19
19
|
const maxIterationsReachedImmediately = maxToolsIterations >= 0 && startingIteration > maxToolsIterations;
|
|
20
20
|
if (maxIterationsReachedImmediately && structuredOutputTool) {
|
|
21
|
-
const result = await (0, maxIterationsHandler_1.handleMaxIterationsReached)(executeFunctions, body, messages, structuredOutputTool, null, accumulatedUsage, apiMode, preserveReasoning, previousResponseId);
|
|
21
|
+
const result = await (0, maxIterationsHandler_1.handleMaxIterationsReached)(executeFunctions, body, messages, structuredOutputTool, null, accumulatedUsage, apiMode, preserveReasoning, previousResponseId, requestTimeoutMs);
|
|
22
22
|
return {
|
|
23
23
|
response: result.response,
|
|
24
24
|
structuredOutputToolResponse: result.structuredOutputToolResponse,
|
|
@@ -33,7 +33,7 @@ async function processToolCalls(executeFunctions, body, messages, invokableTools
|
|
|
33
33
|
: body;
|
|
34
34
|
let response;
|
|
35
35
|
try {
|
|
36
|
-
response = await (0, responsesApiConverter_1.sendModelRequest)(executeFunctions, finalBody, apiMode);
|
|
36
|
+
response = await (0, responsesApiConverter_1.sendModelRequest)(executeFunctions, finalBody, apiMode, requestTimeoutMs);
|
|
37
37
|
if (response.usage) {
|
|
38
38
|
(0, usageTracking_1.mergeUsageData)(accumulatedUsage, response.usage);
|
|
39
39
|
accumulatedUsage.total_requests++;
|
|
@@ -43,7 +43,7 @@ async function processToolCalls(executeFunctions, body, messages, invokableTools
|
|
|
43
43
|
throw error;
|
|
44
44
|
}
|
|
45
45
|
let latestResponseId = '';
|
|
46
|
-
if (apiMode === 'responses' && ((_a = response._rawResponse) === null || _a === void 0 ? void 0 : _a.id)) {
|
|
46
|
+
if (apiMode === 'responses' && stateful && ((_a = response._rawResponse) === null || _a === void 0 ? void 0 : _a.id)) {
|
|
47
47
|
latestResponseId = response._rawResponse.id;
|
|
48
48
|
}
|
|
49
49
|
let toolCalls = (_c = (_b = response === null || response === void 0 ? void 0 : response.choices[0]) === null || _b === void 0 ? void 0 : _b.message) === null || _c === void 0 ? void 0 : _c.tool_calls;
|
|
@@ -67,7 +67,7 @@ async function processToolCalls(executeFunctions, body, messages, invokableTools
|
|
|
67
67
|
break;
|
|
68
68
|
}
|
|
69
69
|
if (maxIterationsReached) {
|
|
70
|
-
const result = await (0, maxIterationsHandler_1.handleMaxIterationsReached)(executeFunctions, body, messages, structuredOutputTool, structuredOutputToolResponse, accumulatedUsage, apiMode, preserveReasoning, latestResponseId);
|
|
70
|
+
const result = await (0, maxIterationsHandler_1.handleMaxIterationsReached)(executeFunctions, body, messages, structuredOutputTool, structuredOutputToolResponse, accumulatedUsage, apiMode, preserveReasoning, latestResponseId, requestTimeoutMs);
|
|
71
71
|
response = result.response;
|
|
72
72
|
structuredOutputToolResponse = result.structuredOutputToolResponse;
|
|
73
73
|
break;
|
|
@@ -75,7 +75,7 @@ async function processToolCalls(executeFunctions, body, messages, invokableTools
|
|
|
75
75
|
const messageCountBefore = messages.length;
|
|
76
76
|
const { reorderedToolCalls, handoffToolToProcess } = (0, toolCallProcessor_1.reorderToolCallsForHandoff)(toolCalls, handoffTools);
|
|
77
77
|
for (const toolCall of reorderedToolCalls) {
|
|
78
|
-
const result = await (0, toolCallProcessor_1.processSingleToolCall)(toolCall, invokableTools, structuredOutputTool, messages, response.choices[0].message, reorderedToolCalls.indexOf(toolCall) === 0, processedToolCallIds, handoffToolToProcess, skillToolNameMap);
|
|
78
|
+
const result = await (0, toolCallProcessor_1.processSingleToolCall)(toolCall, invokableTools, structuredOutputTool, messages, response.choices[0].message, reorderedToolCalls.indexOf(toolCall) === 0, processedToolCallIds, handoffToolToProcess, skillToolNameMap, skillInstructionsMessageType);
|
|
79
79
|
if (result.structuredOutputToolResponse) {
|
|
80
80
|
structuredOutputToolResponse = result.structuredOutputToolResponse;
|
|
81
81
|
}
|
|
@@ -93,33 +93,25 @@ async function processToolCalls(executeFunctions, body, messages, invokableTools
|
|
|
93
93
|
if (handoffDetected) {
|
|
94
94
|
break;
|
|
95
95
|
}
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
store: true,
|
|
106
|
-
|
|
107
|
-
}
|
|
108
|
-
else {
|
|
109
|
-
finalBody = {
|
|
110
|
-
...body,
|
|
111
|
-
messages: preserveReasoning !== 'all'
|
|
112
|
-
? (0, types_1.filterMessagesReasoning)(messages, preserveReasoning)
|
|
113
|
-
: messages,
|
|
114
|
-
};
|
|
115
|
-
}
|
|
96
|
+
const sourceMessages = latestResponseId
|
|
97
|
+
? messages.slice(messageCountBefore + 1)
|
|
98
|
+
: messages;
|
|
99
|
+
finalBody = {
|
|
100
|
+
...body,
|
|
101
|
+
messages: preserveReasoning !== 'all'
|
|
102
|
+
? (0, types_1.filterMessagesReasoning)(sourceMessages, preserveReasoning)
|
|
103
|
+
: sourceMessages,
|
|
104
|
+
...(latestResponseId
|
|
105
|
+
? { store: true, previous_response_id: latestResponseId }
|
|
106
|
+
: { store: false }),
|
|
107
|
+
};
|
|
116
108
|
try {
|
|
117
|
-
response = await (0, responsesApiConverter_1.sendModelRequest)(executeFunctions, finalBody, apiMode);
|
|
109
|
+
response = await (0, responsesApiConverter_1.sendModelRequest)(executeFunctions, finalBody, apiMode, requestTimeoutMs);
|
|
118
110
|
if (response.usage) {
|
|
119
111
|
(0, usageTracking_1.mergeUsageData)(accumulatedUsage, response.usage);
|
|
120
112
|
accumulatedUsage.total_requests++;
|
|
121
113
|
}
|
|
122
|
-
if (apiMode === 'responses' && ((_d = response._rawResponse) === null || _d === void 0 ? void 0 : _d.id)) {
|
|
114
|
+
if (apiMode === 'responses' && stateful && ((_d = response._rawResponse) === null || _d === void 0 ? void 0 : _d.id)) {
|
|
123
115
|
latestResponseId = response._rawResponse.id;
|
|
124
116
|
}
|
|
125
117
|
}
|
|
@@ -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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"}
|
|
@@ -6,4 +6,4 @@ export interface MaxIterationsResult {
|
|
|
6
6
|
response: ChatCompletion;
|
|
7
7
|
structuredOutputToolResponse: any;
|
|
8
8
|
}
|
|
9
|
-
export declare function handleMaxIterationsReached(executeFunctions: IExecuteFunctions, body: IDataObject, messages: IDataObject[], structuredOutputTool: IDataObject | undefined, existingStructuredOutputResponse: any, accumulatedUsage: AccumulatedUsage, apiMode?: ApiMode, preserveReasoning?: PreserveReasoningMode, latestResponseId?: string): Promise<MaxIterationsResult>;
|
|
9
|
+
export declare function handleMaxIterationsReached(executeFunctions: IExecuteFunctions, body: IDataObject, messages: IDataObject[], structuredOutputTool: IDataObject | undefined, existingStructuredOutputResponse: any, accumulatedUsage: AccumulatedUsage, apiMode?: ApiMode, preserveReasoning?: PreserveReasoningMode, latestResponseId?: string, requestTimeoutMs?: number): Promise<MaxIterationsResult>;
|
|
@@ -4,7 +4,7 @@ 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', latestResponseId = '') {
|
|
7
|
+
async function handleMaxIterationsReached(executeFunctions, body, messages, structuredOutputTool, existingStructuredOutputResponse, accumulatedUsage, apiMode = 'chatCompletions', preserveReasoning = 'none', latestResponseId = '', requestTimeoutMs) {
|
|
8
8
|
var _a, _b, _c;
|
|
9
9
|
let finalBody;
|
|
10
10
|
const filteredMessages = preserveReasoning !== 'all'
|
|
@@ -35,7 +35,7 @@ async function handleMaxIterationsReached(executeFunctions, body, messages, stru
|
|
|
35
35
|
}
|
|
36
36
|
let response;
|
|
37
37
|
try {
|
|
38
|
-
response = await (0, responsesApiConverter_1.sendModelRequest)(executeFunctions, finalBody, apiMode);
|
|
38
|
+
response = await (0, responsesApiConverter_1.sendModelRequest)(executeFunctions, finalBody, apiMode, requestTimeoutMs);
|
|
39
39
|
if (response.usage) {
|
|
40
40
|
(0, usageTracking_1.mergeUsageData)(accumulatedUsage, response.usage);
|
|
41
41
|
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,gEA2EC;AA1FD,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,EACjD,mBAA2B,EAAE,EAC7B,gBAAyB;;IAEzB,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;IAGD,IAAI,gBAAgB,EAAE,CAAC;QACtB,SAAS,CAAC,oBAAoB,GAAG,gBAAgB,CAAC;QAClD,SAAS,CAAC,KAAK,GAAG,IAAI,CAAC;IACxB,CAAC;IAED,IAAI,QAAwB,CAAC;IAC7B,IAAI,CAAC;QACJ,QAAQ,GAAG,MAAM,IAAA,wCAAgB,EAAC,gBAAgB,EAAE,SAAS,EAAE,OAAO,EAAE,gBAAgB,CAAC,CAAC;QAE1F,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"}
|
|
@@ -23,4 +23,4 @@ export declare function processSingleToolCall(toolCall: {
|
|
|
23
23
|
};
|
|
24
24
|
}, invokableTools: InvokableTool[], structuredOutputTool: IDataObject | undefined, messages: IDataObject[], assistantMessage: IDataObject, isFirstToolCallInBatch: boolean, processedToolCallIds: Set<string>, handoffToolToProcess: {
|
|
25
25
|
id: string;
|
|
26
|
-
} | undefined, skillToolNameMap: Map<string, string
|
|
26
|
+
} | undefined, skillToolNameMap: Map<string, string>, skillInstructionsMessageType?: string): Promise<SingleToolCallResult>;
|
|
@@ -21,7 +21,7 @@ function reorderToolCallsForHandoff(toolCalls, handoffTools) {
|
|
|
21
21
|
}
|
|
22
22
|
return { reorderedToolCalls: toolCalls, handoffToolToProcess: undefined };
|
|
23
23
|
}
|
|
24
|
-
async function processSingleToolCall(toolCall, invokableTools, structuredOutputTool, messages, assistantMessage, isFirstToolCallInBatch, processedToolCallIds, handoffToolToProcess, skillToolNameMap) {
|
|
24
|
+
async function processSingleToolCall(toolCall, invokableTools, structuredOutputTool, messages, assistantMessage, isFirstToolCallInBatch, processedToolCallIds, handoffToolToProcess, skillToolNameMap, skillInstructionsMessageType = 'userMessage') {
|
|
25
25
|
var _a;
|
|
26
26
|
const calledFunctionName = toolCall.function.name;
|
|
27
27
|
const calledFunctionArgs = toolCall.function.arguments;
|
|
@@ -102,10 +102,18 @@ async function processSingleToolCall(toolCall, invokableTools, structuredOutputT
|
|
|
102
102
|
role: 'tool',
|
|
103
103
|
content: `Follow the "${skillValidation.name}" instructions below.`,
|
|
104
104
|
});
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
105
|
+
if (skillInstructionsMessageType === 'userMessage') {
|
|
106
|
+
messages.push({
|
|
107
|
+
role: 'user',
|
|
108
|
+
content: skillValidation.instructions,
|
|
109
|
+
});
|
|
110
|
+
}
|
|
111
|
+
else {
|
|
112
|
+
messages.push({
|
|
113
|
+
role: 'system',
|
|
114
|
+
content: skillValidation.instructions,
|
|
115
|
+
});
|
|
116
|
+
}
|
|
109
117
|
}
|
|
110
118
|
else {
|
|
111
119
|
messages.push({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toolCallProcessor.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/tools/toolCallProcessor.ts"],"names":[],"mappings":";;AAiBA,gEAyBC;AAeD,
|
|
1
|
+
{"version":3,"file":"toolCallProcessor.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/tools/toolCallProcessor.ts"],"names":[],"mappings":"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"}
|
package/dist/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "n8n-nodes-simple",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "4.1.2",
|
|
4
4
|
"description": "Simple",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"n8n-community-node-package"
|
|
@@ -39,10 +39,12 @@
|
|
|
39
39
|
],
|
|
40
40
|
"nodes": [
|
|
41
41
|
"dist/nodes/CoreAgent/CoreAgent.node.js",
|
|
42
|
-
"dist/nodes/ModelOverview/ModelOverview.node.js"
|
|
42
|
+
"dist/nodes/ModelOverview/ModelOverview.node.js",
|
|
43
|
+
"dist/nodes/MemoryPostgresChat/MemoryPostgresChat.node.js"
|
|
43
44
|
]
|
|
44
45
|
},
|
|
45
46
|
"devDependencies": {
|
|
47
|
+
"@types/pg": "^8.20.0",
|
|
46
48
|
"@typescript-eslint/parser": "^7.18.0",
|
|
47
49
|
"eslint": "^8.56.0",
|
|
48
50
|
"eslint-plugin-n8n-nodes-base": "^1.16.6",
|
|
@@ -54,6 +56,7 @@
|
|
|
54
56
|
"dependencies": {
|
|
55
57
|
"@langchain/core": "0.3.80",
|
|
56
58
|
"@langchain/openai": "0.3.17",
|
|
59
|
+
"@n8n/ai-utilities": "^0.7.1",
|
|
57
60
|
"@n8n/json-schema-to-zod": "1.6.0",
|
|
58
61
|
"@solvers-hub/llm-json": "^0.1.8",
|
|
59
62
|
"@types/json-schema": "^7.0.15",
|
|
@@ -61,7 +64,8 @@
|
|
|
61
64
|
"langchain": "0.3.37",
|
|
62
65
|
"micromatch": ">=4.0.8",
|
|
63
66
|
"n8n-core": "1.90.0",
|
|
64
|
-
"n8n-workflow": "1.89.0"
|
|
67
|
+
"n8n-workflow": "1.89.0",
|
|
68
|
+
"pg": "^8.20.0"
|
|
65
69
|
},
|
|
66
70
|
"peerDependencies": {
|
|
67
71
|
"@types/lodash": "^4.17.23",
|