utilitas 1999.1.97 → 1999.1.98

package/lib/alan.mjs

@@ -48,7 +48,7 @@ const [
     OPENAI, GEMINI, OLLAMA, GEMINI_25_FLASH, NOVA, DEEPSEEK_R1, MD_CODE,
     CLOUD_SONNET_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, GEMMA_3_27B, ANTHROPIC, v8k, ais,
+    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, GEMINI_25_FLASH_IMAGE, IMAGE, JINA, JINA_DEEPSEARCH,
@@ -59,11 +59,11 @@ const [
         'nova', 'deepseek-r1', '```', 'anthropic/claude-sonnet-4.5', 'audio',
         'wav', '[ATTACHMENTS]', 'OPENAI_VOICE', 'medium', 'think', '<think>',
         '</think>', '<tools>', '</tools>', 'tools', 'text', 'OK', 'function',
-        'gpt-5.1', 'gpt-5.1-codex', 'gemma3:27b', 'Anthropic', 7680 * 4320, [],
-        30, { log: true }, 'Alan', 'user', { role: 'system' }, 'assistant',
-        'model', 'json_object', 1.1, 'Content 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,
+        'gpt-5.1', '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, 'Content 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]*$/, ''), 'gemini-2.5-flash-image', 'image',
         'Jina', 'jina-deepsearch-v1', 'gemini-3-pro-preview', 'SiliconFlow',
         'Pro/deepseek-ai/DeepSeek-R1', 768 * 768,
@@ -126,20 +126,21 @@ const DEEPSEEK_R1_RULES = {
 // https://cloud.google.com/vertex-ai/docs/generative-ai/learn/models
 // https://openrouter.ai/docs/features/multimodal/audio (only support input audio)
 const MODELS = {
-    [GPT_51]: { ...OPENAI_RULES, fast: true },
-    [GPT_51_CODEX]: { ...OPENAI_RULES },
-    [GEMINI_25_FLASH_IMAGE]: {
-        ...GEMINI_RULES, contextWindow: k(64), maxOutputTokens: k(32),
-        fast: true, image: true,
+    [GEMINI_30_PRO]: {
+        ...GEMINI_RULES, contextWindow: m(1), maxOutputTokens: k(64),
+        reasoning: true, tools: true,
     },
     [GEMINI_25_FLASH]: {
         ...GEMINI_RULES, contextWindow: m(1), maxOutputTokens: k(64),
         fast: true, reasoning: true, tools: true,
     },
-    [GEMINI_30_PRO]: {
-        ...GEMINI_RULES, contextWindow: m(1), maxOutputTokens: k(64),
-        reasoning: true, tools: true,
+    [GEMINI_25_FLASH_IMAGE]: {
+        ...GEMINI_RULES, contextWindow: k(64), maxOutputTokens: k(32),
+        fast: true, image: true,
     },
+    [GPT_51]: { ...OPENAI_RULES, fast: true },
+    [GPT_51_CODEX]: { ...OPENAI_RULES },
+    [GPT_5_IMAGE]: { ...OPENAI_RULES, image: true },
     [GEMMA_3_27B]: {
         contextWindow: kT(128), maxOutputTokens: k(8),
         imageCostTokens: 256, maxImageSize: 896 * 896,
@@ -255,7 +256,7 @@ const tokenRatioByCharacters = Math.max(
 );
 
 
-let tokeniser;
+let tokeniser, _tools;
 
 const unifyProvider = provider => {
     assert(provider = (provider || '').trim(), 'AI provider is required.');
@@ -326,7 +327,7 @@ const tools = [
     },
 ];
 
-const toolsOpenAI = async () => {
+const packTools = async () => {
     const _tools = [];
     for (const t of tools) {
         (t.depend ? await t.depend() : true) ? _tools.push(t) : log(
@@ -383,6 +384,7 @@ const init = async (options = {}) => {
     }
     assert(models.length,
         `Model name or description is required for provider: ${provider}.`);
+    _tools || (_tools = await packTools());
     switch (provider) {
         case JINA:
             assertApiKey(provider, options);
@@ -670,13 +672,17 @@ const packResp = async (resp, options) => {
     }
     txt = txt.join('\n');
     !options?.delta && !options?.processing && (txt = txt.trim());
+    print(options);
     return {
         ...text(txt), ...options?.jsonMode ? { json } : {},
         ...references ? { references } : {},
         ...referencesMarkdown ? { referencesMarkdown } : {},
         ...audio ? { audio } : {}, ...images?.length ? { images } : {},
         processing: !!options?.processing,
-        model: options?.model,
+        model: [
+            options.provider, options?.router?.provider,
+            options?.router?.model || options?.model,
+        ].filter(x => x).join('/'),
     };
 };
 
@@ -790,11 +796,12 @@ const promptOpenAI = async (aiId, content, options = {}) => {
     let { provider, client, model } = await getAi(aiId);
     let [
         result, resultAudio, resultImages, resultReasoning, event, resultTools,
-        responded, modalities, source, reasoningEnd
+        responded, modalities, source, reasoningEnd, reasoning_details,
     ] = [
             options.result ?? '', Buffer.alloc(0), [], '', null, [], false,
-            options.modalities, model?.source, false
+            options.modalities, model?.source, false, []
         ];
+    options.provider = provider;
     options.model = options.model || model.name;
     const { history }
         = await buildPrompts(MODELS[options.model], content, options);
@@ -816,14 +823,16 @@ const promptOpenAI = async (aiId, content, options = {}) => {
             modalities?.find?.(x => x === AUDIO)
             && { voice: DEFAULT_MODELS[OPENAI_VOICE], format: 'pcm16' }
         ), ...model?.tools && !googleImageMode ? {
-            tools: options.tools ?? (await toolsOpenAI()).map(x => x.def),
-            tool_choice: 'auto',
+            tools: options.tools ?? _tools.map(x => x.def), tool_choice: 'auto',
         } : {},
         store: true, stream: true,
         reasoning_effort: options.reasoning_effort,
     });
     for await (event of resp) {
         // print(JSON.stringify(event, null, 2));
+        event?.provider && event?.model && (options.router = {
+            provider: event.provider, model: event.model,
+        });
         event = event?.choices?.[0] || {};
         const delta = event.delta || {};
         let [delteReasoning, deltaText] = [
@@ -836,6 +845,8 @@ const promptOpenAI = async (aiId, content, options = {}) => {
         const deltaAudio = delta.audio?.data ? await convert(
             delta.audio.data, { input: BASE64, expected: BUFFER }
         ) : Buffer.alloc(0);
+        delta?.reasoning_details?.length
+            && reasoning_details.push(...delta.reasoning_details);
         for (const x of delta.tool_calls || []) {
             let curFunc = resultTools.find(y => y.index === x.index);
             curFunc || (resultTools.push(curFunc = {}));
@@ -870,7 +881,9 @@ const promptOpenAI = async (aiId, content, options = {}) => {
             }, options);
     }
     event = {
-        role: assistant, text: result, tool_calls: resultTools,
+        role: assistant, text: result,
+        ...reasoning_details?.length ? { reasoning_details } : {},
+        tool_calls: resultTools,
         ...resultImages.length ? { images: resultImages } : {},
         ...resultAudio.length ? { audio: { data: resultAudio } } : {},
     };

package/lib/gen.mjs

@@ -10,11 +10,11 @@ const _NEED = ['OpenAI', '@google/genai'];
 const log = (cnt, opt) => _log(cnt, import.meta.url, { time: 1, ...opt || {} });
 const [
     clients, OPENAI, GEMINI, BASE64, FILE, BUFFER, ERROR_GENERATING,
-    IMAGEN_MODEL, OPENAI_MODEL, VEO_MODEL,
+    IMAGEN_MODEL, OPENAI_MODEL, VEO_MODEL, IMAGEN_UPSCALE_MODEL,
 ] = [
         {}, 'OPENAI', 'GEMINI', 'BASE64', 'FILE', 'BUFFER',
         'Error generating media.', 'imagen-4.0-ultra-generate-001',
-        'gpt-image-1', 'veo-3.1-generate-preview',
+        'gpt-image-1', 'veo-3.1-generate-preview', 'imagen-4.0-upscale-preview',
     ];
 
 const init = async (options) => {

package/lib/manifest.mjs

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