@itphx/synth-backend 0.7.2 → 0.8.2
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/app.d.ts +1 -1
- package/dist/app.d.ts.map +1 -1
- package/dist/app.js +241 -84
- package/dist/app.js.map +1 -1
- package/dist/lib/i18n.d.ts.map +1 -1
- package/dist/lib/i18n.js +2 -0
- package/dist/lib/i18n.js.map +1 -1
- package/dist/lib/orchestrator-workspace.test.js +28 -1
- package/dist/lib/orchestrator-workspace.test.js.map +1 -1
- package/dist/lib/recalc-can-summarize.d.ts +16 -0
- package/dist/lib/recalc-can-summarize.d.ts.map +1 -0
- package/dist/lib/recalc-can-summarize.js +48 -0
- package/dist/lib/recalc-can-summarize.js.map +1 -0
- package/dist/routes/agents.d.ts +8 -3
- package/dist/routes/agents.d.ts.map +1 -1
- package/dist/routes/agents.js +18 -154
- package/dist/routes/agents.js.map +1 -1
- package/dist/routes/agents.test.js +2 -2
- package/dist/routes/agents.test.js.map +1 -1
- package/dist/routes/git.test.d.ts +2 -0
- package/dist/routes/git.test.d.ts.map +1 -0
- package/dist/routes/git.test.js +168 -0
- package/dist/routes/git.test.js.map +1 -0
- package/dist/routes/mcp-registry.d.ts +17 -0
- package/dist/routes/mcp-registry.d.ts.map +1 -0
- package/dist/routes/mcp-registry.js +360 -0
- package/dist/routes/mcp-registry.js.map +1 -0
- package/dist/routes/mcp-registry.test.js +1 -0
- package/dist/routes/mcp-registry.test.js.map +1 -1
- package/dist/routes/mcp.d.ts +9 -13
- package/dist/routes/mcp.d.ts.map +1 -1
- package/dist/routes/mcp.js +10 -382
- package/dist/routes/mcp.js.map +1 -1
- package/dist/routes/mcp.test.js +1 -0
- package/dist/routes/mcp.test.js.map +1 -1
- package/dist/routes/messages.d.ts +5 -0
- package/dist/routes/messages.d.ts.map +1 -1
- package/dist/routes/messages.js +15 -153
- package/dist/routes/messages.js.map +1 -1
- package/dist/routes/messages.test.d.ts +2 -0
- package/dist/routes/messages.test.d.ts.map +1 -0
- package/dist/routes/messages.test.js +85 -0
- package/dist/routes/messages.test.js.map +1 -0
- package/dist/routes/models.d.ts +3 -2
- package/dist/routes/models.d.ts.map +1 -1
- package/dist/routes/models.js +7 -168
- package/dist/routes/models.js.map +1 -1
- package/dist/routes/models.test.js +1 -1
- package/dist/routes/models.test.js.map +1 -1
- package/dist/routes/projects-mcp.test.js +1 -1
- package/dist/routes/projects-mcp.test.js.map +1 -1
- package/dist/routes/projects-skills.integration.test.d.ts +2 -0
- package/dist/routes/projects-skills.integration.test.d.ts.map +1 -0
- package/dist/routes/projects-skills.integration.test.js +60 -0
- package/dist/routes/projects-skills.integration.test.js.map +1 -0
- package/dist/routes/projects.d.ts +24 -3
- package/dist/routes/projects.d.ts.map +1 -1
- package/dist/routes/projects.js +53 -216
- package/dist/routes/projects.js.map +1 -1
- package/dist/routes/projects.test.js +302 -3
- package/dist/routes/projects.test.js.map +1 -1
- package/dist/routes/providers.d.ts +1 -1
- package/dist/routes/providers.d.ts.map +1 -1
- package/dist/routes/providers.test.js +1 -1
- package/dist/routes/providers.test.js.map +1 -1
- package/dist/routes/queue.d.ts +4 -0
- package/dist/routes/queue.d.ts.map +1 -1
- package/dist/routes/queue.js +11 -138
- package/dist/routes/queue.js.map +1 -1
- package/dist/routes/sessions.d.ts +1 -1
- package/dist/routes/sessions.d.ts.map +1 -1
- package/dist/routes/sessions.js +4 -1
- package/dist/routes/sessions.js.map +1 -1
- package/dist/routes/sessions.test.js +1 -1
- package/dist/routes/sessions.test.js.map +1 -1
- package/dist/routes/ssh-keys.test.d.ts +2 -0
- package/dist/routes/ssh-keys.test.d.ts.map +1 -0
- package/dist/routes/ssh-keys.test.js +129 -0
- package/dist/routes/ssh-keys.test.js.map +1 -0
- package/package.json +3 -4
- package/dist/lib/git-service.d.ts +0 -15
- package/dist/lib/git-service.d.ts.map +0 -1
- package/dist/lib/git-service.js +0 -215
- package/dist/lib/git-service.js.map +0 -1
- package/dist/lib/workspace-resolver.d.ts +0 -26
- package/dist/lib/workspace-resolver.d.ts.map +0 -1
- package/dist/lib/workspace-resolver.js +0 -249
- package/dist/lib/workspace-resolver.js.map +0 -1
- package/dist/routes/fs.d.ts +0 -5
- package/dist/routes/fs.d.ts.map +0 -1
- package/dist/routes/fs.js +0 -391
- package/dist/routes/fs.js.map +0 -1
- package/dist/routes/git.d.ts +0 -5
- package/dist/routes/git.d.ts.map +0 -1
- package/dist/routes/git.js +0 -105
- package/dist/routes/git.js.map +0 -1
- package/dist/storage/json-store.d.ts +0 -20
- package/dist/storage/json-store.d.ts.map +0 -1
- package/dist/storage/json-store.js +0 -100
- package/dist/storage/json-store.js.map +0 -1
- package/dist/storage/json-store.test.d.ts +0 -2
- package/dist/storage/json-store.test.d.ts.map +0 -1
- package/dist/storage/json-store.test.js +0 -59
- package/dist/storage/json-store.test.js.map +0 -1
- package/dist/storage/project-store.d.ts +0 -30
- package/dist/storage/project-store.d.ts.map +0 -1
- package/dist/storage/project-store.js +0 -109
- package/dist/storage/project-store.js.map +0 -1
|
@@ -1,5 +1,10 @@
|
|
|
1
1
|
import { Hono } from 'hono';
|
|
2
2
|
import type { AuthKit } from '../auth/middleware.js';
|
|
3
3
|
import type { SessionManager, ContextOptimizer, EventBus } from '@itphx/synth-core';
|
|
4
|
+
/**
|
|
5
|
+
* Backend-обёртка над core-фабрикой сообщений: добавляет i18n-сообщения и хук
|
|
6
|
+
* пересчёта `canSummarize` после мутаций (backend-специфика). Логика роутов
|
|
7
|
+
* (batch/toggle/pin/delete/retry/debug) — в core-фабрике.
|
|
8
|
+
*/
|
|
4
9
|
export declare function createMessageRoutes(kit: AuthKit, sessionManager: SessionManager, contextOptimizer: ContextOptimizer | null, eventBus: EventBus): Hono;
|
|
5
10
|
//# sourceMappingURL=messages.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"messages.d.ts","sourceRoot":"","sources":["../../src/routes/messages.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,KAAK,EAAE,cAAc,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"messages.d.ts","sourceRoot":"","sources":["../../src/routes/messages.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,KAAK,EAAE,cAAc,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAKpF;;;;GAIG;AACH,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,OAAO,EACZ,cAAc,EAAE,cAAc,EAC9B,gBAAgB,EAAE,gBAAgB,GAAG,IAAI,EACzC,QAAQ,EAAE,QAAQ,GACjB,IAAI,CAkBN"}
|
package/dist/routes/messages.js
CHANGED
|
@@ -1,160 +1,22 @@
|
|
|
1
1
|
import { Hono } from 'hono';
|
|
2
|
+
import { createMessageRoutes as createCoreMessageRoutes } from '@itphx/synth-core';
|
|
2
3
|
import { t } from '../lib/i18n.js';
|
|
4
|
+
import { createRecalcCanSummarize } from '../lib/recalc-can-summarize.js';
|
|
5
|
+
/**
|
|
6
|
+
* Backend-обёртка над core-фабрикой сообщений: добавляет i18n-сообщения и хук
|
|
7
|
+
* пересчёта `canSummarize` после мутаций (backend-специфика). Логика роутов
|
|
8
|
+
* (batch/toggle/pin/delete/retry/debug) — в core-фабрике.
|
|
9
|
+
*/
|
|
3
10
|
export function createMessageRoutes(kit, sessionManager, contextOptimizer, eventBus) {
|
|
4
11
|
const app = new Hono();
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
let shouldClearPending = false;
|
|
14
|
-
if (s.summarizationPending && s.settings.summarizationEnabled) {
|
|
15
|
-
const sumResult = contextOptimizer.shouldSummarize(s);
|
|
16
|
-
if (!sumResult.triggered) {
|
|
17
|
-
shouldClearPending = true;
|
|
18
|
-
}
|
|
19
|
-
}
|
|
20
|
-
await sessionManager.withLock(sessionId, async (locked) => {
|
|
21
|
-
locked.canSummarize = can;
|
|
22
|
-
if (shouldClearPending)
|
|
23
|
-
locked.summarizationPending = false;
|
|
24
|
-
await sessionManager.saveSession(locked);
|
|
25
|
-
});
|
|
26
|
-
eventBus.publish(sessionId, 'session.updated', {
|
|
27
|
-
session_id: sessionId,
|
|
28
|
-
can_summarize: can,
|
|
29
|
-
summarization_pending: shouldClearPending ? false : undefined,
|
|
30
|
-
input_tokens: s.inputTokens,
|
|
31
|
-
output_tokens: s.outputTokens,
|
|
32
|
-
total_tokens: s.totalTokens,
|
|
33
|
-
cache_read_tokens: s.cacheReadTokens,
|
|
34
|
-
cache_write_tokens: s.cacheWriteTokens,
|
|
35
|
-
reasoning_tokens: s.reasoningTokens,
|
|
36
|
-
input_cost: s.inputCost,
|
|
37
|
-
output_cost: s.outputCost,
|
|
38
|
-
cache_read_cost: s.cacheReadCost,
|
|
39
|
-
cache_write_cost: s.cacheWriteCost,
|
|
40
|
-
});
|
|
41
|
-
}
|
|
42
|
-
// POST /api/v2/messages/:sessionId/batch — групповая операция
|
|
43
|
-
app.post('/:sessionId/batch', kit.requireAuth, async (c) => {
|
|
44
|
-
const sessionId = c.req.param('sessionId');
|
|
45
|
-
const body = await c.req.json();
|
|
46
|
-
const { action, indices, state } = body;
|
|
47
|
-
if (!['pin', 'toggle', 'delete'].includes(action)) {
|
|
48
|
-
return c.json({ error: { code: 'INVALID_ACTION', message: `Unknown action: ${action}` } }, 400);
|
|
49
|
-
}
|
|
50
|
-
if (!Array.isArray(indices) || indices.length === 0) {
|
|
51
|
-
return c.json({ error: { code: 'INVALID_INDICES', message: 'indices must be a non-empty array' } }, 400);
|
|
52
|
-
}
|
|
53
|
-
const session = await sessionManager.getSession(sessionId);
|
|
54
|
-
if (!session)
|
|
55
|
-
return c.json({ error: { code: 'NOT_FOUND', message: t('errors.notFound.session', undefined, c) } }, 404);
|
|
56
|
-
const result = await sessionManager.batchMessageOperation(sessionId, action, indices, state);
|
|
57
|
-
recalcCanSummarize(sessionId);
|
|
58
|
-
return c.json(result, 200);
|
|
59
|
-
});
|
|
60
|
-
// PATCH /api/v2/messages/:sessionId/:index/toggle — переключить disabled
|
|
61
|
-
app.patch('/:sessionId/:index/toggle', kit.requireAuth, async (c) => {
|
|
62
|
-
const sessionId = c.req.param('sessionId');
|
|
63
|
-
const index = parseInt(c.req.param('index'), 10);
|
|
64
|
-
const session = await sessionManager.getSession(sessionId);
|
|
65
|
-
if (!session) {
|
|
66
|
-
return c.json({ error: { code: 'NOT_FOUND', message: t('errors.notFound.session', undefined, c) } }, 404);
|
|
67
|
-
}
|
|
68
|
-
if (index < 0 || index >= session.messages.length) {
|
|
69
|
-
return c.json({ error: { code: 'NOT_FOUND', message: t('errors.notFound.message', undefined, c) } }, 404);
|
|
70
|
-
}
|
|
71
|
-
session.messages[index].disabled = !session.messages[index].disabled;
|
|
72
|
-
await sessionManager.updateSession(session);
|
|
73
|
-
recalcCanSummarize(sessionId);
|
|
74
|
-
return c.json({
|
|
75
|
-
disabled: session.messages[index].disabled,
|
|
76
|
-
success: true,
|
|
77
|
-
});
|
|
78
|
-
});
|
|
79
|
-
// PATCH /api/v2/messages/:sessionId/:index/pin — переключить pinned
|
|
80
|
-
app.patch('/:sessionId/:index/pin', kit.requireAuth, async (c) => {
|
|
81
|
-
const sessionId = c.req.param('sessionId');
|
|
82
|
-
const index = parseInt(c.req.param('index'), 10);
|
|
83
|
-
const session = await sessionManager.getSession(sessionId);
|
|
84
|
-
if (!session) {
|
|
85
|
-
return c.json({ error: { code: 'NOT_FOUND', message: t('errors.notFound.session', undefined, c) } }, 404);
|
|
86
|
-
}
|
|
87
|
-
if (index < 0 || index >= session.messages.length) {
|
|
88
|
-
return c.json({ error: { code: 'NOT_FOUND', message: t('errors.notFound.message', undefined, c) } }, 404);
|
|
89
|
-
}
|
|
90
|
-
session.messages[index].pinned = !session.messages[index].pinned;
|
|
91
|
-
await sessionManager.updateSession(session);
|
|
92
|
-
recalcCanSummarize(sessionId);
|
|
93
|
-
return c.json({
|
|
94
|
-
pinned: session.messages[index].pinned,
|
|
95
|
-
success: true,
|
|
96
|
-
});
|
|
97
|
-
});
|
|
98
|
-
// DELETE /api/v2/messages/:sessionId/:index — удалить сообщение
|
|
99
|
-
app.delete('/:sessionId/:index', kit.requireAuth, async (c) => {
|
|
100
|
-
const sessionId = c.req.param('sessionId');
|
|
101
|
-
const index = parseInt(c.req.param('index'), 10);
|
|
102
|
-
const session = await sessionManager.getSession(sessionId);
|
|
103
|
-
if (!session) {
|
|
104
|
-
return c.json({ error: { code: 'NOT_FOUND', message: t('errors.notFound.session', undefined, c) } }, 404);
|
|
105
|
-
}
|
|
106
|
-
if (index < 0 || index >= session.messages.length) {
|
|
107
|
-
return c.json({ error: { code: 'NOT_FOUND', message: t('errors.notFound.message', undefined, c) } }, 404);
|
|
108
|
-
}
|
|
109
|
-
session.messages.splice(index, 1);
|
|
110
|
-
await sessionManager.updateSession(session);
|
|
111
|
-
recalcCanSummarize(sessionId);
|
|
112
|
-
return c.json({ success: true });
|
|
113
|
-
});
|
|
114
|
-
// POST /api/v2/messages/:sessionId/:index/retry — отключить сообщения от index и вернуть текст
|
|
115
|
-
app.post('/:sessionId/:index/retry', kit.requireAuth, async (c) => {
|
|
116
|
-
const sessionId = c.req.param('sessionId');
|
|
117
|
-
const index = parseInt(c.req.param('index'), 10);
|
|
118
|
-
const session = await sessionManager.getSession(sessionId);
|
|
119
|
-
if (!session) {
|
|
120
|
-
return c.json({ error: { code: 'NOT_FOUND', message: t('errors.notFound.session', undefined, c) } }, 404);
|
|
121
|
-
}
|
|
122
|
-
if (index < 0 || index >= session.messages.length) {
|
|
123
|
-
return c.json({ error: { code: 'NOT_FOUND', message: t('errors.notFound.message', undefined, c) } }, 404);
|
|
124
|
-
}
|
|
125
|
-
const msg = session.messages[index];
|
|
126
|
-
const content = msg.content;
|
|
127
|
-
for (let i = index; i < session.messages.length; i++) {
|
|
128
|
-
session.messages[i].disabled = true;
|
|
129
|
-
}
|
|
130
|
-
session.pendingMessages = [];
|
|
131
|
-
await sessionManager.updateSession(session);
|
|
132
|
-
recalcCanSummarize(sessionId);
|
|
133
|
-
return c.json({ content, success: true });
|
|
134
|
-
});
|
|
135
|
-
// GET /api/v2/messages/:sessionId/:index/debug
|
|
136
|
-
app.get('/:sessionId/:index/debug', kit.requireAuth, async (c) => {
|
|
137
|
-
const sessionId = c.req.param('sessionId');
|
|
138
|
-
const index = parseInt(c.req.param('index'), 10);
|
|
139
|
-
const session = await sessionManager.getSession(sessionId);
|
|
140
|
-
if (!session) {
|
|
141
|
-
return c.json({ error: { code: 'NOT_FOUND', message: t('errors.notFound.session', undefined, c) } }, 404);
|
|
142
|
-
}
|
|
143
|
-
if (index < 0 || index >= session.messages.length) {
|
|
144
|
-
return c.json({ error: { code: 'NOT_FOUND', message: t('errors.notFound.message', undefined, c) } }, 404);
|
|
145
|
-
}
|
|
146
|
-
const msg = session.messages[index];
|
|
147
|
-
return c.json({
|
|
148
|
-
role: msg.role,
|
|
149
|
-
content: msg.content.slice(0, 200),
|
|
150
|
-
model: msg.model,
|
|
151
|
-
provider: msg.provider,
|
|
152
|
-
usage: msg.usage,
|
|
153
|
-
debug_data: msg.debugData || {},
|
|
154
|
-
metadata: msg.metadata || {},
|
|
155
|
-
tool_calls: msg.toolCalls,
|
|
156
|
-
});
|
|
157
|
-
});
|
|
12
|
+
const recalcCanSummarize = createRecalcCanSummarize({ sessionManager, contextOptimizer, eventBus });
|
|
13
|
+
app.route('/', createCoreMessageRoutes({ requireAuth: kit.requireAuth }, sessionManager, undefined, {
|
|
14
|
+
messages: {
|
|
15
|
+
sessionNotFound: (c) => t('errors.notFound.session', undefined, c),
|
|
16
|
+
messageNotFound: (c) => t('errors.notFound.message', undefined, c),
|
|
17
|
+
},
|
|
18
|
+
onMessagesChanged: (sessionId) => recalcCanSummarize(sessionId),
|
|
19
|
+
}));
|
|
158
20
|
return app;
|
|
159
21
|
}
|
|
160
22
|
//# sourceMappingURL=messages.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"messages.js","sourceRoot":"","sources":["../../src/routes/messages.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAG5B,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"messages.js","sourceRoot":"","sources":["../../src/routes/messages.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAG5B,OAAO,EAAE,mBAAmB,IAAI,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AACnF,OAAO,EAAE,CAAC,EAAE,MAAM,gBAAgB,CAAC;AACnC,OAAO,EAAE,wBAAwB,EAAE,MAAM,gCAAgC,CAAC;AAE1E;;;;GAIG;AACH,MAAM,UAAU,mBAAmB,CACjC,GAAY,EACZ,cAA8B,EAC9B,gBAAyC,EACzC,QAAkB;IAElB,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;IACvB,MAAM,kBAAkB,GAAG,wBAAwB,CAAC,EAAE,cAAc,EAAE,gBAAgB,EAAE,QAAQ,EAAE,CAAC,CAAC;IAEpG,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE,uBAAuB,CACpC,EAAE,WAAW,EAAE,GAAG,CAAC,WAAW,EAAE,EAChC,cAAc,EACd,SAAS,EACT;QACE,QAAQ,EAAE;YACR,eAAe,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,yBAAyB,EAAE,SAAS,EAAE,CAAC,CAAC;YAClE,eAAe,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,yBAAyB,EAAE,SAAS,EAAE,CAAC,CAAC;SACnE;QACD,iBAAiB,EAAE,CAAC,SAAS,EAAE,EAAE,CAAC,kBAAkB,CAAC,SAAS,CAAC;KAChE,CACF,CAAC,CAAC;IAEH,OAAO,GAAG,CAAC;AACb,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"messages.test.d.ts","sourceRoot":"","sources":["../../src/routes/messages.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,85 @@
|
|
|
1
|
+
import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
|
|
2
|
+
import { Hono } from 'hono';
|
|
3
|
+
import { mkdtemp, rm } from 'node:fs/promises';
|
|
4
|
+
import { tmpdir } from 'node:os';
|
|
5
|
+
import { join } from 'node:path';
|
|
6
|
+
import { createMessageRoutes } from './messages.js';
|
|
7
|
+
import { SessionManager, EventBus, FileStore } from '@itphx/synth-core';
|
|
8
|
+
import { generateId, MessageRole, nowISO, makeTextPart } from '@itphx/synth-shared';
|
|
9
|
+
function makeMessage(content = 'Привет') {
|
|
10
|
+
return {
|
|
11
|
+
id: generateId(),
|
|
12
|
+
role: MessageRole.USER,
|
|
13
|
+
seq: 0,
|
|
14
|
+
origin: 'local',
|
|
15
|
+
parts: [makeTextPart(content)],
|
|
16
|
+
content,
|
|
17
|
+
createdAt: nowISO(),
|
|
18
|
+
disabled: false,
|
|
19
|
+
pinned: false,
|
|
20
|
+
hidden: false,
|
|
21
|
+
author: 'user',
|
|
22
|
+
};
|
|
23
|
+
}
|
|
24
|
+
function createMockKit() {
|
|
25
|
+
return {
|
|
26
|
+
requireAuth: async (_c, next) => { await next(); },
|
|
27
|
+
getCurrentUser: () => null,
|
|
28
|
+
};
|
|
29
|
+
}
|
|
30
|
+
function createTestApp(tmpDir, contextOptimizer) {
|
|
31
|
+
const app = new Hono();
|
|
32
|
+
const fileStore = new FileStore({ dataDir: tmpDir });
|
|
33
|
+
const sessionManager = new SessionManager(fileStore);
|
|
34
|
+
const eventBus = new EventBus();
|
|
35
|
+
app.route('/api/v2/messages', createMessageRoutes(createMockKit(), sessionManager, contextOptimizer, eventBus));
|
|
36
|
+
return { app, sessionManager, eventBus };
|
|
37
|
+
}
|
|
38
|
+
describe('Messages API Routes (core-фабрика через backend-обёртку)', () => {
|
|
39
|
+
let tmpDir;
|
|
40
|
+
beforeEach(async () => {
|
|
41
|
+
tmpDir = await mkdtemp(join(tmpdir(), 'synth-messages-'));
|
|
42
|
+
});
|
|
43
|
+
afterEach(async () => {
|
|
44
|
+
await rm(tmpDir, { recursive: true, force: true });
|
|
45
|
+
});
|
|
46
|
+
it('DELETE перенумеровывает seq удалённых сообщений (core-поведение)', async () => {
|
|
47
|
+
const { app, sessionManager } = createTestApp(tmpDir, null);
|
|
48
|
+
const session = await sessionManager.createSession({ title: 'M' });
|
|
49
|
+
await sessionManager.addMessage(session.id, makeMessage('a'));
|
|
50
|
+
await sessionManager.addMessage(session.id, makeMessage('b'));
|
|
51
|
+
await sessionManager.addMessage(session.id, makeMessage('c'));
|
|
52
|
+
const res = await app.request(`/api/v2/messages/${session.id}/0`, { method: 'DELETE' });
|
|
53
|
+
expect(res.status).toBe(200);
|
|
54
|
+
const s = await sessionManager.getSession(session.id);
|
|
55
|
+
expect(s.messages.map((m) => m.content)).toEqual(['b', 'c']);
|
|
56
|
+
expect(s.messages.map((m) => m.seq)).toEqual([1, 2]);
|
|
57
|
+
});
|
|
58
|
+
it('404 при неверном индексе — локализованное ru-сообщение', async () => {
|
|
59
|
+
const { app, sessionManager } = createTestApp(tmpDir, null);
|
|
60
|
+
const session = await sessionManager.createSession({ title: 'M' });
|
|
61
|
+
await sessionManager.addMessage(session.id, makeMessage('a'));
|
|
62
|
+
const res = await app.request(`/api/v2/messages/${session.id}/5/pin`, { method: 'PATCH' });
|
|
63
|
+
expect(res.status).toBe(404);
|
|
64
|
+
const body = await res.json();
|
|
65
|
+
expect(body.error.message).toBe('Сообщение не найдено');
|
|
66
|
+
});
|
|
67
|
+
it('после мутации ожидает onMessagesChanged: canSummarize пересчитан, session.updated опубликован', async () => {
|
|
68
|
+
const contextOptimizer = {
|
|
69
|
+
canSummarize: vi.fn().mockReturnValue(true),
|
|
70
|
+
shouldSummarize: vi.fn().mockReturnValue({ triggered: false }),
|
|
71
|
+
};
|
|
72
|
+
const { app, sessionManager, eventBus } = createTestApp(tmpDir, contextOptimizer);
|
|
73
|
+
const session = await sessionManager.createSession({ title: 'M' });
|
|
74
|
+
await sessionManager.addMessage(session.id, makeMessage('a'));
|
|
75
|
+
const events = [];
|
|
76
|
+
eventBus.subscribe(session.id, (e) => events.push(e));
|
|
77
|
+
const res = await app.request(`/api/v2/messages/${session.id}/0/toggle`, { method: 'PATCH' });
|
|
78
|
+
expect(res.status).toBe(200);
|
|
79
|
+
// Хук вызван с await — к моменту ответа состояние уже сохранено (гонка устранена).
|
|
80
|
+
const s = await sessionManager.getSession(session.id);
|
|
81
|
+
expect(s.canSummarize).toBe(true);
|
|
82
|
+
expect(events.some((e) => e.type === 'session.updated')).toBe(true);
|
|
83
|
+
});
|
|
84
|
+
});
|
|
85
|
+
//# sourceMappingURL=messages.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"messages.test.js","sourceRoot":"","sources":["../../src/routes/messages.test.ts"],"names":[],"mappings":"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"}
|
package/dist/routes/models.d.ts
CHANGED
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import { Hono } from 'hono';
|
|
2
2
|
import type { AuthKit } from '../auth/middleware.js';
|
|
3
|
-
import { JsonStore } from '
|
|
3
|
+
import { JsonStore } from '@itphx/synth-core';
|
|
4
4
|
import type { ModelConfig, ProviderConfig } from '@itphx/synth-shared';
|
|
5
5
|
/**
|
|
6
6
|
* Backend-обёртка над core-фабрикой моделей: добавляет только RBAC
|
|
7
|
-
* (мутации — ADMIN), `
|
|
7
|
+
* (мутации и синхронизация — ADMIN), rate limit на `fetch` и `set_as_default`.
|
|
8
|
+
* Логика роутов (GET /, POST /, DELETE /:id, POST /fetch) — в core-фабрике.
|
|
8
9
|
*/
|
|
9
10
|
export declare function createModelRoutes(kit: AuthKit, modelStore: JsonStore<ModelConfig>, providerStore: JsonStore<ProviderConfig>, modelCache: Map<string, ModelConfig>, providerCache: Map<string, ProviderConfig>): Hono;
|
|
10
11
|
//# sourceMappingURL=models.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../../src/routes/models.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../../src/routes/models.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,KAAK,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAKvE;;;;GAIG;AACH,wBAAgB,iBAAiB,CAC/B,GAAG,EAAE,OAAO,EACZ,UAAU,EAAE,SAAS,CAAC,WAAW,CAAC,EAClC,aAAa,EAAE,SAAS,CAAC,cAAc,CAAC,EACxC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,EACpC,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,GACzC,IAAI,CAwBN"}
|
package/dist/routes/models.js
CHANGED
|
@@ -1,186 +1,25 @@
|
|
|
1
1
|
import { Hono } from 'hono';
|
|
2
|
-
import {
|
|
3
|
-
import { createModelRoutes as createCoreModelRoutes, ProviderFactory } from '@itphx/synth-core';
|
|
2
|
+
import { createModelRoutes as createCoreModelRoutes } from '@itphx/synth-core';
|
|
4
3
|
import { t } from '../lib/i18n.js';
|
|
5
4
|
import { createRateLimiter } from '../middleware/rate-limiter.js';
|
|
6
|
-
/** Есть ли у модели хоть одна заданная цена. */
|
|
7
|
-
function hasAnyPrice(model) {
|
|
8
|
-
return model.inputPrice !== undefined
|
|
9
|
-
|| model.outputPrice !== undefined
|
|
10
|
-
|| model.cacheReadPrice !== undefined
|
|
11
|
-
|| model.cacheWritePrice !== undefined;
|
|
12
|
-
}
|
|
13
|
-
/**
|
|
14
|
-
* Считаются ли цены модели ручными. Явная пометка `priceSource === 'manual'`,
|
|
15
|
-
* либо старые записи без `priceSource`, но с ценами (введены вручную до
|
|
16
|
-
* появления поля) — их нельзя терять при синхронизации.
|
|
17
|
-
*/
|
|
18
|
-
function isManualPriceSource(model) {
|
|
19
|
-
return model.priceSource === 'manual' || (model.priceSource === undefined && hasAnyPrice(model));
|
|
20
|
-
}
|
|
21
|
-
/** Токенные цены от провайдера, если они есть; иначе undefined. */
|
|
22
|
-
function collectApiPrices(model) {
|
|
23
|
-
if (model.inputPrice === undefined
|
|
24
|
-
&& model.outputPrice === undefined
|
|
25
|
-
&& model.cacheReadPrice === undefined
|
|
26
|
-
&& model.cacheWritePrice === undefined) {
|
|
27
|
-
return undefined;
|
|
28
|
-
}
|
|
29
|
-
return {
|
|
30
|
-
inputPrice: model.inputPrice,
|
|
31
|
-
outputPrice: model.outputPrice,
|
|
32
|
-
cacheReadPrice: model.cacheReadPrice,
|
|
33
|
-
cacheWritePrice: model.cacheWritePrice,
|
|
34
|
-
};
|
|
35
|
-
}
|
|
36
5
|
/**
|
|
37
6
|
* Backend-обёртка над core-фабрикой моделей: добавляет только RBAC
|
|
38
|
-
* (мутации — ADMIN), `
|
|
7
|
+
* (мутации и синхронизация — ADMIN), rate limit на `fetch` и `set_as_default`.
|
|
8
|
+
* Логика роутов (GET /, POST /, DELETE /:id, POST /fetch) — в core-фабрике.
|
|
39
9
|
*/
|
|
40
10
|
export function createModelRoutes(kit, modelStore, providerStore, modelCache, providerCache) {
|
|
41
11
|
const app = new Hono();
|
|
42
|
-
// POST /
|
|
43
|
-
// Статический сегмент регистрируем до core-роутов (в т.ч. /:id).
|
|
44
|
-
app.post('/fetch', kit.requireAdmin, createRateLimiter(3, 120_000), async (c) => {
|
|
45
|
-
const providerFilter = c.req.query('provider');
|
|
46
|
-
const providers = await providerStore.list();
|
|
47
|
-
const enabledProviders = providers.filter((p) => p.enabled !== false && (!providerFilter || p.name === providerFilter));
|
|
48
|
-
let totalFetched = 0;
|
|
49
|
-
let totalNew = 0;
|
|
50
|
-
let totalEnriched = 0;
|
|
51
|
-
let totalPriced = 0;
|
|
52
|
-
let totalLimited = 0;
|
|
53
|
-
const errors = [];
|
|
54
|
-
for (const provider of enabledProviders) {
|
|
55
|
-
const providerConfig = {
|
|
56
|
-
type: provider.type,
|
|
57
|
-
name: provider.name,
|
|
58
|
-
url: provider.baseUrl || '',
|
|
59
|
-
apiKey: provider.apiKey || '',
|
|
60
|
-
model: provider.defaultModel || '',
|
|
61
|
-
timeout: 30,
|
|
62
|
-
currency: provider.currency,
|
|
63
|
-
};
|
|
64
|
-
if (!providerConfig.url)
|
|
65
|
-
continue;
|
|
66
|
-
try {
|
|
67
|
-
const instance = ProviderFactory.create(provider.name, providerConfig);
|
|
68
|
-
const models = await instance.listModelsDetailed();
|
|
69
|
-
for (const model of models) {
|
|
70
|
-
const modelId = model.id;
|
|
71
|
-
const fullId = `${provider.name}/${modelId}`;
|
|
72
|
-
const existing = await modelStore.load(fullId);
|
|
73
|
-
const { window, source } = lookupContextWindow(modelId);
|
|
74
|
-
// Окно, сообщённое самим провайдером (Ollama /api/tags), приоритетнее
|
|
75
|
-
// справочника и ручных значений; 0/undefined означает «неизвестно».
|
|
76
|
-
const apiWindow = typeof model.contextWindow === 'number' && model.contextWindow > 0
|
|
77
|
-
? model.contextWindow
|
|
78
|
-
: 0;
|
|
79
|
-
const resolvedWindow = apiWindow > 0 ? apiWindow : window;
|
|
80
|
-
const resolvedSource = apiWindow > 0
|
|
81
|
-
? 'api'
|
|
82
|
-
: (source !== 'unknown' ? source : 'unknown');
|
|
83
|
-
// Лимит выходных токенов — только из API.
|
|
84
|
-
const apiMaxOutput = typeof model.maxOutputTokens === 'number' && model.maxOutputTokens > 0
|
|
85
|
-
? model.maxOutputTokens
|
|
86
|
-
: undefined;
|
|
87
|
-
// Токенные цены от провайдера (B1 отфильтровал non-token тарифы).
|
|
88
|
-
const apiPrices = collectApiPrices(model);
|
|
89
|
-
if (!existing) {
|
|
90
|
-
// Новая модель
|
|
91
|
-
const newModel = {
|
|
92
|
-
id: fullId,
|
|
93
|
-
name: modelId,
|
|
94
|
-
provider: provider.name,
|
|
95
|
-
description: '',
|
|
96
|
-
enabled: true,
|
|
97
|
-
isDefault: false,
|
|
98
|
-
contextWindow: resolvedWindow,
|
|
99
|
-
contextSource: resolvedSource,
|
|
100
|
-
};
|
|
101
|
-
if (apiMaxOutput !== undefined) {
|
|
102
|
-
newModel.maxOutputTokens = apiMaxOutput;
|
|
103
|
-
totalLimited++;
|
|
104
|
-
}
|
|
105
|
-
if (apiPrices) {
|
|
106
|
-
Object.assign(newModel, apiPrices);
|
|
107
|
-
newModel.priceSource = 'api';
|
|
108
|
-
totalPriced++;
|
|
109
|
-
}
|
|
110
|
-
if (provider.currency) {
|
|
111
|
-
newModel.currency = provider.currency;
|
|
112
|
-
}
|
|
113
|
-
await modelStore.save(fullId, newModel);
|
|
114
|
-
modelCache.set(fullId, newModel);
|
|
115
|
-
totalNew++;
|
|
116
|
-
totalFetched++;
|
|
117
|
-
continue;
|
|
118
|
-
}
|
|
119
|
-
let changed = false;
|
|
120
|
-
if (apiWindow > 0 && existing.contextWindow !== apiWindow) {
|
|
121
|
-
// Провайдер сообщил реальное окно — оно приоритетнее справочника
|
|
122
|
-
// и актуальнее ранее известного api/reference-значения, но НЕ
|
|
123
|
-
// перезаписывает вручную заданное пользователем (source='manual').
|
|
124
|
-
const hasManualWindow = existing.contextSource === 'manual' && (existing.contextWindow ?? 0) > 0;
|
|
125
|
-
if (!hasManualWindow) {
|
|
126
|
-
existing.contextWindow = apiWindow;
|
|
127
|
-
existing.contextSource = 'api';
|
|
128
|
-
changed = true;
|
|
129
|
-
totalEnriched++;
|
|
130
|
-
}
|
|
131
|
-
}
|
|
132
|
-
else if ((existing.contextWindow ?? 0) === 0 && window > 0) {
|
|
133
|
-
// Обогащаем существующую модель справочными данными
|
|
134
|
-
existing.contextWindow = window;
|
|
135
|
-
existing.contextSource = source;
|
|
136
|
-
changed = true;
|
|
137
|
-
totalEnriched++;
|
|
138
|
-
}
|
|
139
|
-
// maxOutputTokens: заполняем только если пришло из API и ещё не задано.
|
|
140
|
-
if (apiMaxOutput !== undefined && existing.maxOutputTokens == null) {
|
|
141
|
-
existing.maxOutputTokens = apiMaxOutput;
|
|
142
|
-
changed = true;
|
|
143
|
-
totalLimited++;
|
|
144
|
-
}
|
|
145
|
-
// Цены: пишем api-цены, только если модель не помечена ручной и нет
|
|
146
|
-
// старых цен без priceSource (их тоже считаем ручными).
|
|
147
|
-
if (apiPrices && !isManualPriceSource(existing)) {
|
|
148
|
-
Object.assign(existing, apiPrices);
|
|
149
|
-
existing.priceSource = 'api';
|
|
150
|
-
if (existing.currency === undefined && provider.currency) {
|
|
151
|
-
existing.currency = provider.currency;
|
|
152
|
-
}
|
|
153
|
-
changed = true;
|
|
154
|
-
totalPriced++;
|
|
155
|
-
}
|
|
156
|
-
totalFetched++;
|
|
157
|
-
if (changed) {
|
|
158
|
-
await modelStore.save(fullId, existing);
|
|
159
|
-
modelCache.set(fullId, existing);
|
|
160
|
-
}
|
|
161
|
-
}
|
|
162
|
-
}
|
|
163
|
-
catch (err) {
|
|
164
|
-
errors.push(`${provider.name}: ${err instanceof Error ? err.message : t('errors.generic', undefined, c)}`);
|
|
165
|
-
}
|
|
166
|
-
}
|
|
167
|
-
return c.json({
|
|
168
|
-
fetched: totalFetched,
|
|
169
|
-
new: totalNew,
|
|
170
|
-
enriched: totalEnriched,
|
|
171
|
-
priced: totalPriced,
|
|
172
|
-
limited: totalLimited,
|
|
173
|
-
errors: errors.length ? errors : undefined,
|
|
174
|
-
});
|
|
175
|
-
});
|
|
176
|
-
// Общая логика (GET /, POST /, DELETE /:id, set_as_default) — в core.
|
|
12
|
+
// Общая логика (GET /, POST /, DELETE /:id, POST /fetch, set_as_default) — в core.
|
|
177
13
|
app.route('/', createCoreModelRoutes({ requireAuth: kit.requireAuth }, modelStore, providerStore, modelCache, {
|
|
178
14
|
writeGuard: kit.requireAdmin,
|
|
15
|
+
fetchGuard: kit.requireAdmin,
|
|
16
|
+
fetchMiddleware: [createRateLimiter(3, 120_000)],
|
|
179
17
|
providerCache,
|
|
180
18
|
supportSetAsDefault: true,
|
|
181
19
|
messages: {
|
|
182
20
|
idRequired: (c) => t('errors.validation.idRequired', undefined, c),
|
|
183
21
|
modelNotFound: (c) => t('errors.notFound.model', undefined, c),
|
|
22
|
+
fetchError: (c) => t('errors.generic', undefined, c),
|
|
184
23
|
},
|
|
185
24
|
}));
|
|
186
25
|
return app;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"models.js","sourceRoot":"","sources":["../../src/routes/models.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAI5B,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"models.js","sourceRoot":"","sources":["../../src/routes/models.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAI5B,OAAO,EAAE,iBAAiB,IAAI,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC/E,OAAO,EAAE,CAAC,EAAE,MAAM,gBAAgB,CAAC;AACnC,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAElE;;;;GAIG;AACH,MAAM,UAAU,iBAAiB,CAC/B,GAAY,EACZ,UAAkC,EAClC,aAAwC,EACxC,UAAoC,EACpC,aAA0C;IAE1C,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;IAEvB,mFAAmF;IACnF,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE,qBAAqB,CAClC,EAAE,WAAW,EAAE,GAAG,CAAC,WAAW,EAAE,EAChC,UAAU,EACV,aAAa,EACb,UAAU,EACV;QACE,UAAU,EAAE,GAAG,CAAC,YAAY;QAC5B,UAAU,EAAE,GAAG,CAAC,YAAY;QAC5B,eAAe,EAAE,CAAC,iBAAiB,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;QAChD,aAAa;QACb,mBAAmB,EAAE,IAAI;QACzB,QAAQ,EAAE;YACR,UAAU,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,8BAA8B,EAAE,SAAS,EAAE,CAAC,CAAC;YAClE,aAAa,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,uBAAuB,EAAE,SAAS,EAAE,CAAC,CAAC;YAC9D,UAAU,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,gBAAgB,EAAE,SAAS,EAAE,CAAC,CAAC;SACrD;KACF,CACF,CAAC,CAAC;IAEH,OAAO,GAAG,CAAC;AACb,CAAC"}
|
|
@@ -4,7 +4,7 @@ import { mkdtemp, rm } from 'node:fs/promises';
|
|
|
4
4
|
import { tmpdir } from 'node:os';
|
|
5
5
|
import { join } from 'node:path';
|
|
6
6
|
import { createModelRoutes } from './models.js';
|
|
7
|
-
import { JsonStore } from '
|
|
7
|
+
import { JsonStore } from '@itphx/synth-core';
|
|
8
8
|
import { ProviderFactory } from '@itphx/synth-core';
|
|
9
9
|
const BASE = '/api/v2/models';
|
|
10
10
|
function createKit() {
|