utilitas 1998.2.61 → 1998.2.63

package/lib/alan.mjs

@@ -49,30 +49,32 @@ 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, GEMINI_20_PRO, NOVA, EMBEDDING_001, DEEPSEEK_R1,
-    DEEPSEEK_R1_70B, MD_CODE, CHATGPT_REASONING, TEXT_EMBEDDING_3_SMALL,
-    TEXT_EMBEDDING_3_LARGE, CLOUD_37_SONNET, AUDIO, WAV, CHATGPT_MINI,
-    ATTACHMENTS, CHAT, OPENAI_VOICE, MEDIUM, LOW, HIGH, GPT_REASONING_EFFORT,
-    THINK, THINK_STR, THINK_END, AZURE, TOOLS_STR, TOOLS_END, TOOLS, TEXT,
-    THINKING, OK, FUNC, GPT_45, REDACTED_THINKING, GEMMA_3_27B, AZURE_OPENAI,
-    ANTHROPIC, VERTEX_ANTHROPIC, GEMMA327B, size8k, ais, MAX_TOOL_RECURSION,
-    LOG, name, user, system, assistant, MODEL, JSON_OBJECT, TOOL, silent,
-    NOT_INIT, INVALID_FILE, tokenSafeRatio, GPT_QUERY_LIMIT, minsOfDay,
+    DEEPSEEK_R1_70B, DEEPSEEK_R1_32B, MD_CODE, CHATGPT_REASONING,
+    TEXT_EMBEDDING_3_SMALL, TEXT_EMBEDDING_3_LARGE, CLOUD_37_SONNET, AUDIO, WAV,
+    CHATGPT_MINI, ATTACHMENTS, CHAT, OPENAI_VOICE, MEDIUM, LOW, HIGH,
+    GPT_REASONING_EFFORT, THINK, THINK_STR, THINK_END, AZURE, TOOLS_STR,
+    TOOLS_END, TOOLS, TEXT, THINKING, OK, FUNC, GPT_45, REDACTED_THINKING,
+    GEMMA_3_27B, AZURE_OPENAI, ANTHROPIC, VERTEX_ANTHROPIC, GEMMA327B, size8k,
+    ais, MAX_TOOL_RECURSION, LOG, name, user, system, assistant, MODEL,
+    JSON_OBJECT, TOOL, silent, NOT_INIT, INVALID_FILE, tokenSafeRatio,
+    GPT_QUERY_LIMIT, minsOfDay, CONTENT_IS_REQUIRED,
 ] = [
         'OPENAI', 'GEMINI', 'CHATGPT', 'OPENAI_EMBEDDING', 'GEMINI_EMEDDING',
         'OPENAI_TRAINING', 'OLLAMA', 'CLAUDE', 'gpt-4o-mini', 'gpt-4o', 'o1',
         'o3-mini', 'gemini-2.0-flash', 'gemini-2.0-flash-thinking-exp',
         'gemini-2.0-pro-exp', 'nova', 'embedding-001', 'deepseek-r1',
-        'deepseek-r1:70b', '```', 'CHATGPT_REASONING', 'text-embedding-3-small',
-        'text-embedding-3-large', 'claude-3-7-sonnet@20250219', 'audio', 'wav',
-        'CHATGPT_MINI', '[ATTACHMENTS]', 'CHAT', 'OPENAI_VOICE', 'medium',
-        'low', 'high', 'medium', 'think', '<think>', '</think>', 'AZURE',
-        '<tools>', '</tools>', 'tools', 'text', 'thinking', 'OK', 'function',
+        'deepseek-r1:70b', 'deepseek-r1:32b', '```', 'CHATGPT_REASONING',
+        'text-embedding-3-small', 'text-embedding-3-large',
+        'claude-3-7-sonnet@20250219', 'audio', 'wav', 'CHATGPT_MINI',
+        '[ATTACHMENTS]', 'CHAT', 'OPENAI_VOICE', 'medium', 'low', 'high',
+        'medium', 'think', '<think>', '</think>', 'AZURE', '<tools>',
+        '</tools>', 'tools', 'text', 'thinking', 'OK', 'function',
         'gpt-4.5-preview', 'redacted_thinking', 'gemma-3-27b-it',
         'AZURE OPENAI', 'ANTHROPIC', 'VERTEX ANTHROPIC', 'gemma3:27b',
         7680 * 4320, {}, 10, { log: true }, 'Alan', 'user', 'system',
         'assistant', 'model', 'json_object', 'tool', true,
         'AI engine has not been initialized.', 'Invalid file data.', 1.1, 100,
-        60 * 24,
+        60 * 24, 'Content is required.',
     ];
 
 const [
@@ -108,7 +110,6 @@ const unifyEngine = options => unifyType(options?.engine, 'AI engine');
 const trimTailing = text => text.replace(/[\.\s]*$/, '');
 const renderText = (t, o) => _renderText(t, { extraCodeBlock: 0, ...o || {} });
 const log = (cnt, opt) => _log(cnt, import.meta.url, { time: 1, ...opt || {} });
-const CONTENT_IS_REQUIRED = 'Content is required.';
 const assertContent = content => assert(content.length, CONTENT_IS_REQUIRED);
 const countToolCalls = r => r?.split('\n').filter(x => x === TOOLS_STR).length;
 const assertApiKey = (p, o) => assert(o?.apiKey, `${p} api key is required.`);
@@ -369,6 +370,7 @@ const MODELS = {
 };
 
 MODELS[DEEPSEEK_R1_70B] = MODELS[DEEPSEEK_R1];
+MODELS[DEEPSEEK_R1_32B] = MODELS[DEEPSEEK_R1];
 MODELS[GEMMA327B] = MODELS[GEMMA_3_27B];
 
 for (const n in MODELS) {
@@ -566,13 +568,21 @@ const init = async (options = {}) => {
             break;
         case OLLAMA:
             // https://github.com/ollama/ollama/blob/main/docs/openai.md
+            const baseURL = 'http://localhost:11434/v1/';
             ais[id] = {
                 id, provider, model, client: await OpenAI({
-                    baseURL: 'http://localhost:11434/v1/', apiKey: 'ollama',
-                    ...options
+                    baseURL, apiKey: 'ollama', ...options
                 }),
                 prompt: async (cnt, opts) => await promptOpenAI(id, cnt, opts),
             };
+            const phLog = m => log(`Ollama preheat: ${m?.message || m}`);
+            ignoreErrFunc(async () => {
+                phLog(await (await fetch(`${baseURL}completions`, {
+                    method: 'POST', body: JSON.stringify({
+                        model: model.name, prompt: '', keep_alive: -1
+                    })
+                })).text());
+            }, { log: phLog });
             break;
         default:
             throwError(`Invalid AI provider: ${options.provider || 'null'}.`);
@@ -690,10 +700,9 @@ const buildGeminiHistory = (text, options) => buildGeminiMessage(
     text, { ...options || {}, history: true }
 );
 
-const [getOpenAIClient, getGeminiClient, getClaudeClient]
-    = [OPENAI, GEMINI, CLAUDE].map(
-        x => async options => await init({ ...provider(x), ...options })
-    );
+const [getOpenAIClient, getGeminiClient] = [OPENAI, GEMINI].map(
+    x => async options => await init({ ...provider(x), ...options })
+);
 
 const listOpenAIModels = async (options) => {
     const { client } = await getOpenAIClient(options);
@@ -1000,6 +1009,7 @@ const promptOpenAI = async (aiId, content, options = {}) => {
     const resp = await client.chat.completions.create({
         model: azure ? undefined : options.model, ...history,
         ...options.jsonMode ? { response_format: { type: JSON_OBJECT } } : {},
+        ...provider === OLLAMA ? { keep_alive: -1 } : {},
         modalities, audio: options.audio || (
             modalities?.find?.(x => x === AUDIO)
             && { voice: DEFAULT_MODELS[OPENAI_VOICE], format: 'pcm16' }
@@ -1272,8 +1282,9 @@ const createGeminiEmbedding = async (input, options) => {
 };
 
 const buildGptTrainingCase = (prompt, response, options) => messages([
-    ...options?.systemPrompt ? [buildGptMessage(options.systemPrompt, { role: system })] : [],
-    buildGptMessage(prompt),
+    ...options?.systemPrompt ? [
+        buildGptMessage(options.systemPrompt, { role: system })
+    ] : [], buildGptMessage(prompt),
     buildGptMessage(response, { role: assistant }),
 ]);
 
@@ -1560,7 +1571,7 @@ const PREFERRED_ENGINES = [
 export default init;
 export {
     ATTACHMENT_TOKEN_COST, CLOUD_37_SONNET, CODE_INTERPRETER, DEEPSEEK_R1,
-    DEEPSEEK_R1_70B, DEFAULT_MODELS,
+    DEEPSEEK_R1_32B, DEEPSEEK_R1_70B, DEFAULT_MODELS,
     EMBEDDING_001,
     FUNCTION, GEMINI_20_FLASH, GEMINI_20_FLASH_THINKING, GPT_45, GPT_4O, GPT_4O_MINI, GPT_O1, GPT_O3_MINI, INSTRUCTIONS, 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.2.61",
+    "version": "1998.2.63",
     "private": false,
     "homepage": "https://github.com/Leask/utilitas",
     "main": "index.mjs",

package/lib/utilitas.mjs

@@ -650,8 +650,10 @@ const checkInterval = (itv, sed) =>
 
 const ignoreErrFunc = async (func, options) => {
     const run = async () => {
-        try { return await func(...options?.args || []) }
-        catch (err) { options?.log && console.error(err); }
+        try { return await func(...options?.args || []) } catch (err) {
+            if (Function.isFunction(options?.log)) { options.log(err); }
+            else if (options?.log) { console.error(err); }
+        }
     };
     if (options?.await) { await timeout(options.await); return await run(); }
     else if (options?.wait) { return setTimeout(run, options.wait); }

package/package.json

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