utilitas 2000.3.58 → 2000.3.59

package/lib/alan.mjs

@@ -51,10 +51,9 @@ const [
     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,
+    TOOL, 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',
@@ -68,12 +67,12 @@ const [
         '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',
-        'veo-3.1-generate-preview', 'imagen-4.0-upscale-preview',
-        'Error generating content.', 'gemini-2.5-flash-preview-tts',
-        'gemini-2.5-pro-tts', 'wav', 'gpt-4o-mini-tts', 'gpt-4o-transcribe',
-        'Invalid audio data.', 'ogg', '...',
+        ':online', 'gemini-3-pro-preview', 'gemini-2.5-flash-preview-09-2025',
+        '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-tts', 'wav',
+        'gpt-4o-mini-tts', 'gpt-4o-transcribe', 'Invalid audio data.', 'ogg',
+        '...',
     ];
 
 const [tool, messages, text]
@@ -95,7 +94,7 @@ const libOpenAi = async opts => await need('openai', { ...opts, raw: true });
 const buildTextWithEllipsis = (txt, trim) => `${txt}${(trim ? ELLIPSIS : '')}`;
 
 const GEMINI_RULES = {
-    source: S_GOOGLE, icon: '♊️',
+    source: GOOGLE, icon: '♊️',
     json: true, audioCostTokens: 1000 * 1000 * 1, // 8.4 hours => 1 million tokens
     imageCostTokens: ~~(v8k / MAX_TIRE * 258), maxAudioLength: hour(8.4),
     maxAudioPerPrompt: 1, maxFileSize: m(20), maxImagePerPrompt: 3000,
@@ -110,7 +109,7 @@ const GEMINI_RULES = {
 };
 
 const OPENAI_RULES = {
-    source: S_OPENAI, icon: '⚛️',
+    source: OPENAI, icon: '⚛️',
     contextWindow: k(400), maxOutputTokens: k(128),
     imageCostTokens: ~~(OPENAI_HI_RES_SIZE / MAX_TIRE * 140 + 70),
     maxFileSize: m(50), maxImageSize: OPENAI_HI_RES_SIZE,
@@ -147,11 +146,11 @@ const MODELS = {
         contextWindow: k(64), maxOutputTokens: k(32), image: true, tools: false,
     },
     [IMAGEN_4_ULTRA]: {
-        source: S_GOOGLE, maxInputTokens: 480,
+        source: GOOGLE, maxInputTokens: 480,
         image: true, defaultProvider: GOOGLE,
     },
     [VEO_31]: {
-        source: S_GOOGLE, maxInputTokens: 1024,
+        source: GOOGLE, maxInputTokens: 1024,
         imageCostTokens: 0, maxImagePerPrompt: 1,
         maxImageSize: Infinity, vision: true, video: true,
         supportedMimeTypes: [MIME_PNG, MIME_JPEG], defaultProvider: GOOGLE,
@@ -162,7 +161,7 @@ const MODELS = {
     // models with code capabilities
     [GPT_51_CODEX]: { ...OPENAI_RULES },
     [CLOUD_OPUS_45]: {
-        source: S_ANTHROPIC, icon: '✳️',
+        source: ANTHROPIC, icon: '✳️',
         contextWindow: k(200), maxOutputTokens: k(64),
         documentCostTokens: 3000 * 10, maxDocumentFile: m(32),
         maxDocumentPages: 100, imageCostTokens: ~~(v8k / 750),
@@ -175,19 +174,19 @@ const MODELS = {
     },
     // tts/stt models
     [GEMINI_25_FLASH_TTS]: {
-        source: S_GOOGLE, maxInputTokens: k(32), audio: true, fast: true,
+        source: GOOGLE, maxInputTokens: k(32), audio: true, fast: true,
         hidden: true, defaultProvider: GOOGLE,
     },
     [GEMINI_25_PRO_TTS]: {
-        source: S_GOOGLE, maxInputTokens: k(32), audio: true,
+        source: GOOGLE, maxInputTokens: k(32), audio: true,
         hidden: true, defaultProvider: GOOGLE,
     },
     [GPT_4O_MIMI_TTS]: {
-        source: S_OPENAI, maxInputTokens: k(2), audio: true, fast: true,
+        source: OPENAI, maxInputTokens: k(2), audio: true, fast: true,
         hidden: true, defaultProvider: OPENAI,
     },
     [GPT_4O_TRANSCRIBE]: {
-        source: S_OPENAI, maxInputTokens: 0, hearing: true, fast: true,
+        source: OPENAI, maxInputTokens: 0, hearing: true, fast: true,
         hidden: true, defaultProvider: OPENAI,
     },
     // models with deepsearch capabilities
@@ -384,17 +383,15 @@ const packTools = async () => {
     return _tools;
 };
 
-const buildAiId = (provider, model) => [
+const buildAiId = (provider, model) => packModelId([
     provider, ...isOpenrouter(provider, model) ? [model.source] : [],
     model?.name
-].map(x => ensureString(x, { case: 'SNAKE' })).join('_');
+], { case: 'SNAKE', raw: true }).join('_');
 
-const buildAiName = (provider, model) => [
-    model?.icon || getProviderIcon(provider), packModelLabel([
-        provider, isOpenrouter(provider, model) && model.source,
-        model.label || model.name
-    ])
-].join(' ');
+const buildAiName = (provider, model) => packModelId([
+    provider, ...isOpenrouter(provider, model) ? [model.source] : [],
+    model.label || model.name
+]);
 
 const buildAiFeatures = model => Object.entries(FEATURE_ICONS).map(
     x => model[x[0]] ? x[1] : ''
@@ -402,10 +399,12 @@ const buildAiFeatures = model => Object.entries(FEATURE_ICONS).map(
 
 const setupAi = ai => {
     const id = buildAiId(ai.provider, ai.model);
+    const name = buildAiName(ai.provider, ai.model);
+    const icon = ai.model?.icon || getProviderIcon(ai.provider);
+    const features = buildAiFeatures(ai.model);
     ais.push({
-        id, name: buildAiName(ai.provider, ai.model),
-        features: buildAiFeatures(ai.model), initOrder: ais.length,
-        ...ai, priority: ai.priority || 0,
+        id, icon, name, features, label: `${icon} ${name} (${features})`,
+        initOrder: ais.length, ...ai, priority: ai.priority || 0,
         prompt: async (text, opts) => await ai.prompt(id, text, opts),
     });
 };
@@ -753,21 +752,22 @@ const packResp = async (resp, options) => {
         ...annotationsMarkdown ? { annotationsMarkdown } : {},
         ...audio ? { audio } : {}, ...images?.length ? { images } : {},
         processing: !!options?.processing,
-        model: packModelLabel([
+        model: packModelId([
             options.provider, options?.router?.provider,
             options?.router?.model || options?.model,
         ]),
     };
 };
 
-const packModelLabel = (model_reference) => {
+const packModelId = (model_reference, options = {}) => {
     const catched = new Set();
-    return model_reference.join('/').split('/').map(x => {
+    const ref = model_reference.join('/').split('/').map(x => {
         const key = ensureString(x, { case: 'UP' });
         if (catched.has(key)) { return null; }
         catched.add(key);
-        return x;
-    }).filter(x => x).join('/');
+        return ensureString(x, options);
+    }).filter(x => x);
+    return options?.raw ? ref : ref.join('/');
 };
 
 const buildPrompts = async (model, input, options = {}) => {
@@ -904,7 +904,7 @@ const promptOpenRouter = async (aiId, content, options = {}) => {
     } else if (!modalities && model.image) {
         modalities = [TEXT, IMAGE];
     }
-    const googleImageMode = source === S_GOOGLE && modalities?.includes?.(IMAGE);
+    const googleImageMode = source === GOOGLE && modalities?.includes?.(IMAGE);
     const packedTools = _tools.map(x => x.def);
     const ext = provider === OPENROUTER && !packedTools?.find(
         x => x.function.name === 'searchWeb'
@@ -922,7 +922,7 @@ const promptOpenRouter = async (aiId, content, options = {}) => {
             { type: 'code_interpreter', container: { type: 'auto', memory_limit: '8g' } },
         ]);
     }
-    if (source === S_GOOGLE) {
+    if (source === GOOGLE) {
         packedTools.push(...[
             { googleSearch: {} }, { codeExecution: {} }, { urlContext: {} },
             // { googleMaps: {} }, // https://ai.google.dev/gemini-api/docs/maps-grounding // NOT for Gemini 3
@@ -1019,13 +1019,13 @@ const promptOpenRouter = async (aiId, content, options = {}) => {
         ...annotations.length ? { annotations } : {},
     };
     switch (source) {
-        case S_ANTHROPIC:
+        case ANTHROPIC:
             event.content = reasoning_details.map(x => ({
                 type: 'thinking', thinking: x.text,
                 ...x.signature ? { signature: x.signature } : {},
             }));
             break;
-        case S_GOOGLE:
+        case GOOGLE:
             reasoning_details?.length
                 && (event.reasoning_details = reasoning_details);
     }
@@ -1073,7 +1073,7 @@ const promptGoogle = async (aiId, prompt, options = {}) => {
                     data: await convert(x.image.imageBytes, {
                         input: BASE64, suffix: 'png', ...options || {}
                     }), mimeType: x.image.mimeType,
-                }))), model: packModelLabel([provider, M.source, M.name]),
+                }))), model: packModelId([provider, M.source, M.name]),
             }
         }
     } else if (M?.video) {
@@ -1121,7 +1121,7 @@ const promptGoogle = async (aiId, prompt, options = {}) => {
                             input: FILE, suffix: 'mp4', ...options || {}
                         }), mimeType: MIME_MP4, jobId: resp.name,
                     };
-                })), model: packModelLabel([provider, M.source, M.name]),
+                })), model: packModelId([provider, M.source, M.name]),
             };
         }
     } else if (M?.audio) { // https://ai.google.dev/gemini-api/docs/speech-generation#voices
@@ -1146,7 +1146,7 @@ const promptGoogle = async (aiId, prompt, options = {}) => {
                     data: await packPcmToWav(rawAudio?.data, {
                         input: BASE64, suffix: wav, ...options || {},
                     }), mimeType: MIME_WAV,
-                }, model: packModelLabel([provider, M.source, M.name]),
+                }, model: packModelId([provider, M.source, M.name]),
             };
         }
     } else {
@@ -1182,7 +1182,7 @@ const promptOpenAI = async (aiId, prompt, options = {}) => {
                         await resp.arrayBuffer()
                     ), { suffix: OGG_EXT, ...options || {} }),
                     mimeType: MIME_OGG,
-                }, model: packModelLabel([provider, M.source, M.name]),
+                }, model: packModelId([provider, M.source, M.name]),
             };
         }
     } else if (M?.hearing) {
@@ -1202,7 +1202,7 @@ const promptOpenAI = async (aiId, prompt, options = {}) => {
         if (!options?.raw) {
             resp = {
                 text: resp.trim(),
-                model: packModelLabel([provider, M.source, M.name]),
+                model: packModelId([provider, M.source, M.name]),
             };
         }
     } else {
@@ -1339,7 +1339,7 @@ const stt = async (audio, options = {}) => await distillFile(
 
 const prompt = async (input, options = {}) => {
     const ai = await getAi(options?.aiId, options);
-    const tag = packModelLabel([ai.provider, ai.model.source, ai.model.name]);
+    const tag = packModelId([ai.provider, ai.model.source, ai.model.name]);
     options.log && log(`Prompt ${tag}: ${JSON.stringify(input || '[ATTACHMENTS]')}`);
     const resp = await ai.prompt(input, options);
     const msgs = options?.messages || [];

package/lib/manifest.mjs

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