Merge branch 'main' into tpu_ququed_resources_startup_script

Author: TetyanaYahodska

aiplatform/src/main/java/aiplatform/EmbeddingBatchSample.java

@@ -40,7 +40,7 @@ public static void main(String[] args) throws IOException, InterruptedException
     // Could be a BigQuery table or a Google Cloud Storage file.
     // E.g. "gs://[BUCKET]/[OUTPUT].jsonl" OR "bq://[PROJECT].[DATASET].[TABLE]"
     String outputUri = "gs://YOUR_BUCKET/embedding_batch_output";
-    String textEmbeddingModel = "textembedding-gecko@003";
+    String textEmbeddingModel = "text-embedding-005";
 
     embeddingBatchSample(project, location, inputUri, outputUri, textEmbeddingModel);
   }

aiplatform/src/main/java/aiplatform/EmbeddingModelTuningSample.java

@@ -84,7 +84,7 @@ public static PipelineJob createEmbeddingModelTuningPipelineJob(
     Matcher matcher = Pattern.compile("^(?<Location>\\w+-\\w+)").matcher(apiEndpoint);
     String location = matcher.matches() ? matcher.group("Location") : "us-central1";
     String templateUri =
-        "https://us-kfp.pkg.dev/ml-pipeline/llm-text-embedding/tune-text-embedding-model/v1.1.3";
+        "https://us-kfp.pkg.dev/ml-pipeline/llm-text-embedding/tune-text-embedding-model/v1.1.4";
     PipelineServiceSettings settings =
         PipelineServiceSettings.newBuilder().setEndpoint(apiEndpoint).build();
     try (PipelineServiceClient client = PipelineServiceClient.create(settings)) {

aiplatform/src/main/java/aiplatform/PredictTextEmbeddingsSample.java

@@ -41,7 +41,7 @@ public static void main(String[] args) throws IOException {
     // https://cloud.google.com/vertex-ai/docs/generative-ai/embeddings/get-text-embeddings
     String endpoint = "us-central1-aiplatform.googleapis.com:443";
     String project = "YOUR_PROJECT_ID";
-    String model = "text-embedding-004";
+    String model = "text-embedding-005";
     predictTextEmbeddings(
         endpoint,
         project,

aiplatform/src/main/java/aiplatform/PredictTextEmbeddingsSamplePreview.java

@@ -41,7 +41,7 @@ public static void main(String[] args) throws IOException {
     // https://cloud.google.com/vertex-ai/docs/generative-ai/embeddings/get-text-embeddings
     String endpoint = "us-central1-aiplatform.googleapis.com";
     String project = "YOUR_PROJECT_ID";
-    String model = "text-embedding-preview-0815";
+    String model = "text-embedding-005";
     // Calculate the embedding for a code retrieval query. Using 'CODE_RETRIEVAL_QUERY' for query.
     predictTextEmbeddings(
         endpoint,

aiplatform/src/test/java/aiplatform/EmbeddingBatchSampleTest.java

@@ -41,7 +41,7 @@ public class EmbeddingBatchSampleTest extends TestCase {
       "gs://cloud-samples-data/generative-ai/embeddings/embeddings_input.jsonl";
   private static final String GCS_OUTPUT_URI =
       String.format("gs://%s/embedding_batch_output", BUCKET_NAME);
-  private static final String MODEL_ID = "textembedding-gecko@003";
+  private static final String MODEL_ID = "text-embedding-005";
   static Storage storage;
   static Bucket bucket;
 

aiplatform/src/test/java/aiplatform/EmbeddingModelTuningSampleTest.java

@@ -53,7 +53,7 @@ public class EmbeddingModelTuningSampleTest {
 
   private static final String API_ENDPOINT = "us-central1-aiplatform.googleapis.com:443";
   private static final String PROJECT = System.getenv("UCAIP_PROJECT_ID");
-  private static final String BASE_MODEL_VERSION_ID = "text-embedding-004";
+  private static final String BASE_MODEL_VERSION_ID = "text-embedding-005";
   private static final String TASK_TYPE = "DEFAULT";
   private static final String JOB_DISPLAY_NAME = "embedding-customization-pipeline-sample";
   private static final String CORPUS = 

aiplatform/src/test/java/aiplatform/PredictTextEmbeddingsSampleTest.java

@@ -52,7 +52,7 @@ public void testPredictTextEmbeddings() throws IOException {
         PredictTextEmbeddingsSample.predictTextEmbeddings(
             APIS_ENDPOINT,
             PROJECT,
-            "text-embedding-004",
+            "text-embedding-005",
             texts,
             "QUESTION_ANSWERING",
             OptionalInt.of(5));
@@ -70,7 +70,7 @@ public void testPredictTextEmbeddingsPreview() throws IOException {
         PredictTextEmbeddingsSamplePreview.predictTextEmbeddings(
             APIS_ENDPOINT,
             PROJECT,
-            "text-embedding-preview-0815",
+            "text-embedding-005",
             texts,
             "CODE_RETRIEVAL_QUERY",
             OptionalInt.of(5));

cdn/signed-urls/src/main/java/com/google/cdn/SignedUrls.java

@@ -27,12 +27,10 @@
 import javax.crypto.Mac;
 import javax.crypto.spec.SecretKeySpec;
 
-/**
- * Samples to create a signed URL for a Cloud CDN endpoint
- */
+// [START cloudcdn_sign_url]
+/** Samples to create a signed URL for a Cloud CDN endpoint */
 public class SignedUrls {
 
-  // [START cloudcdn_sign_url]
   /**
    * Creates a signed URL for a Cloud CDN endpoint with the given key
    * URL must start with http:// or https://, and must contain a forward

compute/cloud-client/pom.xml

@@ -59,6 +59,13 @@
       <groupId>com.google.cloud</groupId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>5.13.0</version>
+      <scope>test</scope>
+    </dependency>
+
 
     <dependency>
       <artifactId>truth</artifactId>

compute/cloud-client/src/main/java/compute/reservation/CreateInstanceWithoutConsumingReservation.java

@@ -0,0 +1,122 @@
+/*
+ * 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
+ *
+ * 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.
+ */
+
+package compute.reservation;
+
+// [START compute_instance_not_consume_reservation]
+import static com.google.cloud.compute.v1.ReservationAffinity.ConsumeReservationType.NO_RESERVATION;
+
+import com.google.api.gax.longrunning.OperationFuture;
+import com.google.cloud.compute.v1.AttachedDisk;
+import com.google.cloud.compute.v1.AttachedDiskInitializeParams;
+import com.google.cloud.compute.v1.InsertInstanceRequest;
+import com.google.cloud.compute.v1.Instance;
+import com.google.cloud.compute.v1.InstancesClient;
+import com.google.cloud.compute.v1.NetworkInterface;
+import com.google.cloud.compute.v1.Operation;
+import com.google.cloud.compute.v1.ReservationAffinity;
+import java.io.IOException;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+public class CreateInstanceWithoutConsumingReservation {
+  public static void main(String[] args)
+      throws IOException, ExecutionException, InterruptedException, TimeoutException {
+    // TODO(developer): Replace these variables before running the sample.
+    // Project ID or project number of the Cloud project you want to use.
+    String projectId = "YOUR_PROJECT_ID";
+    // Name of the zone you want to use.
+    String zone = "us-central1-a";
+    // Name of the VM instance you want to query.
+    String instanceName = "YOUR_INSTANCE_NAME";
+    // machineType: machine type of the VM being created.
+    // *   This value uses the format zones/{zone}/machineTypes/{type_name}.
+    // *   For a list of machine types, see https://cloud.google.com/compute/docs/machine-types
+    String machineTypeName = "n1-standard-1";
+    // sourceImage: path to the operating system image to mount.
+    // *   For details about images you can mount, see https://cloud.google.com/compute/docs/images
+    String sourceImage = "projects/debian-cloud/global/images/family/debian-11";
+    // diskSizeGb: storage size of the boot disk to attach to the instance.
+    long diskSizeGb = 10L;
+    // networkName: network interface to associate with the instance.
+    String networkName = "default";
+
+    createInstanceWithoutConsumingReservationAsync(projectId, zone, instanceName,
+        machineTypeName, sourceImage, diskSizeGb, networkName);
+  }
+
+  // Create a virtual machine that explicitly doesn't consume reservations
+  public static Instance createInstanceWithoutConsumingReservationAsync(
+      String project, String zone, String instanceName,
+      String machineTypeName, String sourceImage, long diskSizeGb, String networkName)
+      throws IOException, InterruptedException, ExecutionException, TimeoutException {
+    String machineType = String.format("zones/%s/machineTypes/%s", zone, machineTypeName);
+
+    // Initialize client that will be used to send requests. This client only needs to be created
+    // once, and can be reused for multiple requests.
+    try (InstancesClient instancesClient = InstancesClient.create()) {
+      AttachedDisk disk =
+          AttachedDisk.newBuilder()
+              .setBoot(true)
+              .setAutoDelete(true)
+              .setType(AttachedDisk.Type.PERSISTENT.toString())
+              .setDeviceName("disk-1")
+              .setInitializeParams(
+                  AttachedDiskInitializeParams.newBuilder()
+                      .setSourceImage(sourceImage)
+                      .setDiskSizeGb(diskSizeGb)
+                      .build())
+              .build();
+
+      NetworkInterface networkInterface = NetworkInterface.newBuilder()
+          .setName(networkName)
+          .build();
+
+      ReservationAffinity reservationAffinity =
+          ReservationAffinity.newBuilder()
+              .setConsumeReservationType(NO_RESERVATION.toString())
+              .build();
+
+      Instance instanceResource =
+          Instance.newBuilder()
+              .setName(instanceName)
+              .setMachineType(machineType)
+              .addDisks(disk)
+              .addNetworkInterfaces(networkInterface)
+              .setReservationAffinity(reservationAffinity)
+              .build();
+
+      InsertInstanceRequest insertInstanceRequest = InsertInstanceRequest.newBuilder()
+          .setProject(project)
+          .setZone(zone)
+          .setInstanceResource(instanceResource)
+          .build();
+
+      OperationFuture<Operation, Operation> operation = instancesClient.insertAsync(
+          insertInstanceRequest);
+
+      // Wait for the operation to complete.
+      Operation response = operation.get(3, TimeUnit.MINUTES);
+
+      if (response.hasError()) {
+        return null;
+      }
+      return instancesClient.get(project, zone, instanceName);
+    }
+  }
+}
+// [END compute_instance_not_consume_reservation]