halbot 1993.2.6 → 1993.2.8

package/index.mjs

@@ -36,20 +36,6 @@ const init = async (options) => {
     ]);
     let embedding;
     // init ai engines
-    if (options?.googleApiKey) {
-        await alan.init({
-            provider: 'GEMINI', apiKey: options?.googleApiKey,
-            model: options?.geminiModel, // only support custom model while initiating
-            ...options || {},
-        });
-        ai['Gemini'] = {
-            engine: 'GEMINI', priority: options?.geminiPriority || 0,
-        };
-        engines['GEMINI'] = {
-            // save for reference not for prompting
-            model: options?.geminiModel,
-        };
-    }
     if (options?.openaiApiKey || options?.chatGptApiKey) {
         await alan.init({
             provider: 'OPENAI',
@@ -57,13 +43,27 @@ const init = async (options) => {
             ...options || {},
         });
         ai['ChatGPT'] = {
-            engine: 'CHATGPT', priority: options?.chatGptPriority || 1,
+            engine: 'CHATGPT', priority: options?.chatGptPriority || 0,
         };
         engines['CHATGPT'] = {
             // only support custom model while prompting
             model: options?.chatGptModel,
         };
     }
+    if (options?.googleApiKey) {
+        await alan.init({
+            provider: 'GEMINI', apiKey: options?.googleApiKey,
+            model: options?.geminiModel, // only support custom model while initiating
+            ...options || {},
+        });
+        ai['Gemini'] = {
+            engine: 'GEMINI', priority: options?.geminiPriority || 1,
+        };
+        engines['GEMINI'] = {
+            // save for reference not for prompting
+            model: options?.geminiModel,
+        };
+    }
     if (options?.claudeApiKey) {
         await alan.init({
             provider: 'CLAUDE', apiKey: options?.claudeApiKey,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "halbot",
   "description": "Just another `ChatGPT` / `Gemini` / `Mistral (by ollama)` Telegram bob, which is simple design, easy to use, extendable and fun.",
-  "version": "1993.2.6",
+  "version": "1993.2.8",
   "private": false,
   "homepage": "https://github.com/Leask/halbot",
   "type": "module",
@@ -47,12 +47,12 @@
     "mysql2": "^3.12.0",
     "office-text-extractor": "^3.0.3",
     "ollama": "^0.5.11",
-    "openai": "^4.77.3",
+    "openai": "^4.77.4",
     "pg": "^8.13.1",
     "pgvector": "^0.2.0",
     "telegraf": "^4.16.3",
     "tesseract.js": "^6.0.0",
-    "utilitas": "^1998.1.8",
+    "utilitas": "^1998.1.10",
     "youtube-transcript": "^1.2.1"
   }
 }

package/skills/10_engine.mjs

@@ -5,6 +5,7 @@ const NAME_HACK = {
 };
 
 const NAME_HACK_REVERSE = utilitas.reverseKeyValues(NAME_HACK);
+const AI_CMD = '/set --ai=';
 
 let configuredAi;
 
@@ -14,9 +15,11 @@ const action = async (ctx, next) => {
         k => [k, ctx._.ai[k].priority]
     ).sort((x, y) => x[1] - y[1]);
     ctx.firstAi = arrSort[0][0];
-    if (ctx.carry?.keyboards?.length) {
+    if (ctx.carry?.keyboards?.length && !ctx.carry.keyboards.find(
+        x => x.find(y => y.text.includes(AI_CMD))
+    )) {
         ctx.carry.keyboards.unshift(configuredAi.slice(0, 3).map(
-            x => ({ text: `/set --ai=${NAME_HACK[x] || x}` })
+            x => ({ text: `${AI_CMD}${NAME_HACK[x] || x}` })
         ));
     }
     switch (ctx.session.config?.ai) {