halbot 1990.1.91 → 1990.1.93

package/index.mjs

@@ -1,4 +1,4 @@
-import { bot, hal, shot, speech, utilitas, vision } from 'utilitas';
+import { bot, hal, image, shot, speech, utilitas, vision } from 'utilitas';
 import { parse } from 'csv-parse/sync';
 
 await utilitas.locate(utilitas.__(import.meta.url, 'package.json'));
@@ -7,7 +7,7 @@ const skillPath = utilitas.__(import.meta.url, 'skills');
 
 const promptSource = new Set([
     // 'https://raw.githubusercontent.com/f/awesome-chatgpt-prompts/main/prompts.csv',
-    'https://raw.githubusercontent.com/f/awesome-chatgpt-prompts/4fa40ad4067dce08a007f1c07562fac9dcbfcd1d/prompts.csv',
+    'https://raw.githubusercontent.com/f/awesome-chatgpt-prompts/82f15563c9284c01ca54f0b915ae1aeda5a0fc3a/prompts.csv'
 ]);
 
 const fetchPrompts = async () => {
@@ -29,20 +29,25 @@ 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([`[${bot.EMOJI_BOT} ${pkg.title}](${pkg.homepage})`, pkg.description]);
+    const [pkg, ai, _speech, speechOptions]
+        = [await utilitas.which(), {}, {}, { tts: true, stt: true }];
+    const info = bot.lines([
+        `[${bot.EMOJI_BOT} ${pkg.title}](${pkg.homepage})`, pkg.description
+    ]);
     const cacheOptions = options?.storage ? { store: options.storage } : null;
-    if (options?.googleApiKey) {
-        const apiKey = { apiKey: options?.googleApiKey };
-        await Promise.all([
-            speech.init({ ...apiKey, tts: true, stt: true }),
-            vision.init(apiKey),
-        ]);
-    }
-    if (options?.chatGptKey) {
+    if (options?.openaiApiKey) {
+        const apiKey = { apiKey: options.openaiApiKey };
         ai['ChatGPT'] = await hal.init({
-            provider: 'CHATGPT', clientOptions: { apiKey: options.chatGptKey },
-            cacheOptions,
+            provider: 'CHATGPT', clientOptions: apiKey, cacheOptions,
+        });
+        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?.bingToken) {
@@ -67,11 +72,12 @@ const init = async (options) => {
         provider: 'telegram',
         session: options?.storage,
         skillPath: options?.skillPath || skillPath,
-        speech: options?.googleApiKey && speech,
+        speech: (options?.openaiApiKey || options?.googleApiKey) && speech,
         vision: options?.googleApiKey && vision,
     });
     _bot._.ai = ai;                                                             // Should be an array of a map of AIs.
     _bot._.lang = options?.lang || 'English';
+    _bot._.image = options?.openaiApiKey && image;
     _bot._.prompts = await fetchPrompts();
     return _bot;
 };

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.91",
+  "version": "1990.1.93",
   "private": false,
   "homepage": "https://github.com/Leask/halbot",
   "type": "module",
@@ -30,21 +30,22 @@
   },
   "dependencies": {
     "@ffmpeg-installer/ffmpeg": "^1.1.0",
-    "@ffprobe-installer/ffprobe": "^2.1.1",
-    "@google-cloud/speech": "^5.6.0",
-    "@google-cloud/text-to-speech": "^4.2.3",
-    "@google-cloud/vision": "^3.1.4",
+    "@ffprobe-installer/ffprobe": "^2.1.2",
+    "@google-cloud/speech": "^6.1.0",
+    "@google-cloud/text-to-speech": "^5.0.1",
+    "@google-cloud/vision": "^4.0.2",
     "@mozilla/readability": "^0.4.4",
-    "@waylaidwanderer/chatgpt-api": "^1.37.2",
-    "csv-parse": "^5.4.0",
+    "@waylaidwanderer/chatgpt-api": "^1.37.3",
+    "csv-parse": "^5.5.2",
     "fluent-ffmpeg": "^2.1.2",
     "ioredis": "^5.3.2",
     "jsdom": "^22.1.0",
-    "mysql2": "^3.5.2",
-    "office-text-extractor": "^3.0.1",
-    "telegraf": "^4.12.2",
-    "tesseract.js": "^4.1.1",
-    "utilitas": "^1995.0.46",
+    "mysql2": "^3.6.3",
+    "office-text-extractor": "^3.0.2",
+    "openai": "^4.17.3",
+    "telegraf": "^4.15.0",
+    "tesseract.js": "^5.0.3",
+    "utilitas": "^1995.1.14",
     "youtube-transcript": "^1.0.6"
   }
 }

package/skills/10_engine.mjs

@@ -40,7 +40,8 @@ const validateTone = val => {
     return val;
 };
 
-export const { run, priority, func, help, args } = {
+export const { name, run, priority, func, help, args } = {
+    name: 'Engine',
     run: true,
     priority: 10,
     func: action,

package/skills/20_instant.mjs

@@ -22,7 +22,8 @@ const action = async (ctx, next) => {
     await next();
 };
 
-export const { run, priority, func, help, cmds } = {
+export const { name, run, priority, func, help, cmds } = {
+    name: 'Instant',
     run: true,
     priority: 20,
     func: action,

package/skills/30_wording.mjs

@@ -14,7 +14,7 @@ const promptTranslate = (ctx, lang) => execPrompt(ctx, [
 // Inspired by:
 // https://github.com/yetone/bob-plugin-openai-polisher/blob/main/src/main.js
 const promptPolish = ctx => execPrompt(ctx, [
-    'Revise all the following text I send to you to make them more clear, concise, and coherent.',
+    'Revise the following sentences to make them more clear, concise, and coherent.',
     'Please note that you need to list the changes and briefly explain why.',
 ]);
 
@@ -47,7 +47,8 @@ const action = async (ctx, next) => {
     await next();
 };
 
-export const { run, priority, func, cmds, help } = {
+export const { name, run, priority, func, cmds, help } = {
+    name: 'Wording',
     run: true,
     priority: 30,
     func: action,

package/skills/40_image.mjs

@@ -0,0 +1,28 @@
+import { bot } from 'utilitas';
+
+const action = async (ctx, next) => {
+    if (!ctx.cmd.args) {
+        return await ctx.ok('Please input your prompt.');
+    }
+    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) {
+        await ctx.image(image.url, { caption: image.revised_prompt });
+        await ctx.speech(image.revised_prompt);
+    }
+};
+
+export const { name, run, priority, func, cmds, help } = {
+    name: 'Image',
+    run: true,
+    priority: 40,
+    func: action,
+    help: bot.lines([
+        '¶ Use DALL-E to generate images.',
+        'Example 1: /image a cat',
+    ]),
+    cmds: {
+        image: 'Use DALL-E to generate images: /image `PROMPT`',
+    },
+};

package/skills/{40_prompt.mjs → 50_prompt.mjs}

@@ -59,9 +59,10 @@ const action = async (ctx, next) => {
     await next();
 };
 
-export const { run, priority, func, help, cmds, cmdx } = {
+export const { name, run, priority, func, help, cmds, cmdx } = {
+    name: 'Prompt',
     run: true,
-    priority: 40,
+    priority: 50,
     func: action,
     help: bot.lines([
         '¶ Maintain custom prompts.',

package/skills/{50_prepare.mjs → 60_prepare.mjs}

@@ -34,7 +34,8 @@ const action = async (ctx, next) => {
     await next();
 };
 
-export const { run, priority, func } = {
+export const { name, run, priority, func } = {
+    name: 'Prepare',
     run: true,
     priority: 60,
     func: action,

package/skills/{60_chat.mjs → 70_chat.mjs}

@@ -66,7 +66,8 @@ const action = async (ctx, next) => {
     await next();
 };
 
-export const { run, priority, func } = {
+export const { name, run, priority, func } = {
+    name: 'Chat',
     run: true,
     priority: 70,
     func: action,