n8n-nodes-simple 2.0.1 → 2.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/credentials/SimpleOpenAiApi.credentials.js +1 -1
- package/dist/credentials/SimpleOpenAiApi.credentials.js.map +1 -1
- package/dist/nodes/CoreAgent/CoreAgent.node.js.map +1 -1
- package/dist/nodes/CoreAgent/description.js +14 -2
- package/dist/nodes/CoreAgent/description.js.map +1 -1
- package/dist/nodes/Subagent/description.js +15 -2
- package/dist/nodes/Subagent/description.js.map +1 -1
- package/dist/nodes/shared/actions/executor.js +1 -1
- package/dist/nodes/shared/actions/executor.js.map +1 -1
- package/dist/nodes/shared/actions/memory.d.ts +1 -1
- package/dist/nodes/shared/actions/memory.js +71 -19
- package/dist/nodes/shared/actions/memory.js.map +1 -1
- package/dist/nodes/shared/actions/message.operation.js +1 -1
- package/dist/nodes/shared/actions/message.operation.js.map +1 -1
- package/dist/nodes/shared/actions/messageProcessor.d.ts +1 -1
- package/dist/nodes/shared/actions/messageProcessor.js +9 -7
- package/dist/nodes/shared/actions/messageProcessor.js.map +1 -1
- package/dist/nodes/shared/actions/outputProcessor.js +29 -21
- package/dist/nodes/shared/actions/outputProcessor.js.map +1 -1
- package/dist/nodes/shared/actions/parameters.d.ts +2 -0
- package/dist/nodes/shared/actions/parameters.js +8 -1
- package/dist/nodes/shared/actions/parameters.js.map +1 -1
- package/dist/nodes/shared/actions/requestBuilder.js +2 -2
- package/dist/nodes/shared/actions/requestBuilder.js.map +1 -1
- package/dist/nodes/shared/actions/responseConfig.js +2 -2
- package/dist/nodes/shared/actions/responseConfig.js.map +1 -1
- package/dist/nodes/shared/actions/router.js +2 -2
- package/dist/nodes/shared/actions/router.js.map +1 -1
- package/dist/nodes/shared/actions/tool.js.map +1 -1
- package/dist/nodes/shared/actions/toolExecutor.js +78 -21
- package/dist/nodes/shared/actions/toolExecutor.js.map +1 -1
- package/dist/nodes/shared/actions/toolSetup.js +6 -5
- package/dist/nodes/shared/actions/toolSetup.js.map +1 -1
- package/dist/nodes/shared/api/openAiApiRequest.js.map +1 -1
- package/dist/nodes/shared/api/types.d.ts +2 -0
- package/dist/nodes/shared/api/utils.js.map +1 -1
- package/dist/nodes/shared/descriptionGenerator.js +3 -7
- package/dist/nodes/shared/descriptionGenerator.js.map +1 -1
- package/dist/nodes/shared/message/chatHistoryProcessor.d.ts +2 -0
- package/dist/nodes/shared/message/chatHistoryProcessor.js +63 -0
- package/dist/nodes/shared/message/chatHistoryProcessor.js.map +1 -0
- package/dist/nodes/shared/message/memoryOptimizer.d.ts +3 -0
- package/dist/nodes/shared/message/memoryOptimizer.js +30 -0
- package/dist/nodes/shared/message/memoryOptimizer.js.map +1 -0
- package/dist/nodes/shared/message/messageConverter.d.ts +4 -0
- package/dist/nodes/shared/message/messageConverter.js +76 -0
- package/dist/nodes/shared/message/messageConverter.js.map +1 -0
- package/dist/nodes/shared/message/processor.d.ts +3 -7
- package/dist/nodes/shared/message/processor.js +8 -83
- package/dist/nodes/shared/message/processor.js.map +1 -1
- package/dist/nodes/shared/message/toolMessageExtractor.d.ts +6 -0
- package/dist/nodes/shared/message/toolMessageExtractor.js +28 -0
- package/dist/nodes/shared/message/toolMessageExtractor.js.map +1 -0
- package/dist/nodes/shared/message/types.d.ts +2 -0
- package/dist/nodes/shared/message/types.js +5 -5
- package/dist/nodes/shared/message/types.js.map +1 -1
- package/dist/nodes/shared/properties.js +75 -41
- package/dist/nodes/shared/properties.js.map +1 -1
- package/dist/nodes/shared/tool/subagentTool.d.ts +1 -1
- package/dist/nodes/shared/tool/subagentTool.js +4 -4
- package/dist/nodes/shared/tool/subagentTool.js.map +1 -1
- package/dist/nodes/shared/tool/visualEditor.d.ts +1 -1
- package/dist/nodes/shared/tool/visualEditor.js +20 -16
- package/dist/nodes/shared/tool/visualEditor.js.map +1 -1
- package/dist/nodes/shared/toolManager/getConnectedTools.js.map +1 -1
- package/dist/nodes/shared/toolManager/n8nTool.js.map +1 -1
- package/dist/package.json +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SimpleOpenAiApi.credentials.js","sourceRoot":"","sources":["../../credentials/SimpleOpenAiApi.credentials.ts"],"names":[],"mappings":";;;AAOA,MAAa,eAAe;IAA5B;QACC,SAAI,GAAG,iBAAiB,CAAC;QAEzB,gBAAW,GAAG,mBAAmB,CAAC;QAElC,qBAAgB,
|
|
1
|
+
{"version":3,"file":"SimpleOpenAiApi.credentials.js","sourceRoot":"","sources":["../../credentials/SimpleOpenAiApi.credentials.ts"],"names":[],"mappings":";;;AAOA,MAAa,eAAe;IAA5B;QACC,SAAI,GAAG,iBAAiB,CAAC;QAEzB,gBAAW,GAAG,mBAAmB,CAAC;QAElC,qBAAgB,GACf,gHAAgH,CAAC;QAElH,SAAI,GAAG,EAAE,KAAK,EAAE,yBAAyB,EAAE,IAAI,EAAE,yBAAyB,EAAW,CAAC;QAEtF,eAAU,GAAsB;YAC/B;gBACC,WAAW,EAAE,SAAS;gBACtB,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,QAAQ;gBACd,WAAW,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE;gBAC/B,QAAQ,EAAE,IAAI;gBACd,OAAO,EAAE,EAAE;aACX;YACD;gBACC,WAAW,EAAE,UAAU;gBACvB,IAAI,EAAE,SAAS;gBACf,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,IAAI;gBACd,OAAO,EAAE,2BAA2B;gBACpC,WAAW,EAAE,uBAAuB;aACpC;YACD;gBACC,WAAW,EAAE,4BAA4B;gBACzC,IAAI,EAAE,gBAAgB;gBACtB,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,EAAE;gBACX,IAAI,EAAE,uDAAuD;gBAC7D,WAAW,EACV,8MAA8M;aAC/M;SACD,CAAC;QAEF,iBAAY,GAAyB;YACpC,IAAI,EAAE,SAAS;YACf,UAAU,EAAE;gBACX,OAAO,EAAE;oBACR,aAAa,EAAE,iCAAiC;oBAChD,qBAAqB,EAAE,kCAAkC;iBACzD;aACD;SACD,CAAC;QAEF,SAAI,GAA2B;YAC9B,OAAO,EAAE;gBACR,OAAO,EAAE,2BAA2B;gBACpC,GAAG,EAAE,SAAS;aACd;SACD,CAAC;IACH,CAAC;CAAA;AAtDD,0CAsDC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CoreAgent.node.js","sourceRoot":"","sources":["../../../nodes/CoreAgent/CoreAgent.node.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"CoreAgent.node.js","sourceRoot":"","sources":["../../../nodes/CoreAgent/CoreAgent.node.ts"],"names":[],"mappings":";;;AAEA,+CAAqD;AACrD,qDAAkD;AAClD,+CAA+C;AAE/C,MAAa,SAAS;IAAtB;QACC,gBAAW,GAAG,kCAAoB,CAAC;QAEnC,YAAO,GAAG;YACT,UAAU,EAAV,oBAAU;SACV,CAAC;IAMH,CAAC;IAHA,KAAK,CAAC,OAAO;QACZ,OAAO,MAAM,eAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAChC,CAAC;CACD;AAXD,8BAWC"}
|
|
@@ -8,8 +8,20 @@ exports.coreAgentDescription = (0, descriptionGenerator_1.generateDescription)('
|
|
|
8
8
|
description: 'Agent capable of using tools, subagents, and structured output.',
|
|
9
9
|
codex: {
|
|
10
10
|
alias: [
|
|
11
|
-
'Special',
|
|
12
|
-
'
|
|
11
|
+
'Special',
|
|
12
|
+
'General',
|
|
13
|
+
'AI',
|
|
14
|
+
'Agent',
|
|
15
|
+
'Subagent',
|
|
16
|
+
'OpenAI',
|
|
17
|
+
'LiteLLM',
|
|
18
|
+
'LangChain',
|
|
19
|
+
'ChatGPT',
|
|
20
|
+
'assistant',
|
|
21
|
+
'Chat',
|
|
22
|
+
'Conversational',
|
|
23
|
+
'Plan and Execute',
|
|
24
|
+
'ReAct',
|
|
13
25
|
],
|
|
14
26
|
categories: ['AI'],
|
|
15
27
|
subcategories: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"description.js","sourceRoot":"","sources":["../../../nodes/CoreAgent/description.ts"],"names":[],"mappings":";;;AAAA,yEAAqE;AAGxD,QAAA,oBAAoB,GAAyB,IAAA,0CAAmB,EAC5E,WAAW,EACX;IACC,WAAW,EAAE,UAAU;IACvB,QAAQ,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE;IAC9B,WAAW,EAAE,iEAAiE;IAC9E,KAAK,EAAE;QACN,KAAK,EAAE;YACN,SAAS,
|
|
1
|
+
{"version":3,"file":"description.js","sourceRoot":"","sources":["../../../nodes/CoreAgent/description.ts"],"names":[],"mappings":";;;AAAA,yEAAqE;AAGxD,QAAA,oBAAoB,GAAyB,IAAA,0CAAmB,EAC5E,WAAW,EACX;IACC,WAAW,EAAE,UAAU;IACvB,QAAQ,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE;IAC9B,WAAW,EAAE,iEAAiE;IAC9E,KAAK,EAAE;QACN,KAAK,EAAE;YACN,SAAS;YACT,SAAS;YACT,IAAI;YACJ,OAAO;YACP,UAAU;YACV,QAAQ;YACR,SAAS;YACT,WAAW;YACX,SAAS;YACT,WAAW;YACX,MAAM;YACN,gBAAgB;YAChB,kBAAkB;YAClB,OAAO;SACP;QACD,UAAU,EAAE,CAAC,IAAI,CAAC;QAClB,aAAa,EAAE;YACd,EAAE,EAAE,CAAC,QAAQ,EAAE,eAAe,EAAE,YAAY,CAAC;SAC7C;KACD;CACD,CACD,CAAC"}
|
|
@@ -9,8 +9,21 @@ exports.description = (0, descriptionGenerator_1.generateDescription)('subAgent'
|
|
|
9
9
|
group: ['output'],
|
|
10
10
|
codex: {
|
|
11
11
|
alias: [
|
|
12
|
-
'Special',
|
|
13
|
-
'
|
|
12
|
+
'Special',
|
|
13
|
+
'General',
|
|
14
|
+
'AI',
|
|
15
|
+
'Agent',
|
|
16
|
+
'Subagent',
|
|
17
|
+
'OpenAI',
|
|
18
|
+
'LiteLLM',
|
|
19
|
+
'LangChain',
|
|
20
|
+
'ChatGPT',
|
|
21
|
+
'assistant',
|
|
22
|
+
'Chat',
|
|
23
|
+
'Conversational',
|
|
24
|
+
'Plan and Execute',
|
|
25
|
+
'ReAct',
|
|
26
|
+
'Tools',
|
|
14
27
|
],
|
|
15
28
|
categories: ['AI'],
|
|
16
29
|
subcategories: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"description.js","sourceRoot":"","sources":["../../../nodes/Subagent/description.ts"],"names":[],"mappings":";;;AAAA,yEAAqE;AAGxD,QAAA,WAAW,GAAyB,IAAA,0CAAmB,EACnE,UAAU,EACV;IACC,WAAW,EAAE,aAAa;IAC1B,QAAQ,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE;IACjC,WAAW,EAAE,gDAAgD;IAC7D,KAAK,EAAE,CAAC,QAAQ,CAAC;IACjB,KAAK,EAAE;QACN,KAAK,EAAE;YACN,SAAS,
|
|
1
|
+
{"version":3,"file":"description.js","sourceRoot":"","sources":["../../../nodes/Subagent/description.ts"],"names":[],"mappings":";;;AAAA,yEAAqE;AAGxD,QAAA,WAAW,GAAyB,IAAA,0CAAmB,EACnE,UAAU,EACV;IACC,WAAW,EAAE,aAAa;IAC1B,QAAQ,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE;IACjC,WAAW,EAAE,gDAAgD;IAC7D,KAAK,EAAE,CAAC,QAAQ,CAAC;IACjB,KAAK,EAAE;QACN,KAAK,EAAE;YACN,SAAS;YACT,SAAS;YACT,IAAI;YACJ,OAAO;YACP,UAAU;YACV,QAAQ;YACR,SAAS;YACT,WAAW;YACX,SAAS;YACT,WAAW;YACX,MAAM;YACN,gBAAgB;YAChB,kBAAkB;YAClB,OAAO;YACP,OAAO;SACP;QACD,UAAU,EAAE,CAAC,IAAI,CAAC;QAClB,aAAa,EAAE;YACd,EAAE,EAAE,CAAC,eAAe,EAAE,OAAO,CAAC;YAC9B,KAAK,EAAE,CAAC,mBAAmB,EAAE,aAAa,CAAC;SAC3C;KACD;CACD,CACD,CAAC"}
|
|
@@ -54,7 +54,7 @@ async function executeSingleModel(executeFunctions, params, memory, messages, in
|
|
|
54
54
|
const outputData = await (0, outputProcessor_1.prepareOutputData)(response, output, messages, originalMessagesLength, params.addToOutput, params.agentType, executeFunctions, index, body, modelToUse, parentMessageContentStr);
|
|
55
55
|
if (memory && ((_b = (_a = response === null || response === void 0 ? void 0 : response.choices) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.message)) {
|
|
56
56
|
const outputStringified = typeof output === 'string' ? output : JSON.stringify(output);
|
|
57
|
-
await (0, memory_1.saveToMemory)(memory, messages, response, outputStringified);
|
|
57
|
+
await (0, memory_1.saveToMemory)(memory, messages, response, outputStringified, params.saveToolCallsInChatMemory, originalMessagesLength);
|
|
58
58
|
}
|
|
59
59
|
return outputData;
|
|
60
60
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../nodes/shared/actions/executor.ts"],"names":[],"mappings":";;AAcA,0CAGC;AAKD,
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../nodes/shared/actions/executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,4 +2,4 @@ import type { IExecuteFunctions, IDataObject } from 'n8n-workflow';
|
|
|
2
2
|
import type { BaseChatMemory } from 'langchain/memory';
|
|
3
3
|
import type { ChatCompletion } from '../api/types';
|
|
4
4
|
export declare function getMemoryFromInput(executeFunctions: IExecuteFunctions): Promise<BaseChatMemory | undefined>;
|
|
5
|
-
export declare function saveToMemory(memory: BaseChatMemory | undefined, messages: IDataObject[], response: ChatCompletion, outputStringified: string): Promise<void>;
|
|
5
|
+
export declare function saveToMemory(memory: BaseChatMemory | undefined, messages: IDataObject[], response: ChatCompletion, outputStringified: string, saveToolCallsInChatMemory: boolean, originalMessagesLength?: number): Promise<void>;
|
|
@@ -2,40 +2,92 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getMemoryFromInput = getMemoryFromInput;
|
|
4
4
|
exports.saveToMemory = saveToMemory;
|
|
5
|
+
const messages_1 = require("@langchain/core/messages");
|
|
5
6
|
async function getMemoryFromInput(executeFunctions) {
|
|
6
7
|
let memoryInput;
|
|
7
8
|
try {
|
|
8
|
-
memoryInput = (await executeFunctions.getInputConnectionData(
|
|
9
|
+
memoryInput = (await executeFunctions.getInputConnectionData('ai_memory', 0, undefined));
|
|
9
10
|
}
|
|
10
11
|
catch (error) {
|
|
11
12
|
memoryInput = undefined;
|
|
12
13
|
}
|
|
13
14
|
return Array.isArray(memoryInput) ? memoryInput[0] : memoryInput;
|
|
14
15
|
}
|
|
15
|
-
async function saveToMemory(memory, messages, response, outputStringified) {
|
|
16
|
-
var _a, _b, _c, _d;
|
|
16
|
+
async function saveToMemory(memory, messages, response, outputStringified, saveToolCallsInChatMemory, originalMessagesLength = 0) {
|
|
17
|
+
var _a, _b, _c, _d, _e;
|
|
17
18
|
if (!memory || !((_b = (_a = response === null || response === void 0 ? void 0 : response.choices) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.message)) {
|
|
18
19
|
return;
|
|
19
20
|
}
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
assistantContent
|
|
24
|
-
|
|
25
|
-
assistantContent
|
|
21
|
+
if (!saveToolCallsInChatMemory) {
|
|
22
|
+
const lastUserMessageContent = ((_c = [...messages].reverse().find((msg) => msg.role === 'user')) === null || _c === void 0 ? void 0 : _c.content) || '';
|
|
23
|
+
let assistantContent = outputStringified;
|
|
24
|
+
if (!assistantContent || assistantContent === 'null' || assistantContent === 'undefined') {
|
|
25
|
+
assistantContent = response.choices[0].message.content || '';
|
|
26
|
+
if (!assistantContent && ((_d = response.choices[0].message.tool_calls) === null || _d === void 0 ? void 0 : _d.length)) {
|
|
27
|
+
assistantContent =
|
|
28
|
+
'Used tools: ' +
|
|
29
|
+
response.choices[0].message.tool_calls.map((tc) => tc.function.name).join(', ');
|
|
30
|
+
}
|
|
31
|
+
else if (!assistantContent) {
|
|
32
|
+
assistantContent = '[No response content available]';
|
|
33
|
+
}
|
|
26
34
|
}
|
|
27
|
-
|
|
28
|
-
assistantContent =
|
|
35
|
+
if (typeof assistantContent !== 'string') {
|
|
36
|
+
assistantContent = JSON.stringify(assistantContent);
|
|
37
|
+
}
|
|
38
|
+
try {
|
|
39
|
+
await memory.saveContext({ input: lastUserMessageContent }, { output: assistantContent });
|
|
40
|
+
}
|
|
41
|
+
catch (error) {
|
|
42
|
+
console.error('Error saving messages to memory:', error);
|
|
29
43
|
}
|
|
30
44
|
}
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
45
|
+
else {
|
|
46
|
+
try {
|
|
47
|
+
const lastUserMessage = [...messages].reverse().find((msg) => msg.role === 'user');
|
|
48
|
+
if (lastUserMessage === null || lastUserMessage === void 0 ? void 0 : lastUserMessage.content) {
|
|
49
|
+
const humanMessage = new messages_1.HumanMessage(lastUserMessage.content);
|
|
50
|
+
await memory.chatHistory.addMessage(humanMessage);
|
|
51
|
+
}
|
|
52
|
+
const conversationMessages = [];
|
|
53
|
+
for (let i = originalMessagesLength; i < messages.length; i++) {
|
|
54
|
+
const msg = messages[i];
|
|
55
|
+
if (msg.role === 'assistant' || msg.role === 'tool') {
|
|
56
|
+
conversationMessages.push({
|
|
57
|
+
role: msg.role,
|
|
58
|
+
content: msg.content || '',
|
|
59
|
+
...(msg.tool_calls && { tool_calls: msg.tool_calls }),
|
|
60
|
+
...(msg.tool_call_id && { tool_call_id: msg.tool_call_id }),
|
|
61
|
+
...(msg.refusal && { refusal: msg.refusal }),
|
|
62
|
+
});
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
let finalContent = outputStringified;
|
|
66
|
+
if (!finalContent || finalContent === 'null' || finalContent === 'undefined') {
|
|
67
|
+
finalContent = response.choices[0].message.content || '';
|
|
68
|
+
if (!finalContent && ((_e = response.choices[0].message.tool_calls) === null || _e === void 0 ? void 0 : _e.length)) {
|
|
69
|
+
finalContent =
|
|
70
|
+
'Used tools: ' +
|
|
71
|
+
response.choices[0].message.tool_calls.map((tc) => tc.function.name).join(', ');
|
|
72
|
+
}
|
|
73
|
+
else if (!finalContent) {
|
|
74
|
+
finalContent = '[No response content available]';
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
if (typeof finalContent !== 'string') {
|
|
78
|
+
finalContent = JSON.stringify(finalContent);
|
|
79
|
+
}
|
|
80
|
+
const aiMessage = new messages_1.AIMessage({
|
|
81
|
+
content: finalContent,
|
|
82
|
+
tool_calls: conversationMessages,
|
|
83
|
+
additional_kwargs: {},
|
|
84
|
+
response_metadata: {},
|
|
85
|
+
});
|
|
86
|
+
await memory.chatHistory.addMessage(aiMessage);
|
|
87
|
+
}
|
|
88
|
+
catch (error) {
|
|
89
|
+
console.error('Error saving messages with tool calls to memory:', error);
|
|
90
|
+
}
|
|
39
91
|
}
|
|
40
92
|
}
|
|
41
93
|
//# sourceMappingURL=memory.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"memory.js","sourceRoot":"","sources":["../../../../nodes/shared/actions/memory.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"memory.js","sourceRoot":"","sources":["../../../../nodes/shared/actions/memory.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,7 @@ const executor_1 = require("./executor");
|
|
|
8
8
|
async function execute(i, parentMessageContentStr = '', parentMessageContentObj = {}) {
|
|
9
9
|
const params = (0, parameters_1.extractParameters)(this, i);
|
|
10
10
|
const memory = await (0, memory_1.getMemoryFromInput)(this);
|
|
11
|
-
const messages = await (0, messageProcessor_1.processMessages)(params.rawMessagesToSend, memory, parentMessageContentStr, parentMessageContentObj);
|
|
11
|
+
const messages = await (0, messageProcessor_1.processMessages)(params.rawMessagesToSend, memory, parentMessageContentStr, parentMessageContentObj, params.loadToolCallsFromChatMemory);
|
|
12
12
|
return await (0, executor_1.executeWithFallback)(this, params, memory, messages, i, parentMessageContentStr, parentMessageContentObj);
|
|
13
13
|
}
|
|
14
14
|
//# sourceMappingURL=message.operation.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message.operation.js","sourceRoot":"","sources":["../../../../nodes/shared/actions/message.operation.ts"],"names":[],"mappings":";;AAUA,
|
|
1
|
+
{"version":3,"file":"message.operation.js","sourceRoot":"","sources":["../../../../nodes/shared/actions/message.operation.ts"],"names":[],"mappings":";;AAUA,0BA+BC;AAvCD,6CAAiD;AACjD,qCAA8C;AAC9C,yDAAqD;AACrD,yCAAiD;AAK1C,KAAK,UAAU,OAAO,CAE5B,CAAS,EACT,0BAAkC,EAAE,EACpC,0BAAkC,EAAE;IAGpC,MAAM,MAAM,GAAG,IAAA,8BAAiB,EAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IAG1C,MAAM,MAAM,GAAG,MAAM,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;IAG9C,MAAM,QAAQ,GAAG,MAAM,IAAA,kCAAe,EACrC,MAAM,CAAC,iBAAiB,EACxB,MAAM,EACN,uBAAuB,EACvB,uBAAuB,EACvB,MAAM,CAAC,2BAA2B,CAClC,CAAC;IAGF,OAAO,MAAM,IAAA,8BAAmB,EAC/B,IAAI,EACJ,MAAM,EACN,MAAM,EACN,QAAQ,EACR,CAAC,EACD,uBAAuB,EACvB,uBAAuB,CACvB,CAAC;AACH,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import type { IDataObject } from 'n8n-workflow';
|
|
2
2
|
import type { BaseChatMemory } from 'langchain/memory';
|
|
3
3
|
import { Message } from '../message/types';
|
|
4
|
-
export declare function processMessages(rawMessagesToSend: Message[], memory: BaseChatMemory | undefined, parentMessageContentStr: string, parentMessageContentObj: object): Promise<IDataObject[]>;
|
|
4
|
+
export declare function processMessages(rawMessagesToSend: Message[], memory: BaseChatMemory | undefined, parentMessageContentStr: string, parentMessageContentObj: object, loadToolCallsFromChatMemory?: boolean): Promise<IDataObject[]>;
|
|
@@ -2,19 +2,21 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.processMessages = processMessages;
|
|
4
4
|
const processor_1 = require("../message/processor");
|
|
5
|
-
async function processMessages(rawMessagesToSend, memory, parentMessageContentStr, parentMessageContentObj) {
|
|
6
|
-
let messages = await (0, processor_1.unpackChatHistoryAndMemory)(rawMessagesToSend, memory);
|
|
5
|
+
async function processMessages(rawMessagesToSend, memory, parentMessageContentStr, parentMessageContentObj, loadToolCallsFromChatMemory = true) {
|
|
6
|
+
let messages = (await (0, processor_1.unpackChatHistoryAndMemory)(rawMessagesToSend, memory, loadToolCallsFromChatMemory));
|
|
7
7
|
messages = messages
|
|
8
|
-
.map(item => ({
|
|
8
|
+
.map((item) => ({
|
|
9
9
|
...item,
|
|
10
|
-
content: typeof item.content === 'string' ? item.content.trim() : item.content
|
|
10
|
+
content: typeof item.content === 'string' ? item.content.trim() : item.content,
|
|
11
11
|
}))
|
|
12
|
-
.filter(item => item.content !== ''
|
|
12
|
+
.filter((item) => item.content !== '' ||
|
|
13
|
+
(item.role === 'assistant' && item.tool_calls) ||
|
|
14
|
+
item.role === 'tool');
|
|
13
15
|
if (parentMessageContentStr !== '') {
|
|
14
|
-
messages.push({ role:
|
|
16
|
+
messages.push({ role: 'user', content: parentMessageContentStr });
|
|
15
17
|
}
|
|
16
18
|
else if (Object.keys(parentMessageContentObj).length !== 0) {
|
|
17
|
-
messages.push({ role:
|
|
19
|
+
messages.push({ role: 'user', content: JSON.stringify(parentMessageContentObj) });
|
|
18
20
|
}
|
|
19
21
|
return messages;
|
|
20
22
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"messageProcessor.js","sourceRoot":"","sources":["../../../../nodes/shared/actions/messageProcessor.ts"],"names":[],"mappings":";;AAQA,
|
|
1
|
+
{"version":3,"file":"messageProcessor.js","sourceRoot":"","sources":["../../../../nodes/shared/actions/messageProcessor.ts"],"names":[],"mappings":";;AAQA,0CAsCC;AA3CD,oDAAkE;AAK3D,KAAK,UAAU,eAAe,CACpC,iBAA4B,EAC5B,MAAkC,EAClC,uBAA+B,EAC/B,uBAA+B,EAC/B,8BAAuC,IAAI;IAG3C,IAAI,QAAQ,GAAG,CAAC,MAAM,IAAA,sCAA0B,EAC/C,iBAAiB,EACjB,MAAM,EACN,2BAA2B,CAC3B,CAAkB,CAAC;IAGpB,QAAQ,GAAG,QAAQ;SACjB,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QACf,GAAG,IAAI;QACP,OAAO,EAAE,OAAO,IAAI,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO;KAC9E,CAAC,CAAC;SACF,MAAM,CACN,CAAC,IAAI,EAAE,EAAE,CACR,IAAI,CAAC,OAAO,KAAK,EAAE;QACnB,CAAE,IAAY,CAAC,IAAI,KAAK,WAAW,IAAK,IAAY,CAAC,UAAU,CAAC;QAC/D,IAAY,CAAC,IAAI,KAAK,MAAM,CAC9B,CAAC;IAGH,IAAI,uBAAuB,KAAK,EAAE,EAAE,CAAC;QAEpC,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,uBAAuB,EAAE,CAAC,CAAC;IACnE,CAAC;SAAM,IAAI,MAAM,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAG9D,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,uBAAuB,CAAC,EAAE,CAAC,CAAC;IACnF,CAAC;IAED,OAAO,QAAQ,CAAC;AACjB,CAAC"}
|
|
@@ -5,16 +5,14 @@ exports.addModelOverview = addModelOverview;
|
|
|
5
5
|
exports.reorderOutputFields = reorderOutputFields;
|
|
6
6
|
const processor_1 = require("../message/processor");
|
|
7
7
|
async function prepareOutputData(response, output, messages, originalMessagesLength, addToOutput, agentType, executeFunctions, index, body, model, parentMessageContentStr) {
|
|
8
|
-
var _a, _b;
|
|
9
8
|
const outputData = [];
|
|
10
|
-
if (agentType ==
|
|
9
|
+
if (agentType == 'subAgent' && parentMessageContentStr !== '') {
|
|
11
10
|
outputData.push({
|
|
12
11
|
json: { response: response },
|
|
13
12
|
pairedItem: { item: 0 },
|
|
14
13
|
});
|
|
15
14
|
return outputData;
|
|
16
15
|
}
|
|
17
|
-
;
|
|
18
16
|
if (body.response_format) {
|
|
19
17
|
response.choices = response.choices.map((choice) => {
|
|
20
18
|
try {
|
|
@@ -27,47 +25,57 @@ async function prepareOutputData(response, output, messages, originalMessagesLen
|
|
|
27
25
|
output = output ? output : response.choices[0].message.content;
|
|
28
26
|
var outputStringified = typeof output === 'string' ? output : JSON.stringify(output);
|
|
29
27
|
outputData.push({ json: { output: output }, pairedItem: { item: index } });
|
|
30
|
-
if (addToOutput.includes(
|
|
31
|
-
outputData.forEach(item => {
|
|
28
|
+
if (addToOutput.includes('fullResponse') || agentType === 'subAgent') {
|
|
29
|
+
outputData.forEach((item) => {
|
|
32
30
|
item.json.response = response;
|
|
33
31
|
});
|
|
34
32
|
}
|
|
35
33
|
const newMessages = messages.slice(originalMessagesLength);
|
|
36
|
-
if (addToOutput.includes(
|
|
37
|
-
outputData.forEach(item => {
|
|
34
|
+
if (addToOutput.includes('tool_calls')) {
|
|
35
|
+
outputData.forEach((item) => {
|
|
38
36
|
item.json.tool_calls = (0, processor_1.extractToolMessages)(newMessages);
|
|
39
37
|
});
|
|
40
38
|
}
|
|
41
|
-
if (addToOutput.includes(
|
|
39
|
+
if (addToOutput.includes('chatHistory')) {
|
|
42
40
|
const includeToolCallsInChatHistory = executeFunctions.getNodeParameter('includeToolCallsInChatHistory', index, true);
|
|
43
41
|
const includeSystemMessagesInChatHistory = executeFunctions.getNodeParameter('includeSystemMessagesInChatHistory', index, true);
|
|
42
|
+
const includeReasoningInChatHistory = executeFunctions.getNodeParameter('includeReasoningInChatHistory', index, false);
|
|
44
43
|
let chatHistoryMessages = structuredClone(messages);
|
|
45
44
|
if (!includeToolCallsInChatHistory) {
|
|
46
45
|
chatHistoryMessages = chatHistoryMessages
|
|
47
|
-
.filter(msg => msg.content !== null && msg.role !== 'tool')
|
|
46
|
+
.filter((msg) => msg.content !== null && msg.role !== 'tool')
|
|
48
47
|
.map(({ role, content }) => ({ role, content }));
|
|
49
48
|
}
|
|
50
49
|
if (!includeSystemMessagesInChatHistory) {
|
|
51
|
-
chatHistoryMessages = chatHistoryMessages
|
|
52
|
-
.filter(msg => msg.role !== 'system');
|
|
50
|
+
chatHistoryMessages = chatHistoryMessages.filter((msg) => msg.role !== 'system');
|
|
53
51
|
}
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
52
|
+
const finalMessage = response === null || response === void 0 ? void 0 : response.choices[0].message;
|
|
53
|
+
if (finalMessage) {
|
|
54
|
+
let rootMessage = {
|
|
55
|
+
role: finalMessage.role,
|
|
57
56
|
content: outputStringified,
|
|
58
57
|
};
|
|
59
58
|
chatHistoryMessages.push(rootMessage);
|
|
60
59
|
}
|
|
61
|
-
|
|
60
|
+
for (let i = 0; i < chatHistoryMessages.length; i++) {
|
|
61
|
+
const msg = chatHistoryMessages[i];
|
|
62
|
+
if (msg.role === 'assistant') {
|
|
63
|
+
delete msg.reasoning_details;
|
|
64
|
+
if (!includeReasoningInChatHistory) {
|
|
65
|
+
delete msg.reasoning;
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
outputData.forEach((item) => {
|
|
62
70
|
item.json.chat_history = chatHistoryMessages;
|
|
63
71
|
});
|
|
64
72
|
}
|
|
65
|
-
if (addToOutput.includes(
|
|
66
|
-
outputData.forEach(item => {
|
|
73
|
+
if (addToOutput.includes('request')) {
|
|
74
|
+
outputData.forEach((item) => {
|
|
67
75
|
item.json.request = body;
|
|
68
76
|
});
|
|
69
77
|
}
|
|
70
|
-
if (addToOutput.includes(
|
|
78
|
+
if (addToOutput.includes('modelOverview') && model.includes('/')) {
|
|
71
79
|
await addModelOverview(executeFunctions, model, outputData);
|
|
72
80
|
}
|
|
73
81
|
reorderOutputFields(outputData);
|
|
@@ -84,19 +92,19 @@ async function addModelOverview(executeFunctions, model, outputData) {
|
|
|
84
92
|
item.json.model_overview = modelOverviewResponse;
|
|
85
93
|
}
|
|
86
94
|
catch (error) {
|
|
87
|
-
console.error(
|
|
95
|
+
console.error('Error fetching model endpoints:', error);
|
|
88
96
|
}
|
|
89
97
|
}
|
|
90
98
|
}
|
|
91
99
|
function reorderOutputFields(outputData) {
|
|
92
|
-
outputData.forEach(item => {
|
|
100
|
+
outputData.forEach((item) => {
|
|
93
101
|
const reordered = {
|
|
94
102
|
output: item.json.output,
|
|
95
103
|
request: item.json.request,
|
|
96
104
|
tool_calls: item.json.tool_calls,
|
|
97
105
|
response: item.json.response,
|
|
98
106
|
chat_history: item.json.chat_history,
|
|
99
|
-
model_overview: item.json.model_overview
|
|
107
|
+
model_overview: item.json.model_overview,
|
|
100
108
|
};
|
|
101
109
|
item.json = Object.fromEntries(Object.entries(reordered).filter(([_, value]) => value !== undefined));
|
|
102
110
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"outputProcessor.js","sourceRoot":"","sources":["../../../../nodes/shared/actions/outputProcessor.ts"],"names":[],"mappings":";;AAcA,
|
|
1
|
+
{"version":3,"file":"outputProcessor.js","sourceRoot":"","sources":["../../../../nodes/shared/actions/outputProcessor.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,6 +19,8 @@ export type ExtractedParameters = {
|
|
|
19
19
|
options: IDataObject;
|
|
20
20
|
maxToolsIterations: number;
|
|
21
21
|
customParameters: string;
|
|
22
|
+
saveToolCallsInChatMemory: boolean;
|
|
23
|
+
loadToolCallsFromChatMemory: boolean;
|
|
22
24
|
abortSignal: AbortSignal | undefined;
|
|
23
25
|
};
|
|
24
26
|
export declare function extractParameters(executeFunctions: IExecuteFunctions, index: number): ExtractedParameters;
|
|
@@ -2,12 +2,17 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.extractParameters = extractParameters;
|
|
4
4
|
function extractParameters(executeFunctions, index) {
|
|
5
|
+
var _a, _b;
|
|
5
6
|
const get = (path, defaultValue, options) => executeFunctions.getNodeParameter(path, index, defaultValue, options);
|
|
7
|
+
const rawMessages = get('messagesToSend.values', []);
|
|
8
|
+
const chatMemoryMessage = rawMessages.find((msg) => msg.role === 'chatMemoryRole');
|
|
9
|
+
const saveToolCallsInChatMemory = (_a = chatMemoryMessage === null || chatMemoryMessage === void 0 ? void 0 : chatMemoryMessage.saveToolCallsInChatMemory) !== null && _a !== void 0 ? _a : true;
|
|
10
|
+
const loadToolCallsFromChatMemory = (_b = chatMemoryMessage === null || chatMemoryMessage === void 0 ? void 0 : chatMemoryMessage.loadToolCallsFromChatMemory) !== null && _b !== void 0 ? _b : true;
|
|
6
11
|
const params = {
|
|
7
12
|
model: get('modelId', '', { extractValue: true }),
|
|
8
13
|
fallbackModel: get('options.fallbackModelId', '', { extractValue: true }),
|
|
9
14
|
agentType: get('agentType', 'coreAgent'),
|
|
10
|
-
rawMessagesToSend:
|
|
15
|
+
rawMessagesToSend: rawMessages,
|
|
11
16
|
responseFormat: get('responseFormat', ''),
|
|
12
17
|
addToOutput: get('addToOutput', []),
|
|
13
18
|
outputJsonSchemaDefinition: get('outputJsonSchemaDefinition', ''),
|
|
@@ -21,6 +26,8 @@ function extractParameters(executeFunctions, index) {
|
|
|
21
26
|
options: get('options', {}),
|
|
22
27
|
maxToolsIterations: get('options.maxToolsIterations', 15),
|
|
23
28
|
customParameters: get('options.customParameters', '{}'),
|
|
29
|
+
saveToolCallsInChatMemory,
|
|
30
|
+
loadToolCallsFromChatMemory,
|
|
24
31
|
abortSignal: executeFunctions.getExecutionCancelSignal(),
|
|
25
32
|
};
|
|
26
33
|
return params;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parameters.js","sourceRoot":"","sources":["../../../../nodes/shared/actions/parameters.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"parameters.js","sourceRoot":"","sources":["../../../../nodes/shared/actions/parameters.ts"],"names":[],"mappings":";;AA8BA,8CAyCC;AAzCD,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,CAAY,uBAAuB,EAAE,EAAE,CAAC,CAAC;IAGhE,MAAM,iBAAiB,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,gBAAgB,CAAC,CAAC;IACnF,MAAM,yBAAyB,GAAG,MAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,yBAAyB,mCAAI,IAAI,CAAC;IACvF,MAAM,2BAA2B,GAAG,MAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,2BAA2B,mCAAI,IAAI,CAAC;IAE3F,MAAM,MAAM,GAAwB;QACnC,KAAK,EAAE,GAAG,CAAS,SAAS,EAAE,EAAE,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;QACzD,aAAa,EAAE,GAAG,CAAS,yBAAyB,EAAE,EAAE,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;QACjF,SAAS,EAAE,GAAG,CAAS,WAAW,EAAE,WAAW,CAAC;QAChD,iBAAiB,EAAE,WAAW;QAC9B,cAAc,EAAE,GAAG,CAAS,gBAAgB,EAAE,EAAE,CAAC;QACjD,WAAW,EAAE,GAAG,CAAW,aAAa,EAAE,EAAE,CAAC;QAC7C,0BAA0B,EAAE,GAAG,CAAS,4BAA4B,EAAE,EAAE,CAAC;QACzE,yBAAyB,EAAE,GAAG,CAAU,2BAA2B,EAAE,KAAK,CAAC;QAC3E,0BAA0B,EAAE,GAAG,CAC9B,mCAAmC,EACnC,EAAE,CACF;QACD,oBAAoB,EAAE,GAAG,CAAS,sBAAsB,EAAE,EAAE,CAAC;QAC7D,2BAA2B,EAAE,GAAG,CAAS,6BAA6B,EAAE,EAAE,CAAC;QAC3E,uBAAuB,EAAE,GAAG,CAAU,yBAAyB,EAAE,KAAK,CAAC;QACvE,yBAAyB,EAAE,GAAG,CAAS,2BAA2B,EAAE,EAAE,CAAC;QACvE,gCAAgC,EAAE,GAAG,CAAS,kCAAkC,EAAE,EAAE,CAAC;QACrF,OAAO,EAAE,GAAG,CAAc,SAAS,EAAE,EAAE,CAAC;QACxC,kBAAkB,EAAE,GAAG,CAAS,4BAA4B,EAAE,EAAE,CAAC;QACjE,gBAAgB,EAAE,GAAG,CAAS,0BAA0B,EAAE,IAAI,CAAC;QAC/D,yBAAyB;QACzB,2BAA2B;QAC3B,WAAW,EAAE,gBAAgB,CAAC,wBAAwB,EAAE;KACxD,CAAC;IAEF,OAAO,MAAM,CAAC;AACf,CAAC"}
|
|
@@ -19,7 +19,7 @@ function prepareRequestBody(model, messages, tools, tool_choice, response_format
|
|
|
19
19
|
const cleanOptions = (0, omit_1.default)(options, [
|
|
20
20
|
'customParameters',
|
|
21
21
|
'fallbackModelId',
|
|
22
|
-
'maxToolsIterations'
|
|
22
|
+
'maxToolsIterations',
|
|
23
23
|
]);
|
|
24
24
|
const body = {
|
|
25
25
|
model,
|
|
@@ -28,7 +28,7 @@ function prepareRequestBody(model, messages, tools, tool_choice, response_format
|
|
|
28
28
|
tool_choice,
|
|
29
29
|
response_format,
|
|
30
30
|
...cleanOptions,
|
|
31
|
-
...customParamsObj
|
|
31
|
+
...customParamsObj,
|
|
32
32
|
};
|
|
33
33
|
if (!Array.isArray(messages) || !messages.every(types_1.isValidMessage)) {
|
|
34
34
|
throw new Error("Invalid or missing 'messages' in the request body.");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"requestBuilder.js","sourceRoot":"","sources":["../../../../nodes/shared/actions/requestBuilder.ts"],"names":[],"mappings":";;;;;AAOA,
|
|
1
|
+
{"version":3,"file":"requestBuilder.js","sourceRoot":"","sources":["../../../../nodes/shared/actions/requestBuilder.ts"],"names":[],"mappings":";;;;;AAOA,gDAyCC;AA/CD,uDAAgC;AAChC,4CAAkD;AAKlD,SAAgB,kBAAkB,CACjC,KAAa,EACb,QAAuB,EACvB,KAAY,EACZ,WAA+B,EAC/B,eAAwC,EACxC,OAAoB,EACpB,gBAAwB;IAExB,IAAI,eAAe,GAAgB,EAAE,CAAC;IACtC,IAAI,gBAAgB,IAAI,gBAAgB,CAAC,IAAI,EAAE,EAAE,CAAC;QACjD,IAAI,CAAC;YACJ,eAAe,GAAG,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAgB,CAAC;QAC/D,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;QACrD,CAAC;IACF,CAAC;IAGD,MAAM,YAAY,GAAG,IAAA,cAAK,EAAC,OAAO,EAAE;QACnC,kBAAkB;QAClB,iBAAiB;QACjB,oBAAoB;KACpB,CAAC,CAAC;IAEH,MAAM,IAAI,GAAgB;QACzB,KAAK;QACL,QAAQ;QACR,GAAG,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACtC,WAAW;QACX,eAAe;QACf,GAAG,YAAY;QACf,GAAG,eAAe;KAClB,CAAC;IAGF,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,sBAAc,CAAC,EAAE,CAAC;QACjE,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;IACvE,CAAC;IAED,OAAO,IAAI,CAAC;AACb,CAAC"}
|
|
@@ -14,8 +14,8 @@ function configureResponseFormat(responseFormat, outputJsonSchemaDefinition, str
|
|
|
14
14
|
name: structuredOutputName,
|
|
15
15
|
...(structuredOutputDescription.trim() && { description: structuredOutputDescription }),
|
|
16
16
|
schema: (0, visualEditor_1.convertVisualEditorToSchema)(structuredOutputProperties, structuredOutputIsArray, structuredOutputArrayName, structuredOutputArrayDescription),
|
|
17
|
-
strict: true
|
|
18
|
-
}
|
|
17
|
+
strict: true,
|
|
18
|
+
},
|
|
19
19
|
};
|
|
20
20
|
}
|
|
21
21
|
else if (responseFormat === 'jsonMode') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"responseConfig.js","sourceRoot":"","sources":["../../../../nodes/shared/actions/responseConfig.ts"],"names":[],"mappings":";;AAMA,
|
|
1
|
+
{"version":3,"file":"responseConfig.js","sourceRoot":"","sources":["../../../../nodes/shared/actions/responseConfig.ts"],"names":[],"mappings":";;AAMA,0DAiCC;AAtCD,uDAA2F;AAK3F,SAAgB,uBAAuB,CACtC,cAAsB,EACtB,0BAAkC,EAClC,oBAA4B,EAC5B,2BAAmC,EACnC,0BAAoD,EACpD,uBAAgC,EAChC,yBAAiC,EACjC,gCAAwC;IAExC,IAAI,eAAe,CAAC;IACpB,IAAI,cAAc,KAAK,wBAAwB,EAAE,CAAC;QACjD,eAAe,GAAG,EAAE,IAAI,EAAE,aAAa,EAAE,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,0BAA0B,CAAC,EAAE,CAAC;IAChG,CAAC;SAAM,IAAI,cAAc,KAAK,wBAAwB,EAAE,CAAC;QACxD,eAAe,GAAG;YACjB,IAAI,EAAE,aAAa;YACnB,WAAW,EAAE;gBACZ,IAAI,EAAE,oBAAoB;gBAC1B,GAAG,CAAC,2BAA2B,CAAC,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,2BAA2B,EAAE,CAAC;gBACvF,MAAM,EAAE,IAAA,0CAA2B,EAClC,0BAA0B,EAC1B,uBAAuB,EACvB,yBAAyB,EACzB,gCAAgC,CAChC;gBACD,MAAM,EAAE,IAAI;aACZ;SACD,CAAC;IACH,CAAC;SAAM,IAAI,cAAc,KAAK,UAAU,EAAE,CAAC;QAC1C,eAAe,GAAG,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC;IAC3C,CAAC;IAED,OAAO,eAAe,CAAC;AACxB,CAAC"}
|
|
@@ -50,7 +50,7 @@ function initializeRouter(executeFunctions) {
|
|
|
50
50
|
return {
|
|
51
51
|
returnData: [],
|
|
52
52
|
items: executeFunctions.getInputData(),
|
|
53
|
-
execute: messageOperation.execute
|
|
53
|
+
execute: messageOperation.execute,
|
|
54
54
|
};
|
|
55
55
|
}
|
|
56
56
|
async function executeItem(execute, executeFunctions, itemIndex, parentMessageContentStr = '', parentMessageContentObj = {}) {
|
|
@@ -83,7 +83,7 @@ function handleError(error, executeFunctions, itemIndex, continueOnFail, returnD
|
|
|
83
83
|
if (continueOnFail) {
|
|
84
84
|
returnData.push({
|
|
85
85
|
json: { error: normalizedError.message },
|
|
86
|
-
pairedItem: { item: itemIndex }
|
|
86
|
+
pairedItem: { item: itemIndex },
|
|
87
87
|
});
|
|
88
88
|
return returnData;
|
|
89
89
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router.js","sourceRoot":"","sources":["../../../../nodes/shared/actions/router.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"router.js","sourceRoot":"","sources":["../../../../nodes/shared/actions/router.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool.js","sourceRoot":"","sources":["../../../../nodes/shared/actions/tool.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"tool.js","sourceRoot":"","sources":["../../../../nodes/shared/actions/tool.ts"],"names":[],"mappings":";;AAaA,sCAmEC;AAhFD,+CAQsB;AACtB,iDAAoD;AAEpD,uDAAoD;AAE7C,KAAK,UAAU,aAAa,CAElC,SAAiB;IAGjB,MAAM,IAAI,GAAG,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,SAAS,EAAE,UAAU,CAAW,CAAC;IAC5E,MAAM,WAAW,GAAG,IAAI,CAAC,gBAAgB,CACxC,aAAa,EACb,SAAS,EACT,yBAAyB,CACf,CAAC;IAEZ,MAAM,WAAW,GAAG,KAAK,EAAE,KAA2B,EAAmB,EAAE;QAC1E,MAAM,cAAc,GAAgB,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;QAGlF,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC,kCAAmB,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC,CAAC;QAE9F,IAAI,QAAQ,GAAW,EAAE,CAAC;QAC1B,IAAI,cAA0C,CAAC;QAG/C,IAAI,CAAC;YACJ,MAAM,YAAY,GAAG,IAAI,2BAAY,CAAC,IAAoC,CAAC,CAAC;YAC5E,QAAQ,GAAG,MAAM,YAAY,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC5C,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACzB,cAAc,GAAG,IAAI,iCAAkB,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,KAAuB,CAAC,CAAC;YACjF,QAAQ,GAAG,wBAAwB,cAAc,CAAC,OAAO,GAAG,CAAC;QAC9D,CAAC;QAED,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE,CAAC;YAClC,QAAQ,GAAI,QAAmB,CAAC,QAAQ,EAAE,CAAC;QAC5C,CAAC;QAED,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE,CAAC;YAElC,cAAc,GAAG,IAAI,iCAAkB,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,4BAA4B,EAAE;gBACrF,WAAW,EAAE,0DAA0D,OAAO,QAAQ,EAAE;aACxF,CAAC,CAAC;YACH,QAAQ,GAAG,wBAAwB,cAAc,CAAC,OAAO,GAAG,CAAC;QAC9D,CAAC;QAED,IAAI,cAAc,EAAE,CAAC;YACpB,KAAK,IAAI,CAAC,aAAa,CAAC,kCAAmB,CAAC,MAAM,EAAE,KAAK,EAAE,cAAc,CAAC,CAAC;QAC5E,CAAC;aAAM,CAAC;YACP,KAAK,IAAI,CAAC,aAAa,CAAC,kCAAmB,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;QACxF,CAAC;QAED,OAAO,QAAQ,CAAC;IACjB,CAAC,CAAC;IAGF,MAAM,iBAAiB,GAAG;QACzB,IAAI,EAAE,IAAI;QACV,WAAW,EAAE,WAAW;QACxB,IAAI,EAAE,WAAW;KACjB,CAAC;IAEF,IAAI,IAAI,GAA4B,SAAS,CAAC;IAI9C,IAAI,GAAG,IAAI,mBAAW,CAAC,iBAAiB,CAAC,CAAC;IAE1C,OAAO;QACN,QAAQ,EAAE,IAAI;KACd,CAAC;AACH,CAAC"}
|