@n8n/n8n-nodes-langchain 1.42.0 → 1.43.1

package/dist/utils/descriptions.js

@@ -1,6 +1,68 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.textInput = exports.promptTypeOptions = void 0;
+exports.textInput = exports.promptTypeOptions = exports.inputSchemaField = exports.jsonSchemaExampleField = exports.schemaTypeField = void 0;
+exports.schemaTypeField = {
+    displayName: 'Schema Type',
+    name: 'schemaType',
+    type: 'options',
+    noDataExpression: true,
+    options: [
+        {
+            name: 'Generate From JSON Example',
+            value: 'fromJson',
+            description: 'Generate a schema from an example JSON object',
+        },
+        {
+            name: 'Define Below',
+            value: 'manual',
+            description: 'Define the JSON schema manually',
+        },
+    ],
+    default: 'fromJson',
+    description: 'How to specify the schema for the function',
+};
+exports.jsonSchemaExampleField = {
+    displayName: 'JSON Example',
+    name: 'jsonSchemaExample',
+    type: 'json',
+    default: `{
+	"some_input": "some_value"
+}`,
+    noDataExpression: true,
+    typeOptions: {
+        rows: 10,
+    },
+    displayOptions: {
+        show: {
+            schemaType: ['fromJson'],
+        },
+    },
+    description: 'Example JSON object to use to generate the schema',
+};
+exports.inputSchemaField = {
+    displayName: 'Input Schema',
+    name: 'inputSchema',
+    type: 'json',
+    default: `{
+"type": "object",
+"properties": {
+	"some_input": {
+		"type": "string",
+		"description": "Some input to the function"
+		}
+	}
+}`,
+    noDataExpression: true,
+    typeOptions: {
+        rows: 10,
+    },
+    displayOptions: {
+        show: {
+            schemaType: ['manual'],
+        },
+    },
+    description: 'Schema to use for the function',
+};
 exports.promptTypeOptions = {
     displayName: 'Prompt',
     name: 'promptType',

package/dist/utils/descriptions.js.map

@@ -1 +1 @@
-{"version":3,"file":"descriptions.js","sourceRoot":"","sources":["../../utils/descriptions.ts"],"names":[],"mappings":";;;AAEa,QAAA,iBAAiB,GAAoB;IACjD,WAAW,EAAE,QAAQ;IACrB,IAAI,EAAE,YAAY;IAClB,IAAI,EAAE,SAAS;IACf,OAAO,EAAE;QACR;YAEC,IAAI,EAAE,uCAAuC;YAC7C,KAAK,EAAE,MAAM;YACb,WAAW,EAAE,2CAA2C;SACxD;QACD;YAEC,IAAI,EAAE,cAAc;YACpB,KAAK,EAAE,QAAQ;YACf,WAAW,EAAE,4EAA4E;SACzF;KACD;IACD,OAAO,EAAE,MAAM;CACf,CAAC;AAEW,QAAA,SAAS,GAAoB;IACzC,WAAW,EAAE,MAAM;IACnB,IAAI,EAAE,MAAM;IACZ,IAAI,EAAE,QAAQ;IACd,QAAQ,EAAE,IAAI;IACd,OAAO,EAAE,EAAE;IACX,WAAW,EAAE,kCAAkC;IAC/C,WAAW,EAAE;QACZ,IAAI,EAAE,CAAC;KACP;CACD,CAAC"}
+{"version":3,"file":"descriptions.js","sourceRoot":"","sources":["../../utils/descriptions.ts"],"names":[],"mappings":";;;AAEa,QAAA,eAAe,GAAoB;IAC/C,WAAW,EAAE,aAAa;IAC1B,IAAI,EAAE,YAAY;IAClB,IAAI,EAAE,SAAS;IACf,gBAAgB,EAAE,IAAI;IACtB,OAAO,EAAE;QACR;YACC,IAAI,EAAE,4BAA4B;YAClC,KAAK,EAAE,UAAU;YACjB,WAAW,EAAE,+CAA+C;SAC5D;QACD;YACC,IAAI,EAAE,cAAc;YACpB,KAAK,EAAE,QAAQ;YACf,WAAW,EAAE,iCAAiC;SAC9C;KACD;IACD,OAAO,EAAE,UAAU;IACnB,WAAW,EAAE,4CAA4C;CACzD,CAAC;AAEW,QAAA,sBAAsB,GAAoB;IACtD,WAAW,EAAE,cAAc;IAC3B,IAAI,EAAE,mBAAmB;IACzB,IAAI,EAAE,MAAM;IACZ,OAAO,EAAE;;EAER;IACD,gBAAgB,EAAE,IAAI;IACtB,WAAW,EAAE;QACZ,IAAI,EAAE,EAAE;KACR;IACD,cAAc,EAAE;QACf,IAAI,EAAE;YACL,UAAU,EAAE,CAAC,UAAU,CAAC;SACxB;KACD;IACD,WAAW,EAAE,mDAAmD;CAChE,CAAC;AAEW,QAAA,gBAAgB,GAAoB;IAChD,WAAW,EAAE,cAAc;IAC3B,IAAI,EAAE,aAAa;IACnB,IAAI,EAAE,MAAM;IACZ,OAAO,EAAE;;;;;;;;EAQR;IACD,gBAAgB,EAAE,IAAI;IACtB,WAAW,EAAE;QACZ,IAAI,EAAE,EAAE;KACR;IACD,cAAc,EAAE;QACf,IAAI,EAAE;YACL,UAAU,EAAE,CAAC,QAAQ,CAAC;SACtB;KACD;IACD,WAAW,EAAE,gCAAgC;CAC7C,CAAC;AAEW,QAAA,iBAAiB,GAAoB;IACjD,WAAW,EAAE,QAAQ;IACrB,IAAI,EAAE,YAAY;IAClB,IAAI,EAAE,SAAS;IACf,OAAO,EAAE;QACR;YAEC,IAAI,EAAE,uCAAuC;YAC7C,KAAK,EAAE,MAAM;YACb,WAAW,EAAE,2CAA2C;SACxD;QACD;YAEC,IAAI,EAAE,cAAc;YACpB,KAAK,EAAE,QAAQ;YACf,WAAW,EAAE,4EAA4E;SACzF;KACD;IACD,OAAO,EAAE,MAAM;CACf,CAAC;AAEW,QAAA,SAAS,GAAoB;IACzC,WAAW,EAAE,MAAM;IACnB,IAAI,EAAE,MAAM;IACZ,IAAI,EAAE,QAAQ;IACd,QAAQ,EAAE,IAAI;IACd,OAAO,EAAE,EAAE;IACX,WAAW,EAAE,kCAAkC;IAC/C,WAAW,EAAE;QACZ,IAAI,EAAE,CAAC;KACP;CACD,CAAC"}

package/dist/utils/schemaParsing.d.ts

@@ -0,0 +1,6 @@
+import type { JSONSchema7 } from 'json-schema';
+import { JavaScriptSandbox } from 'n8n-nodes-base/dist/nodes/Code/JavaScriptSandbox';
+import type { IExecuteFunctions } from 'n8n-workflow';
+export declare function getSandboxWithZod(ctx: IExecuteFunctions, schema: JSONSchema7, itemIndex: number): JavaScriptSandbox;
+export declare function generateSchema(schemaString: string): JSONSchema7;
+export declare function throwIfToolSchema(ctx: IExecuteFunctions, error: Error): void;

package/dist/utils/schemaParsing.js

@@ -0,0 +1,68 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.throwIfToolSchema = exports.generateSchema = exports.getSandboxWithZod = void 0;
+const vm2_1 = require("@n8n/vm2");
+const generate_schema_1 = require("generate-schema");
+const JavaScriptSandbox_1 = require("n8n-nodes-base/dist/nodes/Code/JavaScriptSandbox");
+const Sandbox_1 = require("n8n-nodes-base/dist/nodes/Code/Sandbox");
+const n8n_workflow_1 = require("n8n-workflow");
+const vmResolver = (0, vm2_1.makeResolverFromLegacyOptions)({
+    external: {
+        modules: ['json-schema-to-zod', 'zod'],
+        transitive: false,
+    },
+    resolve(moduleName, parentDirname) {
+        if (moduleName === 'json-schema-to-zod') {
+            return require.resolve('@n8n/n8n-nodes-langchain/node_modules/json-schema-to-zod/dist/cjs/jsonSchemaToZod.js', {
+                paths: [parentDirname],
+            });
+        }
+        if (moduleName === 'zod') {
+            return require.resolve('@n8n/n8n-nodes-langchain/node_modules/zod.cjs', {
+                paths: [parentDirname],
+            });
+        }
+        return;
+    },
+    builtin: [],
+});
+function getSandboxWithZod(ctx, schema, itemIndex) {
+    var _a;
+    const context = Sandbox_1.getSandboxContext.call(ctx, itemIndex);
+    let itemSchema = schema;
+    try {
+        if (itemSchema.type === undefined) {
+            itemSchema = {
+                type: 'object',
+                properties: (_a = itemSchema.properties) !== null && _a !== void 0 ? _a : itemSchema,
+            };
+        }
+    }
+    catch (error) {
+        throw new n8n_workflow_1.NodeOperationError(ctx.getNode(), 'Error during parsing of JSON Schema.');
+    }
+    const { description, ...restOfSchema } = itemSchema;
+    const sandboxedSchema = new JavaScriptSandbox_1.JavaScriptSandbox(context, `
+			const { z } = require('zod');
+			const { parseSchema } = require('json-schema-to-zod');
+			const zodSchema = parseSchema(${JSON.stringify(restOfSchema)});
+			const itemSchema = new Function('z', 'return (' + zodSchema + ')')(z)
+			return itemSchema
+		`, itemIndex, ctx.helpers, { resolver: vmResolver });
+    return sandboxedSchema;
+}
+exports.getSandboxWithZod = getSandboxWithZod;
+function generateSchema(schemaString) {
+    const parsedSchema = (0, n8n_workflow_1.jsonParse)(schemaString);
+    return (0, generate_schema_1.json)(parsedSchema);
+}
+exports.generateSchema = generateSchema;
+function throwIfToolSchema(ctx, error) {
+    var _a;
+    if ((_a = error === null || error === void 0 ? void 0 : error.message) === null || _a === void 0 ? void 0 : _a.includes('tool input did not match expected schema')) {
+        throw new n8n_workflow_1.NodeOperationError(ctx.getNode(), `${error.message}.
+			This is most likely because some of your tools are configured to require a specific schema. This is not supported by Conversational Agent. Remove the schema from the tool configuration or use Tools agent instead.`);
+    }
+}
+exports.throwIfToolSchema = throwIfToolSchema;
+//# sourceMappingURL=schemaParsing.js.map

package/dist/utils/schemaParsing.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"schemaParsing.js","sourceRoot":"","sources":["../../utils/schemaParsing.ts"],"names":[],"mappings":";;;AAAA,kCAAyD;AACzD,qDAA6D;AAG7D,wFAAqF;AACrF,oEAA2E;AAE3E,+CAA6D;AAE7D,MAAM,UAAU,GAAG,IAAA,mCAA6B,EAAC;IAChD,QAAQ,EAAE;QACT,OAAO,EAAE,CAAC,oBAAoB,EAAE,KAAK,CAAC;QACtC,UAAU,EAAE,KAAK;KACjB;IACD,OAAO,CAAC,UAAU,EAAE,aAAa;QAChC,IAAI,UAAU,KAAK,oBAAoB,EAAE,CAAC;YACzC,OAAO,OAAO,CAAC,OAAO,CACrB,sFAAsF,EACtF;gBACC,KAAK,EAAE,CAAC,aAAa,CAAC;aACtB,CACD,CAAC;QACH,CAAC;QACD,IAAI,UAAU,KAAK,KAAK,EAAE,CAAC;YAC1B,OAAO,OAAO,CAAC,OAAO,CAAC,+CAA+C,EAAE;gBACvE,KAAK,EAAE,CAAC,aAAa,CAAC;aACtB,CAAC,CAAC;QACJ,CAAC;QACD,OAAO;IACR,CAAC;IACD,OAAO,EAAE,EAAE;CACX,CAAC,CAAC;AAEH,SAAgB,iBAAiB,CAAC,GAAsB,EAAE,MAAmB,EAAE,SAAiB;;IAC/F,MAAM,OAAO,GAAG,2BAAiB,CAAC,IAAI,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IACvD,IAAI,UAAU,GAAgB,MAAM,CAAC;IACrC,IAAI,CAAC;QAEJ,IAAI,UAAU,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YACnC,UAAU,GAAG;gBACZ,IAAI,EAAE,QAAQ;gBACd,UAAU,EAAE,MAAA,UAAU,CAAC,UAAU,mCAAK,UAA6C;aACnF,CAAC;QACH,CAAC;IACF,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,MAAM,IAAI,iCAAkB,CAAC,GAAG,CAAC,OAAO,EAAE,EAAE,sCAAsC,CAAC,CAAC;IACrF,CAAC;IAGD,MAAM,EAAE,WAAW,EAAE,GAAG,YAAY,EAAE,GAAG,UAAU,CAAC;IACpD,MAAM,eAAe,GAAG,IAAI,qCAAiB,CAC5C,OAAO,EACP;;;mCAGiC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC;;;GAG5D,EACD,SAAS,EACT,GAAG,CAAC,OAAO,EACX,EAAE,QAAQ,EAAE,UAAU,EAAE,CACxB,CAAC;IACF,OAAO,eAAe,CAAC;AACxB,CAAC;AA/BD,8CA+BC;AAED,SAAgB,cAAc,CAAC,YAAoB;IAClD,MAAM,YAAY,GAAG,IAAA,wBAAS,EAAe,YAAY,CAAC,CAAC;IAE3D,OAAO,IAAA,sBAAkB,EAAC,YAAY,CAAgB,CAAC;AACxD,CAAC;AAJD,wCAIC;AAED,SAAgB,iBAAiB,CAAC,GAAsB,EAAE,KAAY;;IACrE,IAAI,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,0CAAE,QAAQ,CAAC,0CAA0C,CAAC,EAAE,CAAC;QAC1E,MAAM,IAAI,iCAAkB,CAC3B,GAAG,CAAC,OAAO,EAAE,EACb,GAAG,KAAK,CAAC,OAAO;wNACqM,CACrN,CAAC;IACH,CAAC;AACF,CAAC;AARD,8CAQC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@n8n/n8n-nodes-langchain",
-  "version": "1.42.0",
+  "version": "1.43.1",
   "description": "",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",
@@ -114,7 +114,7 @@
     "@types/json-schema": "^7.0.15",
     "@types/temp": "^0.9.1",
     "eslint-plugin-n8n-nodes-base": "^1.16.0",
-    "n8n-core": "1.42.0"
+    "n8n-core": "1.43.1"
   },
   "dependencies": {
     "@aws-sdk/client-bedrock-runtime": "3.549.0",
@@ -144,6 +144,7 @@
     "d3-dsv": "2.0.0",
     "epub2": "3.0.2",
     "form-data": "4.0.0",
+    "generate-schema": "^2.6.0",
     "html-to-text": "9.0.5",
     "jest-mock-extended": "^3.0.4",
     "json-schema-to-zod": "2.0.14",
@@ -159,8 +160,8 @@
     "tmp-promise": "3.0.3",
     "zod": "3.22.4",
     "zod-to-json-schema": "3.22.4",
-    "n8n-workflow": "1.41.0",
-    "n8n-nodes-base": "1.42.0"
+    "n8n-workflow": "1.42.1",
+    "n8n-nodes-base": "1.43.1"
   },
   "scripts": {
     "clean": "rimraf dist .turbo",