neuroalpha 0.5.17 → 0.5.20
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/package.json +61 -60
- package/public/admin.html +604 -571
- package/public/app.js +101 -22
- package/public/landing.html +1207 -1273
- package/public/legal.html +6 -5
- package/public/splat3d.html +671 -0
- package/public/styles.css +12 -3
- package/scripts/set-admin-password.mjs +30 -0
- package/server/api/routes.js +55 -16
- package/server/auth/index.js +58 -13
- package/server/billing/yookassa.js +142 -133
- package/server/brokers/index.js +84 -52
- package/server/data/moex.js +6 -5
- package/server/db.js +1 -1
- package/server/index.js +3 -3
- package/server/instance/central.js +514 -505
- package/server/model/dataset.js +8 -9
- package/server/model/edge.js +74 -19
- package/server/model/forecast.js +117 -20
- package/server/model/live.js +16 -18
- package/server/model/research.js +48 -17
- package/server/security.js +4 -1
- package/server/strategist/index.js +758 -757
- package/server/strategist/tools.js +707 -675
package/server/model/research.js
CHANGED
|
@@ -9,7 +9,7 @@ import { ensureProfiles } from './profiles.js';
|
|
|
9
9
|
import { spearman } from './linalg.js';
|
|
10
10
|
import { listRuns, getRun, createRun, finishRun, saveTrade, saveRunExtra, kvGet } from '../db.js';
|
|
11
11
|
import { strategyDefaults } from '../config.js';
|
|
12
|
-
import { ENTRY_EDGE_MULT, symbolEdgeMult } from './edge.js';
|
|
12
|
+
import { ENTRY_EDGE_MULT, TIER1_LIQUID_SYMBOLS, symbolEdgeMult, computeTokenEdgeMults, QUARANTINE_DECAY, isStockQuarantined, canEnterIntraday, shouldExitBeforeNight } from './edge.js';
|
|
13
13
|
import { buildDividendCalendar, nextDividendAt, dividendRules, DIV_TAX } from './dividends.js';
|
|
14
14
|
|
|
15
15
|
const DAY = 86400000;
|
|
@@ -38,7 +38,9 @@ export function isMarketDown(ds, t) {
|
|
|
38
38
|
// Версия обработки данных: при её смене прежние прогоны не считаются «такими же» (у старых её нет).
|
|
39
39
|
// 8 — скорректированный спектр Марченко–Пастура (sigmaBulk) для 0 — Авто + динамическая концентрация слота (Conviction Sizing)
|
|
40
40
|
// 9: исторический состав индекса (без ошибки выжившего), дивиденды префов, правила v0.5.x
|
|
41
|
-
|
|
41
|
+
// 10: запрет переноса внутридневных сделок через ночь, период полураспада карантина 15 дн., строгий 1-й эшелон
|
|
42
|
+
// 11: индивидуальный расчёт порога каждой акции по её фактическому рублёвому обороту и остаточной волатильности
|
|
43
|
+
const DATA_VERSION = 11;
|
|
42
44
|
|
|
43
45
|
const AUTO_LOCKED = { modelHorizon: 2.5, modelMinEdge: 2.5, modelExitRatio: 0.95 };
|
|
44
46
|
function reuseParamsKey(params) {
|
|
@@ -194,6 +196,7 @@ async function run(runId, p, state) {
|
|
|
194
196
|
const yraw = new Map(); // t -> Float64Array(N)
|
|
195
197
|
const sigmaAt = new Map(); // t -> обычный размах акций в этом окне обучения
|
|
196
198
|
const betaAt = new Map(); // t -> бета акций к индексу в этом окне обучения (для защиты от движения рынка)
|
|
199
|
+
const multAt = new Map(); // t -> индивидуальные множители порога каждой акции в этом окне обучения
|
|
197
200
|
const snapshots = [];
|
|
198
201
|
let prevPts = null, prevCl = null, lastFold = null, lastModels = null;
|
|
199
202
|
const folds = Math.ceil((T - H - firstTest) / testLen);
|
|
@@ -206,6 +209,7 @@ async function run(runId, p, state) {
|
|
|
206
209
|
const mainText = `Обучение ${fi + 1} из ${folds}: учимся до ${fmtDay(timeline[testStart])}, прогнозируем до ${fmtDay(timeline[testEnd - 1])}`;
|
|
207
210
|
await tick();
|
|
208
211
|
const f = buildFold(ds, { trainStart, testStart, testEnd, H, embedDim: p.modelEmbedDim, textWeight: p.modelTextWeight, profiles, multiHorizon: autoAdapt });
|
|
212
|
+
const foldEdgeMults = computeTokenEdgeMults(tokens, f.sigma, trainStart, testStart);
|
|
209
213
|
const fitted = {};
|
|
210
214
|
for (const n of names) {
|
|
211
215
|
fitted[n] = await MODELS[n].fit(f);
|
|
@@ -224,6 +228,7 @@ async function run(runId, p, state) {
|
|
|
224
228
|
yraw.set(t, Float64Array.from(f.yraw.subarray(u * N, u * N + N)));
|
|
225
229
|
sigmaAt.set(t, f.sigma);
|
|
226
230
|
betaAt.set(t, f.beta);
|
|
231
|
+
multAt.set(t, foldEdgeMults);
|
|
227
232
|
}
|
|
228
233
|
// снимок карты рынка на начало месяца прогноза
|
|
229
234
|
const snap = mapSnapshot(f);
|
|
@@ -290,7 +295,7 @@ async function run(runId, p, state) {
|
|
|
290
295
|
const mktFilter = p.modelMarketFilter === 'ma';
|
|
291
296
|
const invVol = p.modelAllocMode === 'invvol';
|
|
292
297
|
const realCost = (p.commissionPct + p.slippagePct) / 100;
|
|
293
|
-
const
|
|
298
|
+
const baseSymMult = Float64Array.from(tokens, (tk) => symbolEdgeMult(tk.symbol));
|
|
294
299
|
const divCal = buildDividendCalendar(ds);
|
|
295
300
|
// реальные цены вечного фьючерса на индекс МосБиржи (IMOEXF) — для честной оценки защиты фьючерсом
|
|
296
301
|
let futOpen = null;
|
|
@@ -350,7 +355,7 @@ async function run(runId, p, state) {
|
|
|
350
355
|
// множитель порога входа и выхода (1 — как в стратегии): проверка «торговать реже, но с запасом над издержками»
|
|
351
356
|
const needMult = Number(ex.needMult) > 0 ? Number(ex.needMult) : ENTRY_EDGE_MULT;
|
|
352
357
|
const cashRateAnnual = Number(ex.cashRateAnnual) > 0 ? Number(ex.cashRateAnnual) : 0;
|
|
353
|
-
const costOf = (i) => (ex.tierCost ? (
|
|
358
|
+
const costOf = (i) => (ex.tierCost ? (TIER1_LIQUID_SYMBOLS.has(tokens[i].symbol) ? 0.00065 : 0.00125) : cost);
|
|
354
359
|
// дивидендный предохранитель (правило стратегии, как в живом контуре; выключается только для сравнения)
|
|
355
360
|
const divGuard = ex.divGuard !== false;
|
|
356
361
|
// налог 13% с дивиденда по покупкам, удержанным через отсечку (цены в бэктесте скорректированы на полный дивиденд)
|
|
@@ -389,10 +394,11 @@ async function run(runId, p, state) {
|
|
|
389
394
|
const countSide = (side) => [...held.values()].filter((h) => h.side === side).length;
|
|
390
395
|
// Самообучение правил по прошлым закрытым сделкам (временный карантин «акций-убийц» с затуханием и авто-калибровка порога выхода)
|
|
391
396
|
const stockPnl = new Float64Array(N), stockCnt = new Float64Array(N);
|
|
392
|
-
const stockAllowed = (i) => !autoAdapt || !(stockCnt[i]
|
|
397
|
+
const stockAllowed = (i) => !autoAdapt || !isStockQuarantined(stockCnt[i], stockPnl[i]);
|
|
393
398
|
let curExitRatio = autoAdapt ? 0.95 : exitRatio;
|
|
394
399
|
const stepBars = autoAdapt ? Math.max(3, Math.floor(H / 5)) : H;
|
|
395
400
|
const maxSlotWeight = dir === 'long' ? Math.min(0.58, Math.max(1 / K, 1.8 / K)) : Math.min(0.75, 3.0 / (2 * K));
|
|
401
|
+
let closedThisBar = new Set();
|
|
396
402
|
|
|
397
403
|
const closePos = (i, h, t, end, why, forcedExitPrice = null) => {
|
|
398
404
|
const exitPrice = forcedExitPrice > 0 ? forcedExitPrice : exitPx(i, t);
|
|
@@ -417,6 +423,7 @@ async function run(runId, p, state) {
|
|
|
417
423
|
stats.feesRub += fee + h.entryCost;
|
|
418
424
|
trades.push(tradeRec(name, i, h, t, exitPrice, gross - fee - borrow - divLoss - h.entryCost, h.entryCost + fee, borrow, end, why));
|
|
419
425
|
held.delete(i);
|
|
426
|
+
closedThisBar.add(i);
|
|
420
427
|
if (autoAdapt) {
|
|
421
428
|
const realGross = h.side === 'short' ? (1 - exitPrice / h.entryPrice) : (exitPrice / h.entryPrice - 1);
|
|
422
429
|
const realNetPct = realGross - 2 * realCost;
|
|
@@ -427,13 +434,16 @@ async function run(runId, p, state) {
|
|
|
427
434
|
for (let k = startIdx; k < testTs.length; k += stepBars) {
|
|
428
435
|
const t = testTs[k];
|
|
429
436
|
const tIn = Math.min(t + lag, T - 1), tOut = Math.min(t + lag + stepBars, T - 1);
|
|
437
|
+
closedThisBar = new Set();
|
|
430
438
|
if (autoAdapt) {
|
|
431
|
-
for (let i = 0; i < N; i++) { stockPnl[i] *=
|
|
439
|
+
for (let i = 0; i < N; i++) { stockPnl[i] *= QUARANTINE_DECAY; stockCnt[i] *= QUARANTINE_DECAY; }
|
|
432
440
|
}
|
|
433
441
|
const pr = preds[name].get(t);
|
|
434
442
|
const sg = sigmaAt.get(t);
|
|
443
|
+
const symMult = multAt.get(t) || baseSymMult;
|
|
435
444
|
const bear = isMarketDown(ds, t);
|
|
436
445
|
const mktDown = mktFilter && bear;
|
|
446
|
+
const barTs = tsOf(t);
|
|
437
447
|
// дивидендный предохранитель: закрываем позиции в последний день с правом на дивиденд и не входим перед отсечкой
|
|
438
448
|
if (divGuard) {
|
|
439
449
|
for (const [i, h] of [...held]) {
|
|
@@ -441,6 +451,16 @@ async function run(runId, p, state) {
|
|
|
441
451
|
if (r && (h.side === 'long' ? r.exitLong : r.exitShort)) { closePos(i, h, tIn, false, 'Дивидендная отсечка'); stats.divExits++; }
|
|
442
452
|
}
|
|
443
453
|
}
|
|
454
|
+
// не переносим внутридневные позиции через ночь и выходные
|
|
455
|
+
if (autoAdapt) {
|
|
456
|
+
for (const [i, h] of [...held]) {
|
|
457
|
+
if (shouldExitBeforeNight(barTs, tsOf(h.entryT), stepBars, BAR_INTERVAL)) {
|
|
458
|
+
closePos(i, h, tIn, false, 'Закрытие перед ночным клирингом');
|
|
459
|
+
}
|
|
460
|
+
}
|
|
461
|
+
}
|
|
462
|
+
const timeOk = !autoAdapt || canEnterIntraday(barTs, H, BAR_INTERVAL);
|
|
463
|
+
const canOpenAt = (i) => timeOk && !held.has(i) && !closedThisBar.has(i) && stockAllowed(i) && canEnter(i, t);
|
|
444
464
|
const okLong = (i) => !divRule(i, t)?.blockLong;
|
|
445
465
|
const okShort = (i) => !divRule(i, t)?.blockShort;
|
|
446
466
|
let order, entries;
|
|
@@ -458,8 +478,8 @@ async function run(runId, p, state) {
|
|
|
458
478
|
}
|
|
459
479
|
const needL = autoAdapt && bear ? need * 1.25 : need;
|
|
460
480
|
const needS = autoAdapt ? (bear ? need * 0.90 : need * 1.25) : need;
|
|
461
|
-
const candL = mktDown ? [] : [...pr.keys()].filter((i) =>
|
|
462
|
-
const candS = [...pr.keys()].filter((i) =>
|
|
481
|
+
const candL = (mktDown || !timeOk) ? [] : [...pr.keys()].filter((i) => canOpenAt(i) && okLong(i) && edge(i) > needL * symMult[i]).sort((a, b) => pr[b] - pr[a]);
|
|
482
|
+
const candS = !timeOk ? [] : [...pr.keys()].filter((i) => canOpenAt(i) && okShort(i) && edge(i) < -needS * symMult[i]).sort((a, b) => pr[a] - pr[b]);
|
|
463
483
|
// Вытеснение слабой/остывшей позиции новым мощным лидером (Opportunity Rotation):
|
|
464
484
|
// если капитал заперт в позиции с ослабевшим ожиданием (< 0.55 * exitNeed), а на текущей свече появился лидер в 2.4 раза сильнее порога,
|
|
465
485
|
// освобождаем слот под лидера, чтобы ни одна фаза не застревала в слабых бумагах
|
|
@@ -500,11 +520,11 @@ async function run(runId, p, state) {
|
|
|
500
520
|
}
|
|
501
521
|
const free = K - held.size;
|
|
502
522
|
const needL = autoAdapt && bear ? need * 1.25 : need;
|
|
503
|
-
const rawCand = mktDown ? [] : [...pr.keys()].filter((i) =>
|
|
523
|
+
const rawCand = (mktDown || !timeOk) ? [] : [...pr.keys()].filter((i) => canOpenAt(i) && okLong(i) && edge(i) > needL * symMult[i]).sort((a, b) => pr[b] - pr[a]);
|
|
504
524
|
const cand = filterDynamicTopK(rawCand, edge, needL, Math.max(0, free));
|
|
505
525
|
order = [...held.keys(), ...cand];
|
|
506
526
|
} else {
|
|
507
|
-
const cand = mktDown ? [] : [...pr.keys()].filter((i) => stockAllowed(i) && pr[i] > 0 && canEnter(i, t)).sort((a, b) => pr[b] - pr[a]).slice(0, K);
|
|
527
|
+
const cand = (mktDown || !timeOk) ? [] : [...pr.keys()].filter((i) => !closedThisBar.has(i) && stockAllowed(i) && pr[i] > 0 && canEnter(i, t)).sort((a, b) => pr[b] - pr[a]).slice(0, K);
|
|
508
528
|
order = cand;
|
|
509
529
|
const next = new Set(order);
|
|
510
530
|
for (const [i, h] of [...held]) if (!next.has(i)) closePos(i, h, tIn, false);
|
|
@@ -1028,10 +1048,11 @@ async function runStabilityLoop(targetId, runRow, st) {
|
|
|
1028
1048
|
const borrowFee = (h, t) => h.alloc * (p.modelShortFeePct / 100) * ((tsOf(t) - tsOf(h.entryT)) / 3600000 / 24 / 365);
|
|
1029
1049
|
const countSide = (side) => [...held.values()].filter((h) => h.side === side).length;
|
|
1030
1050
|
const stockPnl = new Float64Array(N), stockCnt = new Float64Array(N);
|
|
1031
|
-
const stockAllowed = (i) => !autoAdapt || !(stockCnt[i]
|
|
1051
|
+
const stockAllowed = (i) => !autoAdapt || !isStockQuarantined(stockCnt[i], stockPnl[i]);
|
|
1032
1052
|
const curExitRatio = autoAdapt ? 0.95 : exitRatio;
|
|
1033
|
-
const stepBars = autoAdapt ? Math.max(
|
|
1053
|
+
const stepBars = autoAdapt ? Math.max(3, Math.floor(H / 5)) : H;
|
|
1034
1054
|
const maxSlotWeight = dir === 'long' ? Math.min(0.45, Math.max(1 / K, 1.35 / K)) : Math.min(0.35, 1.4 / (2 * K));
|
|
1055
|
+
let closedThisBar = new Set();
|
|
1035
1056
|
const closePos = (i, h, t) => {
|
|
1036
1057
|
const exitPrice = px(i, t);
|
|
1037
1058
|
const gross = h.side === 'short' ? h.alloc * (1 - exitPrice / h.entryPrice) : h.alloc * (exitPrice / h.entryPrice - 1);
|
|
@@ -1040,6 +1061,7 @@ async function runStabilityLoop(targetId, runRow, st) {
|
|
|
1040
1061
|
equity += gross - fee - borrow;
|
|
1041
1062
|
trades.push({ pnl: gross - fee - borrow - h.entryCost, entryTs: tsOf(h.entryT), exitTs: tsOf(t) });
|
|
1042
1063
|
held.delete(i);
|
|
1064
|
+
closedThisBar.add(i);
|
|
1043
1065
|
if (autoAdapt) {
|
|
1044
1066
|
const realGross = h.side === 'short' ? (1 - exitPrice / h.entryPrice) : (exitPrice / h.entryPrice - 1);
|
|
1045
1067
|
stockPnl[i] = stockPnl[i] * 0.90 + (realGross - 2 * realCost);
|
|
@@ -1048,12 +1070,21 @@ async function runStabilityLoop(targetId, runRow, st) {
|
|
|
1048
1070
|
};
|
|
1049
1071
|
for (let k = 0; k < testTs.length; k += stepBars) {
|
|
1050
1072
|
const t = testTs[k], tIn = t + 1, tOut = Math.min(t + 1 + stepBars, T - 1);
|
|
1073
|
+
closedThisBar = new Set();
|
|
1051
1074
|
if (autoAdapt) {
|
|
1052
|
-
for (let i = 0; i < N; i++) { stockPnl[i] *=
|
|
1075
|
+
for (let i = 0; i < N; i++) { stockPnl[i] *= QUARANTINE_DECAY; stockCnt[i] *= QUARANTINE_DECAY; }
|
|
1053
1076
|
}
|
|
1054
1077
|
const pr = preds.get(t), sg = sigmaAt.get(t);
|
|
1055
1078
|
const bear = isMarketDown(ds, t);
|
|
1056
1079
|
const mktDown = mktFilter && bear;
|
|
1080
|
+
const barTs = tsOf(t);
|
|
1081
|
+
if (autoAdapt) {
|
|
1082
|
+
for (const [i, h] of [...held]) {
|
|
1083
|
+
if (shouldExitBeforeNight(barTs, tsOf(h.entryT), stepBars, BAR_INTERVAL)) closePos(i, h, tIn);
|
|
1084
|
+
}
|
|
1085
|
+
}
|
|
1086
|
+
const timeOk = !autoAdapt || canEnterIntraday(barTs, H, BAR_INTERVAL);
|
|
1087
|
+
const canOpenAt = (i) => timeOk && !held.has(i) && !closedThisBar.has(i) && stockAllowed(i) && canEnter(i, t);
|
|
1057
1088
|
const edge = (i) => pr[i] * sg[i] * Math.sqrt(H);
|
|
1058
1089
|
const need = effMinEdge * 2 * realCost * ENTRY_EDGE_MULT, exitNeed = need * curExitRatio, earlyExitNeed = need * 0.35;
|
|
1059
1090
|
let order, entries;
|
|
@@ -1065,8 +1096,8 @@ async function runStabilityLoop(targetId, runRow, st) {
|
|
|
1065
1096
|
}
|
|
1066
1097
|
const needL = autoAdapt && bear ? need * 1.25 : need;
|
|
1067
1098
|
const needS = autoAdapt ? (bear ? need * 0.90 : need * 1.25) : need;
|
|
1068
|
-
const candL = mktDown ? [] : [...pr.keys()].filter((i) =>
|
|
1069
|
-
const candS = [...pr.keys()].filter((i) =>
|
|
1099
|
+
const candL = (mktDown || !timeOk) ? [] : [...pr.keys()].filter((i) => canOpenAt(i) && edge(i) > needL * symbolEdgeMult(tokens[i].symbol)).sort((a, b) => pr[b] - pr[a]);
|
|
1100
|
+
const candS = !timeOk ? [] : [...pr.keys()].filter((i) => canOpenAt(i) && edge(i) < -needS * symbolEdgeMult(tokens[i].symbol)).sort((a, b) => pr[a] - pr[b]);
|
|
1070
1101
|
const nL = K - countSide('long'), nS = K - countSide('short');
|
|
1071
1102
|
entries = [...candL.slice(0, Math.max(0, nL)).map((i) => [i, 'long', edge(i)]), ...candS.slice(0, Math.max(0, nS)).map((i) => [i, 'short', edge(i)])];
|
|
1072
1103
|
} else if (effMinEdge > 0) {
|
|
@@ -1076,10 +1107,10 @@ async function runStabilityLoop(targetId, runRow, st) {
|
|
|
1076
1107
|
if (!(e > req) || !liquid(i, t)) closePos(i, h, tIn);
|
|
1077
1108
|
}
|
|
1078
1109
|
const needL = autoAdapt && bear ? need * 1.25 : need;
|
|
1079
|
-
const cand = mktDown ? [] : [...pr.keys()].filter((i) =>
|
|
1110
|
+
const cand = (mktDown || !timeOk) ? [] : [...pr.keys()].filter((i) => canOpenAt(i) && edge(i) > needL).sort((a, b) => pr[b] - pr[a]).slice(0, Math.max(0, K - held.size));
|
|
1080
1111
|
order = [...held.keys(), ...cand];
|
|
1081
1112
|
} else {
|
|
1082
|
-
const cand = mktDown ? [] : [...pr.keys()].filter((i) => stockAllowed(i) && pr[i] > 0 && canEnter(i, t)).sort((a, b) => pr[b] - pr[a]).slice(0, K);
|
|
1113
|
+
const cand = (mktDown || !timeOk) ? [] : [...pr.keys()].filter((i) => !closedThisBar.has(i) && stockAllowed(i) && pr[i] > 0 && canEnter(i, t)).sort((a, b) => pr[b] - pr[a]).slice(0, K);
|
|
1083
1114
|
order = cand;
|
|
1084
1115
|
const next = new Set(order);
|
|
1085
1116
|
for (const [i, h] of [...held]) if (!next.has(i)) closePos(i, h, tIn);
|
package/server/security.js
CHANGED
|
@@ -33,7 +33,10 @@ export function isCrossOrigin(req) {
|
|
|
33
33
|
const origin = req.headers?.origin;
|
|
34
34
|
if (!origin || origin === 'null') return Boolean(origin);
|
|
35
35
|
try {
|
|
36
|
-
|
|
36
|
+
const origHost = new URL(origin).host.toLowerCase();
|
|
37
|
+
const fwdHost = String(req.headers?.['x-forwarded-host'] || '').split(',')[0].trim().toLowerCase();
|
|
38
|
+
const host = String(req.headers?.host || '').toLowerCase();
|
|
39
|
+
return origHost !== host && (!fwdHost || origHost !== fwdHost);
|
|
37
40
|
} catch {
|
|
38
41
|
return true;
|
|
39
42
|
}
|