utilitas 1998.1.14 → 1998.1.16

package/lib/alan.mjs

@@ -17,15 +17,15 @@ const _NEED = [
 const [
     OPENAI, GEMINI, CHATGPT, OPENAI_EMBEDDING, GEMINI_EMEDDING, OPENAI_TRAINING,
     OLLAMA, CLAUDE, GPT_4O_MINI, GPT_4O, GPT_O1, GPT_O3_MINI, GEMINI_20_FLASH,
-    GEMINI_20_FLASH_THINKING, NOVA, EMBEDDING_001, MISTRAL, CHATGPT_REASONING,
-    TEXT_EMBEDDING_3_SMALL, TEXT_EMBEDDING_3_LARGE, CLAUDE_35_SONNET,
-    CLAUDE_35_HAIKU, AUDIO, WAV, CHATGPT_MINI, ATTACHMENTS, CHAT, OPENAI_VOICE,
-    MEDIUM, LOW, HIGH,
+    GEMINI_20_FLASH_THINKING, NOVA, EMBEDDING_001, DEEPSEEK_R1,
+    CHATGPT_REASONING, TEXT_EMBEDDING_3_SMALL, TEXT_EMBEDDING_3_LARGE,
+    CLAUDE_35_SONNET, CLAUDE_35_HAIKU, AUDIO, WAV, CHATGPT_MINI, ATTACHMENTS,
+    CHAT, OPENAI_VOICE, MEDIUM, LOW, HIGH,
 ] = [
         'OPENAI', 'GEMINI', 'CHATGPT', 'OPENAI_EMBEDDING', 'GEMINI_EMEDDING',
         'OPENAI_TRAINING', 'OLLAMA', 'CLAUDE', 'gpt-4o-mini', 'gpt-4o',
         'o1', 'o3-mini', 'gemini-2.0-flash-exp',
-        'gemini-2.0-flash-thinking-exp', 'nova', 'embedding-001', 'mistral',
+        'gemini-2.0-flash-thinking-exp', 'nova', 'embedding-001', 'DeepSeek-R1',
         'CHATGPT_REASONING', 'text-embedding-3-small', 'text-embedding-3-large',
         'claude-3-5-sonnet-latest', 'claude-3-5-haiku-latest', 'audio', 'wav',
         'CHATGPT_MINI', '[ATTACHMENTS]', 'CHAT', 'OPENAI_VOICE', 'medium',
@@ -82,7 +82,7 @@ const DEFAULT_MODELS = {
     [CLAUDE]: CLAUDE_35_SONNET,
     [GEMINI_EMEDDING]: EMBEDDING_001,
     [GEMINI]: GEMINI_20_FLASH,
-    [OLLAMA]: MISTRAL,
+    [OLLAMA]: DEEPSEEK_R1,
     [OPENAI_EMBEDDING]: TEXT_EMBEDDING_3_SMALL,
     [OPENAI_TRAINING]: GPT_4O_MINI, // https://platform.openai.com/docs/guides/fine-tuning
     [OPENAI_VOICE]: NOVA,
@@ -230,10 +230,14 @@ const MODELS = {
             png, jpeg,
         ],
     },
-    [MISTRAL]: {
+    [DEEPSEEK_R1]: {
         contextWindow: 128000,
+        maxOutputTokens: 32768,
         requestLimitsRPM: Infinity,
         tokenLimitsTPM: Infinity,
+        json: false,
+        vision: false,
+        reasoning: true,
     },
     [TEXT_EMBEDDING_3_SMALL]: {
         contextWindow: 8191,
@@ -363,11 +367,9 @@ const init = async (options) => {
             }
             break;
         case OLLAMA:
-            const Ollama = await need('ollama');
             clients[provider] = {
-                // @todo: this feature does not work yet.
-                // client: new Ollama({ host: options?.endpoint })
-                client: Ollama,
+                client: new (await need('ollama', { raw: true })).Ollama(options),
+                model: options?.model || DEFAULT_MODELS[OLLAMA],
             };
             break;
         default:
@@ -430,6 +432,14 @@ const buildGptMessage = (content, options) => {
     return message;
 };
 
+const buildOllamaMessage = (content, options) => {
+    const message = String.isString(content) ? {
+        role: options?.role || user, content,
+    } : content;
+    assertContent(message.content);
+    return message;
+};
+
 const buildGeminiParts = (text, attachments) => {
     // Gemini API does not allow empty text, even you prompt with attachments.
     const message = [...text?.length || attachments?.length ? [{
@@ -521,28 +531,38 @@ const packResp = async (resp, options) => {
     //     ]
     // };
     let [richText, referencesMarkdown] = [null, null];
-    if (!options?.jsonMode && references?.segments?.length
-        && references?.links?.length && !options?.processing) {
-        richText = txt;
-        for (let i = references.segments.length - 1; i >= 0; i--) {
-            let idx = richText.indexOf(references.segments[i].text);
-            if (idx < 0) { continue; }
-            idx += references.segments[i].text.length;
-            richText = richText.slice(0, idx)
-                + references.segments[i].indices.map(y => ` (${y + 1})`).join('')
-                + richText.slice(idx);
+    if (!options?.jsonMode) {
+        if (!options?.processing
+            && references?.segments?.length && references?.links?.length) {
+            richText = txt;
+            for (let i = references.segments.length - 1; i >= 0; i--) {
+                let idx = richText.indexOf(references.segments[i].text);
+                if (idx < 0) { continue; }
+                idx += references.segments[i].text.length;
+                richText = richText.slice(0, idx)
+                    + references.segments[i].indices.map(y => ` (${y + 1})`).join('')
+                    + richText.slice(idx);
+            }
+            referencesMarkdown = 'References:\n\n' + references.links.map((x, i) => {
+                return `${i + 1}. [${x.title}](${x.uri})`;
+            }).join('\n');
+        }
+        const lines = (richText || txt).split('\n');
+        const indexOfEnd = lines.indexOf('</think>');
+        if (lines[0] === '<think>' && indexOfEnd !== -1) {
+            lines[0] = '```think';
+            lines[indexOfEnd] = '```';
+            richText = lines.join('\n');
         }
-        referencesMarkdown = 'References:\n\n' + references.links.map((x, i) => {
-            return `${i + 1}. [${x.title}](${x.uri})`;
-        }).join('\n');
     }
     return {
         ...text(txt), ...options?.jsonMode && !(
             options?.delta && options?.processing
         ) ? { json: parseJson(txt) } : {},
-        ...richText && referencesMarkdown ? { richText, referencesMarkdown } : {},
-        ...audio ? { audio, audioMimeType: options?.audioMimeType } : {},
+        ...richText ? { richText } : {},
         ...references ? { references } : {},
+        ...referencesMarkdown ? { referencesMarkdown } : {},
+        ...audio ? { audio, audioMimeType: options?.audioMimeType } : {},
         model: options?.model,
     };
 };
@@ -629,13 +649,13 @@ const promptChatGPT = async (content, options = {}) => {
 };
 
 const promptOllama = async (content, options = {}) => {
-    const { client } = await getOllamaClient(options);
+    const { client, model } = await getOllamaClient(options);
     // https://github.com/ollama/ollama-js
     // https://github.com/jmorganca/ollama/blob/main/examples/typescript-simplechat/client.ts
-    options.model = options?.model || DEFAULT_MODELS[OLLAMA];
+    options.model = options?.model || model;
     const resp = await client.chat({
         model: options.model, stream: true,
-        ...messages([...options?.messages || [], buildGptMessage(content)]),
+        ...messages([...options?.messages || [], buildOllamaMessage(content)]),
     })
     let [chunk, result] = [null, ''];
     for await (chunk of resp) {
@@ -962,7 +982,7 @@ const talk = async (input, options) => {
     const session = await getSession(sessionId, { engine, ...options });
     let [resp, sys, messages, msgBuilder] = [null, [], [], null];
     switch (engine) {
-        case CHATGPT: case OLLAMA:
+        case CHATGPT:
             sys.push(buildGptMessage(session.systemPrompt, { role: system }));
             msgBuilder = () => {
                 messages = [];
@@ -995,6 +1015,17 @@ const talk = async (input, options) => {
             };
             msgBuilder()
             break;
+        case OLLAMA:
+            sys.push(buildOllamaMessage(session.systemPrompt, { role: system }));
+            msgBuilder = () => {
+                messages = [];
+                session.messages.map(x => {
+                    messages.push(buildOllamaMessage(x.request, { role: user }));
+                    messages.push(buildOllamaMessage(x.response, { role: assistant }));
+                });
+            };
+            msgBuilder()
+            break;
         default:
             throwError(`Invalid AI engine: '${engine}'.`);
     }
@@ -1160,7 +1191,7 @@ export {
     GPT_4O,
     GPT_O3_MINI,
     GPT_O1,
-    MISTRAL,
+    DEEPSEEK_R1,
     MODELS,
     OPENAI_VOICE,
     RETRIEVAL,

package/lib/manifest.mjs

@@ -1,7 +1,7 @@
 const manifest = {
     "name": "utilitas",
     "description": "Just another common utility for JavaScript.",
-    "version": "1998.1.14",
+    "version": "1998.1.16",
     "private": false,
     "homepage": "https://github.com/Leask/utilitas",
     "main": "index.mjs",

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "utilitas",
     "description": "Just another common utility for JavaScript.",
-    "version": "1998.1.14",
+    "version": "1998.1.16",
     "private": false,
     "homepage": "https://github.com/Leask/utilitas",
     "main": "index.mjs",