utilitas 2000.3.19 → 2000.3.21

package/lib/alan.mjs

@@ -45,18 +45,18 @@ You may be provided with some tools(functions) to help you gather information an
 const _NEED = ['js-tiktoken', 'OpenAI'];
 
 const [
-    OPENAI, GEMINI, OLLAMA, NOVA, DEEPSEEK_R1, MD_CODE, CLOUD_OPUS_45, AUDIO,
+    OPENAI, GEMINI, OLLAMA, NOVA, DEEPSEEK_32, MD_CODE, CLOUD_OPUS_45, AUDIO,
     WAV, ATTACHMENTS, OPENAI_VOICE, GPT_REASONING_EFFORT, THINK, THINK_STR,
     THINK_END, TOOLS_STR, TOOLS_END, TOOLS, TEXT, OK, FUNC, GPT_51,
     GPT_51_CODEX, GPT_5_IMAGE, GEMMA_3_27B, ANTHROPIC, v8k, ais,
     MAX_TOOL_RECURSION, LOG, name, user, system, assistant, MODEL, JSON_OBJECT,
     tokenSafeRatio, CONTENT_IS_REQUIRED, OPENAI_HI_RES_SIZE, k, kT, m, minute,
     hour, gb, trimTailing, trimBeginning, GEMINI_30_PRO_IMAGE, IMAGE, JINA,
-    JINA_DEEPSEARCH, SILICONFLOW, SF_DEEPSEEK_R1, MAX_TIRE, OPENROUTER_API,
+    JINA_DEEPSEARCH, SILICONFLOW, SF_DEEPSEEK_32, MAX_TIRE, OPENROUTER_API,
     OPENROUTER, AUTO, TOOL, S_OPENAI, S_GOOGLE, S_ANTHROPIC, ONLINE,
     GEMINI_30_PRO, GEMINI_25_FLASH,
 ] = [
-        'OpenAI', 'Gemini', 'Ollama', 'nova', 'deepseek-r1', '```',
+        'OpenAI', 'Gemini', 'Ollama', 'nova', 'deepseek-3.2-speciale', '```',
         'claude-opus-4.5', 'audio', 'wav', '[ATTACHMENTS]', 'OPENAI_VOICE',
         'medium', 'think', '<think>', '</think>', '<tools>', '</tools>',
         'tools', 'text', 'OK', 'function', 'gpt-5.1', 'gpt-5.1-codex',
@@ -67,7 +67,7 @@ const [
         x => 1024 * 1024 * 1024 * x, x => x.replace(/[\.\s]*$/, ''),
         x => x.replace(/^[\.\s]*/, ''), 'gemini-3-pro-image-preview', 'image',
         'Jina', 'jina-deepsearch-v1', 'SiliconFlow',
-        'Pro/deepseek-ai/DeepSeek-R1', 768 * 768,
+        'deepseek-ai/DeepSeek-V3.2-exp', 768 * 768,
         'https://openrouter.ai/api/v1', 'OpenRouter', 'openrouter/auto', 'tool',
         'openai', 'google', 'anthropic', ':online', 'gemini-3-pro-preview',
         'gemini-2.5-flash-preview-09-2025',
@@ -120,9 +120,9 @@ const GEMINI_RULES = {
     defaultProvider: OPENROUTER,
 };
 
-const DEEPSEEK_R1_RULES = {
-    icon: '🐬', contextWindow: kT(128), maxOutputTokens: k(8),
-    reasoning: true,
+const DEEPSEEK_32_RULES = {
+    icon: '🐬', contextWindow: kT(163.8), maxOutputTokens: k(65.5),
+    json: true, tools: true, reasoning: true,
 };
 
 // https://platform.openai.com/docs/models
@@ -158,8 +158,8 @@ const MODELS = {
         reasoning: true, json: true, vision: true,
         deepsearch: true, defaultProvider: JINA,
     },
-    [DEEPSEEK_R1]: DEEPSEEK_R1_RULES,
-    [SF_DEEPSEEK_R1]: { ...DEEPSEEK_R1_RULES, defaultProvider: SILICONFLOW },
+    [DEEPSEEK_32]: DEEPSEEK_32_RULES,
+    [SF_DEEPSEEK_32]: { ...DEEPSEEK_32_RULES, defaultProvider: SILICONFLOW },
     [CLOUD_OPUS_45]: {
         source: S_ANTHROPIC, icon: '✳️',
         contextWindow: kT(200), maxOutputTokens: kT(64),
@@ -242,7 +242,7 @@ for (const n in MODELS) {
 // Default models for each provider
 const DEFAULT_MODELS = {
     [OPENROUTER]: GEMINI_25_FLASH,
-    [SILICONFLOW]: SF_DEEPSEEK_R1,
+    [SILICONFLOW]: SF_DEEPSEEK_32,
     [JINA]: JINA_DEEPSEARCH,
     [OLLAMA]: GEMMA_3_27B,
     [OPENAI_VOICE]: NOVA,
@@ -314,7 +314,7 @@ const tools = [
             }
         },
         func: async args => (await distill(args?.url))?.summary,
-        showReq: true, replaced: ONLINE,
+        showReq: true,
     },
     {
         def: {
@@ -338,16 +338,20 @@ const tools = [
             num: args?.num || 10, start: args?.start || 1,
             image: args?.image || false
         }),
-        showReq: true, replaced: ONLINE, depend: checkSearch,
+        showReq: true, depend: checkSearch,
     },
 ];
 
 const packTools = async () => {
     const _tools = [];
     for (const t of tools) {
-        (t.depend ? await t.depend() : true) ? _tools.push(t) : log(
-            `Tool is not ready: ${t.def.function.name}`
-        );
+        if (t.depend ? await t.depend() : true) {
+            _tools.push(t);
+        } else if (t.def.function.name === 'searchWeb') {
+            log(`Tool (${t.def.function.name}) is not ready, fallback to openrouter:online.`);
+        } else {
+            log(`Tool (${t.def.function.name}) is not ready.`);
+        }
     }
     return _tools;
 };
@@ -838,12 +842,11 @@ const promptOpenAI = async (aiId, content, options = {}) => {
         modalities = [TEXT, IMAGE];
     }
     const googleImageMode = source === S_GOOGLE && modalities?.includes?.(IMAGE);
-    // pricy: https://openrouter.ai/docs/features/web-search
-    const ext = ''; // options.jsonMode ? '' : ONLINE;
+    const packedTools = _tools.map(x => x.def);
+    const ext = provider === OPENROUTER && !packedTools?.find(
+        x => x.function.name === 'searchWeb'
+    ) && !options.jsonMode ? ONLINE : '';
     const targetModel = `${isOpenrouter(provider, model) ? `${source}/` : ''}${options.model}${ext}`;
-    const packedTools = (targetModel.endsWith(ONLINE)
-        ? _tools.filter(x => x?.replaced !== ONLINE)
-        : _tools).map(x => x.def);
     if (source === S_GOOGLE) {
         packedTools.push(...[
             { googleSearch: {} }, { codeExecution: {} }, { urlContext: {} },
@@ -1152,7 +1155,7 @@ export {
     ATTACHMENTS,
     CLOUD_OPUS_45,
     CODE_INTERPRETER,
-    DEEPSEEK_R1,
+    DEEPSEEK_32,
     DEFAULT_MODELS,
     FEATURE_ICONS,
     FUNCTION,

package/lib/cache.mjs

@@ -23,7 +23,14 @@ const init = async (options) => {
         }
     }
     assert(redis, 'Redis has not been initialized.', 501);
-    return { del, get, redis, set, setEx };
+    return redis;
+};
+
+const end = async () => {
+    if (redis) {
+        await redis.quit();
+        redis = null;
+    }
 };
 
 const assertKey = key => {
@@ -47,6 +54,7 @@ export {
     init,
     set,
     setEx,
+    end,
 };
 
 

package/lib/manifest.mjs

@@ -1,7 +1,7 @@
 const manifest = {
     "name": "utilitas",
     "description": "Just another common utility for JavaScript.",
-    "version": "2000.3.19",
+    "version": "2000.3.21",
     "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": "2000.3.19",
+    "version": "2000.3.21",
     "private": false,
     "homepage": "https://github.com/Leask/utilitas",
     "main": "index.mjs",