utilitas 1998.2.50 → 1998.2.52

package/lib/alan.mjs

@@ -861,7 +861,6 @@ const buildPrompts = async (model, input, options = {}) => {
             content = trimTailing(trimTailing(content).slice(0, -1)) + '...';
         }
     }, model.maxInputTokens - options.attachments?.length * ATTACHMENT_TOKEN_COST);
-    print(JSON.stringify(history));
     return { systemPrompt, history, prompt };
 };
 

package/lib/bot.mjs

@@ -18,6 +18,7 @@ import { isPrimary, on, report } from './callosum.mjs';
 import { cleanSql, encodeVector, MYSQL, POSTGRESQL } from './dbio.mjs';
 import { convertAudioTo16kNanoPcmWave } from './media.mjs';
 import { get } from './shot.mjs';
+import { OPENAI_TTS_MAX_LENGTH } from './speech.mjs';
 import { BASE64, BUFFER, convert, FILE, isTextFile, tryRm } from './storage.mjs';
 import { fakeUuid } from './uoid.mjs';
 import { parseOfficeFile } from './vision.mjs';
@@ -44,7 +45,7 @@ const SEARCH_LIMIT = 10;
 const [ // https://limits.tginfo.me/en
     BOT_SEND, provider, HELLO, GROUP, PRIVATE, CHANNEL, MENTION, CALLBACK_LIMIT,
     API_ROOT, jsonOptions, signals, sessions, HALBOT, COMMAND_REGEXP,
-    MESSAGE_LENGTH_LIMIT, MESSAGE_SOFT_LIMIT, COMMAND_LENGTH, COMMAND_LIMIT,
+    MESSAGE_LENGTH_LIMIT, COMMAND_LENGTH, COMMAND_LIMIT,
     COMMAND_DESCRIPTION_LENGTH, bot_command, EMOJI_SPEECH, EMOJI_LOOK,
     EMOJI_BOT, logOptions, ON, OFF, EMOJI_THINKING, PARSE_MODE_MD,
     PARSE_MODE_MD_V2,
@@ -52,11 +53,12 @@ const [ // https://limits.tginfo.me/en
         'BOT_SEND', 'TELEGRAM', 'Hello!', 'group', 'private', 'channel',
         'mention', 30, 'https://api.telegram.org/',
         { code: true, extraCodeBlock: 1 }, ['SIGINT', 'SIGTERM'], {}, 'HALBOT',
-        /^\/([a-z0-9_]+)(@([a-z0-9_]*))?\ ?(.*)$/sig, 4096, 4000, 32, 100, 256,
+        /^\/([a-z0-9_]+)(@([a-z0-9_]*))?\ ?(.*)$/sig, 4096, 32, 100, 256,
         'bot_command', '👂', '👀', '🤖', { log: true }, 'on', 'off', '💬',
         'Markdown', 'MarkdownV2',
     ];
 
+const MESSAGE_SOFT_LIMIT = parseInt(MESSAGE_LENGTH_LIMIT * 0.95);
 const parse_mode = PARSE_MODE_MD;
 const [BUFFER_ENCODE, BINARY_STRINGS] = [{ encode: BUFFER }, [OFF, ON]];
 
@@ -215,6 +217,8 @@ const sessionSet = async chatId => {
 };
 
 const paging = (message, options) => {
+    options?.onProgress
+        && (message = message?.length ? `${message} █` : EMOJI_THINKING)
     const [pages, page, size] = [[], [], ~~options?.size || MESSAGE_SOFT_LIMIT];
     const submit = () => {
         const content = trim(lines(page));
@@ -366,7 +370,8 @@ const subconscious = [{
         ctx.shouldSpeech = async text => {
             text = isSet(text, true) ? (text || '') : ctx.tts;
             const should = ctx._.speech?.tts && ctx.checkSpeech();
-            should && text && await ctx.speech(text);
+            should && text && text.length <= OPENAI_TTS_MAX_LENGTH
+                && await ctx.speech(text);
             return should;
         };
         ctx.collect = (content, type, options) => type ? ctx.collected.push(
@@ -380,8 +385,7 @@ const subconscious = [{
             ctx.skipMemorize();
         };
         ctx.ok = async (message, options) => {
-            let pages = paging(message);
-            pages = !pages.length && options?.onProgress ? [''] : pages;
+            let pages = paging(message, options);
             const extra = getExtra(ctx, options);
             const [pageIds, pageMap] = [[], {}];
             options?.pageBreak || ctx.done.map(x => {
@@ -391,16 +395,15 @@ const subconscious = [{
             for (let i in pages) {
                 const lastPage = ~~i === pages.length - 1;
                 const shouldExtra = options?.lastMessageId || lastPage;
-                if (!options?.lastMessageId
+                if (options?.onProgress && !options?.lastMessageId
                     && pageMap[pageIds[~~i]]?.text === pages[i]) { continue; }
                 if (options?.onProgress && !pageIds[~~i]) {                     // progress: new page, reply text
                     ctx.done.push(await reply(
-                        ctx, false, pages[i] || EMOJI_THINKING, extra
+                        ctx, false, pages[i], extra
                     ));
                 } else if (options?.onProgress) {                               // progress: ongoing, edit text
-                    lastPage && (pages[i] += ' █');
                     ctx.done.push(await editMessageText(
-                        ctx, !lastPage, pageIds[~~i],
+                        ctx, false, pageIds[~~i],
                         pages[i], shouldExtra ? extra : {}
                     ));
                 } else if (options?.lastMessageId || pageIds[~~i]) {            // progress: final, edit markdown
@@ -411,7 +414,7 @@ const subconscious = [{
                 } else {                                                        // never progress, reply markdown
                     ctx.done.push(await reply(ctx, true, pages[i], extra));
                 }
-                lastPage || await ctx.timeout();
+                await ctx.timeout();
             }
             return ctx.done;
         };
@@ -433,8 +436,11 @@ const subconscious = [{
             if (Buffer.isBuffer(text)) {
                 file = await convert(text, { input: BUFFER, expected: FILE });
             } else {
-                file = await ctx._.speech.tts(text, { expected: 'file' });
+                file = await ignoreErrFunc(async () => await ctx._.speech.tts(
+                    text, { expected: 'file' }
+                ), logOptions);
             }
+            if (!file) { return; }
             const resp = await ctx.audio(file, options);
             await tryRm(file);
             return resp;
@@ -1059,7 +1065,7 @@ const init = async (options) => {
             const pkg = await which();
             mime = await need('mime');
             lorem = new (await need('lorem-ipsum')).LoremIpsum;
-            bot = new Telegraf(options?.botToken);
+            bot = new Telegraf(options?.botToken, { handlerTimeout: 1000 * 60 * 10 }); // 10 minutes
             bot.use(useNewReplies());
             bot._ = {
                 args: { ...options?.args || {} },

package/lib/manifest.mjs

@@ -1,7 +1,7 @@
 const manifest = {
     "name": "utilitas",
     "description": "Just another common utility for JavaScript.",
-    "version": "1998.2.50",
+    "version": "1998.2.52",
     "private": false,
     "homepage": "https://github.com/Leask/utilitas",
     "main": "index.mjs",

package/lib/speech.mjs

@@ -1,17 +1,18 @@
-import { convert, getTempPath } from './storage.mjs';
 import { DEFAULT_MODELS, OPENAI_VOICE } from './alan.mjs';
-import { ensureString } from './utilitas.mjs';
-import { get } from './shot.mjs';
 import { getApiKeyCredentials, hash } from './encryption.mjs';
 import { getFfmpeg } from './media.mjs';
+import { get } from './shot.mjs';
+import { convert, getTempPath } from './storage.mjs';
+import { ensureString } from './utilitas.mjs';
 
 import {
-    call, countKeys, ignoreErrFunc, inBrowser, log as _log, need, throwError
+    call, countKeys, ignoreErrFunc, inBrowser,
+    need, throwError
 } from './utilitas.mjs';
 
 import {
-    convertAudioTo16kNanoPcmWave,
     convertAudioTo16kNanoOpusOgg,
+    convertAudioTo16kNanoPcmWave,
 } from './media.mjs';
 
 const _NEED = [
@@ -28,6 +29,7 @@ const [BUFFER, STREAM, BASE64, FILE, clients, languageCode, audioEncoding, suffi
 
 // https://platform.openai.com/account/limits
 const [TTS_1, TTS_1_HD] = ['tts-1', 'tts-1-hd']; // [7500 RPM, 7500 RPM]
+const OPENAI_TTS_MAX_LENGTH = 4096;
 const defaultOpenAITtsModel = TTS_1;
 
 const WHISPER_MODELS = [
@@ -147,6 +149,7 @@ const checkWhisper = async (options) => {
 const ttsOpenAI = async (input, options) => {
     assert(clients.tts, 'Text-to-Speech API has not been initialized.', 500);
     assert(input, 'Text is required.', 400);
+    assert(input.length <= OPENAI_TTS_MAX_LENGTH, 'Text is too long.', 400);
     // https://platform.openai.com/docs/api-reference/audio/createSpeech
     const content = await clients.tts.create({
         model: defaultOpenAITtsModel, voice: DEFAULT_MODELS[OPENAI_VOICE],
@@ -274,13 +277,11 @@ export {
     _NEED,
     checkSay,
     checkWhisper,
-    init,
-    stt,
-    sttGoogle,
+    init, OPENAI_TTS_MAX_LENGTH, stt, sttGoogle,
     sttOpenAI,
     sttWhisper,
     tts,
     ttsGoogle,
     ttsOpenAI,
-    ttsSay,
+    ttsSay
 };

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "utilitas",
     "description": "Just another common utility for JavaScript.",
-    "version": "1998.2.50",
+    "version": "1998.2.52",
     "private": false,
     "homepage": "https://github.com/Leask/utilitas",
     "main": "index.mjs",