utilitas 2001.1.85 → 2001.1.87

package/lib/alan.mjs

@@ -103,13 +103,13 @@ const MODEL_ICONS = {
 
 const FEATURE_ICONS = {
     audio: '🔊', deepsearch: '🔍', fast: '⚡️', hearing: '👂', hidden: '🙈',
-    image: '🎨', json: '📊', reasoning: '🧠', tools: '🧰', video: '🎬',
+    image: '🎨', reasoning: '🧠', structured: '📊', tools: '🧰', video: '🎬',
     vision: '👁️', // finetune: '🔧',
 };
 
 const GEMINI_RULES = {
     source: GOOGLE, contextWindow: m(1.05), maxOutputTokens: k(65.5),
-    hearing: true, json: true, reasoning: true, tools: true, vision: true,
+    hearing: true, reasoning: true, structured: true, tools: true, vision: true,
     supportedMimeTypes: [
         MIME_PNG, MIME_JPEG, MIME_MOV, MIME_MPEG, MIME_MP4, MIME_MPG, MIME_AVI,
         MIME_WMV, MIME_MPEGPS, MIME_FLV, MIME_PDF, MIME_AAC, MIME_FLAC,
@@ -120,7 +120,7 @@ const GEMINI_RULES = {
 
 const OPENAI_RULES = {
     source: OPENAI, contextWindow: k(400), maxOutputTokens: k(128),
-    hearing: true, json: true, reasoning: true, tools: true, vision: true,
+    hearing: true, reasoning: true, structured: true, tools: true, vision: true,
     supportedMimeTypes: [
         MIME_PNG, MIME_JPEG, MIME_GIF, MIME_WEBP, MIME_PDF, MIME_WAV
     ], defaultProvider: OPENROUTER,
@@ -128,7 +128,7 @@ const OPENAI_RULES = {
 
 const DEEPSEEK_32_RULES = {
     source: DEEPSEEK, contextWindow: k(163.8), maxOutputTokens: k(65.5),
-    json: true, tools: true, reasoning: true,
+    structured: true, tools: true, reasoning: true,
 };
 
 // https://platform.openai.com/docs/models
@@ -137,7 +137,7 @@ const DEEPSEEK_32_RULES = {
 const MODELS = {
     // fast and balanced models
     [GEMINI_30_FLASH]: { // https://gemini.google.com/app/c680748b3307790b
-        ...GEMINI_RULES, fast: true, json: false, // issue with json output via OpenRouter
+        ...GEMINI_RULES, fast: true, structured: false, // issue with json output via OpenRouter
     },
     // strong and fast
     [GPT_52]: { ...OPENAI_RULES, fast: true },
@@ -152,6 +152,10 @@ const MODELS = {
         source: GOOGLE, maxInputTokens: 480,
         image: true, defaultProvider: GOOGLE,
     },
+    // [IMAGEN_4_UPSCALE]: {
+    //     source: GOOGLE, maxInputTokens: 0, image: true,
+    //     supportedMimeTypes: [MIME_PNG, MIME_JPEG], defaultProvider: GOOGLE,
+    // },
     [VEO_31]: {
         source: GOOGLE, maxInputTokens: 1024, attachmentTokenCost: 0,
         video: true, vision: true,
@@ -165,7 +169,7 @@ const MODELS = {
     [GPT_51_CODEX]: { ...OPENAI_RULES },
     [CLOUD_OPUS_45]: {
         source: ANTHROPIC, contextWindow: k(200), maxOutputTokens: k(64),
-        json: true, reasoning: true, tools: true, vision: true,
+        reasoning: true, structured: true, tools: true, vision: true,
         supportedMimeTypes: [
             MIME_TEXT, MIME_PNG, MIME_JPEG, MIME_GIF, MIME_WEBP, MIME_PDF,
         ], defaultProvider: OPENROUTER,
@@ -190,7 +194,7 @@ const MODELS = {
     // models with deepsearch capabilities
     [JINA_DEEPSEARCH]: { // @todo: parse more details from results, eg: "reed urls".
         maxInputTokens: Infinity, attachmentTokenCost: 0,
-        deepsearch: true, json: true, reasoning: true, vision: true,
+        deepsearch: true, reasoning: true, structured: true, vision: true,
         supportedMimeTypes: [MIME_PNG, MIME_JPEG, MIME_TEXT, MIME_WEBP, MIME_PDF],
         defaultProvider: JINA,
     },
@@ -200,7 +204,7 @@ const MODELS = {
     // best local model
     [GEMMA_3_27B]: {
         source: GOOGLE, contextWindow: k(128), maxOutputTokens: k(8),
-        fast: true, json: true, vision: true,
+        fast: true, structured: true, vision: true,
         supportedMimeTypes: [MIME_PNG, MIME_JPEG, MIME_GIF],
         defaultProvider: OLLAMA,
     },
@@ -248,7 +252,7 @@ for (const n in MODELS) {
 //     }
 //     // for other features, if any model supports it, then AUTO supports it
 //     for (const key of [
-//         'json', 'reasoning', 'tools', 'vision', 'fast', 'deepsearch', 'image',
+//         'structured', 'reasoning', 'tools', 'vision', 'fast', 'deepsearch', 'image',
 //     ]) {
 //         MODELS[AUTO][key] = MODELS[AUTO][key] || MODELS[n][key];
 //     }
@@ -512,7 +516,7 @@ const packAi = (ais, options = {}) => {
 
 const getAi = async (id, options = {}) => {
     options?.select || (options.select = {});
-    options?.jsonMode && (options.select.json = true);
+    options?.jsonMode && (options.select.structured = true);
     if (id) {
         const ai = ais.find(x => x.id === id);
         assert(ai, `AI not found: ${id}.`);
@@ -746,8 +750,8 @@ const packModelId = (model_reference, options = {}) => {
 };
 
 const buildPrompts = async (model, input, options = {}) => {
-    assert(!(options.jsonMode && !model?.json),
-        `This model does not support JSON output: ${model.name}`);
+    assert(!(options.jsonMode && !model?.structured),
+        `This model does not support structured output: ${model.name}`);
     assert(!(options.reasoning && !model?.reasoning),
         `This model does not support reasoning: ${model.name}`);
     options.attachments = (await Promise.all((
@@ -997,11 +1001,23 @@ const promptGoogle = async (aiId, prompt, options = {}) => {
     const target_model = options?.model || model.name;
     const M = MODELS[target_model];
     prompt = ensureString(prompt, { trim: true });
+    // M.name === IMAGEN_4_ULTRA ||
     assertPrompt(prompt);
     M.tts && (prompt = `${options?.prompt || TTS_PROMPT}: ${prompt}`);
     prompt = trimText(prompt, { limit: M.maxInputTokens });
     if (M?.image) {
-        var resp = await client.models.generateImages({
+        var resp;
+        // if (M.name === IMAGEN_4_ULTRA) {
+        //     resp = await client.models.upscaleImage({
+        //         model: M.name, prompt, config: mergeAtoB(options?.config, {
+        //             numberOfImages: options?.n || 4, sampleImageSize: '2K',
+        //             includeRaiReason: true,
+        //             // "1:1" (default), "3:4", "4:3", "9:16", and "16:9"
+        //             aspectRatio: '16:9', personGeneration: 'allow_adult',
+        //         }),
+        //     });
+        // } else {
+        resp = await client.models.generateImages({
             model: M.name, prompt, config: mergeAtoB(options?.config, {
                 numberOfImages: options?.n || 4, sampleImageSize: '2K',
                 includeRaiReason: true,
@@ -1009,6 +1025,7 @@ const promptGoogle = async (aiId, prompt, options = {}) => {
                 aspectRatio: '16:9', personGeneration: 'allow_adult',
             }),
         });
+        // }
         var generated = resp?.generatedImages;
         assert(!resp?.error && generated?.filter(
             x => !x.raiFilteredReason
@@ -1482,7 +1499,7 @@ 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 },
+        jsonMode: true, simple: true, select: { structured: true, fast: true },
         ...options || {}
     });
     const pmt = options?.prompt || (

package/lib/manifest.mjs

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