@n8n/n8n-nodes-langchain 2.41.1 → 2.42.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/AzureEntraCognitiveServicesOAuth2Api.credentials.js +14 -15
- package/dist/credentials/AzureEntraCognitiveServicesOAuth2Api.credentials.js.map +1 -1
- package/dist/known/nodes.json +4 -0
- package/dist/methods/defined.json +3 -0
- package/dist/methods/referenced.json +3 -0
- package/dist/node-definitions/.nodes-hash +1 -1
- package/dist/node-definitions/nodes/n8n-nodes-langchain/anthropic/v1/resource_text/operation_message.schema.js +1 -1
- package/dist/node-definitions/nodes/n8n-nodes-langchain/anthropic/v1/resource_text/operation_message.ts +4 -0
- package/dist/node-definitions/nodes/n8n-nodes-langchain/lmChatAzureOpenAi/index.ts +1 -1
- package/dist/node-definitions/nodes/n8n-nodes-langchain/lmChatAzureOpenAi/v1.schema.js +2 -1
- package/dist/node-definitions/nodes/n8n-nodes-langchain/lmChatAzureOpenAi/v1.ts +5 -1
- package/dist/nodes/agents/Agent/agents/ToolsAgent/V2/execute.js +1 -4
- package/dist/nodes/agents/Agent/agents/ToolsAgent/V2/execute.js.map +1 -1
- package/dist/nodes/agents/Agent/agents/ToolsAgent/V3/helpers/runAgent.js +1 -5
- package/dist/nodes/agents/Agent/agents/ToolsAgent/V3/helpers/runAgent.js.map +1 -1
- package/dist/nodes/agents/Agent/agents/utils.js +1 -1
- package/dist/nodes/agents/Agent/agents/utils.js.map +1 -1
- package/dist/nodes/agents/OpenAiAssistant/OpenAiAssistant.node.js +1 -1
- package/dist/nodes/agents/OpenAiAssistant/OpenAiAssistant.node.js.map +1 -1
- package/dist/nodes/llms/LmChatAzureOpenAi/LmChatAzureOpenAi.node.d.ts +6 -0
- package/dist/nodes/llms/LmChatAzureOpenAi/LmChatAzureOpenAi.node.js +13 -4
- package/dist/nodes/llms/LmChatAzureOpenAi/LmChatAzureOpenAi.node.js.map +1 -1
- package/dist/nodes/llms/LmChatAzureOpenAi/credentials/N8nOAuth2TokenCredential.d.ts +7 -5
- package/dist/nodes/llms/LmChatAzureOpenAi/credentials/N8nOAuth2TokenCredential.js +21 -10
- package/dist/nodes/llms/LmChatAzureOpenAi/credentials/N8nOAuth2TokenCredential.js.map +1 -1
- package/dist/nodes/llms/LmChatAzureOpenAi/credentials/api-key.js +4 -5
- package/dist/nodes/llms/LmChatAzureOpenAi/credentials/api-key.js.map +1 -1
- package/dist/nodes/llms/LmChatAzureOpenAi/credentials/oauth2.js +3 -2
- package/dist/nodes/llms/LmChatAzureOpenAi/credentials/oauth2.js.map +1 -1
- package/dist/nodes/llms/LmChatAzureOpenAi/credentials/requireFoundryEndpoint.d.ts +2 -0
- package/dist/nodes/llms/LmChatAzureOpenAi/credentials/requireFoundryEndpoint.js +11 -0
- package/dist/nodes/llms/LmChatAzureOpenAi/credentials/requireFoundryEndpoint.js.map +1 -0
- package/dist/nodes/llms/LmChatAzureOpenAi/credentials/requireTenantId.d.ts +2 -0
- package/dist/nodes/llms/LmChatAzureOpenAi/credentials/requireTenantId.js +25 -0
- package/dist/nodes/llms/LmChatAzureOpenAi/credentials/requireTenantId.js.map +1 -0
- package/dist/nodes/llms/LmChatAzureOpenAi/methods/searchModels.d.ts +2 -0
- package/dist/nodes/llms/LmChatAzureOpenAi/methods/searchModels.js +51 -0
- package/dist/nodes/llms/LmChatAzureOpenAi/methods/searchModels.js.map +1 -0
- package/dist/nodes/llms/LmChatAzureOpenAi/properties.js +7 -0
- package/dist/nodes/llms/LmChatAzureOpenAi/properties.js.map +1 -1
- package/dist/nodes/llms/LmChatAzureOpenAi/types.d.ts +3 -1
- package/dist/nodes/llms/LmChatAzureOpenAi/types.js +3 -1
- package/dist/nodes/llms/LmChatAzureOpenAi/types.js.map +1 -1
- package/dist/nodes/mcp/shared/utils.js +22 -0
- package/dist/nodes/mcp/shared/utils.js.map +1 -1
- package/dist/nodes/vector_store/VectorStoreDatabricks/DatabricksVectorStore.d.ts +60 -0
- package/dist/nodes/vector_store/VectorStoreDatabricks/DatabricksVectorStore.js +244 -0
- package/dist/nodes/vector_store/VectorStoreDatabricks/DatabricksVectorStore.js.map +1 -0
- package/dist/nodes/vector_store/VectorStoreDatabricks/VectorStoreDatabricks.node.d.ts +29 -0
- package/dist/nodes/vector_store/VectorStoreDatabricks/VectorStoreDatabricks.node.js +235 -0
- package/dist/nodes/vector_store/VectorStoreDatabricks/VectorStoreDatabricks.node.js.map +1 -0
- package/dist/nodes/vendors/Anthropic/actions/text/message.operation.js +30 -1
- package/dist/nodes/vendors/Anthropic/actions/text/message.operation.js.map +1 -1
- package/dist/nodes/vendors/Anthropic/helpers/interfaces.d.ts +7 -0
- package/dist/typecheck.tsbuildinfo +1 -1
- package/dist/types/credentials.json +1 -1
- package/dist/types/nodes.json +4 -3
- package/dist/utils/agent-execution/buildSteps.js +4 -7
- package/dist/utils/agent-execution/buildSteps.js.map +1 -1
- package/dist/utils/databricks/auth-fetch.d.ts +12 -0
- package/dist/utils/databricks/auth-fetch.js +40 -0
- package/dist/utils/databricks/auth-fetch.js.map +1 -0
- package/dist/utils/databricks/constants.d.ts +4 -2
- package/dist/utils/databricks/constants.js.map +1 -1
- package/dist/utils/databricks/gateway-config.d.ts +2 -2
- package/dist/utils/databricks/gateway-config.js +7 -30
- package/dist/utils/databricks/gateway-config.js.map +1 -1
- package/dist/utils/databricks/list-pages.d.ts +6 -0
- package/dist/utils/databricks/list-pages.js +29 -0
- package/dist/utils/databricks/list-pages.js.map +1 -0
- package/dist/utils/databricks/model-services.js +4 -24
- package/dist/utils/databricks/model-services.js.map +1 -1
- package/dist/utils/databricks/token-provider.d.ts +2 -2
- package/dist/utils/databricks/token-provider.js.map +1 -1
- package/package.json +19 -17
|
@@ -7,13 +7,13 @@ class AzureEntraCognitiveServicesOAuth2Api {
|
|
|
7
7
|
this.name = 'azureEntraCognitiveServicesOAuth2Api';
|
|
8
8
|
this.displayName = 'Azure Entra ID (Azure Active Directory) API';
|
|
9
9
|
this.extends = ['oAuth2Api'];
|
|
10
|
-
this.documentationUrl = '
|
|
10
|
+
this.documentationUrl = 'https://docs.n8n.io/integrations/builtin/credentials/azureopenai/#using-azure-entra-id-oauth2';
|
|
11
11
|
this.properties = [
|
|
12
12
|
{
|
|
13
13
|
displayName: 'Grant Type',
|
|
14
14
|
name: 'grantType',
|
|
15
15
|
type: 'hidden',
|
|
16
|
-
default: '
|
|
16
|
+
default: 'clientCredentials',
|
|
17
17
|
},
|
|
18
18
|
{
|
|
19
19
|
displayName: 'Endpoint Type',
|
|
@@ -65,9 +65,10 @@ class AzureEntraCognitiveServicesOAuth2Api {
|
|
|
65
65
|
displayName: 'Tenant ID',
|
|
66
66
|
name: 'tenantId',
|
|
67
67
|
type: 'string',
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
68
|
+
required: true,
|
|
69
|
+
default: '',
|
|
70
|
+
description: 'The Directory (tenant) ID of the Entra app registration',
|
|
71
|
+
placeholder: 'e.g. xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx',
|
|
71
72
|
},
|
|
72
73
|
{
|
|
73
74
|
displayName: 'Authorization URL',
|
|
@@ -81,6 +82,12 @@ class AzureEntraCognitiveServicesOAuth2Api {
|
|
|
81
82
|
type: 'hidden',
|
|
82
83
|
default: '=https://login.microsoftonline.com/{{$self["tenantId"]}}/oauth2/token',
|
|
83
84
|
},
|
|
85
|
+
{
|
|
86
|
+
displayName: 'Send Additional Body Properties',
|
|
87
|
+
name: 'sendAdditionalBodyProperties',
|
|
88
|
+
type: 'hidden',
|
|
89
|
+
default: false,
|
|
90
|
+
},
|
|
84
91
|
{
|
|
85
92
|
displayName: 'Additional Body Properties',
|
|
86
93
|
name: 'additionalBodyProperties',
|
|
@@ -96,9 +103,8 @@ class AzureEntraCognitiveServicesOAuth2Api {
|
|
|
96
103
|
{
|
|
97
104
|
displayName: 'Custom Scopes',
|
|
98
105
|
name: 'customScopes',
|
|
99
|
-
type: '
|
|
106
|
+
type: 'hidden',
|
|
100
107
|
default: false,
|
|
101
|
-
description: 'Define custom scopes. You might need this if the default scopes are not sufficient or if you want to minimize permissions. Ensure you include "openid" and "offline_access".',
|
|
102
108
|
},
|
|
103
109
|
{
|
|
104
110
|
displayName: 'Auth URI Query Parameters',
|
|
@@ -111,15 +117,8 @@ class AzureEntraCognitiveServicesOAuth2Api {
|
|
|
111
117
|
{
|
|
112
118
|
displayName: 'Enabled Scopes',
|
|
113
119
|
name: 'enabledScopes',
|
|
114
|
-
type: '
|
|
115
|
-
displayOptions: {
|
|
116
|
-
show: {
|
|
117
|
-
customScopes: [true],
|
|
118
|
-
},
|
|
119
|
-
},
|
|
120
|
+
type: 'hidden',
|
|
120
121
|
default: defaultScopes.join(' '),
|
|
121
|
-
placeholder: 'openid offline_access',
|
|
122
|
-
description: 'Space-separated list of scopes to request.',
|
|
123
122
|
},
|
|
124
123
|
{
|
|
125
124
|
displayName: 'Scope',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AzureEntraCognitiveServicesOAuth2Api.credentials.js","sourceRoot":"","sources":["../../credentials/AzureEntraCognitiveServicesOAuth2Api.credentials.ts"],"names":[],"mappings":";;;AAEA,MAAM,aAAa,GAAG,CAAC,QAAQ,EAAE,gBAAgB,CAAC,CAAC;AAEnD;IAAA;QACC,SAAI,GAAG,sCAAsC,CAAC;QAG9C,gBAAW,GAAG,6CAA6C,CAAC;QAE5D,YAAO,GAAG,CAAC,WAAW,CAAC,CAAC;QAExB,qBAAgB,
|
|
1
|
+
{"version":3,"file":"AzureEntraCognitiveServicesOAuth2Api.credentials.js","sourceRoot":"","sources":["../../credentials/AzureEntraCognitiveServicesOAuth2Api.credentials.ts"],"names":[],"mappings":"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"}
|
package/dist/known/nodes.json
CHANGED
|
@@ -391,6 +391,10 @@
|
|
|
391
391
|
"className": "VectorStoreAzureAISearch",
|
|
392
392
|
"sourcePath": "dist/nodes/vector_store/VectorStoreAzureAISearch/VectorStoreAzureAISearch.node.js"
|
|
393
393
|
},
|
|
394
|
+
"vectorStoreDatabricks": {
|
|
395
|
+
"className": "VectorStoreDatabricks",
|
|
396
|
+
"sourcePath": "dist/nodes/vector_store/VectorStoreDatabricks/VectorStoreDatabricks.node.js"
|
|
397
|
+
},
|
|
394
398
|
"vectorStoreInMemory": {
|
|
395
399
|
"className": "VectorStoreInMemory",
|
|
396
400
|
"sourcePath": "dist/nodes/vector_store/VectorStoreInMemory/VectorStoreInMemory.node.js"
|
|
@@ -1 +1 @@
|
|
|
1
|
-
|
|
1
|
+
3dc5425478f9c616a71cec01aed7fa042101165cf27136c218779b11632f30ec
|
|
@@ -28,7 +28,7 @@ module.exports = function getSchema({ parameters, z, expressionSchema, stringOrE
|
|
|
28
28
|
attachmentsUrls: resolveSchema({ parameters, schema: stringOrExpression, required: false, displayOptions: {"show":{"addAttachments":[true],"attachmentsInputType":["url"]}}, defaults: {"addAttachments":false,"attachmentsInputType":"url"} }),
|
|
29
29
|
binaryPropertyName: resolveSchema({ parameters, schema: stringOrExpression, required: false, displayOptions: {"show":{"addAttachments":[true],"attachmentsInputType":["binary"]}}, defaults: {"addAttachments":false,"attachmentsInputType":"url"} }),
|
|
30
30
|
simplify: booleanOrExpression.optional(),
|
|
31
|
-
options: z.object({ includeMergedResponse: booleanOrExpression.optional(), system: stringOrExpression.optional(), codeExecution: booleanOrExpression.optional(), webSearch: booleanOrExpression.optional(), maxUses: numberOrExpression.optional(), allowedDomains: stringOrExpression.optional(), blockedDomains: stringOrExpression.optional(), maxTokens: numberOrExpression.optional(), temperature: numberOrExpression.optional(), topP: numberOrExpression.optional(), topK: numberOrExpression.optional(), maxToolsIterations: numberOrExpression.optional() }).optional(),
|
|
31
|
+
options: z.object({ includeMergedResponse: booleanOrExpression.optional(), system: stringOrExpression.optional(), promptCaching: z.union([z.literal('disabled'), z.literal('5m'), z.literal('1h'), expressionSchema]).optional(), codeExecution: booleanOrExpression.optional(), webSearch: booleanOrExpression.optional(), maxUses: numberOrExpression.optional(), allowedDomains: stringOrExpression.optional(), blockedDomains: stringOrExpression.optional(), maxTokens: numberOrExpression.optional(), temperature: numberOrExpression.optional(), topP: numberOrExpression.optional(), topK: numberOrExpression.optional(), maxToolsIterations: numberOrExpression.optional() }).optional(),
|
|
32
32
|
}).optional(),
|
|
33
33
|
subnodes: subnodesSchema.optional(),
|
|
34
34
|
});
|
|
@@ -74,6 +74,10 @@ export type LcAnthropicV1TextMessageParams = {
|
|
|
74
74
|
/** System Message
|
|
75
75
|
*/
|
|
76
76
|
system?: string | Expression<string>;
|
|
77
|
+
/** Whether to cache the prompt so that repeat calls are cheaper and faster. Do not enable for one-off calls: in this case writing the cache costs more than it saves. The value sets how long cached content stays valid before it has to be written again. <a href="https://platform.claude.com/docs/en/build-with-claude/prompt-caching" target="_blank">Learn more</a>.
|
|
78
|
+
* @default disabled
|
|
79
|
+
*/
|
|
80
|
+
promptCaching?: 'disabled' | '5m' | '1h' | Expression<string>;
|
|
77
81
|
/** Whether to enable code execution. Not supported by all models.
|
|
78
82
|
* @default false
|
|
79
83
|
*/
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* Azure
|
|
2
|
+
* Azure AI Foundry Chat Model Node - Version 1 - Zod Validation Schemas
|
|
3
3
|
*
|
|
4
4
|
* These schemas validate node configuration at runtime.
|
|
5
5
|
* Use .parse() for strict validation or .safeParse() for error handling.
|
|
@@ -16,6 +16,7 @@ module.exports = function getSchema({ parameters, z, expressionSchema, stringOrE
|
|
|
16
16
|
const parametersSchema = z.object({
|
|
17
17
|
authentication: z.union([z.literal('azureOpenAiApi'), z.literal('azureEntraCognitiveServicesOAuth2Api'), expressionSchema]).optional(),
|
|
18
18
|
model: stringOrExpression,
|
|
19
|
+
project: stringOrExpression.optional(),
|
|
19
20
|
options: z.object({ frequencyPenalty: numberOrExpression.optional(), maxTokens: numberOrExpression.optional(), responseFormat: z.union([z.literal('text'), z.literal('json_object'), expressionSchema]).optional(), presencePenalty: numberOrExpression.optional(), temperature: numberOrExpression.optional(), timeout: numberOrExpression.optional(), maxRetries: numberOrExpression.optional(), topP: numberOrExpression.optional() }).optional(),
|
|
20
21
|
});
|
|
21
22
|
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* Azure
|
|
2
|
+
* Azure AI Foundry Chat Model Node - Version 1
|
|
3
3
|
* For advanced usage with an AI chain
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -10,6 +10,10 @@ export interface LcLmChatAzureOpenAiV1Params {
|
|
|
10
10
|
* The name of the model(deployment) to use (e.g., gpt-4, gpt-35-turbo)
|
|
11
11
|
*/
|
|
12
12
|
model: string | Expression<string>;
|
|
13
|
+
/**
|
|
14
|
+
* The Azure AI Foundry project that owns the deployment. Required for an Azure AI Foundry resource; leave empty for a classic Azure OpenAI resource.
|
|
15
|
+
*/
|
|
16
|
+
project?: string | Expression<string>;
|
|
13
17
|
/**
|
|
14
18
|
* Additional options to add
|
|
15
19
|
* @default {}
|
|
@@ -211,10 +211,7 @@ async function toolsAgentExecute() {
|
|
|
211
211
|
if (Object.keys(additionalMetadata).length > 0) {
|
|
212
212
|
this.logger.debug('Tracing metadata', { additionalMetadata });
|
|
213
213
|
}
|
|
214
|
-
const
|
|
215
|
-
? (0, tracing_1.getTracingConfig)(this, { additionalMetadata })
|
|
216
|
-
: undefined;
|
|
217
|
-
const executorWithTracing = tracingConfig ? executor.withConfig(tracingConfig) : executor;
|
|
214
|
+
const executorWithTracing = executor.withConfig((0, tracing_1.getTracingConfig)(this, { additionalMetadata }));
|
|
218
215
|
const invokeParams = {
|
|
219
216
|
input,
|
|
220
217
|
system_message: options.systemMessage ?? prompt_1.SYSTEM_MESSAGE,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../../../../../nodes/agents/Agent/agents/ToolsAgent/V2/execute.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../../../../../nodes/agents/Agent/agents/ToolsAgent/V2/execute.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,6 @@ exports.runAgent = runAgent;
|
|
|
5
5
|
const agent_execution_1 = require("../../../../../../../utils/agent-execution");
|
|
6
6
|
const buildResponseMetadata_1 = require("../../../../../../../utils/agent-execution/buildResponseMetadata");
|
|
7
7
|
const tracing_1 = require("../../../../../../../utils/tracing");
|
|
8
|
-
const utils_1 = require("../../../utils");
|
|
9
8
|
const prompt_1 = require("../../prompt");
|
|
10
9
|
function appendToolAttributions(output, steps, tools) {
|
|
11
10
|
if (output.trim() === '')
|
|
@@ -41,10 +40,7 @@ async function runAgent(ctx, executor, itemContext, model, memory, response, mem
|
|
|
41
40
|
if (Object.keys(additionalMetadata).length > 0 && logger) {
|
|
42
41
|
ctx.logger.debug('Tracing metadata', { additionalMetadata });
|
|
43
42
|
}
|
|
44
|
-
const
|
|
45
|
-
? (0, tracing_1.getTracingConfig)(ctx, { additionalMetadata })
|
|
46
|
-
: undefined;
|
|
47
|
-
const executorWithTracing = tracingConfig ? executor.withConfig(tracingConfig) : executor;
|
|
43
|
+
const executorWithTracing = executor.withConfig((0, tracing_1.getTracingConfig)(ctx, { additionalMetadata }));
|
|
48
44
|
const isStreamingAvailable = 'isStreaming' in ctx ? ctx.isStreaming?.() : undefined;
|
|
49
45
|
if ('isStreaming' in ctx &&
|
|
50
46
|
options.enableStreaming &&
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runAgent.js","sourceRoot":"","sources":["../../../../../../../../nodes/agents/Agent/agents/ToolsAgent/V3/helpers/runAgent.ts"],"names":[],"mappings":";;;;AAGA,4DAOgC;AAChC,wFAAqF;AACrF,4CAAwE;AASxE,
|
|
1
|
+
{"version":3,"file":"runAgent.js","sourceRoot":"","sources":["../../../../../../../../nodes/agents/Agent/agents/ToolsAgent/V3/helpers/runAgent.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@ exports.extractParsedOutput = extractParsedOutput;
|
|
|
5
5
|
exports.checkForStructuredTools = checkForStructuredTools;
|
|
6
6
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
7
7
|
function isExecuteFunctions(context) {
|
|
8
|
-
return '
|
|
8
|
+
return !('cloneWith' in context);
|
|
9
9
|
}
|
|
10
10
|
async function extractParsedOutput(ctx, outputParser, output) {
|
|
11
11
|
const parsedOutput = (await outputParser.parse(output));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../nodes/agents/Agent/agents/utils.ts"],"names":[],"mappings":";;;;;AAEA,+CAKsB;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../nodes/agents/Agent/agents/utils.ts"],"names":[],"mappings":";;;;;AAEA,+CAKsB;AAUtB,4BACC,OAAiD;IAEjD,OAAO,CAAC,CAAC,WAAW,IAAI,OAAO,CAAC,CAAC;AAClC,CAAC;AAEM,KAAK,8BACX,GAAsB,EACtB,YAAuC,EACvC,MAAc;IAEd,MAAM,YAAY,GAAG,CAAC,MAAM,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,CAErD,CAAC;IAEF,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC,WAAW,IAAI,GAAG,EAAE,CAAC;QACtC,OAAO,YAAY,CAAC;IACrB,CAAC;IAGD,OAAO,YAAY,EAAE,MAAM,IAAI,YAAY,CAAC;AAC7C,CAAC;AAEM,KAAK,kCACX,KAAwD,EACxD,IAAW,EACX,gBAAwB;IAExB,MAAM,sBAAsB,GAAG,KAAK,CAAC,MAAM,CAC1C,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,KAAK,uBAAuB,CAC3D,CAAC;IACF,IAAI,sBAAsB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACvC,MAAM,WAAW,GAAG,CAAC,IAAkC,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,IAAI,GAAG,CAAC;QAC7E,MAAM,IAAI,iCAAkB,CAC3B,IAAI,EACJ,4CAA4C,gBAAgB,qCAAqC,EACjG;YACC,SAAS,EAAE,CAAC;YACZ,WAAW,EAAE,iCAAiC,sBAAsB,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;SAClG,CACD,CAAC;IACH,CAAC;AACF,CAAC"}
|
|
@@ -35,7 +35,7 @@ class OpenAiAssistant {
|
|
|
35
35
|
resources: {
|
|
36
36
|
primaryDocumentation: [
|
|
37
37
|
{
|
|
38
|
-
url: 'https://docs.n8n.io/integrations/builtin/
|
|
38
|
+
url: 'https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-langchain.openai/assistant-operations',
|
|
39
39
|
},
|
|
40
40
|
],
|
|
41
41
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OpenAiAssistant.node.js","sourceRoot":"","sources":["../../../../nodes/agents/OpenAiAssistant/OpenAiAssistant.node.ts"],"names":[],"mappings":";;;AAAA,sDAA0D;AAE1D,uFAA2F;AAC3F,+CAAuE;AAOvE,mCAAgD;AAEhD,4CAAuE;AACvE,4CAAkD;AAElD,mCAAsD;AACtD,0EAA2F;AAC3F,gCAAoC;AACpC,wCAAuC;AAEvC;IAAA;QACC,gBAAW,GAAyB;YACnC,WAAW,EAAE,kBAAkB;YAC/B,IAAI,EAAE,iBAAiB;YACvB,MAAM,EAAE,IAAI;YACZ,IAAI,EAAE,UAAU;YAChB,KAAK,EAAE,CAAC,WAAW,CAAC;YACpB,OAAO,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC;YACjB,WAAW,EAAE,sCAAsC;YACnD,QAAQ,EAAE,mBAAmB;YAC7B,QAAQ,EAAE;gBACT,IAAI,EAAE,kBAAkB;gBACxB,KAAK,EAAE,SAAS;aAChB;YACD,KAAK,EAAE;gBACN,KAAK,EAAE,CAAC,WAAW,CAAC;gBACpB,UAAU,EAAE,CAAC,IAAI,CAAC;gBAClB,aAAa,EAAE;oBACd,EAAE,EAAE,CAAC,QAAQ,EAAE,YAAY,CAAC;iBAC5B;gBACD,SAAS,EAAE;oBACV,oBAAoB,EAAE;wBACrB;4BACC,GAAG,EAAE,
|
|
1
|
+
{"version":3,"file":"OpenAiAssistant.node.js","sourceRoot":"","sources":["../../../../nodes/agents/OpenAiAssistant/OpenAiAssistant.node.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,11 @@
|
|
|
1
1
|
import { type INodeType, type INodeTypeDescription, type ISupplyDataFunctions, type SupplyData } from 'n8n-workflow';
|
|
2
|
+
import { searchModels } from './methods/searchModels';
|
|
2
3
|
export declare class LmChatAzureOpenAi implements INodeType {
|
|
4
|
+
methods: {
|
|
5
|
+
listSearch: {
|
|
6
|
+
searchModels: typeof searchModels;
|
|
7
|
+
};
|
|
8
|
+
};
|
|
3
9
|
description: INodeTypeDescription;
|
|
4
10
|
supplyData(this: ISupplyDataFunctions, itemIndex: number): Promise<SupplyData>;
|
|
5
11
|
}
|
|
@@ -6,18 +6,24 @@ const ai_utilities_1 = require("@n8n/ai-utilities");
|
|
|
6
6
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
7
7
|
const api_key_1 = require("./credentials/api-key");
|
|
8
8
|
const oauth2_1 = require("./credentials/oauth2");
|
|
9
|
+
const searchModels_1 = require("./methods/searchModels");
|
|
9
10
|
const properties_1 = require("./properties");
|
|
10
11
|
class LmChatAzureOpenAi {
|
|
11
12
|
constructor() {
|
|
13
|
+
this.methods = {
|
|
14
|
+
listSearch: {
|
|
15
|
+
searchModels: searchModels_1.searchModels,
|
|
16
|
+
},
|
|
17
|
+
};
|
|
12
18
|
this.description = {
|
|
13
|
-
displayName: 'Azure
|
|
19
|
+
displayName: 'Azure AI Foundry Chat Model',
|
|
14
20
|
name: 'lmChatAzureOpenAi',
|
|
15
21
|
icon: 'file:azure.svg',
|
|
16
22
|
group: ['transform'],
|
|
17
23
|
version: 1,
|
|
18
24
|
description: 'For advanced usage with an AI chain',
|
|
19
25
|
defaults: {
|
|
20
|
-
name: 'Azure
|
|
26
|
+
name: 'Azure AI Foundry Chat Model',
|
|
21
27
|
},
|
|
22
28
|
codex: {
|
|
23
29
|
categories: ['AI'],
|
|
@@ -32,6 +38,7 @@ class LmChatAzureOpenAi {
|
|
|
32
38
|
},
|
|
33
39
|
],
|
|
34
40
|
},
|
|
41
|
+
alias: ['Azure OpenAI Chat Model', 'Azure OpenAI', 'Azure AI Foundry', 'Foundry'],
|
|
35
42
|
},
|
|
36
43
|
inputs: [],
|
|
37
44
|
outputs: [n8n_workflow_1.NodeConnectionTypes.AiLanguageModel],
|
|
@@ -109,19 +116,21 @@ class LmChatAzureOpenAi {
|
|
|
109
116
|
this.logger.info(`Azure OpenAI (Foundry) client initialized for model: ${modelName}`);
|
|
110
117
|
return { response: model };
|
|
111
118
|
}
|
|
119
|
+
const azureOpenAIEndpoint = modelConfig.azureOpenAIEndpoint ||
|
|
120
|
+
`https://${modelConfig.azureOpenAIApiInstanceName}.openai.azure.com`;
|
|
112
121
|
const model = new openai_1.AzureChatOpenAI({
|
|
113
122
|
useResponsesApi: false,
|
|
114
123
|
model: modelName,
|
|
115
124
|
azureOpenAIApiDeploymentName: modelName,
|
|
116
125
|
...modelConfig,
|
|
117
126
|
...options,
|
|
127
|
+
azureOpenAIEndpoint,
|
|
118
128
|
timeout,
|
|
119
129
|
maxRetries: options.maxRetries ?? 2,
|
|
120
130
|
callbacks: [new ai_utilities_1.N8nLlmTracing(this)],
|
|
121
131
|
configuration: {
|
|
122
132
|
fetchOptions: {
|
|
123
|
-
dispatcher: (0, ai_utilities_1.getProxyAgent)(
|
|
124
|
-
`https://${modelConfig.azureOpenAIApiInstanceName}.openai.azure.com`, {
|
|
133
|
+
dispatcher: (0, ai_utilities_1.getProxyAgent)(azureOpenAIEndpoint, {
|
|
125
134
|
headersTimeout: timeout,
|
|
126
135
|
bodyTimeout: timeout,
|
|
127
136
|
}, this.helpers.getSecureEgressFilter()),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LmChatAzureOpenAi.node.js","sourceRoot":"","sources":["../../../../nodes/llms/LmChatAzureOpenAi/LmChatAzureOpenAi.node.ts"],"names":[],"mappings":";;;AAAA,8CAAoF;AACpF,oDAAiG;AACjG,+CAOsB;AAEtB,mDAAkE;AAClE,iDAAiE;AACjE,6CAA0C;AAQ1C;IAAA;QACC,gBAAW,GAAyB;YACnC,WAAW,EAAE,
|
|
1
|
+
{"version":3,"file":"LmChatAzureOpenAi.node.js","sourceRoot":"","sources":["../../../../nodes/llms/LmChatAzureOpenAi/LmChatAzureOpenAi.node.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,16 @@
|
|
|
1
1
|
import type { TokenCredential, AccessToken } from '@azure/identity';
|
|
2
|
-
import type { INode } from 'n8n-workflow';
|
|
3
|
-
import type
|
|
2
|
+
import type { INode, NodeEgressFilter } from 'n8n-workflow';
|
|
3
|
+
import { type AzureEntraCognitiveServicesOAuth2ApiCredential } from '../types';
|
|
4
4
|
export declare class N8nOAuth2TokenCredential implements TokenCredential {
|
|
5
5
|
private node;
|
|
6
6
|
private credential;
|
|
7
|
-
|
|
7
|
+
private audience;
|
|
8
|
+
private egressFilter?;
|
|
9
|
+
constructor(node: INode, credential: AzureEntraCognitiveServicesOAuth2ApiCredential, audience?: string, egressFilter?: NodeEgressFilter | undefined);
|
|
8
10
|
getToken(): Promise<AccessToken | null>;
|
|
9
11
|
getDeploymentDetails(): Promise<{
|
|
10
12
|
apiVersion: string;
|
|
11
|
-
endpoint: string;
|
|
13
|
+
endpoint: string | undefined;
|
|
12
14
|
resourceName: string;
|
|
13
15
|
endpointType: 'foundry';
|
|
14
16
|
foundryEndpoint: string | undefined;
|
|
@@ -16,7 +18,7 @@ export declare class N8nOAuth2TokenCredential implements TokenCredential {
|
|
|
16
18
|
endpointType?: undefined;
|
|
17
19
|
foundryEndpoint?: undefined;
|
|
18
20
|
apiVersion: string;
|
|
19
|
-
endpoint: string;
|
|
21
|
+
endpoint: string | undefined;
|
|
20
22
|
resourceName: string;
|
|
21
23
|
}>;
|
|
22
24
|
}
|
|
@@ -3,16 +3,27 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.N8nOAuth2TokenCredential = void 0;
|
|
4
4
|
const client_oauth2_1 = require("@n8n/client-oauth2");
|
|
5
5
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
6
|
+
const requireTenantId_1 = require("./requireTenantId");
|
|
7
|
+
const types_1 = require("../types");
|
|
8
|
+
function expiresOnTimestamp(data) {
|
|
9
|
+
const expiresIn = Number(data.expires_in);
|
|
10
|
+
if (Number.isFinite(expiresIn) && expiresIn > 0)
|
|
11
|
+
return Date.now() + expiresIn * 1000;
|
|
12
|
+
const expiresOn = Number(data.expires_on);
|
|
13
|
+
if (Number.isFinite(expiresOn) && expiresOn > 0)
|
|
14
|
+
return expiresOn * 1000;
|
|
15
|
+
return Date.now();
|
|
16
|
+
}
|
|
6
17
|
class N8nOAuth2TokenCredential {
|
|
7
|
-
constructor(node, credential) {
|
|
18
|
+
constructor(node, credential, audience = types_1.AZURE_OPENAI_INFERENCE_AUDIENCE, egressFilter) {
|
|
8
19
|
this.node = node;
|
|
9
20
|
this.credential = credential;
|
|
21
|
+
this.audience = audience;
|
|
22
|
+
this.egressFilter = egressFilter;
|
|
10
23
|
}
|
|
11
24
|
async getToken() {
|
|
25
|
+
(0, requireTenantId_1.requireTenantId)(this.node, this.credential.tenantId);
|
|
12
26
|
try {
|
|
13
|
-
if (!this.credential?.oauthTokenData?.access_token) {
|
|
14
|
-
throw new n8n_workflow_1.NodeOperationError(this.node, 'Failed to retrieve access token');
|
|
15
|
-
}
|
|
16
27
|
const oAuthClient = new client_oauth2_1.ClientOAuth2({
|
|
17
28
|
clientId: this.credential.clientId,
|
|
18
29
|
clientSecret: this.credential.clientSecret,
|
|
@@ -21,14 +32,14 @@ class N8nOAuth2TokenCredential {
|
|
|
21
32
|
authentication: this.credential.authentication,
|
|
22
33
|
authorizationUri: this.credential.authUrl,
|
|
23
34
|
additionalBodyProperties: {
|
|
24
|
-
resource:
|
|
35
|
+
resource: `${this.audience}/`,
|
|
25
36
|
},
|
|
37
|
+
ssrfBridge: this.egressFilter,
|
|
26
38
|
});
|
|
27
39
|
const token = await oAuthClient.credentials.getToken();
|
|
28
|
-
const data = token.data;
|
|
29
40
|
return {
|
|
30
|
-
token: data.access_token,
|
|
31
|
-
expiresOnTimestamp: data
|
|
41
|
+
token: token.data.access_token,
|
|
42
|
+
expiresOnTimestamp: expiresOnTimestamp(token.data),
|
|
32
43
|
};
|
|
33
44
|
}
|
|
34
45
|
catch (error) {
|
|
@@ -39,7 +50,7 @@ class N8nOAuth2TokenCredential {
|
|
|
39
50
|
if (this.credential.endpointType === 'foundry') {
|
|
40
51
|
return {
|
|
41
52
|
apiVersion: this.credential.apiVersion ?? '',
|
|
42
|
-
endpoint: this.credential.foundryEndpoint
|
|
53
|
+
endpoint: this.credential.foundryEndpoint,
|
|
43
54
|
resourceName: this.credential.resourceName ?? '',
|
|
44
55
|
endpointType: 'foundry',
|
|
45
56
|
foundryEndpoint: this.credential.foundryEndpoint,
|
|
@@ -47,7 +58,7 @@ class N8nOAuth2TokenCredential {
|
|
|
47
58
|
}
|
|
48
59
|
return {
|
|
49
60
|
apiVersion: this.credential.apiVersion ?? '',
|
|
50
|
-
endpoint: this.credential.endpoint
|
|
61
|
+
endpoint: this.credential.endpoint,
|
|
51
62
|
resourceName: this.credential.resourceName ?? '',
|
|
52
63
|
};
|
|
53
64
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"N8nOAuth2TokenCredential.js","sourceRoot":"","sources":["../../../../../nodes/llms/LmChatAzureOpenAi/credentials/N8nOAuth2TokenCredential.ts"],"names":[],"mappings":";;;AAEA,sDAAkD;AAElD,+CAAkD;
|
|
1
|
+
{"version":3,"file":"N8nOAuth2TokenCredential.js","sourceRoot":"","sources":["../../../../../nodes/llms/LmChatAzureOpenAi/credentials/N8nOAuth2TokenCredential.ts"],"names":[],"mappings":";;;AAEA,sDAAkD;AAElD,+CAAkD;AAElD,uDAAoD;AACpD,oCAGkB;AASlB,SAAS,kBAAkB,CAAC,IAAqD;IAChF,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC1C,IAAI,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,SAAS,GAAG,CAAC;QAAE,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,GAAG,IAAI,CAAC;IAEtF,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC1C,IAAI,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,SAAS,GAAG,CAAC;QAAE,OAAO,SAAS,GAAG,IAAI,CAAC;IAEzE,OAAO,IAAI,CAAC,GAAG,EAAE,CAAC;AACnB,CAAC;AAKD;IACC,YACS,IAAW,EACX,UAA0D,EAC1D,QAAQ,GAAW,uCAA+B,EAClD,YAA+B;oBAH/B,IAAI;0BACJ,UAAU;wBACV,QAAQ;4BACR,YAAY;IAClB,CAAC;IAMJ,KAAK,CAAC,QAAQ;QAGb,IAAA,iCAAe,EAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QAErD,IAAI,CAAC;YACJ,MAAM,WAAW,GAAG,IAAI,4BAAY,CAAC;gBACpC,QAAQ,EAAE,IAAI,CAAC,UAAU,CAAC,QAAQ;gBAClC,YAAY,EAAE,IAAI,CAAC,UAAU,CAAC,YAAY;gBAC1C,cAAc,EAAE,IAAI,CAAC,UAAU,CAAC,cAAc;gBAC9C,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC;gBACzC,cAAc,EAAE,IAAI,CAAC,UAAU,CAAC,cAAc;gBAC9C,gBAAgB,EAAE,IAAI,CAAC,UAAU,CAAC,OAAO;gBACzC,wBAAwB,EAAE;oBACzB,QAAQ,EAAE,GAAG,IAAI,CAAC,QAAQ,GAAG;iBAC7B;gBAGD,UAAU,EAAE,IAAI,CAAC,YAAY;aAC7B,CAAC,CAAC;YAEH,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC;YACvD,OAAO;gBACN,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,YAAY;gBAC9B,kBAAkB,EAAE,kBAAkB,CAAC,KAAK,CAAC,IAAI,CAAC;aAClD,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,IAAI,iCAAkB,CAAC,IAAI,CAAC,IAAI,EAAE,wCAAwC,EAAE,KAAK,CAAC,CAAC;QAC1F,CAAC;IACF,CAAC;IAED,KAAK,CAAC,oBAAoB;QACzB,IAAI,IAAI,CAAC,UAAU,CAAC,YAAY,KAAK,SAAS,EAAE,CAAC;YAChD,OAAO;gBACN,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,UAAU,IAAI,EAAE;gBAC5C,QAAQ,EAAE,IAAI,CAAC,UAAU,CAAC,eAAe;gBACzC,YAAY,EAAE,IAAI,CAAC,UAAU,CAAC,YAAY,IAAI,EAAE;gBAChD,YAAY,EAAE,SAAkB;gBAChC,eAAe,EAAE,IAAI,CAAC,UAAU,CAAC,eAAe;aAChD,CAAC;QACH,CAAC;QACD,OAAO;YACN,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,UAAU,IAAI,EAAE;YAC5C,QAAQ,EAAE,IAAI,CAAC,UAAU,CAAC,QAAQ;YAClC,YAAY,EAAE,IAAI,CAAC,UAAU,CAAC,YAAY,IAAI,EAAE;SAChD,CAAC;IACH,CAAC;CACD"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.setupApiKeyAuthentication = setupApiKeyAuthentication;
|
|
4
4
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
5
|
+
const requireFoundryEndpoint_1 = require("./requireFoundryEndpoint");
|
|
5
6
|
async function setupApiKeyAuthentication(credentialName) {
|
|
6
7
|
try {
|
|
7
8
|
const configCredentials = await this.getCredentials(credentialName);
|
|
@@ -10,15 +11,13 @@ async function setupApiKeyAuthentication(credentialName) {
|
|
|
10
11
|
}
|
|
11
12
|
this.logger.info('Using API Key authentication for Azure OpenAI.');
|
|
12
13
|
if (configCredentials.endpointType === 'foundry') {
|
|
13
|
-
|
|
14
|
-
throw new n8n_workflow_1.NodeOperationError(this.getNode(), 'Foundry endpoint is missing in the selected Azure OpenAI API credential.');
|
|
15
|
-
}
|
|
14
|
+
const foundryEndpoint = (0, requireFoundryEndpoint_1.requireFoundryEndpoint)(this.getNode(), configCredentials.foundryEndpoint);
|
|
16
15
|
return {
|
|
17
16
|
azureOpenAIApiKey: configCredentials.apiKey,
|
|
18
17
|
azureOpenAIApiInstanceName: '',
|
|
19
18
|
azureOpenAIApiVersion: '',
|
|
20
|
-
azureOpenAIEndpoint:
|
|
21
|
-
azureFoundryBaseURL:
|
|
19
|
+
azureOpenAIEndpoint: foundryEndpoint,
|
|
20
|
+
azureFoundryBaseURL: foundryEndpoint,
|
|
22
21
|
};
|
|
23
22
|
}
|
|
24
23
|
if (!configCredentials.resourceName?.trim() || !configCredentials.apiVersion?.trim()) {
|