n8n-nodes-simple 3.1.0 → 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 +2 -2
- package/dist/nodes/shared/api/responsesApiConverter.js +3 -8
- package/dist/nodes/shared/api/responsesApiConverter.js.map +1 -1
- package/dist/nodes/shared/api/types.d.ts +38 -0
- package/dist/nodes/shared/config/parameters.d.ts +4 -2
- package/dist/nodes/shared/config/parameters.js +3 -3
- package/dist/nodes/shared/config/parameters.js.map +1 -1
- package/dist/nodes/shared/config/properties/options.js +2 -40
- 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 +21 -1
- package/dist/nodes/shared/core/execution/messageOperation.js.map +1 -1
- package/dist/nodes/shared/core/execution/modelAttempt.d.ts +2 -1
- package/dist/nodes/shared/core/execution/modelAttempt.js.map +1 -1
- package/dist/nodes/shared/core/execution/outputData.js +4 -15
- package/dist/nodes/shared/core/execution/outputData.js.map +1 -1
- package/dist/nodes/shared/core/messages/chatHistory.d.ts +1 -1
- package/dist/nodes/shared/core/messages/chatHistory.js +3 -10
- package/dist/nodes/shared/core/messages/chatHistory.js.map +1 -1
- package/dist/nodes/shared/core/messages/converter.d.ts +1 -1
- package/dist/nodes/shared/core/messages/converter.js +15 -8
- package/dist/nodes/shared/core/messages/converter.js.map +1 -1
- package/dist/nodes/shared/core/messages/types.d.ts +46 -7
- package/dist/nodes/shared/core/messages/types.js +24 -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 +3 -2
- 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 +3 -2
- package/dist/nodes/shared/core/tools/maxIterationsHandler.js +7 -3
- package/dist/nodes/shared/core/tools/maxIterationsHandler.js.map +1 -1
- package/dist/nodes/shared/core/tools/toolCallProcessor.d.ts +1 -1
- package/dist/nodes/shared/core/tools/toolCallProcessor.js +2 -3
- 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
|
@@ -2,23 +2,30 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.convertMessages = convertMessages;
|
|
4
4
|
const types_1 = require("./types");
|
|
5
|
-
function convertMessages(messages, loadToolCalls = true,
|
|
5
|
+
function convertMessages(messages, loadToolCalls = true, loadReasoning = true) {
|
|
6
6
|
var _a, _b;
|
|
7
7
|
const result = [];
|
|
8
|
-
const loadReasoning = preserveReasoning !== 'none';
|
|
9
8
|
for (const message of messages) {
|
|
10
9
|
const role = message.constructor.name === 'AIMessage' ? 'assistant'
|
|
11
10
|
: message.constructor.name === 'SystemMessage' ? 'system'
|
|
12
11
|
: 'user';
|
|
13
12
|
const content = typeof message.content === 'string' ? message.content
|
|
14
|
-
:
|
|
15
|
-
:
|
|
13
|
+
: message.content === null ? ''
|
|
14
|
+
: (0, types_1.isContentPartArray)(message.content) ? message.content
|
|
15
|
+
: JSON.stringify(message.content);
|
|
16
16
|
const toolCalls = message.tool_calls;
|
|
17
17
|
if (loadToolCalls &&
|
|
18
18
|
role === 'assistant' &&
|
|
19
19
|
Array.isArray(toolCalls)) {
|
|
20
|
-
|
|
21
|
-
|
|
20
|
+
if (loadReasoning) {
|
|
21
|
+
result.push(...toolCalls);
|
|
22
|
+
}
|
|
23
|
+
else {
|
|
24
|
+
result.push(...toolCalls.map((tc) => {
|
|
25
|
+
const { reasoning, reasoning_content, reasoning_details, ...rest } = tc;
|
|
26
|
+
return rest;
|
|
27
|
+
}));
|
|
28
|
+
}
|
|
22
29
|
const kwargs = (_a = message.additional_kwargs) !== null && _a !== void 0 ? _a : {};
|
|
23
30
|
const assistantMsg = {
|
|
24
31
|
role: 'assistant',
|
|
@@ -27,7 +34,7 @@ function convertMessages(messages, loadToolCalls = true, preserveReasoning = 'al
|
|
|
27
34
|
...(loadReasoning && kwargs.reasoning_content && { reasoning_content: kwargs.reasoning_content }),
|
|
28
35
|
...(loadReasoning && kwargs.reasoning_details && { reasoning_details: kwargs.reasoning_details }),
|
|
29
36
|
};
|
|
30
|
-
result.push(
|
|
37
|
+
result.push(assistantMsg);
|
|
31
38
|
}
|
|
32
39
|
else {
|
|
33
40
|
const kwargs = (_b = message.additional_kwargs) !== null && _b !== void 0 ? _b : {};
|
|
@@ -38,7 +45,7 @@ function convertMessages(messages, loadToolCalls = true, preserveReasoning = 'al
|
|
|
38
45
|
...(loadReasoning && kwargs.reasoning_content && { reasoning_content: kwargs.reasoning_content }),
|
|
39
46
|
...(loadReasoning && kwargs.reasoning_details && { reasoning_details: kwargs.reasoning_details }),
|
|
40
47
|
};
|
|
41
|
-
result.push(
|
|
48
|
+
result.push(msg);
|
|
42
49
|
}
|
|
43
50
|
}
|
|
44
51
|
return result;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"converter.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/messages/converter.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"converter.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/messages/converter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
type ToolCall = {
|
|
1
|
+
export type ToolCall = {
|
|
2
2
|
id: string;
|
|
3
3
|
type: string;
|
|
4
4
|
function: {
|
|
@@ -6,19 +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
|
-
export
|
|
53
|
+
export declare function filterMessagesReasoning(messages: any[], mode: PreserveReasoningMode): any[];
|
|
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
|
+
})) & {
|
|
22
61
|
chatHistoryJson?: string | object[] | null;
|
|
23
62
|
chatMemorySaveOptions?: string[];
|
|
24
63
|
chatMemorySaveMessages?: boolean;
|
|
@@ -1,8 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.isContentPartArray = isContentPartArray;
|
|
3
4
|
exports.filterReasoningFields = filterReasoningFields;
|
|
5
|
+
exports.filterMessagesReasoning = filterMessagesReasoning;
|
|
4
6
|
exports.validateMessage = validateMessage;
|
|
5
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
|
+
}
|
|
6
12
|
function filterReasoningFields(msg, mode) {
|
|
7
13
|
if (mode === 'all')
|
|
8
14
|
return msg;
|
|
@@ -16,6 +22,11 @@ function filterReasoningFields(msg, mode) {
|
|
|
16
22
|
...(mode === 'reasoningDetails' && reasoning_details !== undefined && { reasoning_details }),
|
|
17
23
|
};
|
|
18
24
|
}
|
|
25
|
+
function filterMessagesReasoning(messages, mode) {
|
|
26
|
+
if (mode === 'all')
|
|
27
|
+
return messages;
|
|
28
|
+
return messages.map((msg) => msg.role === 'assistant' ? filterReasoningFields(msg, mode) : msg);
|
|
29
|
+
}
|
|
19
30
|
function validateMessage(item, index) {
|
|
20
31
|
const indexStr = index !== undefined ? ` at index ${index}` : '';
|
|
21
32
|
if (typeof item !== 'object' || item === null) {
|
|
@@ -36,6 +47,19 @@ function validateMessage(item, index) {
|
|
|
36
47
|
error: `Missing required 'content' property${indexStr}`
|
|
37
48
|
};
|
|
38
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
|
+
}
|
|
39
63
|
return { isValid: true };
|
|
40
64
|
}
|
|
41
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"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import type { IExecuteFunctions, IDataObject } from 'n8n-workflow';
|
|
2
|
-
import type { ChatCompletion } from '../../api/types';
|
|
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
|
-
|
|
5
|
+
import { type PreserveReasoningMode } from '../messages/types';
|
|
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<{
|
|
6
7
|
response: ChatCompletion;
|
|
7
8
|
structuredOutputToolResponse: any;
|
|
8
9
|
finalIteration: number;
|
|
@@ -5,7 +5,8 @@ const responsesApiConverter_1 = require("../../api/responsesApiConverter");
|
|
|
5
5
|
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') {
|
|
9
10
|
var _a, _b;
|
|
10
11
|
const accumulatedUsage = {
|
|
11
12
|
prompt_tokens: 0,
|
|
@@ -15,7 +16,9 @@ async function processToolCalls(executeFunctions, body, messages, invokableTools
|
|
|
15
16
|
retried_requests: 0,
|
|
16
17
|
failed_requests: [],
|
|
17
18
|
};
|
|
18
|
-
let finalBody =
|
|
19
|
+
let finalBody = preserveReasoning !== 'all'
|
|
20
|
+
? { ...body, messages: (0, types_1.filterMessagesReasoning)(body.messages, preserveReasoning) }
|
|
21
|
+
: body;
|
|
19
22
|
let response;
|
|
20
23
|
try {
|
|
21
24
|
response = await (0, responsesApiConverter_1.sendModelRequest)(executeFunctions, finalBody, apiMode);
|
|
@@ -48,14 +51,14 @@ async function processToolCalls(executeFunctions, body, messages, invokableTools
|
|
|
48
51
|
break;
|
|
49
52
|
}
|
|
50
53
|
if (maxIterationsReached) {
|
|
51
|
-
const result = await (0, maxIterationsHandler_1.handleMaxIterationsReached)(executeFunctions, body, messages, structuredOutputTool, structuredOutputToolResponse, accumulatedUsage, apiMode);
|
|
54
|
+
const result = await (0, maxIterationsHandler_1.handleMaxIterationsReached)(executeFunctions, body, messages, structuredOutputTool, structuredOutputToolResponse, accumulatedUsage, apiMode, preserveReasoning);
|
|
52
55
|
response = result.response;
|
|
53
56
|
structuredOutputToolResponse = result.structuredOutputToolResponse;
|
|
54
57
|
break;
|
|
55
58
|
}
|
|
56
59
|
const { reorderedToolCalls, handoffToolToProcess } = (0, toolCallProcessor_1.reorderToolCallsForHandoff)(toolCalls, handoffTools);
|
|
57
60
|
for (const toolCall of reorderedToolCalls) {
|
|
58
|
-
const result = await (0, toolCallProcessor_1.processSingleToolCall)(toolCall, invokableTools, structuredOutputTool, messages, response.choices[0].message, reorderedToolCalls.indexOf(toolCall) === 0, processedToolCallIds, handoffToolToProcess, skillToolNameMap
|
|
61
|
+
const result = await (0, toolCallProcessor_1.processSingleToolCall)(toolCall, invokableTools, structuredOutputTool, messages, response.choices[0].message, reorderedToolCalls.indexOf(toolCall) === 0, processedToolCallIds, handoffToolToProcess, skillToolNameMap);
|
|
59
62
|
if (result.structuredOutputToolResponse) {
|
|
60
63
|
structuredOutputToolResponse = result.structuredOutputToolResponse;
|
|
61
64
|
}
|
|
@@ -75,7 +78,9 @@ async function processToolCalls(executeFunctions, body, messages, invokableTools
|
|
|
75
78
|
}
|
|
76
79
|
finalBody = {
|
|
77
80
|
...body,
|
|
78
|
-
messages:
|
|
81
|
+
messages: preserveReasoning !== 'all'
|
|
82
|
+
? (0, types_1.filterMessagesReasoning)(messages, preserveReasoning)
|
|
83
|
+
: messages,
|
|
79
84
|
};
|
|
80
85
|
try {
|
|
81
86
|
response = await (0, responsesApiConverter_1.sendModelRequest)(executeFunctions, finalBody, apiMode);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/tools/executor.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/tools/executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import type { IExecuteFunctions, IDataObject } from 'n8n-workflow';
|
|
2
|
-
import type { ChatCompletion } from '../../api/types';
|
|
2
|
+
import type { ApiMode, ChatCompletion } from '../../api/types';
|
|
3
3
|
import { type AccumulatedUsage } from '../execution/usageTracking';
|
|
4
|
+
import { type PreserveReasoningMode } from '../messages/types';
|
|
4
5
|
export interface MaxIterationsResult {
|
|
5
6
|
response: ChatCompletion;
|
|
6
7
|
structuredOutputToolResponse: any;
|
|
7
8
|
}
|
|
8
|
-
export declare function handleMaxIterationsReached(executeFunctions: IExecuteFunctions, body: IDataObject, messages: IDataObject[], structuredOutputTool: IDataObject | undefined, existingStructuredOutputResponse: any, accumulatedUsage: AccumulatedUsage, apiMode?:
|
|
9
|
+
export declare function handleMaxIterationsReached(executeFunctions: IExecuteFunctions, body: IDataObject, messages: IDataObject[], structuredOutputTool: IDataObject | undefined, existingStructuredOutputResponse: any, accumulatedUsage: AccumulatedUsage, apiMode?: ApiMode, preserveReasoning?: PreserveReasoningMode): Promise<MaxIterationsResult>;
|
|
@@ -3,13 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.handleMaxIterationsReached = handleMaxIterationsReached;
|
|
4
4
|
const responsesApiConverter_1 = require("../../api/responsesApiConverter");
|
|
5
5
|
const usageTracking_1 = require("../execution/usageTracking");
|
|
6
|
-
|
|
6
|
+
const types_1 = require("../messages/types");
|
|
7
|
+
async function handleMaxIterationsReached(executeFunctions, body, messages, structuredOutputTool, existingStructuredOutputResponse, accumulatedUsage, apiMode = 'chatCompletions', preserveReasoning = 'none') {
|
|
7
8
|
var _a, _b, _c;
|
|
8
9
|
let finalBody;
|
|
10
|
+
const filteredMessages = preserveReasoning !== 'all'
|
|
11
|
+
? (0, types_1.filterMessagesReasoning)(messages, preserveReasoning)
|
|
12
|
+
: messages;
|
|
9
13
|
if (structuredOutputTool && !existingStructuredOutputResponse) {
|
|
10
14
|
finalBody = {
|
|
11
15
|
...body,
|
|
12
|
-
messages:
|
|
16
|
+
messages: filteredMessages,
|
|
13
17
|
tools: [structuredOutputTool],
|
|
14
18
|
tool_choice: {
|
|
15
19
|
type: 'function',
|
|
@@ -20,7 +24,7 @@ async function handleMaxIterationsReached(executeFunctions, body, messages, stru
|
|
|
20
24
|
else {
|
|
21
25
|
finalBody = {
|
|
22
26
|
...body,
|
|
23
|
-
messages:
|
|
27
|
+
messages: filteredMessages,
|
|
24
28
|
tools: [],
|
|
25
29
|
tool_choice: undefined,
|
|
26
30
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"maxIterationsHandler.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/tools/maxIterationsHandler.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"maxIterationsHandler.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/tools/maxIterationsHandler.ts"],"names":[],"mappings":";;AAgBA,gEAmEC;AAlFD,2EAAmE;AAEnE,8DAAmF;AACnF,6CAAwF;AAYjF,KAAK,UAAU,0BAA0B,CAC/C,gBAAmC,EACnC,IAAiB,EACjB,QAAuB,EACvB,oBAA6C,EAC7C,gCAAqC,EACrC,gBAAkC,EAClC,UAAmB,iBAAiB,EACpC,oBAA2C,MAAM;;IAEjD,IAAI,SAAsB,CAAC;IAE3B,MAAM,gBAAgB,GAAG,iBAAiB,KAAK,KAAK;QACnD,CAAC,CAAC,IAAA,+BAAuB,EAAC,QAAQ,EAAE,iBAAiB,CAAC;QACtD,CAAC,CAAC,QAAQ,CAAC;IAEZ,IAAI,oBAAoB,IAAI,CAAC,gCAAgC,EAAE,CAAC;QAE/D,SAAS,GAAG;YACX,GAAG,IAAI;YACP,QAAQ,EAAE,gBAAgB;YAC1B,KAAK,EAAE,CAAC,oBAAoB,CAAC;YAC7B,WAAW,EAAE;gBACZ,IAAI,EAAE,UAAU;gBAChB,QAAQ,EAAE,EAAE,IAAI,EAAG,oBAAoB,CAAC,QAAwB,CAAC,IAAc,EAAE;aACjF;SACD,CAAC;IACH,CAAC;SAAM,CAAC;QAEP,SAAS,GAAG;YACX,GAAG,IAAI;YACP,QAAQ,EAAE,gBAAgB;YAC1B,KAAK,EAAE,EAAE;YACT,WAAW,EAAE,SAAS;SACtB,CAAC;IACH,CAAC;IAED,IAAI,QAAwB,CAAC;IAC7B,IAAI,CAAC;QACJ,QAAQ,GAAG,MAAM,IAAA,wCAAgB,EAAC,gBAAgB,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;QAExE,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC;YACpB,IAAA,8BAAc,EAAC,gBAAgB,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC;YACjD,gBAAgB,CAAC,cAAc,EAAE,CAAC;QACnC,CAAC;IACF,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,MAAM,KAAK,GAAI,SAAS,CAAC,KAAgB,IAAI,SAAS,CAAC;QACvD,MAAM,YAAY,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC5E,gBAAgB,CAAC,eAAgB,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,CAAC;QACvE,MAAM,KAAK,CAAC;IACb,CAAC;IAED,IAAI,4BAA4B,GAAG,gCAAgC,CAAC;IACpE,IAAI,oBAAoB,IAAI,CAAC,4BAA4B,KAAI,MAAA,MAAA,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,OAAO,0CAAG,CAAC,CAAC,0CAAE,OAAO,0CAAE,UAAU,CAAA,EAAE,CAAC;QAC1G,MAAM,cAAc,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC;QAC9D,KAAK,MAAM,QAAQ,IAAI,cAAc,EAAE,CAAC;YACvC,IACG,oBAAoB,CAAC,QAAwB,CAAC,IAAe;gBAC/D,QAAQ,CAAC,QAAQ,CAAC,IAAI,EACrB,CAAC;gBACF,4BAA4B,GAAG,QAAQ,CAAC,QAAQ,CAAC,SAAS,CAAC;gBAC3D,MAAM;YACP,CAAC;QACF,CAAC;IACF,CAAC;IAED,OAAO,EAAE,QAAQ,EAAE,4BAA4B,EAAE,CAAC;AACnD,CAAC"}
|
|
@@ -23,4 +23,4 @@ export declare function processSingleToolCall(toolCall: {
|
|
|
23
23
|
};
|
|
24
24
|
}, invokableTools: InvokableTool[], structuredOutputTool: IDataObject | undefined, messages: IDataObject[], assistantMessage: IDataObject, isFirstToolCallInBatch: boolean, processedToolCallIds: Set<string>, handoffToolToProcess: {
|
|
25
25
|
id: string;
|
|
26
|
-
} | undefined, skillToolNameMap: Map<string, string
|
|
26
|
+
} | undefined, skillToolNameMap: Map<string, string>): Promise<SingleToolCallResult>;
|
|
@@ -4,7 +4,6 @@ exports.reorderToolCallsForHandoff = reorderToolCallsForHandoff;
|
|
|
4
4
|
exports.processSingleToolCall = processSingleToolCall;
|
|
5
5
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
6
6
|
const skillValidation_1 = require("./skillValidation");
|
|
7
|
-
const types_1 = require("../messages/types");
|
|
8
7
|
function reorderToolCallsForHandoff(toolCalls, handoffTools) {
|
|
9
8
|
let handoffToolToProcess;
|
|
10
9
|
if (handoffTools.length > 0) {
|
|
@@ -22,7 +21,7 @@ function reorderToolCallsForHandoff(toolCalls, handoffTools) {
|
|
|
22
21
|
}
|
|
23
22
|
return { reorderedToolCalls: toolCalls, handoffToolToProcess: undefined };
|
|
24
23
|
}
|
|
25
|
-
async function processSingleToolCall(toolCall, invokableTools, structuredOutputTool, messages, assistantMessage, isFirstToolCallInBatch, processedToolCallIds, handoffToolToProcess, skillToolNameMap
|
|
24
|
+
async function processSingleToolCall(toolCall, invokableTools, structuredOutputTool, messages, assistantMessage, isFirstToolCallInBatch, processedToolCallIds, handoffToolToProcess, skillToolNameMap) {
|
|
26
25
|
var _a;
|
|
27
26
|
const calledFunctionName = toolCall.function.name;
|
|
28
27
|
const calledFunctionArgs = toolCall.function.arguments;
|
|
@@ -72,7 +71,7 @@ async function processSingleToolCall(toolCall, invokableTools, structuredOutputT
|
|
|
72
71
|
}
|
|
73
72
|
const isHandoffTool = handoffToolToProcess && toolCall.id === handoffToolToProcess.id;
|
|
74
73
|
if (isFirstToolCallInBatch) {
|
|
75
|
-
messages.push(
|
|
74
|
+
messages.push(assistantMessage);
|
|
76
75
|
}
|
|
77
76
|
const toolContent = typeof content === 'string' ? (() => { try {
|
|
78
77
|
return JSON.stringify(JSON.parse(content));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toolCallProcessor.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/tools/toolCallProcessor.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"toolCallProcessor.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/tools/toolCallProcessor.ts"],"names":[],"mappings":"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"}
|