n8n-nodes-simple 2.4.1 → 2.4.2

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

@@ -1,5 +1,5 @@
 import type { IExecuteFunctions, INodeExecutionData, IDataObject } from 'n8n-workflow';
 import type { BufferWindowMemory } from 'langchain/memory';
 import { ExtractedParameters } from '../../config/parameters';
-export declare function executeWithFallback(executeFunctions: IExecuteFunctions, params: ExtractedParameters, messages: IDataObject[], index: number, memory?: BufferWindowMemory): Promise<INodeExecutionData[]>;
-export declare function executeSingleModel(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, memory?: BufferWindowMemory): Promise<INodeExecutionData[]>;
+export declare function runModelWithFallback(executeFunctions: IExecuteFunctions, params: ExtractedParameters, messages: IDataObject[], index: number, memory?: BufferWindowMemory): Promise<INodeExecutionData[]>;

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

@@ -1,23 +1,41 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.executeWithFallback = executeWithFallback;
-exports.executeSingleModel = executeSingleModel;
+exports.runModel = runModel;
+exports.runModelWithFallback = runModelWithFallback;
 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");
 const io_1 = require("../memory/io");
-async function executeWithFallback(executeFunctions, params, messages, index, memory) {
+async function runModel(executeFunctions, params, messages, index, modelToUse, memory) {
+    let responseFormat = (0, structuredOutput_1.configureResponseFormat)(params.responseFormat, params.outputJsonSchemaDefinition, params.structuredOutputName, params.structuredOutputDescription, params.structuredOutputProperties, params.structuredOutputIsArray, params.structuredOutputArrayName, params.structuredOutputArrayDescription);
+    const { tools, invokableTools, tool_choice, structuredOutputTool, updatedResponseFormat } = await (0, setup_1.setupTools)(executeFunctions, params.structuredOutputToolsMode, responseFormat);
+    const body = (0, body_1.prepareRequestBody)(modelToUse, messages, tools, tool_choice, updatedResponseFormat, params.options, params.customParameters);
+    const { response, output } = await (0, executor_1.processToolCalls)(executeFunctions, body, messages, invokableTools, params.maxToolsIterations, params.responseFormat, structuredOutputTool, params.abortSignal);
+    const outputData = await (0, outputData_1.prepareOutputData)(response, output, messages, params.addToOutput, executeFunctions, index, body);
+    if (memory) {
+        await (0, io_1.saveToMemory)(messages, output, params.saveToolCallsInChatMemory, memory);
+    }
+    return outputData;
+}
+async function runModelWithFallback(executeFunctions, params, messages, index, memory) {
+    var _a, _b;
     try {
-        const result = await executeSingleModel(executeFunctions, params, messages, index, params.model, memory);
-        return result;
+        const item = await runModel(executeFunctions, params, messages, index, params.model, memory);
+        if (!item || item.length === 0) {
+            throw new Error(`Node execution failed: No data returned. Received: ${JSON.stringify(item)}`);
+        }
+        if (!((_a = item[0].json) === null || _a === void 0 ? void 0 : _a.output)) {
+            throw new Error(`Node execution failed: Output invalid. Output value: ${JSON.stringify((_b = item[0].json) === null || _b === void 0 ? void 0 : _b.output)}`);
+        }
+        return item;
     }
     catch (error) {
         if (params.fallbackModel) {
             console.error(`Primary model ${params.model} failed with error, trying fallback model ${params.fallbackModel}:`, error);
             try {
-                return await executeSingleModel(executeFunctions, params, messages, index, params.fallbackModel, memory);
+                return await runModel(executeFunctions, params, messages, index, params.fallbackModel, memory);
             }
             catch (fallbackError) {
                 console.error(`Fallback model ${params.fallbackModel} also failed:`, fallbackError);
@@ -27,15 +45,4 @@ async function executeWithFallback(executeFunctions, params, messages, index, me
         throw error;
     }
 }
-async function executeSingleModel(executeFunctions, params, messages, index, modelToUse, memory) {
-    let responseFormat = (0, structuredOutput_1.configureResponseFormat)(params.responseFormat, params.outputJsonSchemaDefinition, params.structuredOutputName, params.structuredOutputDescription, params.structuredOutputProperties, params.structuredOutputIsArray, params.structuredOutputArrayName, params.structuredOutputArrayDescription);
-    const { tools, invokableTools, tool_choice, structuredOutputTool, updatedResponseFormat } = await (0, setup_1.setupTools)(executeFunctions, params.structuredOutputToolsMode, responseFormat);
-    const body = (0, body_1.prepareRequestBody)(modelToUse, messages, tools, tool_choice, updatedResponseFormat, params.options, params.customParameters);
-    const { response, output } = await (0, executor_1.processToolCalls)(executeFunctions, body, messages, invokableTools, params.maxToolsIterations, params.responseFormat, structuredOutputTool, params.abortSignal);
-    const outputData = await (0, outputData_1.prepareOutputData)(response, output, messages, params.addToOutput, executeFunctions, index, body);
-    if (memory) {
-        await (0, io_1.saveToMemory)(messages, output, params.saveToolCallsInChatMemory, memory);
-    }
-    return outputData;
-}
 //# sourceMappingURL=executor.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/execution/executor.ts"],"names":[],"mappings":";;AAaA,kDA0CC;AAKD,gDAqEC;AA9HD,kEAAsE;AACtE,0CAA4C;AAC5C,0CAAqD;AACrD,gDAAqD;AACrD,6CAAiD;AACjD,qCAA4C;AAKrC,KAAK,UAAU,mBAAmB,CACxC,gBAAmC,EACnC,MAA2B,EAC3B,QAAuB,EACvB,KAAa,EACb,MAA2B;IAE3B,IAAI,CAAC;QAEJ,MAAM,MAAM,GAAG,MAAM,kBAAkB,CACtC,gBAAgB,EAChB,MAAM,EACN,QAAQ,EACR,KAAK,EACL,MAAM,CAAC,KAAK,EACZ,MAAM,CACN,CAAC;QACF,OAAO,MAAM,CAAC;IACf,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,IAAI,MAAM,CAAC,aAAa,EAAE,CAAC;YAC1B,OAAO,CAAC,KAAK,CACZ,iBAAiB,MAAM,CAAC,KAAK,6CAA6C,MAAM,CAAC,aAAa,GAAG,EACjG,KAAK,CACL,CAAC;YACF,IAAI,CAAC;gBAEJ,OAAO,MAAM,kBAAkB,CAC9B,gBAAgB,EAChB,MAAM,EACN,QAAQ,EACR,KAAK,EACL,MAAM,CAAC,aAAa,EACpB,MAAM,CACN,CAAC;YACH,CAAC;YAAC,OAAO,aAAa,EAAE,CAAC;gBACxB,OAAO,CAAC,KAAK,CAAC,kBAAkB,MAAM,CAAC,aAAa,eAAe,EAAE,aAAa,CAAC,CAAC;gBACpF,MAAM,aAAa,CAAC;YACrB,CAAC;QACF,CAAC;QAED,MAAM,KAAK,CAAC;IACb,CAAC;AACF,CAAC;AAKM,KAAK,UAAU,kBAAkB,CACvC,gBAAmC,EACnC,MAA2B,EAC3B,QAAuB,EACvB,KAAa,EACb,UAAkB,EAClB,MAA2B;IAG3B,IAAI,cAAc,GAAG,IAAA,0CAAuB,EAC3C,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,qBAAqB,EAAE,GACxF,MAAM,IAAA,kBAAU,EAAC,gBAAgB,EAAE,MAAM,CAAC,yBAAyB,EAAE,cAAc,CAAC,CAAC;IAGtF,MAAM,IAAI,GAAG,IAAA,yBAAkB,EAC9B,UAAU,EACV,QAAQ,EACR,KAAK,EACL,WAAW,EACX,qBAAqB,EACrB,MAAM,CAAC,OAAO,EACd,MAAM,CAAC,gBAAgB,CACvB,CAAC;IAGF,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,MAAM,IAAA,2BAAgB,EAClD,gBAAgB,EAChB,IAAI,EACJ,QAAQ,EACR,cAAc,EACd,MAAM,CAAC,kBAAkB,EACzB,MAAM,CAAC,cAAc,EACrB,oBAAoB,EACpB,MAAM,CAAC,WAAW,CAClB,CAAC;IAGF,MAAM,UAAU,GAAG,MAAM,IAAA,8BAAiB,EACzC,QAAQ,EACR,MAAM,EACN,QAAQ,EACR,MAAM,CAAC,WAAW,EAClB,gBAAgB,EAChB,KAAK,EACL,IAAI,CACJ,CAAC;IAGF,IAAI,MAAM,EAAE,CAAC;QACZ,MAAM,IAAA,iBAAY,EACjB,QAAQ,EACR,MAAM,EACN,MAAM,CAAC,yBAAyB,EAChC,MAAM,CACN,CAAC;IACH,CAAC;IAED,OAAO,UAAU,CAAC;AACnB,CAAC"}
+{"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

@@ -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.executeWithFallback)(this, params, messages, i, memory);
+    return await (0, executor_1.runModelWithFallback)(this, params, messages, i, memory);
 }
 //# sourceMappingURL=messageOperation.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"messageOperation.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/execution/messageOperation.ts"],"names":[],"mappings":";;AAUA,0BAyBC;AAjCD,wDAA4D;AAC5D,qCAAiD;AACjD,yDAAqE;AACrE,yCAAiD;AAK1C,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,8BAAmB,EAC/B,IAAI,EACJ,MAAM,EACN,QAAQ,EACR,CAAC,EACD,MAAM,CACN,CAAC;AACH,CAAC"}
+{"version":3,"file":"messageOperation.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/execution/messageOperation.ts"],"names":[],"mappings":";;AAUA,0BAyBC;AAjCD,wDAA4D;AAC5D,qCAAiD;AACjD,yDAAqE;AACrE,yCAAkD;AAK3C,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,+BAAoB,EAChC,IAAI,EACJ,MAAM,EACN,QAAQ,EACR,CAAC,EACD,MAAM,CACN,CAAC;AACH,CAAC"}

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "n8n-nodes-simple",
-    "version": "2.4.1",
+    "version": "2.4.2",
     "description": "Simple",
     "keywords": [
         "n8n-community-node-package"