halbot 1990.1.29 → 1990.1.30

package/index.mjs

@@ -30,7 +30,7 @@ const fetchPrompts = async () => {
 const init = async (options) => {
     assert(options?.telegramToken, 'Telegram Bot API Token is required.');
     const [pkg, ai, _speech] = [await utilitas.which(), {}, {}];
-    const info = bot.lines([`[🤖️ ${pkg.title}](${pkg.homepage})`, pkg.description]);
+    const info = bot.lines([`[${bot.EMOJI_BOT} ${pkg.title}](${pkg.homepage})`, pkg.description]);
     if (options?.googleApiKey) {
         await speech.init({ apiKey: options?.googleApiKey, tts: true, stt: true });
         Object.assign(_speech, { stt: speech.stt, tts: speech.tts });

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.29",
+  "version": "1990.1.30",
   "private": false,
   "homepage": "https://github.com/Leask/halbot",
   "type": "module",
@@ -38,7 +38,7 @@
     "jsdom": "^21.1.1",
     "mysql2": "^3.2.0",
     "telegraf": "^4.12.2",
-    "utilitas": "^1993.3.13",
+    "utilitas": "^1993.3.20",
     "youtube-transcript": "^1.0.5"
   }
 }

package/skills/chat.mjs

@@ -1,12 +1,10 @@
-import { utilitas } from 'utilitas';
-import { countKeys } from 'utilitas/lib/utilitas.mjs';
+import { bot, utilitas } from 'utilitas';
 
 const onProgress = { onProgress: true };
-const [BOT, LN2] = ['🤖️ ', '\n\n'];
+const [BOT, LN2] = [`${bot.EMOJI_BOT} `, '\n\n'];
 const [joinL1, joinL2] = [a => a.join(LN2), a => a.join(LN2)];
 const enrich = name => name === 'Bing' ? `${name} (Sydney)` : name;
 const log = content => utilitas.log(content, import.meta.url);
-const countTokens = text => text.split(/[^a-z0-9]/i).length;
 
 const action = async (ctx, next) => {
     if (!ctx.text) { return await next(); }
@@ -14,8 +12,8 @@ const action = async (ctx, next) => {
         = [`${ctx.avatar} You:`, {}, {}, {}, [], {}];
     let [lastMsg, lastSent] = ['', 0];
     const packMsg = options => {
-        const addition = !options?.tts && (ctx._text || ctx.action) ? (ctx.text || ctx.action) : '';
-        const packed = [...addition ? [joinL2([YOU, addition])] : []];
+        const said = !options?.tts && ctx.action ? ctx.action : '';
+        const packed = [...said ? [joinL2([YOU, said])] : []];
         const source = options?.tts ? tts : msgs;
         const pure = [];
         ctx.selectedAi.map(n => {
@@ -24,7 +22,7 @@ const action = async (ctx, next) => {
             ) : (source[n] || '');
             pure.push(content);
             packed.push(joinL2([
-                ...ctx.multiAi || !ctx.isDefaultAi(n) || addition || ctxs[n]?.cmd ? [
+                ...ctx.multiAi || !ctx.isDefaultAi(n) || said || ctxs[n]?.cmd ? [
                     `${BOT}${enrich(n)}${ctxs[n]?.cmd && ` > \`${ctxs[n].cmd}\` (exit by /clear)` || ''}:`
                 ] : [], content,
             ]));
@@ -40,20 +38,10 @@ const action = async (ctx, next) => {
         return await ctx.ok(curMsg, { md: true, ...options || {}, ...extra });
     };
     await ok(onProgress);
-    // https://help.openai.com/en/articles/4936856-what-are-tokens-and-how-to-count-them
-    const additionInfo = countKeys(ctx.urls) ? Object.keys(ctx.urls).map(
-        u => ctx.urls[u]
-    ).join('\n').split(' ') : [];
-    while (countTokens(ctx.text) < 2250 && additionInfo.length) {
-        ctx.text += ` ${additionInfo.shift()}`;
-    }
-    additionInfo.filter(x => x).length && (ctx.text += '...');
     for (let n of ctx.selectedAi) {
         pms.push((async () => {
             try {
-                const resp = await ctx._.ai[n].send(ctx.text, {
-                    session: ctx.chatId, context: ctx.context
-                }, token => {
+                const resp = await ctx._.ai[n].send(ctx.text, ctx.carry, token => {
                     msgs[n] = `${(msgs[n] || '')}${token}`;
                     ok(onProgress);
                 });
@@ -80,6 +68,6 @@ const action = async (ctx, next) => {
 
 export const { run, priority, func } = {
     run: true,
-    priority: 80,
+    priority: 70,
     func: action,
 };

package/skills/execute.mjs

@@ -1,11 +1,11 @@
 
 const action = async (ctx, next) => {
-    const prompt = ctx.session.prompts?.[ctx.cmdExt?.cmd]
-        || ctx._.prompts?.[ctx.cmdExt?.cmd]?.prompt;
+    const cmd = ctx.cmd?.cmd;
+    const prompt = ctx.session.prompts?.[cmd] || ctx._.prompts?.[cmd]?.prompt;
     if (prompt) {
         ctx.clear();
-        ctx.context = { cmd: ctx.cmdExt.cmd, prompt };
-        ctx.overwrite(prompt);
+        ctx.context = { cmd, prompt };
+        ctx.collect(prompt);
     }
     await next();
 };

package/skills/prepare.mjs

@@ -0,0 +1,41 @@
+import { bot, utilitas } from 'utilitas';
+
+// https://help.openai.com/en/articles/4936856-what-are-tokens-and-how-to-count-them
+const countTokens = text => text.split(/[^a-z0-9]/i).length;
+
+const action = async (ctx, next) => {
+    // avatar
+    if (ctx.action) {
+        ctx.avatar = '⚙️';
+    } else if (ctx.msg?.voice) {
+        ctx.avatar = bot.EMOJI_SPEECH; ctx.action = utilitas.trim(ctx.text);
+    } else if (ctx.msg?.data) {
+        ctx.avatar = '🔘'; ctx.action = utilitas.trim(ctx.text);
+    } else if (ctx.msg?.poll) {
+        ctx.avatar = '📊';
+    } else if (ctx.cmd?.cmd) {
+        ctx.avatar = '🚀'; ctx.action = utilitas.trim(ctx.text);
+    } else {
+        ctx.avatar = '😸';
+    }
+    // prompt
+    console.log(ctx.collected);
+    const additionInfo = ctx.collected.length ? ctx.collected.map(
+        x => x.content
+    ).join('\n').split(' ') : [];
+    ctx.text += '\n\n';
+    while (countTokens(ctx.text) < 2250 && additionInfo.length) {
+        ctx.text += ` ${additionInfo.shift()}`;
+    }
+    ctx.text = utilitas.trim(ctx.text);
+    additionInfo.filter(x => x).length && (ctx.text += '...');
+    // next
+    ctx.carry = { session: ctx.chatId, context: ctx.context };
+    await next();
+};
+
+export const { run, priority, func } = {
+    run: true,
+    priority: 60,
+    func: action,
+};

package/skills/wording.mjs

@@ -1,6 +1,6 @@
 import { bot } from 'utilitas';
 
-const execPrompt = (ctx, arrLines) => ctx.overwrite((ctx.context = {
+const execPrompt = (ctx, arrLines) => ctx.collect((ctx.context = {
     cmd: ctx.cmd.cmd, prompt: bot.lines(arrLines),
 }).prompt);
 

package/skills/avatar.mjs

@@ -1,20 +0,0 @@
-const action = async (ctx, next) => {
-    if (ctx.message?.voice?.mime_type === 'audio/ogg') {
-        ctx.avatar = '🗣️';
-    } else if (ctx.update?.[ctx.type]?.data) {
-        ctx.avatar = '🔘';
-    } else if (ctx.update?.message?.poll) {
-        ctx.avatar = '📊';
-    } else if (ctx?.cmd?.cmd || ctx?.cmdExt?.cmd) {
-        ctx.avatar = '🚀';
-    } else {
-        ctx.avatar = '😸';
-    }
-    await next();
-};
-
-export const { run, priority, func } = {
-    run: true,
-    priority: 70,
-    func: action,
-};

package/skills/poll.mjs

@@ -1,33 +0,0 @@
-import { bot } from 'utilitas';
-
-const action = async (ctx, next) => {
-    if (!ctx.update?.message?.poll) { return next(); }
-    ctx.text = bot.lines([
-        'Please help me select the best option in this poll.',
-        'Try your best to choose between these options.',
-        'If you know the answer, please select the best one and justify it.',
-        'If you do not have enough info to pick one, explain why.',
-        'If you can choose, put option id in the box brackets like [1].',
-        '',
-        'Question:',
-        ctx.update.message.poll.question,
-        '',
-        'Options:',
-        bot.oList(ctx.update.message.poll.options.map(x => x.text)),
-    ]);
-    await next();
-    // let id;
-    // for (let key in ctx.responses) {
-    //     for (let line of ctx.responses[key].split('\n')) {
-    //         id = ~~line.match(/\[\d+\]/)?.[0]?.replace(/^\[(.*)\]$/i, '$1');
-    //         if (id) { break; }
-    //     }
-    //     if (id) { break; }
-    // }
-};
-
-export const { run, priority, func } = {
-    run: true,
-    priority: 60,
-    func: action,
-};