feat(js/plugins/googleai): Add text-embedding-004 to GoogleAI

docs/monitoring.md

@@ -31,7 +31,7 @@ want to enable TTL for the trace documents:
 https://firebase.google.com/docs/firestore/ttl
 
 ```ts
-import { firebase } from '@genkit-ai/plugin-firebase';
+import { firebase } from '@genkit-ai/firebase';
 
 configureGenkit({
   plugins: [firebase()],

docs/nextjs.md

@@ -127,21 +127,23 @@ Node.js 20 or later.
         import { useState } from 'react';
 
         export default function Home() {
-          const [menuItem, setMenu] = useState<string>('');
+          const [menuItem, setMenuItem] = useState<string>('');
 
           async function getMenuItem(formData: FormData) {
             const theme = formData.get('theme')?.toString() ?? '';
             const suggestion = await callMenuSuggestionFlow(theme);
-            setMenu(suggestion);
+            setMenuItem(suggestion);
           }
 
           return (
             <main>
               <form action={getMenuItem}>
-                <label>
+                <label htmlFor="theme">
                   Suggest a menu item for a restaurant with this theme:{' '}
                 </label>
-                <input type="text" name="theme" />
+                <input type="text" name="theme" id="theme" />
+                <br />
+                <br />
                 <button type="submit">Generate</button>
               </form>
               <br />

docs/plugins/google-genai.md

@@ -65,6 +65,7 @@ import {
   gemini15Flash,
   gemini15Pro,
   textEmbeddingGecko001,
+  textEmbedding004,
 } from '@genkit-ai/googleai';
 ```
 
@@ -77,11 +78,11 @@ const llmResponse = await generate({
 });
 ```
 
-or use embedders (ex. `textEmbeddingGecko001`) with `embed` or retrievers:
+or use embedders (ex. `textEmbedding004`) with `embed` or retrievers:
 
 ```js
 const embedding = await embed({
-  embedder: textEmbeddingGecko001,
+  embedder: textEmbedding004,
   content: input,
 });
 ```

docs/plugins/ollama.md

@@ -66,39 +66,49 @@ import { GoogleAuth } from 'google-auth-library';
 import { ollama, OllamaPluginParams } from 'genkitx-ollama';
 import { configureGenkit, isDevEnv } from '@genkit-ai/core';
 
-const ollamaCommon = {models: [{name: "gemma:2b"}]};
+const ollamaCommon = { models: [{ name: 'gemma:2b' }] };
+
 const ollamaDev = {
   ...ollamaCommon,
   serverAddress: 'http://127.0.0.1:11434',
 } as OllamaPluginParams;
+
 const ollamaProd = {
   ...ollamaCommon,
   serverAddress: 'https://my-deployment',
-  requestHeaders: async (params) => ({
-    Authorization: `Bearer ${await getIdToken(params.serverAddress)}`,
-  }),
+  requestHeaders: async (params) => {
+    const headers = await fetchWithAuthHeader(params.serverAddress);
+    return { Authorization: headers['Authorization'] };
+  },
 } as OllamaPluginParams;
 
 export default configureGenkit({
   plugins: [
-    ollama(isDevEnv() ? ollamaDev: ollamaProd),
+    ollama(isDevEnv() ? ollamaDev : ollamaProd),
   ],
 });
 
-export async function getIdToken(url: string): Promise<string> {
-  const auth = getAuthClient();
-  const client = await auth.getIdTokenClient(url);
-  return client.idTokenProvider.fetchIdToken(url);
-}
-
+// Function to lazily load GoogleAuth client
 let auth: GoogleAuth;
 function getAuthClient() {
-  // Lazy load GoogleAuth client.
   if (!auth) {
     auth = new GoogleAuth();
   }
   return auth;
 }
+
+// Function to fetch headers, reusing tokens when possible
+async function fetchWithAuthHeader(url: string) {
+  const client = await getIdTokenClient(url);
+  const headers = await client.getRequestHeaders(url); // Auto-manages token refresh
+  return headers;
+}
+
+async function getIdTokenClient(url: string) {
+  const auth = getAuthClient();
+  const client = await auth.getIdTokenClient(url);
+  return client;
+}
 ```
 
 ## Usage

genkit-tools/cli/package.json

@@ -1,7 +1,7 @@
 {
   "name": "genkit",
-  "version": "0.5.13",
-  "description": "CLI for interacting with the Google GenKit AI framework",
+  "version": "0.5.14",
+  "description": "CLI for interacting with the Google Genkit AI framework",
   "license": "Apache-2.0",
   "keywords": [
     "genkit",

genkit-tools/common/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@genkit-ai/tools-common",
-  "version": "0.5.13",
+  "version": "0.5.14",
   "scripts": {
     "compile": "tsc -b ./tsconfig.cjs.json ./tsconfig.esm.json ./tsconfig.types.json",
     "build:clean": "rm -rf ./lib",
@@ -18,7 +18,7 @@
     "colorette": "^2.0.20",
     "commander": "^11.1.0",
     "configstore": "^5.0.1",
-    "express": "^4.18.2",
+    "express": "^4.21.0",
     "get-port": "5.1.1",
     "glob": "^10.3.12",
     "inquirer": "^8.2.0",

genkit-tools/package.json

@@ -20,5 +20,5 @@
     "zod": "^3.22.4",
     "zod-to-json-schema": "^3.22.4"
   },
-  "packageManager": "pnpm@9.10.0+sha256.355a8ab8dbb6ad41befbef39bc4fd6b5df85e12761d2724bd01f13e878de4b13"
+  "packageManager": "pnpm@9.11.0+sha256.1c0e33f70e5df9eede84a357bdfa0b1f9dba6e58194628d48a1055756f553754"
 }