halbot 1990.1.119 → 1990.1.121

package/index.mjs

@@ -34,6 +34,7 @@ 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({
@@ -48,18 +49,6 @@ const init = async (options) => {
             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,
-        });
-    }
     if (options?.googleCredentials && options?.googleProject) {
         await alan.init({
             provider: 'VERTEX',
@@ -88,8 +77,26 @@ const init = async (options) => {
             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,
@@ -107,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.119",
+  "version": "1990.1.121",
   "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.47",
+    "utilitas": "^1995.2.51",
     "youtube-transcript": "^1.0.6"
   }
 }

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();