@n8n/n8n-nodes-langchain 0.16.0 → 0.17.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/build.tsbuildinfo +1 -1
- package/dist/nodes/agents/Agent/Agent.node.js +7 -6
- package/dist/nodes/agents/Agent/Agent.node.js.map +1 -1
- package/dist/nodes/agents/Agent/agents/ConversationalAgent/execute.d.ts +1 -1
- package/dist/nodes/agents/Agent/agents/ConversationalAgent/execute.js +2 -2
- package/dist/nodes/agents/Agent/agents/ConversationalAgent/execute.js.map +1 -1
- package/dist/nodes/agents/Agent/agents/OpenAiFunctionsAgent/execute.d.ts +1 -1
- package/dist/nodes/agents/Agent/agents/OpenAiFunctionsAgent/execute.js +2 -2
- package/dist/nodes/agents/Agent/agents/OpenAiFunctionsAgent/execute.js.map +1 -1
- package/dist/nodes/agents/Agent/agents/PlanAndExecuteAgent/execute.d.ts +1 -1
- package/dist/nodes/agents/Agent/agents/PlanAndExecuteAgent/execute.js +2 -2
- package/dist/nodes/agents/Agent/agents/PlanAndExecuteAgent/execute.js.map +1 -1
- package/dist/nodes/agents/Agent/agents/ReActAgent/execute.d.ts +1 -1
- package/dist/nodes/agents/Agent/agents/ReActAgent/execute.js +2 -2
- package/dist/nodes/agents/Agent/agents/ReActAgent/execute.js.map +1 -1
- package/dist/nodes/agents/Agent/agents/SqlAgent/execute.d.ts +1 -1
- package/dist/nodes/agents/Agent/agents/SqlAgent/execute.js +1 -1
- package/dist/nodes/agents/Agent/agents/SqlAgent/execute.js.map +1 -1
- package/dist/nodes/agents/OpenAiAssistant/OpenAiAssistant.node.js +4 -2
- package/dist/nodes/agents/OpenAiAssistant/OpenAiAssistant.node.js.map +1 -1
- package/dist/nodes/chains/ChainLLM/ChainLlm.node.js +1 -1
- package/dist/nodes/memory/MemoryManager/MemoryManager.node.d.ts +1 -1
- package/dist/nodes/memory/MemoryManager/MemoryManager.node.js +75 -15
- package/dist/nodes/memory/MemoryManager/MemoryManager.node.js.map +1 -1
- package/dist/nodes/output_parser/OutputParserStructured/OutputParserStructured.node.js +34 -18
- package/dist/nodes/output_parser/OutputParserStructured/OutputParserStructured.node.js.map +1 -1
- package/dist/nodes/vendors/OpenAi/actions/assistant/message.operation.js +3 -1
- package/dist/nodes/vendors/OpenAi/actions/assistant/message.operation.js.map +1 -1
- package/dist/nodes/vendors/OpenAi/actions/text/message.operation.js +11 -1
- package/dist/nodes/vendors/OpenAi/actions/text/message.operation.js.map +1 -1
- package/dist/nodes/vendors/OpenAi/actions/versionDescription.js +2 -2
- package/dist/nodes/vendors/OpenAi/actions/versionDescription.js.map +1 -1
- package/dist/types/nodes.json +30 -30
- package/dist/utils/helpers.d.ts +2 -0
- package/dist/utils/helpers.js +19 -1
- package/dist/utils/helpers.js.map +1 -1
- package/dist/utils/logWrapper.d.ts +1 -1
- package/dist/utils/logWrapper.js +22 -20
- package/dist/utils/logWrapper.js.map +1 -1
- package/dist/utils/sharedFields.js +7 -2
- package/dist/utils/sharedFields.js.map +1 -1
- package/package.json +2 -2
|
@@ -135,7 +135,7 @@ class Agent {
|
|
|
135
135
|
name: 'agent',
|
|
136
136
|
icon: 'fa:robot',
|
|
137
137
|
group: ['transform'],
|
|
138
|
-
version: [1, 1.1, 1.2, 1.3, 1.4],
|
|
138
|
+
version: [1, 1.1, 1.2, 1.3, 1.4, 1.5],
|
|
139
139
|
description: 'Generates an action plan and executes it. Can use external tools.',
|
|
140
140
|
subtitle: "={{ { conversationalAgent: 'Conversational Agent', openAiFunctionsAgent: 'OpenAI Functions Agent', reActAgent: 'ReAct Agent', sqlAgent: 'SQL Agent', planAndExecuteAgent: 'Plan and Execute Agent' }[$parameter.agent] }}",
|
|
141
141
|
defaults: {
|
|
@@ -282,20 +282,21 @@ class Agent {
|
|
|
282
282
|
}
|
|
283
283
|
async execute() {
|
|
284
284
|
const agentType = this.getNodeParameter('agent', 0, '');
|
|
285
|
+
const nodeVersion = this.getNode().typeVersion;
|
|
285
286
|
if (agentType === 'conversationalAgent') {
|
|
286
|
-
return await execute_1.conversationalAgentExecute.call(this);
|
|
287
|
+
return await execute_1.conversationalAgentExecute.call(this, nodeVersion);
|
|
287
288
|
}
|
|
288
289
|
else if (agentType === 'openAiFunctionsAgent') {
|
|
289
|
-
return await execute_2.openAiFunctionsAgentExecute.call(this);
|
|
290
|
+
return await execute_2.openAiFunctionsAgentExecute.call(this, nodeVersion);
|
|
290
291
|
}
|
|
291
292
|
else if (agentType === 'reActAgent') {
|
|
292
|
-
return await execute_4.reActAgentAgentExecute.call(this);
|
|
293
|
+
return await execute_4.reActAgentAgentExecute.call(this, nodeVersion);
|
|
293
294
|
}
|
|
294
295
|
else if (agentType === 'sqlAgent') {
|
|
295
|
-
return await execute_5.sqlAgentAgentExecute.call(this);
|
|
296
|
+
return await execute_5.sqlAgentAgentExecute.call(this, nodeVersion);
|
|
296
297
|
}
|
|
297
298
|
else if (agentType === 'planAndExecuteAgent') {
|
|
298
|
-
return await execute_3.planAndExecuteAgentExecute.call(this);
|
|
299
|
+
return await execute_3.planAndExecuteAgentExecute.call(this, nodeVersion);
|
|
299
300
|
}
|
|
300
301
|
throw new n8n_workflow_1.NodeOperationError(this.getNode(), `The agent type "${agentType}" is not supported`);
|
|
301
302
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Agent.node.js","sourceRoot":"","sources":["../../../../nodes/agents/Agent/Agent.node.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"Agent.node.js","sourceRoot":"","sources":["../../../../nodes/agents/Agent/Agent.node.ts"],"names":[],"mappings":";;;AAAA,+CAAsE;AAUtE,8DAAqE;AACrE,8DAA2E;AAC3E,0EAAyF;AACzF,kEAAkF;AAClF,2EAA2F;AAC3F,mEAAoF;AACpF,0EAAyF;AACzF,kEAAkF;AAClF,iEAA4E;AAC5E,yDAAqE;AACrE,+DAAwE;AACxE,uDAAiE;AAIjE,SAAS,SAAS,CACjB,KAAiF,EACjF,eAAyB;IAQzB,MAAM,YAAY,GAAG,CACpB,MAAsB,EAC6B,EAAE;QACrD,MAAM,YAAY,GAA8B;YAC/C,oBAAoC,EAAE,OAAO;YAC7C,aAA6B,EAAE,QAAQ;YACvC,WAA2B,EAAE,MAAM;YACnC,mBAAmC,EAAE,eAAe;SACpD,CAAC;QAEF,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,EAAE;YAChD,MAAM,KAAK,GAA4B;gBACtC,IAAI;gBACJ,WAAW,EAAE,IAAI,IAAI,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS;gBAClE,QAAQ,EAAE,IAAI,uBAAuC;gBACrD,cAAc,EAAE,iCAAiE,CAAC,QAAQ,CACzF,IAA0B,CAC1B;oBACA,CAAC,CAAC,CAAC;oBACH,CAAC,CAAC,SAAS;aACZ,CAAC;YAEF,IAAI,MAAM,EAAE,CAAC;gBACZ,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC;YACvB,CAAC;YAED,OAAO,KAAK,CAAC;QACd,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC;IAEF,IAAI,aAAa,GAAmB,EAAE,CAAC;IAEvC,IAAI,KAAK,KAAK,qBAAqB,EAAE,CAAC;QACrC,aAAa,GAAG;YACf;gBACC,IAAI,oBAAoC;gBACxC,MAAM,EAAE;oBACP,KAAK,EAAE;wBACN,0CAA0C;wBAC1C,uCAAuC;wBACvC,uCAAuC;wBACvC,2CAA2C;wBAC3C,6CAA6C;wBAC7C,4CAA4C;qBAC5C;iBACD;aACD;YACD;gBACC,IAAI,aAA6B;aACjC;YACD;gBACC,IAAI,WAA2B;aAC/B;YACD;gBACC,IAAI,mBAAmC;aACvC;SACD,CAAC;IACH,CAAC;SAAM,IAAI,KAAK,KAAK,sBAAsB,EAAE,CAAC;QAC7C,aAAa,GAAG;YACf;gBACC,IAAI,oBAAoC;gBACxC,MAAM,EAAE;oBACP,KAAK,EAAE;wBACN,uCAAuC;wBACvC,4CAA4C;qBAC5C;iBACD;aACD;YACD;gBACC,IAAI,aAA6B;aACjC;YACD;gBACC,IAAI,WAA2B;gBAC/B,QAAQ,EAAE,IAAI;aACd;YACD;gBACC,IAAI,mBAAmC;aACvC;SACD,CAAC;IACH,CAAC;SAAM,IAAI,KAAK,KAAK,YAAY,EAAE,CAAC;QACnC,aAAa,GAAG;YACf;gBACC,IAAI,oBAAoC;aACxC;YACD;gBACC,IAAI,WAA2B;aAC/B;YACD;gBACC,IAAI,mBAAmC;aACvC;SACD,CAAC;IACH,CAAC;SAAM,IAAI,KAAK,KAAK,UAAU,EAAE,CAAC;QACjC,aAAa,GAAG;YACf;gBACC,IAAI,oBAAoC;aACxC;YACD;gBACC,IAAI,aAA6B;aACjC;SACD,CAAC;IACH,CAAC;SAAM,IAAI,KAAK,KAAK,qBAAqB,EAAE,CAAC;QAC5C,aAAa,GAAG;YACf;gBACC,IAAI,oBAAoC;aACxC;YACD;gBACC,IAAI,WAA2B;aAC/B;YACD;gBACC,IAAI,mBAAmC;aACvC;SACD,CAAC;IACH,CAAC;IAED,IAAI,eAAe,KAAK,KAAK,EAAE,CAAC;QAC/B,aAAa,GAAG,aAAa,CAAC,MAAM,CACnC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,sBAAsC,CAC3D,CAAC;IACH,CAAC;IACD,OAAO,SAA0B,GAAG,YAAY,CAAC,aAAa,CAAC,CAAC,CAAC;AAClE,CAAC;AAED,MAAa,KAAK;IAAlB;QACC,gBAAW,GAAyB;YACnC,WAAW,EAAE,UAAU;YACvB,IAAI,EAAE,OAAO;YACb,IAAI,EAAE,UAAU;YAChB,KAAK,EAAE,CAAC,WAAW,CAAC;YACpB,OAAO,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;YACrC,WAAW,EAAE,mEAAmE;YAChF,QAAQ,EACP,2NAA2N;YAC5N,QAAQ,EAAE;gBACT,IAAI,EAAE,UAAU;gBAChB,KAAK,EAAE,SAAS;aAChB;YACD,KAAK,EAAE;gBACN,KAAK,EAAE,CAAC,WAAW,CAAC;gBACpB,UAAU,EAAE,CAAC,IAAI,CAAC;gBAClB,aAAa,EAAE;oBACd,EAAE,EAAE,CAAC,QAAQ,CAAC;iBACd;gBACD,SAAS,EAAE;oBACV,oBAAoB,EAAE;wBACrB;4BACC,GAAG,EAAE,8FAA8F;yBACnG;qBACD;iBACD;aACD;YACD,MAAM,EAAE;;MAEJ,SAAS,CAAC,QAAQ,EAAE;;;KAGrB;YACH,OAAO,EAAE,QAAyB;YAClC,WAAW,EAAE;gBACZ;oBAEC,IAAI,EAAE,OAAO;oBACb,QAAQ,EAAE,IAAI;oBACd,QAAQ,EAAE,qBAAqB;oBAC/B,cAAc,EAAE;wBACf,IAAI,EAAE;4BACL,KAAK,EAAE,CAAC,UAAU,CAAC;4BACnB,aAAa,EAAE,CAAC,OAAO,CAAC;yBACxB;qBACD;iBACD;gBACD;oBACC,IAAI,EAAE,UAAU;oBAChB,QAAQ,EAAE,IAAI;oBACd,cAAc,EAAE;wBACf,IAAI,EAAE;4BACL,KAAK,EAAE,CAAC,UAAU,CAAC;4BACnB,aAAa,EAAE,CAAC,UAAU,CAAC;yBAC3B;qBACD;iBACD;aACD;YACD,UAAU,EAAE;gBACX;oBACC,GAAG,IAAA,qCAAsB,EAAC,IAAI,CAAC;oBAC/B,cAAc,EAAE;wBACf,IAAI,EAAE;4BACL,KAAK,EAAE,CAAC,qBAAqB,CAAC;yBAC9B;qBACD;iBACD;gBACD;oBACC,WAAW,EAAE,OAAO;oBACpB,IAAI,EAAE,OAAO;oBACb,IAAI,EAAE,SAAS;oBACf,gBAAgB,EAAE,IAAI;oBACtB,OAAO,EAAE;wBACR;4BACC,IAAI,EAAE,sBAAsB;4BAC5B,KAAK,EAAE,qBAAqB;4BAC5B,WAAW,EACV,uFAAuF;yBACxF;wBACD;4BACC,IAAI,EAAE,wBAAwB;4BAC9B,KAAK,EAAE,sBAAsB;4BAC7B,WAAW,EACV,uGAAuG;yBACxG;wBACD;4BACC,IAAI,EAAE,wBAAwB;4BAC9B,KAAK,EAAE,qBAAqB;4BAC5B,WAAW,EACV,4GAA4G;yBAC7G;wBACD;4BACC,IAAI,EAAE,aAAa;4BACnB,KAAK,EAAE,YAAY;4BACnB,WAAW,EAAE,uDAAuD;yBACpE;wBACD;4BACC,IAAI,EAAE,WAAW;4BACjB,KAAK,EAAE,UAAU;4BACjB,WAAW,EAAE,iDAAiD;yBAC9D;qBACD;oBACD,OAAO,EAAE,qBAAqB;iBAC9B;gBACD;oBACC,GAAG,gCAAiB;oBACpB,cAAc,EAAE;wBACf,IAAI,EAAE;4BACL,UAAU,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC;4BACpC,KAAK,EAAE,CAAC,UAAU,CAAC;yBACnB;qBACD;iBACD;gBACD;oBACC,GAAG,wBAAS;oBACZ,cAAc,EAAE;wBACf,IAAI,EAAE;4BACL,UAAU,EAAE,CAAC,QAAQ,CAAC;yBACtB;wBACD,IAAI,EAAE;4BACL,KAAK,EAAE,CAAC,UAAU,CAAC;yBACnB;qBACD;iBACD;gBACD;oBACC,WAAW,EAAE,gCAAgC;oBAC7C,IAAI,EAAE,iBAAiB;oBACvB,IAAI,EAAE,SAAS;oBACf,OAAO,EAAE,KAAK;oBACd,cAAc,EAAE;wBACf,IAAI,EAAE;4BACL,UAAU,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC;4BACpC,KAAK,EAAE,CAAC,UAAU,CAAC;yBACnB;qBACD;iBACD;gBACD;oBACC,WAAW,EAAE,8FAA8F,iBAAiC,4EAA4E;oBACxN,IAAI,EAAE,QAAQ;oBACd,IAAI,EAAE,QAAQ;oBACd,OAAO,EAAE,EAAE;oBACX,cAAc,EAAE;wBACf,IAAI,EAAE;4BACL,eAAe,EAAE,CAAC,IAAI,CAAC;yBACvB;qBACD;iBACD;gBAED,GAAG,2CAA6B;gBAChC,GAAG,4CAA8B;gBACjC,GAAG,uCAAyB;gBAC5B,GAAG,qCAAuB;gBAC1B,GAAG,2CAA6B;aAChC;SACD,CAAC;IAoBH,CAAC;IAlBA,KAAK,CAAC,OAAO;QACZ,MAAM,SAAS,GAAG,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,CAAC,EAAE,EAAE,CAAW,CAAC;QAClE,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC,WAAW,CAAC;QAE/C,IAAI,SAAS,KAAK,qBAAqB,EAAE,CAAC;YACzC,OAAO,MAAM,oCAA0B,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QACjE,CAAC;aAAM,IAAI,SAAS,KAAK,sBAAsB,EAAE,CAAC;YACjD,OAAO,MAAM,qCAA2B,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAClE,CAAC;aAAM,IAAI,SAAS,KAAK,YAAY,EAAE,CAAC;YACvC,OAAO,MAAM,gCAAsB,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAC7D,CAAC;aAAM,IAAI,SAAS,KAAK,UAAU,EAAE,CAAC;YACrC,OAAO,MAAM,8BAAoB,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAC3D,CAAC;aAAM,IAAI,SAAS,KAAK,qBAAqB,EAAE,CAAC;YAChD,OAAO,MAAM,oCAA0B,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QACjE,CAAC;QAED,MAAM,IAAI,iCAAkB,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,mBAAmB,SAAS,oBAAoB,CAAC,CAAC;IAChG,CAAC;CACD;AA/KD,sBA+KC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import { type IExecuteFunctions, type INodeExecutionData } from 'n8n-workflow';
|
|
2
|
-
export declare function conversationalAgentExecute(this: IExecuteFunctions): Promise<INodeExecutionData[][]>;
|
|
2
|
+
export declare function conversationalAgentExecute(this: IExecuteFunctions, nodeVersion: number): Promise<INodeExecutionData[][]>;
|
|
@@ -6,7 +6,7 @@ const agents_1 = require("langchain/agents");
|
|
|
6
6
|
const prompts_1 = require("langchain/prompts");
|
|
7
7
|
const output_parsers_1 = require("langchain/output_parsers");
|
|
8
8
|
const helpers_1 = require("../../../../../utils/helpers");
|
|
9
|
-
async function conversationalAgentExecute() {
|
|
9
|
+
async function conversationalAgentExecute(nodeVersion) {
|
|
10
10
|
var _a;
|
|
11
11
|
this.logger.verbose('Executing Conversational Agent');
|
|
12
12
|
const model = await this.getInputConnectionData("ai_languageModel", 0);
|
|
@@ -14,7 +14,7 @@ async function conversationalAgentExecute() {
|
|
|
14
14
|
throw new n8n_workflow_1.NodeOperationError(this.getNode(), 'Conversational Agent requires Chat Model');
|
|
15
15
|
}
|
|
16
16
|
const memory = (await this.getInputConnectionData("ai_memory", 0));
|
|
17
|
-
const tools =
|
|
17
|
+
const tools = await (0, helpers_1.getConnectedTools)(this, nodeVersion >= 1.5);
|
|
18
18
|
const outputParsers = await (0, helpers_1.getOptionalOutputParsers)(this);
|
|
19
19
|
const options = this.getNodeParameter('options', 0, {});
|
|
20
20
|
const agentExecutor = await (0, agents_1.initializeAgentExecutorWithOptions)(tools, model, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../../../../nodes/agents/Agent/agents/ConversationalAgent/execute.ts"],"names":[],"mappings":";;;AAAA,+CAKsB;AAEtB,6CAAsE;
|
|
1
|
+
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../../../../nodes/agents/Agent/agents/ConversationalAgent/execute.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import { type IExecuteFunctions, type INodeExecutionData } from 'n8n-workflow';
|
|
2
|
-
export declare function openAiFunctionsAgentExecute(this: IExecuteFunctions): Promise<INodeExecutionData[][]>;
|
|
2
|
+
export declare function openAiFunctionsAgentExecute(this: IExecuteFunctions, nodeVersion: number): Promise<INodeExecutionData[][]>;
|
|
@@ -8,7 +8,7 @@ const output_parsers_1 = require("langchain/output_parsers");
|
|
|
8
8
|
const memory_1 = require("langchain/memory");
|
|
9
9
|
const openai_1 = require("langchain/chat_models/openai");
|
|
10
10
|
const helpers_1 = require("../../../../../utils/helpers");
|
|
11
|
-
async function openAiFunctionsAgentExecute() {
|
|
11
|
+
async function openAiFunctionsAgentExecute(nodeVersion) {
|
|
12
12
|
var _a;
|
|
13
13
|
this.logger.verbose('Executing OpenAi Functions Agent');
|
|
14
14
|
const model = (await this.getInputConnectionData("ai_languageModel", 0));
|
|
@@ -16,7 +16,7 @@ async function openAiFunctionsAgentExecute() {
|
|
|
16
16
|
throw new n8n_workflow_1.NodeOperationError(this.getNode(), 'OpenAI Functions Agent requires OpenAI Chat Model');
|
|
17
17
|
}
|
|
18
18
|
const memory = (await this.getInputConnectionData("ai_memory", 0));
|
|
19
|
-
const tools =
|
|
19
|
+
const tools = await (0, helpers_1.getConnectedTools)(this, nodeVersion >= 1.5);
|
|
20
20
|
const outputParsers = await (0, helpers_1.getOptionalOutputParsers)(this);
|
|
21
21
|
const options = this.getNodeParameter('options', 0, {});
|
|
22
22
|
const agentConfig = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../../../../nodes/agents/Agent/agents/OpenAiFunctionsAgent/execute.ts"],"names":[],"mappings":";;;AAAA,+CAKsB;AAGtB,6CAA8D;
|
|
1
|
+
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../../../../nodes/agents/Agent/agents/OpenAiFunctionsAgent/execute.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import { type IExecuteFunctions, type INodeExecutionData } from 'n8n-workflow';
|
|
2
|
-
export declare function planAndExecuteAgentExecute(this: IExecuteFunctions): Promise<INodeExecutionData[][]>;
|
|
2
|
+
export declare function planAndExecuteAgentExecute(this: IExecuteFunctions, nodeVersion: number): Promise<INodeExecutionData[][]>;
|
|
@@ -6,10 +6,10 @@ const prompts_1 = require("langchain/prompts");
|
|
|
6
6
|
const output_parsers_1 = require("langchain/output_parsers");
|
|
7
7
|
const plan_and_execute_1 = require("langchain/experimental/plan_and_execute");
|
|
8
8
|
const helpers_1 = require("../../../../../utils/helpers");
|
|
9
|
-
async function planAndExecuteAgentExecute() {
|
|
9
|
+
async function planAndExecuteAgentExecute(nodeVersion) {
|
|
10
10
|
this.logger.verbose('Executing PlanAndExecute Agent');
|
|
11
11
|
const model = (await this.getInputConnectionData("ai_languageModel", 0));
|
|
12
|
-
const tools =
|
|
12
|
+
const tools = await (0, helpers_1.getConnectedTools)(this, nodeVersion >= 1.5);
|
|
13
13
|
const outputParsers = await (0, helpers_1.getOptionalOutputParsers)(this);
|
|
14
14
|
const options = this.getNodeParameter('options', 0, {});
|
|
15
15
|
const agentExecutor = await plan_and_execute_1.PlanAndExecuteAgentExecutor.fromLLMAndTools({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../../../../nodes/agents/Agent/agents/PlanAndExecuteAgent/execute.ts"],"names":[],"mappings":";;;AAAA,+CAKsB;
|
|
1
|
+
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../../../../nodes/agents/Agent/agents/PlanAndExecuteAgent/execute.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import { type IExecuteFunctions, type INodeExecutionData } from 'n8n-workflow';
|
|
2
|
-
export declare function reActAgentAgentExecute(this: IExecuteFunctions): Promise<INodeExecutionData[][]>;
|
|
2
|
+
export declare function reActAgentAgentExecute(this: IExecuteFunctions, nodeVersion: number): Promise<INodeExecutionData[][]>;
|
|
@@ -6,10 +6,10 @@ const agents_1 = require("langchain/agents");
|
|
|
6
6
|
const prompts_1 = require("langchain/prompts");
|
|
7
7
|
const output_parsers_1 = require("langchain/output_parsers");
|
|
8
8
|
const helpers_1 = require("../../../../../utils/helpers");
|
|
9
|
-
async function reActAgentAgentExecute() {
|
|
9
|
+
async function reActAgentAgentExecute(nodeVersion) {
|
|
10
10
|
this.logger.verbose('Executing ReAct Agent');
|
|
11
11
|
const model = (await this.getInputConnectionData("ai_languageModel", 0));
|
|
12
|
-
const tools =
|
|
12
|
+
const tools = await (0, helpers_1.getConnectedTools)(this, nodeVersion >= 1.5);
|
|
13
13
|
const outputParsers = await (0, helpers_1.getOptionalOutputParsers)(this);
|
|
14
14
|
const options = this.getNodeParameter('options', 0, {});
|
|
15
15
|
let agent;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../../../../nodes/agents/Agent/agents/ReActAgent/execute.ts"],"names":[],"mappings":";;;AAAA,+CAKsB;AAEtB,6CAA2E;
|
|
1
|
+
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../../../../nodes/agents/Agent/agents/ReActAgent/execute.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import { type IExecuteFunctions, type INodeExecutionData } from 'n8n-workflow';
|
|
2
|
-
export declare function sqlAgentAgentExecute(this: IExecuteFunctions): Promise<INodeExecutionData[][]>;
|
|
2
|
+
export declare function sqlAgentAgentExecute(this: IExecuteFunctions, nodeVersion: number): Promise<INodeExecutionData[][]>;
|
|
@@ -13,7 +13,7 @@ const parseTablesString = (tablesString) => tablesString
|
|
|
13
13
|
.split(',')
|
|
14
14
|
.map((table) => table.trim())
|
|
15
15
|
.filter((table) => table.length > 0);
|
|
16
|
-
async function sqlAgentAgentExecute() {
|
|
16
|
+
async function sqlAgentAgentExecute(nodeVersion) {
|
|
17
17
|
var _a, _b, _c, _d, _e, _f;
|
|
18
18
|
this.logger.verbose('Executing SQL Agent');
|
|
19
19
|
const model = (await this.getInputConnectionData("ai_languageModel", 0));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../../../../nodes/agents/Agent/agents/SqlAgent/execute.ts"],"names":[],"mappings":";;;AAAA,+CAKsB;AAEtB,6CAA+C;AAE/C,uDAA2E;AAK3E,0DAA0F;AAC1F,oDAA8D;AAC9D,wDAAkE;AAClE,6CAAyD;AACzD,kDAA4D;AAE5D,MAAM,iBAAiB,GAAG,CAAC,YAAoB,EAAE,EAAE,CAClD,YAAY;KACV,KAAK,CAAC,GAAG,CAAC;KACV,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;KAC5B,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;AAEhC,KAAK,UAAU,oBAAoB;;
|
|
1
|
+
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../../../../nodes/agents/Agent/agents/SqlAgent/execute.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@ const agents_1 = require("langchain/agents");
|
|
|
5
5
|
const openai_1 = require("openai");
|
|
6
6
|
const openai_assistant_1 = require("langchain/experimental/openai_assistant");
|
|
7
7
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
8
|
+
const helpers_1 = require("../../../utils/helpers");
|
|
8
9
|
const utils_1 = require("./utils");
|
|
9
10
|
class OpenAiAssistant {
|
|
10
11
|
constructor() {
|
|
@@ -14,7 +15,7 @@ class OpenAiAssistant {
|
|
|
14
15
|
hidden: true,
|
|
15
16
|
icon: 'fa:robot',
|
|
16
17
|
group: ['transform'],
|
|
17
|
-
version: 1,
|
|
18
|
+
version: [1, 1.1],
|
|
18
19
|
description: 'Utilizes Assistant API from Open AI.',
|
|
19
20
|
subtitle: 'Open AI Assistant',
|
|
20
21
|
defaults: {
|
|
@@ -302,7 +303,8 @@ class OpenAiAssistant {
|
|
|
302
303
|
}
|
|
303
304
|
async execute() {
|
|
304
305
|
var _a, _b, _c, _d;
|
|
305
|
-
const
|
|
306
|
+
const nodeVersion = this.getNode().typeVersion;
|
|
307
|
+
const tools = await (0, helpers_1.getConnectedTools)(this, nodeVersion > 1);
|
|
306
308
|
const credentials = await this.getCredentials('openAiApi');
|
|
307
309
|
const items = this.getInputData();
|
|
308
310
|
const returnData = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OpenAiAssistant.node.js","sourceRoot":"","sources":["../../../../nodes/agents/OpenAiAssistant/OpenAiAssistant.node.ts"],"names":[],"mappings":";;;AAAA,6CAAiD;AACjD,mCAAgD;AAChD,8EAAkF;
|
|
1
|
+
{"version":3,"file":"OpenAiAssistant.node.js","sourceRoot":"","sources":["../../../../nodes/agents/OpenAiAssistant/OpenAiAssistant.node.ts"],"names":[],"mappings":"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"}
|
|
@@ -389,7 +389,7 @@ class ChainLlm {
|
|
|
389
389
|
const outputParsers = await (0, helpers_1.getOptionalOutputParsers)(this);
|
|
390
390
|
for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
|
|
391
391
|
let prompt;
|
|
392
|
-
if (this.getNode().typeVersion <= 1.
|
|
392
|
+
if (this.getNode().typeVersion <= 1.3) {
|
|
393
393
|
prompt = this.getNodeParameter('prompt', itemIndex);
|
|
394
394
|
}
|
|
395
395
|
else {
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import type { IExecuteFunctions, INodeExecutionData, INodeType, INodeTypeDescription } from 'n8n-workflow';
|
|
2
2
|
export declare class MemoryManager implements INodeType {
|
|
3
3
|
description: INodeTypeDescription;
|
|
4
4
|
execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]>;
|
|
@@ -18,6 +18,25 @@ function simplifyMessages(messages) {
|
|
|
18
18
|
});
|
|
19
19
|
return transformedMessages;
|
|
20
20
|
}
|
|
21
|
+
const prepareOutputSetup = (ctx, version, memory) => {
|
|
22
|
+
if (version === 1) {
|
|
23
|
+
return async (i) => {
|
|
24
|
+
var _a;
|
|
25
|
+
const messages = await memory.chatHistory.getMessages();
|
|
26
|
+
const serializedMessages = (_a = messages === null || messages === void 0 ? void 0 : messages.map((message) => message.toJSON())) !== null && _a !== void 0 ? _a : [];
|
|
27
|
+
const executionData = ctx.helpers.constructExecutionMetaData(ctx.helpers.returnJsonArray(serializedMessages), { itemData: { item: i } });
|
|
28
|
+
return executionData;
|
|
29
|
+
};
|
|
30
|
+
}
|
|
31
|
+
return async (i) => {
|
|
32
|
+
return [
|
|
33
|
+
{
|
|
34
|
+
json: { success: true },
|
|
35
|
+
pairedItem: { item: i },
|
|
36
|
+
},
|
|
37
|
+
];
|
|
38
|
+
};
|
|
39
|
+
};
|
|
21
40
|
class MemoryManager {
|
|
22
41
|
constructor() {
|
|
23
42
|
this.description = {
|
|
@@ -25,7 +44,7 @@ class MemoryManager {
|
|
|
25
44
|
name: 'memoryManager',
|
|
26
45
|
icon: 'fa:database',
|
|
27
46
|
group: ['transform'],
|
|
28
|
-
version: 1,
|
|
47
|
+
version: [1, 1.1],
|
|
29
48
|
description: 'Manage chat messages memory and use it in the workflow',
|
|
30
49
|
defaults: {
|
|
31
50
|
name: 'Chat Memory Manager',
|
|
@@ -220,17 +239,40 @@ class MemoryManager {
|
|
|
220
239
|
},
|
|
221
240
|
},
|
|
222
241
|
},
|
|
242
|
+
{
|
|
243
|
+
displayName: 'Options',
|
|
244
|
+
name: 'options',
|
|
245
|
+
placeholder: 'Add Option',
|
|
246
|
+
type: 'collection',
|
|
247
|
+
default: {},
|
|
248
|
+
options: [
|
|
249
|
+
{
|
|
250
|
+
displayName: 'Group Messages',
|
|
251
|
+
name: 'groupMessages',
|
|
252
|
+
type: 'boolean',
|
|
253
|
+
default: true,
|
|
254
|
+
description: 'Whether to group messages into a single item or return each message as a separate item',
|
|
255
|
+
},
|
|
256
|
+
],
|
|
257
|
+
displayOptions: {
|
|
258
|
+
show: {
|
|
259
|
+
mode: ['load'],
|
|
260
|
+
},
|
|
261
|
+
},
|
|
262
|
+
},
|
|
223
263
|
],
|
|
224
264
|
};
|
|
225
265
|
}
|
|
226
266
|
async execute() {
|
|
227
267
|
var _a;
|
|
228
|
-
const
|
|
268
|
+
const nodeVersion = this.getNode().typeVersion;
|
|
229
269
|
const items = this.getInputData();
|
|
230
|
-
const
|
|
270
|
+
const mode = this.getNodeParameter('mode', 0, 'load');
|
|
271
|
+
const memory = (await this.getInputConnectionData("ai_memory", 0));
|
|
272
|
+
const prepareOutput = prepareOutputSetup(this, nodeVersion, memory);
|
|
273
|
+
const returnData = [];
|
|
231
274
|
for (let i = 0; i < items.length; i++) {
|
|
232
|
-
const
|
|
233
|
-
let messages = [...(await memory.chatHistory.getMessages())];
|
|
275
|
+
const messages = await memory.chatHistory.getMessages();
|
|
234
276
|
if (mode === 'delete') {
|
|
235
277
|
const deleteMode = this.getNodeParameter('deleteMode', i);
|
|
236
278
|
if (deleteMode === 'lastN') {
|
|
@@ -246,6 +288,7 @@ class MemoryManager {
|
|
|
246
288
|
else {
|
|
247
289
|
await memory.chatHistory.clear();
|
|
248
290
|
}
|
|
291
|
+
returnData.push(...(await prepareOutput(i)));
|
|
249
292
|
}
|
|
250
293
|
if (mode === 'insert') {
|
|
251
294
|
const insertMode = this.getNodeParameter('insertMode', i);
|
|
@@ -265,19 +308,36 @@ class MemoryManager {
|
|
|
265
308
|
}
|
|
266
309
|
await memory.chatHistory.addMessage(MessageClass);
|
|
267
310
|
}
|
|
311
|
+
returnData.push(...(await prepareOutput(i)));
|
|
268
312
|
}
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
313
|
+
if (mode === 'load') {
|
|
314
|
+
const simplifyOutput = this.getNodeParameter('simplifyOutput', i, false);
|
|
315
|
+
const options = this.getNodeParameter('options', i);
|
|
316
|
+
if (simplifyOutput && messages.length && nodeVersion === 1) {
|
|
317
|
+
const groupMessages = options.groupMessages;
|
|
318
|
+
const output = simplifyMessages(messages);
|
|
319
|
+
return [
|
|
320
|
+
this.helpers.constructExecutionMetaData(this.helpers.returnJsonArray(groupMessages ? [{ messages: output, messagesCount: output.length }] : output), { itemData: { item: i } }),
|
|
321
|
+
];
|
|
322
|
+
}
|
|
323
|
+
let groupMessages = true;
|
|
324
|
+
if (options.groupMessages === false) {
|
|
325
|
+
groupMessages = false;
|
|
326
|
+
}
|
|
327
|
+
if (options.groupMessages === undefined && nodeVersion === 1) {
|
|
328
|
+
groupMessages = false;
|
|
329
|
+
}
|
|
330
|
+
let output = (_a = (simplifyOutput
|
|
331
|
+
? simplifyMessages(messages)
|
|
332
|
+
: messages === null || messages === void 0 ? void 0 : messages.map((message) => message.toJSON()))) !== null && _a !== void 0 ? _a : [];
|
|
333
|
+
if (groupMessages) {
|
|
334
|
+
output = [{ messages: output, messagesCount: output.length }];
|
|
335
|
+
}
|
|
336
|
+
const executionData = this.helpers.constructExecutionMetaData(this.helpers.returnJsonArray(output), { itemData: { item: i } });
|
|
337
|
+
returnData.push(...executionData);
|
|
275
338
|
}
|
|
276
|
-
const serializedMessages = (_a = messages === null || messages === void 0 ? void 0 : messages.map((message) => message.toJSON())) !== null && _a !== void 0 ? _a : [];
|
|
277
|
-
const executionData = this.helpers.constructExecutionMetaData(this.helpers.returnJsonArray(serializedMessages), { itemData: { item: i } });
|
|
278
|
-
result.push(...executionData);
|
|
279
339
|
}
|
|
280
|
-
return
|
|
340
|
+
return [returnData];
|
|
281
341
|
}
|
|
282
342
|
}
|
|
283
343
|
exports.MemoryManager = MemoryManager;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MemoryManager.node.js","sourceRoot":"","sources":["../../../../nodes/memory/MemoryManager/MemoryManager.node.ts"],"names":[],"mappings":";;;AAUA,6CAA4F;AAS5F,SAAS,gBAAgB,CAAC,QAAuB;IAChD,MAAM,eAAe,GAAG,EAAE,CAAC;IAC3B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;QAC7C,eAAe,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IACtD,CAAC;IAED,MAAM,mBAAmB,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;QAC5D,MAAM,UAAU,GAAG;YAClB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO;SAC7C,CAAC;QAEF,IAAI,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;YACjB,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;QAC1D,CAAC;QAED,OAAO,UAAU,CAAC;IACnB,CAAC,CAAC,CAAC;IACH,OAAO,mBAAmB,CAAC;AAC5B,CAAC;AAED,MAAa,aAAa;IAA1B;QACC,gBAAW,GAAyB;YACnC,WAAW,EAAE,qBAAqB;YAClC,IAAI,EAAE,eAAe;YACrB,IAAI,EAAE,aAAa;YACnB,KAAK,EAAE,CAAC,WAAW,CAAC;YACpB,OAAO,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"MemoryManager.node.js","sourceRoot":"","sources":["../../../../nodes/memory/MemoryManager/MemoryManager.node.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,25 +26,33 @@ class N8nStructuredOutputParser extends output_parsers_1.StructuredOutputParser
|
|
|
26
26
|
throw new output_parser_1.OutputParserException(`Failed to parse. Text: "${text}". Error: ${e}`, text);
|
|
27
27
|
}
|
|
28
28
|
}
|
|
29
|
-
static fromZedJsonSchema(schema) {
|
|
29
|
+
static fromZedJsonSchema(schema, nodeVersion) {
|
|
30
30
|
const { description, ...restOfSchema } = schema;
|
|
31
31
|
const zodSchemaString = (0, json_schema_to_zod_1.parseSchema)(restOfSchema);
|
|
32
32
|
const itemSchema = new Function('z', `return (${zodSchemaString})`)(zod_1.z);
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
[
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
33
|
+
let returnSchema;
|
|
34
|
+
if (nodeVersion === 1) {
|
|
35
|
+
returnSchema = zod_1.z.object({
|
|
36
|
+
[STRUCTURED_OUTPUT_KEY]: zod_1.z
|
|
37
|
+
.object({
|
|
38
|
+
[STRUCTURED_OUTPUT_OBJECT_KEY]: itemSchema.optional(),
|
|
39
|
+
[STRUCTURED_OUTPUT_ARRAY_KEY]: zod_1.z.array(itemSchema).optional(),
|
|
40
|
+
})
|
|
41
|
+
.describe(`Wrapper around the output data. It can only contain ${STRUCTURED_OUTPUT_OBJECT_KEY} or ${STRUCTURED_OUTPUT_ARRAY_KEY} but never both.`)
|
|
42
|
+
.refine((data) => {
|
|
43
|
+
return (Boolean(data[STRUCTURED_OUTPUT_OBJECT_KEY]) !==
|
|
44
|
+
Boolean(data[STRUCTURED_OUTPUT_ARRAY_KEY]));
|
|
45
|
+
}, {
|
|
46
|
+
message: 'One and only one of __structured__output__object and __structured__output__array should be present.',
|
|
47
|
+
path: [STRUCTURED_OUTPUT_KEY],
|
|
48
|
+
}),
|
|
49
|
+
});
|
|
50
|
+
}
|
|
51
|
+
else {
|
|
52
|
+
returnSchema = zod_1.z.object({
|
|
53
|
+
output: itemSchema.optional(),
|
|
54
|
+
});
|
|
55
|
+
}
|
|
48
56
|
return N8nStructuredOutputParser.fromZodSchema(returnSchema);
|
|
49
57
|
}
|
|
50
58
|
}
|
|
@@ -55,7 +63,8 @@ class OutputParserStructured {
|
|
|
55
63
|
name: 'outputParserStructured',
|
|
56
64
|
icon: 'fa:code',
|
|
57
65
|
group: ['transform'],
|
|
58
|
-
version: 1,
|
|
66
|
+
version: [1, 1.1],
|
|
67
|
+
defaultVersion: 1.1,
|
|
59
68
|
description: 'Return data in a defined JSON format',
|
|
60
69
|
defaults: {
|
|
61
70
|
name: 'Structured Output Parser',
|
|
@@ -117,11 +126,18 @@ class OutputParserStructured {
|
|
|
117
126
|
let itemSchema;
|
|
118
127
|
try {
|
|
119
128
|
itemSchema = (0, n8n_workflow_1.jsonParse)(schema);
|
|
129
|
+
if (itemSchema.type === undefined) {
|
|
130
|
+
itemSchema = {
|
|
131
|
+
type: 'object',
|
|
132
|
+
properties: itemSchema.properties || itemSchema,
|
|
133
|
+
};
|
|
134
|
+
}
|
|
120
135
|
}
|
|
121
136
|
catch (error) {
|
|
122
137
|
throw new n8n_workflow_1.NodeOperationError(this.getNode(), 'Error during parsing of JSON Schema.');
|
|
123
138
|
}
|
|
124
|
-
const
|
|
139
|
+
const nodeVersion = this.getNode().typeVersion;
|
|
140
|
+
const parser = N8nStructuredOutputParser.fromZedJsonSchema(itemSchema, nodeVersion);
|
|
125
141
|
return {
|
|
126
142
|
response: (0, logWrapper_1.logWrapper)(parser, this),
|
|
127
143
|
};
|