n8n-nodes-simple 3.2.0 → 3.2.1
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/properties/output.js +3 -2
- package/dist/nodes/shared/config/properties/output.js.map +1 -1
- package/dist/nodes/shared/core/request/constants.d.ts +1 -1
- package/dist/nodes/shared/core/request/constants.js +1 -1
- package/dist/nodes/shared/core/request/constants.js.map +1 -1
- package/dist/nodes/shared/core/tools/executor.js +12 -0
- package/dist/nodes/shared/core/tools/executor.js.map +1 -1
- package/dist/nodes/shared/core/tools/setup.js +1 -6
- package/dist/nodes/shared/core/tools/setup.js.map +1 -1
- package/dist/package.json +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.outputProperties = void 0;
|
|
4
|
+
const constants_1 = require("../../core/request/constants");
|
|
4
5
|
exports.outputProperties = [
|
|
5
6
|
{
|
|
6
7
|
displayName: 'Response Format',
|
|
@@ -38,7 +39,7 @@ exports.outputProperties = [
|
|
|
38
39
|
type: 'options',
|
|
39
40
|
options: [
|
|
40
41
|
{
|
|
41
|
-
name: '
|
|
42
|
+
name: 'Native',
|
|
42
43
|
value: 'native',
|
|
43
44
|
description: 'Uses json_schema response format',
|
|
44
45
|
},
|
|
@@ -128,7 +129,7 @@ exports.outputProperties = [
|
|
|
128
129
|
name: 'structuredOutputDescription',
|
|
129
130
|
type: 'string',
|
|
130
131
|
default: '',
|
|
131
|
-
description:
|
|
132
|
+
description: `In Tools Mode, the structured output description should be something like: '${constants_1.DEFAULT_STRUCTURED_OUTPUT_TOOL_DESCRIPTION}'. In Native Mode, the structured output description should be something like: '${constants_1.DEFAULT_STRUCTURED_OUTPUT_DESCRIPTION}'.`,
|
|
132
133
|
typeOptions: {
|
|
133
134
|
rows: 1,
|
|
134
135
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"output.js","sourceRoot":"","sources":["../../../../../nodes/shared/config/properties/output.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"output.js","sourceRoot":"","sources":["../../../../../nodes/shared/config/properties/output.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export declare const DEFAULT_STRUCTURED_OUTPUT_DESCRIPTION = "Return valid JSON matching this schema.";
|
|
2
|
-
export declare const DEFAULT_STRUCTURED_OUTPUT_TOOL_DESCRIPTION = "
|
|
2
|
+
export declare const DEFAULT_STRUCTURED_OUTPUT_TOOL_DESCRIPTION = "Send your response to the user.\n\nUsage:\n- Call after other tool calls are complete, or immediately if no other tool calls are needed.\n- Never respond outside this tool.";
|
|
@@ -2,5 +2,5 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.DEFAULT_STRUCTURED_OUTPUT_TOOL_DESCRIPTION = exports.DEFAULT_STRUCTURED_OUTPUT_DESCRIPTION = void 0;
|
|
4
4
|
exports.DEFAULT_STRUCTURED_OUTPUT_DESCRIPTION = 'Return valid JSON matching this schema.';
|
|
5
|
-
exports.DEFAULT_STRUCTURED_OUTPUT_TOOL_DESCRIPTION = '
|
|
5
|
+
exports.DEFAULT_STRUCTURED_OUTPUT_TOOL_DESCRIPTION = 'Send your response to the user.\n\nUsage:\n- Call after other tool calls are complete, or immediately if no other tool calls are needed.\n- Never respond outside this tool.';
|
|
6
6
|
//# sourceMappingURL=constants.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/request/constants.ts"],"names":[],"mappings":";;;AAQa,QAAA,qCAAqC,GAAG,yCAAyC,CAAC;AAMlF,QAAA,0CAA0C,GACtD,
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/request/constants.ts"],"names":[],"mappings":";;;AAQa,QAAA,qCAAqC,GAAG,yCAAyC,CAAC;AAMlF,QAAA,0CAA0C,GACtD,8KAA8K,CAAC"}
|
|
@@ -16,6 +16,18 @@ async function processToolCalls(executeFunctions, body, messages, invokableTools
|
|
|
16
16
|
retried_requests: 0,
|
|
17
17
|
failed_requests: [],
|
|
18
18
|
};
|
|
19
|
+
const maxIterationsReachedImmediately = maxToolsIterations >= 0 && startingIteration > maxToolsIterations;
|
|
20
|
+
if (maxIterationsReachedImmediately && structuredOutputTool) {
|
|
21
|
+
const result = await (0, maxIterationsHandler_1.handleMaxIterationsReached)(executeFunctions, body, messages, structuredOutputTool, null, accumulatedUsage, apiMode, preserveReasoning);
|
|
22
|
+
return {
|
|
23
|
+
response: result.response,
|
|
24
|
+
structuredOutputToolResponse: result.structuredOutputToolResponse,
|
|
25
|
+
finalIteration: startingIteration,
|
|
26
|
+
finalBody: body,
|
|
27
|
+
accumulatedUsage,
|
|
28
|
+
handoffDetected: false,
|
|
29
|
+
};
|
|
30
|
+
}
|
|
19
31
|
let finalBody = preserveReasoning !== 'all'
|
|
20
32
|
? { ...body, messages: (0, types_1.filterMessagesReasoning)(body.messages, preserveReasoning) }
|
|
21
33
|
: body;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/tools/executor.ts"],"names":[],"mappings":";;AAYA,
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/tools/executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -42,16 +42,11 @@ async function prepareTools(executeFunctions, structuredOutputMode, maxToolsIter
|
|
|
42
42
|
}
|
|
43
43
|
if (structuredOutputMode === 'tools' && responseFormat && responseFormat.json_schema) {
|
|
44
44
|
const jsonSchema = responseFormat.json_schema;
|
|
45
|
-
const userDescription = jsonSchema.description;
|
|
46
|
-
const shouldUseToolDescription = !userDescription ||
|
|
47
|
-
userDescription === constants_1.DEFAULT_STRUCTURED_OUTPUT_DESCRIPTION;
|
|
48
45
|
structuredOutputTool = {
|
|
49
46
|
type: 'function',
|
|
50
47
|
function: {
|
|
51
48
|
name: jsonSchema.name,
|
|
52
|
-
description:
|
|
53
|
-
? constants_1.DEFAULT_STRUCTURED_OUTPUT_TOOL_DESCRIPTION
|
|
54
|
-
: userDescription,
|
|
49
|
+
description: jsonSchema.description || constants_1.DEFAULT_STRUCTURED_OUTPUT_TOOL_DESCRIPTION,
|
|
55
50
|
parameters: jsonSchema.schema,
|
|
56
51
|
strict: true,
|
|
57
52
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/tools/setup.ts"],"names":[],"mappings":";;AAUA,
|
|
1
|
+
{"version":3,"file":"setup.js","sourceRoot":"","sources":["../../../../../nodes/shared/core/tools/setup.ts"],"names":[],"mappings":";;AAUA,oCA4EC;AApFD,2CAAgD;AAChD,2CAAqD;AACrD,oDAAkF;AAM3E,KAAK,UAAU,YAAY,CACjC,gBAAmC,EACnC,oBAAwC,EACxC,kBAA0B,EAC1B,cAA4B;IAO5B,IAAI,KAAK,GAAiB,EAAE,CAAC;IAC7B,IAAI,aAAa,GAAW,EAAE,CAAC;IAC/B,MAAM,kBAAkB,GAAG,IAAI,CAAC;IAChC,IAAI,WAAW,GAAqC,SAAS,CAAC;IAC9D,IAAI,oBAAoB,GAA2B,SAAS,CAAC;IAE7D,IAAI,CAAC;QACJ,aAAa,GAAG,MAAM,IAAA,6BAAiB,EAAC,gBAAgB,EAAE,kBAAkB,EAAE,KAAK,CAAC,CAAC;IACtF,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,OAAO,CAAC,KAAK,CAAC,gCAAgC,EAAE,KAAK,CAAC,CAAC;QAEvD,OAAO,CAAC,KAAK,CAAC,kCAAkC,CAAC,CAAC;QAClD,aAAa,GAAG,EAAE,CAAC;IACpB,CAAC;IAED,IAAI,cAAc,GAAoB,EAAE,CAAC;IAEzC,IAAI,aAAa,CAAC,MAAM,EAAE,CAAC;QAE1B,KAAK,MAAM,IAAI,IAAI,aAAa,EAAE,CAAC;YAElC,IAAI,OAAO,IAAI,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;gBAClD,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;oBAClC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBAC9B,CAAC;YACF,CAAC;iBAAM,CAAC;gBACP,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC3B,CAAC;QACF,CAAC;IACF,CAAC;IAGD,IAAI,kBAAkB,KAAK,CAAC,EAAE,CAAC;QAC9B,KAAK,GAAG,EAAE,CAAC;QACX,cAAc,GAAG,EAAE,CAAC;IACrB,CAAC;SAAM,CAAC;QAEP,KAAK,GAAG,cAAc;aACpB,MAAM,CAAC,CAAC,IAAI,EAAgB,EAAE,CAAC,QAAQ,IAAI,IAAI,CAAC;aAChD,GAAG,CAAC,0BAAkB,CAAiB,CAAC;IAC3C,CAAC;IAED,IAAI,oBAAoB,KAAK,OAAO,IAAI,cAAc,IAAI,cAAc,CAAC,WAAW,EAAE,CAAC;QACtF,MAAM,UAAU,GAAG,cAAc,CAAC,WAA0B,CAAC;QAE7D,oBAAoB,GAAG;YACtB,IAAI,EAAE,UAAmB;YACzB,QAAQ,EAAE;gBACT,IAAI,EAAE,UAAU,CAAC,IAAc;gBAC/B,WAAW,EAAE,UAAU,CAAC,WAAqB,IAAI,sDAA0C;gBAC3F,UAAU,EAAE,UAAU,CAAC,MAAqB;gBAC5C,MAAM,EAAE,IAAI;aACZ;SACD,CAAC;QACF,KAAK,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QACjC,cAAc,CAAC,IAAI,CAAC,EAAE,IAAI,EAAG,oBAAoB,CAAC,QAAwB,CAAC,IAAc,EAAE,CAAC,CAAC;QAC7F,WAAW,GAAG,UAAU,CAAC;IAC1B,CAAC;IAED,OAAO;QACN,KAAK;QACL,cAAc;QACd,WAAW;QACX,oBAAoB;KACpB,CAAC;AACH,CAAC"}
|