n8n-nodes-simple 3.2.2 → 3.3.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.js +36 -3
- package/dist/nodes/shared/api/responsesApiConverter.js.map +1 -1
- package/dist/nodes/shared/api/types.d.ts +36 -60
- package/dist/nodes/shared/api/utils.js.map +1 -1
- package/dist/nodes/shared/config/parameters.d.ts +8 -4
- package/dist/nodes/shared/config/parameters.js +14 -5
- package/dist/nodes/shared/config/parameters.js.map +1 -1
- package/dist/nodes/shared/config/properties/apiMode.d.ts +2 -0
- package/dist/nodes/shared/config/properties/apiMode.js +51 -0
- package/dist/nodes/shared/config/properties/apiMode.js.map +1 -0
- package/dist/nodes/shared/config/properties/index.js +2 -0
- package/dist/nodes/shared/config/properties/index.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/config/properties/options.js +0 -11
- package/dist/nodes/shared/config/properties/options.js.map +1 -1
- package/dist/nodes/shared/config/properties/output.js +7 -20
- package/dist/nodes/shared/config/properties/output.js.map +1 -1
- package/dist/nodes/shared/core/execution/messageOperation.js +10 -1
- package/dist/nodes/shared/core/execution/messageOperation.js.map +1 -1
- package/dist/nodes/shared/core/execution/modelAttempt.js +19 -4
- package/dist/nodes/shared/core/execution/modelAttempt.js.map +1 -1
- package/dist/nodes/shared/core/execution/outputData.js +8 -2
- package/dist/nodes/shared/core/execution/outputData.js.map +1 -1
- package/dist/nodes/shared/core/execution/responseParser.d.ts +2 -1
- package/dist/nodes/shared/core/execution/responseParser.js +35 -29
- package/dist/nodes/shared/core/execution/responseParser.js.map +1 -1
- package/dist/nodes/shared/core/memory/io.d.ts +1 -1
- package/dist/nodes/shared/core/memory/io.js +30 -37
- package/dist/nodes/shared/core/memory/io.js.map +1 -1
- package/dist/nodes/shared/core/messages/chatHistory.d.ts +2 -1
- package/dist/nodes/shared/core/messages/chatHistory.js +10 -2
- package/dist/nodes/shared/core/messages/chatHistory.js.map +1 -1
- package/dist/nodes/shared/core/messages/converter.d.ts +2 -1
- package/dist/nodes/shared/core/messages/converter.js +13 -0
- package/dist/nodes/shared/core/messages/converter.js.map +1 -1
- package/dist/nodes/shared/core/tools/connector.d.ts +1 -1
- package/dist/nodes/shared/core/tools/executor.d.ts +1 -1
- package/dist/nodes/shared/core/tools/executor.js +33 -11
- 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 +5 -1
- package/dist/nodes/shared/core/tools/maxIterationsHandler.js.map +1 -1
- package/dist/nodes/shared/core/tools/n8nTool.js +3 -2
- package/dist/nodes/shared/core/tools/n8nTool.js.map +1 -1
- package/dist/package.json +16 -14
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +16 -14
|
@@ -28,7 +28,16 @@ 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
|
-
|
|
31
|
+
if (params.stateful && !params.previousResponseId && memory) {
|
|
32
|
+
const memoryResponseId = await (0, chatHistory_1.getLatestResponseIdFromMemory)(memory);
|
|
33
|
+
if (memoryResponseId) {
|
|
34
|
+
params.previousResponseId = memoryResponseId;
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
const messagesToProcess = params.previousResponseId
|
|
38
|
+
? params.rawMessagesToSend.filter((msg) => msg.role !== 'chatMemoryRole' && msg.role !== 'chatHistoryRole')
|
|
39
|
+
: params.rawMessagesToSend;
|
|
40
|
+
const messages = await (0, chatHistory_1.unpackChatHistoryAndMemory)(messagesToProcess, params.loadToolCallsFromChatMemory, params.loadReasoningFromChatMemory, params.loadSystemMessagesFromChatMemory, memory);
|
|
32
41
|
return await (0, executor_1.runModel)(this, params, messages, i, params.model, memory);
|
|
33
42
|
}
|
|
34
43
|
//# 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":"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"}
|
|
@@ -23,6 +23,7 @@ function unwrapHandoffResult(value) {
|
|
|
23
23
|
return value;
|
|
24
24
|
}
|
|
25
25
|
async function executeModelAttemptWithRetries(context) {
|
|
26
|
+
var _a, _b;
|
|
26
27
|
const { executeFunctions, params, index, currentModel, maxRetries, customParams, messages, tools, tool_choice, responseFormat, invokableTools, structuredOutputTool, validationSchema, shouldValidate, shouldRetryOnAnyError, totalAccumulatedUsage, memory, apiMode, } = context;
|
|
27
28
|
const retryDelayMs = params.retryDelay * 1000;
|
|
28
29
|
let retryState = {
|
|
@@ -33,6 +34,12 @@ async function executeModelAttemptWithRetries(context) {
|
|
|
33
34
|
let currentIteration = 1;
|
|
34
35
|
while (true) {
|
|
35
36
|
let body = (0, body_1.prepareRequestBody)(currentModel, messages, tools, tool_choice, responseFormat, params.options, customParams);
|
|
37
|
+
if (params.apiMode === 'responses' && params.stateful) {
|
|
38
|
+
body.store = true;
|
|
39
|
+
if (params.previousResponseId) {
|
|
40
|
+
body.previous_response_id = params.previousResponseId;
|
|
41
|
+
}
|
|
42
|
+
}
|
|
36
43
|
let response;
|
|
37
44
|
let structuredOutputToolResponse;
|
|
38
45
|
let finalIteration;
|
|
@@ -42,7 +49,7 @@ async function executeModelAttemptWithRetries(context) {
|
|
|
42
49
|
let handoffToolName;
|
|
43
50
|
let handoffToolResult;
|
|
44
51
|
try {
|
|
45
|
-
const result = await (0, executor_1.processToolCalls)(executeFunctions, body, messages, invokableTools, params.maxToolsIterations, structuredOutputTool, params.abortSignal, currentIteration, context.handoffTools, context.skillTools, params.preserveReasoning, apiMode);
|
|
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);
|
|
46
53
|
response = result.response;
|
|
47
54
|
structuredOutputToolResponse = result.structuredOutputToolResponse;
|
|
48
55
|
finalIteration = result.finalIteration;
|
|
@@ -75,7 +82,7 @@ async function executeModelAttemptWithRetries(context) {
|
|
|
75
82
|
}
|
|
76
83
|
const unwrappedOutput = unwrapHandoffResult(parsedHandoffOutput);
|
|
77
84
|
if (memory && params.saveMessagesInChatMemory) {
|
|
78
|
-
await (0, io_1.saveToMemory)(messages, unwrappedOutput, params.saveToolCallsInChatMemory, params.saveReasoningInChatMemory, memory, response.choices[0].message);
|
|
85
|
+
await (0, io_1.saveToMemory)(messages, unwrappedOutput, params.saveToolCallsInChatMemory, params.saveReasoningInChatMemory, params.saveSystemMessagesInChatMemory, memory, response.choices[0].message, (_a = response._rawResponse) === null || _a === void 0 ? void 0 : _a.id);
|
|
79
86
|
}
|
|
80
87
|
const requestBody = apiMode === 'responses' ? (0, responsesApiConverter_1.convertBodyToResponsesApi)(body) : body;
|
|
81
88
|
const outputData = await (0, outputData_1.prepareOutputData)(response, { output: unwrappedOutput, handoffs: [handoffToolName] }, messages, messages.length, params.addToOutput, executeFunctions, index, requestBody, totalAccumulatedUsage, true);
|
|
@@ -84,7 +91,7 @@ async function executeModelAttemptWithRetries(context) {
|
|
|
84
91
|
if (retryState.attemptNumber === 1) {
|
|
85
92
|
messagesCountBeforeValidationRetries = messages.length;
|
|
86
93
|
}
|
|
87
|
-
const parseResult = (0, responseParser_1.parseAssistantResponse)(response, structuredOutputToolResponse, params.responseFormat, params.
|
|
94
|
+
const parseResult = (0, responseParser_1.parseAssistantResponse)(response, structuredOutputToolResponse, params.responseFormat, validationSchema, params.flagExtraContent);
|
|
88
95
|
if (!parseResult.success) {
|
|
89
96
|
if (!shouldValidate || !(0, executionHelpers_1.canRetry)(retryState)) {
|
|
90
97
|
const errorData = (0, errors_1.buildDetailedParseError)(parseResult.error, response, structuredOutputToolResponse, body, totalAccumulatedUsage);
|
|
@@ -125,8 +132,16 @@ async function executeModelAttemptWithRetries(context) {
|
|
|
125
132
|
}
|
|
126
133
|
const requestBody = apiMode === 'responses' ? (0, responsesApiConverter_1.convertBodyToResponsesApi)(body) : body;
|
|
127
134
|
const outputData = await (0, outputData_1.prepareOutputData)(response, parsedOutput, messages, messagesCountBeforeValidationRetries, params.addToOutput, executeFunctions, index, requestBody, totalAccumulatedUsage, false);
|
|
135
|
+
if (parseResult.hasExtraContent !== undefined) {
|
|
136
|
+
outputData.forEach((item) => {
|
|
137
|
+
if (item.json.output && typeof item.json.output === 'object') {
|
|
138
|
+
item.json.output.has_extra_content =
|
|
139
|
+
parseResult.hasExtraContent;
|
|
140
|
+
}
|
|
141
|
+
});
|
|
142
|
+
}
|
|
128
143
|
if (memory && params.saveMessagesInChatMemory) {
|
|
129
|
-
await (0, io_1.saveToMemory)(messages.slice(0, messagesCountBeforeValidationRetries), parsedOutput, params.saveToolCallsInChatMemory, params.saveReasoningInChatMemory, memory, response.choices[0].message);
|
|
144
|
+
await (0, io_1.saveToMemory)(messages.slice(0, messagesCountBeforeValidationRetries), parsedOutput, params.saveToolCallsInChatMemory, params.saveReasoningInChatMemory, params.saveSystemMessagesInChatMemory, memory, response.choices[0].message, (_b = response._rawResponse) === null || _b === void 0 ? void 0 : _b.id);
|
|
130
145
|
}
|
|
131
146
|
return outputData;
|
|
132
147
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modelAttempt.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/execution/modelAttempt.ts"],"names":[],"mappings":";;AAgEA,
|
|
1
|
+
{"version":3,"file":"modelAttempt.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/execution/modelAttempt.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.prepareOutputData = prepareOutputData;
|
|
4
4
|
exports.reorderOutputFields = reorderOutputFields;
|
|
5
5
|
async function prepareOutputData(response, output, messages, messagesBeforeRetries, addToOutput, executeFunctions, index, body, accumulatedUsage, isHandoffScenario) {
|
|
6
|
-
var _a;
|
|
6
|
+
var _a, _b;
|
|
7
7
|
const outputData = [];
|
|
8
8
|
const isHandoff = output && typeof output === 'object' && 'handoffs' in output && 'output' in output;
|
|
9
9
|
if (isHandoff) {
|
|
@@ -15,8 +15,13 @@ async function prepareOutputData(response, output, messages, messagesBeforeRetri
|
|
|
15
15
|
else {
|
|
16
16
|
outputData.push({ json: { output: output }, pairedItem: { item: index } });
|
|
17
17
|
}
|
|
18
|
+
if ((_a = response._rawResponse) === null || _a === void 0 ? void 0 : _a.id) {
|
|
19
|
+
outputData.forEach((item) => {
|
|
20
|
+
item.json.response_id = response._rawResponse.id;
|
|
21
|
+
});
|
|
22
|
+
}
|
|
18
23
|
if (addToOutput.includes('fullResponse')) {
|
|
19
|
-
const responseOutput = (
|
|
24
|
+
const responseOutput = (_b = response._rawResponse) !== null && _b !== void 0 ? _b : response;
|
|
20
25
|
outputData.forEach((item) => {
|
|
21
26
|
item.json.response = responseOutput;
|
|
22
27
|
});
|
|
@@ -86,6 +91,7 @@ function reorderOutputFields(outputData) {
|
|
|
86
91
|
outputData.forEach((item) => {
|
|
87
92
|
const reordered = {
|
|
88
93
|
output: item.json.output,
|
|
94
|
+
response_id: item.json.response_id,
|
|
89
95
|
error: item.json.error,
|
|
90
96
|
request: item.json.request,
|
|
91
97
|
response: item.json.response,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"outputData.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/execution/outputData.ts"],"names":[],"mappings":";;AAUA,
|
|
1
|
+
{"version":3,"file":"outputData.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/execution/outputData.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,5 +2,6 @@ export interface ParseResult {
|
|
|
2
2
|
success: boolean;
|
|
3
3
|
output?: any;
|
|
4
4
|
error?: string;
|
|
5
|
+
hasExtraContent?: boolean;
|
|
5
6
|
}
|
|
6
|
-
export declare function parseAssistantResponse(response: any, structuredOutputToolResponse: any, responseFormat: string,
|
|
7
|
+
export declare function parseAssistantResponse(response: any, structuredOutputToolResponse: any, responseFormat: string, validationSchema?: any, flagExtraContent?: boolean): ParseResult;
|
|
@@ -1,38 +1,44 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.parseAssistantResponse = parseAssistantResponse;
|
|
4
|
-
const
|
|
5
|
-
function
|
|
6
|
-
|
|
7
|
-
const firstBracket = content.indexOf('[');
|
|
8
|
-
if (firstBrace === -1 && firstBracket === -1)
|
|
9
|
-
return content;
|
|
10
|
-
const isObject = firstBrace !== -1 && (firstBracket === -1 || firstBrace < firstBracket);
|
|
11
|
-
const startIndex = isObject ? firstBrace : firstBracket;
|
|
12
|
-
const endIndex = content.lastIndexOf(isObject ? '}' : ']');
|
|
13
|
-
if (endIndex === -1 || endIndex <= startIndex)
|
|
14
|
-
return content;
|
|
15
|
-
return content.substring(startIndex, endIndex + 1);
|
|
16
|
-
}
|
|
17
|
-
function parseAssistantResponse(response, structuredOutputToolResponse, responseFormat, extractFirstObjectOnly = false) {
|
|
18
|
-
var _a, _b, _c;
|
|
4
|
+
const llm_json_1 = require("@solvers-hub/llm-json");
|
|
5
|
+
function parseAssistantResponse(response, structuredOutputToolResponse, responseFormat, validationSchema, flagExtraContent) {
|
|
6
|
+
var _a, _b;
|
|
19
7
|
try {
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
8
|
+
if (responseFormat === 'plainText') {
|
|
9
|
+
return {
|
|
10
|
+
success: true,
|
|
11
|
+
output: (_a = response === null || response === void 0 ? void 0 : response.choices[0]) === null || _a === void 0 ? void 0 : _a.message.content,
|
|
12
|
+
};
|
|
23
13
|
}
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
14
|
+
const content = structuredOutputToolResponse || ((_b = response === null || response === void 0 ? void 0 : response.choices[0]) === null || _b === void 0 ? void 0 : _b.message.content);
|
|
15
|
+
const schemas = validationSchema
|
|
16
|
+
? [{ name: 'output', schema: validationSchema }]
|
|
17
|
+
: undefined;
|
|
18
|
+
const llmJson = new llm_json_1.LlmJson({ attemptCorrection: true, schemas });
|
|
19
|
+
const result = llmJson.extractAll(content);
|
|
20
|
+
if (validationSchema && result.validatedJson) {
|
|
21
|
+
const firstValid = result.validatedJson.find((v) => v.isValid);
|
|
22
|
+
if (!firstValid) {
|
|
23
|
+
const firstError = result.validatedJson[0];
|
|
24
|
+
const errorDetail = (firstError === null || firstError === void 0 ? void 0 : firstError.validationErrors)
|
|
25
|
+
? JSON.stringify(firstError.validationErrors)
|
|
26
|
+
: 'No JSON matching the schema was found';
|
|
27
|
+
return { success: false, error: `Schema validation failed: ${errorDetail}` };
|
|
28
|
+
}
|
|
29
|
+
const hasExtraContent = flagExtraContent
|
|
30
|
+
? result.text.some((t) => t.trim().length > 0) ||
|
|
31
|
+
result.validatedJson.some((v) => !v.isValid)
|
|
32
|
+
: undefined;
|
|
33
|
+
return { success: true, output: firstValid.json, hasExtraContent };
|
|
31
34
|
}
|
|
32
|
-
|
|
33
|
-
success:
|
|
34
|
-
|
|
35
|
-
|
|
35
|
+
if (result.json.length === 0) {
|
|
36
|
+
return { success: false, error: 'No JSON found in response' };
|
|
37
|
+
}
|
|
38
|
+
const hasExtraContent = flagExtraContent
|
|
39
|
+
? result.text.some((t) => t.trim().length > 0) || result.json.length > 1
|
|
40
|
+
: undefined;
|
|
41
|
+
return { success: true, output: result.json[0], hasExtraContent };
|
|
36
42
|
}
|
|
37
43
|
catch (error) {
|
|
38
44
|
const errorMessage = error instanceof Error ? error.message : String(error);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"responseParser.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/execution/responseParser.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"responseParser.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/execution/responseParser.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, 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, responseId?: string): Promise<void>;
|
|
@@ -26,41 +26,38 @@ function extractMessages(messages) {
|
|
|
26
26
|
messagesAfter: messages.slice(lastUserIndex + 1),
|
|
27
27
|
};
|
|
28
28
|
}
|
|
29
|
-
|
|
30
|
-
|
|
29
|
+
function buildAdditionalKwargs(saveReasoning, source, responseId) {
|
|
30
|
+
const kwargs = {};
|
|
31
|
+
if (saveReasoning && (source === null || source === void 0 ? void 0 : source.reasoning))
|
|
32
|
+
kwargs.reasoning = source.reasoning;
|
|
33
|
+
if (saveReasoning && (source === null || source === void 0 ? void 0 : source.reasoning_content))
|
|
34
|
+
kwargs.reasoning_content = source.reasoning_content;
|
|
35
|
+
if (saveReasoning && (source === null || source === void 0 ? void 0 : source.reasoning_details))
|
|
36
|
+
kwargs.reasoning_details = source.reasoning_details;
|
|
37
|
+
if (responseId)
|
|
38
|
+
kwargs.response_id = responseId;
|
|
39
|
+
return kwargs;
|
|
40
|
+
}
|
|
41
|
+
async function saveToMemory(messages, output, saveToolCallsInChatMemory, saveReasoningInChatMemory, saveSystemMessagesInChatMemory, memory, finalResponseMessage, responseId) {
|
|
42
|
+
var _a, _b;
|
|
31
43
|
const extractedMessages = extractMessages(messages);
|
|
32
44
|
const input = (_a = extractedMessages.lastUser) === null || _a === void 0 ? void 0 : _a.content;
|
|
33
45
|
if (!input) {
|
|
34
46
|
console.log('No user message found; no messages will be stored in the Chat Memory sub-node.');
|
|
35
47
|
return;
|
|
36
48
|
}
|
|
49
|
+
const isSystemInput = ((_b = extractedMessages.lastUser) === null || _b === void 0 ? void 0 : _b.role) === 'system';
|
|
50
|
+
const skipInputMessage = isSystemInput && !saveSystemMessagesInChatMemory;
|
|
37
51
|
const stringifiedOutput = (typeof output === 'string' || typeof output === null) ? output : JSON.stringify(output);
|
|
38
|
-
if (!
|
|
39
|
-
const inputMessage =
|
|
52
|
+
if (!skipInputMessage) {
|
|
53
|
+
const inputMessage = isSystemInput
|
|
40
54
|
? new messages_1.SystemMessage(input)
|
|
41
55
|
: new messages_1.HumanMessage(input);
|
|
42
56
|
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
57
|
}
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
: new messages_1.HumanMessage(input);
|
|
63
|
-
await memory.chatHistory.addMessage(inputMessage);
|
|
58
|
+
const additional_kwargs = buildAdditionalKwargs(saveReasoningInChatMemory, finalResponseMessage, responseId);
|
|
59
|
+
let aiMessage;
|
|
60
|
+
if (saveToolCallsInChatMemory) {
|
|
64
61
|
const tool_calls = extractedMessages.messagesAfter
|
|
65
62
|
.filter(msg => msg.role === 'assistant' || msg.role === 'tool')
|
|
66
63
|
.map(msg => ({
|
|
@@ -73,23 +70,19 @@ async function saveToMemory(messages, output, saveToolCallsInChatMemory, saveRea
|
|
|
73
70
|
...(saveReasoningInChatMemory && msg.reasoning_content && { reasoning_content: msg.reasoning_content }),
|
|
74
71
|
...(saveReasoningInChatMemory && msg.reasoning_details && { reasoning_details: msg.reasoning_details }),
|
|
75
72
|
}));
|
|
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({
|
|
73
|
+
aiMessage = new messages_1.AIMessage({
|
|
87
74
|
content: stringifiedOutput,
|
|
88
|
-
tool_calls
|
|
75
|
+
tool_calls,
|
|
89
76
|
additional_kwargs,
|
|
90
77
|
response_metadata: {},
|
|
91
78
|
});
|
|
92
|
-
await memory.chatHistory.addMessage(aiMessage);
|
|
93
79
|
}
|
|
80
|
+
else {
|
|
81
|
+
aiMessage = new messages_1.AIMessage({
|
|
82
|
+
content: stringifiedOutput,
|
|
83
|
+
additional_kwargs,
|
|
84
|
+
});
|
|
85
|
+
}
|
|
86
|
+
await memory.chatHistory.addMessage(aiMessage);
|
|
94
87
|
}
|
|
95
88
|
//# 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,4 @@
|
|
|
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[]>;
|
|
4
|
+
export declare function getLatestResponseIdFromMemory(memory: BufferWindowMemory): Promise<string>;
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.unpackChatHistoryAndMemory = unpackChatHistoryAndMemory;
|
|
4
|
+
exports.getLatestResponseIdFromMemory = getLatestResponseIdFromMemory;
|
|
4
5
|
const converter_1 = require("./converter");
|
|
5
6
|
async function getChatMessages(memory) {
|
|
6
7
|
const allMessages = (await memory.loadMemoryVariables({}))[memory.memoryKey];
|
|
@@ -10,7 +11,7 @@ async function getChatMessages(memory) {
|
|
|
10
11
|
}
|
|
11
12
|
return allMessages;
|
|
12
13
|
}
|
|
13
|
-
async function unpackChatHistoryAndMemory(rawMessagesToSend, loadToolCallsFromChatMemory = true, loadReasoningFromChatMemory = true, memory) {
|
|
14
|
+
async function unpackChatHistoryAndMemory(rawMessagesToSend, loadToolCallsFromChatMemory = true, loadReasoningFromChatMemory = true, loadSystemMessagesFromChatMemory = true, memory) {
|
|
14
15
|
const processedMessages = [];
|
|
15
16
|
for (const rawMessage of rawMessagesToSend) {
|
|
16
17
|
if (rawMessage.role === 'chatHistoryRole') {
|
|
@@ -26,7 +27,10 @@ async function unpackChatHistoryAndMemory(rawMessagesToSend, loadToolCallsFromCh
|
|
|
26
27
|
else if (rawMessage.role === 'chatMemoryRole' && memory) {
|
|
27
28
|
const rawMemoryMessages = await getChatMessages(memory);
|
|
28
29
|
if (rawMemoryMessages.length > 0) {
|
|
29
|
-
|
|
30
|
+
let memoryMessages = (0, converter_1.convertMessages)(rawMemoryMessages, loadToolCallsFromChatMemory, loadReasoningFromChatMemory);
|
|
31
|
+
if (!loadSystemMessagesFromChatMemory) {
|
|
32
|
+
memoryMessages = memoryMessages.filter((msg) => msg.role !== 'system');
|
|
33
|
+
}
|
|
30
34
|
processedMessages.push(...memoryMessages);
|
|
31
35
|
}
|
|
32
36
|
}
|
|
@@ -37,4 +41,8 @@ async function unpackChatHistoryAndMemory(rawMessagesToSend, loadToolCallsFromCh
|
|
|
37
41
|
}
|
|
38
42
|
return processedMessages;
|
|
39
43
|
}
|
|
44
|
+
async function getLatestResponseIdFromMemory(memory) {
|
|
45
|
+
const messages = await getChatMessages(memory);
|
|
46
|
+
return (0, converter_1.getLatestResponseId)(messages);
|
|
47
|
+
}
|
|
40
48
|
//# 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":";;AA0BA,gEAoDC;AAMD,sEAKC;AAtFD,2CAAmE;AAEnE,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;AAMM,KAAK,UAAU,6BAA6B,CAClD,MAA0B;IAE1B,MAAM,QAAQ,GAAG,MAAM,eAAe,CAAC,MAAM,CAAC,CAAC;IAC/C,OAAO,IAAA,+BAAmB,EAAC,QAAQ,CAAC,CAAC;AACtC,CAAC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
1
|
import { Message } from './types';
|
|
2
|
-
import { BaseMessage } from '@langchain/core/
|
|
2
|
+
import { BaseMessage } from '@langchain/core/messages';
|
|
3
3
|
export declare function convertMessages(messages: BaseMessage[], loadToolCalls?: boolean, loadReasoning?: boolean): Message[];
|
|
4
|
+
export declare function getLatestResponseId(messages: BaseMessage[]): string;
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.convertMessages = convertMessages;
|
|
4
|
+
exports.getLatestResponseId = getLatestResponseId;
|
|
4
5
|
const types_1 = require("./types");
|
|
5
6
|
function convertMessages(messages, loadToolCalls = true, loadReasoning = true) {
|
|
6
7
|
var _a, _b;
|
|
@@ -50,4 +51,16 @@ function convertMessages(messages, loadToolCalls = true, loadReasoning = true) {
|
|
|
50
51
|
}
|
|
51
52
|
return result;
|
|
52
53
|
}
|
|
54
|
+
function getLatestResponseId(messages) {
|
|
55
|
+
var _a;
|
|
56
|
+
for (let i = messages.length - 1; i >= 0; i--) {
|
|
57
|
+
const msg = messages[i];
|
|
58
|
+
if (msg.constructor.name === 'AIMessage') {
|
|
59
|
+
const responseId = (_a = msg.additional_kwargs) === null || _a === void 0 ? void 0 : _a.response_id;
|
|
60
|
+
if (responseId)
|
|
61
|
+
return String(responseId);
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
return '';
|
|
65
|
+
}
|
|
53
66
|
//# sourceMappingURL=converter.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"converter.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/messages/converter.ts"],"names":[],"mappings":";;AAgBA,0CAsDC;
|
|
1
|
+
{"version":3,"file":"converter.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/messages/converter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import { type IExecuteFunctions } from 'n8n-workflow';
|
|
2
2
|
import type { Tool } from '@langchain/core/tools';
|
|
3
|
-
export declare const getConnectedTools: (ctx: IExecuteFunctions, enforceUniqueNames: boolean, convertStructuredTool?: boolean) => Promise<Tool[]>;
|
|
3
|
+
export declare const getConnectedTools: (ctx: IExecuteFunctions, enforceUniqueNames: boolean, convertStructuredTool?: boolean) => Promise<Tool<any>[]>;
|
|
@@ -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): 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): Promise<{
|
|
7
7
|
response: ChatCompletion;
|
|
8
8
|
structuredOutputToolResponse: any;
|
|
9
9
|
finalIteration: number;
|