@itphx/synth-backend 0.6.0 → 0.7.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.map +1 -1
- package/dist/app.js +93 -13
- package/dist/app.js.map +1 -1
- package/dist/auth/middleware.d.ts +6 -0
- package/dist/auth/middleware.d.ts.map +1 -1
- package/dist/auth/middleware.js +17 -0
- package/dist/auth/middleware.js.map +1 -1
- package/dist/events/hub.d.ts.map +1 -1
- package/dist/events/hub.js +48 -0
- package/dist/events/hub.js.map +1 -1
- package/dist/events/hub.test.d.ts +2 -0
- package/dist/events/hub.test.d.ts.map +1 -0
- package/dist/events/hub.test.js +74 -0
- package/dist/events/hub.test.js.map +1 -0
- package/dist/lib/orchestrator-workspace.test.js +3 -0
- package/dist/lib/orchestrator-workspace.test.js.map +1 -1
- package/dist/routes/agents.d.ts +1 -1
- package/dist/routes/agents.d.ts.map +1 -1
- package/dist/routes/agents.js +3 -3
- package/dist/routes/agents.js.map +1 -1
- package/dist/routes/agents.test.js +30 -3
- package/dist/routes/agents.test.js.map +1 -1
- package/dist/routes/debug.js +2 -2
- package/dist/routes/debug.js.map +1 -1
- package/dist/routes/debug.test.d.ts +2 -0
- package/dist/routes/debug.test.d.ts.map +1 -0
- package/dist/routes/debug.test.js +102 -0
- package/dist/routes/debug.test.js.map +1 -0
- package/dist/routes/llm.d.ts.map +1 -1
- package/dist/routes/llm.js +29 -9
- package/dist/routes/llm.js.map +1 -1
- package/dist/routes/llm.test.js +82 -5
- package/dist/routes/llm.test.js.map +1 -1
- package/dist/routes/mcp-network-policy.integration.test.d.ts +2 -0
- package/dist/routes/mcp-network-policy.integration.test.d.ts.map +1 -0
- package/dist/routes/mcp-network-policy.integration.test.js +44 -0
- package/dist/routes/mcp-network-policy.integration.test.js.map +1 -0
- package/dist/routes/mcp-registry.test.d.ts +2 -0
- package/dist/routes/mcp-registry.test.d.ts.map +1 -0
- package/dist/routes/mcp-registry.test.js +247 -0
- package/dist/routes/mcp-registry.test.js.map +1 -0
- package/dist/routes/mcp.d.ts +13 -10
- package/dist/routes/mcp.d.ts.map +1 -1
- package/dist/routes/mcp.js +219 -74
- package/dist/routes/mcp.js.map +1 -1
- package/dist/routes/mcp.test.js +69 -61
- package/dist/routes/mcp.test.js.map +1 -1
- package/dist/routes/models.d.ts +4 -0
- package/dist/routes/models.d.ts.map +1 -1
- package/dist/routes/models.js +96 -131
- package/dist/routes/models.js.map +1 -1
- package/dist/routes/models.test.js +246 -0
- package/dist/routes/models.test.js.map +1 -1
- package/dist/routes/projects-mcp.test.d.ts +6 -0
- package/dist/routes/projects-mcp.test.d.ts.map +1 -0
- package/dist/routes/projects-mcp.test.js +160 -0
- package/dist/routes/projects-mcp.test.js.map +1 -0
- package/dist/routes/projects.d.ts +4 -2
- package/dist/routes/projects.d.ts.map +1 -1
- package/dist/routes/projects.js +65 -2
- package/dist/routes/projects.js.map +1 -1
- package/dist/routes/projects.test.js +29 -0
- package/dist/routes/projects.test.js.map +1 -1
- package/dist/routes/providers.d.ts +4 -0
- package/dist/routes/providers.d.ts.map +1 -1
- package/dist/routes/providers.js +36 -150
- package/dist/routes/providers.js.map +1 -1
- package/dist/routes/providers.test.js +128 -0
- package/dist/routes/providers.test.js.map +1 -1
- package/dist/routes/sessions-mcp.test.d.ts +6 -0
- package/dist/routes/sessions-mcp.test.d.ts.map +1 -0
- package/dist/routes/sessions-mcp.test.js +182 -0
- package/dist/routes/sessions-mcp.test.js.map +1 -0
- package/dist/routes/sessions.d.ts +17 -1
- package/dist/routes/sessions.d.ts.map +1 -1
- package/dist/routes/sessions.js +105 -385
- package/dist/routes/sessions.js.map +1 -1
- package/dist/routes/sessions.test.js +81 -4
- package/dist/routes/sessions.test.js.map +1 -1
- package/dist/routes/settings.test.js +49 -1
- package/dist/routes/settings.test.js.map +1 -1
- package/package.json +3 -3
- package/dist/lib/mcp-config-store.d.ts +0 -17
- package/dist/lib/mcp-config-store.d.ts.map +0 -1
- package/dist/lib/mcp-config-store.js +0 -67
- package/dist/lib/mcp-config-store.js.map +0 -1
- package/dist/lib/serialize.d.ts +0 -188
- package/dist/lib/serialize.d.ts.map +0 -1
- package/dist/lib/serialize.js +0 -131
- package/dist/lib/serialize.js.map +0 -1
- package/dist/lib/serialize.test.d.ts +0 -2
- package/dist/lib/serialize.test.d.ts.map +0 -1
- package/dist/lib/serialize.test.js +0 -141
- package/dist/lib/serialize.test.js.map +0 -1
package/dist/routes/models.js
CHANGED
|
@@ -1,121 +1,46 @@
|
|
|
1
1
|
import { Hono } from 'hono';
|
|
2
2
|
import { lookupContextWindow } from '@itphx/synth-shared';
|
|
3
|
-
import { ProviderFactory } from '@itphx/synth-core';
|
|
3
|
+
import { createModelRoutes as createCoreModelRoutes, ProviderFactory } from '@itphx/synth-core';
|
|
4
4
|
import { t } from '../lib/i18n.js';
|
|
5
5
|
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
|
+
/**
|
|
37
|
+
* Backend-обёртка над core-фабрикой моделей: добавляет только RBAC
|
|
38
|
+
* (мутации — ADMIN), `set_as_default` и backend-only синхронизацию `fetch`.
|
|
39
|
+
*/
|
|
6
40
|
export function createModelRoutes(kit, modelStore, providerStore, modelCache, providerCache) {
|
|
7
41
|
const app = new Hono();
|
|
8
|
-
//
|
|
9
|
-
|
|
10
|
-
const filterProvider = c.req.query('provider');
|
|
11
|
-
const onlyEnabled = c.req.query('enabled_only') === 'true' || c.req.query('enabled_only') === '1';
|
|
12
|
-
const [models, providers] = await Promise.all([modelStore.list(), providerStore.list()]);
|
|
13
|
-
// Собираем информацию о провайдерах
|
|
14
|
-
const providerMap = new Map();
|
|
15
|
-
for (const p of providers) {
|
|
16
|
-
providerMap.set(p.name, p);
|
|
17
|
-
}
|
|
18
|
-
// Группируем модели по провайдеру (пропускаем модели от несуществующих провайдеров)
|
|
19
|
-
const groups = new Map();
|
|
20
|
-
for (const m of models) {
|
|
21
|
-
if (filterProvider && m.provider !== filterProvider)
|
|
22
|
-
continue;
|
|
23
|
-
if (onlyEnabled && !m.enabled)
|
|
24
|
-
continue;
|
|
25
|
-
if (!providerMap.has(m.provider))
|
|
26
|
-
continue;
|
|
27
|
-
const group = groups.get(m.provider) || [];
|
|
28
|
-
group.push(m);
|
|
29
|
-
groups.set(m.provider, group);
|
|
30
|
-
}
|
|
31
|
-
// Добавляем пустые группы для провайдеров без моделей
|
|
32
|
-
for (const p of providers) {
|
|
33
|
-
if (!groups.has(p.name)) {
|
|
34
|
-
groups.set(p.name, []);
|
|
35
|
-
}
|
|
36
|
-
}
|
|
37
|
-
// Сортируем группы по имени провайдера
|
|
38
|
-
const sortedProviderNames = [...groups.keys()].sort((a, b) => a.localeCompare(b, 'ru'));
|
|
39
|
-
const result = sortedProviderNames.map((providerName) => {
|
|
40
|
-
const groupModels = groups.get(providerName);
|
|
41
|
-
const provider = providerMap.get(providerName);
|
|
42
|
-
// Сортируем модели по имени
|
|
43
|
-
groupModels.sort((a, b) => a.name.localeCompare(b.name, 'ru'));
|
|
44
|
-
return {
|
|
45
|
-
provider: {
|
|
46
|
-
name: providerName,
|
|
47
|
-
type: provider?.type || 'openai',
|
|
48
|
-
icon: provider?.icon || '',
|
|
49
|
-
defaultModel: provider?.defaultModel || '',
|
|
50
|
-
},
|
|
51
|
-
models: groupModels.map((m) => ({
|
|
52
|
-
id: m.id,
|
|
53
|
-
name: m.name,
|
|
54
|
-
provider: m.provider,
|
|
55
|
-
description: m.description,
|
|
56
|
-
enabled: m.enabled,
|
|
57
|
-
isDefault: m.isDefault || provider?.defaultModel === m.name,
|
|
58
|
-
contextWindow: m.contextWindow,
|
|
59
|
-
contextSource: m.contextSource || 'unknown',
|
|
60
|
-
maxOutputTokens: m.maxOutputTokens,
|
|
61
|
-
inputPrice: m.inputPrice,
|
|
62
|
-
outputPrice: m.outputPrice,
|
|
63
|
-
cacheReadPrice: m.cacheReadPrice,
|
|
64
|
-
cacheWritePrice: m.cacheWritePrice,
|
|
65
|
-
})),
|
|
66
|
-
};
|
|
67
|
-
});
|
|
68
|
-
return c.json({ groups: result });
|
|
69
|
-
});
|
|
70
|
-
// POST /api/v2/models — создать/обновить модель (admin)
|
|
71
|
-
app.post('/', kit.requireAdmin, async (c) => {
|
|
72
|
-
const body = await c.req.json().catch(() => ({}));
|
|
73
|
-
const modelId = body.id?.trim() || body.name?.trim();
|
|
74
|
-
if (!modelId) {
|
|
75
|
-
return c.json({ error: { code: 'VALIDATION_ERROR', message: t('errors.validation.idRequired', undefined, c) } }, 400);
|
|
76
|
-
}
|
|
77
|
-
const existing = await modelStore.load(modelId);
|
|
78
|
-
const provider = body.provider || existing?.provider || '';
|
|
79
|
-
const model = {
|
|
80
|
-
id: modelId,
|
|
81
|
-
name: body.name || existing?.name || modelId,
|
|
82
|
-
provider,
|
|
83
|
-
description: body.description ?? existing?.description ?? '',
|
|
84
|
-
enabled: body.enabled ?? existing?.enabled ?? true,
|
|
85
|
-
isDefault: body.is_default ?? body.isDefault ?? existing?.isDefault ?? false,
|
|
86
|
-
contextWindow: 'context_window' in body
|
|
87
|
-
? (body.context_window ?? undefined)
|
|
88
|
-
: (body.contextWindow ?? existing?.contextWindow),
|
|
89
|
-
contextSource: body.context_source ?? body.contextSource ?? existing?.contextSource ?? (body.context_window ? 'manual' : 'unknown'),
|
|
90
|
-
maxOutputTokens: body.max_output_tokens ?? body.maxOutputTokens ?? existing?.maxOutputTokens,
|
|
91
|
-
inputPrice: body.input_price ?? body.inputPrice ?? existing?.inputPrice,
|
|
92
|
-
outputPrice: body.output_price ?? body.outputPrice ?? existing?.outputPrice,
|
|
93
|
-
cacheReadPrice: body.cache_read_price ?? body.cacheReadPrice ?? existing?.cacheReadPrice,
|
|
94
|
-
cacheWritePrice: body.cache_write_price ?? body.cacheWritePrice ?? existing?.cacheWritePrice,
|
|
95
|
-
};
|
|
96
|
-
await modelStore.save(modelId, model);
|
|
97
|
-
modelCache.set(modelId, model);
|
|
98
|
-
// Если set_as_default — обновить провайдера
|
|
99
|
-
if (body.set_as_default && provider) {
|
|
100
|
-
const prov = await providerStore.load(provider);
|
|
101
|
-
if (prov) {
|
|
102
|
-
prov.defaultModel = model.name;
|
|
103
|
-
await providerStore.save(provider, prov);
|
|
104
|
-
providerCache.set(provider, prov);
|
|
105
|
-
// Снять isDefault с других моделей того же провайдера
|
|
106
|
-
const allModels = await modelStore.list();
|
|
107
|
-
for (const m of allModels) {
|
|
108
|
-
if (m.provider === provider && m.id !== modelId && m.isDefault) {
|
|
109
|
-
m.isDefault = false;
|
|
110
|
-
await modelStore.save(m.id, m);
|
|
111
|
-
modelCache.set(m.id, m);
|
|
112
|
-
}
|
|
113
|
-
}
|
|
114
|
-
}
|
|
115
|
-
}
|
|
116
|
-
return c.json(model, existing ? 200 : 201);
|
|
117
|
-
});
|
|
118
|
-
// POST /api/v2/models/fetch — синхронизировать модели с провайдеров (admin)
|
|
42
|
+
// POST /api/v2/models/fetch — синхронизировать модели с провайдеров (admin).
|
|
43
|
+
// Статический сегмент регистрируем до core-роутов (в т.ч. /:id).
|
|
119
44
|
app.post('/fetch', kit.requireAdmin, createRateLimiter(3, 120_000), async (c) => {
|
|
120
45
|
const providerFilter = c.req.query('provider');
|
|
121
46
|
const providers = await providerStore.list();
|
|
@@ -123,6 +48,8 @@ export function createModelRoutes(kit, modelStore, providerStore, modelCache, pr
|
|
|
123
48
|
let totalFetched = 0;
|
|
124
49
|
let totalNew = 0;
|
|
125
50
|
let totalEnriched = 0;
|
|
51
|
+
let totalPriced = 0;
|
|
52
|
+
let totalLimited = 0;
|
|
126
53
|
const errors = [];
|
|
127
54
|
for (const provider of enabledProviders) {
|
|
128
55
|
const providerConfig = {
|
|
@@ -132,6 +59,7 @@ export function createModelRoutes(kit, modelStore, providerStore, modelCache, pr
|
|
|
132
59
|
apiKey: provider.apiKey || '',
|
|
133
60
|
model: provider.defaultModel || '',
|
|
134
61
|
timeout: 30,
|
|
62
|
+
currency: provider.currency,
|
|
135
63
|
};
|
|
136
64
|
if (!providerConfig.url)
|
|
137
65
|
continue;
|
|
@@ -152,6 +80,12 @@ export function createModelRoutes(kit, modelStore, providerStore, modelCache, pr
|
|
|
152
80
|
const resolvedSource = apiWindow > 0
|
|
153
81
|
? 'api'
|
|
154
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);
|
|
155
89
|
if (!existing) {
|
|
156
90
|
// Новая модель
|
|
157
91
|
const newModel = {
|
|
@@ -164,12 +98,26 @@ export function createModelRoutes(kit, modelStore, providerStore, modelCache, pr
|
|
|
164
98
|
contextWindow: resolvedWindow,
|
|
165
99
|
contextSource: resolvedSource,
|
|
166
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
|
+
}
|
|
167
113
|
await modelStore.save(fullId, newModel);
|
|
168
114
|
modelCache.set(fullId, newModel);
|
|
169
115
|
totalNew++;
|
|
170
116
|
totalFetched++;
|
|
117
|
+
continue;
|
|
171
118
|
}
|
|
172
|
-
|
|
119
|
+
let changed = false;
|
|
120
|
+
if (apiWindow > 0 && existing.contextWindow !== apiWindow) {
|
|
173
121
|
// Провайдер сообщил реальное окно — оно приоритетнее справочника
|
|
174
122
|
// и актуальнее ранее известного api/reference-значения, но НЕ
|
|
175
123
|
// перезаписывает вручную заданное пользователем (source='manual').
|
|
@@ -177,23 +125,38 @@ export function createModelRoutes(kit, modelStore, providerStore, modelCache, pr
|
|
|
177
125
|
if (!hasManualWindow) {
|
|
178
126
|
existing.contextWindow = apiWindow;
|
|
179
127
|
existing.contextSource = 'api';
|
|
180
|
-
|
|
181
|
-
modelCache.set(fullId, existing);
|
|
128
|
+
changed = true;
|
|
182
129
|
totalEnriched++;
|
|
183
130
|
}
|
|
184
|
-
totalFetched++;
|
|
185
131
|
}
|
|
186
132
|
else if ((existing.contextWindow ?? 0) === 0 && window > 0) {
|
|
187
133
|
// Обогащаем существующую модель справочными данными
|
|
188
134
|
existing.contextWindow = window;
|
|
189
135
|
existing.contextSource = source;
|
|
190
|
-
|
|
191
|
-
modelCache.set(fullId, existing);
|
|
136
|
+
changed = true;
|
|
192
137
|
totalEnriched++;
|
|
193
|
-
totalFetched++;
|
|
194
138
|
}
|
|
195
|
-
|
|
196
|
-
|
|
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);
|
|
197
160
|
}
|
|
198
161
|
}
|
|
199
162
|
}
|
|
@@ -205,19 +168,21 @@ export function createModelRoutes(kit, modelStore, providerStore, modelCache, pr
|
|
|
205
168
|
fetched: totalFetched,
|
|
206
169
|
new: totalNew,
|
|
207
170
|
enriched: totalEnriched,
|
|
171
|
+
priced: totalPriced,
|
|
172
|
+
limited: totalLimited,
|
|
208
173
|
errors: errors.length ? errors : undefined,
|
|
209
174
|
});
|
|
210
175
|
});
|
|
211
|
-
// DELETE
|
|
212
|
-
app.
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
});
|
|
176
|
+
// Общая логика (GET /, POST /, DELETE /:id, set_as_default) — в core.
|
|
177
|
+
app.route('/', createCoreModelRoutes({ requireAuth: kit.requireAuth }, modelStore, providerStore, modelCache, {
|
|
178
|
+
writeGuard: kit.requireAdmin,
|
|
179
|
+
providerCache,
|
|
180
|
+
supportSetAsDefault: true,
|
|
181
|
+
messages: {
|
|
182
|
+
idRequired: (c) => t('errors.validation.idRequired', undefined, c),
|
|
183
|
+
modelNotFound: (c) => t('errors.notFound.model', undefined, c),
|
|
184
|
+
},
|
|
185
|
+
}));
|
|
221
186
|
return app;
|
|
222
187
|
}
|
|
223
188
|
//# sourceMappingURL=models.js.map
|
|
@@ -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,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"models.js","sourceRoot":"","sources":["../../src/routes/models.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,6 +28,26 @@ async function makeApp(tmpDir) {
|
|
|
28
28
|
app.route(BASE, createModelRoutes(createKit(), modelStore, providerStore, modelCache, providerCache));
|
|
29
29
|
return { app, modelStore, providerStore, modelCache, providerCache };
|
|
30
30
|
}
|
|
31
|
+
/**
|
|
32
|
+
* Mock-AuthKit для RBAC-тестов: `requireAuth` пропускает, `requireAdmin`
|
|
33
|
+
* отклоняет 403. Фиксирует, что мутации и синхронизация закрыты admin-guard'ом
|
|
34
|
+
* (ТД-1, фаза A).
|
|
35
|
+
*/
|
|
36
|
+
function createRbacKit() {
|
|
37
|
+
return {
|
|
38
|
+
requireAuth: async (_c, next) => { await next(); },
|
|
39
|
+
requireAdmin: async (c) => c.json({ error: { code: 'FORBIDDEN', message: 'Access denied' } }, 403),
|
|
40
|
+
};
|
|
41
|
+
}
|
|
42
|
+
async function makeRbacApp(tmpDir) {
|
|
43
|
+
const modelStore = new JsonStore({ dataDir: tmpDir, subdir: 'models' });
|
|
44
|
+
const providerStore = new JsonStore({ dataDir: tmpDir, subdir: 'providers' });
|
|
45
|
+
const modelCache = new Map();
|
|
46
|
+
const providerCache = new Map();
|
|
47
|
+
const app = new Hono();
|
|
48
|
+
app.route(BASE, createModelRoutes(createRbacKit(), modelStore, providerStore, modelCache, providerCache));
|
|
49
|
+
return { app, modelStore, providerStore, modelCache, providerCache };
|
|
50
|
+
}
|
|
31
51
|
function postJSON(body) {
|
|
32
52
|
return {
|
|
33
53
|
method: 'POST',
|
|
@@ -134,6 +154,129 @@ describe('routes/models', () => {
|
|
|
134
154
|
expect(m2?.contextWindow).toBe(131072);
|
|
135
155
|
expect(m2?.contextSource).toBe('api');
|
|
136
156
|
});
|
|
157
|
+
it('новая модель получает токенные цены, maxOutputTokens и валюту провайдера; ответ содержит priced/limited', async () => {
|
|
158
|
+
await stores.providerStore.save('p-rub', {
|
|
159
|
+
name: 'p-rub', type: 'openai', baseUrl: 'http://provider.local', enabled: true, currency: 'RUB',
|
|
160
|
+
});
|
|
161
|
+
vi.spyOn(ProviderFactory, 'create').mockReturnValue({
|
|
162
|
+
listModelsDetailed: vi.fn().mockResolvedValue([{
|
|
163
|
+
id: 'm1',
|
|
164
|
+
contextWindow: 200000,
|
|
165
|
+
maxOutputTokens: 8000,
|
|
166
|
+
inputPrice: 1.5,
|
|
167
|
+
outputPrice: 2.5,
|
|
168
|
+
cacheReadPrice: 0.1,
|
|
169
|
+
cacheWritePrice: 0.2,
|
|
170
|
+
priceUnit: 'token',
|
|
171
|
+
}]),
|
|
172
|
+
});
|
|
173
|
+
const res = await stores.app.request(`${BASE}/fetch?provider=p-rub`, { method: 'POST' });
|
|
174
|
+
const body = await res.json();
|
|
175
|
+
expect(body.new).toBe(1);
|
|
176
|
+
expect(body.priced).toBe(1);
|
|
177
|
+
expect(body.limited).toBe(1);
|
|
178
|
+
const saved = await stores.modelStore.load('p-rub/m1');
|
|
179
|
+
expect(saved).toMatchObject({
|
|
180
|
+
inputPrice: 1.5,
|
|
181
|
+
outputPrice: 2.5,
|
|
182
|
+
cacheReadPrice: 0.1,
|
|
183
|
+
cacheWritePrice: 0.2,
|
|
184
|
+
priceSource: 'api',
|
|
185
|
+
currency: 'RUB',
|
|
186
|
+
maxOutputTokens: 8000,
|
|
187
|
+
contextWindow: 200000,
|
|
188
|
+
contextSource: 'api',
|
|
189
|
+
});
|
|
190
|
+
});
|
|
191
|
+
it('не перезаписывает ручные цены (priceSource=manual) и валюту модели', async () => {
|
|
192
|
+
await stores.modelStore.save('p1/m1', {
|
|
193
|
+
id: 'p1/m1', name: 'm1', provider: 'p1', enabled: true,
|
|
194
|
+
inputPrice: 99, outputPrice: 98, priceSource: 'manual', currency: 'USD',
|
|
195
|
+
});
|
|
196
|
+
vi.spyOn(ProviderFactory, 'create').mockReturnValue({
|
|
197
|
+
listModelsDetailed: vi.fn().mockResolvedValue([
|
|
198
|
+
{ id: 'm1', inputPrice: 1.5, outputPrice: 2.5, priceUnit: 'token' },
|
|
199
|
+
]),
|
|
200
|
+
});
|
|
201
|
+
const res = await stores.app.request(`${BASE}/fetch?provider=p1`, { method: 'POST' });
|
|
202
|
+
const body = await res.json();
|
|
203
|
+
expect(body.priced).toBe(0);
|
|
204
|
+
const saved = await stores.modelStore.load('p1/m1');
|
|
205
|
+
expect(saved?.inputPrice).toBe(99);
|
|
206
|
+
expect(saved?.outputPrice).toBe(98);
|
|
207
|
+
expect(saved?.priceSource).toBe('manual');
|
|
208
|
+
expect(saved?.currency).toBe('USD');
|
|
209
|
+
});
|
|
210
|
+
it('не перезаписывает старые цены без priceSource (считаются ручными)', async () => {
|
|
211
|
+
await stores.modelStore.save('p1/m1', {
|
|
212
|
+
id: 'p1/m1', name: 'm1', provider: 'p1', enabled: true, inputPrice: 42,
|
|
213
|
+
});
|
|
214
|
+
vi.spyOn(ProviderFactory, 'create').mockReturnValue({
|
|
215
|
+
listModelsDetailed: vi.fn().mockResolvedValue([
|
|
216
|
+
{ id: 'm1', inputPrice: 1.5, priceUnit: 'token' },
|
|
217
|
+
]),
|
|
218
|
+
});
|
|
219
|
+
const res = await stores.app.request(`${BASE}/fetch?provider=p1`, { method: 'POST' });
|
|
220
|
+
const body = await res.json();
|
|
221
|
+
expect(body.priced).toBe(0);
|
|
222
|
+
const saved = await stores.modelStore.load('p1/m1');
|
|
223
|
+
expect(saved?.inputPrice).toBe(42);
|
|
224
|
+
expect(saved?.priceSource).toBeUndefined();
|
|
225
|
+
});
|
|
226
|
+
it('при записи api-цен существующая явная валюта модели сохраняется', async () => {
|
|
227
|
+
await stores.providerStore.save('p-rub2', {
|
|
228
|
+
name: 'p-rub2', type: 'openai', baseUrl: 'http://provider.local', enabled: true, currency: 'RUB',
|
|
229
|
+
});
|
|
230
|
+
await stores.modelStore.save('p-rub2/m1', {
|
|
231
|
+
id: 'p-rub2/m1', name: 'm1', provider: 'p-rub2', enabled: true,
|
|
232
|
+
inputPrice: 1, outputPrice: 1, priceSource: 'api', currency: 'USD',
|
|
233
|
+
});
|
|
234
|
+
vi.spyOn(ProviderFactory, 'create').mockReturnValue({
|
|
235
|
+
listModelsDetailed: vi.fn().mockResolvedValue([
|
|
236
|
+
{ id: 'm1', inputPrice: 5, outputPrice: 6, priceUnit: 'token' },
|
|
237
|
+
]),
|
|
238
|
+
});
|
|
239
|
+
const res = await stores.app.request(`${BASE}/fetch?provider=p-rub2`, { method: 'POST' });
|
|
240
|
+
const body = await res.json();
|
|
241
|
+
expect(body.priced).toBe(1);
|
|
242
|
+
const saved = await stores.modelStore.load('p-rub2/m1');
|
|
243
|
+
expect(saved?.inputPrice).toBe(5);
|
|
244
|
+
expect(saved?.outputPrice).toBe(6);
|
|
245
|
+
expect(saved?.priceSource).toBe('api');
|
|
246
|
+
expect(saved?.currency).toBe('USD');
|
|
247
|
+
});
|
|
248
|
+
it('non-token тарифы (B1 отдаёт без цен) не пишут цены, priced не растёт', async () => {
|
|
249
|
+
await stores.modelStore.save('p1/m1', {
|
|
250
|
+
id: 'p1/m1', name: 'm1', provider: 'p1', enabled: true,
|
|
251
|
+
});
|
|
252
|
+
vi.spyOn(ProviderFactory, 'create').mockReturnValue({
|
|
253
|
+
listModelsDetailed: vi.fn().mockResolvedValue([
|
|
254
|
+
{ id: 'm1', contextWindow: 128000 },
|
|
255
|
+
]),
|
|
256
|
+
});
|
|
257
|
+
const res = await stores.app.request(`${BASE}/fetch?provider=p1`, { method: 'POST' });
|
|
258
|
+
const body = await res.json();
|
|
259
|
+
expect(body.priced).toBe(0);
|
|
260
|
+
expect(body.limited).toBe(0);
|
|
261
|
+
const saved = await stores.modelStore.load('p1/m1');
|
|
262
|
+
expect(saved?.inputPrice).toBeUndefined();
|
|
263
|
+
expect(saved?.priceSource).toBeUndefined();
|
|
264
|
+
});
|
|
265
|
+
it('не перезаписывает уже заданный maxOutputTokens', async () => {
|
|
266
|
+
await stores.modelStore.save('p1/m1', {
|
|
267
|
+
id: 'p1/m1', name: 'm1', provider: 'p1', enabled: true, maxOutputTokens: 4096,
|
|
268
|
+
});
|
|
269
|
+
vi.spyOn(ProviderFactory, 'create').mockReturnValue({
|
|
270
|
+
listModelsDetailed: vi.fn().mockResolvedValue([
|
|
271
|
+
{ id: 'm1', maxOutputTokens: 8000 },
|
|
272
|
+
]),
|
|
273
|
+
});
|
|
274
|
+
const res = await stores.app.request(`${BASE}/fetch?provider=p1`, { method: 'POST' });
|
|
275
|
+
const body = await res.json();
|
|
276
|
+
expect(body.limited).toBe(0);
|
|
277
|
+
const saved = await stores.modelStore.load('p1/m1');
|
|
278
|
+
expect(saved?.maxOutputTokens).toBe(4096);
|
|
279
|
+
});
|
|
137
280
|
});
|
|
138
281
|
describe('синхронизация in-memory кеша (LLM Proxy)', () => {
|
|
139
282
|
it('POST /models добавляет модель в кеш', async () => {
|
|
@@ -199,5 +342,108 @@ describe('routes/models', () => {
|
|
|
199
342
|
expect(stores.modelCache.has('p1/m1')).toBe(false);
|
|
200
343
|
});
|
|
201
344
|
});
|
|
345
|
+
describe('валюта модели', () => {
|
|
346
|
+
async function listGroups() {
|
|
347
|
+
const res = await stores.app.request(BASE);
|
|
348
|
+
const body = await res.json();
|
|
349
|
+
return body.groups;
|
|
350
|
+
}
|
|
351
|
+
it('POST с currency=CNY сохраняет модель, GET возвращает model.currency и provider.currency', async () => {
|
|
352
|
+
await stores.providerStore.save('p-cur', {
|
|
353
|
+
name: 'p-cur', type: 'openai', baseUrl: 'http://p.local', enabled: true, currency: 'USD',
|
|
354
|
+
});
|
|
355
|
+
const res = await stores.app.request(BASE, postJSON({
|
|
356
|
+
id: 'p-cur/m-cur',
|
|
357
|
+
name: 'm-cur',
|
|
358
|
+
provider: 'p-cur',
|
|
359
|
+
currency: 'CNY',
|
|
360
|
+
}));
|
|
361
|
+
expect(res.status).toBe(201);
|
|
362
|
+
const saved = await stores.modelStore.load('p-cur/m-cur');
|
|
363
|
+
expect(saved?.currency).toBe('CNY');
|
|
364
|
+
const group = (await listGroups()).find((g) => g.provider.name === 'p-cur');
|
|
365
|
+
expect(group.provider.currency).toBe('USD');
|
|
366
|
+
expect(group.models[0].currency).toBe('CNY');
|
|
367
|
+
});
|
|
368
|
+
it('POST с невалидной currency (XXX) — 400 VALIDATION_ERROR', async () => {
|
|
369
|
+
const res = await stores.app.request(BASE, postJSON({
|
|
370
|
+
id: 'p1/m-bad',
|
|
371
|
+
name: 'm-bad',
|
|
372
|
+
provider: 'p1',
|
|
373
|
+
currency: 'XXX',
|
|
374
|
+
}));
|
|
375
|
+
expect(res.status).toBe(400);
|
|
376
|
+
const body = await res.json();
|
|
377
|
+
expect(body.error.code).toBe('VALIDATION_ERROR');
|
|
378
|
+
expect(await stores.modelStore.load('p1/m-bad')).toBeNull();
|
|
379
|
+
});
|
|
380
|
+
});
|
|
381
|
+
describe('priceSource при ручном вводе', () => {
|
|
382
|
+
it('POST /models с ценой в body помечает priceSource=manual', async () => {
|
|
383
|
+
const res = await stores.app.request(BASE, postJSON({
|
|
384
|
+
id: 'p1/m-price',
|
|
385
|
+
name: 'm-price',
|
|
386
|
+
provider: 'p1',
|
|
387
|
+
input_price: 3,
|
|
388
|
+
}));
|
|
389
|
+
expect(res.status).toBe(201);
|
|
390
|
+
const saved = await stores.modelStore.load('p1/m-price');
|
|
391
|
+
expect(saved?.inputPrice).toBe(3);
|
|
392
|
+
expect(saved?.priceSource).toBe('manual');
|
|
393
|
+
});
|
|
394
|
+
it('POST /models c camelCase-ценой тоже помечает priceSource=manual', async () => {
|
|
395
|
+
const res = await stores.app.request(BASE, postJSON({
|
|
396
|
+
id: 'p1/m-price-camel',
|
|
397
|
+
name: 'm-price-camel',
|
|
398
|
+
provider: 'p1',
|
|
399
|
+
outputPrice: 4,
|
|
400
|
+
}));
|
|
401
|
+
expect(res.status).toBe(201);
|
|
402
|
+
const saved = await stores.modelStore.load('p1/m-price-camel');
|
|
403
|
+
expect(saved?.outputPrice).toBe(4);
|
|
404
|
+
expect(saved?.priceSource).toBe('manual');
|
|
405
|
+
});
|
|
406
|
+
it('POST /models без цен сохраняет прежний priceSource', async () => {
|
|
407
|
+
await stores.modelStore.save('p1/m-keep', {
|
|
408
|
+
id: 'p1/m-keep', name: 'm-keep', provider: 'p1', enabled: true,
|
|
409
|
+
inputPrice: 2, priceSource: 'api',
|
|
410
|
+
});
|
|
411
|
+
const res = await stores.app.request(BASE, postJSON({
|
|
412
|
+
id: 'p1/m-keep', enabled: false,
|
|
413
|
+
}));
|
|
414
|
+
expect(res.status).toBe(200);
|
|
415
|
+
const saved = await stores.modelStore.load('p1/m-keep');
|
|
416
|
+
expect(saved?.inputPrice).toBe(2);
|
|
417
|
+
expect(saved?.priceSource).toBe('api');
|
|
418
|
+
expect(saved?.enabled).toBe(false);
|
|
419
|
+
});
|
|
420
|
+
});
|
|
421
|
+
});
|
|
422
|
+
describe('routes/models: RBAC (мутации/синхронизация — только ADMIN)', () => {
|
|
423
|
+
let tmpDir;
|
|
424
|
+
let stores;
|
|
425
|
+
beforeEach(async () => {
|
|
426
|
+
tmpDir = await mkdtemp(join(tmpdir(), 'synth-models-rbac-test-'));
|
|
427
|
+
stores = await makeRbacApp(tmpDir);
|
|
428
|
+
});
|
|
429
|
+
afterEach(async () => {
|
|
430
|
+
await rm(tmpDir, { recursive: true, force: true });
|
|
431
|
+
});
|
|
432
|
+
it('GET / — requireAuth пропускает, 200', async () => {
|
|
433
|
+
const res = await stores.app.request(BASE);
|
|
434
|
+
expect(res.status).toBe(200);
|
|
435
|
+
});
|
|
436
|
+
it('POST / — 403 (writeGuard = requireAdmin)', async () => {
|
|
437
|
+
const res = await stores.app.request(BASE, postJSON({ id: 'p1/m1', name: 'm1', provider: 'p1' }));
|
|
438
|
+
expect(res.status).toBe(403);
|
|
439
|
+
});
|
|
440
|
+
it('DELETE /:id — 403 (writeGuard = requireAdmin)', async () => {
|
|
441
|
+
const res = await stores.app.request(`${BASE}/p1%2Fm1`, { method: 'DELETE' });
|
|
442
|
+
expect(res.status).toBe(403);
|
|
443
|
+
});
|
|
444
|
+
it('POST /fetch — 403 (requireAdmin)', async () => {
|
|
445
|
+
const res = await stores.app.request(`${BASE}/fetch?provider=p1`, { method: 'POST' });
|
|
446
|
+
expect(res.status).toBe(403);
|
|
447
|
+
});
|
|
202
448
|
});
|
|
203
449
|
//# sourceMappingURL=models.test.js.map
|