utilitas 2000.3.54 → 2000.3.56

package/lib/alan.mjs

@@ -48,13 +48,13 @@ const [
     TOOLS_STR, TOOLS_END, TOOLS, TEXT, OK, FUNC, GPT_52, GPT_51_CODEX,
     GPT_5_IMAGE, GEMMA_3_27B, ANTHROPIC, v8k, ais, MAX_TOOL_RECURSION, LOG,
     name, user, system, assistant, MODEL, JSON_OBJECT, tokenSafeRatio,
-    PROMPT_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_32, MAX_TIRE, OPENROUTER_API,
-    OPENROUTER, AUTO, TOOL, S_OPENAI, S_GOOGLE, S_ANTHROPIC, ONLINE,
-    GEMINI_30_PRO, GEMINI_25_FLASH, IMAGEN_4_ULTRA, VEO_31, IMAGEN_4_UPSCALE,
-    ERROR_GENERATING, GEMINI_25_FLASH_TTS, GEMINI_25_PRO_TTS, wav,
-    GPT_4O_MIMI_TTS, GPT_4O_TRANSCRIBE, INVALID_AUDIO, OGG_EXT, ELLIPSIS,
+    PROMPT_IS_REQUIRED, OPENAI_HI_RES_SIZE, k, m, minute, hour, gb, trimTailing,
+    trimBeginning, GEMINI_30_PRO_IMAGE, IMAGE, JINA, 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, IMAGEN_4_ULTRA, VEO_31, IMAGEN_4_UPSCALE, ERROR_GENERATING,
+    GEMINI_25_FLASH_TTS, GEMINI_25_PRO_TTS, wav, GPT_4O_MIMI_TTS,
+    GPT_4O_TRANSCRIBE, INVALID_AUDIO, OGG_EXT, ELLIPSIS,
 ] = [
         'OpenAI', 'Google', 'Ollama', 'nova', 'deepseek-3.2-speciale', '```',
         'claude-opus-4.5', 'audio', 'wav', 'OPENAI_VOICE', 'medium', 'think',
@@ -62,12 +62,11 @@ const [
         'function', 'gpt-5.2', 'gpt-5.1-codex', 'gpt-5-image', 'gemma3:27b',
         'Anthropic', 7680 * 4320, [], 30, { log: true }, 'Alan', 'user',
         { role: 'system' }, 'assistant', 'model', 'json_object', 1.1,
-        'Prompt is required.', 2048 * 2048, x => 1024 * x, x => 1000 * x,
-        x => 1024 * 1024 * x, x => 60 * x, x => 60 * 60 * x,
-        x => 1024 * 1024 * 1024 * 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', 768 * 768,
+        'Prompt is required.', 2048 * 2048, x => 1000 * x, x => 1000 * 1000 * x,
+        x => 60 * x, x => 60 * 60 * x, x => 1000 * 1000 * 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', 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', 'imagen-4.0-ultra-generate-001',
@@ -112,7 +111,7 @@ const GEMINI_RULES = {
 
 const OPENAI_RULES = {
     source: S_OPENAI, icon: '⚛️',
-    contextWindow: kT(400), maxOutputTokens: k(128),
+    contextWindow: k(400), maxOutputTokens: k(128),
     imageCostTokens: ~~(OPENAI_HI_RES_SIZE / MAX_TIRE * 140 + 70),
     maxFileSize: m(50), maxImageSize: OPENAI_HI_RES_SIZE,
     json: true, tools: true, vision: true, hearing: true, reasoning: true,
@@ -122,7 +121,7 @@ const OPENAI_RULES = {
 };
 
 const DEEPSEEK_32_RULES = {
-    icon: '🐬', contextWindow: kT(163.8), maxOutputTokens: k(65.5),
+    icon: '🐬', contextWindow: k(163.8), maxOutputTokens: k(65.5),
     json: true, tools: true, reasoning: true,
 };
 
@@ -164,7 +163,7 @@ const MODELS = {
     [GPT_51_CODEX]: { ...OPENAI_RULES },
     [CLOUD_OPUS_45]: {
         source: S_ANTHROPIC, icon: '✳️',
-        contextWindow: kT(200), maxOutputTokens: kT(64),
+        contextWindow: k(200), maxOutputTokens: k(64),
         documentCostTokens: 3000 * 10, maxDocumentFile: m(32),
         maxDocumentPages: 100, imageCostTokens: ~~(v8k / 750),
         maxImagePerPrompt: 100, maxFileSize: m(5), maxImageSize: 2000 * 2000,
@@ -176,15 +175,15 @@ const MODELS = {
     },
     // tts/stt models
     [GEMINI_25_FLASH_TTS]: {
-        source: S_GOOGLE, maxInputTokens: kT(32), audio: true, fast: true,
+        source: S_GOOGLE, maxInputTokens: k(32), audio: true, fast: true,
         hidden: true, defaultProvider: GOOGLE,
     },
     [GEMINI_25_PRO_TTS]: {
-        source: S_GOOGLE, maxInputTokens: kT(32), audio: true,
+        source: S_GOOGLE, maxInputTokens: k(32), audio: true,
         hidden: true, defaultProvider: GOOGLE,
     },
     [GPT_4O_MIMI_TTS]: {
-        source: S_OPENAI, maxInputTokens: kT(2), audio: true, fast: true,
+        source: S_OPENAI, maxInputTokens: k(2), audio: true, fast: true,
         hidden: true, defaultProvider: OPENAI,
     },
     [GPT_4O_TRANSCRIBE]: {
@@ -204,7 +203,7 @@ const MODELS = {
     [SF_DEEPSEEK_32]: { ...DEEPSEEK_32_RULES, defaultProvider: SILICONFLOW },
     // best local model
     [GEMMA_3_27B]: {
-        icon: '❇️', contextWindow: kT(128), maxOutputTokens: k(8),
+        icon: '❇️', contextWindow: k(128), maxOutputTokens: k(8),
         imageCostTokens: 256, maxImageSize: 896 * 896,
         supportedMimeTypes: [MIME_PNG, MIME_JPEG, MIME_GIF],
         fast: true, json: true, vision: true,
@@ -1284,9 +1283,9 @@ const talk = async (input, options = {}) => {
 };
 
 const getChatPromptLimit = async (options) => {
-    let resp = 0;
+    let [resp, aiId] = [0, ensureArray(options?.aiId).filter(x => x)];
     (await getAi(null, { all: true })).map(x => {
-        if (options?.aiId && options?.aiId !== x.id) { return; }
+        if (aiId.length && !aiId.includes(x.id)) { return; }
         const maxInputTokens = x.model.maxInputTokens;
         resp = resp ? Math.min(resp, maxInputTokens) : maxInputTokens;
     });
@@ -1295,9 +1294,9 @@ const getChatPromptLimit = async (options) => {
 };
 
 const getChatAttachmentCost = async (options) => {
-    let resp = 0;
+    let [resp, aiId] = [0, ensureArray(options?.aiId).filter(x => x)];
     (await getAi(null, { all: true })).map(x => {
-        if (options?.aiId && options?.aiId !== x.id) { return; }
+        if (aiId.length && !aiId.includes(x.id)) { return; }
         resp = Math.max(resp, x.model.imageCostTokens || 0);
     });
     assert(resp > 0, 'Chat engine has not been initialized.');
@@ -1346,7 +1345,7 @@ const prompt = async (input, options = {}) => {
 };
 
 const trimPrompt = async (getPrompt, trimFunc, contextWindow, options) => {
-    let [i, maxTry] = [0, ~~options?.maxTry || kT(128)];
+    let [i, maxTry] = [0, ~~options?.maxTry || k(128)];
     while ((await countTokens(await getPrompt(), { fast: true }) > contextWindow)
         || (await countTokens(await getPrompt()) > contextWindow)) {
         await trimFunc();
@@ -1365,6 +1364,10 @@ const analyzeSessions = async (sessionIds, options) => {
         ));
         if (sm.length) { sses[ids[i]] = sm; }
     }
+    const ai = await getAi(options?.aiId, {
+        jsonMode: true, simple: true, select: { json: true, fast: true },
+        ...options || {}
+    });
     const pmt = options?.prompt || (
         'Help me organize the dialogues in the following JSON into a title '
         + 'dictionary and return it in JSON format. The input data may contain '
@@ -1384,10 +1387,9 @@ const analyzeSessions = async (sessionIds, options) => {
                 x, JSON.stringify(sses[x]).length,
             ]).sort((x, y) => y[1] - x[1])[0][0]];
         }
-    }, await getChatPromptLimit(options));
+    }, await getChatPromptLimit({ aiId: ai.id, ...options, }));
     const aiResp = Object.keys(sses) ? (await prompt(getInput(), {
-        jsonMode: true, simple: true, select: { json: true, fast: true },
-        ...options || {}
+        aiId: ai.id, ...options || {}
     })) : {};
     assert(aiResp, 'Unable to analyze sessions.');
     ids.map(x => resp[x] = aiResp[x] || null);

package/lib/manifest.mjs

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

package/lib/rag.mjs

@@ -98,8 +98,8 @@ const ensureApiKey = (options) => {
     return options.apiKey;
 };
 
-const ensureGoogleCredentials = (options) => {
-    assert(options?.googleCredentials, 'Google credentials are required.', 400);
+const ensureCredentials = (options) => {
+    assert(options?.credentials, 'Google credentials are required.', 400);
     assert(options?.projectId, 'Google project ID is required.', 400);
     return options;
 };
@@ -192,7 +192,7 @@ const initReranker = async (options = {}) => {
     const model = options?.model || DEFAULT_RERANKER_MODELS[provider];
     switch (provider) {
         case GOOGLE:
-            ensureGoogleCredentials(options);
+            ensureCredentials(options);
             const { RankServiceClient } = await need(
                 '@google-cloud/discoveryengine', { raw: true }
             );
@@ -200,7 +200,7 @@ const initReranker = async (options = {}) => {
             const clientOptions = {
                 ...location ? { apiEndpoint: `${location}-discoveryengine.googleapis.com` } : {},
                 ...options?.apiEndpoint ? { apiEndpoint: options.apiEndpoint } : {},
-                keyFilename: options.googleCredentials,
+                keyFilename: options.credentials,
             };
             const client = new RankServiceClient(clientOptions);
             rerankerClients[provider] = {

package/package.json

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