n8n-nodes-simple 2.4.8 → 2.4.9
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/nodes/shared/core/execution/executor.d.ts +1 -1
- package/dist/nodes/shared/core/execution/executor.js +29 -4
- package/dist/nodes/shared/core/execution/executor.js.map +1 -1
- package/dist/nodes/shared/core/execution/outputData.d.ts +1 -1
- package/dist/nodes/shared/core/execution/outputData.js +7 -1
- package/dist/nodes/shared/core/execution/outputData.js.map +1 -1
- package/dist/package.json +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { IExecuteFunctions, INodeExecutionData, IDataObject } from 'n8n-workflow';
|
|
2
2
|
import type { BufferWindowMemory } from 'langchain/memory';
|
|
3
3
|
import { ExtractedParameters } from '../../config/parameters';
|
|
4
|
-
export declare function runModel(executeFunctions: IExecuteFunctions, params: ExtractedParameters, messages: IDataObject[], index: number, modelToUse: string, memory?: BufferWindowMemory): Promise<INodeExecutionData[]>;
|
|
4
|
+
export declare function runModel(executeFunctions: IExecuteFunctions, params: ExtractedParameters, messages: IDataObject[], index: number, modelToUse: string, memory?: BufferWindowMemory, primaryError?: string): Promise<INodeExecutionData[]>;
|
|
5
5
|
export declare function runModelWithFallback(executeFunctions: IExecuteFunctions, params: ExtractedParameters, messages: IDataObject[], index: number, memory?: BufferWindowMemory): Promise<INodeExecutionData[]>;
|
|
@@ -8,7 +8,7 @@ const body_1 = require("../request/body");
|
|
|
8
8
|
const executor_1 = require("../tools/executor");
|
|
9
9
|
const outputData_1 = require("./outputData");
|
|
10
10
|
const io_1 = require("../memory/io");
|
|
11
|
-
async function runModel(executeFunctions, params, messages, index, modelToUse, memory) {
|
|
11
|
+
async function runModel(executeFunctions, params, messages, index, modelToUse, memory, primaryError) {
|
|
12
12
|
var _a, _b;
|
|
13
13
|
let responseFormat = (0, structuredOutput_1.prepareResponseFormatField)(params.responseFormat, params.outputJsonSchemaDefinition, params.structuredOutputName, params.structuredOutputDescription, params.structuredOutputProperties, params.structuredOutputIsArray, params.structuredOutputArrayName, params.structuredOutputArrayDescription);
|
|
14
14
|
const { tools, invokableTools, tool_choice, structuredOutputTool } = await (0, setup_1.prepareTools)(executeFunctions, params.structuredOutputToolsMode, params.maxToolsIterations, responseFormat);
|
|
@@ -22,12 +22,19 @@ async function runModel(executeFunctions, params, messages, index, modelToUse, m
|
|
|
22
22
|
|| (params.responseFormat === "plainText"
|
|
23
23
|
? (_a = response === null || response === void 0 ? void 0 : response.choices[0]) === null || _a === void 0 ? void 0 : _a.message.content
|
|
24
24
|
: JSON.parse((_b = response === null || response === void 0 ? void 0 : response.choices[0]) === null || _b === void 0 ? void 0 : _b.message.content));
|
|
25
|
-
const outputData = await (0, outputData_1.prepareOutputData)(response, output, messages, params.addToOutput, executeFunctions, index, body);
|
|
25
|
+
const outputData = await (0, outputData_1.prepareOutputData)(response, output, messages, params.addToOutput, executeFunctions, index, body, primaryError);
|
|
26
26
|
if (memory) {
|
|
27
27
|
await (0, io_1.saveToMemory)(messages, output, params.saveToolCallsInChatMemory, memory);
|
|
28
28
|
}
|
|
29
29
|
return outputData;
|
|
30
30
|
}
|
|
31
|
+
function extractErrorInfo(error) {
|
|
32
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
33
|
+
const description = error.description;
|
|
34
|
+
const requestBody = error.requestBody;
|
|
35
|
+
const httpCode = error.httpCode;
|
|
36
|
+
return { message, description, requestBody, httpCode };
|
|
37
|
+
}
|
|
31
38
|
async function runModelWithFallback(executeFunctions, params, messages, index, memory) {
|
|
32
39
|
var _a, _b;
|
|
33
40
|
try {
|
|
@@ -42,13 +49,31 @@ async function runModelWithFallback(executeFunctions, params, messages, index, m
|
|
|
42
49
|
}
|
|
43
50
|
catch (error) {
|
|
44
51
|
if (params.fallbackModel) {
|
|
52
|
+
const primaryErrorInfo = extractErrorInfo(error);
|
|
53
|
+
let primaryErrorMessage = primaryErrorInfo.message;
|
|
54
|
+
if (primaryErrorInfo.description) {
|
|
55
|
+
primaryErrorMessage += ` (${primaryErrorInfo.description})`;
|
|
56
|
+
}
|
|
45
57
|
try {
|
|
46
58
|
console.error('Running fallback model');
|
|
47
|
-
return await runModel(executeFunctions, params, messages, index, params.fallbackModel, memory);
|
|
59
|
+
return await runModel(executeFunctions, params, messages, index, params.fallbackModel, memory, primaryErrorMessage);
|
|
48
60
|
}
|
|
49
61
|
catch (fallbackError) {
|
|
50
62
|
console.error(`Fallback model ${params.fallbackModel} also failed:`, fallbackError);
|
|
51
|
-
|
|
63
|
+
const fallbackErrorInfo = extractErrorInfo(fallbackError);
|
|
64
|
+
let primaryFullError = primaryErrorInfo.message;
|
|
65
|
+
if (primaryErrorInfo.description) {
|
|
66
|
+
primaryFullError += ` (${primaryErrorInfo.description})`;
|
|
67
|
+
}
|
|
68
|
+
let fallbackFullError = fallbackErrorInfo.message;
|
|
69
|
+
if (fallbackErrorInfo.description) {
|
|
70
|
+
fallbackFullError += ` (${fallbackErrorInfo.description})`;
|
|
71
|
+
}
|
|
72
|
+
const combinedError = new Error(`● [Primary] ${primaryErrorInfo.httpCode} ${primaryFullError} ● [Fallback] ${fallbackErrorInfo.httpCode} ${fallbackFullError}`);
|
|
73
|
+
if (primaryErrorInfo.requestBody || fallbackErrorInfo.requestBody) {
|
|
74
|
+
combinedError.description = `Primary Request Body: ${primaryErrorInfo.requestBody}`;
|
|
75
|
+
}
|
|
76
|
+
throw combinedError;
|
|
52
77
|
}
|
|
53
78
|
}
|
|
54
79
|
throw error;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/execution/executor.ts"],"names":[],"mappings":";;AAaA,
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/execution/executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import type { IExecuteFunctions, INodeExecutionData, IDataObject } from 'n8n-workflow';
|
|
2
2
|
import type { ChatCompletion } from '../../api/types';
|
|
3
|
-
export declare function prepareOutputData(response: ChatCompletion, output: any, messages: IDataObject[], addToOutput: string[], executeFunctions: IExecuteFunctions, index: number, body: IDataObject): Promise<INodeExecutionData[]>;
|
|
3
|
+
export declare function prepareOutputData(response: ChatCompletion, output: any, messages: IDataObject[], addToOutput: string[], executeFunctions: IExecuteFunctions, index: number, body: IDataObject, primaryError?: string): Promise<INodeExecutionData[]>;
|
|
4
4
|
export declare function reorderOutputFields(outputData: INodeExecutionData[]): void;
|
|
@@ -3,9 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.prepareOutputData = prepareOutputData;
|
|
4
4
|
exports.reorderOutputFields = reorderOutputFields;
|
|
5
5
|
const messageExtractor_1 = require("../tools/messageExtractor");
|
|
6
|
-
async function prepareOutputData(response, output, messages, addToOutput, executeFunctions, index, body) {
|
|
6
|
+
async function prepareOutputData(response, output, messages, addToOutput, executeFunctions, index, body, primaryError) {
|
|
7
7
|
const outputData = [];
|
|
8
8
|
outputData.push({ json: { output: output }, pairedItem: { item: index } });
|
|
9
|
+
if (primaryError) {
|
|
10
|
+
outputData.forEach((item) => {
|
|
11
|
+
item.json.error = primaryError;
|
|
12
|
+
});
|
|
13
|
+
}
|
|
9
14
|
if (addToOutput.includes('fullResponse')) {
|
|
10
15
|
outputData.forEach((item) => {
|
|
11
16
|
item.json.response = response;
|
|
@@ -65,6 +70,7 @@ function reorderOutputFields(outputData) {
|
|
|
65
70
|
outputData.forEach((item) => {
|
|
66
71
|
const reordered = {
|
|
67
72
|
output: item.json.output,
|
|
73
|
+
error: item.json.error,
|
|
68
74
|
request: item.json.request,
|
|
69
75
|
tool_calls: item.json.tool_calls,
|
|
70
76
|
response: item.json.response,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"outputData.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/execution/outputData.ts"],"names":[],"mappings":";;AAYA,
|
|
1
|
+
{"version":3,"file":"outputData.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/execution/outputData.ts"],"names":[],"mappings":"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"}
|