n8n-nodes-simple 3.1.1 → 3.2.0
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/api/responsesApiConverter.d.ts +1 -2
- package/dist/nodes/shared/api/responsesApiConverter.js +4 -16
- package/dist/nodes/shared/api/responsesApiConverter.js.map +1 -1
- package/dist/nodes/shared/api/types.d.ts +37 -0
- package/dist/nodes/shared/config/parameters.js +1 -1
- package/dist/nodes/shared/config/parameters.js.map +1 -1
- package/dist/nodes/shared/config/properties/options.js +1 -39
- package/dist/nodes/shared/config/properties/options.js.map +1 -1
- package/dist/nodes/shared/config/properties/output.js +1 -1
- package/dist/nodes/shared/config/properties/output.js.map +1 -1
- package/dist/nodes/shared/core/execution/executionSetup.js +1 -2
- package/dist/nodes/shared/core/execution/executionSetup.js.map +1 -1
- package/dist/nodes/shared/core/execution/messageOperation.js +20 -0
- package/dist/nodes/shared/core/execution/messageOperation.js.map +1 -1
- package/dist/nodes/shared/core/execution/modelAttempt.js.map +1 -1
- package/dist/nodes/shared/core/messages/converter.js +4 -2
- package/dist/nodes/shared/core/messages/converter.js.map +1 -1
- package/dist/nodes/shared/core/messages/types.d.ts +45 -7
- package/dist/nodes/shared/core/messages/types.js +18 -0
- package/dist/nodes/shared/core/messages/types.js.map +1 -1
- package/dist/nodes/shared/core/request/body.d.ts +2 -1
- package/dist/nodes/shared/core/request/body.js +0 -5
- package/dist/nodes/shared/core/request/body.js.map +1 -1
- package/dist/nodes/shared/core/tools/executor.d.ts +1 -1
- package/dist/nodes/shared/core/tools/executor.js +10 -5
- package/dist/nodes/shared/core/tools/executor.js.map +1 -1
- package/dist/nodes/shared/core/tools/maxIterationsHandler.d.ts +1 -1
- package/dist/nodes/shared/core/tools/maxIterationsHandler.js +8 -4
- package/dist/nodes/shared/core/tools/maxIterationsHandler.js.map +1 -1
- package/dist/package.json +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import type { IExecuteFunctions, IDataObject } from 'n8n-workflow';
|
|
2
2
|
import type { ApiMode, ChatCompletion } from './types';
|
|
3
|
-
import type { PreserveReasoningMode } from '../core/messages/types';
|
|
4
3
|
export declare function convertBodyToResponsesApi(chatBody: IDataObject): IDataObject;
|
|
5
4
|
export declare function convertResponseToCompletion(responsesApiResponse: any): ChatCompletion;
|
|
6
|
-
export declare function sendModelRequest(executeFunctions: IExecuteFunctions, body: IDataObject, apiMode: ApiMode
|
|
5
|
+
export declare function sendModelRequest(executeFunctions: IExecuteFunctions, body: IDataObject, apiMode: ApiMode): Promise<ChatCompletion>;
|
|
@@ -5,19 +5,13 @@ exports.convertResponseToCompletion = convertResponseToCompletion;
|
|
|
5
5
|
exports.sendModelRequest = sendModelRequest;
|
|
6
6
|
const crypto_1 = require("crypto");
|
|
7
7
|
const openAiApiRequest_1 = require("./openAiApiRequest");
|
|
8
|
-
const types_1 = require("../core/messages/types");
|
|
9
8
|
const HANDLED_FIELDS = new Set([
|
|
10
9
|
'model',
|
|
11
10
|
'messages',
|
|
12
11
|
'tools',
|
|
13
12
|
'tool_choice',
|
|
14
13
|
'response_format',
|
|
15
|
-
'max_token_completions',
|
|
16
14
|
'temperature',
|
|
17
|
-
'top_p',
|
|
18
|
-
'frequency_penalty',
|
|
19
|
-
'presence_penalty',
|
|
20
|
-
'n',
|
|
21
15
|
]);
|
|
22
16
|
function generateId(prefix) {
|
|
23
17
|
return `${prefix}_${(0, crypto_1.randomUUID)().replace(/-/g, '').slice(0, 24)}`;
|
|
@@ -149,10 +143,10 @@ function convertBodyToResponsesApi(chatBody) {
|
|
|
149
143
|
if (chatBody.response_format) {
|
|
150
144
|
responsesBody.text = convertResponseFormat(chatBody.response_format);
|
|
151
145
|
}
|
|
152
|
-
if (chatBody.
|
|
153
|
-
responsesBody.max_output_tokens = chatBody.
|
|
146
|
+
if (chatBody.max_tokens !== undefined) {
|
|
147
|
+
responsesBody.max_output_tokens = chatBody.max_tokens;
|
|
154
148
|
}
|
|
155
|
-
for (const field of ['temperature'
|
|
149
|
+
for (const field of ['temperature']) {
|
|
156
150
|
if (chatBody[field] !== undefined) {
|
|
157
151
|
responsesBody[field] = chatBody[field];
|
|
158
152
|
}
|
|
@@ -245,13 +239,7 @@ function convertResponseToCompletion(responsesApiResponse) {
|
|
|
245
239
|
system_fingerprint: '',
|
|
246
240
|
};
|
|
247
241
|
}
|
|
248
|
-
async function sendModelRequest(executeFunctions, body, apiMode
|
|
249
|
-
if (preserveReasoning !== 'all') {
|
|
250
|
-
body = {
|
|
251
|
-
...body,
|
|
252
|
-
messages: (0, types_1.filterMessagesReasoning)(body.messages, preserveReasoning),
|
|
253
|
-
};
|
|
254
|
-
}
|
|
242
|
+
async function sendModelRequest(executeFunctions, body, apiMode) {
|
|
255
243
|
if (apiMode === 'responses') {
|
|
256
244
|
const responsesBody = convertBodyToResponsesApi(body);
|
|
257
245
|
const rawResponse = await openAiApiRequest_1.openAiApiRequest.call(executeFunctions, 'POST', '/responses', { body: responsesBody });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"responsesApiConverter.js","sourceRoot":"","sources":["../../../../nodes/shared/api/responsesApiConverter.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"responsesApiConverter.js","sourceRoot":"","sources":["../../../../nodes/shared/api/responsesApiConverter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,42 @@
|
|
|
1
1
|
import type { IDataObject } from 'n8n-workflow';
|
|
2
|
+
import type { Message } from '../core/messages/types';
|
|
2
3
|
export type ApiMode = 'chatCompletions' | 'responses';
|
|
4
|
+
export type FunctionDescription = {
|
|
5
|
+
description?: string;
|
|
6
|
+
name: string;
|
|
7
|
+
parameters: object;
|
|
8
|
+
strict?: boolean;
|
|
9
|
+
};
|
|
10
|
+
export type Tool = {
|
|
11
|
+
type: 'function';
|
|
12
|
+
function: FunctionDescription;
|
|
13
|
+
};
|
|
14
|
+
export type ToolChoice = 'none' | 'auto' | 'required' | {
|
|
15
|
+
type: 'function';
|
|
16
|
+
function: {
|
|
17
|
+
name: string;
|
|
18
|
+
};
|
|
19
|
+
};
|
|
20
|
+
export type ResponseFormat = {
|
|
21
|
+
type: 'json_object';
|
|
22
|
+
} | {
|
|
23
|
+
type: 'json_schema';
|
|
24
|
+
json_schema: {
|
|
25
|
+
name: string;
|
|
26
|
+
strict?: boolean;
|
|
27
|
+
description?: string;
|
|
28
|
+
schema: object;
|
|
29
|
+
};
|
|
30
|
+
};
|
|
31
|
+
export type RequestBody = {
|
|
32
|
+
model: string;
|
|
33
|
+
messages: Message[] | IDataObject[];
|
|
34
|
+
tools?: Tool[] | IDataObject[];
|
|
35
|
+
tool_choice?: ToolChoice | string | IDataObject;
|
|
36
|
+
response_format?: ResponseFormat | IDataObject;
|
|
37
|
+
temperature?: number;
|
|
38
|
+
[key: string]: any;
|
|
39
|
+
};
|
|
3
40
|
export type ChatCompletion = {
|
|
4
41
|
id: string;
|
|
5
42
|
object: string;
|
|
@@ -13,7 +13,7 @@ function extractParameters(executeFunctions, index) {
|
|
|
13
13
|
const chatMemoryLoadOptions = (_c = chatMemoryMessage === null || chatMemoryMessage === void 0 ? void 0 : chatMemoryMessage.chatMemoryLoadOptions) !== null && _c !== void 0 ? _c : ['toolCalls', 'reasoning'];
|
|
14
14
|
const loadToolCallsFromChatMemory = chatMemoryLoadOptions.includes('toolCalls');
|
|
15
15
|
const apiMode = get('options.apiMode', 'chatCompletions');
|
|
16
|
-
const preserveReasoning = get('options.preserveReasoning', '
|
|
16
|
+
const preserveReasoning = get('options.preserveReasoning', 'none');
|
|
17
17
|
const loadReasoningFromChatMemory = chatMemoryLoadOptions.includes('reasoning');
|
|
18
18
|
const saveReasoningInChatMemory = chatMemorySaveOptions.includes('reasoning');
|
|
19
19
|
const responseFormat = get('responseFormat', '');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parameters.js","sourceRoot":"","sources":["../../../../nodes/shared/config/parameters.ts"],"names":[],"mappings":";;AA0CA,8CAyGC;AAzGD,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;IAGnF,MAAM,qBAAqB,GAAG,MAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,qBAAqB,mCAAI,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;IACrG,MAAM,sBAAsB,GAAG,MAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,sBAAsB,mCAAI,KAAK,CAAC;IAIlF,MAAM,wBAAwB,GAAG,qBAAqB,CAAC,MAAM,GAAG,CAAC,IAAI,sBAAsB,CAAC;IAC5F,MAAM,yBAAyB,GAAG,qBAAqB,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IAG9E,MAAM,qBAAqB,GAAG,MAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,qBAAqB,mCAAI,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;IACrG,MAAM,2BAA2B,GAAG,qBAAqB,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IAEhF,MAAM,OAAO,GAAG,GAAG,CAAU,iBAAiB,EAAE,iBAAiB,CAAC,CAAC;IACnE,MAAM,iBAAiB,GAAG,GAAG,CAAwB,2BAA2B,EAAE,
|
|
1
|
+
{"version":3,"file":"parameters.js","sourceRoot":"","sources":["../../../../nodes/shared/config/parameters.ts"],"names":[],"mappings":"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"}
|
|
@@ -41,14 +41,6 @@ exports.optionsProperties = [
|
|
|
41
41
|
typeOptions: { rows: 5 },
|
|
42
42
|
ignoreValidationDuringExecution: true,
|
|
43
43
|
},
|
|
44
|
-
{
|
|
45
|
-
displayName: 'Frequency Penalty',
|
|
46
|
-
name: 'frequency_penalty',
|
|
47
|
-
default: 0,
|
|
48
|
-
typeOptions: { minValue: -2, maxValue: 2, numberPrecision: 1 },
|
|
49
|
-
description: "Positive values penalize new tokens based on their existing frequency in the text so far, decreasing the model's likelihood to repeat the same line verbatim",
|
|
50
|
-
type: 'number',
|
|
51
|
-
},
|
|
52
44
|
{
|
|
53
45
|
displayName: 'Handoff Tools',
|
|
54
46
|
name: 'handoffTools',
|
|
@@ -59,13 +51,6 @@ exports.optionsProperties = [
|
|
|
59
51
|
validateType: 'array',
|
|
60
52
|
ignoreValidationDuringExecution: true,
|
|
61
53
|
},
|
|
62
|
-
{
|
|
63
|
-
displayName: 'Max Tokens',
|
|
64
|
-
name: 'max_token_completions',
|
|
65
|
-
default: 3000,
|
|
66
|
-
description: 'The maximum number of tokens to generate in the completion',
|
|
67
|
-
type: 'number'
|
|
68
|
-
},
|
|
69
54
|
{
|
|
70
55
|
displayName: 'Max Tool Iterations',
|
|
71
56
|
name: 'maxToolsIterations',
|
|
@@ -84,26 +69,11 @@ exports.optionsProperties = [
|
|
|
84
69
|
maxValue: 10,
|
|
85
70
|
},
|
|
86
71
|
},
|
|
87
|
-
{
|
|
88
|
-
displayName: 'Number of Completions',
|
|
89
|
-
name: 'n',
|
|
90
|
-
default: 1,
|
|
91
|
-
description: 'How many completions to generate for each prompt. Note: Not recommended when using connected tools, because extra tool calls and tool outputs are ignored. Because this parameter generates many completions, it can quickly consume your token quota. Use carefully and ensure that you have reasonable settings for max_tokens and stop.',
|
|
92
|
-
type: 'number',
|
|
93
|
-
},
|
|
94
|
-
{
|
|
95
|
-
displayName: 'Presence Penalty',
|
|
96
|
-
name: 'presence_penalty',
|
|
97
|
-
default: 0,
|
|
98
|
-
typeOptions: { minValue: -2, maxValue: 2, numberPrecision: 1 },
|
|
99
|
-
description: "Positive values penalize new tokens based on whether they appear in the text so far, increasing the model's likelihood to talk about new topics",
|
|
100
|
-
type: 'number',
|
|
101
|
-
},
|
|
102
72
|
{
|
|
103
73
|
displayName: 'Preserve Reasoning',
|
|
104
74
|
name: 'preserveReasoning',
|
|
105
75
|
type: 'options',
|
|
106
|
-
default: '
|
|
76
|
+
default: 'none',
|
|
107
77
|
options: [
|
|
108
78
|
{ name: 'None', value: 'none', description: 'Strip all reasoning fields from assistant messages' },
|
|
109
79
|
{ name: 'Reasoning', value: 'reasoning', description: 'Preserve only reasoning field' },
|
|
@@ -143,14 +113,6 @@ exports.optionsProperties = [
|
|
|
143
113
|
description: 'What sampling temperature to use, between 0 and 2. Higher values like 0.8 will make the output more random, while lower values like 0.2 will make it more focused and deterministic. Read the <a href="https://platform.openai.com/docs/api-reference/chat/create" target="_blank">API Reference docs</a>',
|
|
144
114
|
type: 'number',
|
|
145
115
|
},
|
|
146
|
-
{
|
|
147
|
-
displayName: 'Top P',
|
|
148
|
-
name: 'top_p',
|
|
149
|
-
default: 1,
|
|
150
|
-
typeOptions: { minValue: 0, maxValue: 1, numberPrecision: 1 },
|
|
151
|
-
description: 'An alternative to sampling with temperature, called nucleus sampling, where the model considers the results of the tokens with top_p probability mass. So 0.1 means only the tokens comprising the top 10% probability mass are considered.',
|
|
152
|
-
type: 'number',
|
|
153
|
-
},
|
|
154
116
|
],
|
|
155
117
|
},
|
|
156
118
|
];
|
|
@@ -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,UAAU;gBACvB,IAAI,EAAE,SAAS;gBACf,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,iBAAiB;gBAC1B,OAAO,EAAE;oBACR,EAAE,IAAI,EAAE,sBAAsB,EAAE,KAAK,EAAE,iBAAiB,EAAE,WAAW,EAAE,8CAA8C,EAAE;oBACvH,EAAE,IAAI,EAAE,eAAe,EAAE,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,mGAAmG,EAAE;iBAC/J;gBACD,WAAW,EAAE,oJAAoJ;aACjK;YACD;gBACC,WAAW,EAAE,sCAAsC;gBACnD,IAAI,EAAE,0BAA0B;gBAChC,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,KAAK;gBACd,WAAW,EACV,gQAAgQ;gBAClQ,cAAc,EAAE;oBACf,IAAI,EAAE;wBACL,iBAAiB,EAAE,CAAC,wBAAwB,EAAE,wBAAwB,CAAC;qBACvE;iBACD;aACA;YACD;gBACC,WAAW,EAAE,mBAAmB;gBAChC,IAAI,EAAE,kBAAkB;gBACxB,OAAO,EAAE,IAAI;gBACb,WAAW,EACV,gcAAgc;gBACjc,IAAI,EAAE,MAAM;gBACZ,WAAW,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE;gBACxB,+BAA+B,EAAE,IAAI;aACrC;YACD;gBACC,WAAW,EAAE,
|
|
1
|
+
{"version":3,"file":"options.js","sourceRoot":"","sources":["../../../../../nodes/shared/config/properties/options.ts"],"names":[],"mappings":"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"}
|
|
@@ -128,7 +128,7 @@ exports.outputProperties = [
|
|
|
128
128
|
name: 'structuredOutputDescription',
|
|
129
129
|
type: 'string',
|
|
130
130
|
default: '',
|
|
131
|
-
description: "In Tools Mode, the structured output description should be something like: 'Return your response to the user.
|
|
131
|
+
description: "In Tools Mode, the structured output description should be something like: 'Return your response to the user. ALWAYS call this tool last, after all other tool calls are complete, or immediately if no further tool calls are needed. Never respond with plain text outside this tool.'",
|
|
132
132
|
typeOptions: {
|
|
133
133
|
rows: 1,
|
|
134
134
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"output.js","sourceRoot":"","sources":["../../../../../nodes/shared/config/properties/output.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"output.js","sourceRoot":"","sources":["../../../../../nodes/shared/config/properties/output.ts"],"names":[],"mappings":"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"}
|
|
@@ -38,8 +38,7 @@ function modifyResponseFormatByMode(structuredOutputMode, responseFormat) {
|
|
|
38
38
|
async function prepareExecutionContext(executeFunctions, params) {
|
|
39
39
|
const initialResponseFormat = (0, structuredOutput_1.prepareResponseFormatField)(params.responseFormat, params.outputJsonSchemaDefinition, params.structuredOutputName, params.structuredOutputDescription, params.structuredOutputProperties, params.structuredOutputIsArray, params.structuredOutputArrayName, params.structuredOutputArrayDescription);
|
|
40
40
|
const { tools, invokableTools, tool_choice, structuredOutputTool } = await (0, setup_1.prepareTools)(executeFunctions, params.structuredOutputMode, params.maxToolsIterations, initialResponseFormat);
|
|
41
|
-
const shouldValidate = params.
|
|
42
|
-
(params.responseFormat === 'structuredOutputSchema' || params.responseFormat === 'structuredOutputVisual');
|
|
41
|
+
const shouldValidate = params.responseFormat === 'structuredOutputSchema' || params.responseFormat === 'structuredOutputVisual';
|
|
43
42
|
const shouldRetryOnAnyError = params.maxTries > 1;
|
|
44
43
|
const validationSchema = extractValidationSchema(shouldValidate, params.structuredOutputMode, initialResponseFormat, structuredOutputTool);
|
|
45
44
|
const responseFormat = modifyResponseFormatByMode(params.structuredOutputMode, initialResponseFormat);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executionSetup.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/execution/executionSetup.ts"],"names":[],"mappings":";;;AA+HA,
|
|
1
|
+
{"version":3,"file":"executionSetup.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/execution/executionSetup.ts"],"names":[],"mappings":";;;AA+HA,0DAmDC;AA/KD,kEAAyE;AACzE,0CAA8C;AAKjC,QAAA,uBAAuB,GAAG;IACtC,MAAM,EAAE,QAAQ;IAChB,KAAK,EAAE,OAAO;IACd,eAAe,EAAE,gBAAgB;IACjC,qBAAqB,EAAE,qBAAqB;CACnC,CAAC;AAuDX,SAAS,uBAAuB,CAC/B,cAAuB,EACvB,oBAAwC,EACxC,cAA4B,EAC5B,oBAAkC;;IAElC,IAAI,CAAC,cAAc,EAAE,CAAC;QACrB,OAAO,SAAS,CAAC;IAClB,CAAC;IAGD,IAAI,oBAAoB,KAAK,+BAAuB,CAAC,KAAK,IAAI,oBAAoB,EAAE,CAAC;QACpF,OAAO,MAAC,oBAAoB,CAAC,QAAwB,0CAAE,UAAyB,CAAC;IAClF,CAAC;IAGD,IAAI,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,WAAW,EAAE,CAAC;QACjC,OAAO,MAAC,cAAc,CAAC,WAA2B,0CAAE,MAAqB,CAAC;IAC3E,CAAC;IAED,OAAO,SAAS,CAAC;AAClB,CAAC;AASD,SAAS,0BAA0B,CAClC,oBAAwC,EACxC,cAA4B;IAE5B,IAAI,oBAAoB,KAAK,+BAAuB,CAAC,KAAK,EAAE,CAAC;QAC5D,OAAO,SAAS,CAAC;IAClB,CAAC;IAED,IAAI,oBAAoB,KAAK,+BAAuB,CAAC,eAAe,EAAE,CAAC;QACtE,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC;IAChC,CAAC;IAED,IAAI,oBAAoB,KAAK,+BAAuB,CAAC,qBAAqB,EAAE,CAAC;QAC5E,OAAO,SAAS,CAAC;IAClB,CAAC;IAGD,OAAO,cAAc,CAAC;AACvB,CAAC;AAUM,KAAK,UAAU,uBAAuB,CAC5C,gBAAmC,EACnC,MAA2B;IAG3B,MAAM,qBAAqB,GAAG,IAAA,6CAA0B,EACvD,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;IAIF,MAAM,EAAE,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,oBAAoB,EAAE,GACjE,MAAM,IAAA,oBAAY,EAAC,gBAAgB,EAAE,MAAM,CAAC,oBAAoB,EAAE,MAAM,CAAC,kBAAkB,EAAE,qBAAqB,CAAC,CAAC;IAGrH,MAAM,cAAc,GACnB,MAAM,CAAC,cAAc,KAAK,wBAAwB,IAAI,MAAM,CAAC,cAAc,KAAK,wBAAwB,CAAC;IAG1G,MAAM,qBAAqB,GAAG,MAAM,CAAC,QAAQ,GAAG,CAAC,CAAC;IAGlD,MAAM,gBAAgB,GAAG,uBAAuB,CAC/C,cAAc,EACd,MAAM,CAAC,oBAAoB,EAC3B,qBAAqB,EACrB,oBAAoB,CACpB,CAAC;IAGF,MAAM,cAAc,GAAG,0BAA0B,CAAC,MAAM,CAAC,oBAAoB,EAAE,qBAAqB,CAAC,CAAC;IAEtG,OAAO;QACN,cAAc;QACd,KAAK;QACL,cAAc;QACd,WAAW;QACX,oBAAoB;QACpB,gBAAgB;QAChB,cAAc;QACd,qBAAqB;QACrB,YAAY,EAAE,MAAM,CAAC,YAAY;QACjC,UAAU,EAAE,MAAM,CAAC,UAAU;KAC7B,CAAC;AACH,CAAC"}
|
|
@@ -1,13 +1,33 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.execute = execute;
|
|
4
|
+
const n8n_workflow_1 = require("n8n-workflow");
|
|
4
5
|
const parameters_1 = require("../../config/parameters");
|
|
5
6
|
const io_1 = require("../memory/io");
|
|
6
7
|
const chatHistory_1 = require("../messages/chatHistory");
|
|
7
8
|
const executor_1 = require("./executor");
|
|
8
9
|
async function execute(i) {
|
|
9
10
|
const params = (0, parameters_1.extractParameters)(this, i);
|
|
11
|
+
if (params.handoffTools.length > 0 || params.skillTools.length > 0) {
|
|
12
|
+
const connectedTools = (await this.getInputConnectionData(n8n_workflow_1.NodeConnectionTypes.AiTool, 0)) || [];
|
|
13
|
+
const connectedToolNames = new Set(connectedTools.map((t) => t.name));
|
|
14
|
+
const missingHandoff = params.handoffTools.filter((name) => !connectedToolNames.has(name));
|
|
15
|
+
if (missingHandoff.length > 0) {
|
|
16
|
+
throw new n8n_workflow_1.NodeOperationError(this.getNode(), `Handoff tool(s) not found in connected tools: ${missingHandoff.join(', ')}. Connect the tool sub-node(s) or remove them from the Handoff Tools list.`, { itemIndex: i });
|
|
17
|
+
}
|
|
18
|
+
const missingSkill = params.skillTools.filter((name) => !connectedToolNames.has(name));
|
|
19
|
+
if (missingSkill.length > 0) {
|
|
20
|
+
throw new n8n_workflow_1.NodeOperationError(this.getNode(), `Skill tool(s) not found in connected tools: ${missingSkill.join(', ')}. Connect the tool sub-node(s) or remove them from the Skill Tools list.`, { itemIndex: i });
|
|
21
|
+
}
|
|
22
|
+
}
|
|
10
23
|
const memory = await (0, io_1.getOptionalMemory)(this);
|
|
24
|
+
const hasChatMemoryRole = params.rawMessagesToSend.some((msg) => msg.role === 'chatMemoryRole');
|
|
25
|
+
if (memory && !hasChatMemoryRole) {
|
|
26
|
+
throw new n8n_workflow_1.NodeOperationError(this.getNode(), 'A Chat Memory sub-node is connected, but no Chat Memory message is configured. Add a message with the "💭 Chat Memory" role to use the connected memory.', { itemIndex: i });
|
|
27
|
+
}
|
|
28
|
+
if (!memory && hasChatMemoryRole) {
|
|
29
|
+
throw new n8n_workflow_1.NodeOperationError(this.getNode(), 'A Chat Memory message is configured, but no Chat Memory sub-node is connected. Connect a Memory sub-node or remove the Chat Memory message.', { itemIndex: i });
|
|
30
|
+
}
|
|
11
31
|
const messages = await (0, chatHistory_1.unpackChatHistoryAndMemory)(params.rawMessagesToSend, params.loadToolCallsFromChatMemory, params.loadReasoningFromChatMemory, memory);
|
|
12
32
|
return await (0, executor_1.runModel)(this, params, messages, i, params.model, memory);
|
|
13
33
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"messageOperation.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/execution/messageOperation.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"messageOperation.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/execution/messageOperation.ts"],"names":[],"mappings":";;AAYA,0BAuDC;AAjED,+CAAuE;AAEvE,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,IAAI,MAAM,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,IAAI,MAAM,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACpE,MAAM,cAAc,GAClB,CAAC,MAAM,IAAI,CAAC,sBAAsB,CAAC,kCAAmB,CAAC,MAAM,EAAE,CAAC,CAAC,CAAY,IAAI,EAAE,CAAC;QACtF,MAAM,kBAAkB,GAAG,IAAI,GAAG,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;QAEtE,MAAM,cAAc,GAAG,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;QAC3F,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC/B,MAAM,IAAI,iCAAkB,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,iDAAiD,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,4EAA4E,EAAE,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC,CAAC;QACxN,CAAC;QAED,MAAM,YAAY,GAAG,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;QACvF,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC7B,MAAM,IAAI,iCAAkB,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,+CAA+C,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,0EAA0E,EAAE,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC,CAAC;QAClN,CAAC;IACF,CAAC;IAGD,MAAM,MAAM,GAAG,MAAM,IAAA,sBAAiB,EAAC,IAAI,CAAC,CAAC;IAG7C,MAAM,iBAAiB,GAAG,MAAM,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,gBAAgB,CAAC,CAAC;IAEhG,IAAI,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAClC,MAAM,IAAI,iCAAkB,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,0JAA0J,EAAE,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC,CAAC;IAC5N,CAAC;IAED,IAAI,CAAC,MAAM,IAAI,iBAAiB,EAAE,CAAC;QAClC,MAAM,IAAI,iCAAkB,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,6IAA6I,EAAE,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC,CAAC;IAC/M,CAAC;IAGD,MAAM,QAAQ,GAAG,MAAM,IAAA,wCAA0B,EAChD,MAAM,CAAC,iBAAiB,EACxB,MAAM,CAAC,2BAA2B,EAClC,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 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modelAttempt.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/execution/modelAttempt.ts"],"names":[],"mappings":";;AAgEA,wEAuQC;AAnUD,2EAA4E;AAC5E,0CAAqD;AACrD,gDAAqD;AACrD,6CAAiD;AACjD,qCAA4C;AAC5C,sDAAiE;AACjE,qCAAyE;AACzE,iDAA2G;AAC3G,mDAAwE;AACxE,qDAA0D;AAC1D,yDAAiF;AAgCjF,SAAS,mBAAmB,CAAC,KAAU;IAEtC,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAChD,MAAM,UAAU,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QAE5B,IAAI,UAAU,IAAI,OAAO,UAAU,KAAK,QAAQ,IAAI,QAAQ,IAAI,UAAU,EAAE,CAAC;YAC5E,OAAO,UAAU,CAAC,MAAM,CAAC;QAC1B,CAAC;QAED,OAAO,UAAU,CAAC;IACnB,CAAC;IAED,OAAO,KAAK,CAAC;AACd,CAAC;AAKM,KAAK,UAAU,8BAA8B,CACnD,OAA4B;IAE5B,MAAM,EACL,gBAAgB,EAChB,MAAM,EACN,KAAK,EACL,YAAY,EACZ,UAAU,EACV,YAAY,EACZ,QAAQ,EACR,KAAK,EACL,WAAW,EACX,cAAc,EACd,cAAc,EACd,oBAAoB,EACpB,gBAAgB,EAChB,cAAc,EACd,qBAAqB,EACrB,qBAAqB,EACrB,MAAM,EACN,OAAO,GACP,GAAG,OAAO,CAAC;IAEZ,MAAM,YAAY,GAAG,MAAM,CAAC,UAAU,GAAG,IAAI,CAAC;IAE9C,IAAI,UAAU,GAAe;QAC5B,gBAAgB,EAAE,UAAU;QAC5B,aAAa,EAAE,CAAC;KAChB,CAAC;IAEF,IAAI,oCAAoC,GAAG,QAAQ,CAAC,MAAM,CAAC;IAC3D,IAAI,gBAAgB,GAAG,CAAC,CAAC;IAEzB,OAAO,IAAI,EAAE,CAAC;QACb,IAAI,IAAI,GAAG,IAAA,yBAAkB,EAC5B,YAAY,EACZ,QAAQ,EACR,KAAK,EACL,WAAW,EACX,cAAc,EACd,MAAM,CAAC,OAAO,EACd,YAAY,CACZ,CAAC;QAEF,IAAI,QAAa,CAAC;QAClB,IAAI,4BAAiC,CAAC;QACtC,IAAI,cAAsB,CAAC;QAC3B,IAAI,SAAsB,CAAC;QAC3B,IAAI,gBAAqB,CAAC;QAC1B,IAAI,eAAwB,CAAC;QAC7B,IAAI,eAAmC,CAAC;QACxC,IAAI,iBAAqC,CAAC;QAE1C,IAAI,CAAC;YACJ,MAAM,MAAM,GAAG,MAAM,IAAA,2BAAgB,EACpC,gBAAgB,EAChB,IAAI,EACJ,QAAQ,EACR,cAAc,EACd,MAAM,CAAC,kBAAkB,EACzB,oBAAoB,EACpB,MAAM,CAAC,WAAW,EAClB,gBAAgB,EAChB,OAAO,CAAC,YAAY,EACpB,OAAO,CAAC,UAAU,EAClB,MAAM,CAAC,iBAAiB,EACxB,OAAO,CACP,CAAC;YAEF,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;YAC3B,4BAA4B,GAAG,MAAM,CAAC,4BAA4B,CAAC;YACnE,cAAc,GAAG,MAAM,CAAC,cAAc,CAAC;YACvC,SAAS,GAAG,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"modelAttempt.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/execution/modelAttempt.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.convertMessages = convertMessages;
|
|
4
|
+
const types_1 = require("./types");
|
|
4
5
|
function convertMessages(messages, loadToolCalls = true, loadReasoning = true) {
|
|
5
6
|
var _a, _b;
|
|
6
7
|
const result = [];
|
|
@@ -9,8 +10,9 @@ function convertMessages(messages, loadToolCalls = true, loadReasoning = true) {
|
|
|
9
10
|
: message.constructor.name === 'SystemMessage' ? 'system'
|
|
10
11
|
: 'user';
|
|
11
12
|
const content = typeof message.content === 'string' ? message.content
|
|
12
|
-
:
|
|
13
|
-
:
|
|
13
|
+
: message.content === null ? ''
|
|
14
|
+
: (0, types_1.isContentPartArray)(message.content) ? message.content
|
|
15
|
+
: JSON.stringify(message.content);
|
|
14
16
|
const toolCalls = message.tool_calls;
|
|
15
17
|
if (loadToolCalls &&
|
|
16
18
|
role === 'assistant' &&
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"converter.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/messages/converter.ts"],"names":[],"mappings":";;AAgBA,
|
|
1
|
+
{"version":3,"file":"converter.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/messages/converter.ts"],"names":[],"mappings":";;AAgBA,0CAsDC;AAtED,mCAAsD;AAgBtD,SAAgB,eAAe,CAAC,QAAuB,EAAE,gBAAyB,IAAI,EAAE,gBAAyB,IAAI;;IACpH,MAAM,MAAM,GAAc,EAAE,CAAC;IAE7B,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAChC,MAAM,IAAI,GAAG,OAAO,CAAC,WAAW,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC,CAAC,WAAW;YAClE,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,KAAK,eAAe,CAAC,CAAC,CAAC,QAAQ;gBACzD,CAAC,CAAC,MAAM,CAAC;QACV,MAAM,OAAO,GAAG,OAAO,OAAO,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO;YACpE,CAAC,CAAC,OAAO,CAAC,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE;gBAC/B,CAAC,CAAC,IAAA,0BAAkB,EAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO;oBACvD,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAGnC,MAAM,SAAS,GAAI,OAAe,CAAC,UAAU,CAAC;QAC9C,IACC,aAAa;YACb,IAAI,KAAK,WAAW;YACpB,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EACvB,CAAC;YAEF,IAAI,aAAa,EAAE,CAAC;gBACnB,MAAM,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,CAAC;YAC3B,CAAC;iBAAM,CAAC;gBACP,MAAM,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,EAAO,EAAE,EAAE;oBACxC,MAAM,EAAE,SAAS,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,CAAC;oBACxE,OAAO,IAAI,CAAC;gBACb,CAAC,CAAC,CAAC,CAAC;YACL,CAAC;YAGD,MAAM,MAAM,GAAG,MAAC,OAAe,CAAC,iBAAiB,mCAAI,EAAE,CAAC;YACxD,MAAM,YAAY,GAAQ;gBACzB,IAAI,EAAE,WAAW;gBACjB,OAAO,EAAE,OAAO;gBAChB,GAAG,CAAC,aAAa,IAAI,MAAM,CAAC,SAAS,IAAI,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,CAAC;gBACzE,GAAG,CAAC,aAAa,IAAI,MAAM,CAAC,iBAAiB,IAAI,EAAE,iBAAiB,EAAE,MAAM,CAAC,iBAAiB,EAAE,CAAC;gBACjG,GAAG,CAAC,aAAa,IAAI,MAAM,CAAC,iBAAiB,IAAI,EAAE,iBAAiB,EAAE,MAAM,CAAC,iBAAiB,EAAE,CAAC;aACjG,CAAC;YACF,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC3B,CAAC;aAAM,CAAC;YAEP,MAAM,MAAM,GAAG,MAAC,OAAe,CAAC,iBAAiB,mCAAI,EAAE,CAAC;YACxD,MAAM,GAAG,GAAQ;gBAChB,IAAI,EAAE,IAAI;gBACV,OAAO,EAAE,OAAO;gBAChB,GAAG,CAAC,aAAa,IAAI,MAAM,CAAC,SAAS,IAAI,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,CAAC;gBACzE,GAAG,CAAC,aAAa,IAAI,MAAM,CAAC,iBAAiB,IAAI,EAAE,iBAAiB,EAAE,MAAM,CAAC,iBAAiB,EAAE,CAAC;gBACjG,GAAG,CAAC,aAAa,IAAI,MAAM,CAAC,iBAAiB,IAAI,EAAE,iBAAiB,EAAE,MAAM,CAAC,iBAAiB,EAAE,CAAC;aACjG,CAAC;YACF,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAClB,CAAC;IACF,CAAC;IAED,OAAO,MAAM,CAAC;AACf,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
type ToolCall = {
|
|
1
|
+
export type ToolCall = {
|
|
2
2
|
id: string;
|
|
3
3
|
type: string;
|
|
4
4
|
function: {
|
|
@@ -6,20 +6,58 @@ type ToolCall = {
|
|
|
6
6
|
arguments: string;
|
|
7
7
|
};
|
|
8
8
|
};
|
|
9
|
-
export type
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
9
|
+
export type TextContentPart = {
|
|
10
|
+
type: 'text';
|
|
11
|
+
text: string;
|
|
12
|
+
};
|
|
13
|
+
export type ImageContentPart = {
|
|
14
|
+
type: 'image_url';
|
|
15
|
+
image_url: {
|
|
16
|
+
url: string;
|
|
17
|
+
detail?: string;
|
|
18
|
+
};
|
|
19
|
+
};
|
|
20
|
+
export type ContentPart = TextContentPart | ImageContentPart;
|
|
21
|
+
type BaseMessageFields = {
|
|
14
22
|
refusal?: string | null;
|
|
15
23
|
reasoning?: string | null;
|
|
16
24
|
reasoning_content?: string | null;
|
|
17
25
|
reasoning_details?: any;
|
|
18
26
|
};
|
|
27
|
+
export type SystemMessage = BaseMessageFields & {
|
|
28
|
+
role: 'system';
|
|
29
|
+
content: string | ContentPart[];
|
|
30
|
+
name?: string;
|
|
31
|
+
};
|
|
32
|
+
export type UserMessage = BaseMessageFields & {
|
|
33
|
+
role: 'user';
|
|
34
|
+
content: string | ContentPart[];
|
|
35
|
+
name?: string;
|
|
36
|
+
};
|
|
37
|
+
export type AssistantMessage = BaseMessageFields & {
|
|
38
|
+
role: 'assistant';
|
|
39
|
+
content: string | null;
|
|
40
|
+
name?: string;
|
|
41
|
+
tool_calls?: ToolCall[];
|
|
42
|
+
};
|
|
43
|
+
export type ToolMessage = BaseMessageFields & {
|
|
44
|
+
role: 'tool';
|
|
45
|
+
content: string;
|
|
46
|
+
tool_call_id: string;
|
|
47
|
+
name?: string;
|
|
48
|
+
};
|
|
49
|
+
export type Message = SystemMessage | UserMessage | AssistantMessage | ToolMessage;
|
|
50
|
+
export declare function isContentPartArray(content: unknown): content is ContentPart[];
|
|
19
51
|
export type PreserveReasoningMode = 'none' | 'reasoning' | 'reasoningContent' | 'reasoningDetails' | 'all';
|
|
20
52
|
export declare function filterReasoningFields(msg: any, mode: PreserveReasoningMode): any;
|
|
21
53
|
export declare function filterMessagesReasoning(messages: any[], mode: PreserveReasoningMode): any[];
|
|
22
|
-
export type RawMessage = Message & {
|
|
54
|
+
export type RawMessage = (Message | (BaseMessageFields & {
|
|
55
|
+
role: string;
|
|
56
|
+
content: string | ContentPart[] | null;
|
|
57
|
+
name?: string;
|
|
58
|
+
tool_calls?: ToolCall[];
|
|
59
|
+
tool_call_id?: string;
|
|
60
|
+
})) & {
|
|
23
61
|
chatHistoryJson?: string | object[] | null;
|
|
24
62
|
chatMemorySaveOptions?: string[];
|
|
25
63
|
chatMemorySaveMessages?: boolean;
|
|
@@ -1,9 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.isContentPartArray = isContentPartArray;
|
|
3
4
|
exports.filterReasoningFields = filterReasoningFields;
|
|
4
5
|
exports.filterMessagesReasoning = filterMessagesReasoning;
|
|
5
6
|
exports.validateMessage = validateMessage;
|
|
6
7
|
exports.validateMessages = validateMessages;
|
|
8
|
+
function isContentPartArray(content) {
|
|
9
|
+
return Array.isArray(content) && content.length > 0
|
|
10
|
+
&& content.every((p) => typeof p === 'object' && p !== null && typeof p.type === 'string');
|
|
11
|
+
}
|
|
7
12
|
function filterReasoningFields(msg, mode) {
|
|
8
13
|
if (mode === 'all')
|
|
9
14
|
return msg;
|
|
@@ -42,6 +47,19 @@ function validateMessage(item, index) {
|
|
|
42
47
|
error: `Missing required 'content' property${indexStr}`
|
|
43
48
|
};
|
|
44
49
|
}
|
|
50
|
+
const content = item.content;
|
|
51
|
+
if (content !== null && typeof content !== 'string' && !Array.isArray(content)) {
|
|
52
|
+
return {
|
|
53
|
+
isValid: false,
|
|
54
|
+
error: `Invalid 'content' type${indexStr}: expected string, null, or ContentPart[], got ${typeof content}`
|
|
55
|
+
};
|
|
56
|
+
}
|
|
57
|
+
if (item.role === 'tool' && !item.tool_call_id) {
|
|
58
|
+
return {
|
|
59
|
+
isValid: false,
|
|
60
|
+
error: `Missing required 'tool_call_id' property for tool message${indexStr}`
|
|
61
|
+
};
|
|
62
|
+
}
|
|
45
63
|
return { isValid: true };
|
|
46
64
|
}
|
|
47
65
|
function validateMessages(messages) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/messages/types.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/messages/types.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,3 @@
|
|
|
1
1
|
import type { IDataObject } from 'n8n-workflow';
|
|
2
|
-
|
|
2
|
+
import type { RequestBody } from '../../api/types';
|
|
3
|
+
export declare function prepareRequestBody(model: string, messages: IDataObject[], tools: any[], tool_choice: string | IDataObject | undefined, response_format: IDataObject | undefined, options: IDataObject, customParams: IDataObject): RequestBody;
|
|
@@ -7,12 +7,7 @@ exports.prepareRequestBody = prepareRequestBody;
|
|
|
7
7
|
const pick_1 = __importDefault(require("lodash/pick"));
|
|
8
8
|
const types_1 = require("../messages/types");
|
|
9
9
|
const OPENAI_API_BODY_FIELDS = [
|
|
10
|
-
'frequency_penalty',
|
|
11
|
-
'max_token_completions',
|
|
12
|
-
'n',
|
|
13
|
-
'presence_penalty',
|
|
14
10
|
'temperature',
|
|
15
|
-
'top_p',
|
|
16
11
|
];
|
|
17
12
|
function prepareRequestBody(model, messages, tools, tool_choice, response_format, options, customParams) {
|
|
18
13
|
(0, types_1.validateMessages)(messages);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"body.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/request/body.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"body.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/request/body.ts"],"names":[],"mappings":";;;;;AAiBA,gDA+BC;AA/CD,uDAAgC;AAChC,6CAAqD;AAQrD,MAAM,sBAAsB,GAAG;IAC9B,aAAa;CACJ,CAAC;AAKX,SAAgB,kBAAkB,CACjC,KAAa,EACb,QAAuB,EACvB,KAAY,EACZ,WAA6C,EAC7C,eAAwC,EACxC,OAAoB,EACpB,YAAyB;IAGzB,IAAA,wBAAgB,EAAC,QAAQ,CAAC,CAAC;IAG3B,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAQ,EAAE,EAAE,CACvC,GAAG,CAAC,OAAO,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,KAAK,WAAW,IAAI,GAAG,CAAC,UAAU,IAAI,GAAG,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAC/F,CAAC;IAGF,MAAM,YAAY,GAAG,IAAA,cAAK,EAAC,OAAO,EAAE,sBAAsB,CAAC,CAAC;IAE5D,MAAM,IAAI,GAAgB;QACzB,KAAK;QACL,QAAQ;QACR,GAAG,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACtC,WAAW;QACX,eAAe;QACf,GAAI,YAAqC;QACzC,GAAG,YAAY;KACf,CAAC;IAEF,OAAO,IAAI,CAAC;AACb,CAAC"}
|
|
@@ -2,7 +2,7 @@ import type { IExecuteFunctions, IDataObject } from 'n8n-workflow';
|
|
|
2
2
|
import type { ApiMode, ChatCompletion } from '../../api/types';
|
|
3
3
|
import type { InvokableTool } from '../execution/executionSetup';
|
|
4
4
|
import { type AccumulatedUsage } from '../execution/usageTracking';
|
|
5
|
-
import type
|
|
5
|
+
import { type PreserveReasoningMode } from '../messages/types';
|
|
6
6
|
export declare function processToolCalls(executeFunctions: IExecuteFunctions, body: IDataObject, messages: IDataObject[], invokableTools: InvokableTool[], maxToolsIterations: number, structuredOutputTool?: IDataObject, abortSignal?: AbortSignal, startingIteration?: number, handoffTools?: string[], skillTools?: string[], preserveReasoning?: PreserveReasoningMode, apiMode?: ApiMode): Promise<{
|
|
7
7
|
response: ChatCompletion;
|
|
8
8
|
structuredOutputToolResponse: any;
|