@cogitator-ai/openai-compat 8.0.0 → 10.0.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/README.md +333 -30
- package/dist/client/openai-adapter.d.ts +23 -12
- package/dist/client/openai-adapter.d.ts.map +1 -1
- package/dist/client/openai-adapter.js +93 -24
- package/dist/client/openai-adapter.js.map +1 -1
- package/dist/client/storage.d.ts +175 -0
- package/dist/client/storage.d.ts.map +1 -0
- package/dist/client/storage.js +370 -0
- package/dist/client/storage.js.map +1 -0
- package/dist/client/thread-manager.d.ts +55 -31
- package/dist/client/thread-manager.d.ts.map +1 -1
- package/dist/client/thread-manager.js +109 -44
- package/dist/client/thread-manager.js.map +1 -1
- package/dist/index.d.ts +4 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/server/routes/assistants.js +5 -5
- package/dist/server/routes/assistants.js.map +1 -1
- package/dist/server/routes/files.js +5 -5
- package/dist/server/routes/files.js.map +1 -1
- package/dist/server/routes/runs.js +30 -30
- package/dist/server/routes/runs.js.map +1 -1
- package/dist/server/routes/threads.js +11 -11
- package/dist/server/routes/threads.js.map +1 -1
- package/package.json +5 -5
|
@@ -1,19 +1,48 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Thread Manager
|
|
3
|
-
*
|
|
4
|
-
* Manages the mapping between OpenAI threads and Cogitator internal state.
|
|
5
|
-
*/
|
|
6
1
|
import { nanoid } from 'nanoid';
|
|
2
|
+
import { InMemoryThreadStorage } from './storage';
|
|
7
3
|
/**
|
|
8
|
-
* Manages threads, messages, and assistants
|
|
4
|
+
* Manages threads, messages, and assistants with pluggable storage.
|
|
5
|
+
*
|
|
6
|
+
* By default uses in-memory storage. For production, use Redis or PostgreSQL.
|
|
7
|
+
*
|
|
8
|
+
* @example In-memory (default)
|
|
9
|
+
* ```ts
|
|
10
|
+
* const manager = new ThreadManager();
|
|
11
|
+
* ```
|
|
12
|
+
*
|
|
13
|
+
* @example Redis persistence
|
|
14
|
+
* ```ts
|
|
15
|
+
* import { RedisThreadStorage, ThreadManager } from '@cogitator-ai/openai-compat';
|
|
16
|
+
*
|
|
17
|
+
* const storage = new RedisThreadStorage({ url: 'redis://localhost:6379' });
|
|
18
|
+
* await storage.connect();
|
|
19
|
+
*
|
|
20
|
+
* const manager = new ThreadManager(storage);
|
|
21
|
+
* ```
|
|
22
|
+
*
|
|
23
|
+
* @example PostgreSQL persistence
|
|
24
|
+
* ```ts
|
|
25
|
+
* import { PostgresThreadStorage, ThreadManager } from '@cogitator-ai/openai-compat';
|
|
9
26
|
*
|
|
10
|
-
*
|
|
27
|
+
* const storage = new PostgresThreadStorage({
|
|
28
|
+
* connectionString: 'postgresql://user:pass@localhost/db',
|
|
29
|
+
* });
|
|
30
|
+
* await storage.connect();
|
|
31
|
+
*
|
|
32
|
+
* const manager = new ThreadManager(storage);
|
|
33
|
+
* ```
|
|
11
34
|
*/
|
|
12
35
|
export class ThreadManager {
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
36
|
+
storage;
|
|
37
|
+
cache = {
|
|
38
|
+
threads: new Map(),
|
|
39
|
+
assistants: new Map(),
|
|
40
|
+
files: new Map(),
|
|
41
|
+
};
|
|
42
|
+
constructor(storage) {
|
|
43
|
+
this.storage = storage ?? new InMemoryThreadStorage();
|
|
44
|
+
}
|
|
45
|
+
async createAssistant(params) {
|
|
17
46
|
const id = `asst_${nanoid()}`;
|
|
18
47
|
const assistant = {
|
|
19
48
|
id,
|
|
@@ -25,26 +54,36 @@ export class ThreadManager {
|
|
|
25
54
|
temperature: params.temperature,
|
|
26
55
|
created_at: Math.floor(Date.now() / 1000),
|
|
27
56
|
};
|
|
28
|
-
this.
|
|
57
|
+
await this.storage.saveAssistant(id, assistant);
|
|
58
|
+
this.cache.assistants.set(id, assistant);
|
|
29
59
|
return assistant;
|
|
30
60
|
}
|
|
31
|
-
getAssistant(id) {
|
|
32
|
-
|
|
61
|
+
async getAssistant(id) {
|
|
62
|
+
if (this.cache.assistants.has(id)) {
|
|
63
|
+
return this.cache.assistants.get(id);
|
|
64
|
+
}
|
|
65
|
+
const assistant = await this.storage.loadAssistant(id);
|
|
66
|
+
if (assistant) {
|
|
67
|
+
this.cache.assistants.set(id, assistant);
|
|
68
|
+
}
|
|
69
|
+
return assistant ?? undefined;
|
|
33
70
|
}
|
|
34
|
-
updateAssistant(id, updates) {
|
|
35
|
-
const assistant = this.
|
|
71
|
+
async updateAssistant(id, updates) {
|
|
72
|
+
const assistant = await this.getAssistant(id);
|
|
36
73
|
if (!assistant)
|
|
37
74
|
return undefined;
|
|
38
75
|
Object.assign(assistant, updates);
|
|
76
|
+
await this.storage.saveAssistant(id, assistant);
|
|
39
77
|
return assistant;
|
|
40
78
|
}
|
|
41
|
-
deleteAssistant(id) {
|
|
42
|
-
|
|
79
|
+
async deleteAssistant(id) {
|
|
80
|
+
this.cache.assistants.delete(id);
|
|
81
|
+
return this.storage.deleteAssistant(id);
|
|
43
82
|
}
|
|
44
|
-
listAssistants() {
|
|
45
|
-
return
|
|
83
|
+
async listAssistants() {
|
|
84
|
+
return this.storage.listAssistants();
|
|
46
85
|
}
|
|
47
|
-
createThread(metadata) {
|
|
86
|
+
async createThread(metadata) {
|
|
48
87
|
const id = `thread_${nanoid()}`;
|
|
49
88
|
const thread = {
|
|
50
89
|
id,
|
|
@@ -52,17 +91,31 @@ export class ThreadManager {
|
|
|
52
91
|
created_at: Math.floor(Date.now() / 1000),
|
|
53
92
|
metadata: metadata ?? {},
|
|
54
93
|
};
|
|
55
|
-
|
|
94
|
+
const stored = { thread, messages: [] };
|
|
95
|
+
await this.storage.saveThread(id, stored);
|
|
96
|
+
this.cache.threads.set(id, stored);
|
|
56
97
|
return thread;
|
|
57
98
|
}
|
|
58
|
-
getThread(id) {
|
|
59
|
-
|
|
99
|
+
async getThread(id) {
|
|
100
|
+
const stored = await this.getStoredThread(id);
|
|
101
|
+
return stored?.thread;
|
|
60
102
|
}
|
|
61
|
-
|
|
62
|
-
|
|
103
|
+
async getStoredThread(id) {
|
|
104
|
+
if (this.cache.threads.has(id)) {
|
|
105
|
+
return this.cache.threads.get(id);
|
|
106
|
+
}
|
|
107
|
+
const stored = await this.storage.loadThread(id);
|
|
108
|
+
if (stored) {
|
|
109
|
+
this.cache.threads.set(id, stored);
|
|
110
|
+
}
|
|
111
|
+
return stored ?? undefined;
|
|
112
|
+
}
|
|
113
|
+
async deleteThread(id) {
|
|
114
|
+
this.cache.threads.delete(id);
|
|
115
|
+
return this.storage.deleteThread(id);
|
|
63
116
|
}
|
|
64
|
-
addMessage(threadId, request) {
|
|
65
|
-
const stored = this.
|
|
117
|
+
async addMessage(threadId, request) {
|
|
118
|
+
const stored = await this.getStoredThread(threadId);
|
|
66
119
|
if (!stored)
|
|
67
120
|
return undefined;
|
|
68
121
|
const id = `msg_${nanoid()}`;
|
|
@@ -84,14 +137,15 @@ export class ThreadManager {
|
|
|
84
137
|
metadata: request.metadata ?? {},
|
|
85
138
|
};
|
|
86
139
|
stored.messages.push(message);
|
|
140
|
+
await this.storage.saveThread(threadId, stored);
|
|
87
141
|
return message;
|
|
88
142
|
}
|
|
89
|
-
getMessage(threadId, messageId) {
|
|
90
|
-
const stored = this.
|
|
143
|
+
async getMessage(threadId, messageId) {
|
|
144
|
+
const stored = await this.getStoredThread(threadId);
|
|
91
145
|
return stored?.messages.find((m) => m.id === messageId);
|
|
92
146
|
}
|
|
93
|
-
listMessages(threadId, options) {
|
|
94
|
-
const stored = this.
|
|
147
|
+
async listMessages(threadId, options) {
|
|
148
|
+
const stored = await this.getStoredThread(threadId);
|
|
95
149
|
if (!stored)
|
|
96
150
|
return [];
|
|
97
151
|
let messages = [...stored.messages];
|
|
@@ -124,8 +178,8 @@ export class ThreadManager {
|
|
|
124
178
|
/**
|
|
125
179
|
* Get messages in Cogitator format for LLM calls
|
|
126
180
|
*/
|
|
127
|
-
getMessagesForLLM(threadId) {
|
|
128
|
-
const messages = this.listMessages(threadId, { order: 'asc' });
|
|
181
|
+
async getMessagesForLLM(threadId) {
|
|
182
|
+
const messages = await this.listMessages(threadId, { order: 'asc' });
|
|
129
183
|
return messages.map((msg) => ({
|
|
130
184
|
role: msg.role,
|
|
131
185
|
content: this.extractTextContent(msg.content),
|
|
@@ -134,8 +188,8 @@ export class ThreadManager {
|
|
|
134
188
|
/**
|
|
135
189
|
* Add an assistant message (from LLM response)
|
|
136
190
|
*/
|
|
137
|
-
addAssistantMessage(threadId, content, assistantId, runId) {
|
|
138
|
-
const stored = this.
|
|
191
|
+
async addAssistantMessage(threadId, content, assistantId, runId) {
|
|
192
|
+
const stored = await this.getStoredThread(threadId);
|
|
139
193
|
if (!stored)
|
|
140
194
|
return undefined;
|
|
141
195
|
const id = `msg_${nanoid()}`;
|
|
@@ -164,22 +218,33 @@ export class ThreadManager {
|
|
|
164
218
|
metadata: {},
|
|
165
219
|
};
|
|
166
220
|
stored.messages.push(message);
|
|
221
|
+
await this.storage.saveThread(threadId, stored);
|
|
167
222
|
return message;
|
|
168
223
|
}
|
|
169
|
-
addFile(content, filename) {
|
|
224
|
+
async addFile(content, filename) {
|
|
170
225
|
const id = `file_${nanoid()}`;
|
|
171
226
|
const created_at = Math.floor(Date.now() / 1000);
|
|
172
|
-
|
|
227
|
+
const file = { id, content, filename, created_at };
|
|
228
|
+
await this.storage.saveFile(id, file);
|
|
229
|
+
this.cache.files.set(id, file);
|
|
173
230
|
return { id, filename, created_at };
|
|
174
231
|
}
|
|
175
|
-
getFile(id) {
|
|
176
|
-
|
|
232
|
+
async getFile(id) {
|
|
233
|
+
if (this.cache.files.has(id)) {
|
|
234
|
+
return this.cache.files.get(id);
|
|
235
|
+
}
|
|
236
|
+
const file = await this.storage.loadFile(id);
|
|
237
|
+
if (file) {
|
|
238
|
+
this.cache.files.set(id, file);
|
|
239
|
+
}
|
|
240
|
+
return file ?? undefined;
|
|
177
241
|
}
|
|
178
|
-
deleteFile(id) {
|
|
179
|
-
|
|
242
|
+
async deleteFile(id) {
|
|
243
|
+
this.cache.files.delete(id);
|
|
244
|
+
return this.storage.deleteFile(id);
|
|
180
245
|
}
|
|
181
|
-
listFiles() {
|
|
182
|
-
return
|
|
246
|
+
async listFiles() {
|
|
247
|
+
return this.storage.listFiles();
|
|
183
248
|
}
|
|
184
249
|
normalizeContent(content) {
|
|
185
250
|
if (typeof content === 'string') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"thread-manager.js","sourceRoot":"","sources":["../../src/client/thread-manager.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"thread-manager.js","sourceRoot":"","sources":["../../src/client/thread-manager.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
|
@@ -7,6 +7,10 @@
|
|
|
7
7
|
*/
|
|
8
8
|
export { OpenAIServer, createOpenAIServer } from './server/api-server';
|
|
9
9
|
export { OpenAIAdapter, createOpenAIAdapter } from './client/openai-adapter';
|
|
10
|
+
export type { StreamEventType, StreamEmitterEvents } from './client/openai-adapter';
|
|
10
11
|
export { ThreadManager } from './client/thread-manager';
|
|
12
|
+
export type { StoredThread, StoredAssistant } from './client/thread-manager';
|
|
13
|
+
export { InMemoryThreadStorage, RedisThreadStorage, PostgresThreadStorage, createThreadStorage, } from './client/storage';
|
|
14
|
+
export type { ThreadStorage, StoredFile, RedisThreadStorageConfig, PostgresThreadStorageConfig, } from './client/storage';
|
|
11
15
|
export type { OpenAIError, ListResponse, Assistant, AssistantTool, FunctionDefinition, ResponseFormat, CreateAssistantRequest, UpdateAssistantRequest, Thread, ToolResources, CreateThreadRequest, Message, MessageContent, TextContent, TextAnnotation, Attachment, CreateMessageRequest, MessageContentPart, Run, RunStatus, RequiredAction, ToolCall, RunError, Usage, ToolChoice, CreateRunRequest, SubmitToolOutputsRequest, ToolOutput, RunStep, StepDetails, StepToolCall, FileObject, FilePurpose, UploadFileRequest, StreamEvent, MessageDelta, RunStepDelta, } from './types/openai-types';
|
|
12
16
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAEvE,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAEvE,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC7E,YAAY,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AACpF,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,YAAY,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE7E,OAAO,EACL,qBAAqB,EACrB,kBAAkB,EAClB,qBAAqB,EACrB,mBAAmB,GACpB,MAAM,kBAAkB,CAAC;AAC1B,YAAY,EACV,aAAa,EACb,UAAU,EACV,wBAAwB,EACxB,2BAA2B,GAC5B,MAAM,kBAAkB,CAAC;AAE1B,YAAY,EACV,WAAW,EACX,YAAY,EACZ,SAAS,EACT,aAAa,EACb,kBAAkB,EAClB,cAAc,EACd,sBAAsB,EACtB,sBAAsB,EACtB,MAAM,EACN,aAAa,EACb,mBAAmB,EACnB,OAAO,EACP,cAAc,EACd,WAAW,EACX,cAAc,EACd,UAAU,EACV,oBAAoB,EACpB,kBAAkB,EAClB,GAAG,EACH,SAAS,EACT,cAAc,EACd,QAAQ,EACR,QAAQ,EACR,KAAK,EACL,UAAU,EACV,gBAAgB,EAChB,wBAAwB,EACxB,UAAU,EACV,OAAO,EACP,WAAW,EACX,YAAY,EACZ,UAAU,EACV,WAAW,EACX,iBAAiB,EACjB,WAAW,EACX,YAAY,EACZ,YAAY,GACb,MAAM,sBAAsB,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -8,4 +8,5 @@
|
|
|
8
8
|
export { OpenAIServer, createOpenAIServer } from './server/api-server';
|
|
9
9
|
export { OpenAIAdapter, createOpenAIAdapter } from './client/openai-adapter';
|
|
10
10
|
export { ThreadManager } from './client/thread-manager';
|
|
11
|
+
export { InMemoryThreadStorage, RedisThreadStorage, PostgresThreadStorage, createThreadStorage, } from './client/storage';
|
|
11
12
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAEvE,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAEvE,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAE7E,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAGxD,OAAO,EACL,qBAAqB,EACrB,kBAAkB,EAClB,qBAAqB,EACrB,mBAAmB,GACpB,MAAM,kBAAkB,CAAC"}
|
|
@@ -5,11 +5,11 @@
|
|
|
5
5
|
*/
|
|
6
6
|
export function registerAssistantRoutes(fastify, adapter) {
|
|
7
7
|
fastify.post('/v1/assistants', async (request, reply) => {
|
|
8
|
-
const assistant = adapter.createAssistant(request.body);
|
|
8
|
+
const assistant = await adapter.createAssistant(request.body);
|
|
9
9
|
return reply.status(201).send(assistant);
|
|
10
10
|
});
|
|
11
11
|
fastify.get('/v1/assistants', async (request, reply) => {
|
|
12
|
-
const assistants = adapter.listAssistants();
|
|
12
|
+
const assistants = await adapter.listAssistants();
|
|
13
13
|
let data = assistants;
|
|
14
14
|
const { limit = 20, order = 'desc', after, before } = request.query;
|
|
15
15
|
if (order === 'asc') {
|
|
@@ -42,7 +42,7 @@ export function registerAssistantRoutes(fastify, adapter) {
|
|
|
42
42
|
return reply.send(response);
|
|
43
43
|
});
|
|
44
44
|
fastify.get('/v1/assistants/:assistant_id', async (request, reply) => {
|
|
45
|
-
const assistant = adapter.getAssistant(request.params.assistant_id);
|
|
45
|
+
const assistant = await adapter.getAssistant(request.params.assistant_id);
|
|
46
46
|
if (!assistant) {
|
|
47
47
|
return reply.status(404).send({
|
|
48
48
|
error: {
|
|
@@ -55,7 +55,7 @@ export function registerAssistantRoutes(fastify, adapter) {
|
|
|
55
55
|
return reply.send(assistant);
|
|
56
56
|
});
|
|
57
57
|
fastify.post('/v1/assistants/:assistant_id', async (request, reply) => {
|
|
58
|
-
const assistant = adapter.updateAssistant(request.params.assistant_id, request.body);
|
|
58
|
+
const assistant = await adapter.updateAssistant(request.params.assistant_id, request.body);
|
|
59
59
|
if (!assistant) {
|
|
60
60
|
return reply.status(404).send({
|
|
61
61
|
error: {
|
|
@@ -68,7 +68,7 @@ export function registerAssistantRoutes(fastify, adapter) {
|
|
|
68
68
|
return reply.send(assistant);
|
|
69
69
|
});
|
|
70
70
|
fastify.delete('/v1/assistants/:assistant_id', async (request, reply) => {
|
|
71
|
-
const deleted = adapter.deleteAssistant(request.params.assistant_id);
|
|
71
|
+
const deleted = await adapter.deleteAssistant(request.params.assistant_id);
|
|
72
72
|
if (!deleted) {
|
|
73
73
|
return reply.status(404).send({
|
|
74
74
|
error: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assistants.js","sourceRoot":"","sources":["../../../src/server/routes/assistants.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAWH,MAAM,UAAU,uBAAuB,CAAC,OAAwB,EAAE,OAAsB;IACtF,OAAO,CAAC,IAAI,CAAmC,gBAAgB,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;QACxF,MAAM,SAAS,GAAG,OAAO,CAAC,eAAe,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"assistants.js","sourceRoot":"","sources":["../../../src/server/routes/assistants.ts"],"names":[],"mappings":"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"}
|
|
@@ -32,7 +32,7 @@ export function registerFileRoutes(fastify, adapter) {
|
|
|
32
32
|
},
|
|
33
33
|
});
|
|
34
34
|
}
|
|
35
|
-
const file = threadManager.addFile(fileContent, filename);
|
|
35
|
+
const file = await threadManager.addFile(fileContent, filename);
|
|
36
36
|
const response = {
|
|
37
37
|
id: file.id,
|
|
38
38
|
object: 'file',
|
|
@@ -45,7 +45,7 @@ export function registerFileRoutes(fastify, adapter) {
|
|
|
45
45
|
return reply.status(201).send(response);
|
|
46
46
|
});
|
|
47
47
|
fastify.get('/v1/files', async (_request, reply) => {
|
|
48
|
-
const files = threadManager.listFiles();
|
|
48
|
+
const files = await threadManager.listFiles();
|
|
49
49
|
const data = files.map((file) => ({
|
|
50
50
|
id: file.id,
|
|
51
51
|
object: 'file',
|
|
@@ -63,7 +63,7 @@ export function registerFileRoutes(fastify, adapter) {
|
|
|
63
63
|
return reply.send(response);
|
|
64
64
|
});
|
|
65
65
|
fastify.get('/v1/files/:file_id', async (request, reply) => {
|
|
66
|
-
const file = threadManager.getFile(request.params.file_id);
|
|
66
|
+
const file = await threadManager.getFile(request.params.file_id);
|
|
67
67
|
if (!file) {
|
|
68
68
|
return reply.status(404).send({
|
|
69
69
|
error: {
|
|
@@ -85,7 +85,7 @@ export function registerFileRoutes(fastify, adapter) {
|
|
|
85
85
|
return reply.send(response);
|
|
86
86
|
});
|
|
87
87
|
fastify.get('/v1/files/:file_id/content', async (request, reply) => {
|
|
88
|
-
const file = threadManager.getFile(request.params.file_id);
|
|
88
|
+
const file = await threadManager.getFile(request.params.file_id);
|
|
89
89
|
if (!file) {
|
|
90
90
|
return reply.status(404).send({
|
|
91
91
|
error: {
|
|
@@ -100,7 +100,7 @@ export function registerFileRoutes(fastify, adapter) {
|
|
|
100
100
|
return reply.send(file.content);
|
|
101
101
|
});
|
|
102
102
|
fastify.delete('/v1/files/:file_id', async (request, reply) => {
|
|
103
|
-
const deleted = threadManager.deleteFile(request.params.file_id);
|
|
103
|
+
const deleted = await threadManager.deleteFile(request.params.file_id);
|
|
104
104
|
if (!deleted) {
|
|
105
105
|
return reply.status(404).send({
|
|
106
106
|
error: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"files.js","sourceRoot":"","sources":["../../../src/server/routes/files.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAMH,MAAM,UAAU,kBAAkB,CAAC,OAAwB,EAAE,OAAsB;IACjF,MAAM,aAAa,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAEjD,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;QACjD,MAAM,KAAK,GACT,OASD,CAAC,KAAK,EAAE,CAAC;QAEV,IAAI,WAAW,GAAkB,IAAI,CAAC;QACtC,IAAI,QAAQ,GAAG,MAAM,CAAC;QACtB,IAAI,OAAO,GAAgB,YAAY,CAAC;QAExC,IAAI,KAAK,EAAE,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YAC/B,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,IAAI,IAAI,CAAC,SAAS,KAAK,MAAM,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;gBACnE,MAAM,MAAM,GAAa,EAAE,CAAC;gBAC5B,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;oBACpC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACrB,CAAC;gBACD,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBACpC,QAAQ,GAAG,IAAI,CAAC,QAAQ,IAAI,MAAM,CAAC;YACrC,CAAC;iBAAM,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,IAAI,IAAI,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;gBACjE,OAAO,GAAG,IAAI,CAAC,KAAoB,CAAC;YACtC,CAAC;QACH,CAAC;QAED,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,OAAO,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;gBAC5B,KAAK,EAAE;oBACL,OAAO,EAAE,yBAAyB;oBAClC,IAAI,EAAE,uBAAuB;oBAC7B,IAAI,EAAE,cAAc;iBACrB;aACF,CAAC,CAAC;QACL,CAAC;QAED,MAAM,IAAI,GAAG,aAAa,CAAC,OAAO,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"files.js","sourceRoot":"","sources":["../../../src/server/routes/files.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
*/
|
|
6
6
|
export function registerRunRoutes(fastify, adapter) {
|
|
7
7
|
fastify.post('/v1/threads/:thread_id/runs', async (request, reply) => {
|
|
8
|
-
const thread = adapter.getThread(request.params.thread_id);
|
|
8
|
+
const thread = await adapter.getThread(request.params.thread_id);
|
|
9
9
|
if (!thread) {
|
|
10
10
|
return reply.status(404).send({
|
|
11
11
|
error: {
|
|
@@ -33,10 +33,10 @@ export function registerRunRoutes(fastify, adapter) {
|
|
|
33
33
|
}
|
|
34
34
|
});
|
|
35
35
|
fastify.post('/v1/threads/runs', async (request, reply) => {
|
|
36
|
-
const thread = adapter.createThread();
|
|
36
|
+
const thread = await adapter.createThread();
|
|
37
37
|
if (request.body.thread?.messages) {
|
|
38
38
|
for (const msg of request.body.thread.messages) {
|
|
39
|
-
adapter.addMessage(thread.id, msg);
|
|
39
|
+
await adapter.addMessage(thread.id, msg);
|
|
40
40
|
}
|
|
41
41
|
}
|
|
42
42
|
try {
|
|
@@ -111,40 +111,40 @@ export function registerRunRoutes(fastify, adapter) {
|
|
|
111
111
|
});
|
|
112
112
|
}
|
|
113
113
|
/**
|
|
114
|
-
* Handle streaming run response
|
|
114
|
+
* Handle streaming run response using EventEmitter for real-time token delivery
|
|
115
115
|
*/
|
|
116
|
-
|
|
116
|
+
function handleStreamingRun(reply, adapter, _threadId, runId) {
|
|
117
117
|
reply.header('Content-Type', 'text/event-stream');
|
|
118
118
|
reply.header('Cache-Control', 'no-cache');
|
|
119
119
|
reply.header('Connection', 'keep-alive');
|
|
120
|
+
reply.header('X-Accel-Buffering', 'no');
|
|
120
121
|
const sendEvent = (event, data) => {
|
|
122
|
+
const dataStr = event === 'done' ? data : JSON.stringify(data);
|
|
121
123
|
reply.raw.write(`event: ${event}\n`);
|
|
122
|
-
reply.raw.write(`data: ${
|
|
124
|
+
reply.raw.write(`data: ${dataStr}\n\n`);
|
|
123
125
|
};
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
lastStatus = run.status;
|
|
133
|
-
sendEvent(`thread.run.${run.status}`, run);
|
|
134
|
-
}
|
|
135
|
-
if (['completed', 'failed', 'cancelled', 'expired', 'incomplete'].includes(run.status)) {
|
|
136
|
-
if (run.status === 'completed') {
|
|
137
|
-
const messages = adapter.listMessages(threadId, { run_id: runId, limit: 1 });
|
|
138
|
-
if (messages.length > 0) {
|
|
139
|
-
sendEvent('thread.message.completed', messages[0]);
|
|
140
|
-
}
|
|
141
|
-
}
|
|
142
|
-
break;
|
|
143
|
-
}
|
|
144
|
-
await new Promise((resolve) => setTimeout(resolve, 1000));
|
|
145
|
-
iterations++;
|
|
126
|
+
const emitter = adapter.getStreamEmitter(runId);
|
|
127
|
+
if (!emitter) {
|
|
128
|
+
sendEvent('error', {
|
|
129
|
+
error: { message: 'No stream available for this run', type: 'server_error' },
|
|
130
|
+
});
|
|
131
|
+
sendEvent('done', '[DONE]');
|
|
132
|
+
reply.raw.end();
|
|
133
|
+
return;
|
|
146
134
|
}
|
|
147
|
-
|
|
148
|
-
|
|
135
|
+
const eventHandler = (type, data) => {
|
|
136
|
+
sendEvent(type, data);
|
|
137
|
+
};
|
|
138
|
+
const endHandler = () => {
|
|
139
|
+
emitter.off('event', eventHandler);
|
|
140
|
+
emitter.off('end', endHandler);
|
|
141
|
+
reply.raw.end();
|
|
142
|
+
};
|
|
143
|
+
emitter.on('event', eventHandler);
|
|
144
|
+
emitter.on('end', endHandler);
|
|
145
|
+
reply.raw.on('close', () => {
|
|
146
|
+
emitter.off('event', eventHandler);
|
|
147
|
+
emitter.off('end', endHandler);
|
|
148
|
+
});
|
|
149
149
|
}
|
|
150
150
|
//# sourceMappingURL=runs.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runs.js","sourceRoot":"","sources":["../../../src/server/routes/runs.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAMH,MAAM,UAAU,iBAAiB,CAAC,OAAwB,EAAE,OAAsB;IAChF,OAAO,CAAC,IAAI,CACV,6BAA6B,EAC7B,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;QACvB,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"runs.js","sourceRoot":"","sources":["../../../src/server/routes/runs.ts"],"names":[],"mappings":"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"}
|