@intranefr/superbackend 1.5.0 → 1.5.2

package/src/controllers/adminI18n.controller.js

@@ -6,7 +6,8 @@ const { getInferredI18nKeys, getInferredI18nEntries } = require('../services/i18
 const { createAuditEvent, getBasicAuthActor } = require('../services/audit.service');
 const { getSettingValue } = require('../services/globalSettings.service');
 
-const OpenAI = require('openai');
+const llmService = require('../services/llm.service');
+const { resolveLlmProviderModel } = require('../services/llmDefaults.service');
 
 async function ensureLocaleExists(code, actor) {
   if (!code) return;
@@ -379,16 +380,8 @@ exports.deleteEntry = async (req, res) => {
   }
 };
 
-async function buildOpenRouterClient() {
-  const apiKey = await getSettingValue('i18n.ai.openrouter.apiKey', await getSettingValue('ai.openrouter.apiKey', null));
-  if (!apiKey) {
-    throw new Error('Missing i18n.ai.openrouter.apiKey or ai.openrouter.apiKey');
-  }
-
-  return new OpenAI({
-    apiKey,
-    baseURL: 'https://openrouter.ai/api/v1',
-  });
+async function getLegacyOpenRouterApiKey() {
+  return getSettingValue('i18n.ai.openrouter.apiKey', await getSettingValue('ai.openrouter.apiKey', null));
 }
 
 function buildAiPrompt({ glossary, fromLocale, toLocale, key, fromValue }) {
@@ -446,10 +439,19 @@ exports.aiPreview = async (req, res) => {
 
     const fromMap = new Map(fromEntries.map((e) => [e.key, e]));
 
-    const aiModel = model || (await getSettingValue('i18n.ai.model', 'google/gemini-2.5-flash-lite'));
+    const resolved = await resolveLlmProviderModel({
+      systemKey: 'i18n.translate.preview',
+      providerKey: req.body?.providerKey,
+      model,
+    });
+
+    const aiModel = resolved.model || (await getSettingValue('i18n.ai.model', 'google/gemini-2.5-flash-lite'));
     const glossary = await getSettingValue('i18n.ai.glossary', '');
 
-    const client = await buildOpenRouterClient();
+    const legacyApiKey = await getLegacyOpenRouterApiKey();
+    const runtimeOptions = (resolved.providerKey === 'openrouter' && legacyApiKey)
+      ? { apiKey: legacyApiKey, baseUrl: 'https://openrouter.ai/api/v1' }
+      : {};
 
     const results = [];
     for (const key of targetKeys) {
@@ -459,12 +461,17 @@ exports.aiPreview = async (req, res) => {
       }
 
       const prompt = buildAiPrompt({ glossary, fromLocale, toLocale, key, fromValue: from.value });
-      const resp = await client.chat.completions.create({
-        model: aiModel,
-        messages: [{ role: 'user', content: prompt }],
-      });
-
-      const translated = resp.choices?.[0]?.message?.content?.trim() || '';
+      const resp = await llmService.callAdhoc(
+        {
+          providerKey: resolved.providerKey,
+          model: aiModel,
+          messages: [{ role: 'user', content: prompt }],
+          promptKeyForAudit: 'i18n.translate.preview',
+        },
+        runtimeOptions,
+      );
+
+      const translated = String(resp.content || '').trim();
 
       results.push({
         key,
@@ -473,6 +480,7 @@ exports.aiPreview = async (req, res) => {
         fromValue: from.value,
         proposedValue: translated,
         valueFormat: from.valueFormat || 'text',
+        providerKey: resolved.providerKey,
         model: aiModel,
       });
     }
@@ -514,7 +522,7 @@ exports.aiApply = async (req, res) => {
           edited: true,
           editedAt: new Date(),
           editedBy: actor.actorId,
-          lastAiProvider: 'openrouter',
+          lastAiProvider: item.providerKey || 'openrouter',
           lastAiModel: item.model || null,
         });
 
@@ -540,7 +548,7 @@ exports.aiApply = async (req, res) => {
       existing.edited = true;
       existing.editedAt = new Date();
       existing.editedBy = actor.actorId;
-      existing.lastAiProvider = 'openrouter';
+      existing.lastAiProvider = item.providerKey || 'openrouter';
       existing.lastAiModel = item.model || null;
       await existing.save();
 
@@ -578,10 +586,19 @@ exports.aiTranslateText = async (req, res) => {
 
     await ensureLocaleExists(toLocale, getBasicAuthActor(req));
 
-    const aiModel = model || (await getSettingValue('i18n.ai.model', 'google/gemini-2.5-flash-lite'));
+    const resolved = await resolveLlmProviderModel({
+      systemKey: 'i18n.translate.text',
+      providerKey: req.body?.providerKey,
+      model,
+    });
+
+    const aiModel = resolved.model || (await getSettingValue('i18n.ai.model', 'google/gemini-2.5-flash-lite'));
     const glossary = await getSettingValue('i18n.ai.glossary', '');
 
-    const client = await buildOpenRouterClient();
+    const legacyApiKey = await getLegacyOpenRouterApiKey();
+    const runtimeOptions = (resolved.providerKey === 'openrouter' && legacyApiKey)
+      ? { apiKey: legacyApiKey, baseUrl: 'https://openrouter.ai/api/v1' }
+      : {};
     const prompt = buildAiPrompt({
       glossary,
       fromLocale,
@@ -590,13 +607,18 @@ exports.aiTranslateText = async (req, res) => {
       fromValue: text,
     });
 
-    const resp = await client.chat.completions.create({
-      model: aiModel,
-      messages: [{ role: 'user', content: prompt }],
-    });
+    const resp = await llmService.callAdhoc(
+      {
+        providerKey: resolved.providerKey,
+        model: aiModel,
+        messages: [{ role: 'user', content: prompt }],
+        promptKeyForAudit: 'i18n.translate.text',
+      },
+      runtimeOptions,
+    );
 
-    const translatedText = resp.choices?.[0]?.message?.content?.trim() || '';
-    res.json({ translatedText, model: aiModel });
+    const translatedText = String(resp.content || '').trim();
+    res.json({ translatedText, model: aiModel, providerKey: resolved.providerKey });
   } catch (error) {
     console.error('Error translating text with AI:', error);
     res.status(500).json({ error: error.message || 'Failed to translate text' });

package/src/controllers/adminLlm.controller.js

@@ -2,10 +2,17 @@ const GlobalSetting = require("../models/GlobalSetting");
 const AuditEvent = require("../models/AuditEvent");
 const llmService = require("../services/llm.service");
 const { encryptString } = require("../utils/encryption");
+const { decryptString } = require("../utils/encryption");
+const axios = require("axios");
 
 const PROVIDERS_KEY = "llm.providers";
 const PROMPTS_KEY = "llm.prompts";
 
+const DEFAULTS_PROVIDER_KEY = "llm.defaults.providerKey";
+const DEFAULTS_MODEL_KEY = "llm.defaults.model";
+const SYSTEM_DEFAULTS_KEY = "llm.systemDefaults";
+const PROVIDER_MODELS_KEY = "llm.providerModels";
+
 async function getJsonSetting(key, defaultValue) {
   const doc = await GlobalSetting.findOne({ key }).lean();
   if (!doc || !doc.value) return defaultValue;
@@ -15,15 +22,53 @@ async function getJsonSetting(key, defaultValue) {
   } catch (e) {
     return defaultValue;
   }
+
+}
+
+async function getStringSetting(key, defaultValue) {
+  const doc = await GlobalSetting.findOne({ key }).lean();
+  if (!doc || doc.value === undefined || doc.value === null) return defaultValue;
+  return String(doc.value);
+}
+
+async function setStringSetting(key, value, description) {
+  const stringValue = value === undefined || value === null ? "" : String(value);
+  const existing = await GlobalSetting.findOne({ key });
+  if (existing) {
+    existing.value = stringValue;
+    existing.type = "string";
+    if (!existing.description && description) {
+      existing.description = description;
+    }
+    await existing.save();
+    return existing;
+  }
+  // Ensure we never create a document with an undefined value
+  if (stringValue === undefined) {
+    throw new Error(`Cannot save GlobalSetting with undefined value for key: ${key}`);
+  }
+  const created = new GlobalSetting({
+    key,
+    value: stringValue,
+    type: "string",
+    description: description || `LLM setting ${key}`,
+  });
+  await created.save();
+  return created;
 }
 
 async function setJsonSetting(key, value) {
   const descriptions = {
     [PROVIDERS_KEY]: "LLM providers configuration (JSON)",
     [PROMPTS_KEY]: "LLM prompts configuration (JSON)",
+    [SYSTEM_DEFAULTS_KEY]: "LLM system defaults (JSON)",
+    [PROVIDER_MODELS_KEY]: "LLM provider model suggestions (JSON)",
   };
   const description = descriptions[key] || `LLM setting ${key}`;
-  const stringValue = JSON.stringify(value || {});
+  // Ensure we always have a valid object to stringify
+  const safeValue = (value === undefined || value === null || value === '') ? {} : value;
+  const stringValue = JSON.stringify(safeValue);
+  
   const existing = await GlobalSetting.findOne({ key });
   if (existing) {
     existing.value = stringValue;
@@ -34,6 +79,10 @@ async function setJsonSetting(key, value) {
     await existing.save();
     return existing;
   }
+  // Ensure we never create a document with an empty value
+  if (!stringValue) {
+    throw new Error(`Cannot save GlobalSetting with empty value for key: ${key}`);
+  }
   const created = new GlobalSetting({
     key,
     value: stringValue,
@@ -48,6 +97,10 @@ async function getConfig(req, res) {
   try {
     const providers = await getJsonSetting(PROVIDERS_KEY, {});
     const prompts = await getJsonSetting(PROMPTS_KEY, {});
+    const defaultsProviderKey = (await getStringSetting(DEFAULTS_PROVIDER_KEY, "")) || "";
+    const defaultsModel = (await getStringSetting(DEFAULTS_MODEL_KEY, "")) || "";
+    const systemDefaults = await getJsonSetting(SYSTEM_DEFAULTS_KEY, {});
+    const providerModels = await getJsonSetting(PROVIDER_MODELS_KEY, {});
     const safeProviders = {};
     if (providers && typeof providers === "object") {
       for (const [key, value] of Object.entries(providers)) {
@@ -56,7 +109,13 @@ async function getConfig(req, res) {
         safeProviders[key] = rest;
       }
     }
-    res.json({ providers: safeProviders, prompts });
+    res.json({
+      providers: safeProviders,
+      prompts,
+      defaults: { providerKey: defaultsProviderKey, model: defaultsModel },
+      systemDefaults,
+      providerModels,
+    });
   } catch (error) {
     console.error("[adminLlm] getConfig error", error);
     res.status(500).json({ error: "Failed to load LLM configuration" });
@@ -69,6 +128,10 @@ async function saveConfig(req, res) {
     const providers = body.providers && typeof body.providers === "object" ? body.providers : {};
     const prompts = body.prompts && typeof body.prompts === "object" ? body.prompts : {};
 
+    const defaults = body.defaults && typeof body.defaults === "object" ? body.defaults : {};
+    const systemDefaults = body.systemDefaults && typeof body.systemDefaults === "object" ? body.systemDefaults : {};
+    const providerModels = body.providerModels && typeof body.providerModels === "object" ? body.providerModels : {};
+
     const storedProviders = {};
     for (const [key, value] of Object.entries(providers)) {
       if (!value || typeof value !== "object") continue;
@@ -102,6 +165,20 @@ async function saveConfig(req, res) {
     await setJsonSetting(PROVIDERS_KEY, storedProviders);
     await setJsonSetting(PROMPTS_KEY, prompts);
 
+    await setStringSetting(
+      DEFAULTS_PROVIDER_KEY,
+      typeof defaults.providerKey === "string" ? defaults.providerKey.trim() : "",
+      "LLM global default providerKey",
+    );
+    await setStringSetting(
+      DEFAULTS_MODEL_KEY,
+      typeof defaults.model === "string" ? defaults.model.trim() : "",
+      "LLM global default model",
+    );
+
+    await setJsonSetting(SYSTEM_DEFAULTS_KEY, systemDefaults);
+    await setJsonSetting(PROVIDER_MODELS_KEY, providerModels);
+
     res.json({ success: true });
   } catch (error) {
     console.error("[adminLlm] saveConfig error", error);
@@ -109,6 +186,52 @@ async function saveConfig(req, res) {
   }
 }
 
+async function listOpenRouterModels(req, res) {
+  try {
+    const apiKeyDoc = await GlobalSetting.findOne({ key: "llm.provider.openrouter.apiKey", type: "encrypted" }).lean();
+    if (!apiKeyDoc || !apiKeyDoc.value) {
+      return res.status(400).json({ error: "Missing OpenRouter API key (llm.provider.openrouter.apiKey)" });
+    }
+
+    let apiKey;
+    try {
+      const payload = JSON.parse(apiKeyDoc.value);
+      apiKey = decryptString(payload);
+    } catch (e) {
+      return res.status(500).json({ error: "Failed to decrypt OpenRouter API key" });
+    }
+
+    // OpenRouter model list endpoint
+    let data;
+    try {
+      const response = await axios.get("https://openrouter.ai/api/v1/models", {
+        headers: {
+          Authorization: `Bearer ${apiKey}`,
+        },
+        timeout: 20000,
+      });
+      data = response && response.data ? response.data : {};
+    } catch (e) {
+      const message =
+        (e.response && e.response.data && e.response.data.error && e.response.data.error.message)
+          ? e.response.data.error.message
+          : (e.message || "Failed to fetch OpenRouter models");
+      return res.status(502).json({ error: message });
+    }
+
+    const items = Array.isArray(data?.data) ? data.data : [];
+    const models = items
+      .map((m) => (m && (m.id || m.name) ? String(m.id || m.name) : ""))
+      .filter(Boolean)
+      .sort();
+
+    return res.json({ models });
+  } catch (error) {
+    console.error("[adminLlm] listOpenRouterModels error", error);
+    return res.status(500).json({ error: "Failed to list OpenRouter models" });
+  }
+}
+
 async function testPrompt(req, res) {
   try {
     const promptKey = String(req.params.key || "");
@@ -270,4 +393,5 @@ module.exports = {
   testPrompt,
   listAudit,
   listCosts,
+  listOpenRouterModels,
 };