utilitas 1999.1.62 → 1999.1.64

package/lib/alan.mjs

@@ -784,8 +784,8 @@ const buildPrompts = async (model, input, options = {}) => {
         systemPrompt, history, content, prompt, _system, _model, _assistant,
         _history,
     ] = [
-            null, null, input || ATTACHMENTS, null, // length hack: ATTACHMENTS
-            { role: system }, { role: MODEL }, { role: assistant }, null,
+            null, null, input, null, { role: system }, { role: MODEL },
+            { role: assistant }, null,
         ];
     options.systemPrompt = options.systemPrompt || INSTRUCTIONS;
     options.attachments = (
@@ -1390,7 +1390,7 @@ const resetSession = async (sessionId, options) => {
 
 const talk = async (input, options = {}) => {
     let [chat, sessionId] =
-        [{ request: input || ATTACHMENTS }, options.sessionId || newSessionId()];
+        [{ request: input }, options.sessionId || newSessionId()];
     const session = await getSession(sessionId, options);
     const resp = await prompt(input, {
         messages: session.messages, log: true, ...options,

package/lib/gen.mjs

@@ -1,8 +1,9 @@
 import {
-    ensureArray, ensureString, log as _log, need, throwError, tryUntil,
+    ensureArray, ensureString, ignoreErrFunc, log as _log, need, throwError,
+    tryUntil,
 } from './utilitas.mjs';
 
-import { assertCommand, exec } from './shell.mjs';
+import { assertExist, exec } from './shell.mjs';
 import { convert, MIME_PNG } from './storage.mjs';
 import { createReadStream } from 'fs';
 
@@ -180,12 +181,13 @@ const image = async (prompt, options) => {
 };
 
 const getGeminiAccessToken = async (credentials) => {
-    await assertCommand('gcloud');
-    const actResp = await exec(
-        `gcloud auth activate-service-account --key-file=${credentials}`,
+    const bin = 'gcloud';
+    await assertExist(bin);
+    const actResp = await ignoreErrFunc(async () => await exec(
+        `${bin} auth activate-service-account --key-file=${credentials}`,
         { acceptError: true }
-    );
-    assert(actResp.includes('Activated service account credentials'),
+    ), { log: 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);

package/lib/manifest.mjs

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

package/lib/shell.mjs

@@ -30,4 +30,4 @@ const assertExist = async (bin, er, code = 500) => {
 };
 
 export default exec;
-export { assertCommand, assertExist, exec, exist, which };
+export { assertExist, exec, exist, which };

package/package.json

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