halbot 1993.2.10 → 1993.2.13

package/README.md

@@ -3,7 +3,7 @@
 [![MIT licensed](https://img.shields.io/badge/license-MIT-blue)](./LICENSE)
 [![Node.js Package](https://github.com/Leask/halbot/actions/workflows/npm-publish.yml/badge.svg)](https://github.com/Leask/halbot/actions/workflows/npm-publish.yml)
 
-Just another `Gemini` / `ChatGPT` / `Claude` / `Mistral (by ollama)` Telegram bob, which is simple design, easy to use, extendable and fun.
+Just another `Gemini` / `ChatGPT` / `Claude` / `Ollama` Telegram bob, which is simple design, easy to use, extendable and fun.
 
 Live demo, click to watch on YouTube:
 
@@ -29,7 +29,7 @@ alt="Halbot live demo" width="240" height="180" border="10" /></a>
 - [ChatGPT](https://openai.com/blog/chatgpt) (`OpenAI` API key required)
 - [Gemini](https://ai.google.dev/gemini-api/docs) (Google `Gemini` API Key required)
 - [Claude](https://www.anthropic.com/api) (`Anthropic` API Key required)
-- [Mistral](https://mistral.ai/) (Install [Ollama](https://github.com/jmorganca/ollama) and enable `Mistral`)
+- [Ollama](https://github.com/jmorganca/ollama) (Install `Ollama` and serve your model)
 - Speech-to-Text (`OpenAI` or `Google Cloud` API key required, or your own engine)
 - Text-to-Speech (`OpenAI` or `Google Cloud` API key required, or your own engine)
 - Text-to-Image by DALL·E (`OpenAI` API key required, or your own engine)
@@ -105,15 +105,15 @@ All supported configuration fields:
     // OPTIONAL, integer, default: 2.
     "claudePriority": "[[Custom Claude Priority]]",
 
-    // Set some of these fields if you need Mistral features.
+    // Set some of these fields if you need Ollama features.
     // OPTIONAL, boolean.
-    "mistralEnabled": "[[Enable Mistral hosted by Ollama]]",
+    "ollamaEnabled": "[[Enable Ollama API]]",
     // OPTIONAL, string.
-    "mistralEndpoint": "[[Custom Mistral API endpoint]]",
-    // OPTIONAL, string, default: "Mistral" (Mistral 7B).
-    "mistralModel": "[[Custom Mistral Model ID]]",
+    "ollamaEndpoint": "[[Custom Ollama API endpoint]]",
+    // OPTIONAL, string, default: "DeepSeek-R1" (DeepSeek-R1 7B).
+    "ollamaModel": "[[Custom Ollama Model ID]]",
     // OPTIONAL, integer, default: 3.
-    "mistralPriority": "[[Custom Mistral Priority]]",
+    "ollamaPriority": "[[Custom Ollama Priority]]",
 
     // OPTIONAL, undefined || array of string.
     // To open the bot to PUBLIC, DO NOT set this field;

package/index.mjs

@@ -77,16 +77,16 @@ const init = async (options) => {
             model: options?.claudeModel,
         };
     }
-    if (options?.mistralEnabled || options?.mistralEndpoint) {
+    if (options?.ollamaEnabled || options?.ollamaEndpoint) {
         await alan.init({
-            provider: 'OLLAMA', endpoint: options?.mistralEndpoint,
+            provider: 'OLLAMA', host: options?.ollamaEndpoint,
         });
-        ai['Mistral'] = {
-            engine: 'OLLAMA', priority: options?.mistralPriority || 3,
+        ai['Ollama'] = {
+            engine: 'OLLAMA', priority: options?.ollamaPriority || 3,
         };
         engines['OLLAMA'] = {
             // only support custom model while prompting
-            model: options?.mistralModel,
+            model: options?.ollamaModel || alan.DEFAULT_MODELS['OLLAMA'],
         };
     }
     assert(utilitas.countKeys(ai), 'No AI provider is configured.');

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": "1993.2.10",
+  "description": "Just another `ChatGPT` / `Gemini` / `Ollama` Telegram bob, which is simple design, easy to use, extendable and fun.",
+  "version": "1993.2.13",
   "private": false,
   "homepage": "https://github.com/Leask/halbot",
   "type": "module",
@@ -52,7 +52,7 @@
     "pgvector": "^0.2.0",
     "telegraf": "^4.16.3",
     "tesseract.js": "^6.0.0",
-    "utilitas": "^1998.1.15",
+    "utilitas": "^1998.1.16",
     "youtube-transcript": "^1.2.1"
   }
 }

package/skills/10_engine.mjs

@@ -1,7 +1,7 @@
 import { alan, bot, utilitas } from 'utilitas';
 
 const NAME_HACK = {
-    'ChatGPT': '⚛️', 'Gemini': '♊️', 'Claude': '✴️', 'Mistral': 'Ⓜ️',
+    'ChatGPT': '⚛️', 'Gemini': '♊️', 'Claude': '✴️', 'Ollama': '🦙',
 };
 
 const NAME_HACK_REVERSE = utilitas.reverseKeyValues(NAME_HACK);
@@ -92,7 +92,7 @@ export const { name, run, priority, func, help, args } = {
         },
         ai: {
             type: 'string', short: 'a', default: '',
-            desc: "`(ChatGPT, Gemini, Claude, Mistral, @)` Select AI engine.",
+            desc: "`(ChatGPT, Gemini, Claude, Ollama, @)` Select AI engine.",
             validate: validateAi,
         },
         render: {

package/skills/20_instant.mjs

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

package/skills/70_chat.mjs

@@ -2,12 +2,16 @@ 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; // Human readable name, eg: 'VERTEX' => 'Gemini'
 const log = content => utilitas.log(content, import.meta.url);
 const [BOT, BOTS, LN2] = [`${bot.EMOJI_BOT} `, {
-    ChatGPT: '⚛️', Gemini: '♊️', Claude: '✴️', Mistral: 'Ⓜ️',
+    ChatGPT: '⚛️', Gemini: '♊️', Claude: '✴️', Ollama: '🦙', 'DeepSeek-R1': '🐬',
 }, '\n\n'];
 
+const enrich = (name, ctx) => {
+    const m = ctx._.ai[name]?.model;
+    return m ? ` | ${BOTS[m] ? `${BOTS[m]} ` : ''}${m}` : '';
+};
+
 const action = async (ctx, next) => {
     if (!ctx.prompt && !ctx.carry.attachments.length) { return await next(); }
     const [YOU, msgs, tts, pms, extra]
@@ -25,7 +29,7 @@ const action = async (ctx, next) => {
             pure.push(content);
             packed.push(joinL2([
                 ...(ctx.multiAi || !ctx.isDefaultAi(n) || said) && !options?.tts
-                    ? [`${BOTS[n]} ${enrich(n)}:`] : [], content
+                    ? [`${BOTS[n]} ${n}${enrich(n, ctx)}:`] : [], content
             ]));
         });
         return options?.tts && !pure.join('').trim().length ? '' : joinL1(packed);