halbot 1990.1.118 → 1990.1.120

package/README.md

@@ -67,26 +67,41 @@ All supported configuration fields:
     // REQUIRED, string.
     "telegramToken": "[[Telegram Bot API Token]]",
 
-    // OPTIONAL, string.
     // Set some of these fields if you need ChatGPT features.
+    // OPTIONAL, string.
     "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]]",
 
-    // OPTIONAL, string.
     // 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]]",
 
-    // OPTIONAL, string.
     // 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,47 +34,69 @@ const init = async (options) => {
     const info = bot.lines([
         `[${bot.EMOJI_BOT} ${pkg.title}](${pkg.homepage})`, pkg.description
     ]);
+    // init ai engines
     if (options?.openaiApiKey || options?.chatGptApiKey) {
         const apiKey = { apiKey: options?.chatGptApiKey || options?.openaiApiKey };
         await alan.init({
             provider: 'openai', ...apiKey,
             baseURL: options?.chatGptEndpoint || options?.openaiEndpoint,
         });
-        ai['ChatGPT'] = { engine: 'CHATGPT' };
-        engines['CHATGPT'] = { model: options?.chatGptModel };
-    }
-    if (options?.openaiApiKey) {
-        const apiKey = { apiKey: options.openaiApiKey };
-        await speech.init({ ...apiKey, provider: 'OPENAI', ...speechOptions });
-        await image.init(apiKey);
-    }
-    if (options?.googleApiKey) {
-        const apiKey = { apiKey: options.googleApiKey };
-        await vision.init(apiKey);
-        options?.openaiApiKey || await speech.init({
-            ...apiKey, provider: 'GOOGLE', ...speechOptions,
-        });
+        ai['ChatGPT'] = {
+            engine: 'CHATGPT', priority: options?.chatGptPriority || 0,
+        };
+        engines['CHATGPT'] = {
+            // only support custom model while prompting
+            model: options?.chatGptModel,
+        };
     }
     if (options?.googleCredentials && options?.googleProject) {
         await alan.init({
             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.');
+    await alan.initChat({ engines, sessions: options?.storage });
+    // init image, speech engines
+    if (options?.openaiApiKey) {
+        const apiKey = { apiKey: options.openaiApiKey };
+        await image.init(apiKey);
+        await speech.init({ ...apiKey, provider: 'OPENAI', ...speechOptions });
+    } else if (options?.googleApiKey) {
+        const apiKey = { apiKey: options.googleApiKey };
+        await speech.init({ ...apiKey, provider: 'GOOGLE', ...speechOptions });
+    }
+    // init vision engine
+    const supportedMimeTypes = new Set(Object.values(engines).map(
+        x => alan.MODELS[x.model]
+    ).map(x => x.supportedMimeTypes || []).flat().map(x => x.toLowerCase()));
+    if (options?.googleApiKey) {
+        const apiKey = { apiKey: options.googleApiKey };
+        await vision.init(apiKey);
+    }
+    // init bot
     const _bot = await bot.init({
         args: options?.args,
         auth: options?.auth,
@@ -93,6 +114,7 @@ const init = async (options) => {
         skillPath: options?.skillPath || skillPath,
         speech: (options?.openaiApiKey || options?.googleApiKey) && speech,
         vision: options?.googleApiKey && vision,
+        supportedMimeTypes,
     });
     _bot._.ai = ai;                                                             // Should be an array of a map of AIs.
     _bot._.lang = options?.lang || 'English';

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.118",
+  "version": "1990.1.120",
   "private": false,
   "homepage": "https://github.com/Leask/halbot",
   "type": "module",

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;

package/skills/{40_image.mjs → 40_dream.mjs}

@@ -4,7 +4,7 @@ const action = async (ctx, next) => {
     if (!ctx.cmd.args) {
         return await ctx.ok('Please input your prompt.');
     }
-    const objMsg = (await ctx.ok('✍️'))[0];
+    const objMsg = (await ctx.ok('💭'))[0];
     const images = await ctx._.image.generate(ctx.cmd.args, { expected: 'URL' });
     await ctx.deleteMessage(objMsg.message_id);
     for (let image of images) {
@@ -14,15 +14,15 @@ const action = async (ctx, next) => {
 };
 
 export const { name, run, priority, func, cmds, help } = {
-    name: 'Image',
+    name: 'Dream',
     run: true,
     priority: 40,
     func: action,
     help: bot.lines([
         'Use DALL-E to generate images.',
-        'Example: /image a cat',
+        'Example: /dream a cat',
     ]),
     cmds: {
-        image: 'Use DALL-E to generate images: /image `PROMPT`',
+        image: 'Use DALL-E to generate images: /dream `PROMPT`',
     },
 };

package/skills/60_prepare.mjs

@@ -17,15 +17,16 @@ const action = async (ctx, next) => {
     }
     // prompt
     const maxInputTokens = alan.getMaxChatPromptLimit();
-    const additionInfo = ctx.collected.length ? ctx.collected.map(
-        x => x.content
-    ).join('\n').split(' ') : [];
+    const additionInfo = ctx.collected.filter(
+        x => String.isString(x.content)
+    ).map(x => x.content).join('\n').split(' ').filter(x => x);
     ctx.prompt = (ctx.text || '') + '\n\n';
     while (alan.countTokens(ctx.prompt) < maxInputTokens
         && additionInfo.length) {
         ctx.prompt += ` ${additionInfo.shift()}`;
     }
     ctx.prompt = utilitas.trim(ctx.prompt);
+    ctx.carry.attachments = ctx.collected.filter(x => x.type === 'PROMPT').map(x => x.content);
     additionInfo.filter(x => x).length && (ctx.prompt += '...');
     // next
     await next();