neuroalpha 0.6.13 → 0.7.1

package/server/llm/providers.js

@@ -13,6 +13,7 @@ import { chatStream } from './client.js';
 
 const PROTOCOLS = ['openai', 'anthropic', 'gigachat', 'ollama'];
 const CLOUD_LLM_ID = 'neuroalpha_cloud';
+const LOCAL_LLM_ID = 'local_llama';
 const CLOUD_MODEL_ID = 'Qwen/Qwen3.8-27B-FP8';
 const CLOUD_MODEL_LABEL = 'Qwen3.8 27b';
 const DEFAULT_URL = {
@@ -43,13 +44,16 @@ function readSecret(ref) {
 export function getKey(p) {
   let key = decryptSecret(p.apiKey || '') || readSecret(p.keyFile);
   if (!key && p.protocol === 'gigachat') key = (process.env.GIGACHAT_KEY || '').trim();
-  if (!key && p.id === CLOUD_LLM_ID) key = kvGet('cloudLicense')?.apiKey || process.env.NEUROALPHA_API_KEY || 'na_demo';
+  if (!key && p.id === CLOUD_LLM_ID) key = kvGet('cloudLicense')?.apiKey || process.env.NEUROALPHA_TOKEN || process.env.NEUROALPHA_API_KEY || '';
   return key;
 }
 
 // ---------- адреса ----------
 export function chatUrl(p) {
-  const base = String(p.baseUrl || DEFAULT_URL[p.protocol] || '').trim().replace(/\/+$/, '');
+  const dynamicCloudBase = p.id === CLOUD_LLM_ID
+    ? `${String(kvGet('cloudLicense')?.cloudUrl || DEFAULT_CLOUD_URL).replace(/\/+$/, '')}/api/llm/proxy/v1/chat/completions`
+    : '';
+  const base = String(dynamicCloudBase || p.baseUrl || DEFAULT_URL[p.protocol] || '').trim().replace(/\/+$/, '');
   if (!base) return '';
   const tail = p.protocol === 'anthropic' ? '/messages' : '/chat/completions';
   if (base.endsWith(tail)) return base;
@@ -182,14 +186,43 @@ function init() {
     kvSet('gigaCaMigrated', true);
   }
   ensureEnv();
-  if (process.env.CLOUD_MODE !== '1') ensureCloudDefault();
+  ensureCloudDefault();
   const list = kvGet('llmProviders', []);
   if (!kvGet('llmSelected') && list.length) {
-    const hit = findEnv(list) || list.flatMap((p) => p.models.map((m) => ({ p, m }))).find(({ p }) => getKey(p) || p.protocol === 'ollama');
+    const hit = findEnv(list) || list.flatMap((p) => p.models.map((m) => ({ p, m }))).find(({ p }) => getKey(p) || p.protocol === 'ollama' || p.id === LOCAL_LLM_ID);
     if (hit) kvSet('llmSelected', { providerId: hit.p.id, model: hit.m.id });
   }
 }
 
+export function registerLocalLlamaProvider({ port, modelId, label, backend = '' }) {
+  const list = load();
+  const baseUrl = `http://127.0.0.1:${port}/v1/chat/completions`;
+  const modelEntry = { id: modelId, label: `${label}${backend ? ` · ${backend.toUpperCase()}` : ''}`, tools: true };
+  const idx = list.findIndex((p) => p.id === LOCAL_LLM_ID);
+  if (idx >= 0) {
+    const prevModels = (list[idx].models || []).filter((m) => m.id !== modelId);
+    list[idx] = {
+      ...list[idx],
+      name: 'Локальный ИИ (на этом ПК)',
+      protocol: 'openai',
+      baseUrl,
+      models: [modelEntry, ...prevModels],
+      source: 'local',
+    };
+  } else {
+    list.unshift({
+      id: LOCAL_LLM_ID,
+      name: 'Локальный ИИ (на этом ПК)',
+      protocol: 'openai',
+      baseUrl,
+      models: [modelEntry],
+      source: 'local',
+    });
+  }
+  save(list);
+  kvSet('llmSelected', { providerId: LOCAL_LLM_ID, model: modelId });
+}
+
 function ensureCloudDefault() {
   const list = kvGet('llmProviders', []);
   if (list.some((p) => p.id === CLOUD_LLM_ID)) return;
@@ -249,12 +282,13 @@ const cleanModels = (models) => {
 const view = (p) => {
   const key = getKey(p);
   const isCloud = p.id === CLOUD_LLM_ID;
+  const isLocal = p.id === LOCAL_LLM_ID || p.source === 'local';
   const hasLic = Boolean(kvGet('cloudLicense')?.apiKey);
   return {
-    id: p.id, name: p.name, protocol: p.protocol, baseUrl: p.baseUrl || DEFAULT_URL[p.protocol] || '', authUrl: p.authUrl || '', scope: p.scope || '',
-    caFile: p.caFile || '', models: p.models, source: p.source, hasKey: !!key, needsKey: p.protocol !== 'ollama' && !isCloud,
-    keySource: isCloud ? (hasLic ? 'API-ключ подписки' : 'демо-доступ') : (p.apiKey ? 'введён вручную' : p.keyFile ? (p.keyFile.startsWith('env:') ? '.env' : 'файл') : ''),
-    editable: true,
+    id: p.id, name: p.name, protocol: p.protocol, baseUrl: chatUrl(p) || p.baseUrl || DEFAULT_URL[p.protocol] || '', authUrl: p.authUrl || '', scope: p.scope || '',
+    caFile: p.caFile || '', models: p.models, source: p.source, hasKey: !!key, needsKey: p.protocol !== 'ollama' && !isLocal && (!isCloud || !hasLic),
+    keySource: isLocal ? 'локальный движок llama.cpp' : (isCloud ? (hasLic ? 'токен личного кабинета' : 'нужна активация токеном ЛК') : (p.apiKey ? 'введён вручную' : p.keyFile ? (p.keyFile.startsWith('env:') ? '.env' : 'файл') : '')),
+    editable: !isLocal,
   };
 };
 
@@ -353,35 +387,12 @@ export function resolveActive() {
     const protocol = llmConfig.provider === 'anthropic' ? 'anthropic' : 'openai';
     return toTarget({ id: 'env', name: '.env', protocol, baseUrl: llmConfig.baseUrl, keyFile: 'env:LLM' }, { id: llmConfig.model, label: llmConfig.model, tools: true, effort: llmConfig.reasoningEffort });
   }
-  if (process.env.CLOUD_MODE !== '1') {
-    const cp = find(CLOUD_LLM_ID);
-    if (cp && cp.models[0]) return toTarget(cp, cp.models[0]);
-  }
-  return null;
-}
-
-// Истинная апстрим-модель на облачном сервере (для проксирования запросов от npx-клиентов, исключая петлю)
-export function resolveUpstreamForProxy() {
-  const list = load().filter((p) => p.id !== CLOUD_LLM_ID);
-  const sel = getSelected();
-  const p = sel && list.find((x) => x.id === sel.providerId);
-  const m = p?.models.find((x) => x.id === sel.model);
-  if (p && m && isReady(toTarget(p, m))) return toTarget(p, m);
-  if (llmConfig.provider !== 'none' && llmConfig.baseUrl && llmConfig.model) {
-    const protocol = llmConfig.provider === 'anthropic' ? 'anthropic' : 'openai';
-    const t = toTarget({ id: 'env', name: '.env', protocol, baseUrl: llmConfig.baseUrl, keyFile: 'env:LLM' }, { id: llmConfig.model, label: llmConfig.model, tools: true, effort: llmConfig.reasoningEffort });
-    if (isReady(t)) return t;
-  }
-  for (const prov of list) {
-    for (const mod of prov.models) {
-      const t = toTarget(prov, mod);
-      if (isReady(t)) return t;
-    }
-  }
+  const cp = find(CLOUD_LLM_ID);
+  if (cp && cp.models[0] && getKey(cp)) return toTarget(cp, cp.models[0]);
   return null;
 }
 
-export const isReady = (t) => !!t && !!t.url && !!t.model && (t.protocol === 'ollama' || !!getKey(t.provider));
+export const isReady = (t) => !!t && !!t.url && !!t.model && (t.protocol === 'ollama' || t.provider?.id === LOCAL_LLM_ID || !!getKey(t.provider));
 
 export async function testProvider(id, model) {
   const p = find(id);

package/server/model/live.js

@@ -11,7 +11,7 @@ import { STRATEGY_POLICY } from './policy.js';
 import { computeReport, downsample } from './metrics.js';
 import { MODELS } from './models.js';
 import { blockingNews } from '../news/index.js';
-import { currentUserId } from '../auth/index.js';
+import { currentUserId, tradingGate } from '../auth/index.js';
 import { notifyUser } from '../notify/index.js';
 
 const dayKey = (ts) => new Date(ts + MSK).toISOString().slice(0, 10);
@@ -256,6 +256,7 @@ class LiveEngine {
   }
 
   async #tickAccount(s, latest) {
+    if (!tradingGate().allowNew) return;
     if (!s.running || s.busy || s.suspended) return;
     if (latest !== null && latest === s.lastSeenTs) return;
     s.busy = true;