utilitas 1999.1.36 → 1999.1.38

package/lib/bot.mjs

@@ -753,59 +753,63 @@ const subconscious = [{
     run: true, priority: -8860, name: 'vision', func: async (ctx, next) => {
         ctx.collect(ctx.m?.caption || '');
         const files = [];
-        if (ctx.m.document) {
-            let file = {
-                asPrompt: bot._.supportedMimeTypes.has(ctx.m.document.mime_type),
-                file_name: ctx.m.document.file_name, fileId: ctx.m.document.file_id,
-                mime_type: ctx.m.document.mime_type, type: FILE,
-                ocrFunc: async f => (await isTextFile(f)) && f.toString(),
-            };
-            if ('application/pdf' === ctx.m.document?.mime_type) {
-                file = { ...file, ocrFunc: ctx._.vision?.read, type: 'DOCUMENT' };
-            } else if (/^image\/.*$/ig.test(ctx.m.document?.mime_type)) {
-                file = { ...file, ocrFunc: ctx._.vision?.see, type: 'IMAGE' };
-            } else if (/^.*\.(docx|xlsx|pptx)$/.test(ctx.m.document?.file_name)) {
-                file = { ...file, ocrFunc: officeParser, type: 'DOCUMENT' };
+        for (const m of [
+            ctx.m, ...ctx.m.reply_to_message ? [ctx.m.reply_to_message] : []
+        ]) {
+            if (m.document) {
+                let file = {
+                    asPrompt: bot._.supportedMimeTypes.has(m.document.mime_type),
+                    file_name: m.document.file_name, fileId: m.document.file_id,
+                    mime_type: m.document.mime_type, type: FILE,
+                    ocrFunc: async f => (await isTextFile(f)) && f.toString(),
+                };
+                if ('application/pdf' === m.document?.mime_type) {
+                    file = { ...file, ocrFunc: ctx._.vision?.read, type: 'DOCUMENT' };
+                } else if (/^image\/.*$/ig.test(m.document?.mime_type)) {
+                    file = { ...file, ocrFunc: ctx._.vision?.see, type: 'IMAGE' };
+                } else if (/^.*\.(docx|xlsx|pptx)$/.test(m.document?.file_name)) {
+                    file = { ...file, ocrFunc: officeParser, type: 'DOCUMENT' };
+                }
+                files.push(file);
+            }
+            if (m.sticker) {
+                const s = m.sticker;
+                const url = await getFileUrl(s.file_id);
+                const file_name = basename(url);
+                const mime_type = mime.getType(file_name) || 'image';
+                files.push({
+                    asPrompt: bot._.supportedMimeTypes.has(mime_type), file_name,
+                    fileId: s.file_id, mime_type, type: 'PHOTO',
+                    ocrFunc: ctx._.vision?.see,
+                });
+            }
+            if (m.photo?.[m.photo?.length - 1]) {
+                const p = m.photo[m.photo.length - 1];
+                files.push({
+                    asPrompt: bot._.supportedMimeTypes.has(jpeg),
+                    file_name: `${p.file_id}.jpg`, fileId: p.file_id,
+                    mime_type: jpeg, type: 'PHOTO', ocrFunc: ctx._.vision?.see,
+                });
+            }
+            if (m.video_note) {
+                const vn = m.video_note;
+                const url = await getFileUrl(vn.file_id);
+                const file_name = basename(url);
+                const mime_type = mime.getType(file_name) || 'video';
+                files.push({
+                    asPrompt: bot._.supportedMimeTypes.has(mime_type), file_name,
+                    fileId: vn.file_id, mime_type, type: 'VIDEO',
+                });
+            }
+            if (m.video) {
+                const v = m.video;
+                const url = await getFileUrl(v.file_id);
+                const file_name = basename(url);
+                files.push({
+                    asPrompt: bot._.supportedMimeTypes.has(v.mime_type), file_name,
+                    fileId: v.file_id, mime_type: v.mime_type, type: 'VIDEO',
+                });
             }
-            files.push(file);
-        }
-        if (ctx.m.sticker) {
-            const s = ctx.m.sticker;
-            const url = await getFileUrl(s.file_id);
-            const file_name = basename(url);
-            const mime_type = mime.getType(file_name) || 'image';
-            files.push({
-                asPrompt: bot._.supportedMimeTypes.has(mime_type), file_name,
-                fileId: s.file_id, mime_type, type: 'PHOTO',
-                ocrFunc: ctx._.vision?.see,
-            });
-        }
-        if (ctx.m.photo?.[ctx.m.photo?.length - 1]) {
-            const p = ctx.m.photo[ctx.m.photo.length - 1];
-            files.push({
-                asPrompt: bot._.supportedMimeTypes.has(jpeg),
-                file_name: `${p.file_id}.jpg`, fileId: p.file_id,
-                mime_type: jpeg, type: 'PHOTO', ocrFunc: ctx._.vision?.see,
-            });
-        }
-        if (ctx.m.video_note) {
-            const vn = ctx.m.video_note;
-            const url = await getFileUrl(vn.file_id);
-            const file_name = basename(url);
-            const mime_type = mime.getType(file_name) || 'video';
-            files.push({
-                asPrompt: bot._.supportedMimeTypes.has(mime_type), file_name,
-                fileId: vn.file_id, mime_type, type: 'VIDEO',
-            });
-        }
-        if (ctx.m.video) {
-            const v = ctx.m.video;
-            const url = await getFileUrl(v.file_id);
-            const file_name = basename(url);
-            files.push({
-                asPrompt: bot._.supportedMimeTypes.has(v.mime_type), file_name,
-                fileId: v.file_id, mime_type: v.mime_type, type: 'VIDEO',
-            });
         }
         if (files.length) {
             await ctx.ok(EMOJI_LOOK);

package/lib/image.mjs

@@ -2,9 +2,12 @@ import { ensureString, need, throwError } from './utilitas.mjs';
 import { MIME_PNG, convert } from './storage.mjs';
 
 const _NEED = ['OpenAI'];
-const [OPENAI, GEMINI, BASE64, BUFFER, ERROR_GENERATING]
-    = ['OPENAI', 'GEMINI', 'BASE64', 'BUFFER', 'Error generating image.'];
-const clients = {};
+
+const [clients, OPENAI, GEMINI, BASE64, BUFFER, ERROR_GENERATING, IMAGEN_MODEL]
+    = [
+        {}, 'OPENAI', 'GEMINI', 'BASE64', 'BUFFER', 'Error generating image.',
+        'imagen-3.0-generate-002',
+    ];
 
 const init = async (options) => {
     assert(options?.apiKey, 'API key is required.');
@@ -56,8 +59,9 @@ const generate = async (prompt, options) => {
             } catch (err) { throwError(err?.message || ERROR_GENERATING); }
             if (!options?.raw && !asUrl) {
                 resp.data = await Promise.all(resp.data.map(async x => ({
-                    prompt: x.revised_prompt, mimeType: MIME_PNG,
+                    caption: x.revised_prompt, tts: x.revised_prompt,
                     data: await extractImage(x.b64_json, options),
+                    mimeType: MIME_PNG,
                 })));
             }
             return resp?.data;
@@ -65,7 +69,7 @@ const generate = async (prompt, options) => {
             options.expected === 'URL' && (options.expected = 'FILE');
             var resp = await (await fetch(
                 'https://generativelanguage.googleapis.com/v1beta/models/'
-                + `imagen-3.0-generate-002:predict?key=${client.apiKey}`, {
+                + `${IMAGEN_MODEL}:predict?key=${client.apiKey}`, {
                 method: 'POST', headers: { 'Content-Type': 'application/json' },
                 body: JSON.stringify({
                     instances: [{ prompt }], parameters: {
@@ -78,8 +82,9 @@ const generate = async (prompt, options) => {
             if (!options?.raw) {
                 resp = await Promise.all((resp?.predictions || []).map(
                     async x => ({
-                        mimeType: x.mimeType,
+                        caption: `🎨 by ${IMAGEN_MODEL}`, tts: null,
                         data: await extractImage(x.bytesBase64Encoded, options),
+                        mimeType: x.mimeType,
                     })
                 ));
             }

package/lib/manifest.mjs

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

package/package.json

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