utilitas 1998.2.45 → 1998.2.47

package/lib/alan.mjs

@@ -645,8 +645,9 @@ const buildClaudeMessage = (text, options) => {
     });
     return String.isString(text) ? {
         role: options?.role || user, content: [...attachments, {
-            type: TEXT, text,
-            cache_control: options?.cache_control ?? { type: 'ephemeral' }
+            type: TEXT, text, ...options.cache_control ? {
+                cache_control: { type: 'ephemeral' },
+            } : {},
         }],
     } : text;
 };
@@ -771,8 +772,8 @@ const buildPrompts = async (model, input, options = {}) => {
         options.reasoning && !model?.reasoning
     ), `This model does not support reasoning: ${options.model}`);
     let [systemPrompt, history, content, prompt, _system, _user, _assistant] = [
-        null, null, input || ATTACHMENTS, null, [], null, // length hack: ATTACHMENTS
-        { role: system }, { role: user }, { role: assistant }
+        null, null, input || ATTACHMENTS, null, // length hack: ATTACHMENTS
+        { role: system }, { role: user }, { role: assistant },
     ];
     options.systemPrompt = options.systemPrompt || INSTRUCTIONS;
     options.attachments = (
@@ -787,7 +788,7 @@ const buildPrompts = async (model, input, options = {}) => {
             break;
         case CLAUDE:
             systemPrompt = options.systemPrompt;
-            prompt = buildClaudeMessage(content, options)
+            prompt = buildClaudeMessage(content, { ...options, cache_control: true });
             break;
         case OLLAMA:
             systemPrompt = buildOllamaMessage(options.systemPrompt, _system);
@@ -801,7 +802,7 @@ const buildPrompts = async (model, input, options = {}) => {
     }
     const msgBuilder = () => {
         history = [];
-        (options.messages?.length ? options.messages : []).map(x => {
+        (options.messages?.length ? options.messages : []).map((x, i) => {
             switch (options.flavor) {
                 case CHATGPT:
                     history.push(buildGptMessage(x.request, _user));
@@ -812,8 +813,8 @@ const buildPrompts = async (model, input, options = {}) => {
                     history.push(buildClaudeMessage(x.response, _assistant));
                     break;
                 case OLLAMA:
-                    history.push(buildClaudeMessage(x.request, _user));
-                    history.push(buildClaudeMessage(x.response, _assistant));
+                    history.push(buildOllamaMessage(x.request, _user));
+                    history.push(buildOllamaMessage(x.response, _assistant));
                     break;
                 case GEMINI:
                     if (options.attachments?.length) { return; }
@@ -849,6 +850,7 @@ const buildPrompts = async (model, input, options = {}) => {
             content = trimTailing(trimTailing(content).slice(0, -1)) + '...';
         }
     }, model.maxInputTokens - options.attachments?.length * ATTACHMENT_TOKEN_COST);
+    print(JSON.stringify(history));
     return { systemPrompt, history, prompt };
 };
 

package/lib/bot.mjs

@@ -1,24 +1,26 @@
 // @todo: New text of the message, 1-4096 characters after entities parsing
 
 import {
+    log as _log,
     base64Encode, countKeys, ensureArray, ensureString, getTimeIcon,
     humanReadableBoolean, ignoreErrFunc, insensitiveCompare, insensitiveHas,
-    isSet, lastItem, log as _log, need, parseJson, prettyJson, splitArgs,
-    timeout, trim, which, throwError,
+    isSet, lastItem,
+    need, parseJson, prettyJson, splitArgs,
+    throwError,
+    timeout, trim, which,
 } from './utilitas.mjs';
 
-import { BASE64, BUFFER, convert, FILE, isTextFile, tryRm } from './storage.mjs';
+import { readdirSync } from 'fs';
+import { parseArgs as _parseArgs } from 'node:util';
 import { basename, join } from 'path';
+import { jpeg, ogg, wav } from './alan.mjs';
+import { isPrimary, on, report } from './callosum.mjs';
+import { cleanSql, encodeVector, MYSQL, POSTGRESQL } from './dbio.mjs';
 import { convertAudioTo16kNanoPcmWave } from './media.mjs';
-import { distill } from './web.mjs';
-import { fakeUuid } from './uoid.mjs';
 import { get } from './shot.mjs';
-import { isPrimary, on, report } from './callosum.mjs';
-import { jpeg, ogg, wav } from './alan.mjs';
-import { MYSQL, POSTGRESQL, cleanSql, encodeVector } from './dbio.mjs';
-import { parseArgs as _parseArgs } from 'node:util';
+import { BASE64, BUFFER, convert, FILE, isTextFile, tryRm } from './storage.mjs';
+import { fakeUuid } from './uoid.mjs';
 import { parseOfficeFile } from './vision.mjs';
-import { readdirSync } from 'fs';
 
 const _NEED = ['mime', 'telegraf'];
 // 👇 https://core.telegram.org/bots/faq#my-bot-is-hitting-limits-how-do-i-avoid-this
@@ -730,20 +732,20 @@ const subconscious = [{
         );
         await next();
     },
-}, {
-    run: true, priority: -8870, name: 'web', func: async (ctx, next) => {
-        if (ctx.entities.some(e => e.type === 'url')) {
-            await ctx.ok(EMOJI_LOOK);
-            for (let e of ctx.entities) {
-                if (e.type !== 'url') { continue; }
-                const content = await ignoreErrFunc(async () => (
-                    await distill(e.matched)
-                )?.summary);
-                content && ctx.collect(content, 'URL');
-            }
-        }
-        await next();
-    },
+    // }, {
+    //     run: true, priority: -8870, name: 'web', func: async (ctx, next) => {
+    //         if (ctx.entities.some(e => e.type === 'url')) {
+    //             await ctx.ok(EMOJI_LOOK);
+    //             for (let e of ctx.entities) {
+    //                 if (e.type !== 'url') { continue; }
+    //                 const content = await ignoreErrFunc(async () => (
+    //                     await distill(e.matched)
+    //                 )?.summary);
+    //                 content && ctx.collect(content, 'URL');
+    //             }
+    //         }
+    //         await next();
+    //     },
 }, {
     run: true, priority: -8860, name: 'vision', func: async (ctx, next) => {
         ctx.collect(ctx.m?.caption || '');
@@ -1146,21 +1148,14 @@ export {
     COMMAND_LIMIT,
     EMOJI_BOT,
     EMOJI_SPEECH,
-    EMOJI_THINKING,
-    GROUP_LIMIT,
-    HELLO,
-    MESSAGE_LENGTH_LIMIT,
-    MESSAGE_SOFT_LIMIT,
-    PRIVATE_LIMIT,
-    end,
-    init,
+    EMOJI_THINKING, end, GROUP_LIMIT,
+    HELLO, init,
     lines,
     lines2,
-    map,
-    newCommand,
+    map, MESSAGE_LENGTH_LIMIT,
+    MESSAGE_SOFT_LIMIT, newCommand,
     oList,
-    paging,
-    send,
+    paging, PRIVATE_LIMIT, send,
     sendMd,
-    uList,
+    uList
 };

package/lib/manifest.mjs

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

package/package.json

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