halbot 1990.1.120 → 1990.1.122

package/README.md

@@ -67,7 +67,7 @@ All supported configuration fields:
     // REQUIRED, string.
     "telegramToken": "[[Telegram Bot API Token]]",
 
-    // Set some of these fields if you need ChatGPT features.
+    // Set some of these fields if you need ChatGPT, Whisper, Embedding features.
     // OPTIONAL, string.
     "openaiApiKey": "[[OpenAI API Key]]",
     // OPTIONAL, string.
@@ -104,7 +104,7 @@ All supported configuration fields:
     "mistralPriority": "[[Custom Mistral Priority]]",
 
     // OPTIONAL, string.
-    // Set this field if you need TTS/STT/OCR/OBJECT_DETECT features.
+    // Set this field if you need Google's TTS/STT/OCR/OBJECT_DETECT/Embedding.
     "googleApiKey": "[[Google Cloud API Key]]",
 
     // OPTIONAL, undefined || array of string.
@@ -138,20 +138,32 @@ All supported configuration fields:
     "help": "[[help information]]",
 
     // OPTIONAL, object.
-    // Sessions/conversations storage, support MariaDB/MySQL and Redis for now.
+    // Sessions/conversations storage.
+    // support PostgreSQL, MariaDB/MySQL and Redis for now.
     // If omitted, the bot will use memory storage and sync to this file.
-    // Example: (Compatibility: https://github.com/sidorares/node-mysql2)
+    // Example: (Compatibility: https://node-postgres.com/apis/pool)
     "storage": {
-        "type": "[["MARIADB" || "MYSQL"]]",
+        "provider": "POSTGRESQL",
         "host": "[[DATABASE HOST]]",
         "database": "[[DATABASE NAME]]",
         "user": "[[DATABASE USER]]",
         "password": "[[DATABASE PASSWORD]]",
+        "vector": true, // REQUIRED
+        ...[[OTHER DATABASE OPTIONS]],
+    },
+    // OR: (Compatibility: https://github.com/sidorares/node-mysql2)
+    "storage": {
+        "provider": "[["MARIADB" || "MYSQL"]]",
+        "host": "[[DATABASE HOST]]",
+        "database": "[[DATABASE NAME]]",
+        "user": "[[DATABASE USER]]",
+        "password": "[[DATABASE PASSWORD]]",
+        "charset": "utf8mb4", // REQUIRED
         ...[[OTHER DATABASE OPTIONS]],
     },
     // OR: (Compatibility: https://github.com/luin/ioredis)
     "storage": {
-        "type": "REDIS",
+        "provider": "REDIS",
         "host": "[[REDIS HOST]]",
         "password": "[[REDIS PASSWORD]]",
         ...[[OTHER REDIS OPTIONS]],

package/bin/halbot.mjs

@@ -10,6 +10,7 @@ const _getConfig = async () => await _storage.getConfig();
 const getConfig = async key => (await _getConfig())?.config?.[key];
 
 let storage = {
+    provider: 'FILE',
     get: async key => (await getConfig(MEMORY))?.[key],
     set: async (k, v) => await _storage.setConfig({ [MEMORY]: { [k]: v } }),
 };
@@ -17,14 +18,14 @@ let storage = {
 try {
     const { filename, config } = await _getConfig();
     assert(utilitas.countKeys(config), `Error loading config from ${filename}.`);
-    const sessionType = utilitas.trim(config.storage?.provider, { case: 'UP' });
-    switch (sessionType) {
-        case 'MARIADB': case 'MYSQL':
+    const provider = utilitas.trim(config.storage?.provider, { case: 'UP' });
+    switch (provider) {
+        case 'MARIADB': case 'MYSQL': case 'POSTGRESQL':
             await dbio.init(config.storage);
-            storage = await memory.init();
+            storage = { ...await memory.init(), provider, client: dbio };
             break;
         case 'REDIS':
-            storage = await cache.init(config.storage);
+            storage = { ...await cache.init(config.storage), provider };
             break;
         default:
             config.storage && utilitas.throwError('Invalid storage config.');

package/index.mjs

@@ -1,4 +1,4 @@
-import { alan, bot, image, shot, speech, utilitas, vision } from 'utilitas';
+import { alan, bot, dbio, image, shot, speech, utilitas, vision } from 'utilitas';
 import { parse } from 'csv-parse/sync';
 
 await utilitas.locate(utilitas.__(import.meta.url, 'package.json'));
@@ -34,13 +34,11 @@ const init = async (options) => {
     const info = bot.lines([
         `[${bot.EMOJI_BOT} ${pkg.title}](${pkg.homepage})`, pkg.description
     ]);
+    let embedding;
     // init ai engines
     if (options?.openaiApiKey || options?.chatGptApiKey) {
-        const apiKey = { apiKey: options?.chatGptApiKey || options?.openaiApiKey };
-        await alan.init({
-            provider: 'openai', ...apiKey,
-            baseURL: options?.chatGptEndpoint || options?.openaiEndpoint,
-        });
+        const apiKey = { apiKey: options?.openaiApiKey || options?.chatGptApiKey };
+        await alan.init({ provider: 'openai', ...apiKey, ...options });
         ai['ChatGPT'] = {
             engine: 'CHATGPT', priority: options?.chatGptPriority || 0,
         };
@@ -79,14 +77,16 @@ const init = async (options) => {
     }
     assert(utilitas.countKeys(ai), 'No AI provider is configured.');
     await alan.initChat({ engines, sessions: options?.storage });
-    // init image, speech engines
+    // init image, speech, embedding engines
     if (options?.openaiApiKey) {
         const apiKey = { apiKey: options.openaiApiKey };
         await image.init(apiKey);
         await speech.init({ ...apiKey, provider: 'OPENAI', ...speechOptions });
+        embedding = alan.createOpenAIEmbedding;
     } else if (options?.googleApiKey) {
         const apiKey = { apiKey: options.googleApiKey };
         await speech.init({ ...apiKey, provider: 'GOOGLE', ...speechOptions });
+        embedding = alan.createVertexEmbedding;
     }
     // init vision engine
     const supportedMimeTypes = new Set(Object.values(engines).map(
@@ -103,6 +103,8 @@ const init = async (options) => {
         botToken: options?.telegramToken,
         chatType: options?.chatType,
         cmds: options?.cmds,
+        database: options?.storage?.client && options?.storage,
+        embedding, supportedMimeTypes,
         hello: options?.hello,
         help: options?.help,
         homeGroup: options?.homeGroup,
@@ -114,7 +116,6 @@ const init = async (options) => {
         skillPath: options?.skillPath || skillPath,
         speech: (options?.openaiApiKey || options?.googleApiKey) && speech,
         vision: options?.googleApiKey && vision,
-        supportedMimeTypes,
     });
     _bot._.ai = ai;                                                             // Should be an array of a map of AIs.
     _bot._.lang = options?.lang || 'English';

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.120",
+  "version": "1990.1.122",
   "private": false,
   "homepage": "https://github.com/Leask/halbot",
   "type": "module",
@@ -46,7 +46,7 @@
     "openai": "^4.24.1",
     "telegraf": "^4.15.3",
     "tesseract.js": "^5.0.4",
-    "utilitas": "^1995.2.47",
+    "utilitas": "^1995.2.51",
     "youtube-transcript": "^1.0.6"
   }
 }

package/skills/60_prepare.mjs

@@ -21,7 +21,7 @@ const action = async (ctx, next) => {
         x => String.isString(x.content)
     ).map(x => x.content).join('\n').split(' ').filter(x => x);
     ctx.prompt = (ctx.text || '') + '\n\n';
-    while (alan.countTokens(ctx.prompt) < maxInputTokens
+    while (await alan.countTokens(ctx.prompt) < maxInputTokens
         && additionInfo.length) {
         ctx.prompt += ` ${additionInfo.shift()}`;
     }

package/skills/70_chat.mjs

@@ -52,9 +52,6 @@ const action = async (ctx, next) => {
                 tts[n] = ctx.selectedAi.length === 1
                     && !msgs[n].split('\n').some(x => /^```/.test(x))
                     ? resp.spoken : '';
-                // extra.buttons = resp?.suggestedResponses?.map?.(label => ({
-                //     label, text: `/bing@${ctx.botInfo.username} ${label}`,
-                // }));
                 return resp;
             } catch (err) {
                 msgs[n] = err?.message || err;