n8n-nodes-simple 3.3.2 → 4.1.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.d.ts +5 -0
- package/dist/nodes/MemoryPostgresChat/MemoryPostgresChat.node.js +162 -0
- package/dist/nodes/MemoryPostgresChat/MemoryPostgresChat.node.js.map +1 -0
- package/dist/nodes/MemoryPostgresChat/postgres.svg +1 -0
- package/dist/nodes/shared/api/responsesApiConverter.d.ts +1 -1
- package/dist/nodes/shared/api/responsesApiConverter.js +4 -3
- package/dist/nodes/shared/api/responsesApiConverter.js.map +1 -1
- package/dist/nodes/shared/config/parameters.d.ts +2 -0
- package/dist/nodes/shared/config/parameters.js +6 -3
- package/dist/nodes/shared/config/parameters.js.map +1 -1
- package/dist/nodes/shared/config/properties/apiMode.js +8 -28
- package/dist/nodes/shared/config/properties/apiMode.js.map +1 -1
- package/dist/nodes/shared/config/properties/options.js +48 -0
- package/dist/nodes/shared/config/properties/options.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.d.ts +1 -1
- package/dist/nodes/shared/core/execution/executor.js +4 -1
- package/dist/nodes/shared/core/execution/executor.js.map +1 -1
- package/dist/nodes/shared/core/execution/messageOperation.js +14 -7
- package/dist/nodes/shared/core/execution/messageOperation.js.map +1 -1
- package/dist/nodes/shared/core/execution/modelAttempt.d.ts +3 -0
- package/dist/nodes/shared/core/execution/modelAttempt.js +7 -5
- package/dist/nodes/shared/core/execution/modelAttempt.js.map +1 -1
- package/dist/nodes/shared/core/memory/io.d.ts +1 -1
- package/dist/nodes/shared/core/memory/io.js +15 -9
- package/dist/nodes/shared/core/memory/io.js.map +1 -1
- package/dist/nodes/shared/core/messages/chatHistory.d.ts +3 -2
- package/dist/nodes/shared/core/messages/chatHistory.js +3 -7
- package/dist/nodes/shared/core/messages/chatHistory.js.map +1 -1
- package/dist/nodes/shared/core/messages/converter.js +7 -6
- package/dist/nodes/shared/core/messages/converter.js.map +1 -1
- package/dist/nodes/shared/core/tools/executor.d.ts +1 -1
- package/dist/nodes/shared/core/tools/executor.js +20 -28
- 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 +2 -2
- 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 +13 -5
- package/dist/nodes/shared/core/tools/toolCallProcessor.js.map +1 -1
- package/dist/package.json +7 -3
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +7 -3
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import type { ISupplyDataFunctions, INodeType, INodeTypeDescription, SupplyData } from 'n8n-workflow';
|
|
2
|
+
export declare class MemoryPostgresChat implements INodeType {
|
|
3
|
+
description: INodeTypeDescription;
|
|
4
|
+
supplyData(this: ISupplyDataFunctions, itemIndex: number): Promise<SupplyData>;
|
|
5
|
+
}
|
|
@@ -0,0 +1,162 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.MemoryPostgresChat = void 0;
|
|
4
|
+
const chat_history_1 = require("@langchain/core/chat_history");
|
|
5
|
+
const messages_1 = require("@langchain/core/messages");
|
|
6
|
+
const ai_utilities_1 = require("@n8n/ai-utilities");
|
|
7
|
+
const memory_1 = require("langchain/memory");
|
|
8
|
+
const pg_1 = require("pg");
|
|
9
|
+
const n8n_workflow_1 = require("n8n-workflow");
|
|
10
|
+
class LimitedPostgresChatMessageHistory extends chat_history_1.BaseListChatMessageHistory {
|
|
11
|
+
constructor(fields) {
|
|
12
|
+
super();
|
|
13
|
+
this.lc_namespace = ['langchain', 'stores', 'message', 'postgres'];
|
|
14
|
+
this.tableReady = false;
|
|
15
|
+
this.pool = fields.pool;
|
|
16
|
+
this.sessionId = fields.sessionId;
|
|
17
|
+
this.tableName = fields.tableName;
|
|
18
|
+
this.limit = fields.limit;
|
|
19
|
+
}
|
|
20
|
+
async ensureTable() {
|
|
21
|
+
if (this.tableReady)
|
|
22
|
+
return;
|
|
23
|
+
await this.pool.query(`
|
|
24
|
+
CREATE TABLE IF NOT EXISTS ${this.tableName} (
|
|
25
|
+
id SERIAL PRIMARY KEY,
|
|
26
|
+
session_id TEXT NOT NULL,
|
|
27
|
+
message JSONB NOT NULL,
|
|
28
|
+
created_at TIMESTAMPTZ NOT NULL DEFAULT NOW()
|
|
29
|
+
)
|
|
30
|
+
`);
|
|
31
|
+
this.tableReady = true;
|
|
32
|
+
}
|
|
33
|
+
async getMessages() {
|
|
34
|
+
await this.ensureTable();
|
|
35
|
+
const result = await this.pool.query(`SELECT id, message FROM (
|
|
36
|
+
SELECT id, message
|
|
37
|
+
FROM ${this.tableName}
|
|
38
|
+
WHERE session_id = $1
|
|
39
|
+
ORDER BY id DESC
|
|
40
|
+
LIMIT $2
|
|
41
|
+
) sub
|
|
42
|
+
ORDER BY id ASC`, [this.sessionId, this.limit]);
|
|
43
|
+
const storedMessages = result.rows.map((row) => row.message);
|
|
44
|
+
return (0, messages_1.mapStoredMessagesToChatMessages)(storedMessages);
|
|
45
|
+
}
|
|
46
|
+
async addMessage(message) {
|
|
47
|
+
await this.ensureTable();
|
|
48
|
+
const [stored] = (0, messages_1.mapChatMessagesToStoredMessages)([message]);
|
|
49
|
+
await this.pool.query(`INSERT INTO ${this.tableName} (session_id, message) VALUES ($1, $2)`, [this.sessionId, JSON.stringify(stored)]);
|
|
50
|
+
}
|
|
51
|
+
async clear() {
|
|
52
|
+
await this.ensureTable();
|
|
53
|
+
await this.pool.query(`DELETE FROM ${this.tableName} WHERE session_id = $1`, [
|
|
54
|
+
this.sessionId,
|
|
55
|
+
]);
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
class MemoryPostgresChat {
|
|
59
|
+
constructor() {
|
|
60
|
+
this.description = {
|
|
61
|
+
displayName: 'Postgres Chat Memory',
|
|
62
|
+
name: 'memoryPostgresChat',
|
|
63
|
+
icon: 'file:postgres.svg',
|
|
64
|
+
group: ['transform'],
|
|
65
|
+
version: 1,
|
|
66
|
+
description: 'Stores chat history in a Postgres table. Retrieves only the last N messages.',
|
|
67
|
+
defaults: {
|
|
68
|
+
name: 'Postgres Chat Memory',
|
|
69
|
+
},
|
|
70
|
+
credentials: [
|
|
71
|
+
{
|
|
72
|
+
name: 'postgres',
|
|
73
|
+
required: true,
|
|
74
|
+
},
|
|
75
|
+
],
|
|
76
|
+
codex: {
|
|
77
|
+
categories: ['AI'],
|
|
78
|
+
subcategories: {
|
|
79
|
+
AI: ['Memory'],
|
|
80
|
+
Memory: ['Other memories'],
|
|
81
|
+
},
|
|
82
|
+
},
|
|
83
|
+
inputs: [],
|
|
84
|
+
outputs: [n8n_workflow_1.NodeConnectionTypes.AiMemory],
|
|
85
|
+
outputNames: ['Memory'],
|
|
86
|
+
properties: [
|
|
87
|
+
{
|
|
88
|
+
displayName: 'Table Name',
|
|
89
|
+
name: 'tableName',
|
|
90
|
+
type: 'string',
|
|
91
|
+
default: 'chat_memory',
|
|
92
|
+
description: 'The table name to store chat history in. The table is created automatically if it does not exist.',
|
|
93
|
+
},
|
|
94
|
+
{
|
|
95
|
+
displayName: 'Session ID',
|
|
96
|
+
name: 'sessionKey',
|
|
97
|
+
type: 'string',
|
|
98
|
+
default: '',
|
|
99
|
+
description: 'The ID to use for this chat session'
|
|
100
|
+
},
|
|
101
|
+
{
|
|
102
|
+
displayName: 'Context Window Length',
|
|
103
|
+
name: 'contextWindowLength',
|
|
104
|
+
type: 'number',
|
|
105
|
+
default: 10,
|
|
106
|
+
description: 'Number of most-recent messages to retrieve from the database per request. Lower values reduce token usage.',
|
|
107
|
+
typeOptions: {
|
|
108
|
+
minValue: 0,
|
|
109
|
+
},
|
|
110
|
+
},
|
|
111
|
+
],
|
|
112
|
+
};
|
|
113
|
+
}
|
|
114
|
+
async supplyData(itemIndex) {
|
|
115
|
+
const credentials = await this.getCredentials('postgres');
|
|
116
|
+
const tableName = this.getNodeParameter('tableName', itemIndex, 'chat_memory');
|
|
117
|
+
const contextWindowLength = this.getNodeParameter('contextWindowLength', itemIndex, 10);
|
|
118
|
+
let sessionId = this.getNodeParameter('sessionKey', itemIndex, '');
|
|
119
|
+
if (!sessionId) {
|
|
120
|
+
throw new n8n_workflow_1.NodeOperationError(this.getNode(), 'Session Key must not be empty.', {
|
|
121
|
+
itemIndex,
|
|
122
|
+
});
|
|
123
|
+
}
|
|
124
|
+
let sslConfig;
|
|
125
|
+
if (credentials.ssl === 'disable') {
|
|
126
|
+
sslConfig = false;
|
|
127
|
+
}
|
|
128
|
+
else if (credentials.allowUnauthorizedCerts) {
|
|
129
|
+
sslConfig = { rejectUnauthorized: false };
|
|
130
|
+
}
|
|
131
|
+
else {
|
|
132
|
+
sslConfig = { rejectUnauthorized: true };
|
|
133
|
+
}
|
|
134
|
+
const pool = new pg_1.Pool({
|
|
135
|
+
host: credentials.host,
|
|
136
|
+
port: credentials.port,
|
|
137
|
+
database: credentials.database,
|
|
138
|
+
user: credentials.user,
|
|
139
|
+
password: credentials.password,
|
|
140
|
+
ssl: sslConfig,
|
|
141
|
+
max: 5,
|
|
142
|
+
});
|
|
143
|
+
const chatHistory = new LimitedPostgresChatMessageHistory({
|
|
144
|
+
pool,
|
|
145
|
+
sessionId,
|
|
146
|
+
tableName,
|
|
147
|
+
limit: contextWindowLength,
|
|
148
|
+
});
|
|
149
|
+
const memory = new memory_1.BufferMemory({
|
|
150
|
+
memoryKey: 'chat_history',
|
|
151
|
+
chatHistory,
|
|
152
|
+
returnMessages: true,
|
|
153
|
+
inputKey: 'input',
|
|
154
|
+
outputKey: 'output',
|
|
155
|
+
});
|
|
156
|
+
return {
|
|
157
|
+
response: (0, ai_utilities_1.logWrapper)(memory, this),
|
|
158
|
+
};
|
|
159
|
+
}
|
|
160
|
+
}
|
|
161
|
+
exports.MemoryPostgresChat = MemoryPostgresChat;
|
|
162
|
+
//# sourceMappingURL=MemoryPostgresChat.node.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"MemoryPostgresChat.node.js","sourceRoot":"","sources":["../../../nodes/MemoryPostgresChat/MemoryPostgresChat.node.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round" viewBox="0 0 79 81"><defs><linearGradient id="pg-grad" x1="0%" y1="100%" x2="100%" y2="0%"><stop offset="0%" stop-color="#6b2fd4"/><stop offset="100%" stop-color="#3a7ab5"/></linearGradient></defs><use xlink:href="#a" x=".5" y=".5"/><symbol id="a" overflow="visible"><g fill-rule="nonzero" stroke="none"><path fill="#000" d="M77.391 47.922c-.466-1.412-1.688-2.396-3.268-2.632-.745-.111-1.598-.064-2.608.144-1.76.363-3.065.501-4.018.528 3.596-6.072 6.521-12.997 8.204-19.515 2.722-10.54 1.268-15.341-.432-17.513C70.77 3.185 64.206.097 56.287.002c-4.224-.052-7.933.782-9.867 1.382a37 37 0 0 0-5.77-.528c-3.809-.061-7.174.77-10.05 2.476a46 46 0 0 0-7.098-1.782C16.561.411 10.968 1.299 6.876 4.19 1.922 7.689-.375 13.77.05 22.262c.135 2.696 1.643 10.9 4.018 18.68 1.365 4.472 2.82 8.185 4.326 11.038 2.135 4.046 4.419 6.428 6.984 7.284 1.438.479 4.049.814 6.797-1.473a6 6 0 0 0 1.429 1.23c.783.494 1.74.897 2.696 1.136 3.446.862 6.674.646 9.427-.561l.041 1.362.06 1.899c.163 4.064.44 7.223 1.259 9.434.045.122.105.307.169.503.409 1.251 1.092 3.346 2.83 4.987 1.8 1.699 3.978 2.22 5.972 2.22 1 0 1.955-.131 2.792-.311 2.984-.639 6.373-1.614 8.824-5.104 2.318-3.3 3.444-8.27 3.648-16.101l.074-.634.048-.414.546.048.141.01c3.039.138 6.755-.506 9.037-1.566 1.803-.837 7.582-3.888 6.221-8.007"/><path fill="url(#pg-grad)" d="M72.195 48.723c-9.036 1.864-9.657-1.195-9.657-1.195 9.541-14.157 13.529-32.127 10.087-36.525C63.235-.994 46.981 4.68 46.71 4.827l-.087.016c-1.785-.371-3.783-.591-6.029-.628-4.089-.067-7.19 1.072-9.544 2.857 0 0-28.995-11.945-27.647 15.023.287 5.737 8.223 43.41 17.689 32.031 3.46-4.161 6.803-7.679 6.803-7.679 1.66 1.103 3.648 1.666 5.732 1.463l.162-.137a6.3 6.3 0 0 0 .065 1.62c-2.439 2.725-1.722 3.203-6.597 4.206-4.933 1.017-2.035 2.826-.143 3.299 2.294.574 7.6 1.386 11.185-3.633l-.143.573c.956.765 1.626 4.978 1.514 8.797s-.188 6.441.565 8.489 1.503 6.656 7.912 5.282c5.355-1.148 8.13-4.121 8.516-9.081.274-3.526.894-3.005.933-6.158l.497-1.493c.573-4.78.091-6.322 3.39-5.605l.802.07c2.428.11 5.606-.391 7.471-1.257 4.016-1.864 6.398-4.976 2.438-4.158"/><path d="M32.747 24.66c-.814-.113-1.552-.008-1.925.274a.7.7 0 0 0-.292.47c-.047.336.188.707.333.898.409.542 1.006.915 1.598.997a2 2 0 0 0 .256.018c.986 0 1.883-.768 1.962-1.335.099-.71-.932-1.183-1.931-1.322m26.975.022c-.078-.556-1.068-.715-2.007-.584s-1.848.554-1.772 1.112c.061.434.844 1.174 1.771 1.174q.117 0 .237-.016c.619-.086 1.073-.479 1.288-.705.329-.345.518-.73.484-.98m15.477 23.828c-.345-1.042-1.453-1.377-3.296-.997-5.471 1.129-7.43.347-8.073-.127 4.252-6.478 7.75-14.308 9.637-21.614.894-3.461 1.388-6.675 1.428-9.294.045-2.876-.445-4.988-1.455-6.279-4.072-5.203-10.048-7.994-17.283-8.07-4.973-.056-9.175 1.217-9.99 1.575a25 25 0 0 0-5.622-.722c-3.734-.06-6.961.834-9.633 2.655a43 43 0 0 0-7.828-2.052c-6.342-1.021-11.381-.248-14.978 2.3-4.291 3.04-6.272 8.475-5.888 16.152.129 2.583 1.601 10.529 3.923 18.139 3.057 10.016 6.38 15.686 9.877 16.852a4.4 4.4 0 0 0 1.402.232c1.276 0 2.839-.575 4.466-2.531a161 161 0 0 1 6.156-6.966 9.9 9.9 0 0 0 4.429 1.191l.01.121c-.31.368-.564.69-.781.965-1.07 1.358-1.293 1.641-4.738 2.351-.98.202-3.582.738-3.62 2.563-.041 1.993 3.076 2.83 3.431 2.919 1.238.31 2.43.463 3.568.463 2.766 0 5.2-.909 7.145-2.668-.06 7.106.236 14.107 1.089 16.241.699 1.746 2.406 6.014 7.798 6.014.791 0 1.662-.092 2.62-.297 5.627-1.207 8.071-3.694 9.016-9.177.506-2.93 1.374-9.928 1.782-13.682.862.269 1.971.392 3.17.392 2.501 0 5.387-.531 7.197-1.372 2.033-.944 5.702-3.261 5.037-5.274zM61.8 23.147c-.019 1.108-.171 2.114-.333 3.164-.174 1.129-.354 2.297-.399 3.715-.045 1.379.128 2.814.294 4.2.337 2.801.682 5.685-.655 8.531a11 11 0 0 1-.592-1.218c-.166-.403-.527-1.05-1.027-1.946-1.944-3.487-6.497-11.652-4.167-14.984.694-.992 2.456-2.011 6.879-1.463zM56.439 4.374c6.482.143 11.609 2.568 15.24 7.207 2.784 3.558-.282 19.749-9.158 33.716l-.269-.339-.112-.14c2.294-3.788 1.845-7.536 1.446-10.859-.164-1.364-.319-2.652-.28-3.861.041-1.283.21-2.382.374-3.446.202-1.311.407-2.667.35-4.265a1.8 1.8 0 0 0 .037-.601c-.144-1.533-1.894-6.12-5.462-10.273-1.951-2.271-4.797-4.813-8.682-6.527a29.3 29.3 0 0 1 6.515-.612zM20.167 53.298c-1.793 2.155-3.031 1.742-3.438 1.607-2.653-.885-5.73-6.491-8.444-15.382-2.348-7.693-3.72-15.428-3.829-17.597-.343-6.86 1.32-11.641 4.943-14.21 5.896-4.181 15.589-1.679 19.484-.409l-.17.163c-6.391 6.455-6.24 17.483-6.224 18.157a22 22 0 0 0 .051 1.135c.11 1.855.315 5.307-.232 9.217-.508 3.633.612 7.189 3.072 9.756q.383.398.795.75a164 164 0 0 0-6.008 6.814zm6.83-9.113c-1.983-2.069-2.884-4.947-2.471-7.896.577-4.13.364-7.727.25-9.659l-.039-.694c.934-.828 5.261-3.146 8.346-2.439 1.408.323 2.266 1.281 2.623 2.931 1.846 8.539.244 12.098-1.043 14.957-.265.589-.516 1.146-.73 1.722l-.166.445c-.42 1.126-.811 2.173-1.053 3.167-2.108-.006-4.159-.907-5.718-2.534zm.324 11.516a5 5 0 0 1-1.494-.642c.271-.128.754-.301 1.591-.474 4.052-.834 4.678-1.423 6.045-3.158.313-.398.669-.849 1.16-1.398.733-.821 1.068-.682 1.676-.43.493.204.972.821 1.167 1.501.092.321.195.93-.143 1.404-2.855 3.997-7.015 3.946-10.003 3.198zm21.207 19.735c-4.957 1.062-6.713-1.467-7.869-4.359-.747-1.867-1.113-10.285-.853-19.582a1.1 1.1 0 0 0-.048-.356 5 5 0 0 0-.139-.657c-.387-1.353-1.331-2.484-2.462-2.953-.45-.186-1.275-.528-2.267-.274.212-.871.578-1.855.976-2.921l.167-.448c.188-.505.423-1.029.673-1.583 1.347-2.992 3.192-7.091 1.19-16.35-.75-3.468-3.254-5.161-7.05-4.768-2.276.235-4.358 1.154-5.396 1.68q-.334.169-.618.329c.29-3.494 1.385-10.024 5.481-14.156 2.579-2.601 6.014-3.886 10.199-3.817 8.246.135 13.534 4.367 16.518 7.893 2.571 3.039 3.964 6.1 4.52 7.751-4.179-.425-7.022.4-8.463 2.46-3.135 4.481 1.715 13.178 4.046 17.358.427.766.796 1.428.912 1.709.759 1.839 1.742 3.067 2.459 3.964.22.275.433.541.596.774-1.266.365-3.539 1.208-3.332 5.422-.167 2.115-1.356 12.016-1.959 15.514-.797 4.621-2.497 6.343-7.279 7.368zm20.693-23.68c-1.294.601-3.46 1.052-5.518 1.148-2.273.107-3.43-.255-3.702-.477-.128-2.626.85-2.901 1.884-3.191.163-.046.321-.09.474-.144a4 4 0 0 0 .313.23c1.827 1.206 5.085 1.336 9.685.386l.05-.01c-.62.58-1.682 1.359-3.187 2.058z"/></g></symbol></svg>
|
|
@@ -2,4 +2,4 @@ import type { IExecuteFunctions, IDataObject } from 'n8n-workflow';
|
|
|
2
2
|
import type { ApiMode, ChatCompletion } from './types';
|
|
3
3
|
export declare function convertBodyToResponsesApi(chatBody: IDataObject): IDataObject;
|
|
4
4
|
export declare function convertResponseToCompletion(responsesApiResponse: any): ChatCompletion;
|
|
5
|
-
export declare function sendModelRequest(executeFunctions: IExecuteFunctions, body: IDataObject, apiMode: ApiMode): Promise<ChatCompletion>;
|
|
5
|
+
export declare function sendModelRequest(executeFunctions: IExecuteFunctions, body: IDataObject, apiMode: ApiMode, requestTimeoutMs?: number): Promise<ChatCompletion>;
|
|
@@ -272,14 +272,15 @@ function convertResponseToCompletion(responsesApiResponse) {
|
|
|
272
272
|
system_fingerprint: '',
|
|
273
273
|
};
|
|
274
274
|
}
|
|
275
|
-
async function sendModelRequest(executeFunctions, body, apiMode) {
|
|
275
|
+
async function sendModelRequest(executeFunctions, body, apiMode, requestTimeoutMs) {
|
|
276
|
+
const timeoutOption = requestTimeoutMs && requestTimeoutMs > 0 ? { timeout: requestTimeoutMs } : undefined;
|
|
276
277
|
if (apiMode === 'responses') {
|
|
277
278
|
const responsesBody = convertBodyToResponsesApi(body);
|
|
278
|
-
const rawResponse = await openAiApiRequest_1.openAiApiRequest.call(executeFunctions, 'POST', '/responses', { body: responsesBody });
|
|
279
|
+
const rawResponse = await openAiApiRequest_1.openAiApiRequest.call(executeFunctions, 'POST', '/responses', { body: responsesBody, option: timeoutOption });
|
|
279
280
|
const completion = convertResponseToCompletion(rawResponse);
|
|
280
281
|
completion._rawResponse = rawResponse;
|
|
281
282
|
return completion;
|
|
282
283
|
}
|
|
283
|
-
return (await openAiApiRequest_1.openAiApiRequest.call(executeFunctions, 'POST', '/chat/completions', { body }));
|
|
284
|
+
return (await openAiApiRequest_1.openAiApiRequest.call(executeFunctions, 'POST', '/chat/completions', { body, option: timeoutOption }));
|
|
284
285
|
}
|
|
285
286
|
//# sourceMappingURL=responsesApiConverter.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"responsesApiConverter.js","sourceRoot":"","sources":["../../../../nodes/shared/api/responsesApiConverter.ts"],"names":[],"mappings":";;AAkMA,8DA8CC;AAQD,kEA4GC;AASD,
|
|
1
|
+
{"version":3,"file":"responsesApiConverter.js","sourceRoot":"","sources":["../../../../nodes/shared/api/responsesApiConverter.ts"],"names":[],"mappings":"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"}
|
|
@@ -34,8 +34,10 @@ export type ExtractedParameters = {
|
|
|
34
34
|
previousResponseId: string;
|
|
35
35
|
handoffTools: string[];
|
|
36
36
|
skillTools: string[];
|
|
37
|
+
skillInstructionsMessageType: string;
|
|
37
38
|
abortSignal: AbortSignal | undefined;
|
|
38
39
|
maxTries: number;
|
|
40
|
+
requestTimeout: number;
|
|
39
41
|
retryDelay: number;
|
|
40
42
|
appendRetryErrorMessages: boolean;
|
|
41
43
|
};
|
|
@@ -14,9 +14,10 @@ function extractParameters(executeFunctions, index) {
|
|
|
14
14
|
const chatMemoryLoadOptions = (_c = chatMemoryMessage === null || chatMemoryMessage === void 0 ? void 0 : chatMemoryMessage.chatMemoryLoadOptions) !== null && _c !== void 0 ? _c : ['toolCalls', 'reasoning', 'systemMessages'];
|
|
15
15
|
const loadToolCallsFromChatMemory = chatMemoryLoadOptions.includes('toolCalls');
|
|
16
16
|
const loadSystemMessagesFromChatMemory = chatMemoryLoadOptions.includes('systemMessages');
|
|
17
|
-
const
|
|
18
|
-
const
|
|
19
|
-
const
|
|
17
|
+
const uiApiMode = get('apiMode', 'chatCompletions');
|
|
18
|
+
const apiMode = uiApiMode === 'chatCompletions' ? 'chatCompletions' : 'responses';
|
|
19
|
+
const stateful = uiApiMode === 'responsesStateful';
|
|
20
|
+
const previousResponseIdField = stateful ? get('options.previousResponseId', '') : '';
|
|
20
21
|
const previousResponseId = stateful ? previousResponseIdField : '';
|
|
21
22
|
const preserveReasoning = get('options.preserveReasoning', 'none');
|
|
22
23
|
const loadReasoningFromChatMemory = chatMemoryLoadOptions.includes('reasoning');
|
|
@@ -54,6 +55,7 @@ function extractParameters(executeFunctions, index) {
|
|
|
54
55
|
flagExtraContent,
|
|
55
56
|
addToOutput: get('addToOutput', []),
|
|
56
57
|
maxTries: get('options.maxTries', 1),
|
|
58
|
+
requestTimeout: get('options.requestTimeout', 90),
|
|
57
59
|
retryDelay: get('options.retryDelay', 3),
|
|
58
60
|
appendRetryErrorMessages: get('options.appendRetryErrorMessages', false),
|
|
59
61
|
options: get('options', {}),
|
|
@@ -72,6 +74,7 @@ function extractParameters(executeFunctions, index) {
|
|
|
72
74
|
preserveReasoning,
|
|
73
75
|
handoffTools,
|
|
74
76
|
skillTools,
|
|
77
|
+
skillInstructionsMessageType: get('options.skillInstructionsMessageType', 'systemMessage'),
|
|
75
78
|
abortSignal: executeFunctions.getExecutionCancelSignal(),
|
|
76
79
|
};
|
|
77
80
|
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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"}
|
|
@@ -15,37 +15,17 @@ exports.apiModeProperties = [
|
|
|
15
15
|
description: 'Use the /chat/completions endpoint',
|
|
16
16
|
},
|
|
17
17
|
{
|
|
18
|
-
name: 'Responses',
|
|
19
|
-
value: '
|
|
20
|
-
description: 'Use the /responses endpoint',
|
|
18
|
+
name: 'Responses (Stateful)',
|
|
19
|
+
value: 'responsesStateful',
|
|
20
|
+
description: 'Use the /responses endpoint with server-side conversation state. Only new messages are sent; prior context is referenced by response ID.',
|
|
21
|
+
},
|
|
22
|
+
{
|
|
23
|
+
name: 'Responses (Stateless)',
|
|
24
|
+
value: 'responsesStateless',
|
|
25
|
+
description: 'Use the /responses endpoint. The complete message array is sent as input on each call.',
|
|
21
26
|
},
|
|
22
27
|
],
|
|
23
28
|
description: 'Which API format to use. The Responses API is automatically converted from Chat Completions format, so all existing configuration works unchanged.',
|
|
24
29
|
},
|
|
25
|
-
{
|
|
26
|
-
displayName: 'Stateful',
|
|
27
|
-
name: 'stateful',
|
|
28
|
-
type: 'boolean',
|
|
29
|
-
default: false,
|
|
30
|
-
description: 'Whether to use server-side conversation state. When enabled, only new messages are sent; prior context is referenced by response ID. When disabled, the complete message array is sent as input.',
|
|
31
|
-
displayOptions: {
|
|
32
|
-
show: {
|
|
33
|
-
apiMode: ['responses'],
|
|
34
|
-
},
|
|
35
|
-
},
|
|
36
|
-
},
|
|
37
|
-
{
|
|
38
|
-
displayName: 'Previous Response ID',
|
|
39
|
-
name: 'previousResponseId',
|
|
40
|
-
type: 'string',
|
|
41
|
-
default: '',
|
|
42
|
-
description: 'The response ID to chain from. If empty, falls back to the latest response_id stored in Chat Memory.',
|
|
43
|
-
displayOptions: {
|
|
44
|
-
show: {
|
|
45
|
-
apiMode: ['responses'],
|
|
46
|
-
stateful: [true],
|
|
47
|
-
},
|
|
48
|
-
},
|
|
49
|
-
},
|
|
50
30
|
];
|
|
51
31
|
//# sourceMappingURL=apiMode.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apiMode.js","sourceRoot":"","sources":["../../../../../nodes/shared/config/properties/apiMode.ts"],"names":[],"mappings":";;;AAEa,QAAA,iBAAiB,GAAsB;IACnD;QACC,WAAW,EAAE,UAAU;QACvB,IAAI,EAAE,SAAS;QACf,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,iBAAiB;QAC1B,gBAAgB,EAAE,IAAI;QACtB,OAAO,EAAE;YACR;gBACC,IAAI,EAAE,kBAAkB;gBACxB,KAAK,EAAE,iBAAiB;gBACxB,WAAW,EAAE,oCAAoC;aACjD;YACD;gBACC,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"apiMode.js","sourceRoot":"","sources":["../../../../../nodes/shared/config/properties/apiMode.ts"],"names":[],"mappings":";;;AAEa,QAAA,iBAAiB,GAAsB;IACnD;QACC,WAAW,EAAE,UAAU;QACvB,IAAI,EAAE,SAAS;QACf,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,iBAAiB;QAC1B,gBAAgB,EAAE,IAAI;QACtB,OAAO,EAAE;YACR;gBACC,IAAI,EAAE,kBAAkB;gBACxB,KAAK,EAAE,iBAAiB;gBACxB,WAAW,EAAE,oCAAoC;aACjD;YACD;gBACC,IAAI,EAAE,sBAAsB;gBAC5B,KAAK,EAAE,mBAAmB;gBAC1B,WAAW,EACV,0IAA0I;aAC3I;YACD;gBACC,IAAI,EAAE,uBAAuB;gBAC7B,KAAK,EAAE,oBAAoB;gBAC3B,WAAW,EACV,wFAAwF;aACzF;SACD;QACD,WAAW,EACV,oJAAoJ;KACrJ;CACD,CAAC"}
|
|
@@ -72,6 +72,30 @@ exports.optionsProperties = [
|
|
|
72
72
|
],
|
|
73
73
|
description: 'Which reasoning fields to preserve when sending assistant messages to the API. Choose the format your provider accepts.',
|
|
74
74
|
},
|
|
75
|
+
{
|
|
76
|
+
displayName: 'Previous Response ID',
|
|
77
|
+
name: 'previousResponseId',
|
|
78
|
+
type: 'string',
|
|
79
|
+
default: '',
|
|
80
|
+
description: 'The response ID to chain from. If empty, falls back to the latest response_id stored in Chat Memory.',
|
|
81
|
+
displayOptions: {
|
|
82
|
+
show: {
|
|
83
|
+
'/apiMode': ['responsesStateful'],
|
|
84
|
+
},
|
|
85
|
+
},
|
|
86
|
+
},
|
|
87
|
+
{
|
|
88
|
+
displayName: 'Request Timeout',
|
|
89
|
+
name: 'requestTimeout',
|
|
90
|
+
type: 'number',
|
|
91
|
+
default: 90,
|
|
92
|
+
description: 'Maximum seconds to wait for an API response before aborting. Set to 0 or -1 for no timeout. Recommended: 60–120 seconds to prevent workflow timeouts when the API server is slow or unreachable.',
|
|
93
|
+
typeOptions: {
|
|
94
|
+
minValue: -1,
|
|
95
|
+
maxValue: 600,
|
|
96
|
+
numberPrecision: 0,
|
|
97
|
+
},
|
|
98
|
+
},
|
|
75
99
|
{
|
|
76
100
|
displayName: 'Retry Delay',
|
|
77
101
|
name: 'retryDelay',
|
|
@@ -84,6 +108,30 @@ exports.optionsProperties = [
|
|
|
84
108
|
numberPrecision: 1,
|
|
85
109
|
},
|
|
86
110
|
},
|
|
111
|
+
{
|
|
112
|
+
displayName: 'Skill Instructions Message Type',
|
|
113
|
+
name: 'skillInstructionsMessageType',
|
|
114
|
+
type: 'options',
|
|
115
|
+
default: 'systemMessage',
|
|
116
|
+
displayOptions: {
|
|
117
|
+
hide: {
|
|
118
|
+
skillTools: ['[]', ''],
|
|
119
|
+
},
|
|
120
|
+
},
|
|
121
|
+
options: [
|
|
122
|
+
{
|
|
123
|
+
name: 'User Message',
|
|
124
|
+
value: 'userMessage',
|
|
125
|
+
description: 'Inject skill instructions as a user message',
|
|
126
|
+
},
|
|
127
|
+
{
|
|
128
|
+
name: 'System Message',
|
|
129
|
+
value: 'systemMessage',
|
|
130
|
+
description: 'Inject skill instructions as a mid-conversation system message',
|
|
131
|
+
},
|
|
132
|
+
],
|
|
133
|
+
description: 'How to inject the skill instructions into the conversation when a skill tool is called',
|
|
134
|
+
},
|
|
87
135
|
{
|
|
88
136
|
displayName: 'Skill Tools',
|
|
89
137
|
name: 'skillTools',
|
|
@@ -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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"}
|
|
@@ -30,5 +30,6 @@ export interface ExecutionContext {
|
|
|
30
30
|
shouldRetryOnAnyError: boolean;
|
|
31
31
|
handoffTools: string[];
|
|
32
32
|
skillTools: string[];
|
|
33
|
+
skillInstructionsMessageType: string;
|
|
33
34
|
}
|
|
34
35
|
export declare function prepareExecutionContext(executeFunctions: IExecuteFunctions, params: ExtractedParameters): Promise<ExecutionContext>;
|
|
@@ -53,6 +53,7 @@ async function prepareExecutionContext(executeFunctions, params) {
|
|
|
53
53
|
shouldRetryOnAnyError,
|
|
54
54
|
handoffTools: params.handoffTools,
|
|
55
55
|
skillTools: params.skillTools,
|
|
56
|
+
skillInstructionsMessageType: params.skillInstructionsMessageType,
|
|
56
57
|
};
|
|
57
58
|
}
|
|
58
59
|
//# sourceMappingURL=executionSetup.js.map
|
|
@@ -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":";;;AAiIA,0DAoDC;AAlLD,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;AAyDX,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;QAC7B,4BAA4B,EAAE,MAAM,CAAC,4BAA4B;KACjE,CAAC;AACH,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import type { IExecuteFunctions, INodeExecutionData, IDataObject } from 'n8n-workflow';
|
|
2
2
|
import type { BufferWindowMemory } from 'langchain/memory';
|
|
3
3
|
import type { ExtractedParameters } from '../../config/parameters';
|
|
4
|
-
export declare function runModel(executeFunctions: IExecuteFunctions, params: ExtractedParameters, messages: readonly IDataObject[], index: number, modelToUse: string, memory?: BufferWindowMemory): Promise<INodeExecutionData[]>;
|
|
4
|
+
export declare function runModel(executeFunctions: IExecuteFunctions, params: ExtractedParameters, messages: readonly IDataObject[], index: number, modelToUse: string, memory?: BufferWindowMemory, apiMessages?: readonly IDataObject[]): Promise<INodeExecutionData[]>;
|
|
@@ -6,7 +6,7 @@ const modelConfig_1 = require("./modelConfig");
|
|
|
6
6
|
const executionSetup_1 = require("./executionSetup");
|
|
7
7
|
const retryHandler_1 = require("./retryHandler");
|
|
8
8
|
const modelAttempt_1 = require("./modelAttempt");
|
|
9
|
-
async function runModel(executeFunctions, params, messages, index, modelToUse, memory) {
|
|
9
|
+
async function runModel(executeFunctions, params, messages, index, modelToUse, memory, apiMessages) {
|
|
10
10
|
const context = await (0, executionSetup_1.prepareExecutionContext)(executeFunctions, params);
|
|
11
11
|
const modelsToTry = (0, modelConfig_1.buildModelsToTry)(modelToUse, params.customParameters, params.maxTries);
|
|
12
12
|
if (modelsToTry.length === 0) {
|
|
@@ -38,7 +38,10 @@ async function runModel(executeFunctions, params, messages, index, modelToUse, m
|
|
|
38
38
|
memory,
|
|
39
39
|
handoffTools: context.handoffTools,
|
|
40
40
|
skillTools: context.skillTools,
|
|
41
|
+
skillInstructionsMessageType: context.skillInstructionsMessageType,
|
|
41
42
|
apiMode: params.apiMode,
|
|
43
|
+
requestTimeoutMs: params.requestTimeout > 0 ? params.requestTimeout * 1000 : undefined,
|
|
44
|
+
apiMessages: apiMessages,
|
|
42
45
|
});
|
|
43
46
|
}
|
|
44
47
|
catch (error) {
|
|
@@ -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,4BAqEC;AA9ED,mDAA2G;AAC3G,+CAAiD;AACjD,qDAA2D;AAC3D,iDAAiD;AACjD,iDAAgE;AAKzD,KAAK,UAAU,QAAQ,CAC7B,gBAAmC,EACnC,MAA2B,EAC3B,QAAgC,EAChC,KAAa,EACb,UAAkB,EAClB,MAA2B,EAC3B,WAAoC;IAEpC,MAAM,OAAO,GAAG,MAAM,IAAA,wCAAuB,EAAC,gBAAgB,EAAE,MAAM,CAAC,CAAC;IACxE,MAAM,WAAW,GAAG,IAAA,8BAAgB,EACnC,UAAU,EACV,MAAM,CAAC,gBAAgB,EACvB,MAAM,CAAC,QAAQ,CACf,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,YAAY,EAAE,GAAG,WAAW,CAAC,UAAU,CAAC,CAAC;QAClF,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,YAAY;gBACZ,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,qBAAqB,EAAE,OAAO,CAAC,qBAAqB;gBACpD,wBAAwB,EAAE,MAAM,CAAC,wBAAwB;gBACzD,qBAAqB;gBACrB,MAAM;gBACN,YAAY,EAAE,OAAO,CAAC,YAAY;gBAClC,UAAU,EAAE,OAAO,CAAC,UAAU;gBAC9B,4BAA4B,EAAE,OAAO,CAAC,4BAA4B;gBAClE,OAAO,EAAE,MAAM,CAAC,OAAO;gBACvB,gBAAgB,EAAE,MAAM,CAAC,cAAc,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,cAAc,GAAG,IAAI,CAAC,CAAC,CAAC,SAAS;gBACtF,WAAW,EAAE,WAAwC;aACrD,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,cAAc,aAAa,CAAC,OAAO,EAAE,CAAC,CAAC;YAG/F,IAAI,WAAW,EAAE,CAAC;gBACjB,MAAM,KAAK,CAAC;YACb,CAAC;YAED,IAAA,wCAAwB,EAAC,qBAAqB,CAAC,CAAC;YAChD,MAAM,IAAA,8BAAe,EAAC,MAAM,CAAC,UAAU,GAAG,IAAI,CAAC,CAAC;QACjD,CAAC;IACF,CAAC;IAGD,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;AACjD,CAAC"}
|
|
@@ -5,6 +5,7 @@ const n8n_workflow_1 = require("n8n-workflow");
|
|
|
5
5
|
const parameters_1 = require("../../config/parameters");
|
|
6
6
|
const io_1 = require("../memory/io");
|
|
7
7
|
const chatHistory_1 = require("../messages/chatHistory");
|
|
8
|
+
const converter_1 = require("../messages/converter");
|
|
8
9
|
const executor_1 = require("./executor");
|
|
9
10
|
async function execute(i) {
|
|
10
11
|
const params = (0, parameters_1.extractParameters)(this, i);
|
|
@@ -28,16 +29,22 @@ async function execute(i) {
|
|
|
28
29
|
if (!memory && hasChatMemoryRole) {
|
|
29
30
|
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
31
|
}
|
|
31
|
-
|
|
32
|
-
|
|
32
|
+
const rawMemoryMessages = memory ? await (0, chatHistory_1.getChatMessages)(memory) : undefined;
|
|
33
|
+
if (params.stateful && !params.previousResponseId && rawMemoryMessages) {
|
|
34
|
+
const memoryResponseId = (0, converter_1.getLatestResponseId)(rawMemoryMessages);
|
|
33
35
|
if (memoryResponseId) {
|
|
34
36
|
params.previousResponseId = memoryResponseId;
|
|
35
37
|
}
|
|
36
38
|
}
|
|
37
|
-
const
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
39
|
+
const messages = await (0, chatHistory_1.unpackChatHistoryAndMemory)(params.rawMessagesToSend, params.loadToolCallsFromChatMemory, params.loadReasoningFromChatMemory, params.loadSystemMessagesFromChatMemory, memory, rawMemoryMessages);
|
|
40
|
+
let apiMessages;
|
|
41
|
+
if (params.stateful && params.previousResponseId && memory) {
|
|
42
|
+
const chatMemoryIndex = params.rawMessagesToSend.findIndex((msg) => msg.role === 'chatMemoryRole');
|
|
43
|
+
if (chatMemoryIndex !== -1) {
|
|
44
|
+
const rawAfterMemory = params.rawMessagesToSend.slice(chatMemoryIndex + 1);
|
|
45
|
+
apiMessages = await (0, chatHistory_1.unpackChatHistoryAndMemory)(rawAfterMemory, params.loadToolCallsFromChatMemory, params.loadReasoningFromChatMemory, params.loadSystemMessagesFromChatMemory, undefined);
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
return await (0, executor_1.runModel)(this, params, messages, i, params.model, memory, apiMessages);
|
|
42
49
|
}
|
|
43
50
|
//# sourceMappingURL=messageOperation.js.map
|
|
@@ -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":"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"}
|
|
@@ -24,6 +24,9 @@ export interface ModelAttemptContext {
|
|
|
24
24
|
memory?: BufferWindowMemory;
|
|
25
25
|
handoffTools: string[];
|
|
26
26
|
skillTools: string[];
|
|
27
|
+
skillInstructionsMessageType: string;
|
|
27
28
|
apiMode: ApiMode;
|
|
29
|
+
requestTimeoutMs?: number;
|
|
30
|
+
apiMessages?: IDataObject[];
|
|
28
31
|
}
|
|
29
32
|
export declare function executeModelAttemptWithRetries(context: ModelAttemptContext): Promise<INodeExecutionData[]>;
|