halbot 1990.1.90 → 1990.1.92

package/index.mjs

@@ -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,26 @@ 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
+        });
+    }
+    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,7 +73,7 @@ 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.

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.90",
+  "version": "1990.1.92",
   "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.24",
+    "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.11",
     "youtube-transcript": "^1.0.6"
   }
 }