feat: Adding API v2 Bigquery export samples

.kokoro/tests/run_test_java.sh

@@ -45,11 +45,6 @@ if [[ (",$JAVA_VERSION," =~ "17" || ",$JAVA_VERSION," =~ "21")  && ( "$file" ==
     exit 0
 fi
 
-# TODO: Remove the check post Gemini launch.
-if [[ ( "$file" == *"vertexai/snippets"* ) ]]; then
-    echo -e "\n Skipping tests until API live.\n"
-    exit 0
-fi
 
 # Build and deploy Cloud Functions hello-world samples
 # (Some of these samples have E2E tests that use deployed functions.)

aiplatform/pom.xml

@@ -76,5 +76,18 @@
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-bigquery</artifactId>
     </dependency>
+    <!-- Used for retry logic in EmbeddingModelTuningSampleTest.java -->
+    <dependency>
+      <groupId>io.github.resilience4j</groupId>
+      <artifactId>resilience4j-core</artifactId>
+      <version>1.7.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.github.resilience4j</groupId>
+      <artifactId>resilience4j-retry</artifactId>
+      <version>1.7.1</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>

aiplatform/src/main/java/aiplatform/CreateBatchPredictionJobSample.java

@@ -91,7 +91,7 @@ static void createBatchPredictionJobSample(
       MachineSpec machineSpec =
           MachineSpec.newBuilder()
               .setMachineType("n1-standard-2")
-              .setAcceleratorType(AcceleratorType.NVIDIA_TESLA_K80)
+              .setAcceleratorType(AcceleratorType.NVIDIA_TESLA_T4)
               .setAcceleratorCount(1)
               .build();
       BatchDedicatedResources dedicatedResources =

aiplatform/src/main/java/aiplatform/CreateCustomJobSample.java

@@ -59,7 +59,7 @@ static void createCustomJobSample(String project, String displayName, String con
       MachineSpec machineSpec =
           MachineSpec.newBuilder()
               .setMachineType("n1-standard-4")
-              .setAcceleratorType(AcceleratorType.NVIDIA_TESLA_K80)
+              .setAcceleratorType(AcceleratorType.NVIDIA_TESLA_T4)
               .setAcceleratorCount(1)
               .build();
 

aiplatform/src/main/java/aiplatform/CreateFeaturestoreFixedNodesSample.java

@@ -26,14 +26,14 @@
 import com.google.api.gax.longrunning.OperationFuture;
 import com.google.api.gax.longrunning.OperationTimedPollAlgorithm;
 import com.google.api.gax.retrying.RetrySettings;
-import com.google.cloud.aiplatform.v1beta1.CreateFeaturestoreOperationMetadata;
-import com.google.cloud.aiplatform.v1beta1.CreateFeaturestoreRequest;
-import com.google.cloud.aiplatform.v1beta1.Featurestore;
-import com.google.cloud.aiplatform.v1beta1.Featurestore.OnlineServingConfig;
-import com.google.cloud.aiplatform.v1beta1.FeaturestoreServiceClient;
-import com.google.cloud.aiplatform.v1beta1.FeaturestoreServiceSettings;
-import com.google.cloud.aiplatform.v1beta1.LocationName;
-import com.google.cloud.aiplatform.v1beta1.stub.FeaturestoreServiceStubSettings;
+import com.google.cloud.aiplatform.v1.CreateFeaturestoreOperationMetadata;
+import com.google.cloud.aiplatform.v1.CreateFeaturestoreRequest;
+import com.google.cloud.aiplatform.v1.Featurestore;
+import com.google.cloud.aiplatform.v1.Featurestore.OnlineServingConfig;
+import com.google.cloud.aiplatform.v1.FeaturestoreServiceClient;
+import com.google.cloud.aiplatform.v1.FeaturestoreServiceSettings;
+import com.google.cloud.aiplatform.v1.LocationName;
+import com.google.cloud.aiplatform.v1.stub.FeaturestoreServiceStubSettings;
 import java.io.IOException;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;

aiplatform/src/main/java/aiplatform/CreateFeaturestoreSample.java

@@ -24,14 +24,14 @@
 // [START aiplatform_create_featurestore_sample]
 
 import com.google.api.gax.longrunning.OperationFuture;
-import com.google.cloud.aiplatform.v1beta1.CreateFeaturestoreOperationMetadata;
-import com.google.cloud.aiplatform.v1beta1.CreateFeaturestoreRequest;
-import com.google.cloud.aiplatform.v1beta1.Featurestore;
-import com.google.cloud.aiplatform.v1beta1.Featurestore.OnlineServingConfig;
-import com.google.cloud.aiplatform.v1beta1.Featurestore.OnlineServingConfig.Scaling;
-import com.google.cloud.aiplatform.v1beta1.FeaturestoreServiceClient;
-import com.google.cloud.aiplatform.v1beta1.FeaturestoreServiceSettings;
-import com.google.cloud.aiplatform.v1beta1.LocationName;
+import com.google.cloud.aiplatform.v1.CreateFeaturestoreOperationMetadata;
+import com.google.cloud.aiplatform.v1.CreateFeaturestoreRequest;
+import com.google.cloud.aiplatform.v1.Featurestore;
+import com.google.cloud.aiplatform.v1.Featurestore.OnlineServingConfig;
+import com.google.cloud.aiplatform.v1.Featurestore.OnlineServingConfig.Scaling;
+import com.google.cloud.aiplatform.v1.FeaturestoreServiceClient;
+import com.google.cloud.aiplatform.v1.FeaturestoreServiceSettings;
+import com.google.cloud.aiplatform.v1.LocationName;
 import java.io.IOException;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;

aiplatform/src/main/java/aiplatform/CreateHyperparameterTuningJobPythonPackageSample.java

@@ -127,7 +127,7 @@ static void createHyperparameterTuningJobPythonPackageSample(
       MachineSpec machineSpec =
           MachineSpec.newBuilder()
               .setMachineType("n1-standard-4")
-              .setAcceleratorType(AcceleratorType.NVIDIA_TESLA_K80)
+              .setAcceleratorType(AcceleratorType.NVIDIA_TESLA_T4)
               .setAcceleratorCount(1)
               .build();
 

aiplatform/src/main/java/aiplatform/CreateHyperparameterTuningJobSample.java

@@ -72,7 +72,7 @@ static void createHyperparameterTuningJobSample(
       MachineSpec machineSpec =
           MachineSpec.newBuilder()
               .setMachineType("n1-standard-4")
-              .setAcceleratorType(AcceleratorType.NVIDIA_TESLA_K80)
+              .setAcceleratorType(AcceleratorType.NVIDIA_TESLA_T4)
               .setAcceleratorCount(1)
               .build();
       ContainerSpec containerSpec =

aiplatform/src/main/java/aiplatform/CreatePipelineJobModelTuningSample.java

@@ -17,12 +17,12 @@
 package aiplatform;
 
 // [START aiplatform_sdk_tuning]
-import com.google.cloud.aiplatform.v1beta1.CreatePipelineJobRequest;
-import com.google.cloud.aiplatform.v1beta1.LocationName;
-import com.google.cloud.aiplatform.v1beta1.PipelineJob;
-import com.google.cloud.aiplatform.v1beta1.PipelineJob.RuntimeConfig;
-import com.google.cloud.aiplatform.v1beta1.PipelineServiceClient;
-import com.google.cloud.aiplatform.v1beta1.PipelineServiceSettings;
+import com.google.cloud.aiplatform.v1.CreatePipelineJobRequest;
+import com.google.cloud.aiplatform.v1.LocationName;
+import com.google.cloud.aiplatform.v1.PipelineJob;
+import com.google.cloud.aiplatform.v1.PipelineJob.RuntimeConfig;
+import com.google.cloud.aiplatform.v1.PipelineServiceClient;
+import com.google.cloud.aiplatform.v1.PipelineServiceSettings;
 import com.google.protobuf.Value;
 import java.io.IOException;
 import java.util.HashMap;

aiplatform/src/main/java/aiplatform/CreateTrainingPipelineImageObjectDetectionSample.java

@@ -35,8 +35,8 @@
 import com.google.cloud.aiplatform.v1.PredictSchemata;
 import com.google.cloud.aiplatform.v1.TimestampSplit;
 import com.google.cloud.aiplatform.v1.TrainingPipeline;
-import com.google.cloud.aiplatform.v1beta1.schema.trainingjob.definition.AutoMlImageObjectDetectionInputs;
-import com.google.cloud.aiplatform.v1beta1.schema.trainingjob.definition.AutoMlImageObjectDetectionInputs.ModelType;
+import com.google.cloud.aiplatform.v1.schema.trainingjob.definition.AutoMlImageObjectDetectionInputs;
+import com.google.cloud.aiplatform.v1.schema.trainingjob.definition.AutoMlImageObjectDetectionInputs.ModelType;
 import com.google.rpc.Status;
 import java.io.IOException;
 

aiplatform/src/main/java/aiplatform/CreateTrainingPipelineTabularRegressionSample.java

@@ -34,10 +34,10 @@
 import com.google.cloud.aiplatform.v1.PredictSchemata;
 import com.google.cloud.aiplatform.v1.TimestampSplit;
 import com.google.cloud.aiplatform.v1.TrainingPipeline;
-import com.google.cloud.aiplatform.v1beta1.schema.trainingjob.definition.AutoMlTablesInputs;
-import com.google.cloud.aiplatform.v1beta1.schema.trainingjob.definition.AutoMlTablesInputs.Transformation;
-import com.google.cloud.aiplatform.v1beta1.schema.trainingjob.definition.AutoMlTablesInputs.Transformation.AutoTransformation;
-import com.google.cloud.aiplatform.v1beta1.schema.trainingjob.definition.AutoMlTablesInputs.Transformation.TimestampTransformation;
+import com.google.cloud.aiplatform.v1.schema.trainingjob.definition.AutoMlTablesInputs;
+import com.google.cloud.aiplatform.v1.schema.trainingjob.definition.AutoMlTablesInputs.Transformation;
+import com.google.cloud.aiplatform.v1.schema.trainingjob.definition.AutoMlTablesInputs.Transformation.AutoTransformation;
+import com.google.cloud.aiplatform.v1.schema.trainingjob.definition.AutoMlTablesInputs.Transformation.TimestampTransformation;
 import com.google.rpc.Status;
 import java.io.IOException;
 import java.util.ArrayList;

aiplatform/src/main/java/aiplatform/CreateTrainingPipelineTextClassificationSample.java

@@ -35,7 +35,7 @@
 import com.google.cloud.aiplatform.v1.PredictSchemata;
 import com.google.cloud.aiplatform.v1.TimestampSplit;
 import com.google.cloud.aiplatform.v1.TrainingPipeline;
-import com.google.cloud.aiplatform.v1beta1.schema.trainingjob.definition.AutoMlTextClassificationInputs;
+import com.google.cloud.aiplatform.v1.schema.trainingjob.definition.AutoMlTextClassificationInputs;
 import com.google.rpc.Status;
 import java.io.IOException;
 

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

@@ -0,0 +1,133 @@
+/*
+ * 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 aiplatform;
+
+// [START aiplatform_sdk_embedding_model_tuning]
+import com.google.cloud.aiplatform.v1.CreatePipelineJobRequest;
+import com.google.cloud.aiplatform.v1.LocationName;
+import com.google.cloud.aiplatform.v1.PipelineJob;
+import com.google.cloud.aiplatform.v1.PipelineJob.RuntimeConfig;
+import com.google.cloud.aiplatform.v1.PipelineServiceClient;
+import com.google.cloud.aiplatform.v1.PipelineServiceSettings;
+import com.google.protobuf.Value;
+import java.io.IOException;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class EmbeddingModelTuningSample {
+  public static void main(String[] args) throws IOException {
+    // TODO(developer): Replace these variables before running this sample.
+    String apiEndpoint = "us-central1-aiplatform.googleapis.com:443";
+    String project = "PROJECT";
+    String baseModelVersionId = "BASE_MODEL_VERSION_ID";
+    String taskType = "DEFAULT";
+    String pipelineJobDisplayName = "PIPELINE_JOB_DISPLAY_NAME";
+    String outputDir = "OUTPUT_DIR";
+    String queriesPath = "QUERIES_PATH";
+    String corpusPath = "CORPUS_PATH";
+    String trainLabelPath = "TRAIN_LABEL_PATH";
+    String testLabelPath = "TEST_LABEL_PATH";
+    double learningRateMultiplier = 1.0;
+    int outputDimensionality = 768;
+    int batchSize = 128;
+    int trainSteps = 1000;
+
+    createEmbeddingModelTuningPipelineJob(
+        apiEndpoint,
+        project,
+        baseModelVersionId,
+        taskType,
+        pipelineJobDisplayName,
+        outputDir,
+        queriesPath,
+        corpusPath,
+        trainLabelPath,
+        testLabelPath,
+        learningRateMultiplier,
+        outputDimensionality,
+        batchSize,
+        trainSteps);
+  }
+
+  public static PipelineJob createEmbeddingModelTuningPipelineJob(
+      String apiEndpoint,
+      String project,
+      String baseModelVersionId,
+      String taskType,
+      String pipelineJobDisplayName,
+      String outputDir,
+      String queriesPath,
+      String corpusPath,
+      String trainLabelPath,
+      String testLabelPath,
+      double learningRateMultiplier,
+      int outputDimensionality,
+      int batchSize,
+      int trainSteps)
+      throws IOException {
+    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";
+    PipelineServiceSettings settings =
+        PipelineServiceSettings.newBuilder().setEndpoint(apiEndpoint).build();
+    try (PipelineServiceClient client = PipelineServiceClient.create(settings)) {
+      Map<String, Value> parameterValues =
+          Map.of(
+              "base_model_version_id", valueOf(baseModelVersionId),
+              "task_type", valueOf(taskType),
+              "queries_path", valueOf(queriesPath),
+              "corpus_path", valueOf(corpusPath),
+              "train_label_path", valueOf(trainLabelPath),
+              "test_label_path", valueOf(testLabelPath),
+              "learning_rate_multiplier", valueOf(learningRateMultiplier),
+              "output_dimensionality", valueOf(outputDimensionality),
+              "batch_size", valueOf(batchSize),
+              "train_steps", valueOf(trainSteps));
+      PipelineJob pipelineJob =
+          PipelineJob.newBuilder()
+              .setTemplateUri(templateUri)
+              .setDisplayName(pipelineJobDisplayName)
+              .setRuntimeConfig(
+                  RuntimeConfig.newBuilder()
+                      .setGcsOutputDirectory(outputDir)
+                      .putAllParameterValues(parameterValues)
+                      .build())
+              .build();
+      CreatePipelineJobRequest request =
+          CreatePipelineJobRequest.newBuilder()
+              .setParent(LocationName.of(project, location).toString())
+              .setPipelineJob(pipelineJob)
+              .build();
+      return client.createPipelineJob(request);
+    }
+  }
+
+  private static Value valueOf(String s) {
+    return Value.newBuilder().setStringValue(s).build();
+  }
+
+  private static Value valueOf(int n) {
+    return Value.newBuilder().setNumberValue(n).build();
+  }
+
+  private static Value valueOf(double n) {
+    return Value.newBuilder().setNumberValue(n).build();
+  }
+}
+// [END aiplatform_sdk_embedding_model_tuning]

aiplatform/src/main/java/aiplatform/GetFeaturestoreSample.java

@@ -23,11 +23,11 @@
 
 // [START aiplatform_get_featurestore_sample]
 
-import com.google.cloud.aiplatform.v1beta1.Featurestore;
-import com.google.cloud.aiplatform.v1beta1.FeaturestoreName;
-import com.google.cloud.aiplatform.v1beta1.FeaturestoreServiceClient;
-import com.google.cloud.aiplatform.v1beta1.FeaturestoreServiceSettings;
-import com.google.cloud.aiplatform.v1beta1.GetFeaturestoreRequest;
+import com.google.cloud.aiplatform.v1.Featurestore;
+import com.google.cloud.aiplatform.v1.FeaturestoreName;
+import com.google.cloud.aiplatform.v1.FeaturestoreServiceClient;
+import com.google.cloud.aiplatform.v1.FeaturestoreServiceSettings;
+import com.google.cloud.aiplatform.v1.GetFeaturestoreRequest;
 import java.io.IOException;
 
 public class GetFeaturestoreSample {

aiplatform/src/main/java/aiplatform/ListTunedModelsSample.java

@@ -23,12 +23,12 @@
 
 // [START aiplatform_sdk_list_tuned_models]
 
-import com.google.cloud.aiplatform.v1beta1.ListModelsRequest;
-import com.google.cloud.aiplatform.v1beta1.LocationName;
-import com.google.cloud.aiplatform.v1beta1.Model;
-import com.google.cloud.aiplatform.v1beta1.ModelServiceClient;
-import com.google.cloud.aiplatform.v1beta1.ModelServiceClient.ListModelsPagedResponse;
-import com.google.cloud.aiplatform.v1beta1.ModelServiceSettings;
+import com.google.cloud.aiplatform.v1.ListModelsRequest;
+import com.google.cloud.aiplatform.v1.LocationName;
+import com.google.cloud.aiplatform.v1.Model;
+import com.google.cloud.aiplatform.v1.ModelServiceClient;
+import com.google.cloud.aiplatform.v1.ModelServiceClient.ListModelsPagedResponse;
+import com.google.cloud.aiplatform.v1.ModelServiceSettings;
 import java.io.IOException;
 
 public class ListTunedModelsSample {

aiplatform/src/main/java/aiplatform/PredictCodeChatSample.java

@@ -18,10 +18,10 @@
 
 // [START aiplatform_sdk_code_chat]
 
-import com.google.cloud.aiplatform.v1beta1.EndpointName;
-import com.google.cloud.aiplatform.v1beta1.PredictResponse;
-import com.google.cloud.aiplatform.v1beta1.PredictionServiceClient;
-import com.google.cloud.aiplatform.v1beta1.PredictionServiceSettings;
+import com.google.cloud.aiplatform.v1.EndpointName;
+import com.google.cloud.aiplatform.v1.PredictResponse;
+import com.google.cloud.aiplatform.v1.PredictionServiceClient;
+import com.google.cloud.aiplatform.v1.PredictionServiceSettings;
 import com.google.protobuf.InvalidProtocolBufferException;
 import com.google.protobuf.Value;
 import com.google.protobuf.util.JsonFormat;

aiplatform/src/main/java/aiplatform/PredictCodeCompletionCommentSample.java

@@ -18,10 +18,10 @@
 
 // [START aiplatform_sdk_code_completion_comment]
 
-import com.google.cloud.aiplatform.v1beta1.EndpointName;
-import com.google.cloud.aiplatform.v1beta1.PredictResponse;
-import com.google.cloud.aiplatform.v1beta1.PredictionServiceClient;
-import com.google.cloud.aiplatform.v1beta1.PredictionServiceSettings;
+import com.google.cloud.aiplatform.v1.EndpointName;
+import com.google.cloud.aiplatform.v1.PredictResponse;
+import com.google.cloud.aiplatform.v1.PredictionServiceClient;
+import com.google.cloud.aiplatform.v1.PredictionServiceSettings;
 import com.google.protobuf.InvalidProtocolBufferException;
 import com.google.protobuf.Value;
 import com.google.protobuf.util.JsonFormat;

aiplatform/src/main/java/aiplatform/PredictCodeCompletionTestFunctionSample.java

@@ -18,10 +18,10 @@
 
 // [START aiplatform_sdk_code_completion_test_function]
 
-import com.google.cloud.aiplatform.v1beta1.EndpointName;
-import com.google.cloud.aiplatform.v1beta1.PredictResponse;
-import com.google.cloud.aiplatform.v1beta1.PredictionServiceClient;
-import com.google.cloud.aiplatform.v1beta1.PredictionServiceSettings;
+import com.google.cloud.aiplatform.v1.EndpointName;
+import com.google.cloud.aiplatform.v1.PredictResponse;
+import com.google.cloud.aiplatform.v1.PredictionServiceClient;
+import com.google.cloud.aiplatform.v1.PredictionServiceSettings;
 import com.google.protobuf.InvalidProtocolBufferException;
 import com.google.protobuf.Value;
 import com.google.protobuf.util.JsonFormat;

aiplatform/src/main/java/aiplatform/PredictCodeGenerationFunctionSample.java

@@ -18,10 +18,10 @@
 
 // [START aiplatform_sdk_code_generation_function]
 
-import com.google.cloud.aiplatform.v1beta1.EndpointName;
-import com.google.cloud.aiplatform.v1beta1.PredictResponse;
-import com.google.cloud.aiplatform.v1beta1.PredictionServiceClient;
-import com.google.cloud.aiplatform.v1beta1.PredictionServiceSettings;
+import com.google.cloud.aiplatform.v1.EndpointName;
+import com.google.cloud.aiplatform.v1.PredictResponse;
+import com.google.cloud.aiplatform.v1.PredictionServiceClient;
+import com.google.cloud.aiplatform.v1.PredictionServiceSettings;
 import com.google.protobuf.InvalidProtocolBufferException;
 import com.google.protobuf.Value;
 import com.google.protobuf.util.JsonFormat;