utilitas 1998.2.25 → 1998.2.27

package/lib/alan.mjs

@@ -556,7 +556,6 @@ const buildGeminiMessage = (content, options) => {
     const attachments = (options?.attachments || []).map(x => ({
         inlineData: { mimeType: x.mime_type, data: x.data }
     }));
-
     return String.isString(content) ? (options?.history ? {
         role: options?.role || user,
         parts: buildGeminiParts(content, attachments),
@@ -697,9 +696,9 @@ const handleToolsCall = async (msg, options) => {
     let content = [], preRes = [], input, packMsg;
     if (msg?.tool_calls?.length) {
         switch (options?.flavor) {
-            case CLAUDE: preRes.push({ role: 'assistant', content: msg?.tool_calls }); break;
-            case GEMINI: preRes.push({ role: 'model', parts: msg?.tool_calls.map(x => ({ functionCall: x })) }); break;
-            case CHATGPT: default: preRes.push({ role: 'assistant', ...msg });
+            case CLAUDE: preRes.push({ role: assistant, content: msg?.tool_calls }); break;
+            case GEMINI: preRes.push({ role: MODEL, parts: msg?.tool_calls.map(x => ({ functionCall: x })) }); break;
+            case CHATGPT: default: preRes.push({ role: assistant, ...msg }); break;
         }
         for (const fn of msg.tool_calls) {
             switch (options?.flavor) {
@@ -725,6 +724,7 @@ const handleToolsCall = async (msg, options) => {
                     packMsg = (t, e) => ({
                         role: 'tool', tool_call_id: fn.id, [e ? 'error' : 'content']: t
                     });
+                    break;
             }
             const name = fn?.function?.name || fn?.name;
             const func = tools.find(x => insensitiveCompare(
@@ -741,8 +741,8 @@ const handleToolsCall = async (msg, options) => {
             }
         }
         switch (options?.flavor) {
-            case CLAUDE: content = [{ role: 'user', content }]; break;
-            case GEMINI: content = [{ role: 'user', parts: content }]; break;
+            case CLAUDE: content = [{ role: user, content }]; break;
+            case GEMINI: content = [{ role: user, parts: content }]; break;
         }
     }
     return [...preRes, ...content];
@@ -1021,14 +1021,15 @@ const promptGemini = async (content, options) => {
         history: [
             ...options?.messages && !options?.attachments?.length ? options.messages : [],
             ...options?.toolsResult ? [
-                { role: 'user', parts: buildGeminiMessage(content, options) },
+                { role: user, parts: buildGeminiMessage(content, options) },
                 options?.toolsResult[0]
             ] : [],
         ],
         ...generationConfig(options),
     });
     const resp = chat[options?.stream ? 'sendMessageStream' : 'sendMessage'](
-        options?.toolsResult ? options?.toolsResult[1].parts : buildGeminiMessage(content, options)
+        options?.toolsResult ?
+            options?.toolsResult[1].parts : buildGeminiMessage(content, options)
     );
     return await handleGeminiResponse(
         resp, { ...options || {}, content, model: genModel }

package/lib/manifest.mjs

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