freegate 0.6.18 → 0.6.21

package/server.js

@@ -4,7 +4,7 @@ const fs = require('fs');
 const path = require('path');
 const { LRUCache } = require('./lib/cache');
 const { PROVIDERS, MODEL_MAP, callProvider, reloadProviders } = require('./lib/providers');
-const { loadState, initHealth, isCircuitOpen, recordSuccess, recordFailure, recordRequest, recordTokens, getHealth, getStats, getReliability, recordRecent, recordRpm, getRecent, getRpm, recordSelection, getLastSelection, getBandit, recordBandit, warmBanditPriors, getContextStats } = require('./lib/health');
+const { loadState, initHealth, isCircuitOpen, recordSuccess, recordFailure, recordRequest, recordTokens, getHealth, getStats, getReliability, recordRecent, recordRpm, getRecent, getRpm, recordSelection, getLastSelection, getBandit, recordBandit, warmBanditPriors, getContextStats, getHourly } = require('./lib/health');
 const { checkRateLimit } = require('./lib/rateLimit');
 const { handleDashboard } = require('./lib/dashboard');
 const { acquire, stats: poolStats } = require('./lib/pool');
@@ -99,6 +99,30 @@ const METHODOLOGY_CONFIG = Object.assign(
   (config.methodology && typeof config.methodology === 'object') ? config.methodology : {}
 );
 
+// --- Самопроверка ответа второй моделью (vetting) ---
+// Опционально: после не-stream ответа отправляем краткий чек другой модели.
+// Выключено по умолчанию (жжёт 2-й free-лимит). Включается config.vetting.enabled.
+const { shouldVet, vetAnswer, VETTING_DEFAULTS } = require('./lib/vetting');
+const VETTING_CONFIG = Object.assign(
+  { ...VETTING_DEFAULTS },
+  (config.vetting && typeof config.vetting === 'object') ? config.vetting : {}
+);
+
+// --- Стратегия роутинга ---
+// Опциональные модификаторы равномерности (round-robin / least-used).
+// По умолчанию 'weighted' — поведение без изменений.
+const { makeWeightModifier } = require('./lib/strategy');
+const ROUTING_STRATEGY = (config.routing && config.routing.strategy) || 'weighted';
+
+// --- Сжатие промпта (Caveman-стиль) ---
+// Опционально убирает вежливость/заполнители из последнего user-сообщения,
+// экономя токены. config.compress.enabled=true включает.
+const { compressMessages } = require('./lib/compress');
+const COMPRESS_CONFIG = Object.assign(
+  { enabled: false, minLen: 60 },
+  (config.compress && typeof config.compress === 'object') ? config.compress : {}
+);
+
 // --- Веб-поиск для search-задач ---
 // Бесплатный поиск фактов (DuckDuckGo, без ключа) для запросов-поиска, чтобы
 // модель не галлюцинировала («что такое минимакс дизайн» → реальная инфа про
@@ -459,6 +483,15 @@ async function handleChatCompletion(req, res, body) {
   if (METHODOLOGY_CONFIG.enabled && Array.isArray(body.messages)) {
     try {
       taskCategory = classifyTask(body.messages);
+      // Сжатие промпта: убираем вежливость/заполнители ДО методолога (методолог
+      // не должен суммировать сжатый текст). Опционально (config.compress).
+      if (COMPRESS_CONFIG.enabled) {
+        const compressed = compressMessages(body.messages, COMPRESS_CONFIG);
+        if (compressed !== body.messages && Array.isArray(compressed)) {
+          body.messages = compressed;
+          measure.compressed = 1;
+        }
+      }
       const injected = injectMethodology(body.messages, taskCategory, METHODOLOGY_CONFIG);
       if (injected !== body.messages) {
         body.messages = injected;
@@ -608,6 +641,9 @@ async function handleChatCompletion(req, res, body) {
         .sort((a, b) => (b.provider.context_window || 0) - (a.provider.context_window || 0))
         .slice(0, 1);
     } else {
+      const usedTodayList = {};
+      for (const [k] of pool) usedTodayList[k] = usedTodayFor(k);
+      const strategyModifier = makeWeightModifier(ROUTING_STRATEGY, { keys: pool.map(([k]) => k), usedTodayList });
       const scored = pool.map(([key, provider]) => {
         const h = getHealth()[key];
         let score = h.score || 50;
@@ -640,6 +676,9 @@ async function handleChatCompletion(req, res, body) {
         const usedToday = usedTodayFor(key);
         if (dailyLimit > 0 && usedToday >= dailyLimit) weight *= 0.03;
         else if (dailyLimit > 0 && usedToday >= dailyLimit * 0.9) weight *= 0.4;
+        // Стратегия роутинга: равномерность (round-robin / least-used) как
+        // лёгкий модификатор к базовому weight — не ломает основной скоринг.
+        weight *= strategyModifier(key);
         return { key, provider, weight };
       });
 
@@ -836,7 +875,7 @@ async function handleChatCompletion(req, res, body) {
                 model: provider.model,
                 choices: [{ index: 0, message: { role: 'assistant', content: full }, finish_reason: 'stop' }],
                 usage: { prompt_tokens: 0, completion_tokens: 0, total_tokens: 0 },
-              });
+              }, key);
             }
             commit(200);
             res.end();
@@ -946,7 +985,7 @@ async function handleChatCompletion(req, res, body) {
               model: provider.model,
               choices: [{ index: 0, message: { role: 'assistant', content: full }, finish_reason: 'stop' }],
               usage: { prompt_tokens: 0, completion_tokens: 0, total_tokens: 0 },
-            });
+            }, key);
           }
           commit(200);
           res.end();
@@ -971,8 +1010,31 @@ async function handleChatCompletion(req, res, body) {
         measure.provider = key;
         measure.real = (result.data.usage && result.data.usage.prompt_tokens) ? result.data.usage.prompt_tokens : measure.sentTokens || 0;
         measure.win = PROVIDERS[key]?.context_window || 0;
+        // Самопроверка второй моделью (опционально): только не-stream, только по конфигу.
+        if (VETTING_CONFIG.enabled && !isStreaming) {
+          const answer = result.data?.choices?.[0]?.message?.content || '';
+          if (shouldVet({ config: VETTING_CONFIG, complexity, category: taskCategory, answerLen: answer.length })) {
+            const picks = Object.entries(PROVIDERS)
+              .filter(([pk, p]) => p.enabled && pk !== key && !isCircuitOpen(pk) &&
+                getHealth()[pk]?.status === 'up' && p.vision !== true)
+              .map(([_, p]) => p);
+            try {
+              const verdict = await vetAnswer({ answer, callProvider, picks, config: VETTING_CONFIG });
+              if (verdict.checked && !verdict.ok && verdict.note) {
+                const msg = result.data.choices[0].message;
+                msg.content = (msg.content || '') + '\n\n> ⚠️ Проверка второй моделью: ' + verdict.note;
+                measure.vetted = 1;
+                measure.vetNote = verdict.note;
+              } else {
+                measure.vetted = 0;
+              }
+            } catch (vetErr) {
+              measure.vetted = 0;
+            }
+          }
+        }
         commit(200);
-        cache.set(effectiveModel, body.messages, body.temperature, result.data);
+        cache.set(effectiveModel, body.messages, body.temperature, result.data, key);
         recordTokens(key, result.usage);
         res.writeHead(200, { 'Content-Type': 'application/json' });
         res.end(JSON.stringify(result.data));
@@ -1059,7 +1121,7 @@ if (isTooShort(result.data, lastUserText(body.messages))) {
           measure.real = (result.data.usage && result.data.usage.prompt_tokens) ? result.data.usage.prompt_tokens : measure.sentTokens || 0;
           measure.win = PROVIDERS[key]?.context_window || 0;
           commit(200);
-          cache.set(effectiveModel, body.messages, body.temperature, result.data);
+          cache.set(effectiveModel, body.messages, body.temperature, result.data, key);
           recordTokens(key, result.usage);
           res.writeHead(200, { 'Content-Type': 'application/json' });
           res.end(JSON.stringify(result.data));
@@ -1117,7 +1179,7 @@ if (isTooShort(result.data, lastUserText(body.messages))) {
                 model: provider.model,
                 choices: [{ index: 0, message: { role: 'assistant', content: full }, finish_reason: 'stop' }],
                 usage: { prompt_tokens: 0, completion_tokens: 0, total_tokens: 0 },
-              });
+              }, key);
             }
             commit(200);
             res.end();
@@ -1191,6 +1253,57 @@ const server = http.createServer(async (req, res) => {
     return;
   }
 
+  if (parsedUrl.pathname === '/v1/config') {
+    // Чтение/запись опций оптимизации (compress/vetting/routing) в config.json.
+    if (AUTH_KEY) {
+      const apiKey = (req.headers.authorization || '').replace('Bearer ', '').trim();
+      const keyFromQuery = parsedUrl.searchParams.get('key');
+      if (apiKey !== AUTH_KEY && keyFromQuery !== AUTH_KEY) {
+        res.writeHead(401, { 'Content-Type': 'application/json' });
+        res.end(JSON.stringify({ error: { message: 'Invalid API key' } }));
+        return;
+      }
+    }
+    try {
+      const userCfg = JSON.parse(fs.readFileSync(CONFIG_PATH, 'utf8'));
+      if (req.method === 'GET') {
+        res.writeHead(200, { 'Content-Type': 'application/json' });
+        res.end(JSON.stringify({
+          compress: { enabled: !!(userCfg.compress && userCfg.compress.enabled), minLen: userCfg.compress?.minLen || 60 },
+          vetting: { enabled: !!(userCfg.vetting && userCfg.vetting.enabled), minAnswerLen: userCfg.vetting?.minAnswerLen || 120, complexityOnly: userCfg.vetting?.complexityOnly !== false },
+          routing: { strategy: userCfg.routing?.strategy || 'weighted' },
+        }));
+        return;
+      }
+      if (req.method === 'POST') {
+        let body = '';
+        req.on('data', (c) => { body += c; if (body.length > 100000) req.destroy(); });
+        req.on('end', () => {
+          try {
+            const patch = JSON.parse(body || '{}');
+            if (typeof patch.compress === 'object') userCfg.compress = Object.assign({ enabled: false, minLen: 60 }, userCfg.compress, patch.compress);
+            if (typeof patch.vetting === 'object') userCfg.vetting = Object.assign({ enabled: false, minAnswerLen: 120, complexityOnly: true }, userCfg.vetting, patch.vetting);
+            if (typeof patch.routing === 'object') userCfg.routing = Object.assign({ strategy: 'weighted' }, userCfg.routing, patch.routing);
+            fs.writeFileSync(CONFIG_PATH, JSON.stringify(userCfg, null, 2));
+            res.writeHead(200, { 'Content-Type': 'application/json' });
+            res.end(JSON.stringify({ ok: true }));
+          } catch (e) {
+            res.writeHead(400, { 'Content-Type': 'application/json' });
+            res.end(JSON.stringify({ error: { message: 'Invalid config body: ' + e.message } }));
+          }
+        });
+        return;
+      }
+      res.writeHead(405, { 'Content-Type': 'application/json' });
+      res.end(JSON.stringify({ error: { message: 'Method not allowed' } }));
+      return;
+    } catch (err) {
+      res.writeHead(500, { 'Content-Type': 'application/json' });
+      res.end(JSON.stringify({ error: { message: 'Config read failed: ' + err.message } }));
+      return;
+    }
+  }
+
   if (parsedUrl.pathname === '/v1/models-db' && req.method === 'GET') {
     // Структурированная база моделей: паспорта + статистика + топ по скору.
     if (AUTH_KEY) {
@@ -1346,6 +1459,7 @@ const server = http.createServer(async (req, res) => {
         return [k, { status: v.status, score: v.score, latency_ms: v.latency, reason, reliability }];
       })),
       cache: cache.stats(),
+      hourly: (() => { try { return getHourly(); } catch { return []; } })(),
       limits,
       pool: poolStats(),
       last_selection: getLastSelection(),