npm - n8n-nodes-simple - Versions diffs - 2.5.4 → 2.5.6 - Mend

n8n-nodes-simple 2.5.4 → 2.5.6

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.

Files changed (39) hide show

package/dist/nodes/shared/api/types.d.ts CHANGED Viewed

@@ -55,6 +55,10 @@ export type AccumulatedUsage = {
     total_tokens: number;
     total_requests: number;
     retried_requests: number;
+    failed_requests?: Array<{
+        model: string;
+        error: string;
+    }>;
     cost?: number;
     is_byok?: boolean;
     prompt_tokens_details?: {

package/dist/nodes/shared/config/parameters.d.ts CHANGED Viewed

@@ -3,6 +3,7 @@ import { VisualEditorProperties } from '../core/request/visualEditor';
 import { RawMessage } from '../core/messages/types';
 export type ExtractedParameters = {
     model: string;
+    fallbackModel?: string;
     agentType: string;
     rawMessagesToSend: RawMessage[];
     responseFormat: string;
@@ -10,6 +11,7 @@ export type ExtractedParameters = {
     outputJsonSchemaDefinition: string;
     structuredOutputToolsMode: boolean;
     tenacityMaxRetries: number;
+    fallbackTenacityMaxRetries?: number;
     structuredOutputProperties: VisualEditorProperties[];
     structuredOutputName: string;
     structuredOutputDescription: string;

package/dist/nodes/shared/config/parameters.js CHANGED Viewed

@@ -8,8 +8,11 @@ function extractParameters(executeFunctions, index) {
     const chatMemoryMessage = rawMessages.find((msg) => msg.role === 'chatMemoryRole');
     const saveToolCallsInChatMemory = (_a = chatMemoryMessage === null || chatMemoryMessage === void 0 ? void 0 : chatMemoryMessage.saveToolCallsInChatMemory) !== null && _a !== void 0 ? _a : true;
     const loadToolCallsFromChatMemory = (_b = chatMemoryMessage === null || chatMemoryMessage === void 0 ? void 0 : chatMemoryMessage.loadToolCallsFromChatMemory) !== null && _b !== void 0 ? _b : true;
+    const fallbackModelRaw = get('options.fallbackModelId', '', { extractValue: true });
+    const fallbackTenacityMaxRetriesRaw = get('options.fallbackTenacityMaxRetries', -1);
     const params = {
         model: get('modelId', '', { extractValue: true }),
+        fallbackModel: fallbackModelRaw || undefined,
         agentType: get('agentType', 'coreAgent'),
         rawMessagesToSend: rawMessages,
         responseFormat: get('responseFormat', ''),
@@ -17,6 +20,7 @@ function extractParameters(executeFunctions, index) {
         outputJsonSchemaDefinition: get('outputJsonSchemaDefinition', ''),
         structuredOutputToolsMode: get('structuredOutputToolsMode', false),
         tenacityMaxRetries: get('options.tenacityMaxRetries', 0),
+        fallbackTenacityMaxRetries: fallbackTenacityMaxRetriesRaw === -1 ? undefined : fallbackTenacityMaxRetriesRaw,
         structuredOutputProperties: get('structuredOutputProperties.values', []),
         structuredOutputName: get('structuredOutputName', ''),
         structuredOutputDescription: get('structuredOutputDescription', ''),

package/dist/nodes/shared/config/parameters.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"parameters.js","sourceRoot":"","sources":["../../../../nodes/shared/config/parameters.ts"],"names":[],"mappings":";;~~AA8BA~~,~~8CAyCC~~;~~AAzCD~~,SAAgB,iBAAiB,CAChC,gBAAmC,EACnC,KAAa;;IAEb,MAAM,GAAG,GAAG,CAAI,IAAY,EAAE,YAAe,EAAE,OAAkC,EAAE,EAAE,CACpF,gBAAgB,CAAC,gBAAgB,CAAC,IAAI,EAAE,KAAK,EAAE,YAAY,EAAE,OAAO,CAAM,CAAC;IAE5E,MAAM,WAAW,GAAG,GAAG,CAAe,uBAAuB,EAAE,EAAE,CAAC,CAAC;IAGnE,MAAM,iBAAiB,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,gBAAgB,CAAC,CAAC;IACnF,MAAM,yBAAyB,GAAG,MAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,yBAAyB,mCAAI,IAAI,CAAC;IACvF,MAAM,2BAA2B,GAAG,MAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,2BAA2B,mCAAI,IAAI,CAAC;IAE3F,MAAM,MAAM,GAAwB;QACnC,KAAK,EAAE,GAAG,CAAS,SAAS,EAAE,EAAE,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;QACzD,SAAS,EAAE,GAAG,CAAS,WAAW,EAAE,WAAW,CAAC;QAChD,iBAAiB,EAAE,WAAW;QAC9B,cAAc,EAAE,GAAG,CAAS,gBAAgB,EAAE,EAAE,CAAC;QACjD,WAAW,EAAE,GAAG,CAAW,aAAa,EAAE,EAAE,CAAC;QAC7C,0BAA0B,EAAE,GAAG,CAAS,4BAA4B,EAAE,EAAE,CAAC;QACzE,yBAAyB,EAAE,GAAG,CAAU,2BAA2B,EAAE,KAAK,CAAC;QAC3E,kBAAkB,EAAE,GAAG,CAAS,4BAA4B,EAAE,CAAC,CAAC;QAChE,0BAA0B,EAAE,GAAG,CAC9B,mCAAmC,EACnC,EAAE,CACF;QACD,oBAAoB,EAAE,GAAG,CAAS,sBAAsB,EAAE,EAAE,CAAC;QAC7D,2BAA2B,EAAE,GAAG,CAAS,6BAA6B,EAAE,EAAE,CAAC;QAC3E,uBAAuB,EAAE,GAAG,CAAU,yBAAyB,EAAE,KAAK,CAAC;QACvE,yBAAyB,EAAE,GAAG,CAAS,2BAA2B,EAAE,EAAE,CAAC;QACvE,gCAAgC,EAAE,GAAG,CAAS,kCAAkC,EAAE,EAAE,CAAC;QACrF,OAAO,EAAE,GAAG,CAAc,SAAS,EAAE,EAAE,CAAC;QACxC,kBAAkB,EAAE,GAAG,CAAS,4BAA4B,EAAE,EAAE,CAAC;QACjE,gBAAgB,EAAE,GAAG,CAAuB,0BAA0B,EAAE,IAAI,CAAC;QAC7E,yBAAyB;QACzB,2BAA2B;QAC3B,WAAW,EAAE,gBAAgB,CAAC,wBAAwB,EAAE;KACxD,CAAC;IAEF,OAAO,MAAM,CAAC;AACf,CAAC"}
1	+ {"version":3,"file":"parameters.js","sourceRoot":"","sources":["../../../../nodes/shared/config/parameters.ts"],"names":[],"mappings":";;AAgCA,8CA8CC;AA9CD,SAAgB,iBAAiB,CAChC,gBAAmC,EACnC,KAAa;;IAEb,MAAM,GAAG,GAAG,CAAI,IAAY,EAAE,YAAe,EAAE,OAAkC,EAAE,EAAE,CACpF,gBAAgB,CAAC,gBAAgB,CAAC,IAAI,EAAE,KAAK,EAAE,YAAY,EAAE,OAAO,CAAM,CAAC;IAE5E,MAAM,WAAW,GAAG,GAAG,CAAe,uBAAuB,EAAE,EAAE,CAAC,CAAC;IAGnE,MAAM,iBAAiB,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,gBAAgB,CAAC,CAAC;IACnF,MAAM,yBAAyB,GAAG,MAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,yBAAyB,mCAAI,IAAI,CAAC;IACvF,MAAM,2BAA2B,GAAG,MAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,2BAA2B,mCAAI,IAAI,CAAC;IAE3F,MAAM,gBAAgB,GAAG,GAAG,CAAS,yBAAyB,EAAE,EAAE,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC;IAC5F,MAAM,6BAA6B,GAAG,GAAG,CAAS,oCAAoC,EAAE,CAAC,CAAC,CAAC,CAAC;IAE5F,MAAM,MAAM,GAAwB;QACnC,KAAK,EAAE,GAAG,CAAS,SAAS,EAAE,EAAE,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;QACzD,aAAa,EAAE,gBAAgB,IAAI,SAAS;QAC5C,SAAS,EAAE,GAAG,CAAS,WAAW,EAAE,WAAW,CAAC;QAChD,iBAAiB,EAAE,WAAW;QAC9B,cAAc,EAAE,GAAG,CAAS,gBAAgB,EAAE,EAAE,CAAC;QACjD,WAAW,EAAE,GAAG,CAAW,aAAa,EAAE,EAAE,CAAC;QAC7C,0BAA0B,EAAE,GAAG,CAAS,4BAA4B,EAAE,EAAE,CAAC;QACzE,yBAAyB,EAAE,GAAG,CAAU,2BAA2B,EAAE,KAAK,CAAC;QAC3E,kBAAkB,EAAE,GAAG,CAAS,4BAA4B,EAAE,CAAC,CAAC;QAChE,0BAA0B,EAAE,6BAA6B,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,6BAA6B;QAC5G,0BAA0B,EAAE,GAAG,CAC9B,mCAAmC,EACnC,EAAE,CACF;QACD,oBAAoB,EAAE,GAAG,CAAS,sBAAsB,EAAE,EAAE,CAAC;QAC7D,2BAA2B,EAAE,GAAG,CAAS,6BAA6B,EAAE,EAAE,CAAC;QAC3E,uBAAuB,EAAE,GAAG,CAAU,yBAAyB,EAAE,KAAK,CAAC;QACvE,yBAAyB,EAAE,GAAG,CAAS,2BAA2B,EAAE,EAAE,CAAC;QACvE,gCAAgC,EAAE,GAAG,CAAS,kCAAkC,EAAE,EAAE,CAAC;QACrF,OAAO,EAAE,GAAG,CAAc,SAAS,EAAE,EAAE,CAAC;QACxC,kBAAkB,EAAE,GAAG,CAAS,4BAA4B,EAAE,EAAE,CAAC;QACjE,gBAAgB,EAAE,GAAG,CAAuB,0BAA0B,EAAE,IAAI,CAAC;QAC7E,yBAAyB;QACzB,2BAA2B;QAC3B,WAAW,EAAE,gBAAgB,CAAC,wBAAwB,EAAE;KACxD,CAAC;IAEF,OAAO,MAAM,CAAC;AACf,CAAC"}

package/dist/nodes/shared/config/properties/options.js CHANGED Viewed

@@ -19,6 +19,51 @@ exports.optionsProperties = [
                 validateType: 'object',
                 ignoreValidationDuringExecution: true,
             },
+            {
+                displayName: 'Fallback Max Validation Retries',
+                name: 'fallbackTenacityMaxRetries',
+                type: 'number',
+                default: -1,
+                description: 'Maximum validation retries for the fallback model. Use -1 to inherit the primary model\'s retry count, or specify a different value (0-10).',
+                typeOptions: {
+                    minValue: -1,
+                    maxValue: 10,
+                },
+                displayOptions: {
+                    show: {
+                        '/responseFormat': ['structuredOutputVisual', 'structuredOutputSchema'],
+                    },
+                },
+            },
+            {
+                displayName: 'Fallback Model',
+                name: 'fallbackModelId',
+                type: 'resourceLocator',
+                default: { mode: 'list', value: '' },
+                description: 'Model to use if the primary model fails all validation retries. If specified, this fallback model will be tried after the primary model exhausts its retries.',
+                modes: [
+                    {
+                        displayName: 'From List',
+                        name: 'list',
+                        type: 'list',
+                        typeOptions: {
+                            searchListMethod: 'modelSearch',
+                            searchable: true,
+                        },
+                    },
+                    {
+                        displayName: 'ID',
+                        name: 'id',
+                        type: 'string',
+                        placeholder: 'e.g., gpt-4',
+                    },
+                ],
+                displayOptions: {
+                    show: {
+                        '/responseFormat': ['structuredOutputVisual', 'structuredOutputSchema'],
+                    },
+                },
+            },
             {
                 displayName: 'Frequency Penalty',
                 name: 'frequency_penalty',

package/dist/nodes/shared/config/properties/options.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"options.js","sourceRoot":"","sources":["../../../../../nodes/shared/config/properties/options.ts"],"names":[],"mappings":";;;AAEa,QAAA,iBAAiB,GAAsB;IACnD;QACC,WAAW,EAAE,SAAS;QACtB,IAAI,EAAE,SAAS;QACf,WAAW,EAAE,YAAY;QACzB,IAAI,EAAE,YAAY;QAClB,OAAO,EAAE,EAAE;QACX,OAAO,EAAE;YACR;gBACC,WAAW,EAAE,mBAAmB;gBAChC,IAAI,EAAE,kBAAkB;gBACxB,OAAO,EAAE,IAAI;gBACb,WAAW,EACV,uQAAuQ;gBACxQ,IAAI,EAAE,MAAM;gBACZ,WAAW,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE;gBACxB,YAAY,EAAE,QAAQ;gBACtB,+BAA+B,EAAE,IAAI;aACrC;YACD;gBACC,WAAW,EAAE,mBAAmB;gBAChC,IAAI,EAAE,mBAAmB;gBACzB,OAAO,EAAE,CAAC;gBACV,WAAW,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,eAAe,EAAE,CAAC,EAAE;gBAC9D,WAAW,EACV,8JAA8J;gBAC/J,IAAI,EAAE,QAAQ;aACd;YACD;gBACC,WAAW,EAAE,YAAY;gBACzB,IAAI,EAAE,uBAAuB;gBAC7B,OAAO,EAAE,IAAI;gBACb,WAAW,EAAE,4DAA4D;gBACzE,IAAI,EAAE,QAAQ;gBACd,WAAW,EAAE;oBACZ,QAAQ,EAAE,KAAK;iBACf;aACD;YACD;gBACC,WAAW,EAAE,qBAAqB;gBAClC,IAAI,EAAE,oBAAoB;gBAC1B,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,EAAE;gBACX,WAAW,EACV,0MAA0M;aAC3M;YACD;gBACC,WAAW,EAAE,wBAAwB;gBACrC,IAAI,EAAE,oBAAoB;gBAC1B,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,CAAC;gBACV,WAAW,EACV,gNAAgN;gBACjN,WAAW,EAAE;oBACZ,QAAQ,EAAE,CAAC;oBACX,QAAQ,EAAE,EAAE;iBACZ;gBACD,cAAc,EAAE;oBACf,IAAI,EAAE;wBACL,iBAAiB,EAAE,CAAC,wBAAwB,EAAE,wBAAwB,CAAC;qBACvE;iBACD;aACD;YACD;gBACC,WAAW,EAAE,uBAAuB;gBACpC,IAAI,EAAE,GAAG;gBACT,OAAO,EAAE,CAAC;gBACV,WAAW,EACV,4UAA4U;gBAC7U,IAAI,EAAE,QAAQ;aACd;YACD;gBACC,WAAW,EAAE,kBAAkB;gBAC/B,IAAI,EAAE,kBAAkB;gBACxB,OAAO,EAAE,CAAC;gBACV,WAAW,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,eAAe,EAAE,CAAC,EAAE;gBAC9D,WAAW,EACV,iJAAiJ;gBAClJ,IAAI,EAAE,QAAQ;aACd;YACD;gBACC,WAAW,EAAE,aAAa;gBAC1B,IAAI,EAAE,aAAa;gBACnB,OAAO,EAAE,CAAC;gBACV,WAAW,EAAE,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,eAAe,EAAE,CAAC,EAAE;gBAC7D,WAAW,EACV,2SAA2S;gBAC5S,IAAI,EAAE,QAAQ;aACd;YACD;gBACC,WAAW,EAAE,OAAO;gBACpB,IAAI,EAAE,OAAO;gBACb,OAAO,EAAE,CAAC;gBACV,WAAW,EAAE,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,eAAe,EAAE,CAAC,EAAE;gBAC7D,WAAW,EACV,6OAA6O;gBAC9O,IAAI,EAAE,QAAQ;aACd;SACD;KACD;CACD,CAAC"}
1	+ {"version":3,"file":"options.js","sourceRoot":"","sources":["../../../../../nodes/shared/config/properties/options.ts"],"names":[],"mappings":"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"}

package/dist/nodes/shared/core/execution/errors.js CHANGED Viewed

@@ -18,8 +18,13 @@ function normalizeError(error) {
     return new Error(String(error));
 }
 function customizeNodeApiError(nodeApiError) {
-    var _a, _b, _c;
-    const errorCode = (_c = (_b = (_a = nodeApiError.cause) === null || _a === void 0 ? void 0 : _a.error) === null || _b === void 0 ? void 0 : _b.error) === null || _c === void 0 ? void 0 : _c.code;
+    var _a, _b, _c, _d;
+    const cause = nodeApiError.cause;
+    const errorCode = ((_b = (_a = cause === null || cause === void 0 ? void 0 : cause.error) === null || _a === void 0 ? void 0 : _a.error) === null || _b === void 0 ? void 0 : _b.code) ||
+        ((_c = cause === null || cause === void 0 ? void 0 : cause.error) === null || _c === void 0 ? void 0 : _c.code) ||
+        (cause === null || cause === void 0 ? void 0 : cause.code) ||
+        ((_d = cause === null || cause === void 0 ? void 0 : cause.error) === null || _d === void 0 ? void 0 : _d.type) ||
+        (cause === null || cause === void 0 ? void 0 : cause.type);
     if (errorCode) {
         const customErrorMessage = (0, errorHandling_1.getCustomErrorMessage)(errorCode);
         if (customErrorMessage) {

package/dist/nodes/shared/core/execution/errors.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"errors.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/execution/errors.ts"],"names":[],"mappings":";;AAmBA,wCAEC;AAKD,wCAKC;AAOD,~~sDAmBC~~;AAKD,8BAKC;AAKD,0DAoBC;AAKD,oDAoBC;~~AApHD~~,+CAA4C;AAC5C,2DAAgE;AAiBhE,SAAgB,cAAc,CAAC,KAAU;IACxC,OAAO,KAAK,YAAY,2BAAY,IAAI,KAAK,CAAC,IAAI,KAAK,cAAc,CAAC;AACvE,CAAC;AAKD,SAAgB,cAAc,CAAC,KAAc;IAC5C,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;QAC5B,OAAO,KAAK,CAAC;IACd,CAAC;IACD,OAAO,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;AACjC,CAAC;AAOD,SAAgB,qBAAqB,CAAC,YAA0B;;~~IAE~~/D,MAAM,SAAS,~~GAAuB~~,MAAA,MAAA,~~MAAC~~,~~YAAY~~,~~CAAC~~,~~KAAa~~,0CAAE,KAAK,0CAAE,KAAK,0CAAE,IAAI,CAAC;~~IACtF~~,IAAI,SAAS,EAAE,CAAC;QACf,MAAM,kBAAkB,GAAG,IAAA,qCAAqB,EAAC,SAAS,CAAC,CAAC;QAC5D,IAAI,kBAAkB,EAAE,CAAC;YACxB,YAAY,CAAC,OAAO,GAAG,kBAAkB,CAAC;QAC3C,CAAC;IACF,CAAC;IAGD,IAAK,YAAoB,CAAC,WAAW,EAAE,CAAC;QACvC,YAAY,CAAC,OAAO,GAAG;YACtB,GAAG,YAAY,CAAC,OAAO;YACvB,WAAW,EAAG,YAAoB,CAAC,WAAW;SAC9C,CAAC;IACH,CAAC;IAED,OAAO,YAAY,CAAC;AACrB,CAAC;AAKD,SAAgB,SAAS,CAAC,GAAY;IACrC,IAAI,GAAG,KAAK,IAAI;QAAE,OAAO,MAAM,CAAC;IAChC,IAAI,GAAG,KAAK,SAAS;QAAE,OAAO,WAAW,CAAC;IAC1C,IAAI,GAAG,KAAK,EAAE;QAAE,OAAO,gBAAgB,CAAC;IACxC,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC;AACpB,CAAC;AAKD,SAAgB,uBAAuB,CACtC,kBAA0B,EAC1B,QAAa,EACb,4BAAiC,EACjC,IAAiB,EACjB,gBAAmC;;IAEnC,IAAI,WAAW,GAAG,kCAAkC,SAAS,CAAC,MAAA,MAAA,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,OAAO,0CAAG,CAAC,CAAC,0CAAE,OAAO,0CAAE,OAAO,CAAC,IAAI;QAC1G,kCAAkC,SAAS,CAAC,4BAA4B,CAAC,IAAI;QAC7E,iBAAiB,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE;QAChD,kBAAkB,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC;IAEvD,IAAI,gBAAgB,EAAE,CAAC;QACtB,WAAW,IAAI,qBAAqB,IAAI,CAAC,SAAS,CAAC,gBAAgB,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC;IACjF,CAAC;IAED,OAAO;QACN,OAAO,EAAE,qBAAqB,kBAAkB,EAAE;QAClD,WAAW;KACX,CAAC;AACH,CAAC;AAKD,SAAgB,oBAAoB,CACnC,UAAkB,EAClB,eAAuB,EACvB,MAAW,EACX,IAAiB,EACjB,QAAa,EACb,gBAAmC;IAEnC,IAAI,WAAW,GAAG,sBAAsB,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI;QAC1E,iBAAiB,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE;QAChD,kBAAkB,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC;IAEvD,IAAI,gBAAgB,EAAE,CAAC;QACtB,WAAW,IAAI,qBAAqB,IAAI,CAAC,SAAS,CAAC,gBAAgB,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC;IACjF,CAAC;IAED,OAAO;QACN,OAAO,EAAE,6CAA6C,UAAU,GAAG,CAAC,cAAc,eAAe,EAAE;QACnG,WAAW;KACX,CAAA;AACF,CAAC;AAAA,CAAC"}
1	+ {"version":3,"file":"errors.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/execution/errors.ts"],"names":[],"mappings":"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"}

package/dist/nodes/shared/core/execution/executionSetup.d.ts ADDED Viewed

@@ -0,0 +1,12 @@
+import type { IExecuteFunctions, IDataObject } from 'n8n-workflow';
+import type { ExtractedParameters } from '../../config/parameters';
+export interface ExecutionContext {
+    responseFormat?: IDataObject;
+    tools: any[];
+    invokableTools: any[];
+    tool_choice?: string | IDataObject;
+    structuredOutputTool?: IDataObject;
+    validationSchema?: IDataObject;
+    shouldValidate: boolean;
+}
+export declare function prepareExecutionContext(executeFunctions: IExecuteFunctions, params: ExtractedParameters): Promise<ExecutionContext>;

package/dist/nodes/shared/core/execution/executionSetup.js ADDED Viewed

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.prepareExecutionContext = prepareExecutionContext;
+const structuredOutput_1 = require("../request/structuredOutput");
+const setup_1 = require("../tools/setup");
+async function prepareExecutionContext(executeFunctions, params) {
+    var _a, _b;
+    let responseFormat = (0, structuredOutput_1.prepareResponseFormatField)(params.responseFormat, params.outputJsonSchemaDefinition, params.structuredOutputName, params.structuredOutputDescription, params.structuredOutputProperties, params.structuredOutputIsArray, params.structuredOutputArrayName, params.structuredOutputArrayDescription);
+    const { tools, invokableTools, tool_choice, structuredOutputTool } = await (0, setup_1.prepareTools)(executeFunctions, params.structuredOutputToolsMode, params.maxToolsIterations, responseFormat);
+    if (params.structuredOutputToolsMode) {
+        responseFormat = undefined;
+    }
+    const shouldValidate = params.tenacityMaxRetries > 0 &&
+        (params.responseFormat === 'structuredOutputSchema' || params.responseFormat === 'structuredOutputVisual');
+    let validationSchema;
+    if (shouldValidate) {
+        if (params.structuredOutputToolsMode && structuredOutputTool) {
+            validationSchema = (_a = structuredOutputTool.function) === null || _a === void 0 ? void 0 : _a.parameters;
+        }
+        else if (responseFormat === null || responseFormat === void 0 ? void 0 : responseFormat.json_schema) {
+            validationSchema = (_b = responseFormat.json_schema) === null || _b === void 0 ? void 0 : _b.schema;
+        }
+    }
+    return {
+        responseFormat,
+        tools,
+        invokableTools,
+        tool_choice,
+        structuredOutputTool: structuredOutputTool !== null && structuredOutputTool !== void 0 ? structuredOutputTool : undefined,
+        validationSchema,
+        shouldValidate,
+    };
+}
+//# sourceMappingURL=executionSetup.js.map

package/dist/nodes/shared/core/execution/executionSetup.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"executionSetup.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/execution/executionSetup.ts"],"names":[],"mappings":";;AAqBA,0DAiDC;AApED,kEAAyE;AACzE,0CAA8C;AAkBvC,KAAK,UAAU,uBAAuB,CAC5C,gBAAmC,EACnC,MAA2B;;IAG3B,IAAI,cAAc,GAAG,IAAA,6CAA0B,EAC9C,MAAM,CAAC,cAAc,EACrB,MAAM,CAAC,0BAA0B,EACjC,MAAM,CAAC,oBAAoB,EAC3B,MAAM,CAAC,2BAA2B,EAClC,MAAM,CAAC,0BAA0B,EACjC,MAAM,CAAC,uBAAuB,EAC9B,MAAM,CAAC,yBAAyB,EAChC,MAAM,CAAC,gCAAgC,CACvC,CAAC;IAGF,MAAM,EAAE,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,oBAAoB,EAAE,GACjE,MAAM,IAAA,oBAAY,EAAC,gBAAgB,EAAE,MAAM,CAAC,yBAAyB,EAAE,MAAM,CAAC,kBAAkB,EAAE,cAAc,CAAC,CAAC;IACnH,IAAI,MAAM,CAAC,yBAAyB,EAAE,CAAC;QACtC,cAAc,GAAG,SAAS,CAAC;IAC5B,CAAC;IAGD,MAAM,cAAc,GACnB,MAAM,CAAC,kBAAkB,GAAG,CAAC;QAC7B,CAAC,MAAM,CAAC,cAAc,KAAK,wBAAwB,IAAI,MAAM,CAAC,cAAc,KAAK,wBAAwB,CAAC,CAAC;IAG5G,IAAI,gBAAyC,CAAC;IAC9C,IAAI,cAAc,EAAE,CAAC;QACpB,IAAI,MAAM,CAAC,yBAAyB,IAAI,oBAAoB,EAAE,CAAC;YAE9D,gBAAgB,GAAG,MAAC,oBAAoB,CAAC,QAAwB,0CAAE,UAAyB,CAAC;QAC9F,CAAC;aAAM,IAAI,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,WAAW,EAAE,CAAC;YAExC,gBAAgB,GAAG,MAAC,cAAc,CAAC,WAA2B,0CAAE,MAAqB,CAAC;QACvF,CAAC;IACF,CAAC;IAED,OAAO;QACN,cAAc;QACd,KAAK;QACL,cAAc;QACd,WAAW;QACX,oBAAoB,EAAE,oBAAoB,aAApB,oBAAoB,cAApB,oBAAoB,GAAI,SAAS;QACvD,gBAAgB;QAChB,cAAc;KACd,CAAC;AACH,CAAC"}

package/dist/nodes/shared/core/execution/executor.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
 import type { IExecuteFunctions, INodeExecutionData, IDataObject } from 'n8n-workflow';
 import type { BufferWindowMemory } from 'langchain/memory';
 import { ExtractedParameters } from '../../config/parameters';
-export declare function runModel(executeFunctions: IExecuteFunctions, params: ExtractedParameters, messages: IDataObject[], index: number, modelToUse: string, memory?: BufferWindowMemory): Promise<INodeExecutionData[]>;
+export declare function runModel(executeFunctions: IExecuteFunctions, params: ExtractedParameters, messages: IDataObject[], index: number, modelToUse: string, fallbackModelToUse?: string, memory?: BufferWindowMemory): Promise<INodeExecutionData[]>;

package/dist/nodes/shared/core/execution/executor.js CHANGED Viewed

@@ -2,8 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runModel = runModel;
 const n8n_workflow_1 = require("n8n-workflow");
-const structuredOutput_1 = require("../request/structuredOutput");
-const setup_1 = require("../tools/setup");
 const body_1 = require("../request/body");
 const executor_1 = require("../tools/executor");
 const outputData_1 = require("./outputData");
@@ -11,117 +9,102 @@ const io_1 = require("../memory/io");
 const validation_1 = require("../request/validation");
 const errors_1 = require("./errors");
 const retryHandler_1 = require("./retryHandler");
-async function runModel(executeFunctions, params, messages, index, modelToUse, memory) {
-    var _a, _b, _c, _d;
-    let responseFormat = (0, structuredOutput_1.prepareResponseFormatField)(params.responseFormat, params.outputJsonSchemaDefinition, params.structuredOutputName, params.structuredOutputDescription, params.structuredOutputProperties, params.structuredOutputIsArray, params.structuredOutputArrayName, params.structuredOutputArrayDescription);
-    const { tools, invokableTools, tool_choice, structuredOutputTool } = await (0, setup_1.prepareTools)(executeFunctions, params.structuredOutputToolsMode, params.maxToolsIterations, responseFormat);
-    if (params.structuredOutputToolsMode) {
-        responseFormat = undefined;
-    }
-    ;
-    const shouldValidate = params.tenacityMaxRetries > 0 &&
-        (params.responseFormat === 'structuredOutputSchema' || params.responseFormat === 'structuredOutputVisual');
-    let validationSchema;
-    if (shouldValidate) {
-        if (params.structuredOutputToolsMode && structuredOutputTool) {
-            validationSchema = (_a = structuredOutputTool.function) === null || _a === void 0 ? void 0 : _a.parameters;
-        }
-        else if (responseFormat === null || responseFormat === void 0 ? void 0 : responseFormat.json_schema) {
-            validationSchema = (_b = responseFormat.json_schema) === null || _b === void 0 ? void 0 : _b.schema;
-        }
-    }
-    let retryState = {
-        retriesRemaining: params.tenacityMaxRetries,
-        attemptNumber: 1,
-    };
-    let messagesBeforeRetries = messages.length;
-    let currentIteration = 1;
-    let totalAccumulatedUsage = {
-        prompt_tokens: 0,
-        completion_tokens: 0,
-        total_tokens: 0,
-        total_requests: 0,
-        retried_requests: 0,
-    };
-    while (true) {
-        let body = (0, body_1.prepareRequestBody)(modelToUse, messages, tools, tool_choice, responseFormat, params.options, params.customParameters);
-        const { response, structuredOutputToolResponse, finalIteration, finalBody, accumulatedUsage } = await (0, executor_1.processToolCalls)(executeFunctions, body, messages, invokableTools, params.maxToolsIterations, structuredOutputTool, params.abortSignal, currentIteration);
-        const mergeUsage = (target, source) => {
-            for (const key in source) {
-                if (typeof source[key] === 'number') {
-                    target[key] = (target[key] || 0) + source[key];
+const usageTracking_1 = require("./usageTracking");
+const modelConfig_1 = require("./modelConfig");
+const responseParser_1 = require("./responseParser");
+const executionSetup_1 = require("./executionSetup");
+async function runModel(executeFunctions, params, messages, index, modelToUse, fallbackModelToUse, memory) {
+    const context = await (0, executionSetup_1.prepareExecutionContext)(executeFunctions, params);
+    const { responseFormat, tools, invokableTools, tool_choice, structuredOutputTool, validationSchema, shouldValidate } = context;
+    const modelsToTry = (0, modelConfig_1.buildModelsToTry)(modelToUse, fallbackModelToUse, params.tenacityMaxRetries, params.fallbackTenacityMaxRetries);
+    const totalAccumulatedUsage = (0, usageTracking_1.initializeAccumulatedUsage)();
+    let lastError = null;
+    for (let modelIndex = 0; modelIndex < modelsToTry.length; modelIndex++) {
+        const { model: currentModel, maxRetries } = modelsToTry[modelIndex];
+        const isLastModel = modelIndex === modelsToTry.length - 1;
+        try {
+            const messagesForThisModel = [...messages];
+            let retryState = {
+                retriesRemaining: maxRetries,
+                attemptNumber: 1,
+            };
+            let messagesBeforeRetries = messagesForThisModel.length;
+            let currentIteration = 1;
+            while (true) {
+                let body = (0, body_1.prepareRequestBody)(currentModel, messagesForThisModel, tools, tool_choice, responseFormat, params.options, params.customParameters);
+                const { response, structuredOutputToolResponse, finalIteration, finalBody, accumulatedUsage } = await (0, executor_1.processToolCalls)(executeFunctions, body, messagesForThisModel, invokableTools, params.maxToolsIterations, structuredOutputTool, params.abortSignal, currentIteration);
+                (0, usageTracking_1.mergeUsageData)(totalAccumulatedUsage, accumulatedUsage);
+                currentIteration = finalIteration;
+                body = finalBody;
+                if (retryState.attemptNumber === 1) {
+                    messagesBeforeRetries = messagesForThisModel.length;
                 }
-                else if (typeof source[key] === 'boolean') {
-                    target[key] = target[key] || source[key];
+                const parseResult = (0, responseParser_1.parseAssistantResponse)(response, structuredOutputToolResponse, params.responseFormat);
+                let output;
+                let parseError = null;
+                if (!parseResult.success) {
+                    if (shouldValidate && retryState.retriesRemaining > 0) {
+                        parseError = parseResult.error;
+                    }
+                    else {
+                        const errorData = (0, errors_1.buildDetailedParseError)(parseResult.error, response, structuredOutputToolResponse, body, totalAccumulatedUsage);
+                        throw new n8n_workflow_1.NodeOperationError(executeFunctions.getNode(), errorData.message, {
+                            description: errorData.description,
+                            itemIndex: index,
+                        });
+                    }
                 }
-                else if (typeof source[key] === 'object' && source[key] !== null) {
-                    target[key] = target[key] || {};
-                    mergeUsage(target[key], source[key]);
+                else {
+                    output = parseResult.output;
                 }
-                else if (target[key] === undefined) {
-                    target[key] = source[key];
+                if (parseError) {
+                    const shouldRetry = await (0, retryHandler_1.handleParseError)(parseError, response, messagesForThisModel, retryState, params.structuredOutputToolsMode, structuredOutputTool, params.structuredOutputName, tools, validationSchema);
+                    if (shouldRetry) {
+                        const model = body.model || 'unknown';
+                        (0, usageTracking_1.trackFailedRequest)(totalAccumulatedUsage, model, `JSON parse error: ${parseError}`);
+                        retryState = (0, retryHandler_1.updateRetryState)(retryState);
+                        (0, usageTracking_1.incrementRetriedRequests)(totalAccumulatedUsage);
+                        continue;
+                    }
                 }
-            }
-        };
-        mergeUsage(totalAccumulatedUsage, accumulatedUsage);
-        currentIteration = finalIteration;
-        body = finalBody;
-        if (retryState.attemptNumber === 1) {
-            messagesBeforeRetries = messages.length;
-        }
-        let output;
-        let parseError = null;
-        try {
-            output = JSON.parse(structuredOutputToolResponse)
-                || (params.responseFormat === "plainText"
-                    ? (_c = response === null || response === void 0 ? void 0 : response.choices[0]) === null || _c === void 0 ? void 0 : _c.message.content
-                    : JSON.parse((_d = response === null || response === void 0 ? void 0 : response.choices[0]) === null || _d === void 0 ? void 0 : _d.message.content));
-        }
-        catch (error) {
-            const simpleErrorMessage = error instanceof Error ? error.message : String(error);
-            if (shouldValidate && retryState.retriesRemaining > 0) {
-                parseError = simpleErrorMessage;
-            }
-            else {
-                const errorData = (0, errors_1.buildDetailedParseError)(simpleErrorMessage, response, structuredOutputToolResponse, body, totalAccumulatedUsage);
-                throw new n8n_workflow_1.NodeOperationError(executeFunctions.getNode(), errorData.message, {
-                    description: errorData.description,
-                    itemIndex: index,
-                });
-            }
-        }
-        if (parseError) {
-            const shouldRetry = await (0, retryHandler_1.handleParseError)(parseError, response, messages, retryState, params.structuredOutputToolsMode, structuredOutputTool, params.structuredOutputName, tools, validationSchema);
-            if (shouldRetry) {
-                retryState = (0, retryHandler_1.updateRetryState)(retryState);
-                totalAccumulatedUsage.retried_requests++;
-                continue;
-            }
-        }
-        if (shouldValidate) {
-            const validationResult = (0, validation_1.validateStructuredOutput)(validationSchema, output);
-            if (!validationResult.isValid) {
-                const validationError = validationResult.error || 'Unknown validation error';
-                const shouldRetry = await (0, retryHandler_1.handleValidationError)(validationError, output, response, messages, retryState, params.structuredOutputToolsMode, structuredOutputTool, params.structuredOutputName);
-                if (shouldRetry) {
-                    retryState = (0, retryHandler_1.updateRetryState)(retryState);
-                    totalAccumulatedUsage.retried_requests++;
-                    continue;
+                if (shouldValidate) {
+                    const validationResult = (0, validation_1.validateStructuredOutput)(validationSchema, output);
+                    if (!validationResult.isValid) {
+                        const validationError = validationResult.error || 'Unknown validation error';
+                        const shouldRetry = await (0, retryHandler_1.handleValidationError)(validationError, output, response, messagesForThisModel, retryState, params.structuredOutputToolsMode, structuredOutputTool, params.structuredOutputName);
+                        if (shouldRetry) {
+                            const model = body.model || 'unknown';
+                            (0, usageTracking_1.trackFailedRequest)(totalAccumulatedUsage, model, `Validation error: ${validationError}`);
+                            retryState = (0, retryHandler_1.updateRetryState)(retryState);
+                            (0, usageTracking_1.incrementRetriedRequests)(totalAccumulatedUsage);
+                            continue;
+                        }
+                        else {
+                            const errorData = (0, errors_1.buildValidationError)(maxRetries, validationError, output, body, response, totalAccumulatedUsage);
+                            throw new n8n_workflow_1.NodeOperationError(executeFunctions.getNode(), errorData.message, {
+                                description: errorData.description,
+                                itemIndex: index,
+                            });
+                        }
+                    }
                 }
-                else {
-                    const errorData = (0, errors_1.buildValidationError)(params.tenacityMaxRetries, validationError, output, body, response, totalAccumulatedUsage);
-                    throw new n8n_workflow_1.NodeOperationError(executeFunctions.getNode(), errorData.message, {
-                        description: errorData.description,
-                        itemIndex: index,
-                    });
+                const outputData = await (0, outputData_1.prepareOutputData)(response, output, messagesForThisModel, messagesBeforeRetries, params.addToOutput, executeFunctions, index, body, totalAccumulatedUsage);
+                if (memory) {
+                    await (0, io_1.saveToMemory)(messagesForThisModel, output, params.saveToolCallsInChatMemory, memory);
                 }
+                return outputData;
             }
         }
-        const outputData = await (0, outputData_1.prepareOutputData)(response, output, messages, messagesBeforeRetries, params.addToOutput, executeFunctions, index, body, totalAccumulatedUsage);
-        if (memory) {
-            await (0, io_1.saveToMemory)(messages, output, params.saveToolCallsInChatMemory, memory);
+        catch (error) {
+            lastError = error;
+            const errorMessage = error instanceof Error ? error.message : String(error);
+            (0, usageTracking_1.trackFailedRequest)(totalAccumulatedUsage, currentModel, errorMessage);
+            if (isLastModel) {
+                throw error;
+            }
+            await (0, retryHandler_1.waitBeforeRetry)();
         }
-        return outputData;
     }
+    throw lastError || new Error('All models failed');
 }
 //# sourceMappingURL=executor.js.map

package/dist/nodes/shared/core/execution/executor.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/execution/executor.ts"],"names":[],"mappings":";;~~AAiBA~~,~~4BAsPC~~;~~AAtQD~~,+CAAkD;AAGlD,~~kEAAyE;AACzE,0CAA8C;AAC9C,~~0CAAqD;AACrD,gDAAqD;AACrD,6CAAiD;AACjD,qCAA4C;AAC5C,sDAAiE;AACjE,qCAAyE;AACzE,~~iDAA4G~~;~~AAKrG~~,KAAK,UAAU,QAAQ,CAC7B,gBAAmC,EACnC,MAA2B,EAC3B,QAAuB,EACvB,KAAa,EACb,UAAkB,EAClB,~~MAA2B;;IAG3B~~,~~IAAI,cAAc,GAAG,IAAA,6CAA0B,EAC9C,MAAM,CAAC,cAAc,EACrB,MAAM,CAAC,0BAA0B,EACjC,MAAM,CAAC,oBAAoB,~~EAC3B,~~MAAM~~,~~CAAC,2BAA2B,EAClC,~~MAAM,~~CAAC~~,~~0BAA0B~~,~~EACjC,~~MAAM,~~CAAC~~,~~uBAAuB~~,~~EAC9B~~,~~MAAM~~,~~CAAC~~,~~yBAAyB,EAChC,~~MAAM,CAAC,~~gCAAgC,CACvC,~~CAAC;~~IAGF~~,MAAM,EAAE,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,oBAAoB,EAAE,~~GACjE~~,~~MAAM~~,~~IAAA~~,~~oBAAY~~,~~EAAC~~,~~gBAAgB~~,~~EAAE~~,MAAM,~~CAAC~~,~~yBAAyB~~,~~EAAE~~,~~MAAM~~,~~CAAC~~,kBAAkB,~~EAAE~~,~~cAAc~~,CAAC,~~CAAC;IACnH~~,~~IAAI~~,MAAM,CAAC,~~yBAAyB~~,~~EAAE~~,CAAC;~~QAAA~~,~~cAAc~~,GAAG,~~SAAS,CAAA;~~IAAA,~~CAAC;IAAA~~,CAAC;~~IAGnE~~,~~MAAM~~,~~cAAc~~,~~GACnB~~,~~MAAM~~,CAAC~~,kBAAkB,GAAG,CAAC~~;~~QAC7B~~,~~CAAC,MAAM,CAAC,cAAc,~~KAAK,~~wBAAwB,~~IAAI,~~MAAM~~,CAAC,~~cAAc~~,~~KAAK~~,~~wBAAwB~~,~~CAAC~~,CAAC~~;IAG5G~~,~~IAAI~~,~~gBAAyC~~,~~CAAC;IAC9C~~,~~IAAI~~,~~cAAc,~~EAAE,CAAC;~~QACpB~~,~~IAAI,~~MAAM,~~CAAC~~,~~yBAAyB~~,~~IAAI~~,~~oBAAoB~~,EAAE,~~CAAC;YAE9D~~,~~gBAAgB~~,GAAG,~~MAAC~~,~~oBAAoB,~~CAAC,~~QAAwB~~,~~0CAAE,UAAyB,~~CAAC~~;QAC9F~~,CAAC;~~aAAM~~,~~IAAI~~,~~cAAc~~,~~aAAd~~,~~cAAc~~,~~uBAAd~~,~~cAAc,CAAE,~~WAAW,~~EAAE,~~CAAC~~;YAExC~~,~~gBAAgB~~,GAAG,~~MAAC~~,~~cAAc~~,CAAC,~~WAA2B~~,~~0CAAE~~,~~MAAqB~~,CAAC~~;QACvF~~,CAAC~~;IACF~~,CAAC;~~IAGD~~,IAAI,UAAU,GAAe;~~QAC5B~~,gBAAgB,EAAE,~~MAAM,CAAC,kBAAkB~~;~~QAC3C~~,aAAa,EAAE,CAAC;~~KAChB~~,CAAC;~~IAGF~~,IAAI,qBAAqB,GAAG,~~QAAQ~~,CAAC,MAAM,CAAC;~~IAG5C~~,IAAI,gBAAgB,GAAG,CAAC,CAAC;~~IAGzB~~,~~IAAI,qBAAqB,GAAG;QAC3B,aAAa,EAAE,CAAC;QAChB,iBAAiB,EAAE,CAAC;QACpB,YAAY,EAAE,CAAC;QACf,cAAc,EAAE,CAAC;QACjB,gBAAgB,EAAE,CAAC;KACZ,CAAC;IAET,~~OAAO,IAAI,EAAE,CAAC;~~QAEb~~,IAAI,IAAI,GAAG,IAAA,yBAAkB,EAC5B,~~UAAU~~,~~EACV~~,~~QAAQ~~,~~EACR~~,KAAK,EACL,WAAW,EACX,cAAc,EACd,MAAM,CAAC,OAAO,EACd,MAAM,CAAC,gBAAgB,CACvB,CAAC;~~QAGF~~,MAAM,EAAE,QAAQ,EAAE,4BAA4B,EAAE,cAAc,EAAE,SAAS,EAAE,gBAAgB,EAAE,GAAG,MAAM,IAAA,2BAAgB,EACrH,gBAAgB,EAChB,IAAI,EACJ,~~QAAQ~~,~~EACR~~,cAAc,EACd,MAAM,CAAC,kBAAkB,EACzB,oBAAoB,EACpB,MAAM,CAAC,WAAW,EAClB,gBAAgB,CAChB,CAAC;~~QAGF~~,~~MAAM~~,~~UAAU~~,~~GAAG~~,~~CAAC~~,~~MAAW,~~EAAE,~~MAAW~~,~~EAAE,EAAE;YAC/C,KAAK,MAAM,GAAG,IAAI,MAAM,EAAE,~~CAAC~~;gBAC1B~~,~~IAAI,OAAO,MAAM,~~CAAC~~,GAAG,CAAC,KAAK,QAAQ,EAAE,CAAC~~;~~oBACrC~~,~~MAAM~~,~~CAAC,~~GAAG,~~CAAC~~,~~GAAG,~~CAAC~~,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC~~;~~gBAChD~~,~~CAAC;qBAAM,~~IAAI,~~OAAO,MAAM,CAAC,~~GAAG,~~CAAC,KAAK,~~SAAS,~~EAAE,~~CAAC;~~oBAC7C~~,~~MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,~~IAAI,~~MAAM~~,CAAC,~~GAAG~~,~~CAAC,CAAC;gBAC1C,CAAC;qBAAM,IAAI,OAAO,MAAM,CAAC,GAAG,CAAC,~~KAAK,~~QAAQ,IAAI,MAAM,~~CAAC,~~GAAG,CAAC,KAAK,IAAI,~~EAAE,CAAC;~~oBACpE~~,~~MAAM~~,~~CAAC,~~GAAG,~~CAAC~~,~~GAAG,MAAM,~~CAAC,~~GAAG,CAAC,IAAI,EAAE,CAAC;oBAChC,UAAU,CAAC,~~MAAM,CAAC~~,GAAG,CAAC,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC~~;~~gBACtC~~,CAAC;~~qBAAM~~,~~IAAI,~~MAAM,~~CAAC~~,GAAG,~~CAAC~~,~~KAAK~~,~~SAAS~~,~~EAAE~~,~~CAAC;oBACtC~~,~~MAAM~~,~~CAAC~~,~~GAAG,CAAC,GAAG,~~MAAM,CAAC,~~GAAG,CAAC,CAAC;gBAC3B,CAAC;YACF,CAAC;QACF,CAAC,CAAC;QACF,UAAU,CAAC,qBAAqB,EAAE,gBAAgB,CAAC,CAAC;QAGpD,gBAAgB,GAAG,~~cAAc,~~CAAC;QAGlC~~,~~IAAI,GAAG,SAAS,~~CAAC;~~QAIjB~~,IAAI,~~UAAU,CAAC,aAAa,KAAK,CAAC,EAAE,CAAC;YACpC,qBAAqB,GAAG,QAAQ,CAAC,~~MAAM,CAAC;~~QACzC~~,~~CAAC;QAGD,~~IAAI,~~MAAM,CAAC;QACX,IAAI,~~UAAU,GAAkB,IAAI,CAAC;~~QAErC~~,IAAI,CAAC~~;YACJ~~,~~MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,4BAA4B,CAAC;mBAC7C,CAAC,MAAM,CAAC,cAAc,KAAK,~~WAAW~~;oBACxC~~,CAAC,~~CAAC,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,~~OAAO,~~CAAC,CAAC,CAAC,0CAAE,OAAO,CAAC,OAAO;oBACvC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,OAAO,CAAC,CAAC,CAAC,0CAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;QACxD,CAAC;QAAC,OAAO,KAAK,~~EAAE,CAAC;~~YAEhB~~,~~MAAM,kBAAkB,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAGlF,~~IAAI,cAAc,IAAI,UAAU,CAAC,gBAAgB,GAAG,CAAC,EAAE,CAAC;~~gBACvD~~,UAAU,GAAG,~~kBAAkB~~,CAAC;~~YACjC~~,CAAC;~~iBAAM~~,CAAC;~~gBAEP~~,MAAM,SAAS,GAAG,IAAA,gCAAuB,EACxC,~~kBAAkB~~,EAClB,QAAQ,EACR,4BAA4B,EAC5B,IAAI,EACJ,qBAAqB,CACrB,CAAC;~~gBACF~~,MAAM,IAAI,iCAAkB,CAC3B,gBAAgB,CAAC,OAAO,EAAE,EAC1B,SAAS,CAAC,OAAO,EACjB;~~oBACC~~,WAAW,EAAE,SAAS,CAAC,WAAW;~~oBAClC~~,SAAS,EAAE,KAAK;~~iBAChB~~,CACD,CAAC;~~YACH~~,CAAC;~~QACF~~,CAAC;~~QAGD~~,IAAI,UAAU,EAAE,CAAC;~~YAChB~~,MAAM,WAAW,GAAG,MAAM,IAAA,+BAAgB,EACzC,UAAU,EACV,QAAQ,EACR,~~QAAQ~~,~~EACR~~,UAAU,EACV,MAAM,CAAC,yBAAyB,EAChC,oBAAoB,EACpB,MAAM,CAAC,oBAAoB,EAC3B,KAAK,EACL,gBAAgB,CAChB,CAAC;~~YAEF~~,IAAI,WAAW,EAAE,CAAC;~~gBAEjB~~,UAAU,GAAG,IAAA,+BAAgB,EAAC,UAAU,CAAC,CAAC;~~gBAC1C~~,~~qBAAqB~~,~~CAAC~~,~~gBAAgB~~,~~EAAE~~,CAAC;~~gBACzC~~,SAAS;~~YACV~~,CAAC;~~QACF~~,CAAC;~~QAGD~~,IAAI,cAAc,EAAE,CAAC;~~YACpB~~,MAAM,gBAAgB,GAAG,IAAA,qCAAwB,EAAC,gBAAgB,EAAE,MAAM,CAAC,CAAC;~~YAE5E~~,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,CAAC;~~gBAE~~/B,MAAM,eAAe,GAAG,gBAAgB,CAAC,KAAK,IAAI,0BAA0B,CAAC;~~gBAE7E~~,MAAM,WAAW,GAAG,MAAM,IAAA,oCAAqB,EAC9C,eAAe,EACf,MAAM,EACN,QAAQ,EACR,~~QAAQ~~,~~EACR~~,UAAU,EACV,MAAM,CAAC,yBAAyB,EAChC,oBAAoB,EACpB,MAAM,CAAC,oBAAoB,CAC3B,CAAC;~~gBAEF~~,IAAI,WAAW,EAAE,CAAC;~~oBAEjB~~,UAAU,GAAG,IAAA,+BAAgB,EAAC,UAAU,CAAC,CAAC;~~oBAC1C~~,~~qBAAqB~~,~~CAAC~~,~~gBAAgB~~,~~EAAE~~,CAAC;~~oBACzC~~,SAAS;~~gBACV~~,CAAC;~~qBAAM~~,CAAC;~~oBAEP~~,MAAM,SAAS,GAAG,IAAA,6BAAoB,EACrC,~~MAAM~~,~~CAAC~~,~~kBAAkB,EACzB,~~eAAe,EACf,MAAM,EACN,IAAI,EACJ,QAAQ,EACR,qBAAqB,CACrB,CAAC;~~oBACF~~,MAAM,IAAI,iCAAkB,CAC3B,gBAAgB,CAAC,OAAO,EAAE,EAC1B,SAAS,CAAC,OAAO,EACjB;~~wBACC~~,WAAW,EAAE,SAAS,CAAC,WAAW;~~wBAClC~~,SAAS,EAAE,KAAK;~~qBAChB~~,CACD,CAAC;~~gBACH~~,CAAC;~~YACF~~,CAAC;~~QACF~~,CAAC;~~QAID~~,MAAM,UAAU,GAAG,MAAM,IAAA,8BAAiB,EACzC,QAAQ,EACR,MAAM,EACN,~~QAAQ~~,~~EACR~~,qBAAqB,EACrB,MAAM,CAAC,WAAW,EAClB,gBAAgB,EAChB,KAAK,EACL,IAAI,EACJ,qBAAqB,CACrB,CAAC;~~QAGF~~,IAAI,MAAM,EAAE,CAAC;~~YACZ~~,MAAM,IAAA,iBAAY,EACjB,~~QAAQ~~,~~EACR~~,MAAM,EACN,MAAM,CAAC,yBAAyB,EAChC,MAAM,CACN,CAAC;~~QACH~~,CAAC;~~QAED~~,OAAO,UAAU,CAAC;~~IACnB~~,CAAC;~~AACF~~,CAAC"}
1	+ {"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/execution/executor.ts"],"names":[],"mappings":"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"}

package/dist/nodes/shared/core/execution/messageOperation.js CHANGED Viewed

@@ -9,6 +9,6 @@ async function execute(i) {
     const params = (0, parameters_1.extractParameters)(this, i);
     const memory = await (0, io_1.getOptionalMemory)(this);
     const messages = await (0, chatHistory_1.unpackChatHistoryAndMemory)(params.rawMessagesToSend, params.loadToolCallsFromChatMemory, memory);
-    return await (0, executor_1.runModel)(this, params, messages, i, params.model, memory);
+    return await (0, executor_1.runModel)(this, params, messages, i, params.model, params.fallbackModel, memory);
 }
 //# sourceMappingURL=messageOperation.js.map

package/dist/nodes/shared/core/execution/messageOperation.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"messageOperation.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/execution/messageOperation.ts"],"names":[],"mappings":";;AAUA,~~0BA0BC~~;~~AAlCD~~,wDAA4D;AAC5D,qCAAiD;AACjD,yDAAqE;AACrE,yCAAsC;AAK/B,KAAK,UAAU,OAAO,CAE5B,CAAS;IAGT,MAAM,MAAM,GAAG,IAAA,8BAAiB,EAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IAG1C,MAAM,MAAM,GAAG,MAAM,IAAA,sBAAiB,EAAC,IAAI,CAAC,CAAC;IAG7C,MAAM,QAAQ,GAAG,MAAM,IAAA,wCAA0B,EAChD,MAAM,CAAC,iBAAiB,EACxB,MAAM,CAAC,2BAA2B,EAClC,MAAM,CACN,CAAC;IAGF,OAAO,MAAM,IAAA,mBAAQ,EACpB,IAAI,EACJ,MAAM,EACN,QAAQ,EACR,CAAC,EACD,MAAM,CAAC,KAAK,EACZ,MAAM,CACN,CAAC;AACH,CAAC"}
1	+ {"version":3,"file":"messageOperation.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/execution/messageOperation.ts"],"names":[],"mappings":";;AAUA,0BA2BC;AAnCD,wDAA4D;AAC5D,qCAAiD;AACjD,yDAAqE;AACrE,yCAAsC;AAK/B,KAAK,UAAU,OAAO,CAE5B,CAAS;IAGT,MAAM,MAAM,GAAG,IAAA,8BAAiB,EAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IAG1C,MAAM,MAAM,GAAG,MAAM,IAAA,sBAAiB,EAAC,IAAI,CAAC,CAAC;IAG7C,MAAM,QAAQ,GAAG,MAAM,IAAA,wCAA0B,EAChD,MAAM,CAAC,iBAAiB,EACxB,MAAM,CAAC,2BAA2B,EAClC,MAAM,CACN,CAAC;IAGF,OAAO,MAAM,IAAA,mBAAQ,EACpB,IAAI,EACJ,MAAM,EACN,QAAQ,EACR,CAAC,EACD,MAAM,CAAC,KAAK,EACZ,MAAM,CAAC,aAAa,EACpB,MAAM,CACN,CAAC;AACH,CAAC"}

package/dist/nodes/shared/core/execution/modelConfig.d.ts ADDED Viewed

@@ -0,0 +1,5 @@
+export interface ModelConfig {
+    model: string;
+    maxRetries: number;
+}
+export declare function buildModelsToTry(primaryModel: string, fallbackModel: string | undefined, tenacityMaxRetries: number, fallbackTenacityMaxRetries: number | undefined): ModelConfig[];

package/dist/nodes/shared/core/execution/modelConfig.js ADDED Viewed

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildModelsToTry = buildModelsToTry;
+function buildModelsToTry(primaryModel, fallbackModel, tenacityMaxRetries, fallbackTenacityMaxRetries) {
+    const modelsToTry = [
+        { model: primaryModel, maxRetries: tenacityMaxRetries }
+    ];
+    if (fallbackModel) {
+        modelsToTry.push({
+            model: fallbackModel,
+            maxRetries: fallbackTenacityMaxRetries !== null && fallbackTenacityMaxRetries !== void 0 ? fallbackTenacityMaxRetries : tenacityMaxRetries
+        });
+    }
+    return modelsToTry;
+}
+//# sourceMappingURL=modelConfig.js.map

package/dist/nodes/shared/core/execution/modelConfig.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"modelConfig.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/execution/modelConfig.ts"],"names":[],"mappings":";;AAYA,4CAkBC;AAlBD,SAAgB,gBAAgB,CAC/B,YAAoB,EACpB,aAAiC,EACjC,kBAA0B,EAC1B,0BAA8C;IAE9C,MAAM,WAAW,GAAkB;QAClC,EAAE,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,kBAAkB,EAAE;KACvD,CAAC;IAEF,IAAI,aAAa,EAAE,CAAC;QACnB,WAAW,CAAC,IAAI,CAAC;YAChB,KAAK,EAAE,aAAa;YACpB,UAAU,EAAE,0BAA0B,aAA1B,0BAA0B,cAA1B,0BAA0B,GAAI,kBAAkB;SAC5D,CAAC,CAAC;IACJ,CAAC;IAED,OAAO,WAAW,CAAC;AACpB,CAAC"}

package/dist/nodes/shared/core/execution/responseParser.d.ts ADDED Viewed

@@ -0,0 +1,6 @@
+export interface ParseResult {
+    success: boolean;
+    output?: any;
+    error?: string;
+}
+export declare function parseAssistantResponse(response: any, structuredOutputToolResponse: any, responseFormat: string): ParseResult;

package/dist/nodes/shared/core/execution/responseParser.js ADDED Viewed

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseAssistantResponse = parseAssistantResponse;
+function parseAssistantResponse(response, structuredOutputToolResponse, responseFormat) {
+    var _a, _b;
+    try {
+        const output = JSON.parse(structuredOutputToolResponse)
+            || (responseFormat === "plainText"
+                ? (_a = response === null || response === void 0 ? void 0 : response.choices[0]) === null || _a === void 0 ? void 0 : _a.message.content
+                : JSON.parse((_b = response === null || response === void 0 ? void 0 : response.choices[0]) === null || _b === void 0 ? void 0 : _b.message.content));
+        return {
+            success: true,
+            output,
+        };
+    }
+    catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        return {
+            success: false,
+            error: errorMessage,
+        };
+    }
+}
+//# sourceMappingURL=responseParser.js.map

package/dist/nodes/shared/core/execution/responseParser.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"responseParser.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/execution/responseParser.ts"],"names":[],"mappings":";;AAaA,wDAsBC;AAtBD,SAAgB,sBAAsB,CACrC,QAAa,EACb,4BAAiC,EACjC,cAAsB;;IAEtB,IAAI,CAAC;QACJ,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,4BAA4B,CAAC;eACnD,CAAC,cAAc,KAAK,WAAW;gBACjC,CAAC,CAAC,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,OAAO,CAAC,CAAC,CAAC,0CAAE,OAAO,CAAC,OAAO;gBACvC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,OAAO,CAAC,CAAC,CAAC,0CAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;QAEvD,OAAO;YACN,OAAO,EAAE,IAAI;YACb,MAAM;SACN,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,MAAM,YAAY,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC5E,OAAO;YACN,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,YAAY;SACnB,CAAC;IACH,CAAC;AACF,CAAC"}

package/dist/nodes/shared/core/execution/usageTracking.d.ts ADDED Viewed

@@ -0,0 +1,16 @@
+export interface AccumulatedUsage {
+    prompt_tokens: number;
+    completion_tokens: number;
+    total_tokens: number;
+    total_requests: number;
+    retried_requests: number;
+    failed_requests: Array<{
+        model: string;
+        error: string;
+    }>;
+    [key: string]: any;
+}
+export declare function initializeAccumulatedUsage(): AccumulatedUsage;
+export declare function mergeUsageData(target: AccumulatedUsage, source: any): void;
+export declare function trackFailedRequest(usage: AccumulatedUsage, model: string, error: string): void;
+export declare function incrementRetriedRequests(usage: AccumulatedUsage): void;

package/dist/nodes/shared/core/execution/usageTracking.js ADDED Viewed

@@ -0,0 +1,43 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.initializeAccumulatedUsage = initializeAccumulatedUsage;
+exports.mergeUsageData = mergeUsageData;
+exports.trackFailedRequest = trackFailedRequest;
+exports.incrementRetriedRequests = incrementRetriedRequests;
+function initializeAccumulatedUsage() {
+    return {
+        prompt_tokens: 0,
+        completion_tokens: 0,
+        total_tokens: 0,
+        total_requests: 0,
+        retried_requests: 0,
+        failed_requests: [],
+    };
+}
+function mergeUsageData(target, source) {
+    for (const key in source) {
+        if (typeof source[key] === 'number') {
+            target[key] = (target[key] || 0) + source[key];
+        }
+        else if (typeof source[key] === 'boolean') {
+            target[key] = target[key] || source[key];
+        }
+        else if (typeof source[key] === 'object' && source[key] !== null) {
+            target[key] = target[key] || {};
+            mergeUsageData(target[key], source[key]);
+        }
+        else if (target[key] === undefined) {
+            target[key] = source[key];
+        }
+    }
+}
+function trackFailedRequest(usage, model, error) {
+    usage.failed_requests.push({
+        model,
+        error,
+    });
+}
+function incrementRetriedRequests(usage) {
+    usage.retried_requests++;
+}
+//# sourceMappingURL=usageTracking.js.map