halbot 1990.1.117 → 1990.1.119

package/README.md

@@ -67,21 +67,41 @@ All supported configuration fields:
     // REQUIRED, string.
     "telegramToken": "[[Telegram Bot API Token]]",
 
+    // Set some of these fields if you need ChatGPT features.
     // OPTIONAL, string.
-    // Set this field if you need ChatGPT features.
     "openaiApiKey": "[[OpenAI API Key]]",
+    // OPTIONAL, string.
     "openaiEndpoint": "[[Custom OpenAI API endpoint]]",
+    // OPTIONAL, string, default: "gpt-3.5-turbo".
     "chatGptModel": "[[Custom ChatGPT Model ID]]",
+    // OPTIONAL, integer, default: 0.
+    "chatGptPriority": "[[Custom ChatGPT Priority]]",
 
+    // Set some of these fields if you need to use custom ChatGPT API.
+    // OPTIONAL, string.
+    "chatGptApiKey": "[[Custom ChatGPT API Key]]",
     // OPTIONAL, string.
+    "chatGptEndpoint": "[[Custom ChatGPT API endpoint]]",
+
     // Set this field if you need Gemini features.
+    // OPTIONAL, string.
     "googleCredentials": "[[Google Cloud Credentials]]",
+    // OPTIONAL, string.
     "googleProject": "[[Google Cloud Project ID]]",
+    // OPTIONAL, string, default: "gemini-pro-vision".
+    "geminiModel": "[[Custom Gemini Model ID]]",
+    // OPTIONAL, integer, default: 1.
+    "geminiPriority": "[[Custom Gemini Priority]]",
 
-    // OPTIONAL, boolean.
     // Set this field if you need Mistral features.
+    // OPTIONAL, boolean.
     "mistralEnabled": "[[Enable Mistral hosted by Ollama]]",
+    // OPTIONAL, string.
     "mistralEndpoint": "[[Custom Mistral API endpoint]]",
+    // OPTIONAL, string, default: "Mistral" (Mistral 7B).
+    "mistralModel": "[[Custom Mistral Model ID]]",
+    // OPTIONAL, integer, default: 2.
+    "mistralPriority": "[[Custom Mistral Priority]]",
 
     // OPTIONAL, string.
     // Set this field if you need TTS/STT/OCR/OBJECT_DETECT features.

package/index.mjs

@@ -1,6 +1,5 @@
 import { alan, bot, image, shot, speech, utilitas, vision } from 'utilitas';
 import { parse } from 'csv-parse/sync';
-import { end } from 'utilitas/lib/event.mjs';
 
 await utilitas.locate(utilitas.__(import.meta.url, 'package.json'));
 const log = content => utilitas.log(content, 'halbot');
@@ -35,15 +34,24 @@ const init = async (options) => {
     const info = bot.lines([
         `[${bot.EMOJI_BOT} ${pkg.title}](${pkg.homepage})`, pkg.description
     ]);
-    if (options?.openaiApiKey) {
-        const apiKey = { apiKey: options.openaiApiKey };
+    if (options?.openaiApiKey || options?.chatGptApiKey) {
+        const apiKey = { apiKey: options?.chatGptApiKey || options?.openaiApiKey };
         await alan.init({
-            provider: 'openai', ...apiKey, baseURL: options?.openaiEndpoint,
+            provider: 'openai', ...apiKey,
+            baseURL: options?.chatGptEndpoint || options?.openaiEndpoint,
         });
+        ai['ChatGPT'] = {
+            engine: 'CHATGPT', priority: options?.chatGptPriority || 0,
+        };
+        engines['CHATGPT'] = {
+            // only support custom model while prompting
+            model: options?.chatGptModel,
+        };
+    }
+    if (options?.openaiApiKey) {
+        const apiKey = { apiKey: options.openaiApiKey };
         await speech.init({ ...apiKey, provider: 'OPENAI', ...speechOptions });
         await image.init(apiKey);
-        ai['ChatGPT'] = { engine: 'CHATGPT' };
-        engines['CHATGPT'] = { model: options?.chatGptModel };
     }
     if (options?.googleApiKey) {
         const apiKey = { apiKey: options.googleApiKey };
@@ -57,18 +65,28 @@ const init = async (options) => {
             provider: 'VERTEX',
             credentials: options.googleCredentials,
             project: options.googleProject,
+            // only support custom model while initiating
+            model: options?.geminiModel,
         });
-        ai['Gemini'] = { engine: 'VERTEX' };
-        engines['VERTEX'] = {};
+        ai['Gemini'] = {
+            engine: 'VERTEX', priority: options?.geminiPriority || 1,
+        };
+        engines['VERTEX'] = {
+            // save for reference not for prompting
+            model: options?.geminiModel,
+        };
     }
     if (options?.mistralEnabled || options?.mistralEndpoint) {
         await alan.init({
-            provider: 'OLLAMA',
-            endpoint: options?.mistralEndpoint,
-            model: options?.mistralModel,
+            provider: 'OLLAMA', endpoint: options?.mistralEndpoint,
         });
-        ai['Mistral'] = { engine: 'OLLAMA' };
-        engines['OLLAMA'] = {};
+        ai['Mistral'] = {
+            engine: 'OLLAMA', priority: options?.mistralPriority || 2,
+        };
+        engines['OLLAMA'] = {
+            // only support custom model while prompting
+            model: options?.mistralModel,
+        };
     }
     await alan.initChat({ engines, sessions: options?.storage });
     assert(utilitas.countKeys(ai), 'No AI provider is configured.');

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "halbot",
   "description": "Just another ChatGPT/Bing Chat Telegram bob, which is simple design, easy to use, extendable and fun.",
-  "version": "1990.1.117",
+  "version": "1990.1.119",
   "private": false,
   "homepage": "https://github.com/Leask/halbot",
   "type": "module",
@@ -46,7 +46,7 @@
     "openai": "^4.24.1",
     "telegraf": "^4.15.3",
     "tesseract.js": "^5.0.4",
-    "utilitas": "^1995.2.46",
+    "utilitas": "^1995.2.47",
     "youtube-transcript": "^1.0.6"
   }
 }

package/skills/10_engine.mjs

@@ -4,7 +4,10 @@ let configuredAi;
 
 const action = async (ctx, next) => {
     ctx.isDefaultAi = name => name === ctx.firstAi;
-    ctx.firstAi = (configuredAi = Object.keys(ctx._.ai))[0];
+    const arrSort = (configuredAi = Object.keys(ctx._.ai)).map(
+        k => [k, ctx._.ai[k].priority]
+    ).sort((x, y) => x[1] - y[1]);
+    ctx.firstAi = arrSort[0][0];
     switch (ctx.session.config?.ai) {
         case '': ctx.selectedAi = [ctx.firstAi]; break;
         case '@': ctx.selectedAi = configuredAi; break;