utilitas 2000.3.36 → 2000.3.39

package/lib/alan.mjs

@@ -1072,14 +1072,16 @@ const promptGoogle = async (aiId, prompt, options = {}) => {
             x => x.raiFilteredReason
         )?.raiFilteredReason || ERROR_GENERATING);
         if (!options?.raw) {
+            const model = packModelLabel([provider, M.source, M.name]);
             resp = {
-                text: '', images: await Promise.all((
+                text: `🎨 by ${model}`,
+                images: await Promise.all((
                     resp?.generatedImages || []
                 ).map(async x => ({
                     data: await convert(x.image.imageBytes, {
                         input: BASE64, suffix: 'png', ...options || {}
                     }), mimeType: x.image.mimeType,
-                }))), model: packModelLabel([provider, M.source, M.name]),
+                }))), model,
             }
         }
     } else if (M?.video) {
@@ -1110,8 +1112,10 @@ const promptGoogle = async (aiId, prompt, options = {}) => {
         if (options?.videoRaw) {
             resp = resp?.response?.generatedVideos;
         } else if (!options?.videoRaw) {
+            const model = packModelLabel([provider, M.source, M.name]);
             resp = {
-                text: '', videos: await Promise.all(resp?.response?.generatedVideos?.filter(
+                text: `🎬 by ${model}`,
+                videos: await Promise.all(resp?.response?.generatedVideos?.filter(
                     x => x?.video?.uri
                 ).map(async x => {
                     const downloadPath = `${getTempPath({
@@ -1126,7 +1130,7 @@ const promptGoogle = async (aiId, prompt, options = {}) => {
                             input: FILE, suffix: 'mp4', ...options || {}
                         }), mimeType: MIME_MP4, jobId: resp.name,
                     };
-                })), model: packModelLabel([provider, M.source, M.name]),
+                })), model,
             };
         }
     } else if (M?.audio) { // https://ai.google.dev/gemini-api/docs/speech-generation#voices
@@ -1146,12 +1150,13 @@ const promptGoogle = async (aiId, prompt, options = {}) => {
         const rawAudio = resp?.candidates?.[0]?.content?.parts?.[0]?.inlineData;
         assert(rawAudio, ERROR_GENERATING, 500);
         if (!options?.raw) {
+            const model = packModelLabel([provider, M.source, M.name]);
             resp = {
-                text: '', audio: {
+                text: `🗣️ by ${model}`, audio: {
                     data: await packPcmToWav(rawAudio?.data, {
                         input: BASE64, suffix: wav, ...options || {},
                     }), mimeType: MIME_WAV,
-                }, model: packModelLabel([provider, M.source, M.name]),
+                }, model,
             };
         }
     } else {
@@ -1183,13 +1188,14 @@ const promptOpenAI = async (aiId, prompt, options = {}) => {
             input: prompt, ...options?.params || {},
         });
         if (!options?.raw) {
+            const model = packModelLabel([provider, M.source, M.name]);
             resp = {
-                text: '', audio: {
+                text: `🗣️ by ${model}`, audio: {
                     data: await convert(Buffer.from(
                         await resp.arrayBuffer()
                     ), { suffix: OGG_EXT, ...options || {} }),
                     mimeType: MIME_OGG,
-                }, model: packModelLabel([provider, M.source, M.name]),
+                }, model,
             };
         }
     } else if (M?.hearing) {
@@ -1245,8 +1251,7 @@ const initChat = async (options = {}) => {
 };
 
 const defaultSession = session => ({
-    messages: [], systemPrompt: chatConfig.systemPrompt,
-    threadId: null, ...session || {},
+    messages: [], systemPrompt: chatConfig.systemPrompt, ...session || {},
 });
 
 const assertSessionId = sessionId => {
@@ -1347,8 +1352,8 @@ const stt = async (audio, options = {}) => await distillFile(
 
 const prompt = async (input, options = {}) => {
     const ai = await getAi(options?.aiId, options);
-    const tag = `${ai.provider} (${ai.model.name})`;
-    options.log && log(`Prompt ${tag}: ${JSON.stringify(input)}`);
+    const tag = packModelLabel([ai.provider, ai.model.source, ai.model.name]);
+    options.log && log(`Prompt ${tag}: ${JSON.stringify(input || '[ATTACHMENTS]')}`);
     const resp = await ai.prompt(input, options);
     options.log && log(`Response ${tag}: ${JSON.stringify(resp.text)}`);
     return resp;

package/lib/manifest.mjs

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

package/lib/utilitas.mjs

@@ -218,6 +218,22 @@ const ensureDate = (dt, options) => {
     return dt;
 };
 
+const uptime = () => {
+    let resp = `${getTimeIcon(new Date())} ${new Date().toTimeString(
+    ).split(' ')[0].split(':').slice(0, 2).join(':')} up`;
+    let seconds = process.uptime();
+    const days = Math.floor(seconds / (3600 * 24));
+    seconds -= days * 3600 * 24;
+    let hours = Math.floor(seconds / 3600);
+    seconds -= hours * 3600;
+    hours = hours.toString().padStart(2, '0');
+    let minutes = Math.floor(seconds / 60);
+    minutes = minutes.toString().padStart(2, '0');
+    seconds = Math.floor(seconds % 60).toString().padStart(2, '0');
+    days > 0 && (resp += ` ${days} day${days > 1 ? 's' : ''},`);
+    return `${resp} ${hours}:${minutes}:${seconds}`;
+};
+
 const getRandomIndexInArray = (array, options) => {
     const count = ~~options?.count;
     const result = randomArray([...array.keys()]).slice(0, count || 1);
@@ -936,6 +952,7 @@ export {
     verifyPhone,
     verifyUrl,
     verifyUuid,
+    uptime,
     voidFunc,
     which
 };

package/package.json

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