mirror of
https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git
synced 2025-12-20 11:22:15 +00:00
feat(Code Tool Node): Option to specify input schema (#10693)
This commit is contained in:
@@ -5,16 +5,25 @@ import type {
|
|||||||
INodeTypeDescription,
|
INodeTypeDescription,
|
||||||
SupplyData,
|
SupplyData,
|
||||||
ExecutionError,
|
ExecutionError,
|
||||||
|
IDataObject,
|
||||||
} from 'n8n-workflow';
|
} from 'n8n-workflow';
|
||||||
|
|
||||||
import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
|
import { jsonParse, NodeConnectionType, NodeOperationError } from 'n8n-workflow';
|
||||||
import type { Sandbox } from 'n8n-nodes-base/dist/nodes/Code/Sandbox';
|
import type { Sandbox } from 'n8n-nodes-base/dist/nodes/Code/Sandbox';
|
||||||
import { getSandboxContext } from 'n8n-nodes-base/dist/nodes/Code/Sandbox';
|
import { getSandboxContext } from 'n8n-nodes-base/dist/nodes/Code/Sandbox';
|
||||||
import { JavaScriptSandbox } from 'n8n-nodes-base/dist/nodes/Code/JavaScriptSandbox';
|
import { JavaScriptSandbox } from 'n8n-nodes-base/dist/nodes/Code/JavaScriptSandbox';
|
||||||
import { PythonSandbox } from 'n8n-nodes-base/dist/nodes/Code/PythonSandbox';
|
import { PythonSandbox } from 'n8n-nodes-base/dist/nodes/Code/PythonSandbox';
|
||||||
|
|
||||||
import { DynamicTool } from '@langchain/core/tools';
|
import { DynamicStructuredTool, DynamicTool } from '@langchain/core/tools';
|
||||||
import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
|
import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
|
||||||
|
import {
|
||||||
|
inputSchemaField,
|
||||||
|
jsonSchemaExampleField,
|
||||||
|
schemaTypeField,
|
||||||
|
} from '../../../utils/descriptions';
|
||||||
|
import { generateSchema, getSandboxWithZod } from '../../../utils/schemaParsing';
|
||||||
|
import type { JSONSchema7 } from 'json-schema';
|
||||||
|
import type { DynamicZodObject } from '../../../types/zod.types';
|
||||||
|
|
||||||
export class ToolCode implements INodeType {
|
export class ToolCode implements INodeType {
|
||||||
description: INodeTypeDescription = {
|
description: INodeTypeDescription = {
|
||||||
@@ -152,6 +161,18 @@ export class ToolCode implements INodeType {
|
|||||||
description: 'E.g. Converts any text to uppercase',
|
description: 'E.g. Converts any text to uppercase',
|
||||||
noDataExpression: true,
|
noDataExpression: true,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
displayName: 'Specify Input Schema',
|
||||||
|
name: 'specifyInputSchema',
|
||||||
|
type: 'boolean',
|
||||||
|
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.',
|
||||||
|
noDataExpression: true,
|
||||||
|
default: false,
|
||||||
|
},
|
||||||
|
{ ...schemaTypeField, displayOptions: { show: { specifyInputSchema: [true] } } },
|
||||||
|
jsonSchemaExampleField,
|
||||||
|
inputSchemaField,
|
||||||
],
|
],
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -162,6 +183,8 @@ export class ToolCode implements INodeType {
|
|||||||
const name = this.getNodeParameter('name', itemIndex) as string;
|
const name = this.getNodeParameter('name', itemIndex) as string;
|
||||||
const description = this.getNodeParameter('description', itemIndex) as string;
|
const description = this.getNodeParameter('description', itemIndex) as string;
|
||||||
|
|
||||||
|
const useSchema = this.getNodeParameter('specifyInputSchema', itemIndex) as boolean;
|
||||||
|
|
||||||
const language = this.getNodeParameter('language', itemIndex) as string;
|
const language = this.getNodeParameter('language', itemIndex) as string;
|
||||||
let code = '';
|
let code = '';
|
||||||
if (language === 'javaScript') {
|
if (language === 'javaScript') {
|
||||||
@@ -170,7 +193,7 @@ export class ToolCode implements INodeType {
|
|||||||
code = this.getNodeParameter('pythonCode', itemIndex) as string;
|
code = this.getNodeParameter('pythonCode', itemIndex) as string;
|
||||||
}
|
}
|
||||||
|
|
||||||
const getSandbox = (query: string, index = 0) => {
|
const getSandbox = (query: string | IDataObject, index = 0) => {
|
||||||
const context = getSandboxContext.call(this, index);
|
const context = getSandboxContext.call(this, index);
|
||||||
context.query = query;
|
context.query = query;
|
||||||
|
|
||||||
@@ -191,17 +214,12 @@ export class ToolCode implements INodeType {
|
|||||||
return sandbox;
|
return sandbox;
|
||||||
};
|
};
|
||||||
|
|
||||||
const runFunction = async (query: string): Promise<string> => {
|
const runFunction = async (query: string | IDataObject): Promise<string> => {
|
||||||
const sandbox = getSandbox(query, itemIndex);
|
const sandbox = getSandbox(query, itemIndex);
|
||||||
return await (sandbox.runCode() as Promise<string>);
|
return await (sandbox.runCode() as Promise<string>);
|
||||||
};
|
};
|
||||||
|
|
||||||
return {
|
const toolHandler = async (query: string | IDataObject): Promise<string> => {
|
||||||
response: new DynamicTool({
|
|
||||||
name,
|
|
||||||
description,
|
|
||||||
|
|
||||||
func: async (query: string): Promise<string> => {
|
|
||||||
const { index } = this.addInputData(NodeConnectionType.AiTool, [[{ json: { query } }]]);
|
const { index } = this.addInputData(NodeConnectionType.AiTool, [[{ json: { query } }]]);
|
||||||
|
|
||||||
let response: string = '';
|
let response: string = '';
|
||||||
@@ -232,8 +250,48 @@ export class ToolCode implements INodeType {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return response;
|
return response;
|
||||||
},
|
};
|
||||||
}),
|
|
||||||
|
const commonToolOptions = {
|
||||||
|
name,
|
||||||
|
description,
|
||||||
|
func: toolHandler,
|
||||||
|
};
|
||||||
|
|
||||||
|
let tool: DynamicTool | DynamicStructuredTool | undefined = undefined;
|
||||||
|
|
||||||
|
if (useSchema) {
|
||||||
|
try {
|
||||||
|
// We initialize these even though one of them will always be empty
|
||||||
|
// it makes it easier to navigate the ternary operator
|
||||||
|
const jsonExample = this.getNodeParameter('jsonSchemaExample', itemIndex, '') as string;
|
||||||
|
const inputSchema = this.getNodeParameter('inputSchema', itemIndex, '') as string;
|
||||||
|
|
||||||
|
const schemaType = this.getNodeParameter('schemaType', itemIndex) as 'fromJson' | 'manual';
|
||||||
|
const jsonSchema =
|
||||||
|
schemaType === 'fromJson'
|
||||||
|
? generateSchema(jsonExample)
|
||||||
|
: jsonParse<JSONSchema7>(inputSchema);
|
||||||
|
|
||||||
|
const zodSchemaSandbox = getSandboxWithZod(this, jsonSchema, 0);
|
||||||
|
const zodSchema = (await zodSchemaSandbox.runCode()) as DynamicZodObject;
|
||||||
|
|
||||||
|
tool = new DynamicStructuredTool<typeof zodSchema>({
|
||||||
|
schema: zodSchema,
|
||||||
|
...commonToolOptions,
|
||||||
|
});
|
||||||
|
} catch (error) {
|
||||||
|
throw new NodeOperationError(
|
||||||
|
this.getNode(),
|
||||||
|
'Error during parsing of JSON Schema. \n ' + error,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
tool = new DynamicTool(commonToolOptions);
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
response: tool,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user