halbot 1992.1.8 → 1992.1.9

package/index.mjs

@@ -91,6 +91,7 @@ const init = async (options) => {
     }
     assert(utilitas.countKeys(ai), 'No AI provider is configured.');
     await alan.initChat({ engines, sessions: options?.storage });
+    for (const i in ai) { ai[i].model = engines[ai[i].engine].model; }
     // init image, speech, embedding engines
     if (options?.openaiApiKey) {
         const apiKey = { apiKey: options.openaiApiKey };
@@ -102,10 +103,12 @@ const init = async (options) => {
         await speech.init({ ...apiKey, provider: 'GOOGLE', ...speechOptions });
         embedding = alan.createGeminiEmbedding;
     }
-    // init vision engine
+    // init vision / audio engine
     const supportedMimeTypes = new Set(Object.values(engines).map(
         x => alan.MODELS[x.model]
-    ).map(x => x.supportedMimeTypes || []).flat().map(x => x.toLowerCase()));
+    ).map(x => [
+        ...x.supportedMimeTypes || [], ...x.supportedAudioTypes || [],
+    ]).flat().map(x => x.toLowerCase()));
     if (options?.googleApiKey) {
         const apiKey = { apiKey: options.googleApiKey };
         await vision.init(apiKey);

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": "1992.1.8",
+  "version": "1992.1.9",
   "private": false,
   "homepage": "https://github.com/Leask/halbot",
   "type": "module",
@@ -51,7 +51,7 @@
     "pgvector": "^0.2.0",
     "telegraf": "^4.16.3",
     "tesseract.js": "^5.1.1",
-    "utilitas": "^1997.1.32",
+    "utilitas": "^1997.1.34",
     "youtube-transcript": "^1.2.1"
   }
 }

package/skills/10_engine.mjs

@@ -1,4 +1,4 @@
-import { bot, utilitas } from 'utilitas';
+import { alan, bot, utilitas } from 'utilitas';
 
 let configuredAi;
 
@@ -9,10 +9,31 @@ const action = async (ctx, next) => {
     ).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;
-        default: ctx.selectedAi = [configuredAi.includes(ctx.session.config?.ai)
-            ? ctx.session.config?.ai : ctx.firstAi];
+        default:
+            ctx.selectedAi = [ctx.session.config?.ai];
+            const foundAi = configuredAi.includes(ctx.session.config?.ai);
+            if (foundAi) {
+            } else if (!ctx.collected?.length) {
+                ctx.selectedAi = [ctx.firstAi];
+            } else {
+                const supported = {};
+                for (const i of configuredAi) {
+                    const supportedMimeTypes = [
+                        ...alan.MODELS[ctx._.ai[i].model]?.supportedMimeTypes || [],
+                        ...alan.MODELS[ctx._.ai[i].model]?.supportedAudioTypes || [],
+                    ];
+                    for (const j of ctx.collected) {
+                        if (supportedMimeTypes.includes(j?.content?.mime_type)) {
+                            supported[i] || (supported[i] = 0);
+                            supported[i]++;
+                        }
+                    }
+                }
+                ctx.selectedAi = [Object.keys(supported).sort(
+                    (x, y) => supported[y] - supported[x]
+                )?.[0] || ctx.firstAi];
+            }
     }
     ctx.multiAi = ctx.selectedAi.length > 1;
     await next();

package/skills/60_prepare.mjs

@@ -25,8 +25,9 @@ const action = async (ctx, next) => {
         x => String.isString(x.content)
     ).map(x => x.content).join('\n').split(' ').filter(x => x);
     ctx.prompt = (ctx.txt || '') + '\n\n';
-    while (await alan.countTokens(ctx.prompt) < maxInputTokens
-        && additionInfo.length) {
+    while (await alan.countTokens(
+        `${ctx.prompt}${additionInfo?.[0] || ''}`
+    ) < maxInputTokens && additionInfo.length) {
         ctx.prompt += ` ${additionInfo.shift()}`;
     }
     ctx.prompt = utilitas.trim(ctx.prompt);

package/skills/70_chat.mjs

@@ -9,7 +9,7 @@ const [BOT, BOTS, LN2] = [`${bot.EMOJI_BOT} `, {
 }, '\n\n'];
 
 const action = async (ctx, next) => {
-    if (!ctx.prompt) { return await next(); }
+    if (!ctx.prompt && !ctx.carry.attachments.length) { return await next(); }
     const [YOU, msgs, tts, pms, extra]
         = [`${ctx.avatar} You:`, {}, {}, [], { buttons: [] }];
     let [lastMsg, lastSent, references] = [null, 0, null];