utilitas 1999.1.21 → 1999.1.22

package/lib/alan.mjs

@@ -65,7 +65,7 @@ const [
     TOOL, silent, GEMINI_EMBEDDING_M, INVALID_FILE, tokenSafeRatio,
     GPT_QUERY_LIMIT, CONTENT_IS_REQUIRED, OPENAI_HI_RES_SIZE, k, kT, m, minute,
     hour, gb, trimTailing, EBD, GEMINI_20_FLASH_EXP, IMAGE, JINA,
-    JINA_DEEPSEARCH, JINA_CLIP,
+    JINA_DEEPSEARCH, JINA_CLIP, VERTEX,
 ] = [
         'OpenAI', 'Gemini', 'OPENAI_TRAINING', 'Ollama', 'gpt-4o-mini',
         'gpt-4o', 'o1', 'o3-mini', 'gemini-2.0-flash',
@@ -84,7 +84,7 @@ const [
         x => 1024 * 1024 * x, x => 60 * x, x => 60 * 60 * x,
         x => 1024 * 1024 * 1024 * x, x => x.replace(/[\.\s]*$/, ''),
         { embedding: true }, 'gemini-2.0-flash-exp', 'image', 'Jina',
-        'jina-deepsearch-v1', 'jina-clip-v2',
+        'jina-deepsearch-v1', 'jina-clip-v2', 'Vertex',
     ];
 
 const [tool, messages, text]
@@ -236,9 +236,9 @@ const DEFAULT_EMBEDDING = {
 };
 
 const PROVIDER_ICONS = {
-    [OPENAI]: '⚛️', [AZURE_OPENAI]: '⚛️',
+    [OPENAI]: '⚛️', [AZURE_OPENAI]: '⚛️', [AZURE]: '☁️', [JINA]: '✴️',
+    [GEMINI]: '♊️', [VERTEX]: '📖', [OLLAMA]: '🦙',
     [ANTHROPIC]: '✳️', [VERTEX_ANTHROPIC]: '✳️',
-    [GEMINI]: '♊️', [AZURE]: '☁️', [OLLAMA]: '🦙', [JINA]: '✴️',
 };
 
 const FEATURE_ICONS = {
@@ -261,7 +261,7 @@ let tokeniser;
 
 const unifyProvider = provider => {
     assert(provider = (provider || '').trim(), 'AI provider is required.');
-    for (let type of [OPENAI, AZURE_OPENAI, AZURE, GEMINI, ANTHROPIC,
+    for (let type of [OPENAI, AZURE_OPENAI, AZURE, GEMINI, VERTEX, ANTHROPIC,
         VERTEX_ANTHROPIC, JINA, OLLAMA]) {
         if (insensitiveCompare(provider, type)) { return type; }
     }
@@ -347,18 +347,18 @@ const toolsClaude = async () => (await toolsOpenAI()).map(x => ({
     }
 }));
 
-const toolsGemini = async () => (await toolsOpenAI()).map(x => ({
+const toolsGemini = async (options) => (await toolsOpenAI()).map(x => ({
     ...x, def: {
-        name: x.def.function.name,
-        description: x.def.function.description,
+        name: x.def.function.name, description: x.def.function.description,
         parameters: {
             type: 'object',
             properties: x.def.function.parameters.properties,
             required: x.def.function.parameters.required,
-        },
-        // Vertex API only: response: x.def.function?.response ?? {
-        //     type: 'string', description: 'It could be a string or JSON',
-        // },
+        }, ...options?.provider === 'VERTEX' ? {
+            response: x.def.function?.response ?? {
+                type: 'string', description: 'It could be a string or JSON',
+            }
+        } : {},
     }
 }));
 
@@ -426,8 +426,8 @@ const init = async (options = {}) => {
             setupAi({ provider, model, client, prompt: promptOpenAI });
             break;
         case GEMINI:
-            assertApiKey(provider, options);
-            const { GoogleGenAI } = await need('@google/genai');
+            assert(options.apiKey, `${provider} api key is required.`);
+            var { GoogleGenAI } = await need('@google/genai');
             var client = new GoogleGenAI(options);
             for (let model of models) {
                 setupAi({
@@ -436,6 +436,21 @@ const init = async (options = {}) => {
                 });
             }
             break;
+        case VERTEX:
+            assert(options.credentials && options.project,
+                `${provider} credentials and project id are required.`);
+            process.env['GOOGLE_APPLICATION_CREDENTIALS'] = options.credentials;
+            var { GoogleGenAI } = await need('@google/genai');
+            var client = new GoogleGenAI({
+                vertexai: true, location: 'us-east5', ...options
+            });
+            for (let model of models) {
+                setupAi({
+                    provider, model, client,
+                    prompt: promptGemini, embedding: createGeminiEmbedding,
+                });
+            }
+            break;
         case ANTHROPIC:
             assertApiKey(provider, options);
             var client = new ((
@@ -447,7 +462,8 @@ const init = async (options = {}) => {
             break;
         case VERTEX_ANTHROPIC:
             // https://github.com/anthropics/anthropic-sdk-typescript/tree/main/packages/vertex-sdk
-            assert(options?.credentials, `${provider} api credentials are required.`);
+            assert(options.credentials && options.projectId,
+                `${provider} credentials and project id are required.`);
             process.env['GOOGLE_APPLICATION_CREDENTIALS'] = options.credentials;
             process.env['ANTHROPIC_VERTEX_PROJECT_ID'] = options.projectId;
             var model = models[0];
@@ -1126,7 +1142,7 @@ const packGeminiReferences = (chunks, supports) => {
 };
 
 const promptGemini = async (aiId, content, options = {}) => {
-    let { client, model } = await getAi(aiId);
+    let { provider, client, model } = await getAi(aiId);
     let [event, result, references, functionCalls, responded, images] =
         [null, options.result ?? '', null, [], false, []];
     options.model = options.model || model.name;
@@ -1153,7 +1169,7 @@ const promptGemini = async (aiId, content, options = {}) => {
                         // { googleSearch: {} },
                         {
                             functionDeclarations: (
-                                await toolsGemini()
+                                await toolsGemini({ provider })
                             ).map(x => x.def)
                         },
                     ], toolConfig: { functionCallingConfig: { mode: 'AUTO' } },

package/lib/manifest.mjs

@@ -1,7 +1,7 @@
 const manifest = {
     "name": "utilitas",
     "description": "Just another common utility for JavaScript.",
-    "version": "1999.1.21",
+    "version": "1999.1.22",
     "private": false,
     "homepage": "https://github.com/Leask/utilitas",
     "main": "index.mjs",
@@ -33,7 +33,6 @@ const manifest = {
         "@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.6.0",
         "@sentry/profiling-node": "^9.6.0",

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "utilitas",
     "description": "Just another common utility for JavaScript.",
-    "version": "1999.1.21",
+    "version": "1999.1.22",
     "private": false,
     "homepage": "https://github.com/Leask/utilitas",
     "main": "index.mjs",
@@ -44,7 +44,6 @@
         "@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.6.0",
         "@sentry/profiling-node": "^9.6.0",