n8n-nodes-simple 2.5.10 → 2.6.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/config/parameters.d.ts +1 -0
- package/dist/nodes/shared/config/parameters.js +12 -0
- package/dist/nodes/shared/config/parameters.js.map +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/config/properties/output.js +2 -1
- package/dist/nodes/shared/config/properties/output.js.map +1 -1
- package/dist/nodes/shared/core/execution/executionSetup.d.ts +1 -0
- package/dist/nodes/shared/core/execution/executionSetup.js +1 -0
- package/dist/nodes/shared/core/execution/executionSetup.js.map +1 -1
- package/dist/nodes/shared/core/execution/executor.js +1 -0
- package/dist/nodes/shared/core/execution/executor.js.map +1 -1
- package/dist/nodes/shared/core/execution/modelAttempt.d.ts +1 -0
- package/dist/nodes/shared/core/execution/modelAttempt.js +26 -1
- package/dist/nodes/shared/core/execution/modelAttempt.js.map +1 -1
- package/dist/nodes/shared/core/execution/outputData.js +13 -2
- package/dist/nodes/shared/core/execution/outputData.js.map +1 -1
- package/dist/nodes/shared/core/request/body.js +3 -1
- package/dist/nodes/shared/core/request/body.js.map +1 -1
- package/dist/nodes/shared/core/tools/executor.d.ts +4 -1
- package/dist/nodes/shared/core/tools/executor.js +46 -4
- package/dist/nodes/shared/core/tools/executor.js.map +1 -1
- package/dist/package.json +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -25,6 +25,7 @@ export type ExtractedParameters = {
|
|
|
25
25
|
customParameters: string | IDataObject;
|
|
26
26
|
saveToolCallsInChatMemory: boolean;
|
|
27
27
|
loadToolCallsFromChatMemory: boolean;
|
|
28
|
+
handoffTools: string[];
|
|
28
29
|
abortSignal: AbortSignal | undefined;
|
|
29
30
|
};
|
|
30
31
|
export declare function extractParameters(executeFunctions: IExecuteFunctions, index: number): ExtractedParameters;
|
|
@@ -11,6 +11,17 @@ function extractParameters(executeFunctions, index) {
|
|
|
11
11
|
const responseFormat = get('responseFormat', '');
|
|
12
12
|
const isStructuredOutput = responseFormat === 'structuredOutputVisual' || responseFormat === 'structuredOutputSchema';
|
|
13
13
|
const extractFirstObjectOnly = get('extractFirstObjectOnly', true);
|
|
14
|
+
let handoffTools = [];
|
|
15
|
+
try {
|
|
16
|
+
const handoffToolsRaw = get('options.handoffTools', '[]');
|
|
17
|
+
const parsed = JSON.parse(handoffToolsRaw);
|
|
18
|
+
if (Array.isArray(parsed)) {
|
|
19
|
+
handoffTools = parsed.filter((item) => typeof item === 'string');
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
catch (error) {
|
|
23
|
+
handoffTools = [];
|
|
24
|
+
}
|
|
14
25
|
const params = {
|
|
15
26
|
model: get('modelId', '', { extractValue: true }),
|
|
16
27
|
agentType: get('agentType', 'coreAgent'),
|
|
@@ -25,6 +36,7 @@ function extractParameters(executeFunctions, index) {
|
|
|
25
36
|
customParameters: get('options.customParameters', '{}'),
|
|
26
37
|
saveToolCallsInChatMemory,
|
|
27
38
|
loadToolCallsFromChatMemory,
|
|
39
|
+
handoffTools,
|
|
28
40
|
abortSignal: executeFunctions.getExecutionCancelSignal(),
|
|
29
41
|
};
|
|
30
42
|
if (isStructuredOutput) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parameters.js","sourceRoot":"","sources":["../../../../nodes/shared/config/parameters.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"parameters.js","sourceRoot":"","sources":["../../../../nodes/shared/config/parameters.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,7 @@ exports.optionsProperties = [
|
|
|
10
10
|
default: {},
|
|
11
11
|
options: [
|
|
12
12
|
{
|
|
13
|
-
displayName: 'Append
|
|
13
|
+
displayName: 'Append Error Messages During Retries',
|
|
14
14
|
name: 'appendRetryErrorMessages',
|
|
15
15
|
type: 'boolean',
|
|
16
16
|
default: false,
|
|
@@ -84,6 +84,16 @@ exports.optionsProperties = [
|
|
|
84
84
|
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",
|
|
85
85
|
type: 'number',
|
|
86
86
|
},
|
|
87
|
+
{
|
|
88
|
+
displayName: 'Handoff Tools',
|
|
89
|
+
name: 'handoffTools',
|
|
90
|
+
default: '[]',
|
|
91
|
+
description: 'Array of tool names that trigger handoff behavior. When a handoff tool is called, the agent executes all non-handoff tools first, then executes the first matching handoff tool and returns its result directly as output without further LLM processing. Format: ["tool_name_1", "tool_name_2"]. If multiple handoff tools are called, only the first one in this array is executed; others are ignored.',
|
|
92
|
+
type: 'json',
|
|
93
|
+
typeOptions: { rows: 1 },
|
|
94
|
+
validateType: 'array',
|
|
95
|
+
ignoreValidationDuringExecution: true,
|
|
96
|
+
},
|
|
87
97
|
{
|
|
88
98
|
displayName: 'Max Tokens',
|
|
89
99
|
name: 'max_token_completions',
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"options.js","sourceRoot":"","sources":["../../../../../nodes/shared/config/properties/options.ts"],"names":[],"mappings":"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"}
|
|
@@ -34,7 +34,7 @@ exports.outputProperties = [
|
|
|
34
34
|
{
|
|
35
35
|
displayName: 'Structured Output Mode',
|
|
36
36
|
name: 'structuredOutputMode',
|
|
37
|
-
description:
|
|
37
|
+
description: 'Mode used to enforce structured output',
|
|
38
38
|
type: 'options',
|
|
39
39
|
options: [
|
|
40
40
|
{
|
|
@@ -128,6 +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. Usage: Call once, after completing other tool calls, or immediately if none are needed. Never respond with plain text outside this tool.'",
|
|
131
132
|
typeOptions: {
|
|
132
133
|
rows: 1,
|
|
133
134
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"output.js","sourceRoot":"","sources":["../../../../../nodes/shared/config/properties/output.ts"],"names":[],"mappings":";;;AAEa,QAAA,gBAAgB,GAAsB;IAClD;QACC,WAAW,EAAE,iBAAiB;QAC9B,IAAI,EAAE,gBAAgB;QACtB,WAAW,EACV,kcAAkc;QACnc,IAAI,EAAE,SAAS;QACf,gBAAgB,EAAE,IAAI;QACtB,OAAO,EAAE;YACR;gBACC,IAAI,EAAE,YAAY;gBAClB,KAAK,EAAE,WAAW;aAClB;YACD;gBACC,IAAI,EAAE,WAAW;gBACjB,KAAK,EAAE,UAAU;gBACjB,WAAW,EAAE,uDAAuD;aACpE;YACD;gBACC,IAAI,EAAE,qCAAqC;gBAC3C,KAAK,EAAE,wBAAwB;gBAC/B,WAAW,EAAE,wDAAwD;aACrE;YACD;gBACC,IAAI,EAAE,uCAAuC;gBAC7C,KAAK,EAAE,wBAAwB;gBAC/B,WAAW,EAAE,wDAAwD;aACrE;SACD;QACD,OAAO,EAAE,WAAW;KACpB;IACD;QACC,WAAW,EAAE,wBAAwB;QACrC,IAAI,EAAE,sBAAsB;QAC5B,WAAW,EAAE,
|
|
1
|
+
{"version":3,"file":"output.js","sourceRoot":"","sources":["../../../../../nodes/shared/config/properties/output.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,5 +27,6 @@ export interface ExecutionContext {
|
|
|
27
27
|
structuredOutputTool?: OpenAITool;
|
|
28
28
|
validationSchema?: IDataObject;
|
|
29
29
|
shouldValidate: boolean;
|
|
30
|
+
handoffTools: string[];
|
|
30
31
|
}
|
|
31
32
|
export declare function prepareExecutionContext(executeFunctions: IExecuteFunctions, params: ExtractedParameters): Promise<ExecutionContext>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executionSetup.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/execution/executionSetup.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"executionSetup.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/execution/executionSetup.ts"],"names":[],"mappings":";;;AA2HA,0DA+CC;AAvKD,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;AAmDX,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,kBAAkB,GAAG,CAAC;QAC7B,CAAC,MAAM,CAAC,cAAc,KAAK,wBAAwB,IAAI,MAAM,CAAC,cAAc,KAAK,wBAAwB,CAAC,CAAC;IAG5G,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,YAAY,EAAE,MAAM,CAAC,YAAY;KACjC,CAAC;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/execution/executor.ts"],"names":[],"mappings":";;AAYA,
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/execution/executor.ts"],"names":[],"mappings":";;AAYA,4BA8DC;AAvED,mDAAiF;AACjF,+CAAiD;AACjD,qDAA2D;AAC3D,iDAAiD;AACjD,iDAAgE;AAKzD,KAAK,UAAU,QAAQ,CAC7B,gBAAmC,EACnC,MAA2B,EAC3B,QAAgC,EAChC,KAAa,EACb,UAAkB,EAClB,kBAA2B,EAC3B,MAA2B;IAE3B,MAAM,OAAO,GAAG,MAAM,IAAA,wCAAuB,EAAC,gBAAgB,EAAE,MAAM,CAAC,CAAC;IACxE,MAAM,WAAW,GAAG,IAAA,8BAAgB,EACnC,UAAU,EACV,kBAAkB,EAClB,MAAM,CAAC,kBAAkB,EACzB,MAAM,CAAC,0BAA0B,CACjC,CAAC;IAEF,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC9B,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;IAC/C,CAAC;IAED,MAAM,qBAAqB,GAAG,IAAA,0CAA0B,GAAE,CAAC;IAE3D,KAAK,IAAI,UAAU,GAAG,CAAC,EAAE,UAAU,GAAG,WAAW,CAAC,MAAM,EAAE,UAAU,EAAE,EAAE,CAAC;QACxE,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,GAAG,WAAW,CAAC,UAAU,CAAC,CAAC;QACpE,MAAM,WAAW,GAAG,UAAU,KAAK,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC;QAE1D,IAAI,CAAC;YACJ,OAAO,MAAM,IAAA,6CAA8B,EAAC;gBAC3C,gBAAgB;gBAChB,MAAM;gBACN,KAAK;gBACL,YAAY;gBACZ,UAAU;gBACV,QAAQ,EAAE,QAAyB;gBACnC,KAAK,EAAE,OAAO,CAAC,KAAK;gBACpB,WAAW,EAAE,OAAO,CAAC,WAAW;gBAChC,cAAc,EAAE,OAAO,CAAC,cAAc;gBACtC,cAAc,EAAE,OAAO,CAAC,cAAc;gBACtC,oBAAoB,EAAE,OAAO,CAAC,oBAAoB;gBAClD,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;gBAC1C,cAAc,EAAE,OAAO,CAAC,cAAc;gBACtC,wBAAwB,EAAE,MAAM,CAAC,wBAAwB;gBACzD,qBAAqB;gBACrB,MAAM;gBACN,YAAY,EAAE,OAAO,CAAC,YAAY;aAClC,CAAC,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,aAAa,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;YAChF,IAAA,kCAAkB,EAAC,qBAAqB,EAAE,YAAY,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC;YAG/E,IAAI,WAAW,EAAE,CAAC;gBACjB,MAAM,KAAK,CAAC;YACb,CAAC;YAED,MAAM,IAAA,8BAAe,GAAE,CAAC;QACzB,CAAC;IACF,CAAC;IAGD,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;AACjD,CAAC"}
|
|
@@ -19,5 +19,6 @@ export interface ModelAttemptContext {
|
|
|
19
19
|
appendRetryErrorMessages: boolean;
|
|
20
20
|
totalAccumulatedUsage: AccumulatedUsage;
|
|
21
21
|
memory?: BufferWindowMemory;
|
|
22
|
+
handoffTools: string[];
|
|
22
23
|
}
|
|
23
24
|
export declare function executeModelAttemptWithRetries(context: ModelAttemptContext): Promise<INodeExecutionData[]>;
|
|
@@ -11,6 +11,16 @@ const retryHandler_1 = require("./retryHandler");
|
|
|
11
11
|
const usageTracking_1 = require("./usageTracking");
|
|
12
12
|
const responseParser_1 = require("./responseParser");
|
|
13
13
|
const executionHelpers_1 = require("./executionHelpers");
|
|
14
|
+
function unwrapHandoffResult(value) {
|
|
15
|
+
if (Array.isArray(value) && value.length === 1) {
|
|
16
|
+
const innerValue = value[0];
|
|
17
|
+
if (innerValue && typeof innerValue === 'object' && 'output' in innerValue) {
|
|
18
|
+
return innerValue.output;
|
|
19
|
+
}
|
|
20
|
+
return innerValue;
|
|
21
|
+
}
|
|
22
|
+
return value;
|
|
23
|
+
}
|
|
14
24
|
async function executeModelAttemptWithRetries(context) {
|
|
15
25
|
const { executeFunctions, params, index, currentModel, maxRetries, messages, tools, tool_choice, responseFormat, invokableTools, structuredOutputTool, validationSchema, shouldValidate, totalAccumulatedUsage, memory, } = context;
|
|
16
26
|
let retryState = {
|
|
@@ -21,10 +31,25 @@ async function executeModelAttemptWithRetries(context) {
|
|
|
21
31
|
let currentIteration = 1;
|
|
22
32
|
while (true) {
|
|
23
33
|
let body = (0, body_1.prepareRequestBody)(currentModel, messages, tools, tool_choice, responseFormat, params.options, params.customParameters);
|
|
24
|
-
const { response, structuredOutputToolResponse, finalIteration, finalBody, accumulatedUsage } = await (0, executor_1.processToolCalls)(executeFunctions, body, messages, invokableTools, params.maxToolsIterations, structuredOutputTool, params.abortSignal, currentIteration);
|
|
34
|
+
const { response, structuredOutputToolResponse, finalIteration, finalBody, accumulatedUsage, handoffDetected, handoffToolName, handoffToolResult, } = await (0, executor_1.processToolCalls)(executeFunctions, body, messages, invokableTools, params.maxToolsIterations, structuredOutputTool, params.abortSignal, currentIteration, context.handoffTools);
|
|
25
35
|
(0, usageTracking_1.mergeUsageData)(totalAccumulatedUsage, accumulatedUsage);
|
|
26
36
|
currentIteration = finalIteration;
|
|
27
37
|
body = finalBody;
|
|
38
|
+
if (handoffDetected && handoffToolResult !== undefined) {
|
|
39
|
+
let parsedHandoffOutput;
|
|
40
|
+
try {
|
|
41
|
+
parsedHandoffOutput = JSON.parse(handoffToolResult);
|
|
42
|
+
}
|
|
43
|
+
catch {
|
|
44
|
+
parsedHandoffOutput = handoffToolResult;
|
|
45
|
+
}
|
|
46
|
+
const unwrappedOutput = unwrapHandoffResult(parsedHandoffOutput);
|
|
47
|
+
if (memory) {
|
|
48
|
+
await (0, io_1.saveToMemory)(messages, unwrappedOutput, params.saveToolCallsInChatMemory, memory);
|
|
49
|
+
}
|
|
50
|
+
const outputData = await (0, outputData_1.prepareOutputData)(response, { output: unwrappedOutput, handoffs: [handoffToolName] }, messages, messages.length, params.addToOutput, executeFunctions, index, body, totalAccumulatedUsage);
|
|
51
|
+
return outputData;
|
|
52
|
+
}
|
|
28
53
|
if (retryState.attemptNumber === 1) {
|
|
29
54
|
messagesCountBeforeValidationRetries = messages.length;
|
|
30
55
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modelAttempt.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/execution/modelAttempt.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"modelAttempt.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/execution/modelAttempt.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,16 @@ exports.prepareOutputData = prepareOutputData;
|
|
|
4
4
|
exports.reorderOutputFields = reorderOutputFields;
|
|
5
5
|
async function prepareOutputData(response, output, messages, messagesBeforeRetries, addToOutput, executeFunctions, index, body, accumulatedUsage) {
|
|
6
6
|
const outputData = [];
|
|
7
|
-
|
|
7
|
+
const isHandoff = output && typeof output === 'object' && 'handoffs' in output && 'output' in output;
|
|
8
|
+
if (isHandoff) {
|
|
9
|
+
outputData.push({
|
|
10
|
+
json: { output: output.output, handoffs: output.handoffs },
|
|
11
|
+
pairedItem: { item: index },
|
|
12
|
+
});
|
|
13
|
+
}
|
|
14
|
+
else {
|
|
15
|
+
outputData.push({ json: { output: output }, pairedItem: { item: index } });
|
|
16
|
+
}
|
|
8
17
|
if (addToOutput.includes('fullResponse')) {
|
|
9
18
|
outputData.forEach((item) => {
|
|
10
19
|
item.json.response = response;
|
|
@@ -26,9 +35,11 @@ async function prepareOutputData(response, output, messages, messagesBeforeRetri
|
|
|
26
35
|
}
|
|
27
36
|
const finalMessage = response === null || response === void 0 ? void 0 : response.choices[0].message;
|
|
28
37
|
if (finalMessage) {
|
|
38
|
+
const isHandoff = output && typeof output === 'object' && 'handoffs' in output && 'output' in output;
|
|
39
|
+
const contentValue = isHandoff ? output.output : output;
|
|
29
40
|
let rootMessage = {
|
|
30
41
|
role: finalMessage.role,
|
|
31
|
-
content: typeof
|
|
42
|
+
content: typeof contentValue === 'string' ? contentValue : JSON.stringify(contentValue),
|
|
32
43
|
reasoning: finalMessage.reasoning,
|
|
33
44
|
reasoning_details: finalMessage.reasoning_details,
|
|
34
45
|
};
|
|
@@ -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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"}
|
|
@@ -28,7 +28,9 @@ function prepareRequestBody(model, messages, tools, tool_choice, response_format
|
|
|
28
28
|
'maxToolsIterations',
|
|
29
29
|
'tenacityMaxRetries',
|
|
30
30
|
'fallbackModelId',
|
|
31
|
-
'fallbackTenacityMaxRetries'
|
|
31
|
+
'fallbackTenacityMaxRetries',
|
|
32
|
+
'handoffTools',
|
|
33
|
+
'appendRetryErrorMessages',
|
|
32
34
|
]);
|
|
33
35
|
const body = {
|
|
34
36
|
model,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"body.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/request/body.ts"],"names":[],"mappings":";;;;;AAOA,
|
|
1
|
+
{"version":3,"file":"body.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/request/body.ts"],"names":[],"mappings":";;;;;AAOA,gDAoDC;AA1DD,uDAAgC;AAChC,6CAAqD;AAKrD,SAAgB,kBAAkB,CACjC,KAAa,EACb,QAAuB,EACvB,KAAY,EACZ,WAA6C,EAC7C,eAAwC,EACxC,OAAoB,EACpB,gBAAsC;IAGtC,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;IAEF,IAAI,eAAe,GAAgB,EAAE,CAAC;IACtC,IAAI,gBAAgB,EAAE,CAAC;QACtB,IAAI,OAAO,gBAAgB,KAAK,QAAQ,IAAI,gBAAgB,CAAC,IAAI,EAAE,EAAE,CAAC;YACrE,IAAI,CAAC;gBACJ,eAAe,GAAG,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;YAChD,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAChB,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;YACrD,CAAC;QACF,CAAC;aAAM,IAAI,OAAO,gBAAgB,KAAK,QAAQ,EAAE,CAAC;YACjD,eAAe,GAAG,gBAAgB,CAAC;QACpC,CAAC;IACF,CAAC;IAGD,MAAM,YAAY,GAAG,IAAA,cAAK,EAAC,OAAO,EAAE;QACnC,kBAAkB;QAClB,oBAAoB;QACpB,oBAAoB;QACpB,iBAAiB;QACjB,4BAA4B;QAC5B,cAAc;QACd,0BAA0B;KAC1B,CAAC,CAAC;IAEH,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,GAAG,YAAY;QACf,GAAG,eAAe;KAClB,CAAC;IAEF,OAAO,IAAI,CAAC;AACb,CAAC"}
|
|
@@ -1,10 +1,13 @@
|
|
|
1
1
|
import type { IExecuteFunctions, IDataObject } from 'n8n-workflow';
|
|
2
2
|
import type { ChatCompletion, AccumulatedUsage } from '../../api/types';
|
|
3
3
|
import type { InvokableTool } from '../execution/executionSetup';
|
|
4
|
-
export declare function processToolCalls(executeFunctions: IExecuteFunctions, body: IDataObject, messages: IDataObject[], invokableTools: InvokableTool[], maxToolsIterations: number, structuredOutputTool?: IDataObject, abortSignal?: AbortSignal, startingIteration?: number): Promise<{
|
|
4
|
+
export declare function processToolCalls(executeFunctions: IExecuteFunctions, body: IDataObject, messages: IDataObject[], invokableTools: InvokableTool[], maxToolsIterations: number, structuredOutputTool?: IDataObject, abortSignal?: AbortSignal, startingIteration?: number, handoffTools?: string[]): Promise<{
|
|
5
5
|
response: ChatCompletion;
|
|
6
6
|
structuredOutputToolResponse: any;
|
|
7
7
|
finalIteration: number;
|
|
8
8
|
finalBody: IDataObject;
|
|
9
9
|
accumulatedUsage: AccumulatedUsage;
|
|
10
|
+
handoffDetected?: boolean;
|
|
11
|
+
handoffToolName?: string;
|
|
12
|
+
handoffToolResult?: string;
|
|
10
13
|
}>;
|
|
@@ -60,7 +60,7 @@ function accumulateUsage(accumulated, newUsage) {
|
|
|
60
60
|
}
|
|
61
61
|
return accumulated;
|
|
62
62
|
}
|
|
63
|
-
async function processToolCalls(executeFunctions, body, messages, invokableTools, maxToolsIterations, structuredOutputTool, abortSignal, startingIteration = 1) {
|
|
63
|
+
async function processToolCalls(executeFunctions, body, messages, invokableTools, maxToolsIterations, structuredOutputTool, abortSignal, startingIteration = 1, handoffTools = []) {
|
|
64
64
|
var _a, _b, _c, _d, _e, _f;
|
|
65
65
|
const accumulatedUsage = {
|
|
66
66
|
prompt_tokens: 0,
|
|
@@ -91,6 +91,9 @@ async function processToolCalls(executeFunctions, body, messages, invokableTools
|
|
|
91
91
|
let currentIteration = startingIteration;
|
|
92
92
|
var structuredOutputToolResponse = null;
|
|
93
93
|
const processedToolCallIds = new Set();
|
|
94
|
+
let handoffDetected = false;
|
|
95
|
+
let handoffToolName;
|
|
96
|
+
let handoffToolResult;
|
|
94
97
|
while (toolCalls === null || toolCalls === void 0 ? void 0 : toolCalls.length) {
|
|
95
98
|
const maxIterationsReached = maxToolsIterations >= 0 && currentIteration > maxToolsIterations;
|
|
96
99
|
if (abortSignal === null || abortSignal === void 0 ? void 0 : abortSignal.aborted) {
|
|
@@ -143,7 +146,22 @@ async function processToolCalls(executeFunctions, body, messages, invokableTools
|
|
|
143
146
|
}
|
|
144
147
|
break;
|
|
145
148
|
}
|
|
146
|
-
|
|
149
|
+
let reorderedToolCalls = toolCalls;
|
|
150
|
+
let handoffToolToProcess;
|
|
151
|
+
if (handoffTools.length > 0) {
|
|
152
|
+
for (const handoffToolName of handoffTools) {
|
|
153
|
+
const foundHandoffTool = toolCalls.find((tc) => tc.function.name === handoffToolName);
|
|
154
|
+
if (foundHandoffTool) {
|
|
155
|
+
handoffToolToProcess = foundHandoffTool;
|
|
156
|
+
break;
|
|
157
|
+
}
|
|
158
|
+
}
|
|
159
|
+
if (handoffToolToProcess) {
|
|
160
|
+
const nonHandoffTools = toolCalls.filter((tc) => !handoffTools.includes(tc.function.name));
|
|
161
|
+
reorderedToolCalls = [...nonHandoffTools, handoffToolToProcess];
|
|
162
|
+
}
|
|
163
|
+
}
|
|
164
|
+
for (const toolCall of reorderedToolCalls) {
|
|
147
165
|
const calledFunctionName = toolCall.function.name;
|
|
148
166
|
const calledFunctionArgs = toolCall.function.arguments;
|
|
149
167
|
const toolCallId = toolCall.id;
|
|
@@ -189,7 +207,8 @@ async function processToolCalls(executeFunctions, body, messages, invokableTools
|
|
|
189
207
|
if (structuredOutputToolResponse) {
|
|
190
208
|
break;
|
|
191
209
|
}
|
|
192
|
-
|
|
210
|
+
const isHandoffTool = handoffToolToProcess && toolCall.id === handoffToolToProcess.id;
|
|
211
|
+
if (reorderedToolCalls.indexOf(toolCall) === 0) {
|
|
193
212
|
messages.push(response.choices[0].message);
|
|
194
213
|
}
|
|
195
214
|
var toolContent = typeof content === 'string' ? (() => { try {
|
|
@@ -198,6 +217,17 @@ async function processToolCalls(executeFunctions, body, messages, invokableTools
|
|
|
198
217
|
catch {
|
|
199
218
|
return content;
|
|
200
219
|
} })() : JSON.stringify(content);
|
|
220
|
+
if (isHandoffTool) {
|
|
221
|
+
handoffDetected = true;
|
|
222
|
+
handoffToolName = calledFunctionName;
|
|
223
|
+
handoffToolResult = toolContent;
|
|
224
|
+
messages.push({
|
|
225
|
+
tool_call_id: toolCallId,
|
|
226
|
+
role: 'tool',
|
|
227
|
+
content: 'success',
|
|
228
|
+
});
|
|
229
|
+
break;
|
|
230
|
+
}
|
|
201
231
|
messages.push({
|
|
202
232
|
tool_call_id: toolCallId,
|
|
203
233
|
role: 'tool',
|
|
@@ -207,6 +237,9 @@ async function processToolCalls(executeFunctions, body, messages, invokableTools
|
|
|
207
237
|
if (structuredOutputToolResponse) {
|
|
208
238
|
break;
|
|
209
239
|
}
|
|
240
|
+
if (handoffDetected) {
|
|
241
|
+
break;
|
|
242
|
+
}
|
|
210
243
|
finalBody = {
|
|
211
244
|
...body,
|
|
212
245
|
messages: messages,
|
|
@@ -229,6 +262,15 @@ async function processToolCalls(executeFunctions, body, messages, invokableTools
|
|
|
229
262
|
toolCalls = response.choices[0].message.tool_calls;
|
|
230
263
|
currentIteration += 1;
|
|
231
264
|
}
|
|
232
|
-
return {
|
|
265
|
+
return {
|
|
266
|
+
response,
|
|
267
|
+
structuredOutputToolResponse,
|
|
268
|
+
finalIteration: currentIteration,
|
|
269
|
+
finalBody,
|
|
270
|
+
accumulatedUsage,
|
|
271
|
+
handoffDetected,
|
|
272
|
+
handoffToolName,
|
|
273
|
+
handoffToolResult,
|
|
274
|
+
};
|
|
233
275
|
}
|
|
234
276
|
//# sourceMappingURL=executor.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/tools/executor.ts"],"names":[],"mappings":";;AAsFA,
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/tools/executor.ts"],"names":[],"mappings":";;AAsFA,4CAiTC;AAtYD,+CAAyC;AACzC,iEAA8D;AAO9D,SAAS,eAAe,CACvB,WAA6B,EAC7B,QAAiC;IAGjC,MAAM,YAAY,GAAG,CAAC,MAAW,EAAE,MAAW,EAAE,EAAE;QACjD,IAAI,CAAC,MAAM;YAAE,OAAO;QACpB,KAAK,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;YAC1B,IAAI,OAAO,MAAM,CAAC,GAAG,CAAC,KAAK,QAAQ,EAAE,CAAC;gBAErC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;YAChD,CAAC;iBAAM,IAAI,MAAM,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC;gBAEjC,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;YACpB,CAAC;iBAAM,IAAI,OAAO,MAAM,CAAC,GAAG,CAAC,KAAK,SAAS,EAAE,CAAC;gBAE7C,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC;YAC1C,CAAC;iBAAM,IAAI,OAAO,MAAM,CAAC,GAAG,CAAC,KAAK,QAAQ,IAAI,MAAM,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC;gBAEpE,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;gBAChC,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;YACxC,CAAC;iBAAM,IAAI,MAAM,CAAC,GAAG,CAAC,KAAK,SAAS,EAAE,CAAC;gBAEtC,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;YAC3B,CAAC;QACF,CAAC;IACF,CAAC,CAAC;IAGF,WAAW,CAAC,aAAa,IAAI,QAAQ,CAAC,aAAa,IAAI,CAAC,CAAC;IACzD,WAAW,CAAC,iBAAiB,IAAI,QAAQ,CAAC,iBAAiB,IAAI,CAAC,CAAC;IACjE,WAAW,CAAC,YAAY,IAAI,QAAQ,CAAC,YAAY,IAAI,CAAC,CAAC;IAGvD,IAAI,QAAQ,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QACjC,WAAW,CAAC,IAAI,GAAG,CAAC,WAAW,CAAC,IAAI,IAAI,CAAC,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC;IAC5D,CAAC;IAGD,IAAI,QAAQ,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;QACpC,WAAW,CAAC,OAAO,GAAG,WAAW,CAAC,OAAO,IAAI,QAAQ,CAAC,OAAO,CAAC;IAC/D,CAAC;IAGD,IAAI,QAAQ,CAAC,qBAAqB,EAAE,CAAC;QACpC,WAAW,CAAC,qBAAqB,GAAG,WAAW,CAAC,qBAAqB,IAAI,EAAE,CAAC;QAC5E,YAAY,CAAC,WAAW,CAAC,qBAAqB,EAAE,QAAQ,CAAC,qBAAqB,CAAC,CAAC;IACjF,CAAC;IAED,IAAI,QAAQ,CAAC,YAAY,EAAE,CAAC;QAC3B,WAAW,CAAC,YAAY,GAAG,WAAW,CAAC,YAAY,IAAI,EAAE,CAAC;QAC1D,YAAY,CAAC,WAAW,CAAC,YAAY,EAAE,QAAQ,CAAC,YAAY,CAAC,CAAC;IAC/D,CAAC;IAED,IAAI,QAAQ,CAAC,yBAAyB,EAAE,CAAC;QACxC,WAAW,CAAC,yBAAyB,GAAG,WAAW,CAAC,yBAAyB,IAAI,EAAE,CAAC;QACpF,YAAY,CAAC,WAAW,CAAC,yBAAyB,EAAE,QAAQ,CAAC,yBAAyB,CAAC,CAAC;IACzF,CAAC;IAGD,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;QAC5B,IAAI,CAAC,CAAC,eAAe,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,EAAE,SAAS;YAC5E,uBAAuB,EAAE,cAAc,EAAE,2BAA2B,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACtF,IAAI,OAAO,QAAQ,CAAC,GAAG,CAAC,KAAK,QAAQ,EAAE,CAAC;gBACvC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;YAC5D,CAAC;iBAAM,IAAI,WAAW,CAAC,GAAG,CAAC,KAAK,SAAS,EAAE,CAAC;gBAC3C,WAAW,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;YAClC,CAAC;QACF,CAAC;IACF,CAAC;IAED,OAAO,WAAW,CAAC;AACpB,CAAC;AAKM,KAAK,UAAU,gBAAgB,CACrC,gBAAmC,EACnC,IAAiB,EACjB,QAAuB,EACvB,cAA+B,EAC/B,kBAA0B,EAC1B,oBAAkC,EAClC,WAAyB,EACzB,oBAA4B,CAAC,EAC7B,eAAyB,EAAE;;IAY3B,MAAM,gBAAgB,GAAqB;QAC1C,aAAa,EAAE,CAAC;QAChB,iBAAiB,EAAE,CAAC;QACpB,YAAY,EAAE,CAAC;QACf,cAAc,EAAE,CAAC;QACjB,gBAAgB,EAAE,CAAC;QACnB,eAAe,EAAE,EAAE;KACnB,CAAC;IAEF,IAAI,SAAS,GAAG,IAAI,CAAC;IACrB,IAAI,QAAwB,CAAC;IAE7B,IAAI,CAAC;QACJ,QAAQ,GAAG,CAAC,MAAM,mCAAgB,CAAC,IAAI,CAAC,gBAAgB,EAAE,MAAM,EAAE,mBAAmB,EAAE;YACtF,IAAI,EAAE,SAAS;SACf,CAAC,CAAmB,CAAC;QAGtB,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC;YACpB,eAAe,CAAC,gBAAgB,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC;YAClD,gBAAgB,CAAC,cAAc,EAAE,CAAC;QACnC,CAAC;IACF,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAEhB,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;IAGD,IAAI,SAAS,GAAG,MAAA,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,OAAO,CAAC,CAAC,CAAC,0CAAE,OAAO,0CAAE,UAAU,CAAC;IAC1D,IAAI,gBAAgB,GAAG,iBAAiB,CAAC;IACzC,IAAI,4BAA4B,GAAG,IAAI,CAAC;IAGxC,MAAM,oBAAoB,GAAG,IAAI,GAAG,EAAU,CAAC;IAG/C,IAAI,eAAe,GAAG,KAAK,CAAC;IAC5B,IAAI,eAAmC,CAAC;IACxC,IAAI,iBAAqC,CAAC;IAE1C,OAAO,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,MAAM,EAAE,CAAC;QAE1B,MAAM,oBAAoB,GAAG,kBAAkB,IAAI,CAAC,IAAI,gBAAgB,GAAG,kBAAkB,CAAC;QAG9F,IAAI,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,OAAO,EAAE,CAAC;YAC1B,MAAM;QACP,CAAC;QAGD,IAAI,oBAAoB,EAAE,CAAC;YAE1B,IAAI,oBAAoB,IAAI,CAAC,4BAA4B,EAAE,CAAC;gBAE3D,SAAS,GAAG;oBACX,GAAG,IAAI;oBACP,QAAQ,EAAE,QAAQ;oBAClB,KAAK,EAAE,CAAC,oBAAoB,CAAC;oBAC7B,WAAW,EAAE;wBACZ,IAAI,EAAE,UAAU;wBAChB,QAAQ,EAAE,EAAE,IAAI,EAAG,oBAAoB,CAAC,QAAwB,CAAC,IAAc,EAAE;qBACjF;iBACD,CAAC;YACH,CAAC;iBAAM,CAAC;gBAEP,SAAS,GAAG;oBACX,GAAG,IAAI;oBACP,QAAQ,EAAE,QAAQ;oBAClB,KAAK,EAAE,EAAE;oBACT,WAAW,EAAE,SAAS;iBACtB,CAAC;YACH,CAAC;YAGD,IAAI,CAAC;gBACJ,QAAQ,GAAG,CAAC,MAAM,mCAAgB,CAAC,IAAI,CAAC,gBAAgB,EAAE,MAAM,EAAE,mBAAmB,EAAE;oBACtF,IAAI,EAAE,SAAS;iBACf,CAAC,CAAmB,CAAC;gBAGtB,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC;oBACpB,eAAe,CAAC,gBAAgB,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC;oBAClD,gBAAgB,CAAC,cAAc,EAAE,CAAC;gBACnC,CAAC;YACF,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAEhB,MAAM,KAAK,GAAI,SAAS,CAAC,KAAgB,IAAI,SAAS,CAAC;gBACvD,MAAM,YAAY,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;gBAC5E,gBAAgB,CAAC,eAAgB,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,CAAC;gBACvE,MAAM,KAAK,CAAC;YACb,CAAC;YAGD,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;gBAC1G,MAAM,cAAc,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC;gBAC9D,KAAK,MAAM,QAAQ,IAAI,cAAc,EAAE,CAAC;oBACvC,IACG,oBAAoB,CAAC,QAAwB,CAAC,IAAe;wBAC/D,QAAQ,CAAC,QAAQ,CAAC,IAAI,EACrB,CAAC;wBACF,4BAA4B,GAAG,QAAQ,CAAC,QAAQ,CAAC,SAAS,CAAC;wBAC3D,MAAM;oBACP,CAAC;gBACF,CAAC;YACF,CAAC;YAED,MAAM;QACP,CAAC;QAGD,IAAI,kBAAkB,GAAG,SAAS,CAAC;QACnC,IAAI,oBAAqD,CAAC;QAE1D,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAE7B,KAAK,MAAM,eAAe,IAAI,YAAY,EAAE,CAAC;gBAC5C,MAAM,gBAAgB,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,KAAK,eAAe,CAAC,CAAC;gBACtF,IAAI,gBAAgB,EAAE,CAAC;oBACtB,oBAAoB,GAAG,gBAAgB,CAAC;oBACxC,MAAM;gBACP,CAAC;YACF,CAAC;YAED,IAAI,oBAAoB,EAAE,CAAC;gBAE1B,MAAM,eAAe,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;gBAE3F,kBAAkB,GAAG,CAAC,GAAG,eAAe,EAAE,oBAAoB,CAAC,CAAC;YACjE,CAAC;QACF,CAAC;QAGD,KAAK,MAAM,QAAQ,IAAI,kBAAkB,EAAE,CAAC;YAC3C,MAAM,kBAAkB,GAAG,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC;YAClD,MAAM,kBAAkB,GAAG,QAAQ,CAAC,QAAQ,CAAC,SAAS,CAAC;YACvD,MAAM,UAAU,GAAG,QAAQ,CAAC,EAAE,CAAC;YAG/B,IAAI,oBAAoB,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;gBAC1C,OAAO,CAAC,GAAG,CAAC,oCAAoC,UAAU,EAAE,CAAC,CAAC;gBAC9D,SAAS;YACV,CAAC;YACD,oBAAoB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YAGrC,IAAI,OAAO,GAAkB,IAAI,CAAC;YAClC,IAAI,SAAS,GAAG,KAAK,CAAC;YAEtB,IAAI,CAAC;gBACJ,KAAK,MAAM,aAAa,IAAI,cAAc,aAAd,cAAc,cAAd,cAAc,GAAI,EAAE,EAAE,CAAC;oBAElD,IACC,oBAAoB;wBAClB,oBAAoB,CAAC,QAAwB,CAAC,IAAe,KAAK,kBAAkB,EACrF,CAAC;wBACF,4BAA4B,GAAG,kBAAkB,CAAC;wBAClD,SAAS,GAAG,IAAI,CAAC;wBACjB,MAAM;oBACP,CAAC;oBAED,IAAI,aAAa,CAAC,IAAI,KAAK,kBAAkB,EAAE,CAAC;wBAE/C,IAAI,QAAQ,IAAI,aAAa,IAAI,OAAO,aAAa,CAAC,MAAM,KAAK,UAAU,EAAE,CAAC;4BAE7E,MAAM,UAAU,GAAsB,IAAA,wBAAS,EAAC,kBAAkB,CAAC,CAAC;4BAGpE,OAAO,GAAG,MAAM,aAAa,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;4BAGjD,OAAO;gCACN,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,OAAO,CAAA,MAAA,OAAO,CAAC,CAAC,CAAC,0CAAE,IAAI,CAAA,KAAK,QAAQ;oCAC7D,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI;oCACjB,CAAC,CAAC,OAAO,CAAC;wBACb,CAAC;6BAAM,CAAC;4BAEP,OAAO,GAAG,IAAI,CAAC;wBAChB,CAAC;wBAED,SAAS,GAAG,IAAI,CAAC;wBACjB,MAAM;oBACP,CAAC;gBACF,CAAC;gBAED,IAAI,CAAC,SAAS,EAAE,CAAC;oBAChB,OAAO,GAAG,gBAAgB,kBAAkB,gCAAgC,CAAC;oBAC7E,OAAO,CAAC,KAAK,CAAC,mBAAmB,kBAAkB,EAAE,CAAC,CAAC;gBACxD,CAAC;YACF,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAChB,OAAO,GAAG,yBAAyB,kBAAkB,MAAM,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;YACrH,CAAC;YAED,IAAI,4BAA4B,EAAE,CAAC;gBAClC,MAAM;YACP,CAAC;YAGD,MAAM,aAAa,GAAG,oBAAoB,IAAI,QAAQ,CAAC,EAAE,KAAK,oBAAoB,CAAC,EAAE,CAAC;YAGtF,IAAI,kBAAkB,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;gBAChD,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;YAC5C,CAAC;YAGD,IAAI,WAAW,GAAG,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;gBAAC,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;YAAC,CAAC;YAAC,MAAM,CAAC;gBAAC,OAAO,OAAO,CAAC;YAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAA;YAGrK,IAAI,aAAa,EAAE,CAAC;gBACnB,eAAe,GAAG,IAAI,CAAC;gBACvB,eAAe,GAAG,kBAAkB,CAAC;gBACrC,iBAAiB,GAAG,WAAW,CAAC;gBAGhC,QAAQ,CAAC,IAAI,CAAC;oBACb,YAAY,EAAE,UAAU;oBACxB,IAAI,EAAE,MAAM;oBACZ,OAAO,EAAE,SAAS;iBAClB,CAAC,CAAC;gBAGH,MAAM;YACP,CAAC;YAGD,QAAQ,CAAC,IAAI,CAAC;gBACb,YAAY,EAAE,UAAU;gBACxB,IAAI,EAAE,MAAM;gBACZ,OAAO,EAAE,WAAW;aACpB,CAAC,CAAC;QACJ,CAAC;QAED,IAAI,4BAA4B,EAAE,CAAC;YAClC,MAAM;QACP,CAAC;QAGD,IAAI,eAAe,EAAE,CAAC;YACrB,MAAM;QACP,CAAC;QAGD,SAAS,GAAG;YACX,GAAG,IAAI;YACP,QAAQ,EAAE,QAAQ;SAClB,CAAC;QAGF,IAAI,CAAC;YACJ,QAAQ,GAAG,CAAC,MAAM,mCAAgB,CAAC,IAAI,CAAC,gBAAgB,EAAE,MAAM,EAAE,mBAAmB,EAAE;gBACtF,IAAI,EAAE,SAAS;aACf,CAAC,CAAmB,CAAC;YAGtB,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC;gBACpB,eAAe,CAAC,gBAAgB,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC;gBAClD,gBAAgB,CAAC,cAAc,EAAE,CAAC;YACnC,CAAC;QACF,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAEhB,MAAM,KAAK,GAAI,SAAS,CAAC,KAAgB,IAAI,SAAS,CAAC;YACvD,MAAM,YAAY,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAC5E,gBAAgB,CAAC,eAAgB,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,CAAC;YACvE,MAAM,KAAK,CAAC;QACb,CAAC;QAGD,SAAS,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC;QACnD,gBAAgB,IAAI,CAAC,CAAC;IACvB,CAAC;IAED,OAAO;QACN,QAAQ;QACR,4BAA4B;QAC5B,cAAc,EAAE,gBAAgB;QAChC,SAAS;QACT,gBAAgB;QAChB,eAAe;QACf,eAAe;QACf,iBAAiB;KACjB,CAAC;AACH,CAAC"}
|