utilitas 1999.1.61 → 1999.1.63

package/lib/alan.mjs

@@ -780,10 +780,13 @@ const buildPrompts = async (model, input, options = {}) => {
     assert(!(
         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, // length hack: ATTACHMENTS
-        { role: system }, { role: user }, { role: assistant },
-    ];
+    let [
+        systemPrompt, history, content, prompt, _system, _model, _assistant,
+        _history,
+    ] = [
+            null, null, input, null, { role: system }, { role: MODEL },
+            { role: assistant }, null,
+        ];
     options.systemPrompt = options.systemPrompt || INSTRUCTIONS;
     options.attachments = (
         options.attachments?.length ? options.attachments : []
@@ -793,68 +796,71 @@ const buildPrompts = async (model, input, options = {}) => {
     switch (options.flavor) {
         case OPENAI:
             systemPrompt = buildGptMessage(options.systemPrompt, _system);
-            prompt = buildGptMessage(content, options);
             break;
         case ANTHROPIC:
             systemPrompt = options.systemPrompt;
-            prompt = buildClaudeMessage(content, { ...options, cache_control: true });
             break;
         case GEMINI:
             const _role = {
-                role: [GEMINI_20_FLASH].includes(options.model)
-                    ? user : system
+                role: [GEMINI_20_FLASH].includes(options.model) ? user : system
             };
             systemPrompt = buildGeminiHistory(options.systemPrompt, _role);
-            prompt = options.toolsResult?.[options.toolsResult?.length - 1]?.parts
-                || buildGeminiMessage(content, options)
             break;
     }
     const msgBuilder = () => {
-        history = [];
+        [history, _history] = [[], []];
         (options.messages?.length ? options.messages : []).map((x, i) => {
             switch (options.flavor) {
                 case OPENAI:
-                    history.push(buildGptMessage(x.request, _user));
-                    history.push(buildGptMessage(x.response, _assistant));
+                    _history.push(buildGptMessage(x.request));
+                    _history.push(buildGptMessage(x.response, _assistant));
                     break;
                 case ANTHROPIC:
-                    history.push(buildClaudeMessage(x.request, _user));
-                    history.push(buildClaudeMessage(x.response, _assistant));
+                    _history.push(buildClaudeMessage(x.request));
+                    _history.push(buildClaudeMessage(x.response, _assistant));
                     break;
                 case GEMINI:
                     // https://github.com/google/generative-ai-js/blob/main/samples/node/advanced-chat.js
                     // Google's bug: history is not allowed while using inline_data?
                     if (options.attachments?.length) { return; }
-                    history.push(buildGeminiHistory(x.request, _user));
-                    history.push(buildGeminiHistory(x.response, { role: MODEL }));
+                    _history.push(buildGeminiHistory(x.request));
+                    _history.push(buildGeminiHistory(x.response, _model));
                     break;
             }
         });
         switch (options.flavor) {
             case OPENAI:
                 history = messages([
-                    systemPrompt, ...history, prompt,
+                    systemPrompt, ..._history, buildGptMessage(content, options),
                     ...options.toolsResult?.length ? options.toolsResult : []
                 ]);
                 break;
             case ANTHROPIC:
                 history = messages([
-                    ...history, prompt,
-                    ...options.toolsResult?.length ? options.toolsResult : []
+                    ..._history, buildClaudeMessage(content, {
+                        ...options, cache_control: true
+                    }), ...options.toolsResult?.length ? options.toolsResult : []
                 ]);
                 break;
             case GEMINI:
-                history.push(
-                    ...options.toolsResult?.length ? [
-                        buildGeminiHistory(content, { ...options, role: user }),
-                        ...options.toolsResult.slice(0, options.toolsResult.length - 1)
-                    ] : []
-                );
+                [history, prompt] = options.toolsResult?.length ? [
+                    [
+                        ..._history,
+                        buildGeminiHistory(content, options),
+                        ...options.toolsResult.slice(0, options.toolsResult.length - 1),
+                    ],
+                    options.toolsResult[options.toolsResult?.length - 1].parts,
+                ] : [
+                    [..._history],
+                    buildGeminiMessage(content, options),
+                ];
                 break;
         }
     };
     msgBuilder();
-    await trimPrompt(() => [systemPrompt, history, content], () => {
+    await trimPrompt(() => [
+        systemPrompt, _history, content, options.toolsResult
+    ], () => {
         if (options.messages?.length) {
             options.messages?.shift();
             msgBuilder();
@@ -973,7 +979,7 @@ const promptOpenAI = async (aiId, content, options = {}) => {
     const { history }
         = await buildPrompts(MODELS[options.model], content, options);
     model = MODELS[options.model];
-    model.reasoning && !azure && !options.reasoning_effort
+    model?.reasoning && !azure && !options.reasoning_effort
         && (options.reasoning_effort = GPT_REASONING_EFFORT);
     const modalities = options.modalities
         || (options.audioMode ? [TEXT, AUDIO] : undefined);
@@ -985,7 +991,7 @@ const promptOpenAI = async (aiId, content, options = {}) => {
         modalities, audio: options.audio || (
             modalities?.find?.(x => x === AUDIO)
             && { voice: DEFAULT_MODELS[OPENAI_VOICE], format: 'pcm16' }
-        ), ...model.tools && !azure ? {
+        ), ...model?.tools && !azure ? {
             tools: options.tools ?? (await toolsOpenAI()).map(x => x.def),
             tool_choice: 'auto',
         } : {}, ...azure ? {} : { store: true }, stream: true,
@@ -1384,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/manifest.mjs

@@ -1,7 +1,7 @@
 const manifest = {
     "name": "utilitas",
     "description": "Just another common utility for JavaScript.",
-    "version": "1999.1.61",
+    "version": "1999.1.63",
     "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": "1999.1.61",
+    "version": "1999.1.63",
     "private": false,
     "homepage": "https://github.com/Leask/utilitas",
     "main": "index.mjs",