Merge branch 'main' into ci-make

Author: pattishin

.github/auto-label.yaml

@@ -45,6 +45,7 @@ path:
         eventarc: "eventarc"
         error-reporting: "clouderrorreporting"
         functions: "cloudfunctions"
+        generative-ai: "genai"
         game-servers: "gameservices"
         healthcare: "healhcare"
         iam: "iam"

.github/workflows/generative-ai-snippets.yaml

@@ -0,0 +1,106 @@
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+name: generative-ai-snippets
+on:
+  push:
+    branches:
+    - main
+    paths:
+    - 'generative-ai/snippets/**'
+    - '.github/workflows/generative-ai-snippets.yaml'
+  pull_request:
+    paths:
+    - 'generative-ai/snippets/**'
+    - '.github/workflows/generative-ai-snippets.yaml'
+  pull_request_target:
+    types: [labeled]
+    paths:
+    - 'generative-ai/snippets/**'
+    - '.github/workflows/generative-ai-snippets.yaml'
+  schedule:
+  - cron:  '0 0 * * 0'
+jobs:
+  test:
+    if: github.event.action != 'labeled' || github.event.label.name == 'actions:force-run'
+    runs-on: ubuntu-latest
+    timeout-minutes: 120
+    permissions:
+      contents: 'read'
+      id-token: 'write'
+    defaults:
+      run:
+        working-directory: 'generative-ai/snippets'
+    steps:
+    - uses: actions/[email protected]
+      with:
+        ref: ${{github.event.pull_request.head.sha}}
+    - uses: 'google-github-actions/[email protected]'
+      with:
+        workload_identity_provider: 'projects/1046198160504/locations/global/workloadIdentityPools/github-actions-pool/providers/github-actions-provider'
+        service_account: '[email protected]'
+        create_credentials_file: 'true'
+        access_token_lifetime: 600s
+    - id: secrets
+      uses: 'google-github-actions/get-secretmanager-secrets@v1'
+      with:
+        secrets: |-
+          caip_id:nodejs-docs-samples-tests/nodejs-docs-samples-ai-platform-caip-project-id
+          location:nodejs-docs-samples-tests/nodejs-docs-samples-ai-platform-location
+    - uses: actions/[email protected]
+      with:
+        node-version: 16
+    - name: Get npm cache directory
+      id: npm-cache-dir
+      shell: bash
+      run: echo "dir=$(npm config get cache)" >> ${GITHUB_OUTPUT}        
+    - uses: actions/cache@v3
+      id: npm-cache
+      with:
+        path: ${{ steps.npm-cache-dir.outputs.dir }}
+        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
+        restore-keys: |
+          ${{ runner.os }}-node-   
+    - name: install repo dependencies
+      run: npm install
+      working-directory: .
+    - name: install directory dependencies
+      run: npm install
+    - run: npm run build --if-present
+    - name: set env vars for scheduled run
+      if: github.event.action == 'schedule'
+      run: |
+        echo "MOCHA_REPORTER_SUITENAME=generative-ai-snippets" >> $GITHUB_ENV
+        echo "MOCHA_REPORTER_OUTPUT=${{github.run_id}}_sponge_log.xml" >> $GITHUB_ENV
+        echo "MOCHA_REPORTER=xunit" >> $GITHUB_ENV
+    - run: npm test
+      env:
+        LOCATION: ${{ steps.secrets.outputs.location }}
+        CAIP_PROJECT_ID: ${{ steps.secrets.outputs.caip_id }}      
+    - name: upload test results for FlakyBot workflow
+      if: github.event.action == 'schedule' && always()
+      uses: actions/upload-artifact@v3
+      env:
+        MOCHA_REPORTER_OUTPUT: "${{github.run_id}}_sponge_log.xml"
+      with:
+        name: test-results
+        path: generative-ai/snippets/${{ env.MOCHA_REPORTER_OUTPUT }}
+        retention-days: 1        
+  flakybot:
+    permissions:
+      contents: 'read'
+      id-token: 'write'
+    if: github.event_name == 'schedule' && always() # always() submits logs even if tests fail
+    uses: ./.github/workflows/flakybot.yaml
+    needs: [test]

.github/workflows/utils/workflows-secrets.json

@@ -5,5 +5,6 @@
   "iam/deny",
   "security-center/snippets",
   "storagetransfer",
+  "generative-ai/snippets",
   "vision"
 ]

CODEOWNERS

@@ -50,6 +50,7 @@ monitoring/opencensus @GoogleCloudPlatform/nodejs-samples-reviewers
 
 # Data & AI
 ai-platform @GoogleCloudPlatform/dee-data-ai @GoogleCloudPlatform/nodejs-samples-reviewers
+generative-ai @GoogleCloudPlatform/dee-data-ai @GoogleCloudPlatform/nodejs-samples-reviewers
 automl @GoogleCloudPlatform/dee-data-ai @GoogleCloudPlatform/nodejs-samples-reviewers
 cloud-language @GoogleCloudPlatform/dee-data-ai @GoogleCloudPlatform/nodejs-samples-reviewers
 contact-center-insights @GoogleCloudPlatform/dee-data-ai @GoogleCloudPlatform/nodejs-samples-reviewers

document-warehouse/create-document-schema.js

@@ -31,31 +31,38 @@ async function main(
   const {DocumentSchemaServiceClient} =
     require('@google-cloud/contentwarehouse').v1;
 
+  const apiEndpoint =
+    location === 'us'
+      ? 'contentwarehouse.googleapis.com'
+      : `${location}-contentwarehouse.googleapis.com`;
+
   // Create service client
-  const serviceClient = new DocumentSchemaServiceClient();
+  const serviceClient = new DocumentSchemaServiceClient({
+    apiEndpoint: apiEndpoint,
+  });
 
   // Create Document Schema
   async function createDocumentSchema() {
-    // Initialize request argument(s)
-    const request = {};
-
-    // Property Definition
-    const propertyDefinition = {};
-    propertyDefinition.name = 'testPropertyDefinitionName'; // Must be unique within a document schema (case insensitive)
-    propertyDefinition.displayName = 'searchable text';
-    propertyDefinition.isSearchable = true;
-    propertyDefinition.textTypeOptions = {};
-
-    // Document Schema
-    const documentSchema = {};
-    documentSchema.displayName = 'My Test Schema';
-    documentSchema.propertyDefinitions = [propertyDefinition];
-
-    request.documentSchema = documentSchema;
-
     // The full resource name of the location, e.g.:
     // projects/{project_number}/locations/{location}
-    request.parent = `projects/${projectNumber}/locations/${location}`;
+    const parent = `projects/${projectNumber}/locations/${location}`;
+    // Initialize request argument(s)
+    const request = {
+      parent: parent,
+      // Document Schema
+      documentSchema: {
+        displayName: 'My Test Schema',
+        // Property Definition
+        propertyDefinitions: [
+          {
+            name: 'testPropertyDefinitionName', // Must be unique within a document schema (case insensitive)
+            displayName: 'searchable text',
+            isSearchable: true,
+            textTypeOptions: {},
+          },
+        ],
+      },
+    };
 
     // Make Request
     const response = serviceClient.createDocumentSchema(request);

document-warehouse/delete-document-schema.js

@@ -34,8 +34,15 @@ async function main(
   const {DocumentSchemaServiceClient} =
     require('@google-cloud/contentwarehouse').v1;
 
+  const apiEndpoint =
+    location === 'us'
+      ? 'contentwarehouse.googleapis.com'
+      : `${location}-contentwarehouse.googleapis.com`;
+
   // Create service client
-  const serviceClient = new DocumentSchemaServiceClient();
+  const serviceClient = new DocumentSchemaServiceClient({
+    apiEndpoint: apiEndpoint,
+  });
 
   // Delete Document Schema
   async function deleteDocumentSchema() {

document-warehouse/fetch-acl.js

@@ -34,8 +34,13 @@ async function main(
   // Import from google cloud
   const {DocumentServiceClient} = require('@google-cloud/contentwarehouse').v1;
 
+  const apiEndpoint =
+    location === 'us'
+      ? 'contentwarehouse.googleapis.com'
+      : `${location}-contentwarehouse.googleapis.com`;
+
   // Create service client
-  const serviceClient = new DocumentServiceClient();
+  const serviceClient = new DocumentServiceClient({apiEndpoint: apiEndpoint});
 
   // Fetches access control policies on project or document level.
   async function fetchACL() {

document-warehouse/get-document-schema.js

@@ -32,8 +32,15 @@ async function main(
   const {DocumentSchemaServiceClient} =
     require('@google-cloud/contentwarehouse').v1;
 
+  const apiEndpoint =
+    location === 'us'
+      ? 'contentwarehouse.googleapis.com'
+      : `${location}-contentwarehouse.googleapis.com`;
+
   // Create service client
-  const serviceClient = new DocumentSchemaServiceClient();
+  const serviceClient = new DocumentSchemaServiceClient({
+    apiEndpoint: apiEndpoint,
+  });
 
   // Get Document Schema
   async function getDocumentSchema() {

document-warehouse/get-document.js

@@ -33,8 +33,15 @@ async function main(
   // Import from google cloud
   const {DocumentServiceClient} = require('@google-cloud/contentwarehouse').v1;
 
+  const apiEndpoint =
+    location === 'us'
+      ? 'contentwarehouse.googleapis.com'
+      : `${location}-contentwarehouse.googleapis.com`;
+
   // Create service client
-  const serviceClient = new DocumentServiceClient();
+  const serviceClient = new DocumentServiceClient({
+    apiEndpoint: apiEndpoint,
+  });
 
   // Get Document Schema
   async function getDocument() {

document-warehouse/quickstart.js

@@ -31,9 +31,16 @@ async function main(
   const {DocumentSchemaServiceClient, DocumentServiceClient} =
     require('@google-cloud/contentwarehouse').v1;
 
+  const apiEndpoint =
+    location === 'us'
+      ? 'contentwarehouse.googleapis.com'
+      : `${location}-contentwarehouse.googleapis.com`;
+
   // Create service client
-  const schemaClient = new DocumentSchemaServiceClient();
-  const serviceClient = new DocumentServiceClient();
+  const schemaClient = new DocumentSchemaServiceClient({
+    apiEndpoint: apiEndpoint,
+  });
+  const serviceClient = new DocumentServiceClient({apiEndpoint: apiEndpoint});
 
   // Get Document Schema
   async function quickstart() {

document-warehouse/search-document.js

@@ -32,8 +32,13 @@ async function main(
   // Import from google cloud
   const {DocumentServiceClient} = require('@google-cloud/contentwarehouse').v1;
 
+  const apiEndpoint =
+    location === 'us'
+      ? 'contentwarehouse.googleapis.com'
+      : `${location}-contentwarehouse.googleapis.com`;
+
   // Create service client
-  const serviceClient = new DocumentServiceClient();
+  const serviceClient = new DocumentServiceClient({apiEndpoint: apiEndpoint});
 
   // Get Document Schema
   async function searchDocuments() {

document-warehouse/set-acl.js

@@ -37,8 +37,13 @@ async function main(
   //Import service client from google cloud
   const {DocumentServiceClient} = require('@google-cloud/contentwarehouse').v1;
 
+  const apiEndpoint =
+    location === 'us'
+      ? 'contentwarehouse.googleapis.com'
+      : `${location}-contentwarehouse.googleapis.com`;
+
   // Create client
-  const serviceClient = new DocumentServiceClient();
+  const serviceClient = new DocumentServiceClient({apiEndpoint: apiEndpoint});
 
   // Set access control policies on project or document level.
   async function setACL() {

generative-ai/snippets/countTokens.js

@@ -0,0 +1,52 @@
+// Copyright 2023 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+const {VertexAI} = require('@google-cloud/vertexai');
+
+async function countTokens(
+  projectId = 'PROJECT_ID',
+  location = 'LOCATION_ID',
+  model = 'MODEL'
+) {
+  // [START aiplatform_gemini_token_count]
+
+  /**
+   * TODO(developer): Uncomment these variables before running the sample.
+   */
+  // const projectId = 'your-project-id';
+  // const location = 'us-central1';
+  // const model = 'chosen-genai-model';
+
+  // Initialize Vertex with your Cloud project and location
+  const vertex_ai = new VertexAI({project: projectId, location: location});
+
+  // Instantiate the model
+  const generativeModel = vertex_ai.preview.getGenerativeModel({
+    model: model,
+  });
+
+  const req = {
+    contents: [{role: 'user', parts: [{text: 'How are you doing today?'}]}],
+  };
+
+  const countTokensResp = await generativeModel.countTokens(req);
+  console.log('count tokens response: ', countTokensResp);
+
+  // [END aiplatform_gemini_token_count]
+}
+
+countTokens(...process.argv.slice(2)).catch(err => {
+  console.error(err.message);
+  process.exitCode = 1;
+});