utilitas 1999.1.20 → 1999.1.21

package/lib/alan.mjs

@@ -38,7 +38,7 @@ You may be provided with some tools(functions) to help you gather information an
 - Unless otherwise specified to require the original result, in most cases, you may reorganize the information obtained after using the tool to solve the problem as needed.`;
 
 const _NEED = [
-    '@anthropic-ai/sdk', '@anthropic-ai/vertex-sdk', '@google/generative-ai',
+    '@anthropic-ai/sdk', '@anthropic-ai/vertex-sdk', '@google/genai',
     'js-tiktoken', 'OpenAI',
 ];
 
@@ -356,9 +356,9 @@ const toolsGemini = async () => (await toolsOpenAI()).map(x => ({
             properties: x.def.function.parameters.properties,
             required: x.def.function.parameters.required,
         },
-        response: x.def.function?.response ?? {
-            type: 'string', description: 'It could be a string or JSON',
-        },
+        // Vertex API only: response: x.def.function?.response ?? {
+        //     type: 'string', description: 'It could be a string or JSON',
+        // },
     }
 }));
 
@@ -427,8 +427,8 @@ const init = async (options = {}) => {
             break;
         case GEMINI:
             assertApiKey(provider, options);
-            const { GoogleGenerativeAI } = await need('@google/generative-ai');
-            var client = new GoogleGenerativeAI(options.apiKey);
+            const { GoogleGenAI } = await need('@google/genai');
+            var client = new GoogleGenAI(options);
             for (let model of models) {
                 setupAi({
                     provider, model, client,
@@ -506,7 +506,7 @@ const packAi = (ais, options = {}) => {
 const getAi = async (id, options = {}) => {
     if (id) {
         const ai = ais.find(x => x.id === id);
-        assert(ais, `AI not found: ${id}.`);
+        assert(ai, `AI not found: ${id}.`);
         return options?.client ? ai?.client : ai;
     } else if (options?.select) {
         const res = [];
@@ -795,6 +795,8 @@ const buildPrompts = async (model, input, options = {}) => {
                     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 }));
@@ -826,9 +828,9 @@ const buildPrompts = async (model, input, options = {}) => {
         }
     };
     msgBuilder();
-    await trimPrompt(() => [systemPrompt, history, prompt], () => {
-        if (options.messages.length) {
-            options.messages.shift();
+    await trimPrompt(() => [systemPrompt, history, content], () => {
+        if (options.messages?.length) {
+            options.messages?.shift();
             msgBuilder();
         } else {
             content = trimTailing(trimTailing(content).slice(0, -1)) + '...';
@@ -1110,15 +1112,6 @@ const deleteFile = async (aiId, file_id, options) => {
     return await client.files.del(file_id);
 };
 
-const generationConfig = options => ({
-    generationConfig: {
-        responseMimeType: options.jsonMode ? MIME_JSON : MIME_TEXT,
-        responseModalities: options.modalities
-            || (options.imageMode ? [TEXT, IMAGE] : undefined),
-        ...options?.generationConfig || {},
-    },
-});
-
 const packGeminiReferences = (chunks, supports) => {
     let references = null;
     if (chunks?.length && supports?.length) {
@@ -1134,8 +1127,8 @@ const packGeminiReferences = (chunks, supports) => {
 
 const promptGemini = async (aiId, content, options = {}) => {
     let { client, model } = await getAi(aiId);
-    let [result, references, functionCalls, responded, images]
-        = [options.result ?? '', null, null, false, []];
+    let [event, result, references, functionCalls, responded, images] =
+        [null, options.result ?? '', null, [], false, []];
     options.model = options.model || model.name;
     model?.image === true && (options.imageMode = true);
     assert(!(options.imageMode && !model.image), 'Image mode is not supported.');
@@ -1146,43 +1139,44 @@ const promptGemini = async (aiId, content, options = {}) => {
     }
     const { systemPrompt: systemInstruction, history, prompt }
         = await buildPrompts(model, content, { ...options, flavor: GEMINI });
-    const _client = client.getGenerativeModel({
-        model: options.model, systemInstruction,
-        ...model?.tools && !options.jsonMode
-            && options.model !== GEMINI_20_FLASH_EXP ? (options.tools ?? {
-                tools: [
-                    // @todo: Gemini will failed when using these tools together.
-                    // https://ai.google.dev/gemini-api/docs/function-calling
-                    // { codeExecution: {} },
-                    // { googleSearch: {} },
-                    {
-                        functionDeclarations: (
-                            await toolsGemini()
-                        ).map(x => x.def)
-                    },
-                ],
-                toolConfig: { functionCallingConfig: { mode: 'AUTO' } },
-            }) : {},
+    const chat = client.chats.create({
+        model: options.model, history, config: {
+            responseMimeType: options.jsonMode ? MIME_JSON : MIME_TEXT,
+            systemInstruction, responseModalities: options.modalities || (
+                options.imageMode ? [TEXT, IMAGE] : undefined
+            ), ...options?.config || {}, ...model?.tools && !options.jsonMode
+                && options.model !== GEMINI_20_FLASH_EXP ? (options.tools ?? {
+                    tools: [
+                        // @todo: Gemini will failed when using these tools together.
+                        // https://ai.google.dev/gemini-api/docs/function-calling
+                        // { codeExecution: {} },
+                        // { googleSearch: {} },
+                        {
+                            functionDeclarations: (
+                                await toolsGemini()
+                            ).map(x => x.def)
+                        },
+                    ], toolConfig: { functionCallingConfig: { mode: 'AUTO' } },
+                }) : {},
+        },
     });
-    // 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?
-    const chat = _client.startChat({ history, ...generationConfig(options) });
-    const resp = await chat.sendMessageStream(prompt);
-    for await (const chunk of resp.stream) {
-        const deltaImages = [];
-        chunk.candidates[0].content?.parts?.filter(
-            x => x?.inlineData?.mimeType === png
-        )?.map?.(x => {
-            deltaImages.push(x.inlineData);
-            images.push(x.inlineData);
+    const resp = await chat.sendMessageStream({ message: prompt });
+    for await (const chunk of resp) {
+        event = chunk.candidates[0];
+        let [deltaText, deltaImages] = ['', []];
+        event?.content?.parts?.map(x => {
+            if (x.text) { deltaText = x.text; }
+            else if (x.functionCall) { functionCalls.push(x); }
+            else if (x.inlineData?.mimeType === png) {
+                deltaImages.push(x.inlineData);
+                images.push(x.inlineData);
+            }
         });
-        functionCalls || (functionCalls = chunk.functionCalls);
         const rfc = packGeminiReferences(
-            chunk.candidates[0]?.groundingMetadata?.groundingChunks,
-            chunk.candidates[0]?.groundingMetadata?.groundingSupports
+            event?.groundingMetadata?.groundingChunks,
+            event?.groundingMetadata?.groundingSupports
         );
         rfc && (references = rfc);
-        let deltaText = chunk?.text?.() || '';
         options.result && deltaText
             && (responded = responded || (deltaText = `\n\n${deltaText}`));
         result += deltaText;
@@ -1191,10 +1185,6 @@ const promptGemini = async (aiId, content, options = {}) => {
             images: options.delta ? deltaImages : images,
         }, options);
     }
-    const _resp = await resp.response;
-    functionCalls = (
-        functionCalls() || _resp.functionCalls() || []
-    ).map(x => ({ functionCall: x }));
     const { toolsResult, toolsResponse } = await handleToolsCall(
         { role: MODEL, parts: functionCalls },
         { ...options, result, flavor: GEMINI }

package/lib/manifest.mjs

@@ -1,7 +1,7 @@
 const manifest = {
     "name": "utilitas",
     "description": "Just another common utility for JavaScript.",
-    "version": "1999.1.20",
+    "version": "1999.1.21",
     "private": false,
     "homepage": "https://github.com/Leask/utilitas",
     "main": "index.mjs",
@@ -19,7 +19,7 @@ const manifest = {
         "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.1/xlsx-0.20.1.tgz"
     },
     "dependencies": {
-        "file-type": "^20.4.0",
+        "file-type": "^20.4.1",
         "mathjs": "^14.3.1",
         "uuid": "^11.1.0"
     },
@@ -28,14 +28,15 @@ const manifest = {
         "@anthropic-ai/vertex-sdk": "^0.7.0",
         "@ffmpeg-installer/ffmpeg": "^1.1.0",
         "@ffprobe-installer/ffprobe": "^2.1.2",
-        "@google-cloud/speech": "^6.7.1",
+        "@google-cloud/speech": "^7.0.0",
         "@google-cloud/storage": "^7.15.2",
-        "@google-cloud/text-to-speech": "^5.8.1",
-        "@google-cloud/vision": "^4.3.3",
+        "@google-cloud/text-to-speech": "^6.0.0",
+        "@google-cloud/vision": "^5.0.0",
+        "@google/genai": "^0.4.0",
         "@google/generative-ai": "^0.24.0",
         "@mozilla/readability": "github:mozilla/readability",
-        "@sentry/node": "^9.5.0",
-        "@sentry/profiling-node": "^9.5.0",
+        "@sentry/node": "^9.6.0",
+        "@sentry/profiling-node": "^9.6.0",
         "acme-client": "^5.4.0",
         "browserify-fs": "^1.0.0",
         "buffer": "^6.0.3",
@@ -53,9 +54,9 @@ const manifest = {
         "node-mailjet": "^6.0.8",
         "node-polyfill-webpack-plugin": "^4.1.0",
         "office-text-extractor": "^3.0.3",
-        "openai": "^4.87.3",
-        "pdfjs-dist": "^4.10.38",
-        "pg": "^8.14.0",
+        "openai": "^4.87.4",
+        "pdfjs-dist": "^5.0.375",
+        "pg": "^8.14.1",
         "pgvector": "^0.2.0",
         "ping": "^0.4.4",
         "process": "^0.11.10",
@@ -68,7 +69,7 @@ const manifest = {
         "url": "github:Leask/node-url",
         "webpack-cli": "^6.0.1",
         "whisper-node": "^1.1.1",
-        "wrangler": "^3.114.1",
+        "wrangler": "^4.1.0",
         "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.1/xlsx-0.20.1.tgz",
         "youtube-transcript": "^1.2.1"
     }

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "utilitas",
     "description": "Just another common utility for JavaScript.",
-    "version": "1999.1.20",
+    "version": "1999.1.21",
     "private": false,
     "homepage": "https://github.com/Leask/utilitas",
     "main": "index.mjs",
@@ -30,7 +30,7 @@
         "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.1/xlsx-0.20.1.tgz"
     },
     "dependencies": {
-        "file-type": "^20.4.0",
+        "file-type": "^20.4.1",
         "mathjs": "^14.3.1",
         "uuid": "^11.1.0"
     },
@@ -39,14 +39,15 @@
         "@anthropic-ai/vertex-sdk": "^0.7.0",
         "@ffmpeg-installer/ffmpeg": "^1.1.0",
         "@ffprobe-installer/ffprobe": "^2.1.2",
-        "@google-cloud/speech": "^6.7.1",
+        "@google-cloud/speech": "^7.0.0",
         "@google-cloud/storage": "^7.15.2",
-        "@google-cloud/text-to-speech": "^5.8.1",
-        "@google-cloud/vision": "^4.3.3",
+        "@google-cloud/text-to-speech": "^6.0.0",
+        "@google-cloud/vision": "^5.0.0",
+        "@google/genai": "^0.4.0",
         "@google/generative-ai": "^0.24.0",
         "@mozilla/readability": "github:mozilla/readability",
-        "@sentry/node": "^9.5.0",
-        "@sentry/profiling-node": "^9.5.0",
+        "@sentry/node": "^9.6.0",
+        "@sentry/profiling-node": "^9.6.0",
         "acme-client": "^5.4.0",
         "browserify-fs": "^1.0.0",
         "buffer": "^6.0.3",
@@ -64,9 +65,9 @@
         "node-mailjet": "^6.0.8",
         "node-polyfill-webpack-plugin": "^4.1.0",
         "office-text-extractor": "^3.0.3",
-        "openai": "^4.87.3",
-        "pdfjs-dist": "^4.10.38",
-        "pg": "^8.14.0",
+        "openai": "^4.87.4",
+        "pdfjs-dist": "^5.0.375",
+        "pg": "^8.14.1",
         "pgvector": "^0.2.0",
         "ping": "^0.4.4",
         "process": "^0.11.10",
@@ -79,7 +80,7 @@
         "url": "github:Leask/node-url",
         "webpack-cli": "^6.0.1",
         "whisper-node": "^1.1.1",
-        "wrangler": "^3.114.1",
+        "wrangler": "^4.1.0",
         "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.1/xlsx-0.20.1.tgz",
         "youtube-transcript": "^1.2.1"
     }