n8n 2.29.2 → 2.29.4
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/modules/instance-ai/instance-ai-credit.service.js +10 -6
- package/dist/modules/instance-ai/instance-ai-credit.service.js.map +1 -1
- package/dist/modules/instance-ai/instance-ai-model.service.js +2 -2
- package/dist/modules/instance-ai/instance-ai-model.service.js.map +1 -1
- package/dist/modules/instance-ai/instance-ai.adapter.service.d.ts +4 -1
- package/dist/modules/instance-ai/instance-ai.adapter.service.js +31 -38
- package/dist/modules/instance-ai/instance-ai.adapter.service.js.map +1 -1
- package/dist/modules/instance-ai/instance-ai.service.js +3 -1
- package/dist/modules/instance-ai/instance-ai.service.js.map +1 -1
- package/dist/modules/instance-ai/sandbox/instance-ai-sandbox.service.d.ts +1 -1
- package/dist/modules/instance-ai/sandbox/instance-ai-sandbox.service.js +1 -1
- package/dist/modules/instance-ai/sandbox/instance-ai-sandbox.service.js.map +1 -1
- package/dist/modules/instance-ai/tracing/instance-ai-tracing.service.js +1 -1
- package/dist/modules/instance-ai/tracing/instance-ai-tracing.service.js.map +1 -1
- package/dist/modules/mcp-registry/synthesize-type-def.js +2 -2
- package/dist/modules/mcp-registry/synthesize-type-def.js.map +1 -1
- package/dist/node-catalog/node-catalog.service.d.ts +19 -0
- package/dist/node-catalog/node-catalog.service.js +126 -21
- package/dist/node-catalog/node-catalog.service.js.map +1 -1
- package/package.json +26 -25
|
@@ -56,7 +56,7 @@ let InstanceAiCreditService = InstanceAiCreditService_1 = class InstanceAiCredit
|
|
|
56
56
|
this.logger.debug('Claiming Instance AI credits', { threadId, dedupeId, status, usage });
|
|
57
57
|
let result;
|
|
58
58
|
try {
|
|
59
|
-
result = await this.claimTokensWithRetry(user, dedupeId, usage);
|
|
59
|
+
result = await this.claimTokensWithRetry(user, threadId, dedupeId, usage);
|
|
60
60
|
}
|
|
61
61
|
catch (error) {
|
|
62
62
|
this.claimedRunIds.delete(dedupeId);
|
|
@@ -136,21 +136,25 @@ let InstanceAiCreditService = InstanceAiCreditService_1 = class InstanceAiCredit
|
|
|
136
136
|
}
|
|
137
137
|
async getProxyAuth(user) {
|
|
138
138
|
const client = await this.aiService.getClient();
|
|
139
|
-
const token = await client.
|
|
139
|
+
const token = await client.getInstanceAiApiProxyToken({ id: user.id }, { userMessageId: (0, nanoid_1.nanoid)() });
|
|
140
140
|
return {
|
|
141
141
|
client,
|
|
142
142
|
headers: { Authorization: `${token.tokenType} ${token.accessToken}` },
|
|
143
143
|
};
|
|
144
144
|
}
|
|
145
|
-
async claimTokens(user, dedupeId, usage) {
|
|
145
|
+
async claimTokens(user, threadId, dedupeId, usage) {
|
|
146
146
|
const { client, headers } = await this.getProxyAuth(user);
|
|
147
|
-
return await client.
|
|
147
|
+
return await client.markInstanceAiTokenUsage({ id: user.id }, headers, {
|
|
148
|
+
dedupeId,
|
|
149
|
+
usage,
|
|
150
|
+
threadId,
|
|
151
|
+
});
|
|
148
152
|
}
|
|
149
|
-
async claimTokensWithRetry(user, dedupeId, usage) {
|
|
153
|
+
async claimTokensWithRetry(user, threadId, dedupeId, usage) {
|
|
150
154
|
let lastError;
|
|
151
155
|
for (let attempt = 1; attempt <= InstanceAiCreditService_1.CLAIM_MAX_ATTEMPTS; attempt++) {
|
|
152
156
|
try {
|
|
153
|
-
return await this.claimTokens(user, dedupeId, usage);
|
|
157
|
+
return await this.claimTokens(user, threadId, dedupeId, usage);
|
|
154
158
|
}
|
|
155
159
|
catch (error) {
|
|
156
160
|
lastError = error;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instance-ai-credit.service.js","sourceRoot":"","sources":["../../../src/modules/instance-ai/instance-ai-credit.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,wDAA6C;AAE7C,gCAAkC;AAElC,uCAA4C;AAC5C,+CAAsD;AACtD,mCAAgC;AAEhC,iCAA8B;AAC9B,sDAAkD;AAClD,2CAAwC;AAExC,gGAA0F;AAE1F,SAAS,eAAe,CAAC,KAAc;IACtC,OAAO,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AAC/D,CAAC;AAcM,IAAM,uBAAuB,+BAA7B,MAAM,uBAAuB;IAiBnC,YACC,MAAc,EACG,SAAoB,EACpB,SAAoB,EACpB,gBAAkC,EAClC,IAAU,EACV,UAAsC;QAJtC,cAAS,GAAT,SAAS,CAAW;QACpB,cAAS,GAAT,SAAS,CAAW;QACpB,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,SAAI,GAAJ,IAAI,CAAM;QACV,eAAU,GAAV,UAAU,CAA4B;QAdvC,kBAAa,GAAG,IAAI,GAAG,EAAU,CAAC;QAgBlD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;IAC5C,CAAC;IAcD,KAAK,CAAC,aAAa,CAClB,IAAU,EACV,QAAgB,EAChB,QAAgB,EAChB,KAAyB,EACzB,MAAmB;QAEnB,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,EAAE,CAAC;YACtC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mDAAmD,EAAE;gBACtE,QAAQ;gBACR,QAAQ;aACR,CAAC,CAAC;YACH,OAAO;QACR,CAAC;QACD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACxB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,6CAA6C,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC;YACzF,OAAO;QACR,CAAC;QACD,IAAI,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;YACtC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oDAAoD,EAAE;gBACvE,QAAQ;gBACR,QAAQ;aACR,CAAC,CAAC;YACH,OAAO;QACR,CAAC;QAED,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,CAAC;QACpC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,8BAA8B,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;QAKzF,IAAI,MAAoD,CAAC;QACzD,IAAI,CAAC;YACJ,MAAM,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"instance-ai-credit.service.js","sourceRoot":"","sources":["../../../src/modules/instance-ai/instance-ai-credit.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -66,7 +66,7 @@ let InstanceAiModelService = class InstanceAiModelService {
|
|
|
66
66
|
const client = await this.aiService.getClient();
|
|
67
67
|
const proxyBaseUrl = client.getApiProxyBaseUrl();
|
|
68
68
|
const tokenManager = new proxy_token_manager_1.ProxyTokenManager(async () => {
|
|
69
|
-
return await client.
|
|
69
|
+
return await client.getInstanceAiApiProxyToken({ id: user.id }, { userMessageId: (0, nanoid_1.nanoid)() });
|
|
70
70
|
});
|
|
71
71
|
return await this.resolveProxyModel(user, proxyBaseUrl, tokenManager);
|
|
72
72
|
}
|
|
@@ -122,7 +122,7 @@ let InstanceAiModelService = class InstanceAiModelService {
|
|
|
122
122
|
return { creditsQuota: api_types_1.UNLIMITED_CREDITS, creditsClaimed: 0 };
|
|
123
123
|
}
|
|
124
124
|
const client = await this.aiService.getClient();
|
|
125
|
-
return await client.
|
|
125
|
+
return await client.getInstanceAiCredits({ id: user.id });
|
|
126
126
|
}
|
|
127
127
|
};
|
|
128
128
|
exports.InstanceAiModelService = InstanceAiModelService;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instance-ai-model.service.js","sourceRoot":"","sources":["../../../src/modules/instance-ai/instance-ai-model.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAAsE;AACtE,0DAAoD;AAEpD,gCAAkC;AAElC,mCAAgC;AAEhC,2CAA0C;AAC1C,sDAAkD;AAClD,wEAAmE;AACnE,2DAA4D;AAE5D,iFAA2E;AAmBpE,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAClC,YACkB,eAA0C,EAC1C,SAAoB,EACpB,YAA0B;QAF1B,oBAAe,GAAf,eAAe,CAA2B;QAC1C,cAAS,GAAT,SAAS,CAAW;QACpB,iBAAY,GAAZ,YAAY,CAAc;IACzC,CAAC;IAGJ,cAAc;QACb,OAAO,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,CAAC;IACxC,CAAC;IAaD,KAAK,CAAC,uBAAuB,CAAC,IAAU;QACvC,IAAI,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,EAAE,CAAC;YACrC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC;YAChD,MAAM,YAAY,GAAG,MAAM,CAAC,kBAAkB,EAAE,CAAC;YACjD,MAAM,YAAY,GAAG,IAAI,uCAAiB,CAAC,KAAK,IAAI,EAAE;gBACrD,OAAO,MAAM,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"instance-ai-model.service.js","sourceRoot":"","sources":["../../../src/modules/instance-ai/instance-ai-model.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,6 +14,7 @@ import { ExecutionPersistence } from '../../executions/execution-persistence';
|
|
|
14
14
|
import { License } from '../../license';
|
|
15
15
|
import { LoadNodesAndCredentials } from '../../load-nodes-and-credentials';
|
|
16
16
|
import { NodeTypes } from '../../node-types';
|
|
17
|
+
import { NodeCatalogService } from '../../node-catalog';
|
|
17
18
|
import { DataTableRepository } from '../../modules/data-table/data-table.repository';
|
|
18
19
|
import { DataTableService } from '../../modules/data-table/data-table.service';
|
|
19
20
|
import { SourceControlPreferencesService } from '../../modules/source-control.ee/source-control-preferences.service.ee';
|
|
@@ -61,13 +62,14 @@ export declare class InstanceAiAdapterService {
|
|
|
61
62
|
private readonly aiBuilderTemporaryWorkflowRepository;
|
|
62
63
|
private readonly ssrfProtectionService;
|
|
63
64
|
private readonly outboundHttp;
|
|
65
|
+
private readonly nodeCatalogService?;
|
|
64
66
|
private readonly logger;
|
|
65
67
|
private readonly allowSendingParameterValues;
|
|
66
68
|
private nodesCache;
|
|
67
69
|
private readonly NODES_CACHE_TTL_MS;
|
|
68
70
|
private templatesService;
|
|
69
71
|
private getNodesFromCache;
|
|
70
|
-
constructor(logger: Logger, globalConfig: GlobalConfig, workflowService: WorkflowService, workflowFinderService: WorkflowFinderService, workflowRepository: WorkflowRepository, sharedWorkflowRepository: SharedWorkflowRepository, projectRepository: ProjectRepository, executionRepository: ExecutionRepository, credentialsService: CredentialsService, credentialsFinderService: CredentialsFinderService, activeExecutions: ActiveExecutions, workflowRunner: WorkflowRunner, loadNodesAndCredentials: LoadNodesAndCredentials, nodeTypes: NodeTypes, instanceSettings: InstanceSettings, dataTableService: DataTableService, dataTableRepository: DataTableRepository, nodeResourceExplorerService: NodeResourceExplorerService, folderService: FolderService, projectService: ProjectService, tagService: TagService, sourceControlPreferencesService: SourceControlPreferencesService, settingsService: InstanceAiSettingsService, workflowHistoryService: WorkflowHistoryService, enterpriseWorkflowService: EnterpriseWorkflowService, license: License, executionPersistence: ExecutionPersistence, eventService: EventService, roleService: RoleService, telemetry: Telemetry, aiBuilderTemporaryWorkflowRepository: AiBuilderTemporaryWorkflowRepository, ssrfProtectionService: SsrfProtectionService, outboundHttp: OutboundHttp);
|
|
72
|
+
constructor(logger: Logger, globalConfig: GlobalConfig, workflowService: WorkflowService, workflowFinderService: WorkflowFinderService, workflowRepository: WorkflowRepository, sharedWorkflowRepository: SharedWorkflowRepository, projectRepository: ProjectRepository, executionRepository: ExecutionRepository, credentialsService: CredentialsService, credentialsFinderService: CredentialsFinderService, activeExecutions: ActiveExecutions, workflowRunner: WorkflowRunner, loadNodesAndCredentials: LoadNodesAndCredentials, nodeTypes: NodeTypes, instanceSettings: InstanceSettings, dataTableService: DataTableService, dataTableRepository: DataTableRepository, nodeResourceExplorerService: NodeResourceExplorerService, folderService: FolderService, projectService: ProjectService, tagService: TagService, sourceControlPreferencesService: SourceControlPreferencesService, settingsService: InstanceAiSettingsService, workflowHistoryService: WorkflowHistoryService, enterpriseWorkflowService: EnterpriseWorkflowService, license: License, executionPersistence: ExecutionPersistence, eventService: EventService, roleService: RoleService, telemetry: Telemetry, aiBuilderTemporaryWorkflowRepository: AiBuilderTemporaryWorkflowRepository, ssrfProtectionService: SsrfProtectionService, outboundHttp: OutboundHttp, nodeCatalogService?: NodeCatalogService | undefined);
|
|
71
73
|
createContext(user: User, options?: {
|
|
72
74
|
searchProxyConfig?: ServiceProxyConfig;
|
|
73
75
|
pushRef?: string;
|
|
@@ -89,6 +91,7 @@ export declare class InstanceAiAdapterService {
|
|
|
89
91
|
private buildSearchMethod;
|
|
90
92
|
private _nodeDefinitionDirs?;
|
|
91
93
|
getNodeDefinitionDirs(): string[];
|
|
94
|
+
private getNodeCatalogService;
|
|
92
95
|
private createNodeAdapter;
|
|
93
96
|
private createWorkspaceAdapter;
|
|
94
97
|
}
|
|
@@ -80,10 +80,10 @@ const execution_persistence_1 = require("../../executions/execution-persistence"
|
|
|
80
80
|
const license_1 = require("../../license");
|
|
81
81
|
const load_nodes_and_credentials_1 = require("../../load-nodes-and-credentials");
|
|
82
82
|
const node_types_1 = require("../../node-types");
|
|
83
|
+
const node_catalog_1 = require("../../node-catalog");
|
|
83
84
|
const data_table_repository_1 = require("../../modules/data-table/data-table.repository");
|
|
84
85
|
const data_table_service_1 = require("../../modules/data-table/data-table.service");
|
|
85
86
|
const node_description_transform_1 = require("../../modules/mcp-registry/node-description-transform");
|
|
86
|
-
const synthesize_type_def_1 = require("../../modules/mcp-registry/synthesize-type-def");
|
|
87
87
|
const source_control_preferences_service_ee_1 = require("../../modules/source-control.ee/source-control-preferences.service.ee");
|
|
88
88
|
const check_access_1 = require("../../permissions.ee/check-access");
|
|
89
89
|
const folder_service_1 = require("../../services/folder.service");
|
|
@@ -124,7 +124,7 @@ let InstanceAiAdapterService = class InstanceAiAdapterService {
|
|
|
124
124
|
});
|
|
125
125
|
return await promise;
|
|
126
126
|
}
|
|
127
|
-
constructor(logger, globalConfig, workflowService, workflowFinderService, workflowRepository, sharedWorkflowRepository, projectRepository, executionRepository, credentialsService, credentialsFinderService, activeExecutions, workflowRunner, loadNodesAndCredentials, nodeTypes, instanceSettings, dataTableService, dataTableRepository, nodeResourceExplorerService, folderService, projectService, tagService, sourceControlPreferencesService, settingsService, workflowHistoryService, enterpriseWorkflowService, license, executionPersistence, eventService, roleService, telemetry, aiBuilderTemporaryWorkflowRepository, ssrfProtectionService, outboundHttp) {
|
|
127
|
+
constructor(logger, globalConfig, workflowService, workflowFinderService, workflowRepository, sharedWorkflowRepository, projectRepository, executionRepository, credentialsService, credentialsFinderService, activeExecutions, workflowRunner, loadNodesAndCredentials, nodeTypes, instanceSettings, dataTableService, dataTableRepository, nodeResourceExplorerService, folderService, projectService, tagService, sourceControlPreferencesService, settingsService, workflowHistoryService, enterpriseWorkflowService, license, executionPersistence, eventService, roleService, telemetry, aiBuilderTemporaryWorkflowRepository, ssrfProtectionService, outboundHttp, nodeCatalogService) {
|
|
128
128
|
this.workflowService = workflowService;
|
|
129
129
|
this.workflowFinderService = workflowFinderService;
|
|
130
130
|
this.workflowRepository = workflowRepository;
|
|
@@ -156,6 +156,7 @@ let InstanceAiAdapterService = class InstanceAiAdapterService {
|
|
|
156
156
|
this.aiBuilderTemporaryWorkflowRepository = aiBuilderTemporaryWorkflowRepository;
|
|
157
157
|
this.ssrfProtectionService = ssrfProtectionService;
|
|
158
158
|
this.outboundHttp = outboundHttp;
|
|
159
|
+
this.nodeCatalogService = nodeCatalogService;
|
|
159
160
|
this.nodesCache = null;
|
|
160
161
|
this.NODES_CACHE_TTL_MS = 5 * 60 * 1000;
|
|
161
162
|
this.webResearchCache = new web_research_1.LRUCache({
|
|
@@ -168,6 +169,9 @@ let InstanceAiAdapterService = class InstanceAiAdapterService {
|
|
|
168
169
|
});
|
|
169
170
|
this.logger = logger.scoped('instance-ai');
|
|
170
171
|
this.allowSendingParameterValues = globalConfig.ai.allowSendingParameterValues;
|
|
172
|
+
this.loadNodesAndCredentials.addPostProcessor?.(async () => {
|
|
173
|
+
this.nodesCache = null;
|
|
174
|
+
});
|
|
171
175
|
}
|
|
172
176
|
createContext(user, options) {
|
|
173
177
|
const { searchProxyConfig, pushRef, threadId, projectId, credentialIdAllowlist } = options ?? {};
|
|
@@ -1317,11 +1321,17 @@ let InstanceAiAdapterService = class InstanceAiAdapterService {
|
|
|
1317
1321
|
return undefined;
|
|
1318
1322
|
}
|
|
1319
1323
|
getNodeDefinitionDirs() {
|
|
1324
|
+
const catalogDirs = this.nodeCatalogService?.getNodeDefinitionDirs();
|
|
1325
|
+
if (catalogDirs?.length)
|
|
1326
|
+
return catalogDirs;
|
|
1320
1327
|
if (!this._nodeDefinitionDirs) {
|
|
1321
1328
|
this._nodeDefinitionDirs = (0, node_definition_resolver_1.resolveBuiltinNodeDefinitionDirs)();
|
|
1322
1329
|
}
|
|
1323
1330
|
return this._nodeDefinitionDirs;
|
|
1324
1331
|
}
|
|
1332
|
+
getNodeCatalogService() {
|
|
1333
|
+
return this.nodeCatalogService ?? di_1.Container.get(node_catalog_1.NodeCatalogService);
|
|
1334
|
+
}
|
|
1325
1335
|
createNodeAdapter(user) {
|
|
1326
1336
|
const getNodes = async () => await this.getNodesFromCache();
|
|
1327
1337
|
const findNodeByVersion = (nodes, nodeType, version) => {
|
|
@@ -1338,17 +1348,6 @@ let InstanceAiAdapterService = class InstanceAiAdapterService {
|
|
|
1338
1348
|
}
|
|
1339
1349
|
return nodes.find((n) => n.name === nodeType);
|
|
1340
1350
|
};
|
|
1341
|
-
const normalizeNodeVersion = (version) => {
|
|
1342
|
-
if (!version)
|
|
1343
|
-
return undefined;
|
|
1344
|
-
const normalized = version.replace(/^v/i, '');
|
|
1345
|
-
if (!/^\d+$/.test(normalized))
|
|
1346
|
-
return Number(normalized);
|
|
1347
|
-
if (normalized.length === 2) {
|
|
1348
|
-
return Number(`${normalized[0]}.${normalized[1]}`);
|
|
1349
|
-
}
|
|
1350
|
-
return Number(normalized);
|
|
1351
|
-
};
|
|
1352
1351
|
return {
|
|
1353
1352
|
async listAvailable(options) {
|
|
1354
1353
|
const nodes = await getNodes();
|
|
@@ -1473,32 +1472,25 @@ let InstanceAiAdapterService = class InstanceAiAdapterService {
|
|
|
1473
1472
|
};
|
|
1474
1473
|
},
|
|
1475
1474
|
getNodeTypeDefinition: async (nodeType, options) => {
|
|
1476
|
-
const
|
|
1477
|
-
|
|
1478
|
-
|
|
1479
|
-
|
|
1480
|
-
|
|
1481
|
-
|
|
1482
|
-
|
|
1483
|
-
|
|
1484
|
-
|
|
1485
|
-
|
|
1486
|
-
|
|
1487
|
-
|
|
1488
|
-
|
|
1489
|
-
|
|
1490
|
-
return { content: '', error: result.error };
|
|
1491
|
-
}
|
|
1492
|
-
const nodeDesc = findNodeByVersion(nodes, nodeType, normalizeNodeVersion(result.version ?? options?.version));
|
|
1493
|
-
const builderHint = nodeDesc?.builderHint?.searchHint;
|
|
1494
|
-
return {
|
|
1495
|
-
content: result.content,
|
|
1496
|
-
version: result.version,
|
|
1497
|
-
...(builderHint ? { builderHint } : {}),
|
|
1498
|
-
};
|
|
1475
|
+
const nodeCatalogService = this.getNodeCatalogService();
|
|
1476
|
+
await nodeCatalogService.initialize();
|
|
1477
|
+
const { version, resource, operation, mode } = options ?? {};
|
|
1478
|
+
const getDefinition = async (nodeId) => await nodeCatalogService.getNodeTypeDefinition({
|
|
1479
|
+
nodeId,
|
|
1480
|
+
...(version ? { version } : {}),
|
|
1481
|
+
...(resource ? { resource } : {}),
|
|
1482
|
+
...(operation ? { operation } : {}),
|
|
1483
|
+
...(mode ? { mode } : {}),
|
|
1484
|
+
});
|
|
1485
|
+
const result = await getDefinition(nodeType);
|
|
1486
|
+
if (!result.error || nodeType.includes('.'))
|
|
1487
|
+
return result;
|
|
1488
|
+
return await getDefinition(`${node_description_transform_1.MCP_REGISTRY_PACKAGE_NAME}.${nodeType}`);
|
|
1499
1489
|
},
|
|
1500
1490
|
listDiscriminators: async (nodeType) => {
|
|
1501
|
-
|
|
1491
|
+
const nodeCatalogService = this.getNodeCatalogService();
|
|
1492
|
+
await nodeCatalogService.initialize();
|
|
1493
|
+
return (0, node_definition_resolver_1.listNodeDiscriminators)(nodeType, nodeCatalogService.getNodeDefinitionDirs());
|
|
1502
1494
|
},
|
|
1503
1495
|
getParameterIssues: async (nodeType, typeVersion, parameters) => {
|
|
1504
1496
|
const nodes = await getNodes();
|
|
@@ -1793,7 +1785,8 @@ exports.InstanceAiAdapterService = InstanceAiAdapterService = __decorate([
|
|
|
1793
1785
|
telemetry_1.Telemetry,
|
|
1794
1786
|
db_1.AiBuilderTemporaryWorkflowRepository,
|
|
1795
1787
|
backend_network_1.SsrfProtectionService,
|
|
1796
|
-
backend_network_1.OutboundHttp
|
|
1788
|
+
backend_network_1.OutboundHttp,
|
|
1789
|
+
node_catalog_1.NodeCatalogService])
|
|
1797
1790
|
], InstanceAiAdapterService);
|
|
1798
1791
|
const MAX_RESULT_CHARS = 20_000;
|
|
1799
1792
|
const MAX_NODE_OUTPUT_CHARS = 1_000;
|