@n8n/n8n-nodes-langchain 1.42.0 → 1.43.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/build.tsbuildinfo +1 -1
- package/dist/nodes/agents/Agent/agents/ConversationalAgent/execute.js +2 -0
- package/dist/nodes/agents/Agent/agents/ConversationalAgent/execute.js.map +1 -1
- package/dist/nodes/agents/Agent/agents/PlanAndExecuteAgent/execute.js +2 -0
- package/dist/nodes/agents/Agent/agents/PlanAndExecuteAgent/execute.js.map +1 -1
- package/dist/nodes/agents/Agent/agents/ReActAgent/execute.js +2 -0
- package/dist/nodes/agents/Agent/agents/ReActAgent/execute.js.map +1 -1
- package/dist/nodes/code/Code.node.js +1 -0
- package/dist/nodes/code/Code.node.js.map +1 -1
- package/dist/nodes/output_parser/OutputParserStructured/OutputParserStructured.node.d.ts +1 -1
- package/dist/nodes/output_parser/OutputParserStructured/OutputParserStructured.node.js +51 -48
- package/dist/nodes/output_parser/OutputParserStructured/OutputParserStructured.node.js.map +1 -1
- package/dist/nodes/tools/ToolWorkflow/ToolWorkflow.node.js +74 -35
- package/dist/nodes/tools/ToolWorkflow/ToolWorkflow.node.js.map +1 -1
- package/dist/nodes/vendors/OpenAi/actions/assistant/create.operation.d.ts +1 -1
- package/dist/nodes/vendors/OpenAi/actions/assistant/create.operation.js +36 -4
- package/dist/nodes/vendors/OpenAi/actions/assistant/create.operation.js.map +1 -1
- package/dist/nodes/vendors/OpenAi/actions/assistant/deleteAssistant.operation.d.ts +1 -1
- package/dist/nodes/vendors/OpenAi/actions/assistant/deleteAssistant.operation.js +1 -1
- package/dist/nodes/vendors/OpenAi/actions/assistant/list.operation.d.ts +1 -1
- package/dist/nodes/vendors/OpenAi/actions/assistant/list.operation.js +1 -1
- package/dist/nodes/vendors/OpenAi/actions/assistant/message.operation.d.ts +1 -1
- package/dist/nodes/vendors/OpenAi/actions/assistant/message.operation.js +35 -3
- package/dist/nodes/vendors/OpenAi/actions/assistant/message.operation.js.map +1 -1
- package/dist/nodes/vendors/OpenAi/actions/assistant/update.operation.d.ts +1 -1
- package/dist/nodes/vendors/OpenAi/actions/assistant/update.operation.js +43 -8
- package/dist/nodes/vendors/OpenAi/actions/assistant/update.operation.js.map +1 -1
- package/dist/nodes/vendors/OpenAi/actions/audio/generate.operation.d.ts +1 -1
- package/dist/nodes/vendors/OpenAi/actions/audio/transcribe.operation.d.ts +1 -1
- package/dist/nodes/vendors/OpenAi/actions/audio/translate.operation.d.ts +1 -1
- package/dist/nodes/vendors/OpenAi/actions/file/deleteFile.operation.d.ts +1 -1
- package/dist/nodes/vendors/OpenAi/actions/file/list.operation.d.ts +1 -1
- package/dist/nodes/vendors/OpenAi/actions/file/upload.operation.d.ts +1 -1
- package/dist/nodes/vendors/OpenAi/actions/image/analyze.operation.d.ts +1 -1
- package/dist/nodes/vendors/OpenAi/actions/image/generate.operation.d.ts +1 -1
- package/dist/nodes/vendors/OpenAi/actions/text/classify.operation.d.ts +1 -1
- package/dist/nodes/vendors/OpenAi/actions/text/message.operation.d.ts +1 -1
- package/dist/nodes/vendors/OpenAi/actions/versionDescription.js +1 -0
- package/dist/nodes/vendors/OpenAi/actions/versionDescription.js.map +1 -1
- package/dist/nodes/vendors/OpenAi/methods/listSearch.js +1 -1
- package/dist/types/nodes.json +3 -3
- package/dist/types/zod.types.d.ts +2 -0
- package/dist/types/zod.types.js +3 -0
- package/dist/types/zod.types.js.map +1 -0
- package/dist/utils/descriptions.d.ts +3 -0
- package/dist/utils/descriptions.js +63 -1
- package/dist/utils/descriptions.js.map +1 -1
- package/dist/utils/schemaParsing.d.ts +6 -0
- package/dist/utils/schemaParsing.js +68 -0
- package/dist/utils/schemaParsing.js.map +1 -0
- package/package.json +5 -4
|
@@ -7,6 +7,7 @@ const prompts_1 = require("@langchain/core/prompts");
|
|
|
7
7
|
const output_parsers_1 = require("langchain/output_parsers");
|
|
8
8
|
const helpers_1 = require("../../../../../utils/helpers");
|
|
9
9
|
const tracing_1 = require("../../../../../utils/tracing");
|
|
10
|
+
const schemaParsing_1 = require("../../../../../utils/schemaParsing");
|
|
10
11
|
async function conversationalAgentExecute(nodeVersion) {
|
|
11
12
|
var _a;
|
|
12
13
|
this.logger.verbose('Executing Conversational Agent');
|
|
@@ -77,6 +78,7 @@ async function conversationalAgentExecute(nodeVersion) {
|
|
|
77
78
|
returnData.push({ json: response });
|
|
78
79
|
}
|
|
79
80
|
catch (error) {
|
|
81
|
+
(0, schemaParsing_1.throwIfToolSchema)(this, error);
|
|
80
82
|
if (this.continueOnFail()) {
|
|
81
83
|
returnData.push({ json: { error: error.message }, pairedItem: { item: itemIndex } });
|
|
82
84
|
continue;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../../../../nodes/agents/Agent/agents/ConversationalAgent/execute.ts"],"names":[],"mappings":";;;AAAA,+CAAsE;AAGtE,6CAAsE;AAGtE,qDAAyD;AACzD,6DAAiE;AACjE,0DAKsC;AACtC,0DAAgE;
|
|
1
|
+
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../../../../nodes/agents/Agent/agents/ConversationalAgent/execute.ts"],"names":[],"mappings":";;;AAAA,+CAAsE;AAGtE,6CAAsE;AAGtE,qDAAyD;AACzD,6DAAiE;AACjE,0DAKsC;AACtC,0DAAgE;AAChE,sEAAuE;AAEhE,KAAK,UAAU,0BAA0B,CAE/C,WAAmB;;IAEnB,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,gCAAgC,CAAC,CAAC;IACtD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,sBAAsB,qBAAqC,CAAC,CAAC,CAAC;IAEvF,IAAI,CAAC,IAAA,wBAAc,EAAC,KAAK,CAAC,EAAE,CAAC;QAC5B,MAAM,IAAI,iCAAkB,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,0CAA0C,CAAC,CAAC;IAC1F,CAAC;IAED,MAAM,MAAM,GAAG,CAAC,MAAM,IAAI,CAAC,sBAAsB,cAA8B,CAAC,CAAC,CAErE,CAAC;IAEb,MAAM,KAAK,GAAG,MAAM,IAAA,2BAAiB,EAAC,IAAI,EAAE,WAAW,IAAI,GAAG,CAAC,CAAC;IAChE,MAAM,aAAa,GAAG,MAAM,IAAA,kCAAwB,EAAC,IAAI,CAAC,CAAC;IAG3D,MAAM,OAAO,GAAG,IAAI,CAAC,gBAAgB,CAAC,SAAS,EAAE,CAAC,EAAE,EAAE,CAKrD,CAAC;IAEF,MAAM,aAAa,GAAG,MAAM,IAAA,2CAAkC,EAAC,KAAK,EAAE,KAAK,EAAE;QAK5E,SAAS,EAAE,uCAAuC;QAClD,MAAM;QACN,uBAAuB,EAAE,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,uBAAuB,MAAK,IAAI;QAClE,aAAa,EAAE,MAAA,OAAO,CAAC,aAAa,mCAAI,EAAE;QAC1C,SAAS,EAAE;YACV,aAAa,EAAE,OAAO,CAAC,aAAa;YACpC,YAAY,EAAE,OAAO,CAAC,YAAY;SAClC;KACD,CAAC,CAAC;IAEH,MAAM,UAAU,GAAyB,EAAE,CAAC;IAE5C,IAAI,YAA0C,CAAC;IAC/C,IAAI,MAAkC,CAAC;IACvC,IAAI,aAAa,CAAC,MAAM,EAAE,CAAC;QAC1B,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAChC,YAAY,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;QACjC,CAAC;aAAM,CAAC;YACP,YAAY,GAAG,IAAI,sCAAqB,CAAC,GAAG,aAAa,CAAC,CAAC;QAC5D,CAAC;QAED,IAAI,YAAY,EAAE,CAAC;YAClB,MAAM,kBAAkB,GAAG,YAAY,CAAC,qBAAqB,EAAE,CAAC;YAEhE,MAAM,GAAG,IAAI,wBAAc,CAAC;gBAC3B,QAAQ,EAAE,+BAA+B;gBACzC,cAAc,EAAE,CAAC,OAAO,CAAC;gBACzB,gBAAgB,EAAE,EAAE,kBAAkB,EAAE;aACxC,CAAC,CAAC;QACJ,CAAC;IACF,CAAC;IAED,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;IAClC,KAAK,IAAI,SAAS,GAAG,CAAC,EAAE,SAAS,GAAG,KAAK,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE,CAAC;QAC/D,IAAI,CAAC;YACJ,IAAI,KAAK,CAAC;YAEV,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC,WAAW,IAAI,GAAG,EAAE,CAAC;gBACvC,KAAK,GAAG,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,SAAS,CAAW,CAAC;YAC5D,CAAC;iBAAM,CAAC;gBACP,KAAK,GAAG,IAAA,8BAAoB,EAAC;oBAC5B,GAAG,EAAE,IAAI;oBACT,CAAC,EAAE,SAAS;oBACZ,QAAQ,EAAE,MAAM;oBAChB,aAAa,EAAE,YAAY;iBAC3B,CAAC,CAAC;YACJ,CAAC;YAED,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;gBACzB,MAAM,IAAI,iCAAkB,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,+BAA+B,CAAC,CAAC;YAC/E,CAAC;YAED,IAAI,MAAM,EAAE,CAAC;gBACZ,KAAK,GAAG,CAAC,MAAM,MAAM,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;YAChD,CAAC;YAED,IAAI,QAAQ,GAAG,MAAM,aAAa;iBAChC,UAAU,CAAC,IAAA,0BAAgB,EAAC,IAAI,CAAC,CAAC;iBAClC,MAAM,CAAC,EAAE,KAAK,EAAE,aAAa,EAAE,CAAC,CAAC;YAEnC,IAAI,YAAY,EAAE,CAAC;gBAClB,QAAQ,GAAG,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAgB,CAAC,EAAE,CAAC;YAC5E,CAAC;YAED,UAAU,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;QACrC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAA,iCAAiB,EAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YAE/B,IAAI,IAAI,CAAC,cAAc,EAAE,EAAE,CAAC;gBAC3B,UAAU,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,OAAO,EAAE,EAAE,UAAU,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC;gBACrF,SAAS;YACV,CAAC;YAED,MAAM,KAAK,CAAC;QACb,CAAC;IACF,CAAC;IAED,OAAO,MAAM,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;AACjD,CAAC;AA7GD,gEA6GC"}
|
|
@@ -7,6 +7,7 @@ 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
9
|
const tracing_1 = require("../../../../../utils/tracing");
|
|
10
|
+
const schemaParsing_1 = require("../../../../../utils/schemaParsing");
|
|
10
11
|
async function planAndExecuteAgentExecute(nodeVersion) {
|
|
11
12
|
this.logger.verbose('Executing PlanAndExecute Agent');
|
|
12
13
|
const model = (await this.getInputConnectionData("ai_languageModel", 0));
|
|
@@ -61,6 +62,7 @@ async function planAndExecuteAgentExecute(nodeVersion) {
|
|
|
61
62
|
returnData.push({ json: response });
|
|
62
63
|
}
|
|
63
64
|
catch (error) {
|
|
65
|
+
(0, schemaParsing_1.throwIfToolSchema)(this, error);
|
|
64
66
|
if (this.continueOnFail()) {
|
|
65
67
|
returnData.push({ json: { error: error.message }, pairedItem: { item: itemIndex } });
|
|
66
68
|
continue;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../../../../nodes/agents/Agent/agents/PlanAndExecuteAgent/execute.ts"],"names":[],"mappings":";;;AAAA,+CAKsB;AAGtB,qDAAyD;AACzD,6DAAiE;AAEjE,8EAAsF;AACtF,0DAIsC;AACtC,0DAAgE;
|
|
1
|
+
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../../../../nodes/agents/Agent/agents/PlanAndExecuteAgent/execute.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,7 @@ const prompts_1 = require("@langchain/core/prompts");
|
|
|
7
7
|
const output_parsers_1 = require("langchain/output_parsers");
|
|
8
8
|
const helpers_1 = require("../../../../../utils/helpers");
|
|
9
9
|
const tracing_1 = require("../../../../../utils/tracing");
|
|
10
|
+
const schemaParsing_1 = require("../../../../../utils/schemaParsing");
|
|
10
11
|
async function reActAgentAgentExecute(nodeVersion) {
|
|
11
12
|
this.logger.verbose('Executing ReAct Agent');
|
|
12
13
|
const model = (await this.getInputConnectionData("ai_languageModel", 0));
|
|
@@ -75,6 +76,7 @@ async function reActAgentAgentExecute(nodeVersion) {
|
|
|
75
76
|
returnData.push({ json: response });
|
|
76
77
|
}
|
|
77
78
|
catch (error) {
|
|
79
|
+
(0, schemaParsing_1.throwIfToolSchema)(this, error);
|
|
78
80
|
if (this.continueOnFail()) {
|
|
79
81
|
returnData.push({ json: { error: error.message }, pairedItem: { item: itemIndex } });
|
|
80
82
|
continue;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../../../../nodes/agents/Agent/agents/ReActAgent/execute.ts"],"names":[],"mappings":";;;AAAA,+CAKsB;AAEtB,6CAA2E;AAG3E,qDAAyD;AACzD,6DAAiE;AAEjE,0DAKsC;AACtC,0DAAgE;
|
|
1
|
+
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../../../../nodes/agents/Agent/agents/ReActAgent/execute.ts"],"names":[],"mappings":";;;AAAA,+CAKsB;AAEtB,6CAA2E;AAG3E,qDAAyD;AACzD,6DAAiE;AAEjE,0DAKsC;AACtC,0DAAgE;AAChE,sEAAuE;AAEhE,KAAK,UAAU,sBAAsB,CAE3C,WAAmB;IAEnB,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,uBAAuB,CAAC,CAAC;IAE7C,MAAM,KAAK,GAAG,CAAC,MAAM,IAAI,CAAC,sBAAsB,qBAAqC,CAAC,CAAC,CAEvE,CAAC;IAEjB,MAAM,KAAK,GAAG,MAAM,IAAA,2BAAiB,EAAC,IAAI,EAAE,WAAW,IAAI,GAAG,CAAC,CAAC;IAEhE,MAAM,aAAa,GAAG,MAAM,IAAA,kCAAwB,EAAC,IAAI,CAAC,CAAC;IAE3D,MAAM,OAAO,GAAG,IAAI,CAAC,gBAAgB,CAAC,SAAS,EAAE,CAAC,EAAE,EAAE,CAMrD,CAAC;IACF,IAAI,KAAgC,CAAC;IAErC,IAAI,IAAA,wBAAc,EAAC,KAAK,CAAC,EAAE,CAAC;QAC3B,KAAK,GAAG,kBAAS,CAAC,eAAe,CAAC,KAAK,EAAE,KAAK,EAAE;YAC/C,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,MAAM,EAAE,OAAO,CAAC,UAAU;YAC1B,oBAAoB,EAAE,OAAO,CAAC,oBAAoB;SAClD,CAAC,CAAC;IACJ,CAAC;SAAM,CAAC;QACP,KAAK,GAAG,sBAAa,CAAC,eAAe,CAAC,KAAK,EAAE,KAAK,EAAE;YACnD,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,MAAM,EAAE,OAAO,CAAC,MAAM;SACtB,CAAC,CAAC;IACJ,CAAC;IAED,MAAM,aAAa,GAAG,sBAAa,CAAC,iBAAiB,CAAC;QACrD,KAAK;QACL,KAAK;QACL,uBAAuB,EAAE,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,uBAAuB,MAAK,IAAI;KAClE,CAAC,CAAC;IAEH,MAAM,UAAU,GAAyB,EAAE,CAAC;IAE5C,IAAI,YAA0C,CAAC;IAC/C,IAAI,MAAkC,CAAC;IACvC,IAAI,aAAa,CAAC,MAAM,EAAE,CAAC;QAC1B,YAAY;YACX,aAAa,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,sCAAqB,CAAC,GAAG,aAAa,CAAC,CAAC;QAE7F,MAAM,kBAAkB,GAAG,YAAY,CAAC,qBAAqB,EAAE,CAAC;QAEhE,MAAM,GAAG,IAAI,wBAAc,CAAC;YAC3B,QAAQ,EAAE,+BAA+B;YACzC,cAAc,EAAE,CAAC,OAAO,CAAC;YACzB,gBAAgB,EAAE,EAAE,kBAAkB,EAAE;SACxC,CAAC,CAAC;IACJ,CAAC;IAED,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;IAClC,KAAK,IAAI,SAAS,GAAG,CAAC,EAAE,SAAS,GAAG,KAAK,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE,CAAC;QAC/D,IAAI,CAAC;YACJ,IAAI,KAAK,CAAC;YAEV,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC,WAAW,IAAI,GAAG,EAAE,CAAC;gBACvC,KAAK,GAAG,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,SAAS,CAAW,CAAC;YAC5D,CAAC;iBAAM,CAAC;gBACP,KAAK,GAAG,IAAA,8BAAoB,EAAC;oBAC5B,GAAG,EAAE,IAAI;oBACT,CAAC,EAAE,SAAS;oBACZ,QAAQ,EAAE,MAAM;oBAChB,aAAa,EAAE,YAAY;iBAC3B,CAAC,CAAC;YACJ,CAAC;YAED,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;gBACzB,MAAM,IAAI,iCAAkB,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,gCAAgC,CAAC,CAAC;YAChF,CAAC;YAED,IAAI,MAAM,EAAE,CAAC;gBACZ,KAAK,GAAG,CAAC,MAAM,MAAM,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;YAChD,CAAC;YAED,IAAI,QAAQ,GAAG,MAAM,aAAa;iBAChC,UAAU,CAAC,IAAA,0BAAgB,EAAC,IAAI,CAAC,CAAC;iBAClC,MAAM,CAAC,EAAE,KAAK,EAAE,aAAa,EAAE,CAAC,CAAC;YAEnC,IAAI,YAAY,EAAE,CAAC;gBAClB,QAAQ,GAAG,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAgB,CAAC,EAAE,CAAC;YAC5E,CAAC;YAED,UAAU,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;QACrC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAA,iCAAiB,EAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YAC/B,IAAI,IAAI,CAAC,cAAc,EAAE,EAAE,CAAC;gBAC3B,UAAU,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,OAAO,EAAE,EAAE,UAAU,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC;gBACrF,SAAS;YACV,CAAC;YAED,MAAM,KAAK,CAAC;QACb,CAAC;IACF,CAAC;IAED,OAAO,MAAM,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;AACjD,CAAC;AAxGD,wDAwGC"}
|
|
@@ -62,6 +62,7 @@ function getSandbox(code, options) {
|
|
|
62
62
|
context.getExecutionCancelSignal = this.getExecutionCancelSignal;
|
|
63
63
|
context.getNodeOutputs = this.getNodeOutputs;
|
|
64
64
|
context.executeWorkflow = this.executeWorkflow;
|
|
65
|
+
context.getWorkflowDataProxy = this.getWorkflowDataProxy;
|
|
65
66
|
context.logger = this.logger;
|
|
66
67
|
if (options === null || options === void 0 ? void 0 : options.addItems) {
|
|
67
68
|
context.items = context.$input.all();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Code.node.js","sourceRoot":"","sources":["../../../nodes/code/Code.node.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"Code.node.js","sourceRoot":"","sources":["../../../nodes/code/Code.node.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { type IExecuteFunctions, type INodeType, type INodeTypeDescription, type SupplyData } from 'n8n-workflow';
|
|
2
2
|
import { z } from 'zod';
|
|
3
3
|
import { StructuredOutputParser } from 'langchain/output_parsers';
|
|
4
|
-
import { JavaScriptSandbox } from 'n8n-nodes-base/dist/nodes/Code/JavaScriptSandbox';
|
|
4
|
+
import type { JavaScriptSandbox } from 'n8n-nodes-base/dist/nodes/Code/JavaScriptSandbox';
|
|
5
5
|
export declare class N8nStructuredOutputParser<T extends z.ZodTypeAny> extends StructuredOutputParser<T> {
|
|
6
6
|
parse(text: string): Promise<z.infer<T>>;
|
|
7
7
|
static fromZedJsonSchema(sandboxedSchema: JavaScriptSandbox, nodeVersion: number): Promise<StructuredOutputParser<z.ZodType<object, z.ZodTypeDef, object>>>;
|
|
@@ -9,11 +9,10 @@ const zod_1 = require("zod");
|
|
|
9
9
|
const output_parsers_1 = require("langchain/output_parsers");
|
|
10
10
|
const output_parsers_2 = require("@langchain/core/output_parsers");
|
|
11
11
|
const get_1 = __importDefault(require("lodash/get"));
|
|
12
|
-
const Sandbox_1 = require("n8n-nodes-base/dist/nodes/Code/Sandbox");
|
|
13
|
-
const JavaScriptSandbox_1 = require("n8n-nodes-base/dist/nodes/Code/JavaScriptSandbox");
|
|
14
|
-
const vm2_1 = require("@n8n/vm2");
|
|
15
12
|
const sharedFields_1 = require("../../../utils/sharedFields");
|
|
16
13
|
const logWrapper_1 = require("../../../utils/logWrapper");
|
|
14
|
+
const schemaParsing_1 = require("../../../utils/schemaParsing");
|
|
15
|
+
const descriptions_1 = require("../../../utils/descriptions");
|
|
17
16
|
const STRUCTURED_OUTPUT_KEY = '__structured__output';
|
|
18
17
|
const STRUCTURED_OUTPUT_OBJECT_KEY = '__structured__output__object';
|
|
19
18
|
const STRUCTURED_OUTPUT_ARRAY_KEY = '__structured__output__array';
|
|
@@ -64,8 +63,8 @@ class OutputParserStructured {
|
|
|
64
63
|
name: 'outputParserStructured',
|
|
65
64
|
icon: 'fa:code',
|
|
66
65
|
group: ['transform'],
|
|
67
|
-
version: [1, 1.1],
|
|
68
|
-
defaultVersion: 1.
|
|
66
|
+
version: [1, 1.1, 1.2],
|
|
67
|
+
defaultVersion: 1.2,
|
|
69
68
|
description: 'Return data in a defined JSON format',
|
|
70
69
|
defaults: {
|
|
71
70
|
name: 'Structured Output Parser',
|
|
@@ -89,6 +88,33 @@ class OutputParserStructured {
|
|
|
89
88
|
outputNames: ['Output Parser'],
|
|
90
89
|
properties: [
|
|
91
90
|
(0, sharedFields_1.getConnectionHintNoticeField)(["ai_chain", "ai_agent"]),
|
|
91
|
+
{ ...descriptions_1.schemaTypeField, displayOptions: { show: { '@version': [{ _cnd: { gte: 1.2 } }] } } },
|
|
92
|
+
{
|
|
93
|
+
...descriptions_1.jsonSchemaExampleField,
|
|
94
|
+
default: `{
|
|
95
|
+
"state": "California",
|
|
96
|
+
"cities": ["Los Angeles", "San Francisco", "San Diego"]
|
|
97
|
+
}`,
|
|
98
|
+
},
|
|
99
|
+
{
|
|
100
|
+
...descriptions_1.inputSchemaField,
|
|
101
|
+
displayName: 'JSON Schema',
|
|
102
|
+
description: 'JSON Schema to structure and validate the output against',
|
|
103
|
+
default: `{
|
|
104
|
+
"type": "object",
|
|
105
|
+
"properties": {
|
|
106
|
+
"state": {
|
|
107
|
+
"type": "string"
|
|
108
|
+
},
|
|
109
|
+
"cities": {
|
|
110
|
+
"type": "array",
|
|
111
|
+
"items": {
|
|
112
|
+
"type": "string"
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
}`,
|
|
117
|
+
},
|
|
92
118
|
{
|
|
93
119
|
displayName: 'JSON Schema',
|
|
94
120
|
name: 'jsonSchema',
|
|
@@ -112,64 +138,41 @@ class OutputParserStructured {
|
|
|
112
138
|
rows: 10,
|
|
113
139
|
},
|
|
114
140
|
required: true,
|
|
141
|
+
displayOptions: {
|
|
142
|
+
show: {
|
|
143
|
+
'@version': [{ _cnd: { lte: 1.1 } }],
|
|
144
|
+
},
|
|
145
|
+
},
|
|
115
146
|
},
|
|
116
147
|
{
|
|
117
148
|
displayName: 'The schema has to be defined in the <a target="_blank" href="https://json-schema.org/">JSON Schema</a> format. Look at <a target="_blank" href="https://json-schema.org/learn/miscellaneous-examples.html">this</a> page for examples.',
|
|
118
149
|
name: 'notice',
|
|
119
150
|
type: 'notice',
|
|
120
151
|
default: '',
|
|
152
|
+
displayOptions: {
|
|
153
|
+
hide: {
|
|
154
|
+
schemaType: ['fromJson'],
|
|
155
|
+
},
|
|
156
|
+
},
|
|
121
157
|
},
|
|
122
158
|
],
|
|
123
159
|
};
|
|
124
160
|
}
|
|
125
161
|
async supplyData(itemIndex) {
|
|
126
|
-
|
|
127
|
-
const
|
|
128
|
-
let
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
if (itemSchema.type === undefined) {
|
|
132
|
-
itemSchema = {
|
|
133
|
-
type: 'object',
|
|
134
|
-
properties: (_a = itemSchema.properties) !== null && _a !== void 0 ? _a : itemSchema,
|
|
135
|
-
};
|
|
136
|
-
}
|
|
162
|
+
const schemaType = this.getNodeParameter('schemaType', itemIndex, '');
|
|
163
|
+
const jsonExample = this.getNodeParameter('jsonSchemaExample', itemIndex, '');
|
|
164
|
+
let inputSchema;
|
|
165
|
+
if (this.getNode().typeVersion <= 1.1) {
|
|
166
|
+
inputSchema = this.getNodeParameter('jsonSchema', itemIndex, '');
|
|
137
167
|
}
|
|
138
|
-
|
|
139
|
-
|
|
168
|
+
else {
|
|
169
|
+
inputSchema = this.getNodeParameter('inputSchema', itemIndex, '');
|
|
140
170
|
}
|
|
141
|
-
const
|
|
142
|
-
|
|
143
|
-
modules: ['json-schema-to-zod', 'zod'],
|
|
144
|
-
transitive: false,
|
|
145
|
-
},
|
|
146
|
-
resolve(moduleName, parentDirname) {
|
|
147
|
-
if (moduleName === 'json-schema-to-zod') {
|
|
148
|
-
return require.resolve('@n8n/n8n-nodes-langchain/node_modules/json-schema-to-zod/dist/cjs/jsonSchemaToZod.js', {
|
|
149
|
-
paths: [parentDirname],
|
|
150
|
-
});
|
|
151
|
-
}
|
|
152
|
-
if (moduleName === 'zod') {
|
|
153
|
-
return require.resolve('@n8n/n8n-nodes-langchain/node_modules/zod.cjs', {
|
|
154
|
-
paths: [parentDirname],
|
|
155
|
-
});
|
|
156
|
-
}
|
|
157
|
-
return;
|
|
158
|
-
},
|
|
159
|
-
builtin: [],
|
|
160
|
-
});
|
|
161
|
-
const context = Sandbox_1.getSandboxContext.call(this, itemIndex);
|
|
162
|
-
const { description, ...restOfSchema } = itemSchema;
|
|
163
|
-
const sandboxedSchema = new JavaScriptSandbox_1.JavaScriptSandbox(context, `
|
|
164
|
-
const { z } = require('zod');
|
|
165
|
-
const { parseSchema } = require('json-schema-to-zod');
|
|
166
|
-
const zodSchema = parseSchema(${JSON.stringify(restOfSchema)});
|
|
167
|
-
const itemSchema = new Function('z', 'return (' + zodSchema + ')')(z)
|
|
168
|
-
return itemSchema
|
|
169
|
-
`, itemIndex, this.helpers, { resolver: vmResolver });
|
|
171
|
+
const jsonSchema = schemaType === 'fromJson' ? (0, schemaParsing_1.generateSchema)(jsonExample) : (0, n8n_workflow_1.jsonParse)(inputSchema);
|
|
172
|
+
const zodSchemaSandbox = (0, schemaParsing_1.getSandboxWithZod)(this, jsonSchema, 0);
|
|
170
173
|
const nodeVersion = this.getNode().typeVersion;
|
|
171
174
|
try {
|
|
172
|
-
const parser = await N8nStructuredOutputParser.fromZedJsonSchema(
|
|
175
|
+
const parser = await N8nStructuredOutputParser.fromZedJsonSchema(zodSchemaSandbox, nodeVersion);
|
|
173
176
|
return {
|
|
174
177
|
response: (0, logWrapper_1.logWrapper)(parser, this),
|
|
175
178
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OutputParserStructured.node.js","sourceRoot":"","sources":["../../../../nodes/output_parser/OutputParserStructured/OutputParserStructured.node.ts"],"names":[],"mappings":";;;;;;AACA,+CAQsB;AACtB,6BAAwB;AAExB,6DAAkE;AAClE,mEAAuE;AACvE,qDAA6B;
|
|
1
|
+
{"version":3,"file":"OutputParserStructured.node.js","sourceRoot":"","sources":["../../../../nodes/output_parser/OutputParserStructured/OutputParserStructured.node.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,6 +33,8 @@ const tools_1 = require("@langchain/core/tools");
|
|
|
33
33
|
const get_1 = __importDefault(require("lodash/get"));
|
|
34
34
|
const isObject_1 = __importDefault(require("lodash/isObject"));
|
|
35
35
|
const sharedFields_1 = require("../../../utils/sharedFields");
|
|
36
|
+
const schemaParsing_1 = require("../../../utils/schemaParsing");
|
|
37
|
+
const descriptions_1 = require("../../../utils/descriptions");
|
|
36
38
|
class ToolWorkflow {
|
|
37
39
|
constructor() {
|
|
38
40
|
this.description = {
|
|
@@ -306,12 +308,25 @@ class ToolWorkflow {
|
|
|
306
308
|
},
|
|
307
309
|
],
|
|
308
310
|
},
|
|
311
|
+
{
|
|
312
|
+
displayName: 'Specify Input Schema',
|
|
313
|
+
name: 'specifyInputSchema',
|
|
314
|
+
type: 'boolean',
|
|
315
|
+
description: 'Whether to specify the schema for the function. This would require the LLM to provide the input in the correct format and would validate it against the schema.',
|
|
316
|
+
noDataExpression: true,
|
|
317
|
+
default: false,
|
|
318
|
+
},
|
|
319
|
+
{ ...descriptions_1.schemaTypeField, displayOptions: { show: { specifyInputSchema: [true] } } },
|
|
320
|
+
descriptions_1.jsonSchemaExampleField,
|
|
321
|
+
descriptions_1.inputSchemaField,
|
|
309
322
|
],
|
|
310
323
|
};
|
|
311
324
|
}
|
|
312
325
|
async supplyData(itemIndex) {
|
|
313
326
|
const name = this.getNodeParameter('name', itemIndex);
|
|
314
327
|
const description = this.getNodeParameter('description', itemIndex);
|
|
328
|
+
const useSchema = this.getNodeParameter('specifyInputSchema', itemIndex);
|
|
329
|
+
let tool = undefined;
|
|
315
330
|
const runFunction = async (query, runManager) => {
|
|
316
331
|
const source = this.getNodeParameter('source', itemIndex);
|
|
317
332
|
const responsePropertyName = this.getNodeParameter('responsePropertyName', itemIndex);
|
|
@@ -368,42 +383,66 @@ class ToolWorkflow {
|
|
|
368
383
|
}
|
|
369
384
|
return response;
|
|
370
385
|
};
|
|
386
|
+
const toolHandler = async (query, runManager) => {
|
|
387
|
+
const { index } = this.addInputData("ai_tool", [[{ json: { query } }]]);
|
|
388
|
+
let response = '';
|
|
389
|
+
let executionError;
|
|
390
|
+
try {
|
|
391
|
+
response = await runFunction(query, runManager);
|
|
392
|
+
}
|
|
393
|
+
catch (error) {
|
|
394
|
+
executionError = error;
|
|
395
|
+
response = `There was an error: "${error.message}"`;
|
|
396
|
+
}
|
|
397
|
+
if (typeof response === 'number') {
|
|
398
|
+
response = response.toString();
|
|
399
|
+
}
|
|
400
|
+
if ((0, isObject_1.default)(response)) {
|
|
401
|
+
response = JSON.stringify(response, null, 2);
|
|
402
|
+
}
|
|
403
|
+
if (typeof response !== 'string') {
|
|
404
|
+
executionError = new n8n_workflow_1.NodeOperationError(this.getNode(), 'Wrong output type returned', {
|
|
405
|
+
description: `The response property should be a string, but it is an ${typeof response}`,
|
|
406
|
+
});
|
|
407
|
+
response = `There was an error: "${executionError.message}"`;
|
|
408
|
+
}
|
|
409
|
+
if (executionError) {
|
|
410
|
+
void this.addOutputData("ai_tool", index, executionError);
|
|
411
|
+
}
|
|
412
|
+
else {
|
|
413
|
+
void this.addOutputData("ai_tool", index, [[{ json: { response } }]]);
|
|
414
|
+
}
|
|
415
|
+
return response;
|
|
416
|
+
};
|
|
417
|
+
const functionBase = {
|
|
418
|
+
name,
|
|
419
|
+
description,
|
|
420
|
+
func: toolHandler,
|
|
421
|
+
};
|
|
422
|
+
if (useSchema) {
|
|
423
|
+
try {
|
|
424
|
+
const jsonExample = this.getNodeParameter('jsonSchemaExample', itemIndex, '');
|
|
425
|
+
const inputSchema = this.getNodeParameter('inputSchema', itemIndex, '');
|
|
426
|
+
const schemaType = this.getNodeParameter('schemaType', itemIndex);
|
|
427
|
+
const jsonSchema = schemaType === 'fromJson'
|
|
428
|
+
? (0, schemaParsing_1.generateSchema)(jsonExample)
|
|
429
|
+
: (0, n8n_workflow_1.jsonParse)(inputSchema);
|
|
430
|
+
const zodSchemaSandbox = (0, schemaParsing_1.getSandboxWithZod)(this, jsonSchema, 0);
|
|
431
|
+
const zodSchema = (await zodSchemaSandbox.runCode());
|
|
432
|
+
tool = new tools_1.DynamicStructuredTool({
|
|
433
|
+
schema: zodSchema,
|
|
434
|
+
...functionBase,
|
|
435
|
+
});
|
|
436
|
+
}
|
|
437
|
+
catch (error) {
|
|
438
|
+
throw new n8n_workflow_1.NodeOperationError(this.getNode(), 'Error during parsing of JSON Schema. \n ' + error);
|
|
439
|
+
}
|
|
440
|
+
}
|
|
441
|
+
else {
|
|
442
|
+
tool = new tools_1.DynamicTool(functionBase);
|
|
443
|
+
}
|
|
371
444
|
return {
|
|
372
|
-
response:
|
|
373
|
-
name,
|
|
374
|
-
description,
|
|
375
|
-
func: async (query, runManager) => {
|
|
376
|
-
const { index } = this.addInputData("ai_tool", [[{ json: { query } }]]);
|
|
377
|
-
let response = '';
|
|
378
|
-
let executionError;
|
|
379
|
-
try {
|
|
380
|
-
response = await runFunction(query, runManager);
|
|
381
|
-
}
|
|
382
|
-
catch (error) {
|
|
383
|
-
executionError = error;
|
|
384
|
-
response = `There was an error: "${error.message}"`;
|
|
385
|
-
}
|
|
386
|
-
if (typeof response === 'number') {
|
|
387
|
-
response = response.toString();
|
|
388
|
-
}
|
|
389
|
-
if ((0, isObject_1.default)(response)) {
|
|
390
|
-
response = JSON.stringify(response, null, 2);
|
|
391
|
-
}
|
|
392
|
-
if (typeof response !== 'string') {
|
|
393
|
-
executionError = new n8n_workflow_1.NodeOperationError(this.getNode(), 'Wrong output type returned', {
|
|
394
|
-
description: `The response property should be a string, but it is an ${typeof response}`,
|
|
395
|
-
});
|
|
396
|
-
response = `There was an error: "${executionError.message}"`;
|
|
397
|
-
}
|
|
398
|
-
if (executionError) {
|
|
399
|
-
void this.addOutputData("ai_tool", index, executionError);
|
|
400
|
-
}
|
|
401
|
-
else {
|
|
402
|
-
void this.addOutputData("ai_tool", index, [[{ json: { response } }]]);
|
|
403
|
-
}
|
|
404
|
-
return response;
|
|
405
|
-
},
|
|
406
|
-
}),
|
|
445
|
+
response: tool,
|
|
407
446
|
};
|
|
408
447
|
}
|
|
409
448
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ToolWorkflow.node.js","sourceRoot":"","sources":["../../../../nodes/tools/ToolWorkflow/ToolWorkflow.node.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAWA,+
|
|
1
|
+
{"version":3,"file":"ToolWorkflow.node.js","sourceRoot":"","sources":["../../../../nodes/tools/ToolWorkflow/ToolWorkflow.node.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,7 +19,7 @@ export declare const description: {
|
|
|
19
19
|
modes?: import("n8n-workflow").INodePropertyMode[] | undefined;
|
|
20
20
|
requiresDataPath?: "single" | "multiple" | undefined;
|
|
21
21
|
doNotInherit?: boolean | undefined;
|
|
22
|
-
validateType?: import("n8n-workflow").
|
|
22
|
+
validateType?: keyof import("n8n-workflow").FieldTypeMap | undefined;
|
|
23
23
|
ignoreValidationDuringExecution?: boolean | undefined;
|
|
24
24
|
}[];
|
|
25
25
|
export declare function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]>;
|
|
@@ -115,6 +115,22 @@ const properties = [
|
|
|
115
115
|
type: 'collection',
|
|
116
116
|
default: {},
|
|
117
117
|
options: [
|
|
118
|
+
{
|
|
119
|
+
displayName: 'Output Randomness (Temperature)',
|
|
120
|
+
name: 'temperature',
|
|
121
|
+
default: 1,
|
|
122
|
+
typeOptions: { maxValue: 1, minValue: 0, numberPrecision: 1 },
|
|
123
|
+
description: 'Controls randomness: Lowering results in less random completions. As the temperature approaches zero, the model will become deterministic and repetitive. We generally recommend altering this or temperature but not both.',
|
|
124
|
+
type: 'number',
|
|
125
|
+
},
|
|
126
|
+
{
|
|
127
|
+
displayName: 'Output Randomness (Top P)',
|
|
128
|
+
name: 'topP',
|
|
129
|
+
default: 1,
|
|
130
|
+
typeOptions: { maxValue: 1, minValue: 0, numberPrecision: 1 },
|
|
131
|
+
description: 'An alternative to sampling with temperature, controls diversity via nucleus sampling: 0.5 means half of all likelihood-weighted options are considered. We generally recommend altering this or temperature but not both.',
|
|
132
|
+
type: 'number',
|
|
133
|
+
},
|
|
118
134
|
{
|
|
119
135
|
displayName: 'Fail if Assistant Already Exists',
|
|
120
136
|
name: 'failIfExists',
|
|
@@ -133,6 +149,7 @@ const displayOptions = {
|
|
|
133
149
|
};
|
|
134
150
|
exports.description = (0, n8n_workflow_1.updateDisplayOptions)(displayOptions, properties);
|
|
135
151
|
async function execute(i) {
|
|
152
|
+
var _a, _b;
|
|
136
153
|
const model = this.getNodeParameter('modelId', i, '', { extractValue: true });
|
|
137
154
|
const name = this.getNodeParameter('name', i);
|
|
138
155
|
const assistantDescription = this.getNodeParameter('description', i);
|
|
@@ -151,7 +168,7 @@ async function execute(i) {
|
|
|
151
168
|
do {
|
|
152
169
|
const response = (await transport_1.apiRequest.call(this, 'GET', '/assistants', {
|
|
153
170
|
headers: {
|
|
154
|
-
'OpenAI-Beta': 'assistants=
|
|
171
|
+
'OpenAI-Beta': 'assistants=v2',
|
|
155
172
|
},
|
|
156
173
|
qs: {
|
|
157
174
|
limit: 100,
|
|
@@ -181,18 +198,33 @@ async function execute(i) {
|
|
|
181
198
|
name,
|
|
182
199
|
description: assistantDescription,
|
|
183
200
|
instructions,
|
|
184
|
-
file_ids,
|
|
185
201
|
};
|
|
186
202
|
const tools = [];
|
|
187
203
|
if (codeInterpreter) {
|
|
188
204
|
tools.push({
|
|
189
205
|
type: 'code_interpreter',
|
|
190
206
|
});
|
|
207
|
+
body.tool_resources = {
|
|
208
|
+
...((_a = body.tool_resources) !== null && _a !== void 0 ? _a : {}),
|
|
209
|
+
code_interpreter: {
|
|
210
|
+
file_ids,
|
|
211
|
+
},
|
|
212
|
+
};
|
|
191
213
|
}
|
|
192
214
|
if (knowledgeRetrieval) {
|
|
193
215
|
tools.push({
|
|
194
|
-
type: '
|
|
216
|
+
type: 'file_search',
|
|
195
217
|
});
|
|
218
|
+
body.tool_resources = {
|
|
219
|
+
...((_b = body.tool_resources) !== null && _b !== void 0 ? _b : {}),
|
|
220
|
+
file_search: {
|
|
221
|
+
vector_stores: [
|
|
222
|
+
{
|
|
223
|
+
file_ids,
|
|
224
|
+
},
|
|
225
|
+
],
|
|
226
|
+
},
|
|
227
|
+
};
|
|
196
228
|
}
|
|
197
229
|
if (tools.length) {
|
|
198
230
|
body.tools = tools;
|
|
@@ -200,7 +232,7 @@ async function execute(i) {
|
|
|
200
232
|
const response = await transport_1.apiRequest.call(this, 'POST', '/assistants', {
|
|
201
233
|
body,
|
|
202
234
|
headers: {
|
|
203
|
-
'OpenAI-Beta': 'assistants=
|
|
235
|
+
'OpenAI-Beta': 'assistants=v2',
|
|
204
236
|
},
|
|
205
237
|
});
|
|
206
238
|
return [
|