n8n 2.35.2 → 2.36.0

package/dist/modules/instance-ai/instance-ai-error-reporter.service.js

@@ -16,6 +16,7 @@ const di_1 = require("@n8n/di");
 const instance_ai_1 = require("@n8n/instance-ai");
 const n8n_core_1 = require("n8n-core");
 const observability_1 = require("./observability");
+const stream_transport_error_1 = require("./stream-transport-error");
 function getAgentErrorSeverity(source) {
     if (source === 'observer' || source === 'reflector' || source === 'episodic-memory') {
         return 'warning';
@@ -57,6 +58,14 @@ let InstanceAiErrorReporterService = class InstanceAiErrorReporterService {
             });
             return;
         }
+        if (context.providerStream && (0, stream_transport_error_1.isStreamTransportError)(error)) {
+            this.logger.warn(`Instance AI stream transport failure in ${context.component}`, {
+                error,
+                component: context.component,
+                ...observability,
+            });
+            return;
+        }
         if (isSelfDeclaredWarning(error)) {
             this.logger.warn(`Instance AI warning-level error in ${context.component}`, {
                 error,

package/dist/modules/instance-ai/instance-ai-error-reporter.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"instance-ai-error-reporter.service.js","sourceRoot":"","sources":["../../../src/modules/instance-ai/instance-ai-error-reporter.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"instance-ai-error-reporter.service.js","sourceRoot":"","sources":["../../../src/modules/instance-ai/instance-ai-error-reporter.service.ts"],"names":[],"mappings":"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"}

package/dist/modules/instance-ai/instance-ai-model.service.d.ts

@@ -1,4 +1,4 @@
-import { type InstanceAiCredits } from '@n8n/api-types';
+import { type InstanceAiCredits, type ProxyContext } from '@n8n/api-types';
 import { OutboundHttp } from '@n8n/backend-network';
 import type { User } from '@n8n/db';
 import type { ModelConfig } from '@n8n/instance-ai';
@@ -11,8 +11,8 @@ export declare class InstanceAiModelService {
     private readonly outboundHttp;
     constructor(settingsService: InstanceAiSettingsService, aiService: AiService, outboundHttp: OutboundHttp);
     isProxyEnabled(): boolean;
-    resolveAgentModelConfig(user: User): Promise<ModelConfig>;
-    resolveProxyModel(user: User, proxyBaseUrl: string, tokenManager: ProxyTokenManager): Promise<ModelConfig>;
+    resolveAgentModelConfig(user: User, proxyContext?: ProxyContext): Promise<ModelConfig>;
+    resolveProxyModel(user: User, proxyBaseUrl: string, tokenManager: ProxyTokenManager, proxyContext?: ProxyContext): Promise<ModelConfig>;
     private resolveHttpProxyModel;
     getCredits(user: User): Promise<InstanceAiCredits>;
 }

package/dist/modules/instance-ai/instance-ai-model.service.js

@@ -18,6 +18,7 @@ const constants_1 = require("../../constants");
 const ai_service_1 = require("../../services/ai.service");
 const proxy_token_manager_1 = require("../../services/proxy-token-manager");
 const ai_proxy_fetch_1 = require("../../utils/ai-proxy-fetch");
+const ai_proxy_language_model_1 = require("../../utils/ai-proxy-language-model");
 const ai_service_retry_1 = require("../../utils/ai-service-retry");
 const instance_ai_settings_service_1 = require("./instance-ai-settings.service");
 let InstanceAiModelService = class InstanceAiModelService {
@@ -29,40 +30,33 @@ let InstanceAiModelService = class InstanceAiModelService {
     isProxyEnabled() {
         return this.aiService.isProxyEnabled();
     }
-    async resolveAgentModelConfig(user) {
+    async resolveAgentModelConfig(user, proxyContext) {
         if (this.aiService.isProxyEnabled()) {
             const client = await this.aiService.getClient();
             const proxyBaseUrl = client.getApiProxyBaseUrl();
             const tokenManager = new proxy_token_manager_1.ProxyTokenManager(async () => {
                 return await client.getInstanceAiApiProxyToken({ id: user.id }, { userMessageId: (0, nanoid_1.nanoid)() });
             });
-            return await this.resolveProxyModel(user, proxyBaseUrl, tokenManager);
+            return await this.resolveProxyModel(user, proxyBaseUrl, tokenManager, proxyContext);
         }
         const httpProxyModel = await this.resolveHttpProxyModel(user);
         if (httpProxyModel)
             return httpProxyModel;
         return await this.settingsService.resolveModelConfig(user);
     }
-    async resolveProxyModel(user, proxyBaseUrl, tokenManager) {
-        const modelName = this.settingsService.resolveModelName(user);
-        const { createAnthropic } = await import('@ai-sdk/anthropic');
-        const modelFetch = (0, ai_proxy_fetch_1.createAiProxyFetch)(this.outboundHttp);
-        const provider = createAnthropic({
-            baseURL: proxyBaseUrl + '/anthropic/v1',
-            apiKey: 'proxy-managed',
-            fetch: async (input, init) => {
-                const headers = new Headers(init?.headers);
-                const auth = await tokenManager.getAuthHeaders();
-                for (const [k, v] of Object.entries(auth)) {
-                    headers.set(k, v);
-                }
-                for (const [k, v] of Object.entries((0, api_types_1.buildProxyHeaders)({ feature: 'instance-ai', n8nVersion: constants_1.N8N_VERSION }))) {
-                    headers.set(k, v);
-                }
-                return await modelFetch(input, { ...init, headers });
-            },
+    async resolveProxyModel(user, proxyBaseUrl, tokenManager, proxyContext) {
+        const configuredModelId = this.settingsService.getConfiguredModelId();
+        const isExactKimi = (0, api_types_1.isMoonshotaiKimiK3ModelId)(configuredModelId);
+        const modelId = isExactKimi ? configuredModelId : this.settingsService.resolveModelName(user);
+        return await (0, ai_proxy_language_model_1.createProxyLanguageModel)({
+            proxyBaseUrl,
+            modelId,
+            tokenManager,
+            feature: 'instance-ai',
+            n8nVersion: constants_1.N8N_VERSION,
+            outboundHttp: this.outboundHttp,
+            ...proxyContext,
         });
-        return provider(modelName);
     }
     async resolveHttpProxyModel(user) {
         const hasHttpProxy = Boolean(process.env.HTTPS_PROXY || process.env.HTTP_PROXY);

package/dist/modules/instance-ai/instance-ai-model.service.js.map

@@ -1 +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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"}
+{"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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"}

package/dist/modules/instance-ai/instance-ai-settings.service.d.ts

@@ -2,23 +2,33 @@ import type { InstanceAiAdminSettingsResponse, InstanceAiAdminSettingsUpdateRequ
 import { GlobalConfig } from '@n8n/config';
 import { DbLockService, SettingsRepository, UserRepository } from '@n8n/db';
 import type { User } from '@n8n/db';
-import type { ModelConfig } from '@n8n/instance-ai';
+import { type ModelConfig } from '@n8n/instance-ai';
 import { CredentialsFinderService } from '../../credentials/credentials-finder.service';
 import { CredentialsService } from '../../credentials/credentials.service';
 import { InstanceCredentialBroker, type InstanceCredentialUse } from '../../credentials/instance-credential-broker';
 import { EventService } from '../../events/event.service';
 import { AiService } from '../../services/ai.service';
+import { INSTANCE_AI_DAYTONA_CREDENTIAL_POLICY, INSTANCE_AI_N8N_SANDBOX_CREDENTIAL_POLICY, SandboxSettingsService } from '../../services/sandbox-settings.service';
 import { UserService } from '../../services/user.service';
+export { INSTANCE_AI_DAYTONA_CREDENTIAL_POLICY, INSTANCE_AI_N8N_SANDBOX_CREDENTIAL_POLICY };
 export interface InstanceAiSandboxStatus {
     enabled: boolean;
     provider: InstanceAiSandboxProvider;
     workflowBuilderAvailable: boolean;
     unavailableReason: string | null;
 }
+export declare const CREDENTIAL_TO_MODEL_PROVIDER: Record<string, string>;
 export declare const INSTANCE_AI_MODEL_CREDENTIAL_POLICY: InstanceCredentialUse;
-export declare const INSTANCE_AI_DAYTONA_CREDENTIAL_POLICY: InstanceCredentialUse;
-export declare const INSTANCE_AI_N8N_SANDBOX_CREDENTIAL_POLICY: InstanceCredentialUse;
 export declare const INSTANCE_AI_SEARCH_CREDENTIAL_POLICY: InstanceCredentialUse;
+export interface AdminModelSelection {
+    modelCredentialId: string | null;
+    modelName: string | null;
+}
+export interface AdminCredentialSelection extends AdminModelSelection {
+    daytonaCredentialId: string | null;
+    n8nSandboxCredentialId: string | null;
+    searchCredentialId: string | null;
+}
 export declare class InstanceAiSettingsService {
     private readonly dbLockService;
     private readonly settingsRepository;
@@ -28,6 +38,7 @@ export declare class InstanceAiSettingsService {
     private readonly credentialsService;
     private readonly credentialsFinderService;
     private readonly instanceCredentialBroker;
+    private readonly sandboxSettingsService;
     private readonly eventService;
     private readonly config;
     private readonly deploymentConfig;
@@ -40,7 +51,7 @@ export declare class InstanceAiSettingsService {
     private searchDisabled;
     private adminN8nSandboxServiceUrl;
     private readonly environmentN8nSandboxServiceUrl;
-    constructor(globalConfig: GlobalConfig, dbLockService: DbLockService, settingsRepository: SettingsRepository, userRepository: UserRepository, userService: UserService, aiService: AiService, credentialsService: CredentialsService, credentialsFinderService: CredentialsFinderService, instanceCredentialBroker: InstanceCredentialBroker, eventService: EventService);
+    constructor(globalConfig: GlobalConfig, dbLockService: DbLockService, settingsRepository: SettingsRepository, userRepository: UserRepository, userService: UserService, aiService: AiService, credentialsService: CredentialsService, credentialsFinderService: CredentialsFinderService, instanceCredentialBroker: InstanceCredentialBroker, sandboxSettingsService: SandboxSettingsService, eventService: EventService);
     private get isCloud();
     isProxyEnabled(): boolean;
     loadFromDb(): Promise<void>;
@@ -88,6 +99,7 @@ export declare class InstanceAiSettingsService {
     getSandboxStatus(): InstanceAiSandboxStatus;
     isInstanceAiEnabled(): boolean;
     isSetupCompleted(): Promise<boolean>;
+    getConfiguredModelId(): string;
     resolveModelName(user: User): string;
     resolveModelConfig(user: User): Promise<ModelConfig>;
     resolveModelConfigForVerification(user: User, modelName?: string): Promise<ModelConfig>;
@@ -110,6 +122,10 @@ export declare class InstanceAiSettingsService {
     private hasEnvironmentSearchConnection;
     private isDirectSelfManaged;
     private envVarModelConfigForModel;
+    private resolveVertexProjectId;
+    private resolveVertexLocation;
+    private vertexAnthropicModelConfig;
+    private customModelOptionsFor;
     private extractModelName;
     private applyAdminSettings;
     private readUserPreferences;