utilitas 2001.1.88 → 2001.1.89

package/lib/alan.mjs

@@ -49,8 +49,8 @@ const [
     TOOLS_STR, TOOLS_END, TOOLS, TEXT, OK, FUNC, GPT_52, GPT_51_CODEX,
     GPT_IMAGE_15, GEMMA_3_27B, ANTHROPIC, ais, MAX_TOOL_RECURSION, LOG, name,
     user, system, assistant, JSON_OBJECT, PROMPT_IS_REQUIRED, k, trimTailing,
-    trimBeginning, GEMINI_30_PRO_IMAGE, IMAGE, JINA, JINA_DEEPSEARCH,
-    SILICONFLOW, SF_DEEPSEEK_32, OPENROUTER_API, OPENROUTER, AUTO, TOOL, ONLINE,
+    trimBeginning, GEMINI_30_PRO_IMAGE, IMAGE, JINA, SILICONFLOW,
+    SF_DEEPSEEK_32, OPENROUTER_API, OPENROUTER, AUTO, TOOL, ONLINE,
     GEMINI_30_PRO, GEMINI_30_FLASH, IMAGEN_4_ULTRA, VEO_31, IMAGEN_4_UPSCALE,
     ERROR_GENERATING, GEMINI_25_FLASH_TTS, GEMINI_25_PRO_TTS, wav, PNG_EXT,
     GPT_4O_MIMI_TTS, GPT_4O_TRANSCRIBE, INVALID_AUDIO, OGG_EXT, ELLIPSIS,
@@ -65,10 +65,9 @@ const [
         { role: 'assistant' }, 'json_object', 'Prompt is required.',
         x => 1000 * x, x => x.replace(/[\.\s]*$/, ''),
         x => x.replace(/^[\.\s]*/, ''), 'gemini-3-pro-image-preview', 'image',
-        'Jina', 'jina-deepsearch-v1', 'SiliconFlow',
-        'deepseek-ai/DeepSeek-V3.2-exp', 'https://openrouter.ai/api/v1',
-        'OpenRouter', 'openrouter/auto', 'tool', ':online',
-        'gemini-3-pro-preview', 'gemini-3-flash-preview',
+        'Jina', 'SiliconFlow', 'deepseek-ai/DeepSeek-V3.2-exp',
+        'https://openrouter.ai/api/v1', 'OpenRouter', 'openrouter/auto', 'tool',
+        ':online', 'gemini-3-pro-preview', 'gemini-3-flash-preview',
         'imagen-4.0-ultra-generate-001', 'veo-3.1-generate-preview',
         'imagen-4.0-upscale-preview', 'Error generating content.',
         'gemini-2.5-flash-preview-tts', 'gemini-2.5-pro-preview-tts', 'wav',
@@ -98,7 +97,7 @@ const m = x => k(k(x));
 const [MAX_TOKENS, ATTACHMENT_TOKEN_COST] = [m(1), k(10)];
 
 const MODEL_ICONS = {
-    [OPENROUTER]: '🔀', [OPENAI]: '⚛️', [JINA]: '✴️', [GOOGLE]: '♊️',
+    [OPENROUTER]: '🔀', [OPENAI]: '⚛️', [GOOGLE]: '♊️', // [JINA]: '✴️',
     [OLLAMA]: '🦙', [ANTHROPIC]: '✳️', [SILICONFLOW]: '🧬', [DEEPSEEK]: '🐬',
 };
 
@@ -197,12 +196,6 @@ const MODELS = {
         source: GOOGLE, contextWindow: m(1.05), maxOutputTokens: k(65.5),
         'deep-research': true, reasoning: true, defaultProvider: GOOGLE,
     },
-    [JINA_DEEPSEARCH]: { // @todo: parse more details from results, eg: "reed urls".
-        maxInputTokens: Infinity, attachmentTokenCost: 0,
-        'deep-research': true, reasoning: true,
-        supportedMimeTypes: [MIME_PNG, MIME_JPEG, MIME_TEXT, MIME_WEBP, MIME_PDF],
-        defaultProvider: JINA,
-    },
     // best Chinese models
     [DEEPSEEK_32]: DEEPSEEK_32_RULES,
     [SF_DEEPSEEK_32]: { ...DEEPSEEK_32_RULES, defaultProvider: SILICONFLOW },
@@ -271,7 +264,6 @@ for (const n in MODELS) {
 const DEFAULT_MODELS = {
     [OPENROUTER]: GEMINI_30_FLASH,
     [SILICONFLOW]: SF_DEEPSEEK_32,
-    [JINA]: JINA_DEEPSEARCH,
     [OLLAMA]: GEMMA_3_27B,
     [OPENAI_VOICE]: NOVA,
 };
@@ -280,7 +272,7 @@ let _tools;
 
 const unifyProvider = provider => {
     assert(provider = (provider || '').trim(), 'AI provider is required.');
-    for (let type of [OPENROUTER, GOOGLE, OPENAI, JINA, OLLAMA, SILICONFLOW]) {
+    for (let type of [OPENROUTER, GOOGLE, OPENAI, OLLAMA, SILICONFLOW]) { // JINA,
         if (insensitiveCompare(provider, type)) { return type; }
     }
     throwError(`Invalid AI provider: ${provider}.`);
@@ -448,17 +440,6 @@ const init = async (options = {}) => {
                 });
             }
             break;
-        case JINA:
-            assertApiKey(provider, options);
-            var { client } = await OpenAI({
-                baseURL: 'https://deepsearch.jina.ai/v1/', ...options,
-            });
-            for (let model of models) {
-                setupAi({
-                    provider, model, client, prompt: promptOpenRouter, priority,
-                });
-            }
-            break;
         case OLLAMA:
             // https://github.com/ollama/ollama/blob/main/docs/openai.md
             const baseURL = 'http://localhost:11434/v1/';
@@ -705,21 +686,21 @@ const packResp = async (resp, options) => {
         ).join('\n');
     }
     txt = txt.split('\n');
-    const [reJinaStr, reJinaEnd]
-        = [`^\s*(${THINK_STR})`, `(${THINK_END})\s*$`].map(x => new RegExp(x));
-    const fixJina = [];
-    for (let l of txt) {
-        let catched = false;
-        if (reJinaStr.test(l)) {
-            fixJina.push(THINK_STR);
-            l = l.replace(reJinaStr, '');
-        }
-        if (reJinaEnd.test(l)) {
-            l = l.replace(reJinaEnd, '');
-            catched = true;
-        }
-        fixJina.push(l, ...catched ? [THINK_END, ''] : []);
-    }
+    // const [reJinaStr, reJinaEnd]
+    //     = [`^\s*(${THINK_STR})`, `(${THINK_END})\s*$`].map(x => new RegExp(x));
+    // const fixJina = [];
+    // for (let l of txt) {
+    //     let catched = false;
+    //     if (reJinaStr.test(l)) {
+    //         fixJina.push(THINK_STR);
+    //         l = l.replace(reJinaStr, '');
+    //     }
+    //     if (reJinaEnd.test(l)) {
+    //         l = l.replace(reJinaEnd, '');
+    //         catched = true;
+    //     }
+    //     fixJina.push(l, ...catched ? [THINK_END, ''] : []);
+    // }
     txt = fixJina;
     for (let i in txt) {
         switch (txt[i]) {

package/lib/manifest.mjs

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