utilitas 1999.1.32 → 1999.1.34

package/lib/alan.mjs

@@ -747,12 +747,20 @@ const packResp = async (resp, options) => {
         ).join('\n');
     }
     txt = txt.split('\n');
-    const reJina = new RegExp(`^\s*${THINK_STR}(.*)${THINK_END}\s*$`);
+    const [reJinaStr, reJinaEnd]
+        = [`^\s*(${THINK_STR})`, `(${THINK_END})\s*$`].map(x => new RegExp(x));
     const fixJina = [];
     for (let l of txt) {
-        if (reJina.test(l)) {
-            fixJina.push(THINK_STR, l.replace(reJina, '$1'), THINK_END);
-        } else { fixJina.push(l); }
+        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) {

package/lib/image.mjs

@@ -1,51 +1,86 @@
-import { convert } from './storage.mjs';
 import { ensureString, need } from './utilitas.mjs';
+import { MIME_PNG, convert } from './storage.mjs';
 
-const _NEED = [
-    'OpenAI',
-];
-
-const [BASE64, BUFFER] = ['BASE64', 'BUFFER'];
-
-let client;
+const _NEED = ['OpenAI'];
+const [OPENAI, GEMINI, BASE64, BUFFER]
+    = ['OPENAI', 'GEMINI', 'BASE64', 'BUFFER'];
+const clients = {};
 
 const init = async (options) => {
-    if (options?.apiKey) {
-        const OpenAI = await need('openai');
-        const openai = new OpenAI(options);
-        client = openai.images;
+    assert(options?.apiKey, 'API key is required.');
+    const provider = ensureString(options?.provider, { case: 'UP' });
+    switch (provider) {
+        case OPENAI:
+            const OpenAI = await need('openai');
+            const openai = new OpenAI(options);
+            clients[provider] = openai.images;
+            break;
+        case GEMINI:
+            clients[provider] = { apiKey: options.apiKey };
+            break;
+        default:
+            throw new Error('Invalid provider.');
     }
-    assert(client, 'Image API client has not been initialized.', 501);
-    return client;
+    return clients;
 };
 
+const extractImage = async (data, options) => await convert(
+    data, { input: BASE64, suffix: 'png', ...options || {} }
+);
+
 const generate = async (prompt, options) => {
-    assert(client, 'Image API client has not been initialized.', 500);
+    let provider = ensureString(options?.provider, { case: 'UP' });
+    if (!provider && clients?.[GEMINI]) { provider = GEMINI; }
+    if (!provider && clients?.[OPENAI]) { provider = OPENAI; }
+    const client = clients?.[provider];
+    assert(client, 'No available image generation provider.');
     prompt = ensureString(prompt);
-    assert(
-        prompt.length <= 4000, 'Prompt must be less than 4000 characters.', 400
-    );
-    options = {
-        ...options || {},
-        expected: ensureString(options?.expected || BUFFER, { case: 'LOW' }),
-    };
-    const asUrl = options.expected === 'url';
-    const resp = await client.generate({
-        prompt, model: 'dall-e-3', n: 1, quality: 'hd',
-        response_format: asUrl ? 'url' : 'b64_json',
-        size: '1792x1024', // 1024x1024, 1792x1024, or 1024x1792
-        style: 'vivid', // or 'natural'
-        // user: '',
-        ...options?.params || {},
-    });
-    if (!options?.raw && !asUrl) {
-        resp.data = await Promise.all(resp.data.map(async x => ({
-            revised_prompt: x.revised_prompt, [options.expected]: await convert(
-                x.b64_json, { input: BASE64, ...options || {} }
-            )
-        })));
+    assert(prompt.length <= 4000,
+        'Prompt must be less than 4000 characters.', 400);
+    switch (provider) {
+        case OPENAI:
+            options = {
+                ...options || {},
+                expected: ensureString(options?.expected || BUFFER, { case: 'LOW' }),
+            };
+            const asUrl = options.expected === 'url';
+            var resp = await client.generate({
+                prompt, model: 'dall-e-3', n: 1, quality: 'hd',
+                response_format: asUrl ? 'url' : 'b64_json',
+                size: '1792x1024', // 1024x1024, 1792x1024, or 1024x1792
+                // style: 'vivid', // or 'natural'
+                // user: '',
+                ...options?.params || {},
+            });
+            if (!options?.raw && !asUrl) {
+                resp.data = await Promise.all(resp.data.map(async x => ({
+                    prompt: x.revised_prompt, mimeType: MIME_PNG,
+                    data: await extractImage(x.b64_json, options),
+                })));
+            }
+            return resp?.data;
+        case GEMINI:
+            var resp = await (await fetch(
+                'https://generativelanguage.googleapis.com/v1beta/models/'
+                + `imagen-3.0-generate-002:predict?key=${client.apiKey}`, {
+                method: 'POST', headers: { 'Content-Type': 'application/json' },
+                body: JSON.stringify({
+                    instances: [{ prompt }], parameters: {
+                        sampleCount: 4, aspectRatio: '16:9',
+                        ...options?.params || {},
+                    }, // "1:1" (default), "3:4", "4:3", "9:16", and "16:9"
+                })
+            })).json();
+            if (!options?.raw) {
+                resp = await Promise.all(resp?.predictions.map(async x => ({
+                    mimeType: x.mimeType,
+                    data: await extractImage(x.bytesBase64Encoded, options),
+                })));
+            }
+            return resp;
+        default:
+            throw new Error('Invalid provider.');
     }
-    return resp?.data;
 };
 
 export default init;

package/lib/manifest.mjs

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

package/lib/storage.mjs

@@ -26,11 +26,11 @@ const sanitizeFilename = (s, r) => s.replace(/[\/?<>\\:*|"]/g, r || '_').trim();
 
 const [
     NULL, BASE64, BUFFER, FILE, STREAM, TEXT, _JSON, encoding, BINARY, BLOB,
-    DATAURL, mode, dirMode, MIME_TEXT, MIME_BINARY, MIME_JSON,
+    DATAURL, mode, dirMode, MIME_TEXT, MIME_BINARY, MIME_JSON, MIME_PNG,
 ] = [
         'NULL', 'BASE64', 'BUFFER', 'FILE', 'STREAM', 'TEXT', 'JSON', 'utf8',
         'binary', 'BLOB', 'DATAURL', '0644', '0755', 'text/plain',
-        'application/octet-stream', 'application/json',
+        'application/octet-stream', 'application/json', 'image/png',
     ];
 
 const [encodeBase64, encodeBinary, encodeNull]
@@ -469,13 +469,14 @@ const deleteOnCloud = async (path, options) => {
 
 export {
     _NEED,
-    BUFFER,
     BASE64,
+    BUFFER,
     DATAURL,
     FILE,
     MIME_BINARY,
-    MIME_TEXT,
     MIME_JSON,
+    MIME_PNG,
+    MIME_TEXT,
     STREAM,
     analyzeFile,
     assertPath,

package/lib/web.mjs

@@ -222,7 +222,7 @@ const search = async (query, options = {}) => {
                     headers: {
                         'Authorization': `Bearer ${key}`,
                         'Accept': options?.aiFriendly ? MIME_TEXT : MIME_JSON,
-                        'X-Respond-With': 'no-content',
+                        ...options?.fetch ? {} : { 'X-Respond-With': 'no-content' },
                         ...options?.aiFriendly ? {} : { 'X-With-Favicons': true },
                     }
                 }, ...options || {},
@@ -329,8 +329,14 @@ const distill = async (url, options = {}) => {
     const key = options.apiKey || jinaApiKey;
     if (key) {
         const resp = await get(`https://r.jina.ai/${encodeURIComponent(url)}`, {
-            fetch: { headers: { 'Authorization': `Bearer ${key}` } },
-            ...options || {},
+            fetch: {
+                headers: {
+                    'Authorization': `Bearer ${key}`,
+                    // 'X-Engine': 'cf-browser-rendering',
+                    // 'X-Respond-With': 'readerlm-v2',
+                    'X-Base': 'final',
+                }
+            }, ...options || {},
         });
         return { content: null, summary: resp?.content };
     }

package/package.json

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