utilitas 1999.1.56 → 1999.1.57

package/lib/gen.mjs

@@ -1,5 +1,6 @@
+import { convert, MIME_PNG } from './storage.mjs';
 import { ensureString, need, throwError, tryUntil } from './utilitas.mjs';
-import { MIME_PNG, convert } from './storage.mjs';
+import { assertCommand, exec } from './shell.mjs';
 
 const _NEED = ['OpenAI'];
 
@@ -13,8 +14,8 @@ const [
 
 const init = async (options) => {
     assert(
-        options?.apiKey || (options?.projectId && options?.accessToken),
-        'API key or project ID (with access token) are required.'
+        options?.apiKey || (options?.credentials && options?.projectId),
+        'API key or credentials are required.'
     );
     const provider = ensureString(options?.provider, { case: 'UP' });
     switch (provider) {
@@ -27,7 +28,7 @@ const init = async (options) => {
             clients[provider] = {
                 apiKey: options.apiKey,
                 projectId: options.projectId,
-                accessToken: options.accessToken,
+                credentials: options.credentials,
             };
             break;
         default:
@@ -46,7 +47,7 @@ const extractVideo = async (data, options) => await convert(
 
 const generateImage = async (prompt, options) => {
     let provider = ensureString(options?.provider, { case: 'UP' });
-    if (!provider && clients?.[GEMINI] && client.apiKey) { provider = GEMINI; }
+    if (!provider && clients?.[GEMINI]?.apiKey) { provider = GEMINI; }
     if (!provider && clients?.[OPENAI]) { provider = OPENAI; }
     const client = clients?.[provider];
     const n = options?.n || 4;
@@ -105,6 +106,19 @@ const generateImage = async (prompt, options) => {
     }
 };
 
+const getGeminiAccessToken = async (credentials) => {
+    await assertCommand('gcloud');
+    const actResp = await exec(
+        `gcloud auth activate-service-account --key-file=${credentials}`,
+        { acceptError: true }
+    );
+    assert(actResp.includes('Activated service account credentials'),
+        'Failed to activate service account credentials.', 500);
+    const tokResp = (await exec(`gcloud auth print-access-token`)).trim();
+    assert(tokResp, 'Failed to get access token.', 500);
+    return tokResp;
+};
+
 const getGeminiVideo = async (jobId) => {
     const client = clients?.[GEMINI];
     assert(client, 'No available video generation provider.');
@@ -129,11 +143,12 @@ const getGeminiVideo = async (jobId) => {
 
 const generateVideo = async (prompt, options) => {
     let provider = ensureString(options?.provider, { case: 'UP' });
-    if (!provider && clients?.[GEMINI] && client.accessToken) {
-        provider = GEMINI;
-    }
+    if (!provider
+        && clients?.[GEMINI]?.credentials
+        && clients?.[GEMINI]?.projectId) { provider = GEMINI; }
     const client = clients?.[provider];
     assert(client, 'No available video generation provider.');
+    const accessToken = await getGeminiAccessToken(client.credentials);
     prompt = ensureString(prompt);
     assert(prompt.length <= 4000,
         'Prompt must be less than 4000 characters.', 400);
@@ -149,7 +164,7 @@ const generateVideo = async (prompt, options) => {
                 + `models/${VEO_MODEL}:predictLongRunning`, {
                 method: 'POST', headers: {
                     'Content-Type': 'application/json',
-                    'Authorization': `Bearer ${client.accessToken}`,
+                    'Authorization': `Bearer ${accessToken}`,
                 },
                 body: JSON.stringify({
                     instances: [{ prompt }], parameters: {

package/lib/manifest.mjs

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

package/lib/shell.mjs

@@ -11,8 +11,10 @@ const exist = (bin) => { assertCommand(bin); return which(bin); };
 const exec = async (command, options = {}) => {
     assertCommand(command);
     const { stdout, stderr } = await pmsExec(command);
-    assert(!stderr, stderr, 500);
-    return stdout;
+    assert(options?.acceptError || !stderr, stderr, 500);
+    return options?.acceptError
+        ? [stdout, stderr].map(x => x.trim()).filter(x => x).join('\n')
+        : stdout.trim();
 };
 
 const which = async (bin) => {
@@ -28,4 +30,4 @@ const assertExist = async (bin, er, code = 500) => {
 };
 
 export default exec;
-export { assertExist, exec, exist, which };
+export { assertCommand, assertExist, exec, exist, which };

package/package.json

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