Merge branch 'main' into tpu_queued_resources_startup_script

Author: iennae

.github/blunderbuss.yml

@@ -26,7 +26,7 @@ assign_issues_by:
 - labels:
   - 'api: cloudsql'
   to:
-  - GoogleCloudPlatform/infra-db-sdk
+  - GoogleCloudPlatform/cloud-sql-connectors
 - labels:
   - 'api: dlp'
   to:
@@ -55,7 +55,7 @@ assign_prs_by:
 - labels:
   - 'api: cloudsql'
   to:
-  - GoogleCloudPlatform/infra-db-sdk
+  - GoogleCloudPlatform/cloud-sql-connectors
 - labels:
   - 'api: dlp'
   to:

.github/cloud-samples-tools/cmd/main.go

@@ -72,9 +72,11 @@ func affectedCmd(configFile string, diffsFile string) {
 	if err != nil {
 		log.Fatalln("❌ error getting the diffs: ", diffsFile, "\n", err)
 	}
-	diffs := strings.Split(string(diffsBytes), "\n")
+	// Trim whitespace to remove extra newline from diff output.
+	diffs := strings.Split(strings.TrimSpace(string(diffsBytes)), "\n")
 
-	packages, err := config.Affected(diffs)
+	// Log to stderr since GitHub Actions expects the output on stdout.
+	packages, err := config.Affected(os.Stderr, diffs)
 	if err != nil {
 		log.Fatalln("❌ error finding the affected packages.\n", err)
 	}

.github/cloud-samples-tools/pkg/config/config.go

@@ -19,6 +19,8 @@ package config
 import (
 	"encoding/json"
 	"errors"
+	"fmt"
+	"io"
 	"io/fs"
 	"os"
 	"path/filepath"
@@ -154,8 +156,8 @@ func (c *Config) FindAllPackages(root string) ([]string, error) {
 // Affected returns the packages that have been affected from diffs.
 // If there are diffs on at leat one global file affecting all packages,
 // then this returns all packages matched by the config.
-func (c *Config) Affected(diffs []string) ([]string, error) {
-	changed := c.Changed(diffs)
+func (c *Config) Affected(log io.Writer, diffs []string) ([]string, error) {
+	changed := c.Changed(log, diffs)
 	if slices.Contains(changed, ".") {
 		return c.FindAllPackages(".")
 	}
@@ -165,16 +167,13 @@ func (c *Config) Affected(diffs []string) ([]string, error) {
 // Changed returns the packages that have changed.
 // It only returns packages that are matched by the config,
 // and are not excluded by the config.
-func (c *Config) Changed(diffs []string) []string {
+func (c *Config) Changed(log io.Writer, diffs []string) []string {
 	changedUnique := make(map[string]bool)
 	for _, diff := range diffs {
 		if !c.Matches(diff) {
 			continue
 		}
 		pkg := c.FindPackage(diff)
-		if slices.Contains(c.ExcludePackages, pkg) {
-			continue
-		}
 		changedUnique[pkg] = true
 	}
 
@@ -184,6 +183,10 @@ func (c *Config) Changed(diffs []string) []string {
 
 	changed := make([]string, 0, len(changedUnique))
 	for pkg := range changedUnique {
+		if slices.Contains(c.ExcludePackages, pkg) {
+			fmt.Fprintf(log, "ℹ️ Excluded package %q, skipping.\n", pkg)
+			continue
+		}
 		changed = append(changed, pkg)
 	}
 	return changed

.github/cloud-samples-tools/pkg/config/config_test.go

@@ -167,30 +167,35 @@ func TestFindPackage(t *testing.T) {
 
 func TestChanged(t *testing.T) {
 	config := c.Config{
-		PackageFile: []string{"package.json"},
-		Match:       []string{"*"},
+		PackageFile:     []string{"package.json"},
+		Match:           []string{"*"},
+		ExcludePackages: []string{filepath.Join("testdata", "excluded")},
 	}
 
 	tests := []struct {
 		diffs    []string
 		expected []string
 	}{
-		{
+		{ // Global change, everything is affected.
 			diffs:    []string{filepath.Join("testdata", "file.txt")},
 			expected: []string{"."},
 		},
-		{
+		{ // Single affected package.
 			diffs:    []string{filepath.Join("testdata", "my-package", "file.txt")},
 			expected: []string{filepath.Join("testdata", "my-package")},
 		},
-		{
+		{ // Single affected nested package.
 			diffs:    []string{filepath.Join("testdata", "my-package", "subpackage", "file.txt")},
 			expected: []string{filepath.Join("testdata", "my-package", "subpackage")},
 		},
+		{ // Excluded package.
+			diffs:    []string{filepath.Join("testdata", "excluded", "file.txt")},
+			expected: []string{},
+		},
 	}
 
 	for _, test := range tests {
-		got := config.Changed(test.diffs)
+		got := config.Changed(os.Stderr, test.diffs)
 		if !reflect.DeepEqual(test.expected, got) {
 			t.Fatal("expected equal\n", test.expected, got)
 		}

.github/cloud-samples-tools/pkg/config/testdata/excluded/package.json

@@ -78,10 +78,8 @@
   "media/transcoder",
   "media/video-stitcher",
   "mediatranslation",
-  "monitoring/opencensus",
   "monitoring/prometheus",
   "monitoring/snippets",
-  "opencensus",
   "retail",
   "run/filesystem",
   "scheduler",

.github/workflows/monitoring-opencensus.yaml

@@ -29,13 +29,12 @@ tpu @GoogleCloudPlatform/dee-infra @GoogleCloudPlatform/nodejs-samples-reviewers
 webrisk @GoogleCloudPlatform/dee-infra @GoogleCloudPlatform/nodejs-samples-reviewers @GoogleCloudPlatform/cloud-samples-reviewers
 
 # SoDa teams
-cloud-sql @GoogleCloudPlatform/infra-db-sdk @GoogleCloudPlatform/nodejs-samples-reviewers @GoogleCloudPlatform/cloud-samples-reviewers
+cloud-sql @GoogleCloudPlatform/cloud-sql-connectors @GoogleCloudPlatform/nodejs-samples-reviewers @GoogleCloudPlatform/cloud-samples-reviewers
 datastore @GoogleCloudPlatform/cloud-native-db-dpes @GoogleCloudPlatform/nodejs-samples-reviewers @GoogleCloudPlatform/cloud-samples-reviewers
 storagetransfer @GoogleCloudPlatform/cloud-storage-dpes @GoogleCloudPlatform/nodejs-samples-reviewers @GoogleCloudPlatform/cloud-samples-reviewers
 
 # One-offs
 composer @GoogleCloudPlatform/cloud-dpes-composer @GoogleCloudPlatform/nodejs-samples-reviewers @GoogleCloudPlatform/cloud-samples-reviewers
-monitoring/opencensus @GoogleCloudPlatform/nodejs-samples-reviewers @GoogleCloudPlatform/cloud-samples-reviewers
 
 # Data & AI
 document-ai @GoogleCloudPlatform/nodejs-samples-reviewers @GoogleCloudPlatform/document-ai-samples-contributors @GoogleCloudPlatform/cloud-samples-reviewers

.github/workflows/opencensus.yaml

@@ -0,0 +1,105 @@
+/*
+ * Copyright 2024 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.
+ */
+
+'use strict';
+
+async function main(projectId, inputUri, outputUri, jobName) {
+  // [START generativeaionvertexai_embedding_batch]
+  // Imports the aiplatform library
+  const aiplatformLib = require('@google-cloud/aiplatform');
+  const aiplatform = aiplatformLib.protos.google.cloud.aiplatform.v1;
+
+  /**
+   * TODO(developer):  Uncomment/update these variables before running the sample.
+   */
+  // projectId = 'YOUR_PROJECT_ID';
+
+  // Optional: URI of the input dataset.
+  // Could be a BigQuery table or a Google Cloud Storage file.
+  // E.g. "gs://[BUCKET]/[DATASET].jsonl" OR "bq://[PROJECT].[DATASET].[TABLE]"
+  // inputUri =
+  //   'gs://cloud-samples-data/generative-ai/embeddings/embeddings_input.jsonl';
+
+  // Optional: URI where the output will be stored.
+  // Could be a BigQuery table or a Google Cloud Storage file.
+  // E.g. "gs://[BUCKET]/[OUTPUT].jsonl" OR "bq://[PROJECT].[DATASET].[TABLE]"
+  // outputUri = 'gs://your_bucket/embedding_batch_output';
+
+  // The name of the job
+  // jobName = `Batch embedding job: ${new Date().getMilliseconds()}`;
+
+  const textEmbeddingModel = 'text-embedding-005';
+  const location = 'us-central1';
+
+  // Configure the parent resource
+  const parent = `projects/${projectId}/locations/${location}`;
+  const modelName = `projects/${projectId}/locations/${location}/publishers/google/models/${textEmbeddingModel}`;
+
+  // Specifies the location of the api endpoint
+  const clientOptions = {
+    apiEndpoint: `${location}-aiplatform.googleapis.com`,
+  };
+
+  // Instantiates a client
+  const jobServiceClient = new aiplatformLib.JobServiceClient(clientOptions);
+
+  // Generates embeddings from text using batch processing.
+  // Read more: https://cloud.google.com/vertex-ai/generative-ai/docs/embeddings/batch-prediction-genai-embeddings
+  async function callBatchEmbedding() {
+    const gcsSource = new aiplatform.GcsSource({
+      uris: [inputUri],
+    });
+
+    const inputConfig = new aiplatform.BatchPredictionJob.InputConfig({
+      gcsSource,
+      instancesFormat: 'jsonl',
+    });
+
+    const gcsDestination = new aiplatform.GcsDestination({
+      outputUriPrefix: outputUri,
+    });
+
+    const outputConfig = new aiplatform.BatchPredictionJob.OutputConfig({
+      gcsDestination,
+      predictionsFormat: 'jsonl',
+    });
+
+    const batchPredictionJob = new aiplatform.BatchPredictionJob({
+      displayName: jobName,
+      model: modelName,
+      inputConfig,
+      outputConfig,
+    });
+
+    const request = {
+      parent,
+      batchPredictionJob,
+    };
+
+    // Create batch prediction job request
+    const [response] = await jobServiceClient.createBatchPredictionJob(request);
+
+    console.log('Raw response: ', JSON.stringify(response, null, 2));
+  }
+
+  await callBatchEmbedding();
+  // [END generativeaionvertexai_embedding_batch]
+}
+
+main(...process.argv.slice(2)).catch(err => {
+  console.error(err.message);
+  process.exitCode = 1;
+});