@n8n/n8n-nodes-langchain 2.39.2 → 2.40.0
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/credentials/BraveSearchApi.credentials.js +1 -0
- package/dist/credentials/BraveSearchApi.credentials.js.map +1 -1
- package/dist/node-definitions/.nodes-hash +1 -1
- package/dist/node-definitions/nodes/n8n-nodes-langchain/agent/v3.schema.js +1 -1
- package/dist/node-definitions/nodes/n8n-nodes-langchain/agent/v3.ts +4 -0
- package/dist/node-definitions/nodes/n8n-nodes-langchain/agent/v31.schema.js +1 -1
- package/dist/node-definitions/nodes/n8n-nodes-langchain/agent/v31.ts +4 -0
- package/dist/node-definitions/nodes/n8n-nodes-langchain/agentTool/v3.schema.js +1 -1
- package/dist/node-definitions/nodes/n8n-nodes-langchain/agentTool/v3.ts +4 -0
- package/dist/node-definitions/nodes/n8n-nodes-langchain/guardrails/v1.ts +4 -4
- package/dist/node-definitions/nodes/n8n-nodes-langchain/guardrails/v2.ts +4 -4
- package/dist/nodes/Guardrails/description.js +1 -1
- package/dist/nodes/Guardrails/description.js.map +1 -1
- package/dist/nodes/agents/Agent/Agent.node.js +45 -0
- package/dist/nodes/agents/Agent/Agent.node.js.map +1 -1
- package/dist/nodes/agents/Agent/agents/ToolsAgent/V3/description.js +8 -0
- package/dist/nodes/agents/Agent/agents/ToolsAgent/V3/description.js.map +1 -1
- package/dist/nodes/agents/Agent/agents/ToolsAgent/V3/helpers/createAgentSequence.d.ts +1 -1
- package/dist/nodes/agents/Agent/agents/ToolsAgent/V3/helpers/createAgentSequence.js +9 -5
- package/dist/nodes/agents/Agent/agents/ToolsAgent/V3/helpers/createAgentSequence.js.map +1 -1
- package/dist/nodes/agents/Agent/agents/ToolsAgent/V3/helpers/executeBatch.js +2 -2
- package/dist/nodes/agents/Agent/agents/ToolsAgent/V3/helpers/executeBatch.js.map +1 -1
- package/dist/nodes/agents/Agent/agents/ToolsAgent/V3/helpers/runAgent.d.ts +2 -1
- package/dist/nodes/agents/Agent/agents/ToolsAgent/V3/helpers/runAgent.js +24 -2
- package/dist/nodes/agents/Agent/agents/ToolsAgent/V3/helpers/runAgent.js.map +1 -1
- package/dist/nodes/agents/Agent/agents/ToolsAgent/V3/types.d.ts +1 -0
- package/dist/nodes/chains/InformationExtractor/InformationExtractor.node.js +1 -1
- package/dist/nodes/chains/InformationExtractor/InformationExtractor.node.js.map +1 -1
- package/dist/nodes/llms/LmChatAzureOpenAi/LmChatAzureOpenAi.node.js +2 -1
- package/dist/nodes/llms/LmChatAzureOpenAi/LmChatAzureOpenAi.node.js.map +1 -1
- package/dist/nodes/llms/LmChatDatabricks/LmChatDatabricks.node.js +72 -31
- package/dist/nodes/llms/LmChatDatabricks/LmChatDatabricks.node.js.map +1 -1
- package/dist/nodes/llms/LmChatDatabricks/constants.d.ts +1 -0
- package/dist/nodes/llms/LmChatDatabricks/constants.js +10 -0
- package/dist/nodes/llms/LmChatDatabricks/constants.js.map +1 -0
- package/dist/nodes/llms/LmChatDatabricks/error-handling.d.ts +2 -0
- package/dist/nodes/llms/LmChatDatabricks/error-handling.js +53 -0
- package/dist/nodes/llms/LmChatDatabricks/error-handling.js.map +1 -0
- package/dist/nodes/llms/LmChatDatabricks/token-provider.d.ts +6 -4
- package/dist/nodes/llms/LmChatDatabricks/token-provider.js +24 -36
- package/dist/nodes/llms/LmChatDatabricks/token-provider.js.map +1 -1
- package/dist/nodes/llms/N8nNonEstimatingTracing.js +1 -8
- package/dist/nodes/llms/N8nNonEstimatingTracing.js.map +1 -1
- package/dist/nodes/mcp/McpClientTool/utils.d.ts +1 -1
- package/dist/nodes/mcp/McpClientTool/utils.js +2 -2
- package/dist/nodes/mcp/McpClientTool/utils.js.map +1 -1
- package/dist/nodes/mcp/shared/runtime.js +2 -1
- package/dist/nodes/mcp/shared/runtime.js.map +1 -1
- package/dist/nodes/output_parser/OutputParserStructured/OutputParserStructured.node.js +1 -1
- package/dist/nodes/output_parser/OutputParserStructured/OutputParserStructured.node.js.map +1 -1
- package/dist/nodes/tools/ToolCode/ToolCode.node.js +1 -1
- package/dist/nodes/tools/ToolCode/ToolCode.node.js.map +1 -1
- package/dist/nodes/tools/ToolWorkflow/v1/ToolWorkflowV1.node.js +1 -1
- package/dist/nodes/tools/ToolWorkflow/v1/ToolWorkflowV1.node.js.map +1 -1
- package/dist/typecheck.tsbuildinfo +1 -1
- package/dist/types/credentials.json +1 -1
- package/dist/types/nodes.json +7 -7
- package/dist/utils/agent-execution/buildSteps.js +1 -1
- package/dist/utils/agent-execution/buildSteps.js.map +1 -1
- package/dist/utils/agent-execution/createEngineRequests.js +2 -2
- package/dist/utils/agent-execution/createEngineRequests.js.map +1 -1
- package/dist/utils/agent-execution/processEventStream.d.ts +1 -1
- package/dist/utils/agent-execution/processEventStream.js +8 -1
- package/dist/utils/agent-execution/processEventStream.js.map +1 -1
- package/dist/utils/agent-execution/types.d.ts +1 -0
- package/dist/utils/agent-execution/types.js.map +1 -1
- package/dist/utils/oauth2-token-provider.d.ts +24 -0
- package/dist/utils/oauth2-token-provider.js +59 -0
- package/dist/utils/oauth2-token-provider.js.map +1 -0
- package/dist/utils/schemaParsing.d.ts +2 -1
- package/dist/utils/schemaParsing.js +11 -2
- package/dist/utils/schemaParsing.js.map +1 -1
- package/package.json +16 -25
|
@@ -3,9 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.LmChatDatabricks = void 0;
|
|
4
4
|
const openai_1 = require("@langchain/openai");
|
|
5
5
|
const ai_utilities_1 = require("@n8n/ai-utilities");
|
|
6
|
+
const constants_1 = require("n8n-nodes-base/dist/nodes/Databricks/constants");
|
|
6
7
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
8
|
+
const constants_2 = require("./constants");
|
|
9
|
+
const error_handling_1 = require("./error-handling");
|
|
7
10
|
const token_provider_1 = require("./token-provider");
|
|
8
|
-
const error_handling_1 = require("../../vendors/OpenAi/helpers/error-handling");
|
|
9
11
|
function assertHttpsHost(ctx, host) {
|
|
10
12
|
if (!URL.canParse(host) || new URL(host).protocol !== 'https:') {
|
|
11
13
|
throw new n8n_workflow_1.NodeOperationError(ctx.getNode(), 'Databricks host must use https');
|
|
@@ -15,32 +17,55 @@ async function searchModels(filter) {
|
|
|
15
17
|
const credentials = await this.getCredentials('databricksOAuth2Api');
|
|
16
18
|
assertHttpsHost(this, credentials.host);
|
|
17
19
|
const host = credentials.host.replace(/\/$/, '');
|
|
18
|
-
const
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
20
|
+
const listModelServices = async (parent) => {
|
|
21
|
+
let services = [];
|
|
22
|
+
let pageToken;
|
|
23
|
+
let pages = 0;
|
|
24
|
+
do {
|
|
25
|
+
if (++pages > 50) {
|
|
26
|
+
throw new n8n_workflow_1.NodeOperationError(this.getNode(), 'Model service list exceeded 50 pages');
|
|
27
|
+
}
|
|
28
|
+
const page = await this.helpers.httpRequestWithAuthentication.call(this, 'databricksOAuth2Api', {
|
|
29
|
+
method: 'GET',
|
|
30
|
+
url: `${host}/api/2.1/unity-catalog/model-services`,
|
|
31
|
+
qs: { view: 'FULL', parent, page_token: pageToken },
|
|
32
|
+
headers: { Accept: 'application/json', 'User-Agent': constants_1.DATABRICKS_PARTNER_USER_AGENT },
|
|
33
|
+
json: true,
|
|
34
|
+
});
|
|
35
|
+
services = services.concat(page.model_services ?? []);
|
|
36
|
+
pageToken = page.next_page_token;
|
|
37
|
+
} while (pageToken);
|
|
38
|
+
return services;
|
|
39
|
+
};
|
|
40
|
+
let services;
|
|
41
|
+
try {
|
|
42
|
+
services = await listModelServices();
|
|
43
|
+
}
|
|
44
|
+
catch (error) {
|
|
45
|
+
if (!(error instanceof n8n_workflow_1.NodeApiError) || error.httpCode !== '400')
|
|
46
|
+
throw error;
|
|
47
|
+
services = await listModelServices('schemas/system.ai');
|
|
48
|
+
}
|
|
49
|
+
if (services.length === 0) {
|
|
50
|
+
throw new n8n_workflow_1.NodeOperationError(this.getNode(), 'No model services found', {
|
|
51
|
+
description: 'Check that Unity AI Gateway is enabled on this workspace and that this credential can access at least one model service',
|
|
52
|
+
});
|
|
53
|
+
}
|
|
54
|
+
const chatServices = services.filter((service) => service.supported_api_types?.some((type) => type.endsWith('/chat/completions')));
|
|
55
|
+
if (chatServices.length === 0) {
|
|
56
|
+
throw new n8n_workflow_1.NodeOperationError(this.getNode(), 'No chat-capable model services found', {
|
|
57
|
+
description: 'None of the visible model services supports chat completions. Use ID mode to enter a service name directly',
|
|
58
|
+
});
|
|
59
|
+
}
|
|
60
|
+
const allResults = chatServices.map((service) => {
|
|
61
|
+
const name = service.name.replace(/^model-services\//, '');
|
|
62
|
+
return { name, value: name, description: service.comment };
|
|
38
63
|
});
|
|
39
64
|
if (filter) {
|
|
40
65
|
const filterLower = filter.toLowerCase();
|
|
41
66
|
return {
|
|
42
67
|
results: allResults.filter((r) => r.name.toLowerCase().includes(filterLower) ||
|
|
43
|
-
r.description.toLowerCase().includes(filterLower)),
|
|
68
|
+
(r.description ?? '').toLowerCase().includes(filterLower)),
|
|
44
69
|
};
|
|
45
70
|
}
|
|
46
71
|
return { results: allResults };
|
|
@@ -89,7 +114,7 @@ class LmChatDatabricks {
|
|
|
89
114
|
properties: [
|
|
90
115
|
(0, ai_utilities_1.getConnectionHintNoticeField)([n8n_workflow_1.NodeConnectionTypes.AiChain, n8n_workflow_1.NodeConnectionTypes.AiAgent]),
|
|
91
116
|
{
|
|
92
|
-
displayName: 'If using JSON response format, you must include word "json" in the prompt in your chain or agent. Also, make sure the selected
|
|
117
|
+
displayName: 'If using JSON response format, you must include word "json" in the prompt in your chain or agent. Also, make sure the selected model service supports JSON mode.',
|
|
93
118
|
name: 'notice',
|
|
94
119
|
type: 'notice',
|
|
95
120
|
default: '',
|
|
@@ -120,10 +145,10 @@ class LmChatDatabricks {
|
|
|
120
145
|
displayName: 'ID',
|
|
121
146
|
name: 'id',
|
|
122
147
|
type: 'string',
|
|
123
|
-
placeholder: '
|
|
148
|
+
placeholder: 'system.ai.gpt-oss-120b',
|
|
124
149
|
},
|
|
125
150
|
],
|
|
126
|
-
description: 'The
|
|
151
|
+
description: 'The Unity AI Gateway model service. Choose from the list, or enter its full name (catalog.schema.service).',
|
|
127
152
|
},
|
|
128
153
|
{
|
|
129
154
|
displayName: 'Options',
|
|
@@ -214,20 +239,36 @@ class LmChatDatabricks {
|
|
|
214
239
|
}
|
|
215
240
|
async supplyData(itemIndex) {
|
|
216
241
|
const credential = await this.getCredentials('databricksOAuth2Api');
|
|
217
|
-
if (credential.grantType === 'authorizationCode') {
|
|
218
|
-
throw new n8n_workflow_1.NodeOperationError(this.getNode(), 'User (Authorization Code) login is not supported by this node yet - use a Client Credentials (Service Principal) credential');
|
|
219
|
-
}
|
|
220
242
|
assertHttpsHost(this, credential.host);
|
|
221
|
-
const baseURL = `${credential.host.replace(/\/$/, '')}/
|
|
243
|
+
const baseURL = `${credential.host.replace(/\/$/, '')}/ai-gateway/openai/v1`;
|
|
222
244
|
const modelName = this.getNodeParameter('model', itemIndex, '', {
|
|
223
245
|
extractValue: true,
|
|
224
246
|
});
|
|
225
247
|
const options = this.getNodeParameter('options', itemIndex, {});
|
|
226
248
|
const egressFilter = this.helpers.getSecureEgressFilter();
|
|
227
249
|
const timeout = options.timeout;
|
|
250
|
+
const tokenSource = (0, token_provider_1.getDatabricksTokenProvider)(this, credential, egressFilter);
|
|
251
|
+
const { refreshAfterRejection } = tokenSource;
|
|
228
252
|
const configuration = {
|
|
229
253
|
baseURL,
|
|
230
|
-
fetch: (0,
|
|
254
|
+
fetch: (0, error_handling_1.wrapDatabricksErrorFetch)((0, ai_utilities_1.createRefreshingAuthFetch)({
|
|
255
|
+
baseFetch: fetch,
|
|
256
|
+
expiredStatus: tokenSource.expiredStatus,
|
|
257
|
+
resolveHeaders: async () => (0, constants_2.databricksAuthHeaders)(await tokenSource.getToken()),
|
|
258
|
+
...(refreshAfterRejection && {
|
|
259
|
+
refreshHeaders: async () => {
|
|
260
|
+
const refreshed = await refreshAfterRejection();
|
|
261
|
+
return refreshed ? (0, constants_2.databricksAuthHeaders)(refreshed) : null;
|
|
262
|
+
},
|
|
263
|
+
}),
|
|
264
|
+
assertAllowedUrl: async (hopUrl) => {
|
|
265
|
+
if (!egressFilter)
|
|
266
|
+
return;
|
|
267
|
+
const result = await egressFilter.validateUrl(hopUrl);
|
|
268
|
+
if (!result.ok)
|
|
269
|
+
throw result.error;
|
|
270
|
+
},
|
|
271
|
+
})),
|
|
231
272
|
fetchOptions: {
|
|
232
273
|
dispatcher: (0, ai_utilities_1.getProxyAgent)(baseURL, {
|
|
233
274
|
headersTimeout: timeout,
|
|
@@ -248,7 +289,7 @@ class LmChatDatabricks {
|
|
|
248
289
|
configuration,
|
|
249
290
|
callbacks: [new ai_utilities_1.N8nLlmTracing(this)],
|
|
250
291
|
modelKwargs: Object.keys(modelKwargs).length > 0 ? modelKwargs : undefined,
|
|
251
|
-
onFailedAttempt: (0, ai_utilities_1.makeN8nLlmFailedAttemptHandler)(this, error_handling_1.
|
|
292
|
+
onFailedAttempt: (0, ai_utilities_1.makeN8nLlmFailedAttemptHandler)(this, (0, error_handling_1.makeDatabricksFailedAttemptHandler)(tokenSource.expiredStatus)),
|
|
252
293
|
});
|
|
253
294
|
return {
|
|
254
295
|
response: model,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LmChatDatabricks.node.js","sourceRoot":"","sources":["../../../../nodes/llms/LmChatDatabricks/LmChatDatabricks.node.ts"],"names":[],"mappings":";;;AAAA,8CAAmE;AACnE,
|
|
1
|
+
{"version":3,"file":"LmChatDatabricks.node.js","sourceRoot":"","sources":["../../../../nodes/llms/LmChatDatabricks/LmChatDatabricks.node.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare const databricksAuthHeaders: (token: string) => HeadersInit;
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.databricksAuthHeaders = void 0;
|
|
4
|
+
const constants_1 = require("n8n-nodes-base/dist/nodes/Databricks/constants");
|
|
5
|
+
const databricksAuthHeaders = (token) => ({
|
|
6
|
+
authorization: `Bearer ${token}`,
|
|
7
|
+
'user-agent': constants_1.DATABRICKS_PARTNER_USER_AGENT,
|
|
8
|
+
});
|
|
9
|
+
exports.databricksAuthHeaders = databricksAuthHeaders;
|
|
10
|
+
//# sourceMappingURL=constants.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../nodes/llms/LmChatDatabricks/constants.ts"],"names":[],"mappings":";;;AAAA,8EAA+F;AAOxF,MAAM,qBAAqB,GAAG,CAAC,KAAa,EAAe,EAAE,CAAC,CAAC;IACrE,aAAa,EAAE,UAAU,KAAK,EAAE;IAChC,YAAY,EAAE,yCAA6B;CAC3C,CAAC,CAAC;AAHU,QAAA,qBAAqB,GAArB,qBAAqB,CAG/B"}
|
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.wrapDatabricksErrorFetch = wrapDatabricksErrorFetch;
|
|
4
|
+
exports.makeDatabricksFailedAttemptHandler = makeDatabricksFailedAttemptHandler;
|
|
5
|
+
const is_record_1 = require("@n8n/utils/is-record");
|
|
6
|
+
const n8n_workflow_1 = require("n8n-workflow");
|
|
7
|
+
const oauth2_token_provider_1 = require("../../../utils/oauth2-token-provider");
|
|
8
|
+
const error_handling_1 = require("../../vendors/OpenAi/helpers/error-handling");
|
|
9
|
+
function wrapDatabricksErrorFetch(baseFetch) {
|
|
10
|
+
return async (input, init) => {
|
|
11
|
+
const response = await baseFetch(input, init);
|
|
12
|
+
if (response.ok)
|
|
13
|
+
return response;
|
|
14
|
+
const text = await response.text();
|
|
15
|
+
let body = text;
|
|
16
|
+
try {
|
|
17
|
+
const parsed = JSON.parse(text);
|
|
18
|
+
if ((0, is_record_1.isRecord)(parsed) && !('error' in parsed) && typeof parsed.message === 'string') {
|
|
19
|
+
body = JSON.stringify({ error: { message: parsed.message, code: parsed.error_code } });
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
catch { }
|
|
23
|
+
const headers = new Headers(response.headers);
|
|
24
|
+
headers.delete('content-length');
|
|
25
|
+
return new Response(body, {
|
|
26
|
+
status: response.status,
|
|
27
|
+
statusText: response.statusText,
|
|
28
|
+
headers,
|
|
29
|
+
});
|
|
30
|
+
};
|
|
31
|
+
}
|
|
32
|
+
function indicatesInvalidToken(text) {
|
|
33
|
+
return /invalid\s+(access\s+)?token|token\s+(is\s+)?(invalid|expired)|expired\s+token/i.test(text);
|
|
34
|
+
}
|
|
35
|
+
function isExpiredTokenResponse(error, expiredStatus) {
|
|
36
|
+
if (typeof error !== 'object' || error === null)
|
|
37
|
+
return false;
|
|
38
|
+
if (!('status' in error) || error.status !== expiredStatus)
|
|
39
|
+
return false;
|
|
40
|
+
return ('message' in error && typeof error.message === 'string' && indicatesInvalidToken(error.message));
|
|
41
|
+
}
|
|
42
|
+
function makeDatabricksFailedAttemptHandler(expiredStatus) {
|
|
43
|
+
return (error) => {
|
|
44
|
+
const sessionExpired = (0, oauth2_token_provider_1.findSessionExpiredError)(error);
|
|
45
|
+
if (sessionExpired)
|
|
46
|
+
throw sessionExpired;
|
|
47
|
+
if (expiredStatus !== undefined && isExpiredTokenResponse(error, expiredStatus)) {
|
|
48
|
+
throw new n8n_workflow_1.OperationalError('Databricks rejected the access token and it could not be refreshed. The sign-in session has likely expired - open the credential and select Connect to sign in again.', { cause: error });
|
|
49
|
+
}
|
|
50
|
+
(0, error_handling_1.openAiFailedAttemptHandler)(error);
|
|
51
|
+
};
|
|
52
|
+
}
|
|
53
|
+
//# sourceMappingURL=error-handling.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"error-handling.js","sourceRoot":"","sources":["../../../../nodes/llms/LmChatDatabricks/error-handling.ts"],"names":[],"mappings":";;;;AAAA,oDAAgD;AAChD,+CAAgD;AAEhD,gFAA+E;AAC/E,gFAAyF;AAQzF,kCAAyC,SAAuB;IAC/D,OAAO,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QAC5B,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QAC9C,IAAI,QAAQ,CAAC,EAAE;YAAE,OAAO,QAAQ,CAAC;QAEjC,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;QACnC,IAAI,IAAI,GAAG,IAAI,CAAC;QAChB,IAAI,CAAC;YACJ,MAAM,MAAM,GAAY,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACzC,IAAI,IAAA,oBAAQ,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC,OAAO,IAAI,MAAM,CAAC,IAAI,OAAO,MAAM,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;gBACpF,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;YACxF,CAAC;QACF,CAAC;QAAC,MAAM,CAAC,CAAA,CAAC;QAEV,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAC9C,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;QACjC,OAAO,IAAI,QAAQ,CAAC,IAAI,EAAE;YACzB,MAAM,EAAE,QAAQ,CAAC,MAAM;YACvB,UAAU,EAAE,QAAQ,CAAC,UAAU;YAC/B,OAAO;SACP,CAAC,CAAC;IACJ,CAAC,CAAC;AACH,CAAC;AAOD,SAAS,qBAAqB,CAAC,IAAY;IAC1C,OAAO,gFAAgF,CAAC,IAAI,CAC3F,IAAI,CACJ,CAAC;AACH,CAAC;AAED,SAAS,sBAAsB,CAAC,KAAc,EAAE,aAAqB;IACpE,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI;QAAE,OAAO,KAAK,CAAC;IAC9D,IAAI,CAAC,CAAC,QAAQ,IAAI,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,KAAK,aAAa;QAAE,OAAO,KAAK,CAAC;IACzE,OAAO,CACN,SAAS,IAAI,KAAK,IAAI,OAAO,KAAK,CAAC,OAAO,KAAK,QAAQ,IAAI,qBAAqB,CAAC,KAAK,CAAC,OAAO,CAAC,CAC/F,CAAC;AACH,CAAC;AAOD,4CAAmD,aAAsB;IACxE,OAAO,CAAC,KAAc,EAAE,EAAE;QACzB,MAAM,cAAc,GAAG,IAAA,+CAAuB,EAAC,KAAK,CAAC,CAAC;QACtD,IAAI,cAAc;YAAE,MAAM,cAAc,CAAC;QAEzC,IAAI,aAAa,KAAK,SAAS,IAAI,sBAAsB,CAAC,KAAK,EAAE,aAAa,CAAC,EAAE,CAAC;YACjF,MAAM,IAAI,+BAAgB,CACzB,uKAAuK,EACvK,EAAE,KAAK,EAAE,KAAK,EAAE,CAChB,CAAC;QACH,CAAC;QAED,IAAA,2CAA0B,EAAC,KAAK,CAAC,CAAC;IACnC,CAAC,CAAC;AACH,CAAC"}
|
|
@@ -1,4 +1,6 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { ISupplyDataFunctions, ILoadOptionsFunctions, NodeEgressFilter } from 'n8n-workflow';
|
|
2
|
+
import type { OAuth2TokenData, RefreshingTokenSource } from '../../../utils/oauth2-token-provider';
|
|
3
|
+
export declare const DATABRICKS_CREDENTIAL_TYPE = "databricksOAuth2Api";
|
|
2
4
|
export interface DatabricksOAuth2Credential {
|
|
3
5
|
host: string;
|
|
4
6
|
grantType: 'clientCredentials' | 'authorizationCode';
|
|
@@ -6,7 +8,7 @@ export interface DatabricksOAuth2Credential {
|
|
|
6
8
|
clientSecret: string;
|
|
7
9
|
scope?: string;
|
|
8
10
|
authentication?: 'header' | 'body';
|
|
11
|
+
oauthTokenData?: OAuth2TokenData;
|
|
12
|
+
tokenExpiredStatusCode?: number;
|
|
9
13
|
}
|
|
10
|
-
export declare
|
|
11
|
-
export declare function getDatabricksTokenProvider(node: INode, credential: DatabricksOAuth2Credential, egressFilter?: NodeEgressFilter): () => Promise<string>;
|
|
12
|
-
export declare function createDatabricksFetch(getToken: () => Promise<string>, egressFilter?: NodeEgressFilter): typeof globalThis.fetch;
|
|
14
|
+
export declare function getDatabricksTokenProvider(ctx: ISupplyDataFunctions | ILoadOptionsFunctions, credential: DatabricksOAuth2Credential, egressFilter?: NodeEgressFilter): RefreshingTokenSource;
|
|
@@ -1,13 +1,24 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.DATABRICKS_CREDENTIAL_TYPE = void 0;
|
|
4
4
|
exports.getDatabricksTokenProvider = getDatabricksTokenProvider;
|
|
5
|
-
exports.createDatabricksFetch = createDatabricksFetch;
|
|
6
|
-
const ai_utilities_1 = require("@n8n/ai-utilities");
|
|
7
5
|
const client_oauth2_1 = require("@n8n/client-oauth2");
|
|
6
|
+
const constants_1 = require("n8n-nodes-base/dist/nodes/Databricks/constants");
|
|
8
7
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
9
|
-
|
|
10
|
-
|
|
8
|
+
const oauth2_token_provider_1 = require("../../../utils/oauth2-token-provider");
|
|
9
|
+
exports.DATABRICKS_CREDENTIAL_TYPE = 'databricksOAuth2Api';
|
|
10
|
+
function getDatabricksTokenProvider(ctx, credential, egressFilter) {
|
|
11
|
+
if (credential.grantType === 'authorizationCode') {
|
|
12
|
+
return (0, oauth2_token_provider_1.createRefreshingOAuth2TokenProvider)({
|
|
13
|
+
ctx,
|
|
14
|
+
credentialType: exports.DATABRICKS_CREDENTIAL_TYPE,
|
|
15
|
+
credential,
|
|
16
|
+
serviceName: 'Databricks',
|
|
17
|
+
});
|
|
18
|
+
}
|
|
19
|
+
return getServicePrincipalTokenProvider(ctx.getNode(), credential, egressFilter);
|
|
20
|
+
}
|
|
21
|
+
function getServicePrincipalTokenProvider(node, credential, egressFilter) {
|
|
11
22
|
const tokenUrl = `${credential.host.replace(/\/$/, '')}/oidc/v1/token`;
|
|
12
23
|
let cached;
|
|
13
24
|
let expiresAt = 0;
|
|
@@ -20,7 +31,7 @@ function getDatabricksTokenProvider(node, credential, egressFilter) {
|
|
|
20
31
|
scopes: credential.scope?.split(' '),
|
|
21
32
|
authentication: credential.authentication,
|
|
22
33
|
ssrfBridge: egressFilter,
|
|
23
|
-
headers: { 'User-Agent':
|
|
34
|
+
headers: { 'User-Agent': constants_1.DATABRICKS_PARTNER_USER_AGENT },
|
|
24
35
|
});
|
|
25
36
|
const token = await oAuthClient.credentials.getToken();
|
|
26
37
|
const expiresIn = Number(token.data.expires_in);
|
|
@@ -38,37 +49,14 @@ function getDatabricksTokenProvider(node, credential, egressFilter) {
|
|
|
38
49
|
});
|
|
39
50
|
}
|
|
40
51
|
};
|
|
41
|
-
return
|
|
42
|
-
|
|
43
|
-
expiresAt
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
return await cached;
|
|
47
|
-
};
|
|
48
|
-
}
|
|
49
|
-
function createDatabricksFetch(getToken, egressFilter) {
|
|
50
|
-
return async (input, init) => {
|
|
51
|
-
const headers = new Headers(init?.headers ?? (input instanceof Request ? input.headers : undefined));
|
|
52
|
-
headers.set('authorization', `Bearer ${await getToken()}`);
|
|
53
|
-
headers.set('user-agent', exports.CHAT_MODEL_USER_AGENT);
|
|
54
|
-
const requestInit = { ...init };
|
|
55
|
-
if (input instanceof Request) {
|
|
56
|
-
requestInit.method ??= input.method;
|
|
57
|
-
requestInit.signal ??= input.signal;
|
|
58
|
-
if (requestInit.body === undefined && input.body) {
|
|
59
|
-
requestInit.body = await input.arrayBuffer();
|
|
52
|
+
return {
|
|
53
|
+
getToken: async () => {
|
|
54
|
+
if (!cached || Date.now() >= expiresAt) {
|
|
55
|
+
expiresAt = Infinity;
|
|
56
|
+
cached = mint();
|
|
60
57
|
}
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
return await (0, ai_utilities_1.fetchFollowingRedirects)(fetch, startUrl, { ...requestInit, headers }, {
|
|
64
|
-
onBeforeHop: async (hopUrl) => {
|
|
65
|
-
if (egressFilter) {
|
|
66
|
-
const result = await egressFilter.validateUrl(hopUrl);
|
|
67
|
-
if (!result.ok)
|
|
68
|
-
throw result.error;
|
|
69
|
-
}
|
|
70
|
-
},
|
|
71
|
-
});
|
|
58
|
+
return await cached;
|
|
59
|
+
},
|
|
72
60
|
};
|
|
73
61
|
}
|
|
74
62
|
//# sourceMappingURL=token-provider.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token-provider.js","sourceRoot":"","sources":["../../../../nodes/llms/LmChatDatabricks/token-provider.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"token-provider.js","sourceRoot":"","sources":["../../../../nodes/llms/LmChatDatabricks/token-provider.ts"],"names":[],"mappings":";;;;AAAA,sDAAkD;AAClD,8EAA+F;AAO/F,+CAAkD;AAGlD,gFAA2F;AAE9E,QAAA,0BAA0B,GAAG,qBAAqB,CAAC;AAiBhE,oCACC,GAAiD,EACjD,UAAsC,EACtC,YAA+B;IAE/B,IAAI,UAAU,CAAC,SAAS,KAAK,mBAAmB,EAAE,CAAC;QAClD,OAAO,IAAA,2DAAmC,EAAC;YAC1C,GAAG;YACH,cAAc,EAAE,QAAA,0BAA0B;YAC1C,UAAU;YACV,WAAW,EAAE,YAAY;SACzB,CAAC,CAAC;IACJ,CAAC;IACD,OAAO,gCAAgC,CAAC,GAAG,CAAC,OAAO,EAAE,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC;AAClF,CAAC;AAiBD,SAAS,gCAAgC,CACxC,IAAW,EACX,UAAsC,EACtC,YAA+B;IAE/B,MAAM,QAAQ,GAAG,GAAG,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,gBAAgB,CAAC;IAEvE,IAAI,MAAmC,CAAC;IACxC,IAAI,SAAS,GAAG,CAAC,CAAC;IAElB,MAAM,IAAI,GAAG,KAAK,IAAqB,EAAE;QACxC,IAAI,CAAC;YAGJ,MAAM,WAAW,GAAG,IAAI,4BAAY,CAAC;gBACpC,QAAQ,EAAE,UAAU,CAAC,QAAQ;gBAC7B,YAAY,EAAE,UAAU,CAAC,YAAY;gBACrC,cAAc,EAAE,QAAQ;gBACxB,MAAM,EAAE,UAAU,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC;gBACpC,cAAc,EAAE,UAAU,CAAC,cAAc;gBACzC,UAAU,EAAE,YAAY;gBACxB,OAAO,EAAE,EAAE,YAAY,EAAE,yCAA6B,EAAE;aACxD,CAAC,CAAC;YACH,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC;YACvD,MAAM,SAAS,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAGhD,SAAS,GAAG,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,SAAS,GAAG,EAAE,CAAC,GAAG,IAAI,CAAC;YAC/E,OAAO,KAAK,CAAC,WAAW,CAAC;QAC1B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,GAAG,SAAS,CAAC;YACnB,SAAS,GAAG,CAAC,CAAC;YAGd,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;YACnE,MAAM,IAAI,iCAAkB,CAAC,IAAI,EAAE,4CAA4C,EAAE;gBAChF,WAAW,EACV,OAAO,IAAI,UAAU,CAAC,YAAY;oBACjC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,YAAY,EAAE,KAAK,CAAC;oBACpD,CAAC,CAAC,OAAO;aACX,CAAC,CAAC;QACJ,CAAC;IACF,CAAC,CAAC;IAGF,OAAO;QACN,QAAQ,EAAE,KAAK,IAAI,EAAE;YACpB,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,GAAG,EAAE,IAAI,SAAS,EAAE,CAAC;gBAExC,SAAS,GAAG,QAAQ,CAAC;gBACrB,MAAM,GAAG,IAAI,EAAE,CAAC;YACjB,CAAC;YACD,OAAO,MAAM,MAAM,CAAC;QACrB,CAAC;KACD,CAAC;AACH,CAAC"}
|
|
@@ -88,14 +88,7 @@ class N8nNonEstimatingTracing extends base_1.BaseCallbackHandler {
|
|
|
88
88
|
}
|
|
89
89
|
async handleLLMError(error, runId, parentRunId) {
|
|
90
90
|
const runDetails = this.runsMap[runId] ?? { index: Object.keys(this.runsMap).length };
|
|
91
|
-
|
|
92
|
-
const errorWithHeaders = error;
|
|
93
|
-
Object.keys(errorWithHeaders.headers).forEach((key) => {
|
|
94
|
-
if (!key.startsWith('x-')) {
|
|
95
|
-
delete errorWithHeaders.headers[key];
|
|
96
|
-
}
|
|
97
|
-
});
|
|
98
|
-
}
|
|
91
|
+
(0, ai_utilities_1.stripNonXHeaders)(error);
|
|
99
92
|
if (error instanceof n8n_workflow_1.NodeError) {
|
|
100
93
|
if (this.options.errorDescriptionMapper) {
|
|
101
94
|
error.description = this.options.errorDescriptionMapper(error);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"N8nNonEstimatingTracing.js","sourceRoot":"","sources":["../../../nodes/llms/N8nNonEstimatingTracing.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,yDAAqE;AASrE,
|
|
1
|
+
{"version":3,"file":"N8nNonEstimatingTracing.js","sourceRoot":"","sources":["../../../nodes/llms/N8nNonEstimatingTracing.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,yDAAqE;AASrE,oDAAqF;AACrF,uDAA+B;AAE/B,+CAAkF;AAQlF,6BAAqC,SAAQ,0BAAmB;IA2B/D,YACS,kBAAwC,EAChD,OAGC;QAED,KAAK,EAAE,CAAC;QANA,uBAAkB,GAAlB,kBAAkB,CAAsB;QA3BjD,SAAI,GAAG,yBAAyB,CAAC;QAIjC,kBAAa,GAAG,IAAI,CAAC;QAErB,mBAAc,GAAG,kCAAmB,CAAC,eAAe,CAAC;QAErD,0DAAyB;QAQzB,YAAO,GAA8B,EAAE,CAAC;QAExC,YAAO,GAGH;YAEH,sBAAsB,EAAE,CAAC,KAAgB,EAAE,EAAE,CAAC,KAAK,CAAC,WAAW;SAC/D,CAAC;QAUD,IAAI,CAAC,OAAO,GAAG,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE,GAAG,OAAO,EAAE,CAAC;IAChD,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,MAAiB,EAAE,KAAa;QAGlD,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,CAAC;QAEtF,MAAM,CAAC,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CACnD,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,cAAI,EAAC,CAAC,EAAE,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC,CACnD,CAAC;QAEF,MAAM,kBAAkB,GAAG;YAC1B,gBAAgB,EAAE,CAAC;YACnB,YAAY,EAAE,CAAC;YACf,WAAW,EAAE,CAAC;SACd,CAAC;QACF,MAAM,QAAQ,GAGV;YACH,QAAQ,EAAE,EAAE,WAAW,EAAE,MAAM,CAAC,WAAW,EAAE;SAC7C,CAAC;QAEF,QAAQ,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;QAEjD,MAAM,cAAc,GACnB,OAAO,UAAU,CAAC,QAAQ,KAAK,QAAQ;YACtC,CAAC,CAAC,UAAU,CAAC,QAAQ;YACrB,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;gBACpC,IAAI,OAAO,OAAO,KAAK,QAAQ;oBAAE,OAAO,OAAO,CAAC;gBAChD,IAAI,OAAO,OAAO,EAAE,MAAM,KAAK,UAAU;oBAAE,OAAO,OAAO,CAAC,MAAM,EAAE,CAAC;gBAEnE,OAAO,OAAO,CAAC;YAChB,CAAC,CAAC,CAAC;QAEN,MAAM,kBAAkB,GACvB,uBAAA,IAAI,+CAAgB,KAAK,SAAS,CAAC,CAAC,CAAC,uBAAA,IAAI,+CAAgB,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;QAE1F,IAAI,CAAC,kBAAkB,CAAC,aAAa,CACpC,IAAI,CAAC,cAAc,EACnB,UAAU,CAAC,KAAK,EAChB,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,GAAG,QAAQ,EAAE,EAAE,CAAC,CAAC,EAC7B,SAAS,EACT,kBAAkB,CAClB,CAAC;QAEF,IAAA,yBAAU,EAAC,IAAI,CAAC,kBAAkB,EAAE,yBAAyB,EAAE;YAC9D,QAAQ,EAAE,cAAc;YACxB,OAAO,EAAE,UAAU,CAAC,OAAO;YAC3B,QAAQ;SACR,CAAC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,GAAe,EAAE,OAAiB,EAAE,KAAa;QACrE,MAAM,eAAe,GAAG,CAAC,CAAC;QAC1B,MAAM,kBAAkB,GACvB,uBAAA,IAAI,+CAAgB,KAAK,SAAS;YACjC,CAAC,CAAC,uBAAA,IAAI,+CAAgB,GAAG,IAAI,CAAC,kBAAkB,CAAC,eAAe,EAAE;YAClE,CAAC,CAAC,SAAS,CAAC;QAEd,MAAM,OAAO,GAAG,IAAA,iCAAkB,EACjC,GAAG,CAAC,IAAI,KAAK,aAAa,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,EAC7C,IAAI,CAAC,OAAO,CAAC,eAAe,IAAI,EAAE,CAClC,CAAC;QACF,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,kBAAkB,CAAC,YAAY,CACrD,IAAI,CAAC,cAAc,EACnB;YACC;gBACC;oBACC,IAAI,EAAE;wBACL,QAAQ,EAAE,OAAO;wBACjB,eAAe;wBACf,OAAO;qBACP;iBACD;aACD;SACD,EACD,kBAAkB,CAClB,CAAC;QAGF,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG;YACrB,KAAK;YACL,OAAO;YACP,QAAQ,EAAE,OAAO;SACjB,CAAC;IACH,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,KAA0B,EAAE,KAAa,EAAE,WAAoB;QACnF,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,CAAC;QAEtF,IAAA,+BAAgB,EAAC,KAAK,CAAC,CAAC;QAExB,IAAI,KAAK,YAAY,wBAAS,EAAE,CAAC;YAChC,IAAI,IAAI,CAAC,OAAO,CAAC,sBAAsB,EAAE,CAAC;gBACzC,KAAK,CAAC,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC;YAChE,CAAC;YAED,IAAI,CAAC,kBAAkB,CAAC,aAAa,CAAC,IAAI,CAAC,cAAc,EAAE,UAAU,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QACrF,CAAC;aAAM,CAAC;YAEP,IAAI,CAAC,kBAAkB,CAAC,aAAa,CACpC,IAAI,CAAC,cAAc,EACnB,UAAU,CAAC,KAAK,EAChB,IAAI,iCAAkB,CAAC,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,EAAE,KAAmB,EAAE;gBAC9E,aAAa,EAAE,oBAAoB;aACnC,CAAC,CACF,CAAC;QACH,CAAC;QAED,IAAA,yBAAU,EAAC,IAAI,CAAC,kBAAkB,EAAE,gBAAgB,EAAE;YACrD,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,KAAK;YACjE,KAAK;YACL,WAAW;SACX,CAAC,CAAC;IACJ,CAAC;IAGD,iBAAiB,CAAC,QAAgB;QACjC,uBAAA,IAAI,2CAAmB,QAAQ,MAAA,CAAC;IACjC,CAAC;CACD"}
|
|
@@ -14,4 +14,4 @@ export declare const getErrorDescriptionFromToolCall: (result: unknown) => strin
|
|
|
14
14
|
export declare const createCallTool: (name: string, client: Client, timeout: number, onError: (error: string) => void, getAbortSignal?: () => AbortSignal | undefined) => (args: IDataObject) => Promise<{} | null>;
|
|
15
15
|
export declare function buildMcpToolName(serverName: string, toolName: string): string;
|
|
16
16
|
export declare function isZodObjectSchema(schema: z.ZodTypeAny): schema is z.ZodObject<z.ZodRawShape>;
|
|
17
|
-
export declare function mcpToolToDynamicTool(tool: McpTool, onCallTool: DynamicStructuredToolInput['func']): DynamicStructuredTool;
|
|
17
|
+
export declare function mcpToolToDynamicTool(tool: McpTool, onCallTool: DynamicStructuredToolInput['func'], attribution?: string): DynamicStructuredTool;
|
|
@@ -97,7 +97,7 @@ function isZodObjectSchema(schema) {
|
|
|
97
97
|
return internals._zod.def.type === 'object';
|
|
98
98
|
return internals._def?.typeName === 'ZodObject';
|
|
99
99
|
}
|
|
100
|
-
function mcpToolToDynamicTool(tool, onCallTool) {
|
|
100
|
+
function mcpToolToDynamicTool(tool, onCallTool, attribution) {
|
|
101
101
|
const rawSchema = (0, schemaParsing_1.convertJsonSchemaToZod)(tool.inputSchema);
|
|
102
102
|
const objectSchema = isZodObjectSchema(rawSchema) ? rawSchema : zod_1.z.object({ value: rawSchema });
|
|
103
103
|
return new tools_1.DynamicStructuredTool({
|
|
@@ -105,7 +105,7 @@ function mcpToolToDynamicTool(tool, onCallTool) {
|
|
|
105
105
|
description: tool.description ?? '',
|
|
106
106
|
schema: objectSchema,
|
|
107
107
|
func: onCallTool,
|
|
108
|
-
metadata: { isFromToolkit: true },
|
|
108
|
+
metadata: { isFromToolkit: true, ...(attribution && { attribution }) },
|
|
109
109
|
});
|
|
110
110
|
}
|
|
111
111
|
//# sourceMappingURL=utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../nodes/mcp/McpClientTool/utils.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../nodes/mcp/McpClientTool/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -65,6 +65,7 @@ async function buildMcpToolkit(ctx, itemIndex, config) {
|
|
|
65
65
|
description: 'Connected successfully to your MCP server but it returned an empty list of tools.',
|
|
66
66
|
}));
|
|
67
67
|
}
|
|
68
|
+
const attribution = config.registryCredential?.connection.attribution;
|
|
68
69
|
try {
|
|
69
70
|
const tools = mcpTools.map((tool) => {
|
|
70
71
|
const prefixedName = (0, utils_2.buildMcpToolName)(node.name, tool.name);
|
|
@@ -74,7 +75,7 @@ async function buildMcpToolkit(ctx, itemIndex, config) {
|
|
|
74
75
|
ctx.logger.error(`MCP client: Tool "${tool.name}" failed to execute`, {
|
|
75
76
|
error: callError,
|
|
76
77
|
});
|
|
77
|
-
}, () => ctx.getExecutionCancelSignal())), ctx);
|
|
78
|
+
}, () => ctx.getExecutionCancelSignal()), attribution), ctx);
|
|
78
79
|
});
|
|
79
80
|
ctx.logger.debug(`MCP client: Connected to MCP Server with ${tools.length} tools`);
|
|
80
81
|
const toolkit = new n8n_core_1.StructuredToolkit(tools);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runtime.js","sourceRoot":"","sources":["../../../../nodes/mcp/shared/runtime.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"runtime.js","sourceRoot":"","sources":["../../../../nodes/mcp/shared/runtime.ts"],"names":[],"mappings":"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"}
|
|
@@ -180,7 +180,7 @@ class OutputParserStructured {
|
|
|
180
180
|
}
|
|
181
181
|
const jsonSchema = schemaType === 'fromJson'
|
|
182
182
|
? (0, schemaParsing_1.generateSchemaFromExample)(jsonExample, jsonExampleAllFieldsRequired)
|
|
183
|
-
: (0,
|
|
183
|
+
: (0, schemaParsing_1.parseJsonSchemaParameter)(inputSchema);
|
|
184
184
|
const zodSchema = (0, schemaParsing_1.convertJsonSchemaToZod)(jsonSchema);
|
|
185
185
|
const nodeVersion = this.getNode().typeVersion;
|
|
186
186
|
const autoFix = this.getNodeParameter('autoFix', itemIndex, false);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OutputParserStructured.node.js","sourceRoot":"","sources":["../../../../nodes/output_parser/OutputParserStructured/OutputParserStructured.node.ts"],"names":[],"mappings":";;;AACA,qDAAyD;
|
|
1
|
+
{"version":3,"file":"OutputParserStructured.node.js","sourceRoot":"","sources":["../../../../nodes/output_parser/OutputParserStructured/OutputParserStructured.node.ts"],"names":[],"mappings":"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"}
|
|
@@ -98,7 +98,7 @@ function getTool(ctx, itemIndex, log = true) {
|
|
|
98
98
|
const schemaType = ctx.getNodeParameter('schemaType', itemIndex);
|
|
99
99
|
const jsonSchema = schemaType === 'fromJson'
|
|
100
100
|
? (0, schemaParsing_1.generateSchemaFromExample)(jsonExample, ctx.getNode().typeVersion >= 1.3)
|
|
101
|
-
: (0,
|
|
101
|
+
: (0, schemaParsing_1.parseJsonSchemaParameter)(inputSchema);
|
|
102
102
|
const zodSchema = (0, schemaParsing_1.convertJsonSchemaToZod)(jsonSchema);
|
|
103
103
|
tool = new tools_1.DynamicStructuredTool({
|
|
104
104
|
schema: zodSchema,
|