n8n-nodes-simple 4.2.0 → 4.3.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/MemoryPostgresChat/MemoryPostgresChat.node.js +60 -20
- package/dist/nodes/MemoryPostgresChat/MemoryPostgresChat.node.js.map +1 -1
- package/dist/nodes/shared/api/errorHandling.d.ts +0 -3
- package/dist/nodes/shared/api/errorHandling.js +0 -17
- package/dist/nodes/shared/api/errorHandling.js.map +1 -1
- package/dist/nodes/shared/config/properties/options.js +6 -1
- package/dist/nodes/shared/config/properties/options.js.map +1 -1
- package/dist/nodes/shared/methods/listSearch.js.map +1 -1
- package/package.json +7 -8
|
@@ -11,16 +11,15 @@ class LimitedPostgresChatMessageHistory extends chat_history_1.BaseListChatMessa
|
|
|
11
11
|
constructor(fields) {
|
|
12
12
|
super();
|
|
13
13
|
this.lc_namespace = ['langchain', 'stores', 'message', 'postgres'];
|
|
14
|
-
this.tableReady = false;
|
|
15
14
|
this.pool = fields.pool;
|
|
16
15
|
this.sessionId = fields.sessionId;
|
|
17
16
|
this.tableName = fields.tableName;
|
|
18
17
|
this.limit = fields.limit;
|
|
19
18
|
this.readOnly = fields.readOnly;
|
|
19
|
+
this.summaryPrefix = fields.summaryPrefix;
|
|
20
|
+
this.keepMessagesBeforePrefix = fields.keepMessagesBeforePrefix;
|
|
20
21
|
}
|
|
21
22
|
async ensureTable() {
|
|
22
|
-
if (this.tableReady)
|
|
23
|
-
return;
|
|
24
23
|
await this.pool.query(`
|
|
25
24
|
CREATE TABLE IF NOT EXISTS ${this.tableName} (
|
|
26
25
|
id SERIAL PRIMARY KEY,
|
|
@@ -33,33 +32,53 @@ class LimitedPostgresChatMessageHistory extends chat_history_1.BaseListChatMessa
|
|
|
33
32
|
CREATE INDEX IF NOT EXISTS ${this.tableName}_session_id_idx
|
|
34
33
|
ON ${this.tableName} (session_id, id DESC)
|
|
35
34
|
`);
|
|
36
|
-
|
|
35
|
+
}
|
|
36
|
+
async withTableAutoCreate(op) {
|
|
37
|
+
try {
|
|
38
|
+
return await op();
|
|
39
|
+
}
|
|
40
|
+
catch (err) {
|
|
41
|
+
if ((err === null || err === void 0 ? void 0 : err.code) !== '42P01')
|
|
42
|
+
throw err;
|
|
43
|
+
await this.ensureTable();
|
|
44
|
+
return await op();
|
|
45
|
+
}
|
|
37
46
|
}
|
|
38
47
|
async getMessages() {
|
|
39
|
-
await this.
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
ORDER BY id ASC`, [this.sessionId, this.limit]);
|
|
48
|
+
const result = await this.withTableAutoCreate(() => this.pool.query(`SELECT id, message FROM (
|
|
49
|
+
SELECT id, message
|
|
50
|
+
FROM ${this.tableName}
|
|
51
|
+
WHERE session_id = $1
|
|
52
|
+
ORDER BY id DESC
|
|
53
|
+
LIMIT $2
|
|
54
|
+
) sub
|
|
55
|
+
ORDER BY id ASC`, [this.sessionId, this.limit]));
|
|
48
56
|
const storedMessages = result.rows.map((row) => row.message);
|
|
49
|
-
|
|
57
|
+
const messages = (0, messages_1.mapStoredMessagesToChatMessages)(storedMessages);
|
|
58
|
+
if (this.summaryPrefix) {
|
|
59
|
+
for (let i = messages.length - 1; i >= 0; i--) {
|
|
60
|
+
const m = messages[i];
|
|
61
|
+
const type = m.constructor.name;
|
|
62
|
+
if (type !== 'HumanMessage' && type !== 'SystemMessage')
|
|
63
|
+
continue;
|
|
64
|
+
if (typeof m.content !== 'string')
|
|
65
|
+
continue;
|
|
66
|
+
if (m.content.startsWith(this.summaryPrefix)) {
|
|
67
|
+
const start = Math.max(0, i - this.keepMessagesBeforePrefix);
|
|
68
|
+
return messages.slice(start);
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
return messages;
|
|
50
73
|
}
|
|
51
74
|
async addMessage(message) {
|
|
52
75
|
if (this.readOnly)
|
|
53
76
|
return;
|
|
54
|
-
await this.ensureTable();
|
|
55
77
|
const [stored] = (0, messages_1.mapChatMessagesToStoredMessages)([message]);
|
|
56
|
-
await this.pool.query(`INSERT INTO ${this.tableName} (session_id, message) VALUES ($1, $2)`, [this.sessionId, JSON.stringify(stored)]);
|
|
78
|
+
await this.withTableAutoCreate(() => this.pool.query(`INSERT INTO ${this.tableName} (session_id, message) VALUES ($1, $2)`, [this.sessionId, JSON.stringify(stored)]));
|
|
57
79
|
}
|
|
58
80
|
async clear() {
|
|
59
|
-
await this.
|
|
60
|
-
await this.pool.query(`DELETE FROM ${this.tableName} WHERE session_id = $1`, [
|
|
61
|
-
this.sessionId,
|
|
62
|
-
]);
|
|
81
|
+
await this.withTableAutoCreate(() => this.pool.query(`DELETE FROM ${this.tableName} WHERE session_id = $1`, [this.sessionId]));
|
|
63
82
|
}
|
|
64
83
|
}
|
|
65
84
|
class MemoryPostgresChat {
|
|
@@ -115,6 +134,23 @@ class MemoryPostgresChat {
|
|
|
115
134
|
minValue: 0,
|
|
116
135
|
},
|
|
117
136
|
},
|
|
137
|
+
{
|
|
138
|
+
displayName: 'Summary Prefix',
|
|
139
|
+
name: 'summaryPrefix',
|
|
140
|
+
type: 'string',
|
|
141
|
+
default: '<summary>',
|
|
142
|
+
description: 'If set, skips all messages before the most recent user or system message whose content starts with this string. Useful for anchoring a compacted-context summary inserted into chat history. Leave empty to disable.',
|
|
143
|
+
},
|
|
144
|
+
{
|
|
145
|
+
displayName: 'Keep Messages Before Prefix',
|
|
146
|
+
name: 'keepMessagesBeforePrefix',
|
|
147
|
+
type: 'number',
|
|
148
|
+
default: 2,
|
|
149
|
+
description: 'Number of messages immediately before the matched prefix message to retain. Only applies when Summary Prefix is set and matches. Set to 0 to drop everything before the prefix.',
|
|
150
|
+
typeOptions: {
|
|
151
|
+
minValue: 0,
|
|
152
|
+
},
|
|
153
|
+
},
|
|
118
154
|
{
|
|
119
155
|
displayName: 'Read Only',
|
|
120
156
|
name: 'readOnly',
|
|
@@ -130,6 +166,8 @@ class MemoryPostgresChat {
|
|
|
130
166
|
const tableName = this.getNodeParameter('tableName', itemIndex, 'chat_memory');
|
|
131
167
|
const contextWindowLength = this.getNodeParameter('contextWindowLength', itemIndex, 10);
|
|
132
168
|
const readOnly = this.getNodeParameter('readOnly', itemIndex, false);
|
|
169
|
+
const summaryPrefix = this.getNodeParameter('summaryPrefix', itemIndex, '');
|
|
170
|
+
const keepMessagesBeforePrefix = this.getNodeParameter('keepMessagesBeforePrefix', itemIndex, 2);
|
|
133
171
|
let sessionId = this.getNodeParameter('sessionKey', itemIndex, '');
|
|
134
172
|
if (!sessionId) {
|
|
135
173
|
throw new n8n_workflow_1.NodeOperationError(this.getNode(), 'Session Key must not be empty.', {
|
|
@@ -161,6 +199,8 @@ class MemoryPostgresChat {
|
|
|
161
199
|
tableName,
|
|
162
200
|
limit: contextWindowLength,
|
|
163
201
|
readOnly,
|
|
202
|
+
summaryPrefix,
|
|
203
|
+
keepMessagesBeforePrefix,
|
|
164
204
|
});
|
|
165
205
|
const memory = new memory_1.BufferMemory({
|
|
166
206
|
memoryKey: 'chat_history',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MemoryPostgresChat.node.js","sourceRoot":"","sources":["../../../nodes/MemoryPostgresChat/MemoryPostgresChat.node.ts"],"names":[],"mappings":";;;AAAA,+DAA0E;AAC1E,uDAIkC;AAClC,6CAAgD;AAChD,6CAA0C;AAC1C,2BAA2C;AAE3C,+CAAuE;AAMvE,MAAM,iCAAkC,SAAQ,yCAA0B;
|
|
1
|
+
{"version":3,"file":"MemoryPostgresChat.node.js","sourceRoot":"","sources":["../../../nodes/MemoryPostgresChat/MemoryPostgresChat.node.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1 @@
|
|
|
1
|
-
import { OpenAIError } from 'openai/error';
|
|
2
1
|
export declare function getCustomErrorMessage(errorCode: string): string | undefined;
|
|
3
|
-
export declare function isOpenAiError(error: any): error is OpenAIError;
|
|
4
|
-
export declare const openAiFailedAttemptHandler: (error: any) => void;
|
|
@@ -1,11 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.openAiFailedAttemptHandler = void 0;
|
|
4
3
|
exports.getCustomErrorMessage = getCustomErrorMessage;
|
|
5
|
-
exports.isOpenAiError = isOpenAiError;
|
|
6
|
-
const n8n_workflow_1 = require("n8n-workflow");
|
|
7
|
-
const openai_1 = require("openai");
|
|
8
|
-
const error_1 = require("openai/error");
|
|
9
4
|
const errorMap = {
|
|
10
5
|
insufficient_quota: 'Insufficient quota detected. <a href="https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-langchain.openai/common-issues/#insufficient-quota" target="_blank">Learn more</a> about resolving this issue',
|
|
11
6
|
rate_limit_exceeded: 'OpenAI: Rate limit reached',
|
|
@@ -13,16 +8,4 @@ const errorMap = {
|
|
|
13
8
|
function getCustomErrorMessage(errorCode) {
|
|
14
9
|
return errorMap[errorCode];
|
|
15
10
|
}
|
|
16
|
-
function isOpenAiError(error) {
|
|
17
|
-
return error instanceof error_1.OpenAIError;
|
|
18
|
-
}
|
|
19
|
-
const openAiFailedAttemptHandler = (error) => {
|
|
20
|
-
var _a;
|
|
21
|
-
if (error instanceof openai_1.RateLimitError) {
|
|
22
|
-
const errorCode = error === null || error === void 0 ? void 0 : error.code;
|
|
23
|
-
const errorMessage = (_a = getCustomErrorMessage(errorCode !== null && errorCode !== void 0 ? errorCode : 'rate_limit_exceeded')) !== null && _a !== void 0 ? _a : errorMap.rate_limit_exceeded;
|
|
24
|
-
throw new n8n_workflow_1.OperationalError(errorMessage, { cause: error });
|
|
25
|
-
}
|
|
26
|
-
};
|
|
27
|
-
exports.openAiFailedAttemptHandler = openAiFailedAttemptHandler;
|
|
28
11
|
//# sourceMappingURL=errorHandling.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errorHandling.js","sourceRoot":"","sources":["../../../../nodes/shared/api/errorHandling.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"errorHandling.js","sourceRoot":"","sources":["../../../../nodes/shared/api/errorHandling.ts"],"names":[],"mappings":";;AAOA,sDAEC;AARD,MAAM,QAAQ,GAA2B;IACxC,kBAAkB,EACjB,kNAAkN;IACnN,mBAAmB,EAAE,4BAA4B;CACjD,CAAC;AAEF,SAAgB,qBAAqB,CAAC,SAAiB;IACtD,OAAO,QAAQ,CAAC,SAAS,CAAC,CAAC;AAC5B,CAAC"}
|
|
@@ -144,6 +144,11 @@ exports.optionsProperties = [
|
|
|
144
144
|
description: 'Append skill instructions to the existing system prompt',
|
|
145
145
|
},
|
|
146
146
|
],
|
|
147
|
+
displayOptions: {
|
|
148
|
+
show: {
|
|
149
|
+
skillTools: [{ _cnd: { exists: true } }],
|
|
150
|
+
},
|
|
151
|
+
},
|
|
147
152
|
description: 'How to inject the skill instructions into the conversation when a skill tool is called',
|
|
148
153
|
},
|
|
149
154
|
{
|
|
@@ -154,7 +159,7 @@ exports.optionsProperties = [
|
|
|
154
159
|
validateType: 'array',
|
|
155
160
|
ignoreValidationDuringExecution: true,
|
|
156
161
|
typeOptions: { rows: 1 },
|
|
157
|
-
description: 'Array of tool names that should be treated as skills. When a skill tool is called, if the tool returns an object with "name" and "instructions" properties, the system returns a directive message and injects the skill instructions as a
|
|
162
|
+
description: 'Array of tool names that should be treated as skills. When a skill tool is called, if the tool returns an object with "name" and "instructions" properties, the system returns a directive message and injects the skill instructions as a message. Format: ["tool_name_1", "tool_name_2"]. Example: ["skill", "skills", "playbook"].',
|
|
158
163
|
},
|
|
159
164
|
],
|
|
160
165
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"options.js","sourceRoot":"","sources":["../../../../../nodes/shared/config/properties/options.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"options.js","sourceRoot":"","sources":["../../../../../nodes/shared/config/properties/options.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"listSearch.js","sourceRoot":"","sources":["../../../../nodes/shared/methods/listSearch.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"listSearch.js","sourceRoot":"","sources":["../../../../nodes/shared/methods/listSearch.ts"],"names":[],"mappings":";;;AA4CA,kCAWC;AAjDD,8DAA2D;AAM3D,MAAM,cAAc,GACnB,CAAC,eAAgD,EAAE,EAAE,CACrD,KAAK,EAAE,GAA0B,EAAE,MAAe,EAAkC,EAAE;;IACrF,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,MAAM,mCAAgB,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,EAAE,SAAS,CAAC,CAA4B,CAAC;IAE/F,IAAI,GAAG,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC;IAEvD,IAAI,OAAO,GAA2B,EAAE,CAAC;IAEzC,IAAI,MAAM,EAAE,CAAC;QACZ,KAAK,MAAM,KAAK,IAAI,IAAI,IAAI,EAAE,EAAE,CAAC;YAChC,IAAI,MAAA,KAAK,CAAC,EAAE,0CAAE,WAAW,GAAG,QAAQ,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,EAAE,CAAC;gBAC5D,OAAO,CAAC,IAAI,CAAC;oBACZ,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC,WAAW,EAAE;oBAC5B,KAAK,EAAE,KAAK,CAAC,EAAE;iBACf,CAAC,CAAC;YACJ,CAAC;QACF,CAAC;IACF,CAAC;SAAM,CAAC;QACP,OAAO,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YACtC,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC,WAAW,EAAE;YAC5B,KAAK,EAAE,KAAK,CAAC,EAAE;SACf,CAAC,CAAC,CAAC;IACL,CAAC;IAED,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;IAE/D,OAAO;QACN,OAAO;KACP,CAAC;AACH,CAAC,CAAC;AAEI,KAAK,UAAU,WAAW,CAEhC,MAAe;IAEf,OAAO,MAAM,cAAc,CAE1B,GAAG,EAAE,CAAC,IAAI,CAIV,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AACjB,CAAC;AAGY,QAAA,UAAU,GAAG;IACzB,WAAW;CACX,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "n8n-nodes-simple",
|
|
3
|
-
"version": "4.
|
|
3
|
+
"version": "4.3.1",
|
|
4
4
|
"description": "Simple",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"n8n-community-node-package"
|
|
@@ -37,20 +37,20 @@
|
|
|
37
37
|
},
|
|
38
38
|
"devDependencies": {
|
|
39
39
|
"@types/pg": "^8.20.0",
|
|
40
|
-
"@typescript-eslint/parser": "^
|
|
40
|
+
"@typescript-eslint/parser": "^8.59.3",
|
|
41
41
|
"eslint": "^8.56.0",
|
|
42
42
|
"eslint-plugin-n8n-nodes-base": "^1.16.6",
|
|
43
|
-
"gulp": "^
|
|
44
|
-
"n8n-core": "^2.
|
|
43
|
+
"gulp": "^5.0.1",
|
|
44
|
+
"n8n-core": "^2.16.1",
|
|
45
45
|
"n8n-workflow": "^2.15.0",
|
|
46
46
|
"prettier": "^3.8.1",
|
|
47
47
|
"typescript": "^5.9.3"
|
|
48
48
|
},
|
|
49
49
|
"dependencies": {
|
|
50
50
|
"@langchain/core": "0.3.80",
|
|
51
|
-
"@langchain/openai": "0.
|
|
52
|
-
"@n8n/json-schema-to-zod": "1.
|
|
53
|
-
"@solvers-hub/llm-json": "^0.1.
|
|
51
|
+
"@langchain/openai": "0.6.17",
|
|
52
|
+
"@n8n/json-schema-to-zod": "1.9.0",
|
|
53
|
+
"@solvers-hub/llm-json": "^0.1.11",
|
|
54
54
|
"@types/json-schema": "^7.0.15",
|
|
55
55
|
"braces": ">=3.0.3",
|
|
56
56
|
"generate-schema": "2.6.0",
|
|
@@ -62,7 +62,6 @@
|
|
|
62
62
|
"peerDependencies": {
|
|
63
63
|
"@types/lodash": "^4.17.23",
|
|
64
64
|
"lodash": "^4.17.23",
|
|
65
|
-
"openai": "^4.73.1",
|
|
66
65
|
"zod": "^3.23.8"
|
|
67
66
|
},
|
|
68
67
|
"bugs": {
|