Merge branch 'main' into paradalicea/fix/functions/sample-billing-stop/b-403855924

Author: iennae

.github/workflows/custard-ci-dev.yaml

@@ -45,7 +45,7 @@ jobs:
       - name: Create `bin` directory for cloud-samples-tools binaries
         run: mkdir bin
         working-directory: cloud-samples-tools
-      - uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5
+      - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5
         with:
           go-version: ${{ env.GO_VERSION }}
       - name: Build Custard (from cloud-samples-tools)

.github/workflows/custard-ci.yaml

@@ -49,7 +49,7 @@ jobs:
       - name: Create `bin` directory for cloud-samples-tools binaries
         run: mkdir bin
         working-directory: cloud-samples-tools
-      - uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5
+      - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5
         with:
           go-version: ${{ env.GO_VERSION }}
       - name: Build Custard (from cloud-samples-tools)

ai-platform/snippets/predict-image-from-image-and-text.js

@@ -30,7 +30,7 @@ async function main(
    */
   // const project = 'YOUR_PROJECT_ID';
   // const location = 'YOUR_PROJECT_LOCATION';
-  // const bastImagePath = "YOUR_BASED_IMAGE_PATH"
+  // const baseImagePath = 'YOUR_BASE_IMAGE_PATH';
   // const textPrompt = 'YOUR_TEXT_PROMPT';
   const aiplatform = require('@google-cloud/aiplatform');
 

ai-platform/snippets/predict-text-embeddings.js

@@ -20,7 +20,7 @@
 // [START generativeaionvertexai_sdk_embedding]
 async function main(
   project,
-  model = 'text-embedding-005',
+  model = 'gemini-embedding-001',
   texts = 'banana bread?;banana muffins?',
   task = 'QUESTION_ANSWERING',
   dimensionality = 0,
@@ -37,19 +37,29 @@ async function main(
     const instances = texts
       .split(';')
       .map(e => helpers.toValue({content: e, task_type: task}));
+    
+    const client = new PredictionServiceClient(clientOptions);
     const parameters = helpers.toValue(
       dimensionality > 0 ? {outputDimensionality: parseInt(dimensionality)} : {}
     );
-    const request = {endpoint, instances, parameters};
-    const client = new PredictionServiceClient(clientOptions);
-    const [response] = await client.predict(request);
-    const predictions = response.predictions;
-    const embeddings = predictions.map(p => {
-      const embeddingsProto = p.structValue.fields.embeddings;
-      const valuesProto = embeddingsProto.structValue.fields.values;
-      return valuesProto.listValue.values.map(v => v.numberValue);
-    });
-    console.log('Got embeddings: \n' + JSON.stringify(embeddings));
+    const allEmbeddings = []
+    // gemini-embedding-001 takes one input at a time.
+    for (const instance of instances) {
+      const request = {endpoint, instances: [instance], parameters};
+      const [response] = await client.predict(request);
+      const predictions = response.predictions;
+
+      const embeddings = predictions.map(p => {
+        const embeddingsProto = p.structValue.fields.embeddings;
+        const valuesProto = embeddingsProto.structValue.fields.values;
+        return valuesProto.listValue.values.map(v => v.numberValue);
+      });
+
+      allEmbeddings.push(embeddings[0])
+    }
+
+
+    console.log('Got embeddings: \n' + JSON.stringify(allEmbeddings));
   }
 
   callPredict();

ai-platform/snippets/test/predict-text-embeddings.test.js

@@ -37,7 +37,7 @@ const texts = [
 describe('predict text embeddings', () => {
   it('should get text embeddings using the latest model', async () => {
     const stdout = execSync(
-      `node ./predict-text-embeddings.js ${project} text-embedding-004 '${texts.join(';')}' QUESTION_ANSWERING ${dimensionality}`,
+      `node ./predict-text-embeddings.js ${project} gemini-embedding-001 '${texts.join(';')}' QUESTION_ANSWERING ${dimensionality}`,
       {cwd}
     );
     const embeddings = JSON.parse(stdout.trimEnd().split('\n').at(-1));

functions/README.md

@@ -13,7 +13,7 @@ There are two versions of Cloud Run functions:
 
 1. Read [Prerequisites][prereq] and [How to run a sample][run] first.
 
-[prereq]: ../README.md#prerequisities
+[prereq]: ../README.md#setup
 [run]: ../README.md#how-to-run-a-sample
 
 ## Samples

functions/env_vars/README.md

@@ -16,7 +16,7 @@ See the [Cloud Functions Using Environment Variables tutorial][tutorial].
 
 ## Run the tests
 
-1. Read and follow the [prerequisites](../../#how-to-run-the-tests).
+1. Read and follow the [prerequisites](../../#setup).
 
 2. Install dependencies:
 

functions/helloworld/README.md

@@ -27,7 +27,7 @@ complete list, see the [gcloud reference](https://cloud.google.com/sdk/gcloud/re
 
 ## Run the tests
 
-1. Read and follow the [prerequisites](../../../README.md#prerequisites).
+1. Read and follow the [prerequisites](../../../README.md#setup).
 
 
 1. Install dependencies:

functions/helloworld/helloGCS/README.md

@@ -25,7 +25,7 @@ complete list, see the [gcloud reference](https://cloud.google.com/sdk/gcloud/re
 
 ## Run the tests
 
-1. Read and follow the [prerequisites](../../../README.md#prerequisites).
+1. Read and follow the [prerequisites](../../../README.md#setup).
 
 
 1. Install dependencies:

functions/helloworld/helloPubSub/README.md

@@ -25,7 +25,7 @@ complete list, see the [gcloud reference](https://cloud.google.com/sdk/gcloud/re
 
 ## Run the tests
 
-1. Read and follow the [prerequisites](../../../README.md#prerequisites).
+1. Read and follow the [prerequisites](../../../README.md#setup).
 
 
 1. Install dependencies: