data-primals-engine 1.7.1 → 1.7.3

package/src/modules/assistant/constants.js

@@ -1,17 +1,24 @@
-
-export const providers = {
-    "OpenAI" : {
-        key:"OPENAI_API_KEY",
-        defaultModel: 'gpt-3.5-turbo'
-    },
-    "Google": {
-        key:"GOOGLE_API_KEY"
-    },
-    "DeepSeek": {
-        key: "DEEPSEEK_API_KEY",
-        defaultModel: 'deepseek-chat'
-    },
-    "Anthropic": {
-        key:"ANTHROPIC_API_KEY"
-    }
+
+export const providers = {
+    "OpenAI" : {
+        key:"OPENAI_API_KEY",
+        defaultModel: 'gpt-4o-mini',
+        generationModel: 'gpt-4o-mini' // Excellent for JSON generation
+    },
+    "Google": {
+        key:"GOOGLE_API_KEY",
+        defaultModel: 'gemini-1.5-flash',
+        generationModel: 'gemini-1.5-flash'
+    },
+    "DeepSeek": {
+        key: "DEEPSEEK_API_KEY",
+        defaultModel: 'deepseek-chat',
+        // As per the error message, 'deepseek-v2-coder' is a good candidate for code/JSON generation
+        generationModel: 'deepseek-coder'
+    },
+    "Anthropic": {
+        key:"ANTHROPIC_API_KEY",
+        defaultModel: 'claude-3-haiku-20240307',
+        generationModel: 'claude-3-haiku-20240307' // Haiku is fast and good with JSON
+    }
 };

package/src/modules/assistant/providers.js

@@ -1,38 +1,78 @@
-import { Config } from "../../config.js";
-import { assistantConfig } from "../../constants.js";
-import { Logger } from "../../gameObject.js";
-
-const logger = new Logger("AssistantProviders");
-
-export const getAIProvider = async (aiProvider, aiModel, apiKey) => {
-    const maxTokens = Config.Get('assistant.maxTokens', assistantConfig.maxTokens);
-    try {
-        switch (aiProvider) {
-            case 'OpenAI': {
-                const { ChatOpenAI } = await import("@langchain/openai");
-                return new ChatOpenAI({ apiKey, model: aiModel, temperature: 0.7, maxTokens });
-            }
-            case 'Google': {
-                const { ChatGoogleGenerativeAI } = await import("@langchain/google-genai");
-                return new ChatGoogleGenerativeAI({ apiKey, model: aiModel, temperature: 0.7, maxTokens });
-            }
-            case 'DeepSeek': {
-                const { ChatDeepSeek } = await import("@langchain/deepseek");
-                return new ChatDeepSeek({ apiKey, model: aiModel, temperature: 0.7, maxTokens });
-            }
-            case 'Anthropic': {
-                const { ChatAnthropic } = await import("@langchain/anthropic");
-                return new ChatAnthropic({ apiKey, model: aiModel, temperature: 0.7, maxTokens });
-            }
-            default:
-                throw new Error(`Unsupported AI provider: ${aiProvider}`);
-        }
-    } catch (e) {
-        if (e.code === 'ERR_MODULE_NOT_FOUND') {
-            logger.error(`[Assistant] The package for the '${aiProvider}' provider is not installed. Please run 'npm install @langchain/${aiProvider.toLowerCase()}' to use this provider.`);
-            throw new Error(`The AI provider '${aiProvider}' is not installed. Please ask the administrator to install the corresponding package.`);
-        }
-        logger.error(`[Assistant] Error initializing AI provider '${aiProvider}': ${e.message}`);
-        throw e; // Re-throw other errors
-    }
+import { Config } from "../../config.js";
+import {assistantConfig} from "../../constants.js";
+import { Logger } from "../../gameObject.js";
+import { getCollectionForUser } from "../mongodb.js";
+import { providers } from "./constants.js";
+import process from "node:process";
+
+const logger = new Logger("AssistantProviders");
+
+/**
+ * Finds the first available AI provider based on configured API keys for a given user.
+ * It checks the user's specific environment variables first, then falls back to the machine's process.env.
+ * @param {object} user - The user object.
+ * @param {string|null} [preferredProvider=null] - If specified, will only check for this provider.
+ * @returns {Promise<{provider: string, apiKey: string}|null>} An object with the provider name and API key, or null if none are found.
+ */
+export async function findFirstAvailableProvider(user, preferredProvider = null) {
+    const envCollection = await getCollectionForUser(user);
+    const providerNames = preferredProvider ? [preferredProvider] : Object.keys(providers);
+
+    for (const pName of providerNames) {
+        const providerInfo = providers[pName];
+        if (!providerInfo) continue;
+
+        const envKeyName = providerInfo.key;
+        const userEnvVar = await envCollection.findOne({ _model: 'env', name: envKeyName, _user: user.username });
+        const key = userEnvVar?.value || process.env[envKeyName];
+
+        if (key) {
+            return { provider: pName, apiKey: key };
+        }
+    }
+    return null;
+}
+
+export const getAIProvider = async (aiProvider, aiModel, apiKey, isJsonMode = false) => {
+    const maxTokens = Config.Get('assistant.maxTokens', assistantConfig.maxTokens);
+    const modelOptions = {
+        apiKey,
+        model: aiModel,
+        temperature: 0.7,
+        maxTokens
+    };
+
+    if (isJsonMode) {
+        modelOptions.response_format = { type: "json_object" };
+    }
+
+    try {
+        switch (aiProvider) {
+            case 'OpenAI': {
+                const { ChatOpenAI } = await import("@langchain/openai");
+                return new ChatOpenAI(modelOptions);
+            }
+            case 'Google': {
+                const { ChatGoogleGenerativeAI } = await import("@langchain/google-genai");
+                return new ChatGoogleGenerativeAI(modelOptions);
+            }
+            case 'DeepSeek': {
+                const { ChatDeepSeek } = await import("@langchain/deepseek");
+                return new ChatDeepSeek(modelOptions);
+            }
+            case 'Anthropic': {
+                const { ChatAnthropic } = await import("@langchain/anthropic");
+                return new ChatAnthropic(modelOptions);
+            }
+            default:
+                throw new Error(`Unsupported AI provider: ${aiProvider}`);
+        }
+    } catch (e) {
+        if (e.code === 'ERR_MODULE_NOT_FOUND') {
+            logger.error(`[Assistant] The package for the '${aiProvider}' provider is not installed. Please run 'npm install @langchain/${aiProvider.toLowerCase()}' to use this provider.`);
+            throw new Error(`The AI provider '${aiProvider}' is not installed. Please ask the administrator to install the corresponding package.`);
+        }
+        logger.error(`[Assistant] Error initializing AI provider '${aiProvider}': ${e.message}`);
+        throw e; // Re-throw other errors
+    }
 }

package/src/modules/auth-google/index.js

@@ -1,51 +1,54 @@
-import { Strategy as GoogleStrategy } from 'passport-google-oauth20';
-import { Sso, SSOUserProvider } from '../../sso.js';
-import {Logger} from "../../gameObject.js";
-
-let logger;
-
-export async function onInit(engine) {
-    logger = engine.getComponent(Logger);
-
-    // Le SSOUserProvider est nécessaire pour l'initialisation et pour la stratégie.
-    // On le crée donc en premier.
-    const ssoUserProvider = new SSOUserProvider(engine);
-
-    // 1. Récupérer le composant PassportAuth central.
-    let passportAuth = engine.getComponent(Sso);
-    if (!passportAuth) {
-        passportAuth = engine.addComponent(Sso);
-        // C'EST ICI QUE L'INITIALISATION DOIT AVOIR LIEU, UNE SEULE FOIS.
-        passportAuth.initialize({ ssoUserProvider });
-        passportAuth.addLogoutRoute();
-        logger.info("[auth-google] Sso component was not found, created and initialized a new one.");
-    }
-
-    // 2. Vérifier que les variables d'environnement nécessaires sont présentes.
-    if (!process.env.GOOGLE_CLIENT_ID || !process.env.GOOGLE_CLIENT_SECRET) {
-        logger.warn("[auth-google] GOOGLE_CLIENT_ID or GOOGLE_CLIENT_SECRET are not set. Google SSO will be disabled.");
-        return;
-    }
-
-    // 3. Créer l'instance de la stratégie Google.
-    const googleStrategy = new GoogleStrategy({
-        clientID: process.env.GOOGLE_CLIENT_ID,
-        clientSecret: process.env.GOOGLE_CLIENT_SECRET,
-        callbackURL: "/api/auth/google/callback"
-    },
-    async (accessToken, refreshToken, profile, done) => {
-        try {
-            // On utilise le SSOUserProvider pour trouver ou créer l'utilisateur.
-            const user = await ssoUserProvider.findOrCreate(profile);
-            return done(null, user);
-        } catch (err) {
-            return done(err);
-        }
-    });
-
-    // 4. Enregistrer la stratégie auprès du composant PassportAuth.
-    passportAuth.addStrategy('google', googleStrategy,
-        { authPath: '/api/auth/google', callbackPath: '/api/auth/google/callback' },
-        { scope: ['profile', 'email'] }
-    );
+import { Strategy as GoogleStrategy } from 'passport-google-oauth20';
+import { Sso, SSOUserProvider } from '../../sso.js';
+import {Logger} from "../../gameObject.js";
+import passport from "passport";
+
+let logger;
+
+export async function onInit(engine) {
+    logger = engine.getComponent(Logger);
+
+    // Le SSOUserProvider est nécessaire pour l'initialisation et pour la stratégie.
+    // On le crée donc en premier.
+    const ssoUserProvider = new SSOUserProvider(engine);
+
+    // 1. Récupérer le composant PassportAuth central.
+    let ssoComponent = engine.getComponent(Sso);
+    if (!ssoComponent) {
+        ssoComponent = engine.addComponent(Sso);
+        // C'EST ICI QUE L'INITIALISATION DOIT AVOIR LIEU, UNE SEULE FOIS.
+        ssoComponent.initialize({ ssoUserProvider });
+        ssoComponent.addLogoutRoute();
+        logger.info("[auth-google] Sso component was not found, created and initialized a new one.");
+    }
+
+    // 2. Vérifier que les variables d'environnement nécessaires sont présentes.
+    if (!process.env.GOOGLE_CLIENT_ID || !process.env.GOOGLE_CLIENT_SECRET) {
+        logger.warn("[auth-google] GOOGLE_CLIENT_ID or GOOGLE_CLIENT_SECRET are not set. Google SSO will be disabled.");
+        return;
+    }
+
+    // 3. Créer l'instance de la stratégie Google.
+    const googleStrategy = new GoogleStrategy({
+        clientID: process.env.GOOGLE_CLIENT_ID,
+        clientSecret: process.env.GOOGLE_CLIENT_SECRET,
+        callbackURL: "/api/auth/google/callback"
+    },
+    async (accessToken, refreshToken, profile, done) => {
+        try {
+            const user = await ssoUserProvider.findOrCreate(profile);
+            // On passe le profil brut dans le 3ème argument pour le récupérer dans le callback de `authenticate`
+            // et le passer à l'événement OnSsoLogin.
+            return done(null, user, { profile });
+        } catch (err) {
+            return done(err);
+        }
+    });
+
+    // 4. Enregistrer la stratégie auprès du composant SSO.
+    // Le composant Sso gère lui-même les routes, le callback, req.logIn() et le déclenchement de l'événement.
+    ssoComponent.addStrategy('google', googleStrategy,
+        { authPath: '/api/auth/google', callbackPath: '/api/auth/google/callback' },
+        { scope: ['profile', 'email'] }
+    );
 }