samples: updates samples to v1 (2 of 8) (#212)

telpirion · web-flow · commit 70ecdfd5e8be · 2021-04-19T14:20:53.000-07:00
* samples: datasets

* samples: updates samples to v1 (2 of 10)
diff --git a/aiplatform/snippets/src/main/java/aiplatform/CreateDatasetImageSample.java b/aiplatform/snippets/src/main/java/aiplatform/CreateDatasetImageSample.java
@@ -19,11 +19,11 @@
 // [START aiplatform_create_dataset_image_sample]
 
 import com.google.api.gax.longrunning.OperationFuture;
-import com.google.cloud.aiplatform.v1beta1.CreateDatasetOperationMetadata;
-import com.google.cloud.aiplatform.v1beta1.Dataset;
-import com.google.cloud.aiplatform.v1beta1.DatasetServiceClient;
-import com.google.cloud.aiplatform.v1beta1.DatasetServiceSettings;
-import com.google.cloud.aiplatform.v1beta1.LocationName;
+import com.google.cloud.aiplatform.v1.CreateDatasetOperationMetadata;
+import com.google.cloud.aiplatform.v1.Dataset;
+import com.google.cloud.aiplatform.v1.DatasetServiceClient;
+import com.google.cloud.aiplatform.v1.DatasetServiceSettings;
+import com.google.cloud.aiplatform.v1.LocationName;
 import java.io.IOException;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
diff --git a/aiplatform/snippets/src/main/java/aiplatform/CreateDatasetSample.java b/aiplatform/snippets/src/main/java/aiplatform/CreateDatasetSample.java
@@ -19,11 +19,11 @@
 // [START aiplatform_create_dataset_sample]
 
 import com.google.api.gax.longrunning.OperationFuture;
-import com.google.cloud.aiplatform.v1beta1.CreateDatasetOperationMetadata;
-import com.google.cloud.aiplatform.v1beta1.Dataset;
-import com.google.cloud.aiplatform.v1beta1.DatasetServiceClient;
-import com.google.cloud.aiplatform.v1beta1.DatasetServiceSettings;
-import com.google.cloud.aiplatform.v1beta1.LocationName;
+import com.google.cloud.aiplatform.v1.CreateDatasetOperationMetadata;
+import com.google.cloud.aiplatform.v1.Dataset;
+import com.google.cloud.aiplatform.v1.DatasetServiceClient;
+import com.google.cloud.aiplatform.v1.DatasetServiceSettings;
+import com.google.cloud.aiplatform.v1.LocationName;
 import java.io.IOException;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
diff --git a/aiplatform/snippets/src/main/java/aiplatform/CreateDatasetTabularBigquerySample.java b/aiplatform/snippets/src/main/java/aiplatform/CreateDatasetTabularBigquerySample.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2021 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,11 +19,11 @@
 // [START aiplatform_create_dataset_tabular_bigquery_sample]
 
 import com.google.api.gax.longrunning.OperationFuture;
-import com.google.cloud.aiplatform.v1beta1.CreateDatasetOperationMetadata;
-import com.google.cloud.aiplatform.v1beta1.Dataset;
-import com.google.cloud.aiplatform.v1beta1.DatasetServiceClient;
-import com.google.cloud.aiplatform.v1beta1.DatasetServiceSettings;
-import com.google.cloud.aiplatform.v1beta1.LocationName;
+import com.google.cloud.aiplatform.v1.CreateDatasetOperationMetadata;
+import com.google.cloud.aiplatform.v1.Dataset;
+import com.google.cloud.aiplatform.v1.DatasetServiceClient;
+import com.google.cloud.aiplatform.v1.DatasetServiceSettings;
+import com.google.cloud.aiplatform.v1.LocationName;
 import com.google.protobuf.Value;
 import com.google.protobuf.util.JsonFormat;
 import java.io.IOException;
diff --git a/aiplatform/snippets/src/main/java/aiplatform/CreateDatasetTabularGcsSample.java b/aiplatform/snippets/src/main/java/aiplatform/CreateDatasetTabularGcsSample.java
@@ -19,11 +19,11 @@
 // [START aiplatform_create_dataset_tabular_gcs_sample]
 
 import com.google.api.gax.longrunning.OperationFuture;
-import com.google.cloud.aiplatform.v1beta1.CreateDatasetOperationMetadata;
-import com.google.cloud.aiplatform.v1beta1.Dataset;
-import com.google.cloud.aiplatform.v1beta1.DatasetServiceClient;
-import com.google.cloud.aiplatform.v1beta1.DatasetServiceSettings;
-import com.google.cloud.aiplatform.v1beta1.LocationName;
+import com.google.cloud.aiplatform.v1.CreateDatasetOperationMetadata;
+import com.google.cloud.aiplatform.v1.Dataset;
+import com.google.cloud.aiplatform.v1.DatasetServiceClient;
+import com.google.cloud.aiplatform.v1.DatasetServiceSettings;
+import com.google.cloud.aiplatform.v1.LocationName;
 import com.google.protobuf.Value;
 import com.google.protobuf.util.JsonFormat;
 import java.io.IOException;
diff --git a/aiplatform/snippets/src/main/java/aiplatform/CreateDatasetTextSample.java b/aiplatform/snippets/src/main/java/aiplatform/CreateDatasetTextSample.java
@@ -19,11 +19,11 @@
 // [START aiplatform_create_dataset_text_sample]
 
 import com.google.api.gax.longrunning.OperationFuture;
-import com.google.cloud.aiplatform.v1beta1.CreateDatasetOperationMetadata;
-import com.google.cloud.aiplatform.v1beta1.Dataset;
-import com.google.cloud.aiplatform.v1beta1.DatasetServiceClient;
-import com.google.cloud.aiplatform.v1beta1.DatasetServiceSettings;
-import com.google.cloud.aiplatform.v1beta1.LocationName;
+import com.google.cloud.aiplatform.v1.CreateDatasetOperationMetadata;
+import com.google.cloud.aiplatform.v1.Dataset;
+import com.google.cloud.aiplatform.v1.DatasetServiceClient;
+import com.google.cloud.aiplatform.v1.DatasetServiceSettings;
+import com.google.cloud.aiplatform.v1.LocationName;
 import java.io.IOException;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
diff --git a/aiplatform/snippets/src/main/java/aiplatform/CreateDatasetVideoSample.java b/aiplatform/snippets/src/main/java/aiplatform/CreateDatasetVideoSample.java
@@ -19,11 +19,11 @@
 // [START aiplatform_create_dataset_video_sample]
 
 import com.google.api.gax.longrunning.OperationFuture;
-import com.google.cloud.aiplatform.v1beta1.CreateDatasetOperationMetadata;
-import com.google.cloud.aiplatform.v1beta1.Dataset;
-import com.google.cloud.aiplatform.v1beta1.DatasetServiceClient;
-import com.google.cloud.aiplatform.v1beta1.DatasetServiceSettings;
-import com.google.cloud.aiplatform.v1beta1.LocationName;
+import com.google.cloud.aiplatform.v1.CreateDatasetOperationMetadata;
+import com.google.cloud.aiplatform.v1.Dataset;
+import com.google.cloud.aiplatform.v1.DatasetServiceClient;
+import com.google.cloud.aiplatform.v1.DatasetServiceSettings;
+import com.google.cloud.aiplatform.v1.LocationName;
 import java.io.IOException;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
diff --git a/aiplatform/snippets/src/main/java/aiplatform/CreateEndpointSample.java b/aiplatform/snippets/src/main/java/aiplatform/CreateEndpointSample.java
@@ -19,11 +19,11 @@
 // [START aiplatform_create_endpoint_sample]
 
 import com.google.api.gax.longrunning.OperationFuture;
-import com.google.cloud.aiplatform.v1beta1.CreateEndpointOperationMetadata;
-import com.google.cloud.aiplatform.v1beta1.Endpoint;
-import com.google.cloud.aiplatform.v1beta1.EndpointServiceClient;
-import com.google.cloud.aiplatform.v1beta1.EndpointServiceSettings;
-import com.google.cloud.aiplatform.v1beta1.LocationName;
+import com.google.cloud.aiplatform.v1.CreateEndpointOperationMetadata;
+import com.google.cloud.aiplatform.v1.Endpoint;
+import com.google.cloud.aiplatform.v1.EndpointServiceClient;
+import com.google.cloud.aiplatform.v1.EndpointServiceSettings;
+import com.google.cloud.aiplatform.v1.LocationName;
 import java.io.IOException;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
diff --git a/aiplatform/snippets/src/main/java/aiplatform/CreateHyperparameterTuningJobPythonPackageSample.java b/aiplatform/snippets/src/main/java/aiplatform/CreateHyperparameterTuningJobPythonPackageSample.java
@@ -17,24 +17,24 @@
 package aiplatform;
 
 // [START aiplatform_create_hyperparameter_tuning_job_python_package_sample]
-import com.google.cloud.aiplatform.v1beta1.AcceleratorType;
-import com.google.cloud.aiplatform.v1beta1.CustomJobSpec;
-import com.google.cloud.aiplatform.v1beta1.HyperparameterTuningJob;
-import com.google.cloud.aiplatform.v1beta1.JobServiceClient;
-import com.google.cloud.aiplatform.v1beta1.JobServiceSettings;
-import com.google.cloud.aiplatform.v1beta1.LocationName;
-import com.google.cloud.aiplatform.v1beta1.MachineSpec;
-import com.google.cloud.aiplatform.v1beta1.PythonPackageSpec;
-import com.google.cloud.aiplatform.v1beta1.StudySpec;
-import com.google.cloud.aiplatform.v1beta1.StudySpec.MetricSpec;
-import com.google.cloud.aiplatform.v1beta1.StudySpec.MetricSpec.GoalType;
-import com.google.cloud.aiplatform.v1beta1.StudySpec.ParameterSpec;
-import com.google.cloud.aiplatform.v1beta1.StudySpec.ParameterSpec.ConditionalParameterSpec;
-import com.google.cloud.aiplatform.v1beta1.StudySpec.ParameterSpec.ConditionalParameterSpec.DiscreteValueCondition;
-import com.google.cloud.aiplatform.v1beta1.StudySpec.ParameterSpec.DiscreteValueSpec;
-import com.google.cloud.aiplatform.v1beta1.StudySpec.ParameterSpec.DoubleValueSpec;
-import com.google.cloud.aiplatform.v1beta1.StudySpec.ParameterSpec.ScaleType;
-import com.google.cloud.aiplatform.v1beta1.WorkerPoolSpec;
+import com.google.cloud.aiplatform.v1.AcceleratorType;
+import com.google.cloud.aiplatform.v1.CustomJobSpec;
+import com.google.cloud.aiplatform.v1.HyperparameterTuningJob;
+import com.google.cloud.aiplatform.v1.JobServiceClient;
+import com.google.cloud.aiplatform.v1.JobServiceSettings;
+import com.google.cloud.aiplatform.v1.LocationName;
+import com.google.cloud.aiplatform.v1.MachineSpec;
+import com.google.cloud.aiplatform.v1.PythonPackageSpec;
+import com.google.cloud.aiplatform.v1.StudySpec;
+import com.google.cloud.aiplatform.v1.StudySpec.MetricSpec;
+import com.google.cloud.aiplatform.v1.StudySpec.MetricSpec.GoalType;
+import com.google.cloud.aiplatform.v1.StudySpec.ParameterSpec;
+import com.google.cloud.aiplatform.v1.StudySpec.ParameterSpec.ConditionalParameterSpec;
+import com.google.cloud.aiplatform.v1.StudySpec.ParameterSpec.ConditionalParameterSpec.DiscreteValueCondition;
+import com.google.cloud.aiplatform.v1.StudySpec.ParameterSpec.DiscreteValueSpec;
+import com.google.cloud.aiplatform.v1.StudySpec.ParameterSpec.DoubleValueSpec;
+import com.google.cloud.aiplatform.v1.StudySpec.ParameterSpec.ScaleType;
+import com.google.cloud.aiplatform.v1.WorkerPoolSpec;
 import java.io.IOException;
 import java.util.Arrays;
 
diff --git a/aiplatform/snippets/src/main/java/aiplatform/CreateHyperparameterTuningJobSample.java b/aiplatform/snippets/src/main/java/aiplatform/CreateHyperparameterTuningJobSample.java
@@ -17,16 +17,16 @@
 package aiplatform;
 
 // [START aiplatform_create_hyperparameter_tuning_job_sample]
-import com.google.cloud.aiplatform.v1beta1.AcceleratorType;
-import com.google.cloud.aiplatform.v1beta1.ContainerSpec;
-import com.google.cloud.aiplatform.v1beta1.CustomJobSpec;
-import com.google.cloud.aiplatform.v1beta1.HyperparameterTuningJob;
-import com.google.cloud.aiplatform.v1beta1.JobServiceClient;
-import com.google.cloud.aiplatform.v1beta1.JobServiceSettings;
-import com.google.cloud.aiplatform.v1beta1.LocationName;
-import com.google.cloud.aiplatform.v1beta1.MachineSpec;
-import com.google.cloud.aiplatform.v1beta1.StudySpec;
-import com.google.cloud.aiplatform.v1beta1.WorkerPoolSpec;
+import com.google.cloud.aiplatform.v1.AcceleratorType;
+import com.google.cloud.aiplatform.v1.ContainerSpec;
+import com.google.cloud.aiplatform.v1.CustomJobSpec;
+import com.google.cloud.aiplatform.v1.HyperparameterTuningJob;
+import com.google.cloud.aiplatform.v1.JobServiceClient;
+import com.google.cloud.aiplatform.v1.JobServiceSettings;
+import com.google.cloud.aiplatform.v1.LocationName;
+import com.google.cloud.aiplatform.v1.MachineSpec;
+import com.google.cloud.aiplatform.v1.StudySpec;
+import com.google.cloud.aiplatform.v1.WorkerPoolSpec;
 import java.io.IOException;
 
 public class CreateHyperparameterTuningJobSample {
diff --git a/aiplatform/snippets/src/test/java/aiplatform/CancelTrainingPipelineSampleTest.java b/aiplatform/snippets/src/test/java/aiplatform/CancelTrainingPipelineSampleTest.java
@@ -118,6 +118,6 @@ public void cancelTrainingPipeline() throws IOException, InterruptedException {
     // Get TrainingPipeline
     GetTrainingPipelineSample.getTrainingPipeline(PROJECT, TRAINING_PIPELINE_ID);
     String trainingPipelineResponse = bout.toString();
-    assertThat(trainingPipelineResponse).contains("Message: CANCELLED");
+    assertThat(trainingPipelineResponse).contains("Message: CANCELED");
   }
 }
diff --git a/aiplatform/snippets/src/test/java/aiplatform/CreateHyperparameterTuningJobPythonPackageSampleTest.java b/aiplatform/snippets/src/test/java/aiplatform/CreateHyperparameterTuningJobPythonPackageSampleTest.java
@@ -39,7 +39,8 @@ public class CreateHyperparameterTuningJobPythonPackageSampleTest {
   private static final String EXECUTOR_IMAGE_URI =
       "us.gcr.io/cloud-aiplatform/training/tf-gpu.2-1:latest";
   private static final String PACKAGE_URI =
-      "gs://ucaip-test-us-central1/training/pythonpackages/trainer.tar.bz2";
+      "gs://cloud-samples-data-us-central1/ai-platform-unified/training/python-packages/"
+          + "trainer.tar.bz2";
   private static final String PYTHON_MODULE = "trainer.hptuning_trainer";
   private ByteArrayOutputStream bout;
   private PrintStream out;
diff --git a/aiplatform/snippets/src/test/java/aiplatform/CreateHyperparameterTuningJobSampleTest.java b/aiplatform/snippets/src/test/java/aiplatform/CreateHyperparameterTuningJobSampleTest.java
@@ -35,7 +35,8 @@
 
 public class CreateHyperparameterTuningJobSampleTest {
   private static final String PROJECT = System.getenv("UCAIP_PROJECT_ID");
-  private static final String CONTAINER_IMAGE_URI = "gcr.io/ucaip-test/ucaip-training-test:latest";
+  private static final String CONTAINER_IMAGE_URI = "gcr.io/ucaip-sample-tests/ucaip-training-test:"
+      + "latest";
   private ByteArrayOutputStream bout;
   private PrintStream out;
   private PrintStream originalPrintStream;
diff --git a/aiplatform/snippets/src/test/java/aiplatform/CreateTrainingPipelineCustomTrainingManagedDatasetSampleTest.java b/aiplatform/snippets/src/test/java/aiplatform/CreateTrainingPipelineCustomTrainingManagedDatasetSampleTest.java
@@ -37,7 +37,7 @@ public class CreateTrainingPipelineCustomTrainingManagedDatasetSampleTest {
   private static final String ANNOTATION_SCHEMA_URI =
       "gs://google-cloud-aiplatform/schema/dataset/annotation/image_classification_1.0.0.yaml";
   private static final String TRAINING_CONTAINER_IMAGE_URI =
-      "gcr.io/ucaip-test/custom-container-managed-dataset:latest";
+      "gcr.io/ucaip-sample-tests/custom-container-managed-dataset:latest";
   private static final String MODEL_CONTAIN_SPEC_IMAGE_URI =
       "gcr.io/cloud-aiplatform/prediction/tf-gpu.1-15:latest";
   private static final String GCS_OUTPUT_DIRECTORY =

Original file line number	Diff line number	Diff line change
`@@ -118,6 +118,6 @@ public void cancelTrainingPipeline() throws IOException, InterruptedException {`
`118`	`118`	`// Get TrainingPipeline`
`119`	`119`	`GetTrainingPipelineSample.getTrainingPipeline(PROJECT, TRAINING_PIPELINE_ID);`
`120`	`120`	`String trainingPipelineResponse = bout.toString();`
`121`		`- assertThat(trainingPipelineResponse).contains("Message: CANCELLED");`
	`121`	`+ assertThat(trainingPipelineResponse).contains("Message: CANCELED");`
`122`	`122`	`}`
`123`	`123`	`}`