feat(editor): Easy $fromAI Button for AI Tools (#12587)

This commit is contained in:
Charlie Kolb
2025-02-05 08:42:50 +01:00
committed by GitHub
parent 182fc150be
commit 21773764d3
34 changed files with 1711 additions and 328 deletions

View File

@@ -99,3 +99,5 @@ export const TRIMMED_TASK_DATA_CONNECTIONS_KEY = '__isTrimmedManualExecutionData
export const OPEN_AI_API_CREDENTIAL_TYPE = 'openAiApi';
export const FREE_AI_CREDITS_ERROR_TYPE = 'free_ai_credits_request_error';
export const FREE_AI_CREDITS_USED_ALL_CREDITS_ERROR_CODE = 400;
export const FROM_AI_AUTO_GENERATED_MARKER = '/*n8n-auto-generated-fromAI-override*/';

View File

@@ -6,6 +6,7 @@ import {
EXECUTE_WORKFLOW_NODE_TYPE,
FREE_AI_CREDITS_ERROR_TYPE,
FREE_AI_CREDITS_USED_ALL_CREDITS_ERROR_CODE,
FROM_AI_AUTO_GENERATED_MARKER,
HTTP_REQUEST_NODE_TYPE,
HTTP_REQUEST_TOOL_LANGCHAIN_NODE_TYPE,
LANGCHAIN_CUSTOM_TOOLS,
@@ -525,3 +526,60 @@ export const userInInstanceRanOutOfFreeAiCredits = (runData: IRun): boolean => {
return false;
};
export type FromAICount = {
aiNodeCount: number;
aiToolCount: number;
fromAIOverrideCount: number;
fromAIExpressionCount: number;
};
export function resolveAIMetrics(nodes: INode[], nodeTypes: INodeTypes): FromAICount | {} {
const resolvedNodes = nodes
.map((x) => [x, nodeTypes.getByNameAndVersion(x.type, x.typeVersion)] as const)
.filter((x) => !!x[1]?.description);
const aiNodeCount = resolvedNodes.reduce(
(acc, x) => acc + Number(x[1].description.codex?.categories?.includes('AI')),
0,
);
if (aiNodeCount === 0) return {};
let fromAIOverrideCount = 0;
let fromAIExpressionCount = 0;
const tools = resolvedNodes.filter((node) =>
node[1].description.codex?.subcategories?.AI?.includes('Tools'),
);
for (const [node, _] of tools) {
// FlatMap to support values in resourceLocators
const values = Object.values(node.parameters).flatMap((param) => {
if (param && typeof param === 'object' && 'value' in param) param = param.value;
return typeof param === 'string' ? param : [];
});
// Note that we don't match the i in `fromAI` to support lower case i (though we miss fromai)
const overrides = values.reduce(
(acc, value) => acc + Number(value.startsWith(`={{ ${FROM_AI_AUTO_GENERATED_MARKER} $fromA`)),
0,
);
fromAIOverrideCount += overrides;
// check for = to avoid scanning lengthy text fields
// this will re-count overrides
fromAIExpressionCount +=
values.reduce(
(acc, value) => acc + Number(value[0] === '=' && value.includes('$fromA', 2)),
0,
) - overrides;
}
return {
aiNodeCount,
aiToolCount: tools.length,
fromAIOverrideCount,
fromAIExpressionCount,
};
}

View File

@@ -10,6 +10,9 @@ describe('extractFromAICalls', () => {
test.each<[string, [unknown, unknown, unknown, unknown]]>([
['$fromAI("a", "b", "string")', ['a', 'b', 'string', undefined]],
['$fromAI("a", "b", "number", 5)', ['a', 'b', 'number', 5]],
['$fromAI("a", "`", "number", 5)', ['a', '`', 'number', 5]],
['$fromAI("a", "\\`", "number", 5)', ['a', '`', 'number', 5]], // this is a bit surprising, but intended
['$fromAI("a", "\\n", "number", 5)', ['a', 'n', 'number', 5]], // this is a bit surprising, but intended
['{{ $fromAI("a", "b", "boolean") }}', ['a', 'b', 'boolean', undefined]],
])('should parse args as expected for %s', (formula, [key, description, type, defaultValue]) => {
expect(extractFromAICalls(formula)).toEqual([

View File

@@ -3,7 +3,7 @@ import { v5 as uuidv5, v3 as uuidv3, v4 as uuidv4, v1 as uuidv1 } from 'uuid';
import { STICKY_NODE_TYPE } from '@/Constants';
import { ApplicationError, ExpressionError, NodeApiError } from '@/errors';
import type { IRun, IRunData } from '@/Interfaces';
import type { INode, INodeTypeDescription, IRun, IRunData } from '@/Interfaces';
import { NodeConnectionType, type IWorkflowBase } from '@/Interfaces';
import * as nodeHelpers from '@/NodeHelpers';
import {
@@ -12,11 +12,13 @@ import {
generateNodesGraph,
getDomainBase,
getDomainPath,
resolveAIMetrics,
userInInstanceRanOutOfFreeAiCredits,
} from '@/TelemetryHelpers';
import { randomInt } from '@/utils';
import { nodeTypes } from './ExpressionExtensions/Helpers';
import type { NodeTypes } from './NodeTypes';
describe('getDomainBase should return protocol plus domain', () => {
test('in valid URLs', () => {
@@ -1541,3 +1543,109 @@ function generateTestWorkflowAndRunData(): { workflow: Partial<IWorkflowBase>; r
return { workflow, runData };
}
describe('makeAIMetrics', () => {
const makeNode = (parameters: object, type: string) =>
({
parameters,
type,
typeVersion: 2.1,
id: '7cb0b373-715c-4a89-8bbb-3f238907bc86',
name: 'a name',
position: [0, 0],
}) as INode;
it('should count applicable nodes and parameters', async () => {
const nodes = [
makeNode(
{
sendTo: "={{ /*n8n-auto-generated-fromAI-override*/ $fromAI('To', ``, 'string') }}",
sendTwo: "={{ /*n8n-auto-generated-fromAI-override*/ $fromAI('To', ``, 'string') }}",
subject: "={{ $fromAI('Subject', ``, 'string') }}",
},
'n8n-nodes-base.gmailTool',
),
makeNode(
{
subject: "={{ $fromAI('Subject', ``, 'string') }}",
verb: "={{ $fromAI('Verb', ``, 'string') }}",
},
'n8n-nodes-base.gmailTool',
),
makeNode(
{
subject: "'A Subject'",
},
'n8n-nodes-base.gmailTool',
),
];
const nodeTypes = mock<NodeTypes>({
getByNameAndVersion: () => ({
description: {
codex: {
categories: ['AI'],
subcategories: { AI: ['Tools'] },
},
} as unknown as INodeTypeDescription,
}),
});
const result = resolveAIMetrics(nodes, nodeTypes);
expect(result).toMatchObject({
aiNodeCount: 3,
aiToolCount: 3,
fromAIOverrideCount: 2,
fromAIExpressionCount: 3,
});
});
it('should not count non-applicable nodes and parameters', async () => {
const nodes = [
makeNode(
{
sendTo: 'someone',
},
'n8n-nodes-base.gmail',
),
];
const nodeTypes = mock<NodeTypes>({
getByNameAndVersion: () => ({
description: {} as unknown as INodeTypeDescription,
}),
});
const result = resolveAIMetrics(nodes, nodeTypes);
expect(result).toMatchObject({});
});
it('should count ai nodes without tools', async () => {
const nodes = [
makeNode(
{
sendTo: 'someone',
},
'n8n-nodes-base.gmailTool',
),
];
const nodeTypes = mock<NodeTypes>({
getByNameAndVersion: () => ({
description: {
codex: {
categories: ['AI'],
},
} as unknown as INodeTypeDescription,
}),
});
const result = resolveAIMetrics(nodes, nodeTypes);
expect(result).toMatchObject({
aiNodeCount: 1,
aiToolCount: 0,
fromAIOverrideCount: 0,
fromAIExpressionCount: 0,
});
});
});