n8n-nodes-simple 3.2.2 → 3.2.3
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/config/parameters.d.ts +5 -3
- package/dist/nodes/shared/config/parameters.js +6 -2
- package/dist/nodes/shared/config/parameters.js.map +1 -1
- package/dist/nodes/shared/config/properties/messages.js +13 -3
- package/dist/nodes/shared/config/properties/messages.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.js +2 -2
- 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 +28 -37
- package/dist/nodes/shared/core/memory/io.js.map +1 -1
- package/dist/nodes/shared/core/messages/chatHistory.d.ts +1 -1
- package/dist/nodes/shared/core/messages/chatHistory.js +5 -2
- package/dist/nodes/shared/core/messages/chatHistory.js.map +1 -1
- package/dist/package.json +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -12,9 +12,6 @@ export type ExtractedParameters = {
|
|
|
12
12
|
addToOutput: string[];
|
|
13
13
|
outputJsonSchemaDefinition?: string;
|
|
14
14
|
structuredOutputMode?: string;
|
|
15
|
-
maxTries: number;
|
|
16
|
-
retryDelay: number;
|
|
17
|
-
appendRetryErrorMessages: boolean;
|
|
18
15
|
structuredOutputProperties?: VisualEditorProperties[];
|
|
19
16
|
structuredOutputName?: string;
|
|
20
17
|
structuredOutputDescription?: string;
|
|
@@ -29,10 +26,15 @@ export type ExtractedParameters = {
|
|
|
29
26
|
loadToolCallsFromChatMemory: boolean;
|
|
30
27
|
saveReasoningInChatMemory: boolean;
|
|
31
28
|
loadReasoningFromChatMemory: boolean;
|
|
29
|
+
saveSystemMessagesInChatMemory: boolean;
|
|
30
|
+
loadSystemMessagesFromChatMemory: boolean;
|
|
32
31
|
preserveReasoning: PreserveReasoningMode;
|
|
33
32
|
apiMode: ApiMode;
|
|
34
33
|
handoffTools: string[];
|
|
35
34
|
skillTools: string[];
|
|
36
35
|
abortSignal: AbortSignal | undefined;
|
|
36
|
+
maxTries: number;
|
|
37
|
+
retryDelay: number;
|
|
38
|
+
appendRetryErrorMessages: boolean;
|
|
37
39
|
};
|
|
38
40
|
export declare function extractParameters(executeFunctions: IExecuteFunctions, index: number): ExtractedParameters;
|
|
@@ -6,12 +6,14 @@ function extractParameters(executeFunctions, index) {
|
|
|
6
6
|
const get = (path, defaultValue, options) => executeFunctions.getNodeParameter(path, index, defaultValue, options);
|
|
7
7
|
const rawMessages = get('messagesToSend.values', []);
|
|
8
8
|
const chatMemoryMessage = rawMessages.find((msg) => msg.role === 'chatMemoryRole');
|
|
9
|
-
const chatMemorySaveOptions = (_a = chatMemoryMessage === null || chatMemoryMessage === void 0 ? void 0 : chatMemoryMessage.chatMemorySaveOptions) !== null && _a !== void 0 ? _a : ['toolCalls', 'reasoning'];
|
|
9
|
+
const chatMemorySaveOptions = (_a = chatMemoryMessage === null || chatMemoryMessage === void 0 ? void 0 : chatMemoryMessage.chatMemorySaveOptions) !== null && _a !== void 0 ? _a : ['toolCalls', 'reasoning', 'systemMessages'];
|
|
10
10
|
const chatMemorySaveMessages = (_b = chatMemoryMessage === null || chatMemoryMessage === void 0 ? void 0 : chatMemoryMessage.chatMemorySaveMessages) !== null && _b !== void 0 ? _b : false;
|
|
11
11
|
const saveMessagesInChatMemory = chatMemorySaveOptions.length > 0 || chatMemorySaveMessages;
|
|
12
12
|
const saveToolCallsInChatMemory = chatMemorySaveOptions.includes('toolCalls');
|
|
13
|
-
const
|
|
13
|
+
const saveSystemMessagesInChatMemory = chatMemorySaveOptions.includes('systemMessages');
|
|
14
|
+
const chatMemoryLoadOptions = (_c = chatMemoryMessage === null || chatMemoryMessage === void 0 ? void 0 : chatMemoryMessage.chatMemoryLoadOptions) !== null && _c !== void 0 ? _c : ['toolCalls', 'reasoning', 'systemMessages'];
|
|
14
15
|
const loadToolCallsFromChatMemory = chatMemoryLoadOptions.includes('toolCalls');
|
|
16
|
+
const loadSystemMessagesFromChatMemory = chatMemoryLoadOptions.includes('systemMessages');
|
|
15
17
|
const apiMode = get('options.apiMode', 'chatCompletions');
|
|
16
18
|
const preserveReasoning = get('options.preserveReasoning', 'none');
|
|
17
19
|
const loadReasoningFromChatMemory = chatMemoryLoadOptions.includes('reasoning');
|
|
@@ -59,6 +61,8 @@ function extractParameters(executeFunctions, index) {
|
|
|
59
61
|
loadToolCallsFromChatMemory,
|
|
60
62
|
saveReasoningInChatMemory,
|
|
61
63
|
loadReasoningFromChatMemory,
|
|
64
|
+
saveSystemMessagesInChatMemory,
|
|
65
|
+
loadSystemMessagesFromChatMemory,
|
|
62
66
|
apiMode,
|
|
63
67
|
preserveReasoning,
|
|
64
68
|
handoffTools,
|
|
@@ -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":";;AA4CA,8CA6GC;AA7GD,SAAgB,iBAAiB,CAChC,gBAAmC,EACnC,KAAa;;IAEb,MAAM,GAAG,GAAG,CAAI,IAAY,EAAE,YAAe,EAAE,OAAkC,EAAE,EAAE,CACpF,gBAAgB,CAAC,gBAAgB,CAAC,IAAI,EAAE,KAAK,EAAE,YAAY,EAAE,OAAO,CAAM,CAAC;IAE5E,MAAM,WAAW,GAAG,GAAG,CAAe,uBAAuB,EAAE,EAAE,CAAC,CAAC;IAGnE,MAAM,iBAAiB,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,gBAAgB,CAAC,CAAC;IAGnF,MAAM,qBAAqB,GAAG,MAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,qBAAqB,mCAAI,CAAC,WAAW,EAAE,WAAW,EAAE,gBAAgB,CAAC,CAAC;IACvH,MAAM,sBAAsB,GAAG,MAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,sBAAsB,mCAAI,KAAK,CAAC;IAIlF,MAAM,wBAAwB,GAAG,qBAAqB,CAAC,MAAM,GAAG,CAAC,IAAI,sBAAsB,CAAC;IAC5F,MAAM,yBAAyB,GAAG,qBAAqB,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IAC9E,MAAM,8BAA8B,GAAG,qBAAqB,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;IAGxF,MAAM,qBAAqB,GAAG,MAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,qBAAqB,mCAAI,CAAC,WAAW,EAAE,WAAW,EAAE,gBAAgB,CAAC,CAAC;IACvH,MAAM,2BAA2B,GAAG,qBAAqB,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IAChF,MAAM,gCAAgC,GAAG,qBAAqB,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;IAE1F,MAAM,OAAO,GAAG,GAAG,CAAU,iBAAiB,EAAE,iBAAiB,CAAC,CAAC;IACnE,MAAM,iBAAiB,GAAG,GAAG,CAAwB,2BAA2B,EAAE,MAAM,CAAC,CAAC;IAC1F,MAAM,2BAA2B,GAAG,qBAAqB,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IAChF,MAAM,yBAAyB,GAAG,qBAAqB,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IAE9E,MAAM,cAAc,GAAG,GAAG,CAAS,gBAAgB,EAAE,EAAE,CAAC,CAAC;IACzD,MAAM,kBAAkB,GAAG,cAAc,KAAK,wBAAwB,IAAI,cAAc,KAAK,wBAAwB,CAAC;IACtH,MAAM,sBAAsB,GAAG,GAAG,CAAU,wBAAwB,EAAE,KAAK,CAAC,CAAC;IAG7E,IAAI,YAAY,GAAa,EAAE,CAAC;IAChC,IAAI,CAAC;QACJ,MAAM,eAAe,GAAG,GAAG,CAAS,sBAAsB,EAAE,IAAI,CAAC,CAAC;QAClE,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;QAC3C,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YAC3B,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC;QAClE,CAAC;IACF,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAEhB,YAAY,GAAG,EAAE,CAAC;IACnB,CAAC;IAGD,IAAI,UAAU,GAAa,EAAE,CAAC;IAC9B,IAAI,CAAC;QACJ,MAAM,aAAa,GAAG,GAAG,CAAS,oBAAoB,EAAE,IAAI,CAAC,CAAC;QAC9D,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;QACzC,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YAC3B,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC;QAChE,CAAC;IACF,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAEhB,UAAU,GAAG,EAAE,CAAC;IACjB,CAAC;IAED,MAAM,MAAM,GAAwB;QACnC,KAAK,EAAE,GAAG,CAAS,SAAS,EAAE,EAAE,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;QACzD,SAAS,EAAE,GAAG,CAAS,WAAW,EAAE,WAAW,CAAC;QAChD,iBAAiB,EAAE,WAAW;QAC9B,cAAc;QACd,sBAAsB;QACtB,WAAW,EAAE,GAAG,CAAW,aAAa,EAAE,EAAE,CAAC;QAC7C,QAAQ,EAAE,GAAG,CAAS,kBAAkB,EAAE,CAAC,CAAC;QAC5C,UAAU,EAAE,GAAG,CAAS,oBAAoB,EAAE,CAAC,CAAC;QAChD,wBAAwB,EAAE,GAAG,CAAU,kCAAkC,EAAE,KAAK,CAAC;QACjF,OAAO,EAAE,GAAG,CAAc,SAAS,EAAE,EAAE,CAAC;QACxC,kBAAkB,EAAE,GAAG,CAAS,4BAA4B,EAAE,EAAE,CAAC;QACjE,gBAAgB,EAAE,GAAG,CAAuB,0BAA0B,EAAE,IAAI,CAAC;QAC7E,wBAAwB;QACxB,yBAAyB;QACzB,2BAA2B;QAC3B,yBAAyB;QACzB,2BAA2B;QAC3B,8BAA8B;QAC9B,gCAAgC;QAChC,OAAO;QACP,iBAAiB;QACjB,YAAY;QACZ,UAAU;QACV,WAAW,EAAE,gBAAgB,CAAC,wBAAwB,EAAE;KACxD,CAAC;IAGF,IAAI,kBAAkB,EAAE,CAAC;QACxB,IAAI,cAAc,KAAK,wBAAwB,EAAE,CAAC;YACjD,MAAM,CAAC,0BAA0B,GAAG,GAAG,CAAS,4BAA4B,EAAE,EAAE,CAAC,CAAC;QACnF,CAAC;aAAM,IAAI,cAAc,KAAK,wBAAwB,EAAE,CAAC;YACxD,MAAM,CAAC,0BAA0B,GAAG,GAAG,CACtC,mCAAmC,EACnC,EAAE,CACF,CAAC;YACF,MAAM,CAAC,oBAAoB,GAAG,GAAG,CAAS,sBAAsB,EAAE,EAAE,CAAC,CAAC;YACtE,MAAM,CAAC,2BAA2B,GAAG,GAAG,CAAS,6BAA6B,EAAE,EAAE,CAAC,CAAC;YACpF,MAAM,CAAC,uBAAuB,GAAG,GAAG,CAAU,yBAAyB,EAAE,KAAK,CAAC,CAAC;YAChF,MAAM,CAAC,yBAAyB,GAAG,GAAG,CAAS,2BAA2B,EAAE,EAAE,CAAC,CAAC;YAChF,MAAM,CAAC,gCAAgC,GAAG,GAAG,CAAS,kCAAkC,EAAE,EAAE,CAAC,CAAC;QAC/F,CAAC;QAED,MAAM,CAAC,oBAAoB,GAAG,GAAG,CAAS,sBAAsB,EAAE,QAAQ,CAAC,CAAC;IAC7E,CAAC;IAED,OAAO,MAAM,CAAC;AACf,CAAC"}
|
|
@@ -96,8 +96,13 @@ exports.messagesProperties = [
|
|
|
96
96
|
value: 'reasoning',
|
|
97
97
|
description: 'Load assistant\'s reasoning',
|
|
98
98
|
},
|
|
99
|
+
{
|
|
100
|
+
name: 'System Messages',
|
|
101
|
+
value: 'systemMessages',
|
|
102
|
+
description: 'Load system messages from chat memory',
|
|
103
|
+
},
|
|
99
104
|
],
|
|
100
|
-
default: ['toolCalls', 'reasoning'],
|
|
105
|
+
default: ['toolCalls', 'reasoning', 'systemMessages'],
|
|
101
106
|
displayOptions: {
|
|
102
107
|
show: {
|
|
103
108
|
role: ['chatMemoryRole'],
|
|
@@ -120,8 +125,13 @@ exports.messagesProperties = [
|
|
|
120
125
|
value: 'reasoning',
|
|
121
126
|
description: 'Save assistant\'s reasoning',
|
|
122
127
|
},
|
|
128
|
+
{
|
|
129
|
+
name: 'System Messages',
|
|
130
|
+
value: 'systemMessages',
|
|
131
|
+
description: 'Save system messages to chat memory',
|
|
132
|
+
},
|
|
123
133
|
],
|
|
124
|
-
default: ['toolCalls', 'reasoning'],
|
|
134
|
+
default: ['toolCalls', 'reasoning', 'systemMessages'],
|
|
125
135
|
displayOptions: {
|
|
126
136
|
show: {
|
|
127
137
|
role: ['chatMemoryRole'],
|
|
@@ -139,7 +149,7 @@ exports.messagesProperties = [
|
|
|
139
149
|
role: ['chatMemoryRole'],
|
|
140
150
|
},
|
|
141
151
|
hide: {
|
|
142
|
-
chatMemorySaveOptions: ['toolCalls', 'reasoning'],
|
|
152
|
+
chatMemorySaveOptions: ['toolCalls', 'reasoning', 'systemMessages'],
|
|
143
153
|
},
|
|
144
154
|
},
|
|
145
155
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"messages.js","sourceRoot":"","sources":["../../../../../nodes/shared/config/properties/messages.ts"],"names":[],"mappings":";;;AAEa,QAAA,kBAAkB,GAAsB;IACpD;QACC,WAAW,EAAE,UAAU;QACvB,IAAI,EAAE,gBAAgB;QACtB,IAAI,EAAE,iBAAiB;QACvB,WAAW,EAAE;YACZ,QAAQ,EAAE,IAAI;YACd,cAAc,EAAE,IAAI;SACpB;QACD,WAAW,EAAE,aAAa;QAC1B,OAAO,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,EAAE;QACtC,OAAO,EAAE;YACR;gBACC,WAAW,EAAE,QAAQ;gBACrB,IAAI,EAAE,QAAQ;gBACd,MAAM,EAAE;oBACP;wBACC,WAAW,EAAE,MAAM;wBACnB,IAAI,EAAE,MAAM;wBACZ,IAAI,EAAE,SAAS;wBAEf,OAAO,EAAE;4BACR;gCACC,IAAI,EAAE,cAAc;gCACpB,KAAK,EAAE,WAAW;6BAClB;4BACD;gCACC,IAAI,EAAE,YAAY;gCAClB,KAAK,EAAE,QAAQ;6BACf;4BACD;gCACC,IAAI,EAAE,YAAY;gCAClB,KAAK,EAAE,MAAM;6BACb;4BACD;gCACC,IAAI,EAAE,kBAAkB;gCACxB,KAAK,EAAE,iBAAiB;gCACxB,WAAW,EAAE,yCAAyC;6BACtD;4BACD;gCACC,IAAI,EAAE,gBAAgB;gCACtB,KAAK,EAAE,gBAAgB;gCACvB,WAAW,EAAE,0CAA0C;6BACvD;yBACD;wBACD,OAAO,EAAE,MAAM;qBACf;oBACD;wBACC,WAAW,EAAE,SAAS;wBACtB,IAAI,EAAE,SAAS;wBACf,IAAI,EAAE,QAAQ;wBACd,OAAO,EAAE,EAAE;wBAEX,WAAW,EACV,oFAAoF;wBACrF,WAAW,EAAE;4BACZ,IAAI,EAAE,CAAC;yBACP;wBACD,cAAc,EAAE;4BACf,IAAI,EAAE;gCACL,IAAI,EAAE,CAAC,iBAAiB,EAAE,gBAAgB,CAAC;6BAC3C;yBACD;qBACD;oBACD;wBACC,WAAW,EAAE,eAAe;wBAC5B,IAAI,EAAE,iBAAiB;wBACvB,IAAI,EAAE,MAAM;wBACZ,OAAO,EAAE,IAAI;wBAEb,WAAW,EACV;;;qOAG8N;wBAC9N,WAAW,EAAE;4BACb,IAAI,EAAE,CAAC;yBACP;wBACD,cAAc,EAAE;4BACf,IAAI,EAAE;gCACL,IAAI,EAAE,CAAC,iBAAiB,CAAC;6BACzB;yBACD;qBACD;oBACD;wBACC,WAAW,EAAE,MAAM;wBACnB,IAAI,EAAE,uBAAuB;wBAC7B,IAAI,EAAE,cAAc;wBACpB,WAAW,EAAE,yCAAyC;wBACtD,OAAO,EAAE;4BACR;gCACC,IAAI,EAAE,YAAY;gCAClB,KAAK,EAAE,WAAW;gCAClB,WAAW,EAAE,mCAAmC;6BAChD;4BACD;gCACC,IAAI,EAAE,WAAW;gCACjB,KAAK,EAAE,WAAW;gCAClB,WAAW,EAAE,6BAA6B;6BAC1C;yBACD;wBACD,OAAO,EAAE,CAAC,WAAW,EAAE,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"messages.js","sourceRoot":"","sources":["../../../../../nodes/shared/config/properties/messages.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,7 +28,7 @@ async function execute(i) {
|
|
|
28
28
|
if (!memory && hasChatMemoryRole) {
|
|
29
29
|
throw new n8n_workflow_1.NodeOperationError(this.getNode(), 'A Chat Memory message is configured, but no Chat Memory sub-node is connected. Connect a Memory sub-node or remove the Chat Memory message.', { itemIndex: i });
|
|
30
30
|
}
|
|
31
|
-
const messages = await (0, chatHistory_1.unpackChatHistoryAndMemory)(params.rawMessagesToSend, params.loadToolCallsFromChatMemory, params.loadReasoningFromChatMemory, memory);
|
|
31
|
+
const messages = await (0, chatHistory_1.unpackChatHistoryAndMemory)(params.rawMessagesToSend, params.loadToolCallsFromChatMemory, params.loadReasoningFromChatMemory, params.loadSystemMessagesFromChatMemory, memory);
|
|
32
32
|
return await (0, executor_1.runModel)(this, params, messages, i, params.model, memory);
|
|
33
33
|
}
|
|
34
34
|
//# sourceMappingURL=messageOperation.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"messageOperation.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/execution/messageOperation.ts"],"names":[],"mappings":";;AAYA,
|
|
1
|
+
{"version":3,"file":"messageOperation.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/execution/messageOperation.ts"],"names":[],"mappings":";;AAYA,0BAwDC;AAlED,+CAAuE;AAEvE,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,IAAI,MAAM,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,IAAI,MAAM,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACpE,MAAM,cAAc,GAClB,CAAC,MAAM,IAAI,CAAC,sBAAsB,CAAC,kCAAmB,CAAC,MAAM,EAAE,CAAC,CAAC,CAAY,IAAI,EAAE,CAAC;QACtF,MAAM,kBAAkB,GAAG,IAAI,GAAG,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;QAEtE,MAAM,cAAc,GAAG,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;QAC3F,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC/B,MAAM,IAAI,iCAAkB,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,iDAAiD,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,4EAA4E,EAAE,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC,CAAC;QACxN,CAAC;QAED,MAAM,YAAY,GAAG,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;QACvF,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC7B,MAAM,IAAI,iCAAkB,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,+CAA+C,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,0EAA0E,EAAE,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC,CAAC;QAClN,CAAC;IACF,CAAC;IAGD,MAAM,MAAM,GAAG,MAAM,IAAA,sBAAiB,EAAC,IAAI,CAAC,CAAC;IAG7C,MAAM,iBAAiB,GAAG,MAAM,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,gBAAgB,CAAC,CAAC;IAEhG,IAAI,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAClC,MAAM,IAAI,iCAAkB,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,0JAA0J,EAAE,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC,CAAC;IAC5N,CAAC;IAED,IAAI,CAAC,MAAM,IAAI,iBAAiB,EAAE,CAAC;QAClC,MAAM,IAAI,iCAAkB,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,6IAA6I,EAAE,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC,CAAC;IAC/M,CAAC;IAGD,MAAM,QAAQ,GAAG,MAAM,IAAA,wCAA0B,EAChD,MAAM,CAAC,iBAAiB,EACxB,MAAM,CAAC,2BAA2B,EAClC,MAAM,CAAC,2BAA2B,EAClC,MAAM,CAAC,gCAAgC,EACvC,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"}
|
|
@@ -75,7 +75,7 @@ async function executeModelAttemptWithRetries(context) {
|
|
|
75
75
|
}
|
|
76
76
|
const unwrappedOutput = unwrapHandoffResult(parsedHandoffOutput);
|
|
77
77
|
if (memory && params.saveMessagesInChatMemory) {
|
|
78
|
-
await (0, io_1.saveToMemory)(messages, unwrappedOutput, params.saveToolCallsInChatMemory, params.saveReasoningInChatMemory, memory, response.choices[0].message);
|
|
78
|
+
await (0, io_1.saveToMemory)(messages, unwrappedOutput, params.saveToolCallsInChatMemory, params.saveReasoningInChatMemory, params.saveSystemMessagesInChatMemory, memory, response.choices[0].message);
|
|
79
79
|
}
|
|
80
80
|
const requestBody = apiMode === 'responses' ? (0, responsesApiConverter_1.convertBodyToResponsesApi)(body) : body;
|
|
81
81
|
const outputData = await (0, outputData_1.prepareOutputData)(response, { output: unwrappedOutput, handoffs: [handoffToolName] }, messages, messages.length, params.addToOutput, executeFunctions, index, requestBody, totalAccumulatedUsage, true);
|
|
@@ -126,7 +126,7 @@ async function executeModelAttemptWithRetries(context) {
|
|
|
126
126
|
const requestBody = apiMode === 'responses' ? (0, responsesApiConverter_1.convertBodyToResponsesApi)(body) : body;
|
|
127
127
|
const outputData = await (0, outputData_1.prepareOutputData)(response, parsedOutput, messages, messagesCountBeforeValidationRetries, params.addToOutput, executeFunctions, index, requestBody, totalAccumulatedUsage, false);
|
|
128
128
|
if (memory && params.saveMessagesInChatMemory) {
|
|
129
|
-
await (0, io_1.saveToMemory)(messages.slice(0, messagesCountBeforeValidationRetries), parsedOutput, params.saveToolCallsInChatMemory, params.saveReasoningInChatMemory, memory, response.choices[0].message);
|
|
129
|
+
await (0, io_1.saveToMemory)(messages.slice(0, messagesCountBeforeValidationRetries), parsedOutput, params.saveToolCallsInChatMemory, params.saveReasoningInChatMemory, params.saveSystemMessagesInChatMemory, memory, response.choices[0].message);
|
|
130
130
|
}
|
|
131
131
|
return outputData;
|
|
132
132
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modelAttempt.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/execution/modelAttempt.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"modelAttempt.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/execution/modelAttempt.ts"],"names":[],"mappings":";;AAgEA,wEAuQC;AAnUD,2EAA4E;AAC5E,0CAAqD;AACrD,gDAAqD;AACrD,6CAAiD;AACjD,qCAA4C;AAC5C,sDAAiE;AACjE,qCAAyE;AACzE,iDAA2G;AAC3G,mDAAwE;AACxE,qDAA0D;AAC1D,yDAAiF;AAgCjF,SAAS,mBAAmB,CAAC,KAAU;IAEtC,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAChD,MAAM,UAAU,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QAE5B,IAAI,UAAU,IAAI,OAAO,UAAU,KAAK,QAAQ,IAAI,QAAQ,IAAI,UAAU,EAAE,CAAC;YAC5E,OAAO,UAAU,CAAC,MAAM,CAAC;QAC1B,CAAC;QAED,OAAO,UAAU,CAAC;IACnB,CAAC;IAED,OAAO,KAAK,CAAC;AACd,CAAC;AAKM,KAAK,UAAU,8BAA8B,CACnD,OAA4B;IAE5B,MAAM,EACL,gBAAgB,EAChB,MAAM,EACN,KAAK,EACL,YAAY,EACZ,UAAU,EACV,YAAY,EACZ,QAAQ,EACR,KAAK,EACL,WAAW,EACX,cAAc,EACd,cAAc,EACd,oBAAoB,EACpB,gBAAgB,EAChB,cAAc,EACd,qBAAqB,EACrB,qBAAqB,EACrB,MAAM,EACN,OAAO,GACP,GAAG,OAAO,CAAC;IAEZ,MAAM,YAAY,GAAG,MAAM,CAAC,UAAU,GAAG,IAAI,CAAC;IAE9C,IAAI,UAAU,GAAe;QAC5B,gBAAgB,EAAE,UAAU;QAC5B,aAAa,EAAE,CAAC;KAChB,CAAC;IAEF,IAAI,oCAAoC,GAAG,QAAQ,CAAC,MAAM,CAAC;IAC3D,IAAI,gBAAgB,GAAG,CAAC,CAAC;IAEzB,OAAO,IAAI,EAAE,CAAC;QACb,IAAI,IAAI,GAAG,IAAA,yBAAkB,EAC5B,YAAY,EACZ,QAAQ,EACR,KAAK,EACL,WAAW,EACX,cAAc,EACd,MAAM,CAAC,OAAO,EACd,YAAY,CACZ,CAAC;QAEF,IAAI,QAAa,CAAC;QAClB,IAAI,4BAAiC,CAAC;QACtC,IAAI,cAAsB,CAAC;QAC3B,IAAI,SAAsB,CAAC;QAC3B,IAAI,gBAAqB,CAAC;QAC1B,IAAI,eAAwB,CAAC;QAC7B,IAAI,eAAmC,CAAC;QACxC,IAAI,iBAAqC,CAAC;QAE1C,IAAI,CAAC;YACJ,MAAM,MAAM,GAAG,MAAM,IAAA,2BAAgB,EACpC,gBAAgB,EAChB,IAAI,EACJ,QAAQ,EACR,cAAc,EACd,MAAM,CAAC,kBAAkB,EACzB,oBAAoB,EACpB,MAAM,CAAC,WAAW,EAClB,gBAAgB,EAChB,OAAO,CAAC,YAAY,EACpB,OAAO,CAAC,UAAU,EAClB,MAAM,CAAC,iBAAiB,EACxB,OAAO,CACP,CAAC;YAEF,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;YAC3B,4BAA4B,GAAG,MAAM,CAAC,4BAA4B,CAAC;YACnE,cAAc,GAAG,MAAM,CAAC,cAAc,CAAC;YACvC,SAAS,GAAG,MAAM,CAAC,SAAwB,CAAC;YAC5C,gBAAgB,GAAG,MAAM,CAAC,gBAAgB,CAAC;YAC3C,eAAe,GAAG,MAAM,CAAC,eAAe,IAAI,KAAK,CAAC;YAClD,eAAe,GAAG,MAAM,CAAC,eAAe,CAAC;YACzC,iBAAiB,GAAG,MAAM,CAAC,iBAAiB,CAAC;QAC9C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAEhB,qBAAqB,CAAC,cAAc,EAAE,CAAC;YAGvC,IAAI,qBAAqB,IAAI,IAAA,2BAAQ,EAAC,UAAU,CAAC,EAAE,CAAC;gBACnD,MAAM,YAAY,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;gBAC5E,UAAU,GAAG,IAAA,+BAAY,EACxB,UAAU,EACV,qBAAqB,EACrB,IAAI,EACJ,WAAW,EACX,YAAY,CACZ,CAAC;gBAEF,MAAM,IAAA,8BAAe,EAAC,YAAY,CAAC,CAAC;gBACpC,SAAS;YACV,CAAC;YAGD,MAAM,KAAK,CAAC;QACb,CAAC;QAED,IAAA,8BAAc,EAAC,qBAAqB,EAAE,gBAAgB,CAAC,CAAC;QACxD,gBAAgB,GAAG,cAAc,CAAC;QAClC,IAAI,GAAG,SAAS,CAAC;QAGjB,IAAI,eAAe,IAAI,iBAAiB,KAAK,SAAS,EAAE,CAAC;YAExD,IAAI,mBAAwB,CAAC;YAC7B,IAAI,CAAC;gBACJ,mBAAmB,GAAG,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;YACrD,CAAC;YAAC,MAAM,CAAC;gBAER,mBAAmB,GAAG,iBAAiB,CAAC;YACzC,CAAC;YAGD,MAAM,eAAe,GAAG,mBAAmB,CAAC,mBAAmB,CAAC,CAAC;YAGjE,IAAI,MAAM,IAAI,MAAM,CAAC,wBAAwB,EAAE,CAAC;gBAC/C,MAAM,IAAA,iBAAY,EAAC,QAAQ,EAAE,eAAe,EAAE,MAAM,CAAC,yBAAyB,EAAE,MAAM,CAAC,yBAAyB,EAAE,MAAM,CAAC,8BAA8B,EAAE,MAAM,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;YAC/L,CAAC;YAGD,MAAM,WAAW,GAAG,OAAO,KAAK,WAAW,CAAC,CAAC,CAAC,IAAA,iDAAyB,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;YACrF,MAAM,UAAU,GAAG,MAAM,IAAA,8BAAiB,EACzC,QAAQ,EACR,EAAE,MAAM,EAAE,eAAe,EAAE,QAAQ,EAAE,CAAC,eAAe,CAAC,EAAE,EACxD,QAAQ,EACR,QAAQ,CAAC,MAAM,EACf,MAAM,CAAC,WAAW,EAClB,gBAAgB,EAChB,KAAK,EACL,WAAW,EACX,qBAAqB,EACrB,IAAI,CACJ,CAAC;YAEF,OAAO,UAAU,CAAC;QACnB,CAAC;QAID,IAAI,UAAU,CAAC,aAAa,KAAK,CAAC,EAAE,CAAC;YACpC,oCAAoC,GAAG,QAAQ,CAAC,MAAM,CAAC;QACxD,CAAC;QAED,MAAM,WAAW,GAAG,IAAA,uCAAsB,EACzC,QAAQ,EACR,4BAA4B,EAC5B,MAAM,CAAC,cAAc,EACrB,MAAM,CAAC,sBAAsB,CAC7B,CAAC;QAGF,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;YAC1B,IAAI,CAAC,cAAc,IAAI,CAAC,IAAA,2BAAQ,EAAC,UAAU,CAAC,EAAE,CAAC;gBAC9C,MAAM,SAAS,GAAG,IAAA,gCAAuB,EACxC,WAAW,CAAC,KAAM,EAClB,QAAQ,EACR,4BAA4B,EAC5B,IAAI,EACJ,qBAAqB,CACrB,CAAC;gBACF,IAAA,sCAAmB,EAAC,gBAAgB,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;YACzD,CAAC;YAED,MAAM,WAAW,GAAG,MAAM,IAAA,+BAAgB,EACzC,WAAW,CAAC,KAAM,EAClB,QAAQ,EACR,QAAQ,EACR,UAAU,EACV,MAAM,CAAC,oBAAoB,EAC3B,oBAAoB,EACpB,MAAM,CAAC,oBAAoB,EAC3B,KAAK,EACL,gBAAgB,EAChB,MAAM,CAAC,wBAAwB,EAC/B,YAAY,CACZ,CAAC;YAEF,IAAI,WAAW,EAAE,CAAC;gBACjB,UAAU,GAAG,IAAA,+BAAY,EAAC,UAAU,EAAE,qBAAqB,EAAE,IAAI,EAAE,kBAAkB,EAAE,WAAW,CAAC,KAAM,CAAC,CAAC;gBAC3G,SAAS;YACV,CAAC;QACF,CAAC;QAED,MAAM,YAAY,GAAG,WAAW,CAAC,MAAO,CAAC;QAGzC,IAAI,qBAAqB,IAAI,MAAM,CAAC,cAAc,KAAK,WAAW;YACjE,CAAC,YAAY,KAAK,IAAI,IAAI,YAAY,KAAK,SAAS;gBACnD,CAAC,OAAO,YAAY,KAAK,QAAQ,IAAI,YAAY,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC;YACrE,IAAI,IAAA,2BAAQ,EAAC,UAAU,CAAC,EAAE,CAAC;gBAC1B,UAAU,GAAG,IAAA,+BAAY,EAAC,UAAU,EAAE,qBAAqB,EAAE,IAAI,EAAE,gBAAgB,EAAE,kCAAkC,CAAC,CAAC;gBACzH,MAAM,IAAA,8BAAe,EAAC,YAAY,CAAC,CAAC;gBACpC,SAAS;YACV,CAAC;YACD,IAAA,sCAAmB,EAAC,gBAAgB,EAAE;gBACrC,OAAO,EAAE,kCAAkC;gBAC3C,WAAW,EAAE,mFAAmF;aAChG,EAAE,KAAK,CAAC,CAAC;QACX,CAAC;QAGD,IAAI,cAAc,EAAE,CAAC;YACpB,MAAM,gBAAgB,GAAG,IAAA,qCAAwB,EAAC,gBAAgB,EAAE,YAAY,CAAC,CAAC;YAElF,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,CAAC;gBAC/B,MAAM,eAAe,GAAG,gBAAgB,CAAC,KAAK,IAAI,0BAA0B,CAAC;gBAE7E,MAAM,WAAW,GAAG,MAAM,IAAA,oCAAqB,EAC9C,eAAe,EACf,YAAY,EACZ,QAAQ,EACR,QAAQ,EACR,UAAU,EACV,MAAM,CAAC,oBAAoB,EAC3B,oBAAoB,EACpB,MAAM,CAAC,oBAAoB,EAC3B,MAAM,CAAC,wBAAwB,EAC/B,YAAY,CACZ,CAAC;gBAEF,IAAI,WAAW,EAAE,CAAC;oBACjB,UAAU,GAAG,IAAA,+BAAY,EAAC,UAAU,EAAE,qBAAqB,EAAE,IAAI,EAAE,kBAAkB,EAAE,eAAe,CAAC,CAAC;oBACxG,SAAS;gBACV,CAAC;gBAED,MAAM,SAAS,GAAG,IAAA,6BAAoB,EACrC,UAAU,EACV,eAAe,EACf,YAAY,EACZ,IAAI,EACJ,QAAQ,EACR,qBAAqB,CACrB,CAAC;gBACF,IAAA,sCAAmB,EAAC,gBAAgB,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;YACzD,CAAC;QACF,CAAC;QAGD,MAAM,WAAW,GAAG,OAAO,KAAK,WAAW,CAAC,CAAC,CAAC,IAAA,iDAAyB,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QACrF,MAAM,UAAU,GAAG,MAAM,IAAA,8BAAiB,EACzC,QAAQ,EACR,YAAY,EACZ,QAAQ,EACR,oCAAoC,EACpC,MAAM,CAAC,WAAW,EAClB,gBAAgB,EAChB,KAAK,EACL,WAAW,EACX,qBAAqB,EACrB,KAAK,CACL,CAAC;QAEF,IAAI,MAAM,IAAI,MAAM,CAAC,wBAAwB,EAAE,CAAC;YAC/C,MAAM,IAAA,iBAAY,EAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,oCAAoC,CAAC,EAAE,YAAY,EAAE,MAAM,CAAC,yBAAyB,EAAE,MAAM,CAAC,yBAAyB,EAAE,MAAM,CAAC,8BAA8B,EAAE,MAAM,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;QAC3O,CAAC;QAED,OAAO,UAAU,CAAC;IACnB,CAAC;AACF,CAAC"}
|
|
@@ -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, memory: BufferWindowMemory, finalResponseMessage?: IDataObject): Promise<void>;
|
|
4
|
+
export declare function saveToMemory(messages: IDataObject[], output: any, saveToolCallsInChatMemory: boolean, saveReasoningInChatMemory: boolean, saveSystemMessagesInChatMemory: boolean, memory: BufferWindowMemory, finalResponseMessage?: IDataObject): Promise<void>;
|
|
@@ -26,41 +26,36 @@ function extractMessages(messages) {
|
|
|
26
26
|
messagesAfter: messages.slice(lastUserIndex + 1),
|
|
27
27
|
};
|
|
28
28
|
}
|
|
29
|
-
|
|
30
|
-
|
|
29
|
+
function buildReasoningKwargs(save, source) {
|
|
30
|
+
const kwargs = {};
|
|
31
|
+
if (save && (source === null || source === void 0 ? void 0 : source.reasoning))
|
|
32
|
+
kwargs.reasoning = source.reasoning;
|
|
33
|
+
if (save && (source === null || source === void 0 ? void 0 : source.reasoning_content))
|
|
34
|
+
kwargs.reasoning_content = source.reasoning_content;
|
|
35
|
+
if (save && (source === null || source === void 0 ? void 0 : source.reasoning_details))
|
|
36
|
+
kwargs.reasoning_details = source.reasoning_details;
|
|
37
|
+
return kwargs;
|
|
38
|
+
}
|
|
39
|
+
async function saveToMemory(messages, output, saveToolCallsInChatMemory, saveReasoningInChatMemory, saveSystemMessagesInChatMemory, memory, finalResponseMessage) {
|
|
40
|
+
var _a, _b;
|
|
31
41
|
const extractedMessages = extractMessages(messages);
|
|
32
42
|
const input = (_a = extractedMessages.lastUser) === null || _a === void 0 ? void 0 : _a.content;
|
|
33
43
|
if (!input) {
|
|
34
44
|
console.log('No user message found; no messages will be stored in the Chat Memory sub-node.');
|
|
35
45
|
return;
|
|
36
46
|
}
|
|
47
|
+
const isSystemInput = ((_b = extractedMessages.lastUser) === null || _b === void 0 ? void 0 : _b.role) === 'system';
|
|
48
|
+
const skipInputMessage = isSystemInput && !saveSystemMessagesInChatMemory;
|
|
37
49
|
const stringifiedOutput = (typeof output === 'string' || typeof output === null) ? output : JSON.stringify(output);
|
|
38
|
-
if (!
|
|
39
|
-
const inputMessage =
|
|
50
|
+
if (!skipInputMessage) {
|
|
51
|
+
const inputMessage = isSystemInput
|
|
40
52
|
? new messages_1.SystemMessage(input)
|
|
41
53
|
: new messages_1.HumanMessage(input);
|
|
42
54
|
await memory.chatHistory.addMessage(inputMessage);
|
|
43
|
-
const additional_kwargs = {};
|
|
44
|
-
if (saveReasoningInChatMemory && (finalResponseMessage === null || finalResponseMessage === void 0 ? void 0 : finalResponseMessage.reasoning)) {
|
|
45
|
-
additional_kwargs.reasoning = finalResponseMessage.reasoning;
|
|
46
|
-
}
|
|
47
|
-
if (saveReasoningInChatMemory && (finalResponseMessage === null || finalResponseMessage === void 0 ? void 0 : finalResponseMessage.reasoning_content)) {
|
|
48
|
-
additional_kwargs.reasoning_content = finalResponseMessage.reasoning_content;
|
|
49
|
-
}
|
|
50
|
-
if (saveReasoningInChatMemory && (finalResponseMessage === null || finalResponseMessage === void 0 ? void 0 : finalResponseMessage.reasoning_details)) {
|
|
51
|
-
additional_kwargs.reasoning_details = finalResponseMessage.reasoning_details;
|
|
52
|
-
}
|
|
53
|
-
const aiMessage = new messages_1.AIMessage({
|
|
54
|
-
content: stringifiedOutput,
|
|
55
|
-
additional_kwargs,
|
|
56
|
-
});
|
|
57
|
-
await memory.chatHistory.addMessage(aiMessage);
|
|
58
55
|
}
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
: new messages_1.HumanMessage(input);
|
|
63
|
-
await memory.chatHistory.addMessage(inputMessage);
|
|
56
|
+
const additional_kwargs = buildReasoningKwargs(saveReasoningInChatMemory, finalResponseMessage);
|
|
57
|
+
let aiMessage;
|
|
58
|
+
if (saveToolCallsInChatMemory) {
|
|
64
59
|
const tool_calls = extractedMessages.messagesAfter
|
|
65
60
|
.filter(msg => msg.role === 'assistant' || msg.role === 'tool')
|
|
66
61
|
.map(msg => ({
|
|
@@ -73,23 +68,19 @@ async function saveToMemory(messages, output, saveToolCallsInChatMemory, saveRea
|
|
|
73
68
|
...(saveReasoningInChatMemory && msg.reasoning_content && { reasoning_content: msg.reasoning_content }),
|
|
74
69
|
...(saveReasoningInChatMemory && msg.reasoning_details && { reasoning_details: msg.reasoning_details }),
|
|
75
70
|
}));
|
|
76
|
-
|
|
77
|
-
if (saveReasoningInChatMemory && (finalResponseMessage === null || finalResponseMessage === void 0 ? void 0 : finalResponseMessage.reasoning)) {
|
|
78
|
-
additional_kwargs.reasoning = finalResponseMessage.reasoning;
|
|
79
|
-
}
|
|
80
|
-
if (saveReasoningInChatMemory && (finalResponseMessage === null || finalResponseMessage === void 0 ? void 0 : finalResponseMessage.reasoning_content)) {
|
|
81
|
-
additional_kwargs.reasoning_content = finalResponseMessage.reasoning_content;
|
|
82
|
-
}
|
|
83
|
-
if (saveReasoningInChatMemory && (finalResponseMessage === null || finalResponseMessage === void 0 ? void 0 : finalResponseMessage.reasoning_details)) {
|
|
84
|
-
additional_kwargs.reasoning_details = finalResponseMessage.reasoning_details;
|
|
85
|
-
}
|
|
86
|
-
const aiMessage = new messages_1.AIMessage({
|
|
71
|
+
aiMessage = new messages_1.AIMessage({
|
|
87
72
|
content: stringifiedOutput,
|
|
88
|
-
tool_calls
|
|
73
|
+
tool_calls,
|
|
89
74
|
additional_kwargs,
|
|
90
75
|
response_metadata: {},
|
|
91
76
|
});
|
|
92
|
-
await memory.chatHistory.addMessage(aiMessage);
|
|
93
77
|
}
|
|
78
|
+
else {
|
|
79
|
+
aiMessage = new messages_1.AIMessage({
|
|
80
|
+
content: stringifiedOutput,
|
|
81
|
+
additional_kwargs,
|
|
82
|
+
});
|
|
83
|
+
}
|
|
84
|
+
await memory.chatHistory.addMessage(aiMessage);
|
|
94
85
|
}
|
|
95
86
|
//# sourceMappingURL=io.js.map
|
|
@@ -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,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): Promise<Message[]>;
|
|
3
|
+
export declare function unpackChatHistoryAndMemory(rawMessagesToSend: RawMessage[], loadToolCallsFromChatMemory?: boolean, loadReasoningFromChatMemory?: boolean, loadSystemMessagesFromChatMemory?: boolean, memory?: BufferWindowMemory): Promise<Message[]>;
|
|
@@ -10,7 +10,7 @@ async function getChatMessages(memory) {
|
|
|
10
10
|
}
|
|
11
11
|
return allMessages;
|
|
12
12
|
}
|
|
13
|
-
async function unpackChatHistoryAndMemory(rawMessagesToSend, loadToolCallsFromChatMemory = true, loadReasoningFromChatMemory = true, memory) {
|
|
13
|
+
async function unpackChatHistoryAndMemory(rawMessagesToSend, loadToolCallsFromChatMemory = true, loadReasoningFromChatMemory = true, loadSystemMessagesFromChatMemory = true, memory) {
|
|
14
14
|
const processedMessages = [];
|
|
15
15
|
for (const rawMessage of rawMessagesToSend) {
|
|
16
16
|
if (rawMessage.role === 'chatHistoryRole') {
|
|
@@ -26,7 +26,10 @@ async function unpackChatHistoryAndMemory(rawMessagesToSend, loadToolCallsFromCh
|
|
|
26
26
|
else if (rawMessage.role === 'chatMemoryRole' && memory) {
|
|
27
27
|
const rawMemoryMessages = await getChatMessages(memory);
|
|
28
28
|
if (rawMemoryMessages.length > 0) {
|
|
29
|
-
|
|
29
|
+
let memoryMessages = (0, converter_1.convertMessages)(rawMemoryMessages, loadToolCallsFromChatMemory, loadReasoningFromChatMemory);
|
|
30
|
+
if (!loadSystemMessagesFromChatMemory) {
|
|
31
|
+
memoryMessages = memoryMessages.filter((msg) => msg.role !== 'system');
|
|
32
|
+
}
|
|
30
33
|
processedMessages.push(...memoryMessages);
|
|
31
34
|
}
|
|
32
35
|
}
|
|
@@ -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":";;AA0BA,gEAoDC;AA3ED,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;AAWM,KAAK,UAAU,0BAA0B,CAC/C,iBAA+B,EAC/B,8BAAuC,IAAI,EAC3C,8BAAuC,IAAI,EAC3C,mCAA4C,IAAI,EAChD,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,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"}
|