halbot 1993.2.56 → 1993.2.58

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "halbot",
   "description": "Just another `ChatGPT` / `Gemini` / `Ollama` Telegram bob, which is simple design, easy to use, extendable and fun.",
-  "version": "1993.2.56",
+  "version": "1993.2.58",
   "private": false,
   "homepage": "https://github.com/Leask/halbot",
   "type": "module",
@@ -51,7 +51,7 @@
     "pgvector": "^0.2.0",
     "telegraf": "^4.16.3",
     "tesseract.js": "^6.0.0",
-    "utilitas": "^1999.1.6",
+    "utilitas": "^1999.1.9",
     "youtube-transcript": "^1.2.1"
   }
 }

package/skills/60_prepare.mjs

@@ -35,8 +35,8 @@ const action = async (ctx, next) => {
     }
     // prompt
     await checkUnsupportedMimeType(ctx);
-    const maxInputTokens = alan.getMaxChatPromptLimit()
-        - alan.ATTACHMENT_TOKEN_COST * ctx.carry.attachments.length;
+    const maxInputTokens = await alan.getChatPromptLimit()
+        - await alan.getChatAttachmentCost() * ctx.carry.attachments.length;
     const additionInfo = ctx.collected.filter(
         x => String.isString(x.content)
     ).map(x => x.content).join('\n').split(' ').filter(x => x);

package/skills/70_chat.mjs

@@ -1,4 +1,4 @@
-import { alan, bot, utilitas } from 'utilitas';
+import { alan, bot, storage, utilitas } from 'utilitas';
 
 const onProgress = { onProgress: true };
 const [joinL1, joinL2] = [a => a.join(LN2), a => a.join(LN2)];
@@ -12,8 +12,10 @@ const [BOT, BOTS, LN2] = [`${bot.EMOJI_BOT} `, {
 
 const action = async (ctx, next) => {
     if (!ctx.prompt && !ctx.carry.attachments.length) { return await next(); }
-    const [YOU, msgs, tts, rsm, pms, extra, firstResp]
-        = [`${ctx.avatar} You:`, {}, {}, {}, [], { buttons: [] }, Date.now()];
+    const [YOU, msgs, tts, rsm, pms, extra, firstResp, lock] = [
+        `${ctx.avatar} You:`, {}, {}, {}, [], { buttons: [] }, Date.now(),
+        1000 * 5
+    ];
     let [lastMsg, lastSent, references, audio] = [null, 0, null, null];
     const packMsg = options => {
         const said = !options?.tts && ctx.result ? ctx.result : '';
@@ -34,10 +36,9 @@ const action = async (ctx, next) => {
     const ok = async options => {
         const [curTime, curMsg] = [Date.now(), packMsg(options)];
         if (options?.onProgress && (
-            (curTime - lastSent) < (ctx.limit * (curTime - firstResp > 1000 * 60 ? 2 : 1))
-            || lastMsg === curMsg
+            curTime - lastSent < ctx.limit || lastMsg === curMsg
         )) { return; }
-        [lastSent, lastMsg] = [curTime, curMsg];
+        [lastSent, lastMsg] = [curTime + lock, curMsg];
         const cmd = ctx.session.context?.cmd;
         if (options?.final) {
             (references?.links || []).map((x, i) => extra.buttons.push({
@@ -47,10 +48,12 @@ const action = async (ctx, next) => {
                 label: `❎ End context: \`${cmd}\``, text: '/clear',
             }));
         }
-        return await ctx.ok(curMsg, {
+        const resp = await ctx.ok(curMsg, {
             ...ctx.carry.keyboards ? { keyboards: ctx.carry.keyboards } : {},
             md: true, ...extra, ...options || {},
         });
+        lastSent = curTime;
+        return resp;
     };
     ctx.carry.threadInfo.length || await ok(onProgress);
     for (const n of ctx.selectedAi) {
@@ -69,6 +72,10 @@ const action = async (ctx, next) => {
                     && !msgs[ai].split('\n').some(x => /^\s*```/.test(x))
                     ? resp.spoken : '';
                 rsm[ai] = resp.model;
+                for (let img of resp?.images || []) {
+                    await ctx.image(img.data, { caption: `🎨 by ${resp.model}` });
+                    await ctx.timeout();
+                }
                 return resp;
             } catch (err) {
                 msgs[ai] = `⚠️ ${err?.message || err}`;