halbot 1992.1.7 → 1992.1.9

package/index.mjs

@@ -37,38 +37,52 @@ const init = async (options) => {
     let embedding;
     // init ai engines
     if (options?.openaiApiKey || options?.chatGptApiKey) {
-        const apiKey = { apiKey: options?.openaiApiKey || options?.chatGptApiKey };
-        await alan.init({ ...apiKey, ...options, provider: 'OPENAI' });
+        await alan.init({
+            provider: 'OPENAI',
+            apiKey: options?.openaiApiKey || options?.chatGptApiKey,
+            ...options || {},
+        });
         ai['ChatGPT'] = {
-            engine: 'CHATGPT', priority: options?.chatGptPriority || 0, // ASSISTANT
+            engine: 'CHATGPT', priority: options?.chatGptPriority || 0,
         };
-        engines['CHATGPT'] = { // ASSISTANT
+        engines['CHATGPT'] = {
             // only support custom model while prompting
             model: options?.chatGptModel,
         };
     }
-    if (options?.googleCredentials && options?.googleProject) {
+    if (options?.googleApiKey) {
         await alan.init({
-            provider: 'VERTEX',
-            credentials: options.googleCredentials,
-            project: options.googleProject,
-            // only support custom model while initiating
-            model: options?.geminiModel,
+            provider: 'GEMINI', apiKey: options?.googleApiKey,
+            model: options?.geminiModel, // only support custom model while initiating
+            ...options || {},
         });
         ai['Gemini'] = {
-            engine: 'VERTEX', priority: options?.geminiPriority || 1,
+            engine: 'GEMINI', priority: options?.geminiPriority || 1,
         };
-        engines['VERTEX'] = {
+        engines['GEMINI'] = {
             // save for reference not for prompting
             model: options?.geminiModel,
         };
     }
+    if (options?.claudeApiKey) {
+        await alan.init({
+            provider: 'CLAUDE', apiKey: options?.claudeApiKey,
+            ...options || {},
+        });
+        ai['Claude'] = {
+            engine: 'CLAUDE', priority: options?.claudePriority || 2,
+        };
+        engines['CLAUDE'] = {
+            // only support custom model while prompting
+            model: options?.claudeModel,
+        };
+    }
     if (options?.mistralEnabled || options?.mistralEndpoint) {
         await alan.init({
             provider: 'OLLAMA', endpoint: options?.mistralEndpoint,
         });
         ai['Mistral'] = {
-            engine: 'OLLAMA', priority: options?.mistralPriority || 2,
+            engine: 'OLLAMA', priority: options?.mistralPriority || 3,
         };
         engines['OLLAMA'] = {
             // only support custom model while prompting
@@ -77,6 +91,7 @@ const init = async (options) => {
     }
     assert(utilitas.countKeys(ai), 'No AI provider is configured.');
     await alan.initChat({ engines, sessions: options?.storage });
+    for (const i in ai) { ai[i].model = engines[ai[i].engine].model; }
     // init image, speech, embedding engines
     if (options?.openaiApiKey) {
         const apiKey = { apiKey: options.openaiApiKey };
@@ -86,12 +101,14 @@ const init = async (options) => {
     } else if (options?.googleApiKey) {
         const apiKey = { apiKey: options.googleApiKey };
         await speech.init({ ...apiKey, provider: 'GOOGLE', ...speechOptions });
-        embedding = alan.createVertexEmbedding;
+        embedding = alan.createGeminiEmbedding;
     }
-    // init vision engine
+    // init vision / audio engine
     const supportedMimeTypes = new Set(Object.values(engines).map(
         x => alan.MODELS[x.model]
-    ).map(x => x.supportedMimeTypes || []).flat().map(x => x.toLowerCase()));
+    ).map(x => [
+        ...x.supportedMimeTypes || [], ...x.supportedAudioTypes || [],
+    ]).flat().map(x => x.toLowerCase()));
     if (options?.googleApiKey) {
         const apiKey = { apiKey: options.googleApiKey };
         await vision.init(apiKey);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "halbot",
   "description": "Just another `ChatGPT` / `Gemini` / `Mistral (by ollama)` Telegram bob, which is simple design, easy to use, extendable and fun.",
-  "version": "1992.1.7",
+  "version": "1992.1.9",
   "private": false,
   "homepage": "https://github.com/Leask/halbot",
   "type": "module",
@@ -29,29 +29,29 @@
     "url": "https://github.com/Leask/halbot.git"
   },
   "dependencies": {
+    "@anthropic-ai/sdk": "^0.33.1",
     "@ffmpeg-installer/ffmpeg": "^1.1.0",
     "@ffprobe-installer/ffprobe": "^2.1.2",
-    "@google-cloud/aiplatform": "^3.28.0",
     "@google-cloud/speech": "^6.7.0",
-    "@google-cloud/text-to-speech": "^5.4.0",
-    "@google-cloud/vertexai": "^1.7.0",
+    "@google-cloud/text-to-speech": "^5.7.0",
     "@google-cloud/vision": "^4.3.2",
+    "@google/generative-ai": "^0.21.0",
     "@mozilla/readability": "^0.5.0",
-    "csv-parse": "^5.5.6",
+    "csv-parse": "^5.6.0",
     "fluent-ffmpeg": "^2.1.3",
-    "ioredis": "^5.4.1",
-    "js-tiktoken": "^1.0.14",
-    "jsdom": "^25.0.0",
-    "mime": "^4.0.4",
-    "mysql2": "^3.11.0",
+    "ioredis": "^5.4.2",
+    "js-tiktoken": "^1.0.16",
+    "jsdom": "^25.0.1",
+    "mime": "^4.0.6",
+    "mysql2": "^3.12.0",
     "office-text-extractor": "^3.0.3",
-    "ollama": "^0.5.8",
-    "openai": "^4.58.1",
-    "pg": "^8.12.0",
+    "ollama": "^0.5.11",
+    "openai": "^4.77.0",
+    "pg": "^8.13.1",
     "pgvector": "^0.2.0",
     "telegraf": "^4.16.3",
     "tesseract.js": "^5.1.1",
-    "utilitas": "^1997.1.11",
+    "utilitas": "^1997.1.34",
     "youtube-transcript": "^1.2.1"
   }
 }

package/skills/10_engine.mjs

@@ -1,4 +1,4 @@
-import { bot, utilitas } from 'utilitas';
+import { alan, bot, utilitas } from 'utilitas';
 
 let configuredAi;
 
@@ -9,10 +9,31 @@ const action = async (ctx, next) => {
     ).sort((x, y) => x[1] - y[1]);
     ctx.firstAi = arrSort[0][0];
     switch (ctx.session.config?.ai) {
-        case '': ctx.selectedAi = [ctx.firstAi]; break;
         case '@': ctx.selectedAi = configuredAi; break;
-        default: ctx.selectedAi = [configuredAi.includes(ctx.session.config?.ai)
-            ? ctx.session.config?.ai : ctx.firstAi];
+        default:
+            ctx.selectedAi = [ctx.session.config?.ai];
+            const foundAi = configuredAi.includes(ctx.session.config?.ai);
+            if (foundAi) {
+            } else if (!ctx.collected?.length) {
+                ctx.selectedAi = [ctx.firstAi];
+            } else {
+                const supported = {};
+                for (const i of configuredAi) {
+                    const supportedMimeTypes = [
+                        ...alan.MODELS[ctx._.ai[i].model]?.supportedMimeTypes || [],
+                        ...alan.MODELS[ctx._.ai[i].model]?.supportedAudioTypes || [],
+                    ];
+                    for (const j of ctx.collected) {
+                        if (supportedMimeTypes.includes(j?.content?.mime_type)) {
+                            supported[i] || (supported[i] = 0);
+                            supported[i]++;
+                        }
+                    }
+                }
+                ctx.selectedAi = [Object.keys(supported).sort(
+                    (x, y) => supported[y] - supported[x]
+                )?.[0] || ctx.firstAi];
+            }
     }
     ctx.multiAi = ctx.selectedAi.length > 1;
     await next();
@@ -48,7 +69,7 @@ export const { name, run, priority, func, help, args } = {
         },
         ai: {
             type: 'string', short: 'a', default: '',
-            desc: "`(ChatGPT, Gemini, Mistral, @)` Select AI engine.",
+            desc: "`(ChatGPT, Gemini, Claude, Mistral, @)` Select AI engine.",
             validate: validateAi,
         },
         render: {

package/skills/20_instant.mjs

@@ -22,6 +22,13 @@ const action = async (ctx, next) => {
             ctx.selectedAi = ['Gemini'];
             ctx.hello(ctx.cmd.args);
             break;
+        case 'claude':
+            if (!utilitas.insensitiveHas(allAi, 'claude')) {
+                return await ctx.er('Claude is not available.');
+            }
+            ctx.selectedAi = ['Claude'];
+            ctx.hello(ctx.cmd.args);
+            break;
         case 'mistral':
             if (!utilitas.insensitiveHas(allAi, 'mistral')) {
                 return await ctx.er('Mistral is not available.');
@@ -45,6 +52,7 @@ export const { name, run, priority, func, help, cmds } = {
         all: 'Use all AI engines simultaneously: /all Say hello to all AIs!',
         chatgpt: 'Use ⚛️ ChatGPT temporary: /chatgpt Say hello to ChatGPT!',
         gemini: 'Use ♊️ Gemini temporary: /gemini Say hello to Gemini!',
+        claude: 'Use ✴️ Claude temporary: /claude Say hello to Claude!',
         mistral: 'Use Ⓜ️ Mistral temporary: /mistral Say hello to Mistral!',
     },
 };

package/skills/60_prepare.mjs

@@ -25,8 +25,9 @@ const action = async (ctx, next) => {
         x => String.isString(x.content)
     ).map(x => x.content).join('\n').split(' ').filter(x => x);
     ctx.prompt = (ctx.txt || '') + '\n\n';
-    while (await alan.countTokens(ctx.prompt) < maxInputTokens
-        && additionInfo.length) {
+    while (await alan.countTokens(
+        `${ctx.prompt}${additionInfo?.[0] || ''}`
+    ) < maxInputTokens && additionInfo.length) {
         ctx.prompt += ` ${additionInfo.shift()}`;
     }
     ctx.prompt = utilitas.trim(ctx.prompt);

package/skills/70_chat.mjs

@@ -2,15 +2,17 @@ import { alan, bot, utilitas } from 'utilitas';
 
 const onProgress = { onProgress: true };
 const [joinL1, joinL2] = [a => a.join(LN2), a => a.join(LN2)];
-const enrich = name => name === 'VERTEX' ? 'Gemini' : name;
+const enrich = name => name; // Human readable name, eg: 'VERTEX' => 'Gemini'
 const log = content => utilitas.log(content, import.meta.url);
-const [BOT, BOTS, LN2]
-    = [`${bot.EMOJI_BOT} `, { ChatGPT: '⚛️', Gemini: '♊️', Mistral: 'Ⓜ️' }, '\n\n'];
+const [BOT, BOTS, LN2] = [`${bot.EMOJI_BOT} `, {
+    ChatGPT: '⚛️', Gemini: '♊️', Claude: '✴️', Mistral: 'Ⓜ️',
+}, '\n\n'];
 
 const action = async (ctx, next) => {
-    if (!ctx.prompt) { return await next(); }
-    const [YOU, msgs, tts, pms, extra] = [`${ctx.avatar} You:`, {}, {}, [], {}];
-    let [lastMsg, lastSent] = [null, 0];
+    if (!ctx.prompt && !ctx.carry.attachments.length) { return await next(); }
+    const [YOU, msgs, tts, pms, extra]
+        = [`${ctx.avatar} You:`, {}, {}, [], { buttons: [] }];
+    let [lastMsg, lastSent, references] = [null, 0, null];
     const packMsg = options => {
         const said = !options?.tts && ctx.result ? ctx.result : '';
         const packed = [
@@ -35,9 +37,14 @@ const action = async (ctx, next) => {
         )) { return; }
         [lastSent, lastMsg] = [curTime, curMsg];
         const cmd = ctx.session.context?.cmd;
-        options?.final && cmd && (extra.buttons = [{
-            label: `❎ End context: \`${cmd}\``, text: '/clear',
-        }]);
+        if (options?.final) {
+            (references?.links || []).map((x, i) => extra.buttons.push({
+                label: `${i + 1}. ${x.title}`, url: x.uri,
+            }));
+            cmd && (extra.buttons.push({
+                label: `❎ End context: \`${cmd}\``, text: '/clear',
+            }));
+        }
         return await ctx.ok(curMsg, {
             ...ctx.carry.keyboards ? { keyboards: ctx.carry.keyboards } : {},
             md: true, ...extra, ...options || {},
@@ -54,8 +61,9 @@ const action = async (ctx, next) => {
                         ctx.carry.threadInfo.length || await ok(onProgress);
                     },
                 });
-                msgs[n] = ctx.session.config?.render === true
-                    ? resp.rendered : resp.text;
+                references = resp.references;
+                msgs[n] = ctx.session.config?.render === false
+                    ? resp.text : resp.rendered;
                 tts[n] = ctx.selectedAi.length === 1
                     && !msgs[n].split('\n').some(x => /^\s*```/.test(x))
                     ? resp.spoken : '';