n8n-nodes-simple 4.1.2 → 4.1.3
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/config/parameters.js +1 -1
- package/dist/nodes/shared/config/properties/options.js +11 -1
- package/dist/nodes/shared/config/properties/options.js.map +1 -1
- package/dist/nodes/shared/core/tools/executor.js +1 -1
- package/dist/nodes/shared/core/tools/skillValidation.d.ts +9 -5
- package/dist/nodes/shared/core/tools/skillValidation.js.map +1 -1
- package/dist/nodes/shared/core/tools/toolCallProcessor.js +44 -40
- package/dist/nodes/shared/core/tools/toolCallProcessor.js.map +1 -1
- package/dist/package.json +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -74,7 +74,7 @@ function extractParameters(executeFunctions, index) {
|
|
|
74
74
|
preserveReasoning,
|
|
75
75
|
handoffTools,
|
|
76
76
|
skillTools,
|
|
77
|
-
skillInstructionsMessageType: get('options.skillInstructionsMessageType', '
|
|
77
|
+
skillInstructionsMessageType: get('options.skillInstructionsMessageType', 'toolMessage'),
|
|
78
78
|
abortSignal: executeFunctions.getExecutionCancelSignal(),
|
|
79
79
|
};
|
|
80
80
|
if (isStructuredOutput) {
|
|
@@ -112,13 +112,18 @@ exports.optionsProperties = [
|
|
|
112
112
|
displayName: 'Skill Instructions Message Type',
|
|
113
113
|
name: 'skillInstructionsMessageType',
|
|
114
114
|
type: 'options',
|
|
115
|
-
default: '
|
|
115
|
+
default: 'toolMessage',
|
|
116
116
|
displayOptions: {
|
|
117
117
|
hide: {
|
|
118
118
|
skillTools: ['[]', ''],
|
|
119
119
|
},
|
|
120
120
|
},
|
|
121
121
|
options: [
|
|
122
|
+
{
|
|
123
|
+
name: 'Tool Message',
|
|
124
|
+
value: 'toolMessage',
|
|
125
|
+
description: 'Display skill instructions in the tool response message',
|
|
126
|
+
},
|
|
122
127
|
{
|
|
123
128
|
name: 'User Message',
|
|
124
129
|
value: 'userMessage',
|
|
@@ -129,6 +134,11 @@ exports.optionsProperties = [
|
|
|
129
134
|
value: 'systemMessage',
|
|
130
135
|
description: 'Inject skill instructions as a mid-conversation system message',
|
|
131
136
|
},
|
|
137
|
+
{
|
|
138
|
+
name: 'Append To System',
|
|
139
|
+
value: 'appendToSystem',
|
|
140
|
+
description: 'Append skill instructions to the existing system prompt',
|
|
141
|
+
},
|
|
132
142
|
],
|
|
133
143
|
description: 'How to inject the skill instructions into the conversation when a skill tool is called',
|
|
134
144
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"options.js","sourceRoot":"","sources":["../../../../../nodes/shared/config/properties/options.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"options.js","sourceRoot":"","sources":["../../../../../nodes/shared/config/properties/options.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ const usageTracking_1 = require("../execution/usageTracking");
|
|
|
6
6
|
const maxIterationsHandler_1 = require("./maxIterationsHandler");
|
|
7
7
|
const toolCallProcessor_1 = require("./toolCallProcessor");
|
|
8
8
|
const types_1 = require("../messages/types");
|
|
9
|
-
async function processToolCalls(executeFunctions, body, messages, invokableTools, maxToolsIterations, structuredOutputTool, abortSignal, startingIteration = 1, handoffTools = [], skillTools = [], preserveReasoning = 'none', apiMode = 'chatCompletions', previousResponseId = '', requestTimeoutMs, skillInstructionsMessageType = '
|
|
9
|
+
async function processToolCalls(executeFunctions, body, messages, invokableTools, maxToolsIterations, structuredOutputTool, abortSignal, startingIteration = 1, handoffTools = [], skillTools = [], preserveReasoning = 'none', apiMode = 'chatCompletions', previousResponseId = '', requestTimeoutMs, skillInstructionsMessageType = 'toolMessage', stateful = false) {
|
|
10
10
|
var _a, _b, _c, _d;
|
|
11
11
|
const accumulatedUsage = {
|
|
12
12
|
prompt_tokens: 0,
|
|
@@ -1,6 +1,10 @@
|
|
|
1
|
-
export
|
|
2
|
-
isValid:
|
|
3
|
-
name
|
|
4
|
-
instructions
|
|
5
|
-
}
|
|
1
|
+
export type SkillValidationResult = {
|
|
2
|
+
isValid: true;
|
|
3
|
+
name: string;
|
|
4
|
+
instructions: string;
|
|
5
|
+
} | {
|
|
6
|
+
isValid: false;
|
|
7
|
+
name?: undefined;
|
|
8
|
+
instructions?: undefined;
|
|
9
|
+
};
|
|
6
10
|
export declare function isValidSkillResponse(content: any): SkillValidationResult;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"skillValidation.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/tools/skillValidation.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"skillValidation.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/tools/skillValidation.ts"],"names":[],"mappings":";;AAYA,oDA4BC;AA5BD,SAAgB,oBAAoB,CAAC,OAAY;IAChD,IAAI,CAAC;QAEJ,IAAI,MAAM,GAAG,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;QAGzE,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAClD,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QACpB,CAAC;QAGD,IACC,MAAM;YACN,OAAO,MAAM,KAAK,QAAQ;YAC1B,OAAO,MAAM,CAAC,IAAI,KAAK,QAAQ;YAC/B,OAAO,MAAM,CAAC,YAAY,KAAK,QAAQ,EACtC,CAAC;YACF,OAAO;gBACN,OAAO,EAAE,IAAI;gBACb,IAAI,EAAE,MAAM,CAAC,IAAI;gBACjB,YAAY,EAAE,MAAM,CAAC,YAAY;aACjC,CAAC;QACH,CAAC;IACF,CAAC;IAAC,MAAM,CAAC;IAET,CAAC;IAED,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;AAC3B,CAAC"}
|
|
@@ -21,7 +21,36 @@ function reorderToolCallsForHandoff(toolCalls, handoffTools) {
|
|
|
21
21
|
}
|
|
22
22
|
return { reorderedToolCalls: toolCalls, handoffToolToProcess: undefined };
|
|
23
23
|
}
|
|
24
|
-
|
|
24
|
+
function injectSkillInstructions(messages, toolCallId, skillName, instructions, messageType) {
|
|
25
|
+
if (messageType !== 'toolMessage') {
|
|
26
|
+
const ref = messageType === 'appendToSystem'
|
|
27
|
+
? `Follow the "${skillName}" instructions defined in the system prompt.`
|
|
28
|
+
: `Follow the "${skillName}" instructions below.`;
|
|
29
|
+
messages.push({ tool_call_id: toolCallId, role: 'tool', content: ref });
|
|
30
|
+
}
|
|
31
|
+
switch (messageType) {
|
|
32
|
+
case 'userMessage':
|
|
33
|
+
messages.push({ role: 'user', content: instructions });
|
|
34
|
+
break;
|
|
35
|
+
case 'systemMessage':
|
|
36
|
+
messages.push({ role: 'system', content: instructions });
|
|
37
|
+
break;
|
|
38
|
+
case 'appendToSystem': {
|
|
39
|
+
const idx = messages.findIndex((m) => m.role === 'system');
|
|
40
|
+
if (idx !== -1) {
|
|
41
|
+
const existing = messages[idx];
|
|
42
|
+
messages[idx] = { ...existing, content: `${existing.content}\n\n${instructions}` };
|
|
43
|
+
}
|
|
44
|
+
else {
|
|
45
|
+
messages.unshift({ role: 'system', content: instructions });
|
|
46
|
+
}
|
|
47
|
+
break;
|
|
48
|
+
}
|
|
49
|
+
default:
|
|
50
|
+
messages.push({ tool_call_id: toolCallId, role: 'tool', content: instructions });
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
async function processSingleToolCall(toolCall, invokableTools, structuredOutputTool, messages, assistantMessage, isFirstToolCallInBatch, processedToolCallIds, handoffToolToProcess, skillToolNameMap, skillInstructionsMessageType = 'toolMessage') {
|
|
25
54
|
var _a;
|
|
26
55
|
const calledFunctionName = toolCall.function.name;
|
|
27
56
|
const calledFunctionArgs = toolCall.function.arguments;
|
|
@@ -73,12 +102,16 @@ async function processSingleToolCall(toolCall, invokableTools, structuredOutputT
|
|
|
73
102
|
if (isFirstToolCallInBatch) {
|
|
74
103
|
messages.push(assistantMessage);
|
|
75
104
|
}
|
|
76
|
-
const toolContent = typeof content === 'string'
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
105
|
+
const toolContent = typeof content === 'string'
|
|
106
|
+
? (() => {
|
|
107
|
+
try {
|
|
108
|
+
return JSON.stringify(JSON.parse(content));
|
|
109
|
+
}
|
|
110
|
+
catch {
|
|
111
|
+
return content;
|
|
112
|
+
}
|
|
113
|
+
})()
|
|
114
|
+
: JSON.stringify(content);
|
|
82
115
|
if (isHandoffTool) {
|
|
83
116
|
messages.push({
|
|
84
117
|
tool_call_id: toolCallId,
|
|
@@ -94,41 +127,12 @@ async function processSingleToolCall(toolCall, invokableTools, structuredOutputT
|
|
|
94
127
|
};
|
|
95
128
|
}
|
|
96
129
|
const isSkillTool = skillToolNameMap.has(calledFunctionName) && !isHandoffTool;
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
messages.push({
|
|
101
|
-
tool_call_id: toolCallId,
|
|
102
|
-
role: 'tool',
|
|
103
|
-
content: `Follow the "${skillValidation.name}" instructions below.`,
|
|
104
|
-
});
|
|
105
|
-
if (skillInstructionsMessageType === 'userMessage') {
|
|
106
|
-
messages.push({
|
|
107
|
-
role: 'user',
|
|
108
|
-
content: skillValidation.instructions,
|
|
109
|
-
});
|
|
110
|
-
}
|
|
111
|
-
else {
|
|
112
|
-
messages.push({
|
|
113
|
-
role: 'system',
|
|
114
|
-
content: skillValidation.instructions,
|
|
115
|
-
});
|
|
116
|
-
}
|
|
117
|
-
}
|
|
118
|
-
else {
|
|
119
|
-
messages.push({
|
|
120
|
-
tool_call_id: toolCallId,
|
|
121
|
-
role: 'tool',
|
|
122
|
-
content: toolContent,
|
|
123
|
-
});
|
|
124
|
-
}
|
|
130
|
+
const skillValidation = isSkillTool ? (0, skillValidation_1.isValidSkillResponse)(content) : null;
|
|
131
|
+
if (isSkillTool && (skillValidation === null || skillValidation === void 0 ? void 0 : skillValidation.isValid)) {
|
|
132
|
+
injectSkillInstructions(messages, toolCallId, skillValidation.name, skillValidation.instructions, skillInstructionsMessageType);
|
|
125
133
|
}
|
|
126
134
|
else {
|
|
127
|
-
messages.push({
|
|
128
|
-
tool_call_id: toolCallId,
|
|
129
|
-
role: 'tool',
|
|
130
|
-
content: toolContent,
|
|
131
|
-
});
|
|
135
|
+
messages.push({ tool_call_id: toolCallId, role: 'tool', content: toolContent });
|
|
132
136
|
}
|
|
133
137
|
return { structuredOutputToolResponse: null, handoffDetected: false, shouldBreak: false };
|
|
134
138
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toolCallProcessor.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/tools/toolCallProcessor.ts"],"names":[],"mappings":";;AAiBA,gEAyBC;
|
|
1
|
+
{"version":3,"file":"toolCallProcessor.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/tools/toolCallProcessor.ts"],"names":[],"mappings":"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"}
|