utilitas 1999.1.57 → 1999.1.59

package/lib/gen.mjs

@@ -1,9 +1,12 @@
+import {
+    ensureString, log as _log, need, throwError, tryUntil,
+} from './utilitas.mjs';
+
 import { convert, MIME_PNG } from './storage.mjs';
-import { ensureString, need, throwError, tryUntil } from './utilitas.mjs';
 import { assertCommand, exec } from './shell.mjs';
 
 const _NEED = ['OpenAI'];
-
+const log = (cnt, opt) => _log(cnt, import.meta.url, { time: 1, ...opt || {} });
 const [
     clients, OPENAI, GEMINI, BASE64, BUFFER, ERROR_GENERATING, IMAGEN_MODEL,
     OPENAI_MODEL, VEO_MODEL,
@@ -45,7 +48,7 @@ const extractVideo = async (data, options) => await convert(
     data, { input: BASE64, suffix: 'mp4', ...options || {} }
 );
 
-const generateImage = async (prompt, options) => {
+const image = async (prompt, options) => {
     let provider = ensureString(options?.provider, { case: 'UP' });
     if (!provider && clients?.[GEMINI]?.apiKey) { provider = GEMINI; }
     if (!provider && clients?.[OPENAI]) { provider = OPENAI; }
@@ -79,15 +82,58 @@ const generateImage = async (prompt, options) => {
             }
             return resp?.data;
         case GEMINI:
+            // Image editing failed with the following error: imagen-3.0-capability-001 is unavailable.
+            // @todo: https://cloud.google.com/vertex-ai/generative-ai/docs/image/overview#feature-launch-stage
+            // cat << EOF > request.json
+            // {
+            //     "endpoint": "projects/backend-alpha-97077/locations/us-central1/publishers/google/models/imagen-3.0-capability-001",
+            //     "instances": [
+            //         {
+            //             "prompt": "ENTER PROMPT HERE",
+            //             "referenceImages": [
+            //                 {
+            //                     "referenceId": 1,
+            //                     "referenceType": "REFERENCE_TYPE_SUBJECT",
+            //                     "referenceImage": {
+            //                         "bytesBase64Encoded":
+            //                         },
+            //                     "subjectImageConfig" {
+            //                         "subjectDescription": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx",
+            //                         "subjectType": "SUBJECT_TYPE_DEFAULT"
+            //                     }
+            //                 }
+            //             ],
+            //         }
+            //     ],
+            //     "parameters": {
+            //         "aspectRatio": "1:1",
+            //         "sampleCount": 4,
+            //         "negativePrompt": "",
+            //         "enhancePrompt": false,
+            //         "personGeneration": "",
+            //         "safetySetting": "",
+            //         "addWatermark": true,
+            //         "includeRaiReason": true,
+            //         "language": "auto",
+            //     }
+            // }
+            // curl \
+            // -X POST \
+            // -H "Content-Type: application/json" \
+            // -H "Authorization: Bearer $(gcloud auth print-access-token)" \
+            // "https://${API_ENDPOINT}/v1/projects/${PROJECT_ID}/locations/${LOCATION_ID}/publishers/google/models/${MODEL_ID}:predict" -d '@request.json'
+            // ARGs: https://cloud.google.com/vertex-ai/generative-ai/docs/model-reference/imagen-api?authuser=4#rest_1
             var resp = await (await fetch(
                 'https://generativelanguage.googleapis.com/v1beta/models/'
                 + `${IMAGEN_MODEL}:predict?key=${client.apiKey}`, {
                 method: 'POST', headers: { 'Content-Type': 'application/json' },
                 body: JSON.stringify({
                     instances: [{ prompt }], parameters: {
-                        sampleCount: n, aspectRatio: '16:9',
+                        // "1:1" (default), "3:4", "4:3", "9:16", and "16:9"
+                        aspectRatio: '16:9', includeRaiReason: true,
+                        personGeneration: 'allow_adult', sampleCount: n,
                         ...options?.params || {},
-                    }, // "1:1" (default), "3:4", "4:3", "9:16", and "16:9"
+                    },
                 })
             })).json();
             assert(!resp?.error, resp?.error?.message || ERROR_GENERATING);
@@ -119,7 +165,7 @@ const getGeminiAccessToken = async (credentials) => {
     return tokResp;
 };
 
-const getGeminiVideo = async (jobId) => {
+const getGeminiVideo = async (jobId, accessToken) => {
     const client = clients?.[GEMINI];
     assert(client, 'No available video generation provider.');
     const resp = await (await fetch(
@@ -128,20 +174,16 @@ const getGeminiVideo = async (jobId) => {
         + `${VEO_MODEL}:fetchPredictOperation`, {
         method: 'POST', headers: {
             'Content-Type': 'application/json',
-            'Authorization': `Bearer ${client.accessToken}`,
-        },
-        body: JSON.stringify({
-            operationName: jobId,
-        })
+            'Authorization': `Bearer ${accessToken}`,
+        }, body: JSON.stringify({ operationName: jobId })
     })).json();
-    assert(
-        resp?.response?.videos?.length,
-        `Waiting for Gemini video generation: \`${jobId}\`...`
-    );
+    assert(resp?.response?.videos?.length,
+        'Waiting for Gemini video generation: '
+        + jobId.replace(/^.*\/([^/]+)$/, '$1'));
     return resp?.response?.videos;
 };
 
-const generateVideo = async (prompt, options) => {
+const video = async (prompt, options) => {
     let provider = ensureString(options?.provider, { case: 'UP' });
     if (!provider
         && clients?.[GEMINI]?.credentials
@@ -181,10 +223,9 @@ const generateVideo = async (prompt, options) => {
                 resp?.error?.message || ERROR_GENERATING
             );
             if (options?.generateRaw) { return resp; }
-            var videos = await tryUntil(
-                async () => await getGeminiVideo(resp.name),
-                { maxTry: 60 * 10, log: true }
-            );
+            var videos = await tryUntil(async () => await getGeminiVideo(
+                resp.name, accessToken
+            ), { maxTry: 60 * 10, log });
             assert(videos?.length, 'Failed to generate Gemini video.');
             if (options?.videoRaw) { return videos; }
             return await Promise.all(videos.map(async x => ({
@@ -200,8 +241,7 @@ const generateVideo = async (prompt, options) => {
 export default init;
 export {
     _NEED,
-    generateImage,
-    generateVideo,
-    getGeminiVideo,
+    image,
     init,
+    video,
 };

package/lib/manifest.mjs

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

package/lib/utilitas.mjs

@@ -394,6 +394,7 @@ const log = (content, filename, options) => {
     const args = ['[' + color.red(name) + color.yellow(strTime) + ']'
         + (isErr ? '' : ` ${content}`)];
     if (isErr) { args.push(content); }
+    if (options?.return) { return args[0]; }
     return console.info.apply(null, args);
 };
 
@@ -669,12 +670,15 @@ const tryUntil = async (fnTry, options) => {
         interval: 1000 * 1, maxTry: Infinity, log: false, error: 'Operation failed.',
         verify: async (err, res) => { return !err; }, ...options || {}
     };
-    let [curTry, result, err] = [0, null, null];
+    let [curTry, result, err, msg] = [0, null, null, null];
     do {
         try {
             assert(await options.verify((err = null), (result = await fnTry())), options.error);
         } catch (e) {
-            (err = e) && options?.log && console.log(err?.message || err);
+            (err = e) && (msg = err?.message || err) && (
+                Function.isFunction(options?.log)
+                    ? await options.log(msg) : console.log(msg)
+            );
             await timeout(options.interval);
         }
     } while (++curTry < options.maxTry && err)

package/package.json

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