From f6d8f705deeeadfc4cd4b9309407971831728ab1 Mon Sep 17 00:00:00 2001 From: Eric Schmidt Date: Wed, 24 Mar 2021 14:58:47 -0700 Subject: [PATCH 01/11] samples: datasets --- .../java/aiplatform/CreateDatasetImageSample.java | 10 +++++----- .../main/java/aiplatform/CreateDatasetSample.java | 10 +++++----- .../CreateDatasetTabularBigquerySample.java | 12 ++++++------ 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/samples/snippets/src/main/java/aiplatform/CreateDatasetImageSample.java b/samples/snippets/src/main/java/aiplatform/CreateDatasetImageSample.java index 0ce9767c4..6fcb27157 100644 --- a/samples/snippets/src/main/java/aiplatform/CreateDatasetImageSample.java +++ b/samples/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/samples/snippets/src/main/java/aiplatform/CreateDatasetSample.java b/samples/snippets/src/main/java/aiplatform/CreateDatasetSample.java index 233a2e677..0b0817f69 100644 --- a/samples/snippets/src/main/java/aiplatform/CreateDatasetSample.java +++ b/samples/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/samples/snippets/src/main/java/aiplatform/CreateDatasetTabularBigquerySample.java b/samples/snippets/src/main/java/aiplatform/CreateDatasetTabularBigquerySample.java index bcaf5c94e..fd7628be2 100644 --- a/samples/snippets/src/main/java/aiplatform/CreateDatasetTabularBigquerySample.java +++ b/samples/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; From cea450c31186da4ab49fa8bec0cd6fc80a7cbfff Mon Sep 17 00:00:00 2001 From: Eric Schmidt Date: Mon, 29 Mar 2021 13:58:44 -0700 Subject: [PATCH 02/11] samples: updates samples to v1 (2 of 10) --- .../CreateDatasetTabularGcsSample.java | 10 +-- .../aiplatform/CreateDatasetTextSample.java | 10 +-- .../aiplatform/CreateDatasetVideoSample.java | 10 +-- .../java/aiplatform/CreateEndpointSample.java | 10 +-- ...parameterTuningJobPythonPackageSample.java | 36 +++++----- .../CreateHyperparameterTuningJobSample.java | 20 +++--- .../CreateSpecialistPoolSample.java | 69 +++++++++++++++++++ 7 files changed, 117 insertions(+), 48 deletions(-) create mode 100644 samples/snippets/src/main/java/aiplatform/CreateSpecialistPoolSample.java diff --git a/samples/snippets/src/main/java/aiplatform/CreateDatasetTabularGcsSample.java b/samples/snippets/src/main/java/aiplatform/CreateDatasetTabularGcsSample.java index 2b2f17f41..87bb139c9 100644 --- a/samples/snippets/src/main/java/aiplatform/CreateDatasetTabularGcsSample.java +++ b/samples/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/samples/snippets/src/main/java/aiplatform/CreateDatasetTextSample.java b/samples/snippets/src/main/java/aiplatform/CreateDatasetTextSample.java index ff3c93ee4..bb4fa16fe 100644 --- a/samples/snippets/src/main/java/aiplatform/CreateDatasetTextSample.java +++ b/samples/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/samples/snippets/src/main/java/aiplatform/CreateDatasetVideoSample.java b/samples/snippets/src/main/java/aiplatform/CreateDatasetVideoSample.java index 537525c81..65e96a7c8 100644 --- a/samples/snippets/src/main/java/aiplatform/CreateDatasetVideoSample.java +++ b/samples/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/samples/snippets/src/main/java/aiplatform/CreateEndpointSample.java b/samples/snippets/src/main/java/aiplatform/CreateEndpointSample.java index 382ebe2b3..e0d921434 100644 --- a/samples/snippets/src/main/java/aiplatform/CreateEndpointSample.java +++ b/samples/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/samples/snippets/src/main/java/aiplatform/CreateHyperparameterTuningJobPythonPackageSample.java b/samples/snippets/src/main/java/aiplatform/CreateHyperparameterTuningJobPythonPackageSample.java index 9d1937f3d..0d86232e2 100644 --- a/samples/snippets/src/main/java/aiplatform/CreateHyperparameterTuningJobPythonPackageSample.java +++ b/samples/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/samples/snippets/src/main/java/aiplatform/CreateHyperparameterTuningJobSample.java b/samples/snippets/src/main/java/aiplatform/CreateHyperparameterTuningJobSample.java index 37e66d512..b2295270a 100644 --- a/samples/snippets/src/main/java/aiplatform/CreateHyperparameterTuningJobSample.java +++ b/samples/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/samples/snippets/src/main/java/aiplatform/CreateSpecialistPoolSample.java b/samples/snippets/src/main/java/aiplatform/CreateSpecialistPoolSample.java new file mode 100644 index 000000000..631e9304e --- /dev/null +++ b/samples/snippets/src/main/java/aiplatform/CreateSpecialistPoolSample.java @@ -0,0 +1,69 @@ +/* + * 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. + * 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_create_specialist_pool_sample] +import com.google.api.gax.longrunning.OperationFuture; +import com.google.cloud.aiplatform.v1.CreateSpecialistPoolOperationMetadata; +import com.google.cloud.aiplatform.v1.LocationName; +import com.google.cloud.aiplatform.v1.SpecialistPool; +import com.google.cloud.aiplatform.v1.SpecialistPoolServiceClient; +import com.google.cloud.aiplatform.v1.SpecialistPoolServiceSettings; +import java.io.IOException; +import java.util.concurrent.ExecutionException; + +public class CreateSpecialistPoolSample { + + public static void main(String[] args) + throws IOException, ExecutionException, InterruptedException { + // TODO(developer): Replace these variables before running the sample. + String project = "PROJECT"; + String location = "us-central1"; + String displayName = "DISPLAY_NAME"; + createSpecialistPoolSample(project, location, displayName); + } + + static void createSpecialistPoolSample(String project, String location, String displayName) + throws IOException, ExecutionException, InterruptedException { + // The AI Platform services require regional API endpoints. + SpecialistPoolServiceSettings settings = + SpecialistPoolServiceSettings.newBuilder() + .setEndpoint("us-central1-aiplatform.googleapis.com:443") + .build(); + + // Initialize client that will be used to send requests. This client only needs to be created + // once, and can be reused for multiple requests. After completing all of your requests, call + // the "close" method on the client to safely clean up any remaining background resources. + try (SpecialistPoolServiceClient client = SpecialistPoolServiceClient.create(settings)) { + SpecialistPool specialistPool = + SpecialistPool.newBuilder().setDisplayName(displayName).build(); + LocationName parent = LocationName.of(project, location); + OperationFuture response = + client.createSpecialistPoolAsync(parent, specialistPool); + + // You can use OperationFuture.getInitialFuture to get a future representing the initial + // response to the request, which contains information while the operation is in progress. + System.out.format("Operation name: %s\n", response.getInitialFuture().get().getName()); + + // OperationFuture.get() will block until the operation is finished. + SpecialistPool createdSpecialistPool = response.get(); + System.out.format("createdSpecialistPool: %s\n", createdSpecialistPool); + } + } +} + +// [END aiplatform_create_specialist_pool_sample] From affa7aeac954543786d43f575604820b54ea566d Mon Sep 17 00:00:00 2001 From: Eric Schmidt Date: Wed, 31 Mar 2021 11:06:52 -0700 Subject: [PATCH 03/11] fix: removed unneeded sample --- .../CreateSpecialistPoolSample.java | 69 ------------ .../CreateSpecialistPoolSampleTest.java | 102 ++++++++++++++++++ 2 files changed, 102 insertions(+), 69 deletions(-) delete mode 100644 samples/snippets/src/main/java/aiplatform/CreateSpecialistPoolSample.java create mode 100644 samples/snippets/src/test/java/aiplatform/CreateSpecialistPoolSampleTest.java diff --git a/samples/snippets/src/main/java/aiplatform/CreateSpecialistPoolSample.java b/samples/snippets/src/main/java/aiplatform/CreateSpecialistPoolSample.java deleted file mode 100644 index 631e9304e..000000000 --- a/samples/snippets/src/main/java/aiplatform/CreateSpecialistPoolSample.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * 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. - * 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_create_specialist_pool_sample] -import com.google.api.gax.longrunning.OperationFuture; -import com.google.cloud.aiplatform.v1.CreateSpecialistPoolOperationMetadata; -import com.google.cloud.aiplatform.v1.LocationName; -import com.google.cloud.aiplatform.v1.SpecialistPool; -import com.google.cloud.aiplatform.v1.SpecialistPoolServiceClient; -import com.google.cloud.aiplatform.v1.SpecialistPoolServiceSettings; -import java.io.IOException; -import java.util.concurrent.ExecutionException; - -public class CreateSpecialistPoolSample { - - public static void main(String[] args) - throws IOException, ExecutionException, InterruptedException { - // TODO(developer): Replace these variables before running the sample. - String project = "PROJECT"; - String location = "us-central1"; - String displayName = "DISPLAY_NAME"; - createSpecialistPoolSample(project, location, displayName); - } - - static void createSpecialistPoolSample(String project, String location, String displayName) - throws IOException, ExecutionException, InterruptedException { - // The AI Platform services require regional API endpoints. - SpecialistPoolServiceSettings settings = - SpecialistPoolServiceSettings.newBuilder() - .setEndpoint("us-central1-aiplatform.googleapis.com:443") - .build(); - - // Initialize client that will be used to send requests. This client only needs to be created - // once, and can be reused for multiple requests. After completing all of your requests, call - // the "close" method on the client to safely clean up any remaining background resources. - try (SpecialistPoolServiceClient client = SpecialistPoolServiceClient.create(settings)) { - SpecialistPool specialistPool = - SpecialistPool.newBuilder().setDisplayName(displayName).build(); - LocationName parent = LocationName.of(project, location); - OperationFuture response = - client.createSpecialistPoolAsync(parent, specialistPool); - - // You can use OperationFuture.getInitialFuture to get a future representing the initial - // response to the request, which contains information while the operation is in progress. - System.out.format("Operation name: %s\n", response.getInitialFuture().get().getName()); - - // OperationFuture.get() will block until the operation is finished. - SpecialistPool createdSpecialistPool = response.get(); - System.out.format("createdSpecialistPool: %s\n", createdSpecialistPool); - } - } -} - -// [END aiplatform_create_specialist_pool_sample] diff --git a/samples/snippets/src/test/java/aiplatform/CreateSpecialistPoolSampleTest.java b/samples/snippets/src/test/java/aiplatform/CreateSpecialistPoolSampleTest.java new file mode 100644 index 000000000..fe2f00d2e --- /dev/null +++ b/samples/snippets/src/test/java/aiplatform/CreateSpecialistPoolSampleTest.java @@ -0,0 +1,102 @@ +package aiplatform; + +import static com.google.common.truth.Truth.assertThat; +import static junit.framework.TestCase.assertNotNull; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.PrintStream; +import java.util.UUID; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; +import org.junit.After; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Ignore; +import org.junit.Test; + +public class CreateSpecialistPoolSampleTest { + private static final String PROJECT = System.getenv("UCAIP_PROJECT_ID"); + private static final String DATASET_ID = + System.getenv("DATA_LABELING_ACTIVE_LEARNING_DATASET_ID"); + private static final String SPECIALIST_POOL_ID = + System.getenv("DATA_LABELING_SPECIALIST_POOL_ID"); + private static final String INSTRUCTION_URI = + "gs://ucaip-sample-resources/images/datalabeling_instructions.pdf"; + private static final String INPUTS_SCHEMA_URI = + "gs://google-cloud-aiplatform/schema/datalabelingjob/inputs/image_classification_1.0.0.yaml"; + private static final String ANNOTATION_SPEC = "roses"; + private ByteArrayOutputStream bout; + private PrintStream out; + private PrintStream originalPrintStream; + private String dataLabelingJobId; + + private static void requireEnvVar(String varName) { + String errorMessage = + String.format("Environment variable '%s' is required to perform these tests.", varName); + assertNotNull(errorMessage, System.getenv(varName)); + } + + @BeforeClass + public static void checkRequirements() { + requireEnvVar("GOOGLE_APPLICATION_CREDENTIALS"); + requireEnvVar("UCAIP_PROJECT_ID"); + requireEnvVar("DATA_LABELING_ACTIVE_LEARNING_DATASET_ID"); + requireEnvVar("DATA_LABELING_SPECIALIST_POOL_ID"); + } + + @Before + public void setUp() { + bout = new ByteArrayOutputStream(); + out = new PrintStream(bout); + originalPrintStream = System.out; + System.setOut(out); + } + + @After + public void tearDown() + throws InterruptedException, ExecutionException, IOException, TimeoutException { + // Cancel data labeling job + CancelDataLabelingJobSample.cancelDataLabelingJob(PROJECT, dataLabelingJobId); + + // Assert + String cancelResponse = bout.toString(); + assertThat(cancelResponse).contains("Cancelled Data labeling job"); + TimeUnit.MINUTES.sleep(1); + + // Delete the created dataset + DeleteDataLabelingJobSample.deleteDataLabelingJob(PROJECT, dataLabelingJobId); + + // Assert + String deleteResponse = bout.toString(); + assertThat(deleteResponse).contains("Deleted Data Labeling Job."); + System.out.flush(); + System.setOut(originalPrintStream); + } + + @Test + @Ignore("Avoid creating actual data labeling pool of humans") + public void testCreateSpecialistPoolSampleTest() throws IOException { + // Act + String dataLabelingDisplayName = + String.format( + "temp_data_labeling_job_specialist_pool_display_name_%s", + UUID.randomUUID().toString().replaceAll("-", "_").substring(0, 26)); + + CreateDataLabelingJobSpecialistPoolSample.createDataLabelingJobSpecialistPoolSample( + PROJECT, + dataLabelingDisplayName, + DATASET_ID, + SPECIALIST_POOL_ID, + INSTRUCTION_URI, + INPUTS_SCHEMA_URI, + ANNOTATION_SPEC); + + // Assert + String got = bout.toString(); + assertThat(got).contains(dataLabelingDisplayName); + assertThat(got).contains("Create Data Labeling Job Image Response"); + dataLabelingJobId = got.split("Name: ")[1].split("dataLabelingJobs/")[1].split("\n")[0]; + } +} From 18fcea488f338063258ad6c117105f227a3c35a6 Mon Sep 17 00:00:00 2001 From: Eric Schmidt Date: Wed, 31 Mar 2021 13:55:34 -0700 Subject: [PATCH 04/11] fix: removed unneeded test --- .../CreateSpecialistPoolSampleTest.java | 102 ------------------ 1 file changed, 102 deletions(-) delete mode 100644 samples/snippets/src/test/java/aiplatform/CreateSpecialistPoolSampleTest.java diff --git a/samples/snippets/src/test/java/aiplatform/CreateSpecialistPoolSampleTest.java b/samples/snippets/src/test/java/aiplatform/CreateSpecialistPoolSampleTest.java deleted file mode 100644 index fe2f00d2e..000000000 --- a/samples/snippets/src/test/java/aiplatform/CreateSpecialistPoolSampleTest.java +++ /dev/null @@ -1,102 +0,0 @@ -package aiplatform; - -import static com.google.common.truth.Truth.assertThat; -import static junit.framework.TestCase.assertNotNull; - -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.PrintStream; -import java.util.UUID; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; -import org.junit.After; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Ignore; -import org.junit.Test; - -public class CreateSpecialistPoolSampleTest { - private static final String PROJECT = System.getenv("UCAIP_PROJECT_ID"); - private static final String DATASET_ID = - System.getenv("DATA_LABELING_ACTIVE_LEARNING_DATASET_ID"); - private static final String SPECIALIST_POOL_ID = - System.getenv("DATA_LABELING_SPECIALIST_POOL_ID"); - private static final String INSTRUCTION_URI = - "gs://ucaip-sample-resources/images/datalabeling_instructions.pdf"; - private static final String INPUTS_SCHEMA_URI = - "gs://google-cloud-aiplatform/schema/datalabelingjob/inputs/image_classification_1.0.0.yaml"; - private static final String ANNOTATION_SPEC = "roses"; - private ByteArrayOutputStream bout; - private PrintStream out; - private PrintStream originalPrintStream; - private String dataLabelingJobId; - - private static void requireEnvVar(String varName) { - String errorMessage = - String.format("Environment variable '%s' is required to perform these tests.", varName); - assertNotNull(errorMessage, System.getenv(varName)); - } - - @BeforeClass - public static void checkRequirements() { - requireEnvVar("GOOGLE_APPLICATION_CREDENTIALS"); - requireEnvVar("UCAIP_PROJECT_ID"); - requireEnvVar("DATA_LABELING_ACTIVE_LEARNING_DATASET_ID"); - requireEnvVar("DATA_LABELING_SPECIALIST_POOL_ID"); - } - - @Before - public void setUp() { - bout = new ByteArrayOutputStream(); - out = new PrintStream(bout); - originalPrintStream = System.out; - System.setOut(out); - } - - @After - public void tearDown() - throws InterruptedException, ExecutionException, IOException, TimeoutException { - // Cancel data labeling job - CancelDataLabelingJobSample.cancelDataLabelingJob(PROJECT, dataLabelingJobId); - - // Assert - String cancelResponse = bout.toString(); - assertThat(cancelResponse).contains("Cancelled Data labeling job"); - TimeUnit.MINUTES.sleep(1); - - // Delete the created dataset - DeleteDataLabelingJobSample.deleteDataLabelingJob(PROJECT, dataLabelingJobId); - - // Assert - String deleteResponse = bout.toString(); - assertThat(deleteResponse).contains("Deleted Data Labeling Job."); - System.out.flush(); - System.setOut(originalPrintStream); - } - - @Test - @Ignore("Avoid creating actual data labeling pool of humans") - public void testCreateSpecialistPoolSampleTest() throws IOException { - // Act - String dataLabelingDisplayName = - String.format( - "temp_data_labeling_job_specialist_pool_display_name_%s", - UUID.randomUUID().toString().replaceAll("-", "_").substring(0, 26)); - - CreateDataLabelingJobSpecialistPoolSample.createDataLabelingJobSpecialistPoolSample( - PROJECT, - dataLabelingDisplayName, - DATASET_ID, - SPECIALIST_POOL_ID, - INSTRUCTION_URI, - INPUTS_SCHEMA_URI, - ANNOTATION_SPEC); - - // Assert - String got = bout.toString(); - assertThat(got).contains(dataLabelingDisplayName); - assertThat(got).contains("Create Data Labeling Job Image Response"); - dataLabelingJobId = got.split("Name: ")[1].split("dataLabelingJobs/")[1].split("\n")[0]; - } -} From 57375e1bacb46359a4fb6caa7a80975597c01e6c Mon Sep 17 00:00:00 2001 From: Eric Schmidt Date: Wed, 31 Mar 2021 15:35:53 -0700 Subject: [PATCH 05/11] samples: updates the samples to v1 (3 of 10) --- ...CreateTrainingPipelineCustomJobSample.java | 14 ++--- ...ineCustomTrainingManagedDatasetSample.java | 16 ++--- ...ningPipelineImageClassificationSample.java | 59 ++++++------------ ...ingPipelineImageObjectDetectionSample.java | 56 +++++------------ .../CreateTrainingPipelineSample.java | 55 +++++------------ ...ngPipelineTabularClassificationSample.java | 61 ++++++------------- ...ainingPipelineTabularRegressionSample.java | 56 +++++------------ ...iningPipelineTextClassificationSample.java | 55 +++++------------ ...ingPipelineTextEntityExtractionSample.java | 57 +++++------------ ...ngPipelineTextSentimentAnalysisSample.java | 57 ++++++----------- 10 files changed, 147 insertions(+), 339 deletions(-) diff --git a/samples/snippets/src/main/java/aiplatform/CreateTrainingPipelineCustomJobSample.java b/samples/snippets/src/main/java/aiplatform/CreateTrainingPipelineCustomJobSample.java index 7b40d0e8d..53e9867a6 100644 --- a/samples/snippets/src/main/java/aiplatform/CreateTrainingPipelineCustomJobSample.java +++ b/samples/snippets/src/main/java/aiplatform/CreateTrainingPipelineCustomJobSample.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. @@ -17,12 +17,12 @@ package aiplatform; // [START aiplatform_create_training_pipeline_custom_job_sample] -import com.google.cloud.aiplatform.v1beta1.LocationName; -import com.google.cloud.aiplatform.v1beta1.Model; -import com.google.cloud.aiplatform.v1beta1.ModelContainerSpec; -import com.google.cloud.aiplatform.v1beta1.PipelineServiceClient; -import com.google.cloud.aiplatform.v1beta1.PipelineServiceSettings; -import com.google.cloud.aiplatform.v1beta1.TrainingPipeline; +import com.google.cloud.aiplatform.v1.LocationName; +import com.google.cloud.aiplatform.v1.Model; +import com.google.cloud.aiplatform.v1.ModelContainerSpec; +import com.google.cloud.aiplatform.v1.PipelineServiceClient; +import com.google.cloud.aiplatform.v1.PipelineServiceSettings; +import com.google.cloud.aiplatform.v1.TrainingPipeline; import com.google.gson.JsonArray; import com.google.gson.JsonObject; import com.google.protobuf.Value; diff --git a/samples/snippets/src/main/java/aiplatform/CreateTrainingPipelineCustomTrainingManagedDatasetSample.java b/samples/snippets/src/main/java/aiplatform/CreateTrainingPipelineCustomTrainingManagedDatasetSample.java index 739d15cf8..f6964b715 100644 --- a/samples/snippets/src/main/java/aiplatform/CreateTrainingPipelineCustomTrainingManagedDatasetSample.java +++ b/samples/snippets/src/main/java/aiplatform/CreateTrainingPipelineCustomTrainingManagedDatasetSample.java @@ -17,14 +17,14 @@ package aiplatform; // [START aiplatform_create_training_pipeline_custom_training_managed_dataset_sample] -import com.google.cloud.aiplatform.v1beta1.GcsDestination; -import com.google.cloud.aiplatform.v1beta1.InputDataConfig; -import com.google.cloud.aiplatform.v1beta1.LocationName; -import com.google.cloud.aiplatform.v1beta1.Model; -import com.google.cloud.aiplatform.v1beta1.ModelContainerSpec; -import com.google.cloud.aiplatform.v1beta1.PipelineServiceClient; -import com.google.cloud.aiplatform.v1beta1.PipelineServiceSettings; -import com.google.cloud.aiplatform.v1beta1.TrainingPipeline; +import com.google.cloud.aiplatform.v1.GcsDestination; +import com.google.cloud.aiplatform.v1.InputDataConfig; +import com.google.cloud.aiplatform.v1.LocationName; +import com.google.cloud.aiplatform.v1.Model; +import com.google.cloud.aiplatform.v1.ModelContainerSpec; +import com.google.cloud.aiplatform.v1.PipelineServiceClient; +import com.google.cloud.aiplatform.v1.PipelineServiceSettings; +import com.google.cloud.aiplatform.v1.TrainingPipeline; import com.google.gson.JsonArray; import com.google.gson.JsonObject; import com.google.protobuf.Value; diff --git a/samples/snippets/src/main/java/aiplatform/CreateTrainingPipelineImageClassificationSample.java b/samples/snippets/src/main/java/aiplatform/CreateTrainingPipelineImageClassificationSample.java index 445707253..4f9c1e2c5 100644 --- a/samples/snippets/src/main/java/aiplatform/CreateTrainingPipelineImageClassificationSample.java +++ b/samples/snippets/src/main/java/aiplatform/CreateTrainingPipelineImageClassificationSample.java @@ -18,28 +18,24 @@ // [START aiplatform_create_training_pipeline_image_classification_sample] import com.google.cloud.aiplatform.util.ValueConverter; -import com.google.cloud.aiplatform.v1beta1.DeployedModelRef; -import com.google.cloud.aiplatform.v1beta1.EnvVar; -import com.google.cloud.aiplatform.v1beta1.ExplanationMetadata; -import com.google.cloud.aiplatform.v1beta1.ExplanationParameters; -import com.google.cloud.aiplatform.v1beta1.ExplanationSpec; -import com.google.cloud.aiplatform.v1beta1.FilterSplit; -import com.google.cloud.aiplatform.v1beta1.FractionSplit; -import com.google.cloud.aiplatform.v1beta1.InputDataConfig; -import com.google.cloud.aiplatform.v1beta1.LocationName; -import com.google.cloud.aiplatform.v1beta1.Model; -import com.google.cloud.aiplatform.v1beta1.Model.ExportFormat; -import com.google.cloud.aiplatform.v1beta1.ModelContainerSpec; -import com.google.cloud.aiplatform.v1beta1.PipelineServiceClient; -import com.google.cloud.aiplatform.v1beta1.PipelineServiceSettings; -import com.google.cloud.aiplatform.v1beta1.Port; -import com.google.cloud.aiplatform.v1beta1.PredefinedSplit; -import com.google.cloud.aiplatform.v1beta1.PredictSchemata; -import com.google.cloud.aiplatform.v1beta1.SampledShapleyAttribution; -import com.google.cloud.aiplatform.v1beta1.TimestampSplit; -import com.google.cloud.aiplatform.v1beta1.TrainingPipeline; -import com.google.cloud.aiplatform.v1beta1.schema.trainingjob.definition.AutoMlImageClassificationInputs; -import com.google.cloud.aiplatform.v1beta1.schema.trainingjob.definition.AutoMlImageClassificationInputs.ModelType; +import com.google.cloud.aiplatform.v1.DeployedModelRef; +import com.google.cloud.aiplatform.v1.EnvVar; +import com.google.cloud.aiplatform.v1.FilterSplit; +import com.google.cloud.aiplatform.v1.FractionSplit; +import com.google.cloud.aiplatform.v1.InputDataConfig; +import com.google.cloud.aiplatform.v1.LocationName; +import com.google.cloud.aiplatform.v1.Model; +import com.google.cloud.aiplatform.v1.Model.ExportFormat; +import com.google.cloud.aiplatform.v1.ModelContainerSpec; +import com.google.cloud.aiplatform.v1.PipelineServiceClient; +import com.google.cloud.aiplatform.v1.PipelineServiceSettings; +import com.google.cloud.aiplatform.v1.Port; +import com.google.cloud.aiplatform.v1.PredefinedSplit; +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.v1.schema.trainingjob.definition.AutoMlImageClassificationInputs; +import com.google.cloud.aiplatform.v1.schema.trainingjob.definition.AutoMlImageClassificationInputs.ModelType; import com.google.rpc.Status; import java.io.IOException; @@ -204,25 +200,6 @@ static void createTrainingPipelineImageClassificationSample( System.out.format("Deployed Model Id: %s\n", deployedModelRef.getDeployedModelId()); } - ExplanationSpec explanationSpec = modelResponse.getExplanationSpec(); - System.out.println("Explanation Spec"); - - ExplanationParameters explanationParameters = explanationSpec.getParameters(); - System.out.println("Parameters"); - - SampledShapleyAttribution sampledShapleyAttribution = - explanationParameters.getSampledShapleyAttribution(); - System.out.println("Sampled Shapley Attribution"); - System.out.format("Path Count: %s\n", sampledShapleyAttribution.getPathCount()); - - ExplanationMetadata explanationMetadata = explanationSpec.getMetadata(); - System.out.println("Metadata"); - System.out.format("Inputs: %s\n", explanationMetadata.getInputsMap()); - System.out.format("Outputs: %s\n", explanationMetadata.getOutputsMap()); - System.out.format( - "Feature Attributions Schema_uri: %s\n", - explanationMetadata.getFeatureAttributionsSchemaUri()); - Status status = trainingPipelineResponse.getError(); System.out.println("Error"); System.out.format("Code: %s\n", status.getCode()); diff --git a/samples/snippets/src/main/java/aiplatform/CreateTrainingPipelineImageObjectDetectionSample.java b/samples/snippets/src/main/java/aiplatform/CreateTrainingPipelineImageObjectDetectionSample.java index 9136cec90..d6a9ae6d0 100644 --- a/samples/snippets/src/main/java/aiplatform/CreateTrainingPipelineImageObjectDetectionSample.java +++ b/samples/snippets/src/main/java/aiplatform/CreateTrainingPipelineImageObjectDetectionSample.java @@ -19,27 +19,22 @@ // [START aiplatform_create_training_pipeline_image_object_detection_sample] import com.google.cloud.aiplatform.util.ValueConverter; -import com.google.cloud.aiplatform.v1beta1.DeployedModelRef; -import com.google.cloud.aiplatform.v1beta1.EnvVar; -import com.google.cloud.aiplatform.v1beta1.ExplanationMetadata; -import com.google.cloud.aiplatform.v1beta1.ExplanationParameters; -import com.google.cloud.aiplatform.v1beta1.ExplanationSpec; -import com.google.cloud.aiplatform.v1beta1.FilterSplit; -import com.google.cloud.aiplatform.v1beta1.FractionSplit; -import com.google.cloud.aiplatform.v1beta1.InputDataConfig; -import com.google.cloud.aiplatform.v1beta1.LocationName; -import com.google.cloud.aiplatform.v1beta1.Model; -import com.google.cloud.aiplatform.v1beta1.Model.ExportFormat; -import com.google.cloud.aiplatform.v1beta1.ModelContainerSpec; -import com.google.cloud.aiplatform.v1beta1.PipelineServiceClient; -import com.google.cloud.aiplatform.v1beta1.PipelineServiceSettings; -import com.google.cloud.aiplatform.v1beta1.Port; -import com.google.cloud.aiplatform.v1beta1.PredefinedSplit; -import com.google.cloud.aiplatform.v1beta1.PredictSchemata; -import com.google.cloud.aiplatform.v1beta1.SampledShapleyAttribution; -import com.google.cloud.aiplatform.v1beta1.TimestampSplit; -import com.google.cloud.aiplatform.v1beta1.TrainingPipeline; -import com.google.cloud.aiplatform.v1beta1.schema.trainingjob.definition.AutoMlImageClassification; +import com.google.cloud.aiplatform.v1.DeployedModelRef; +import com.google.cloud.aiplatform.v1.EnvVar; +import com.google.cloud.aiplatform.v1.FilterSplit; +import com.google.cloud.aiplatform.v1.FractionSplit; +import com.google.cloud.aiplatform.v1.InputDataConfig; +import com.google.cloud.aiplatform.v1.LocationName; +import com.google.cloud.aiplatform.v1.Model; +import com.google.cloud.aiplatform.v1.Model.ExportFormat; +import com.google.cloud.aiplatform.v1.ModelContainerSpec; +import com.google.cloud.aiplatform.v1.PipelineServiceClient; +import com.google.cloud.aiplatform.v1.PipelineServiceSettings; +import com.google.cloud.aiplatform.v1.Port; +import com.google.cloud.aiplatform.v1.PredefinedSplit; +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.protobuf.Value; @@ -207,25 +202,6 @@ static void createTrainingPipelineImageObjectDetectionSample( System.out.format("Deployed Model Id: %s\n", deployedModelRef.getDeployedModelId()); } - ExplanationSpec explanationSpec = modelResponse.getExplanationSpec(); - System.out.println("Explanation Spec"); - - ExplanationParameters explanationParameters = explanationSpec.getParameters(); - System.out.println("Parameters"); - - SampledShapleyAttribution sampledShapleyAttribution = - explanationParameters.getSampledShapleyAttribution(); - System.out.println("Sampled Shapley Attribution"); - System.out.format("Path Count: %s\n", sampledShapleyAttribution.getPathCount()); - - ExplanationMetadata explanationMetadata = explanationSpec.getMetadata(); - System.out.println("Metadata"); - System.out.format("Inputs: %s\n", explanationMetadata.getInputsMap()); - System.out.format("Outputs: %s\n", explanationMetadata.getOutputsMap()); - System.out.format( - "Feature Attributions Schema_uri: %s\n", - explanationMetadata.getFeatureAttributionsSchemaUri()); - Status status = trainingPipelineResponse.getError(); System.out.println("Error"); System.out.format("Code: %s\n", status.getCode()); diff --git a/samples/snippets/src/main/java/aiplatform/CreateTrainingPipelineSample.java b/samples/snippets/src/main/java/aiplatform/CreateTrainingPipelineSample.java index 2dcb6e88c..33f94753e 100644 --- a/samples/snippets/src/main/java/aiplatform/CreateTrainingPipelineSample.java +++ b/samples/snippets/src/main/java/aiplatform/CreateTrainingPipelineSample.java @@ -18,26 +18,22 @@ // [START aiplatform_create_training_pipeline_sample] -import com.google.cloud.aiplatform.v1beta1.DeployedModelRef; -import com.google.cloud.aiplatform.v1beta1.EnvVar; -import com.google.cloud.aiplatform.v1beta1.ExplanationMetadata; -import com.google.cloud.aiplatform.v1beta1.ExplanationParameters; -import com.google.cloud.aiplatform.v1beta1.ExplanationSpec; -import com.google.cloud.aiplatform.v1beta1.FilterSplit; -import com.google.cloud.aiplatform.v1beta1.FractionSplit; -import com.google.cloud.aiplatform.v1beta1.InputDataConfig; -import com.google.cloud.aiplatform.v1beta1.LocationName; -import com.google.cloud.aiplatform.v1beta1.Model; -import com.google.cloud.aiplatform.v1beta1.Model.ExportFormat; -import com.google.cloud.aiplatform.v1beta1.ModelContainerSpec; -import com.google.cloud.aiplatform.v1beta1.PipelineServiceClient; -import com.google.cloud.aiplatform.v1beta1.PipelineServiceSettings; -import com.google.cloud.aiplatform.v1beta1.Port; -import com.google.cloud.aiplatform.v1beta1.PredefinedSplit; -import com.google.cloud.aiplatform.v1beta1.PredictSchemata; -import com.google.cloud.aiplatform.v1beta1.SampledShapleyAttribution; -import com.google.cloud.aiplatform.v1beta1.TimestampSplit; -import com.google.cloud.aiplatform.v1beta1.TrainingPipeline; +import com.google.cloud.aiplatform.v1.DeployedModelRef; +import com.google.cloud.aiplatform.v1.EnvVar; +import com.google.cloud.aiplatform.v1.FilterSplit; +import com.google.cloud.aiplatform.v1.FractionSplit; +import com.google.cloud.aiplatform.v1.InputDataConfig; +import com.google.cloud.aiplatform.v1.LocationName; +import com.google.cloud.aiplatform.v1.Model; +import com.google.cloud.aiplatform.v1.Model.ExportFormat; +import com.google.cloud.aiplatform.v1.ModelContainerSpec; +import com.google.cloud.aiplatform.v1.PipelineServiceClient; +import com.google.cloud.aiplatform.v1.PipelineServiceSettings; +import com.google.cloud.aiplatform.v1.Port; +import com.google.cloud.aiplatform.v1.PredefinedSplit; +import com.google.cloud.aiplatform.v1.PredictSchemata; +import com.google.cloud.aiplatform.v1.TimestampSplit; +import com.google.cloud.aiplatform.v1.TrainingPipeline; import com.google.protobuf.Value; import com.google.protobuf.util.JsonFormat; import com.google.rpc.Status; @@ -204,25 +200,6 @@ static void createTrainingPipelineSample( System.out.format("Deployed Model Id: %s\n", deployedModelRef.getDeployedModelId()); } - ExplanationSpec explanationSpec = modelResponse.getExplanationSpec(); - System.out.println("Explanation Spec"); - - ExplanationParameters explanationParameters = explanationSpec.getParameters(); - System.out.println("Parameters"); - - SampledShapleyAttribution sampledShapleyAttribution = - explanationParameters.getSampledShapleyAttribution(); - System.out.println("Sampled Shapley Attribution"); - System.out.format("Path Count: %s\n", sampledShapleyAttribution.getPathCount()); - - ExplanationMetadata explanationMetadata = explanationSpec.getMetadata(); - System.out.println("Metadata"); - System.out.format("Inputs: %s\n", explanationMetadata.getInputsMap()); - System.out.format("Outputs: %s\n", explanationMetadata.getOutputsMap()); - System.out.format( - "Feature Attributions Schema_uri: %s\n", - explanationMetadata.getFeatureAttributionsSchemaUri()); - Status status = trainingPipelineResponse.getError(); System.out.println("Error"); System.out.format("Code: %s\n", status.getCode()); diff --git a/samples/snippets/src/main/java/aiplatform/CreateTrainingPipelineTabularClassificationSample.java b/samples/snippets/src/main/java/aiplatform/CreateTrainingPipelineTabularClassificationSample.java index d37bbf6eb..d3a8c58af 100644 --- a/samples/snippets/src/main/java/aiplatform/CreateTrainingPipelineTabularClassificationSample.java +++ b/samples/snippets/src/main/java/aiplatform/CreateTrainingPipelineTabularClassificationSample.java @@ -19,30 +19,24 @@ // [START aiplatform_create_training_pipeline_tabular_classification_sample] import com.google.cloud.aiplatform.util.ValueConverter; -import com.google.cloud.aiplatform.v1beta1.DeployedModelRef; -import com.google.cloud.aiplatform.v1beta1.EnvVar; -import com.google.cloud.aiplatform.v1beta1.ExplanationMetadata; -import com.google.cloud.aiplatform.v1beta1.ExplanationParameters; -import com.google.cloud.aiplatform.v1beta1.ExplanationSpec; -import com.google.cloud.aiplatform.v1beta1.FilterSplit; -import com.google.cloud.aiplatform.v1beta1.FractionSplit; -import com.google.cloud.aiplatform.v1beta1.InputDataConfig; -import com.google.cloud.aiplatform.v1beta1.LocationName; -import com.google.cloud.aiplatform.v1beta1.Model; -import com.google.cloud.aiplatform.v1beta1.ModelContainerSpec; -import com.google.cloud.aiplatform.v1beta1.PipelineServiceClient; -import com.google.cloud.aiplatform.v1beta1.PipelineServiceSettings; -import com.google.cloud.aiplatform.v1beta1.Port; -import com.google.cloud.aiplatform.v1beta1.PredefinedSplit; -import com.google.cloud.aiplatform.v1beta1.PredictSchemata; -import com.google.cloud.aiplatform.v1beta1.SampledShapleyAttribution; -import com.google.cloud.aiplatform.v1beta1.TimestampSplit; -import com.google.cloud.aiplatform.v1beta1.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.protobuf.Value; -import com.google.protobuf.util.JsonFormat; +import com.google.cloud.aiplatform.v1.DeployedModelRef; +import com.google.cloud.aiplatform.v1.EnvVar; +import com.google.cloud.aiplatform.v1.FilterSplit; +import com.google.cloud.aiplatform.v1.FractionSplit; +import com.google.cloud.aiplatform.v1.InputDataConfig; +import com.google.cloud.aiplatform.v1.LocationName; +import com.google.cloud.aiplatform.v1.Model; +import com.google.cloud.aiplatform.v1.ModelContainerSpec; +import com.google.cloud.aiplatform.v1.PipelineServiceClient; +import com.google.cloud.aiplatform.v1.PipelineServiceSettings; +import com.google.cloud.aiplatform.v1.Port; +import com.google.cloud.aiplatform.v1.PredefinedSplit; +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.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.rpc.Status; import java.io.IOException; import java.util.ArrayList; @@ -245,25 +239,6 @@ static void createTrainingPipelineTableClassification( System.out.format("\t\tDeployed Model Id: %s\n", deployedModelRef.getDeployedModelId()); } - ExplanationSpec explanationSpec = modelResponse.getExplanationSpec(); - System.out.println("\tExplanation Spec"); - - ExplanationParameters explanationParameters = explanationSpec.getParameters(); - System.out.println("\t\tParameters"); - - SampledShapleyAttribution sampledShapleyAttribution = - explanationParameters.getSampledShapleyAttribution(); - System.out.println("\t\tSampled Shapley Attribution"); - System.out.format("\t\t\tPath Count: %s\n", sampledShapleyAttribution.getPathCount()); - - ExplanationMetadata explanationMetadata = explanationSpec.getMetadata(); - System.out.println("\t\tMetadata"); - System.out.format("\t\t\tInput: %s\n", explanationMetadata.getInputsMap()); - System.out.format("\t\t\tOutput: %s\n", explanationMetadata.getOutputsMap()); - System.out.format( - "\t\t\tFeature Attributions Schema Uri: %s\n", - explanationMetadata.getFeatureAttributionsSchemaUri()); - Status status = trainingPipelineResponse.getError(); System.out.println("\tError"); System.out.format("\t\tCode: %s\n", status.getCode()); diff --git a/samples/snippets/src/main/java/aiplatform/CreateTrainingPipelineTabularRegressionSample.java b/samples/snippets/src/main/java/aiplatform/CreateTrainingPipelineTabularRegressionSample.java index ce5fff480..6891ddc5a 100644 --- a/samples/snippets/src/main/java/aiplatform/CreateTrainingPipelineTabularRegressionSample.java +++ b/samples/snippets/src/main/java/aiplatform/CreateTrainingPipelineTabularRegressionSample.java @@ -19,32 +19,25 @@ // [START aiplatform_create_training_pipeline_tabular_regression_sample] import com.google.cloud.aiplatform.util.ValueConverter; -import com.google.cloud.aiplatform.v1beta1.DeployedModelRef; -import com.google.cloud.aiplatform.v1beta1.EnvVar; -import com.google.cloud.aiplatform.v1beta1.ExplanationMetadata; -import com.google.cloud.aiplatform.v1beta1.ExplanationParameters; -import com.google.cloud.aiplatform.v1beta1.ExplanationSpec; -import com.google.cloud.aiplatform.v1beta1.FilterSplit; -import com.google.cloud.aiplatform.v1beta1.FractionSplit; -import com.google.cloud.aiplatform.v1beta1.InputDataConfig; -import com.google.cloud.aiplatform.v1beta1.LocationName; -import com.google.cloud.aiplatform.v1beta1.Model; -import com.google.cloud.aiplatform.v1beta1.ModelContainerSpec; -import com.google.cloud.aiplatform.v1beta1.PipelineServiceClient; -import com.google.cloud.aiplatform.v1beta1.PipelineServiceSettings; -import com.google.cloud.aiplatform.v1beta1.Port; -import com.google.cloud.aiplatform.v1beta1.PredefinedSplit; -import com.google.cloud.aiplatform.v1beta1.PredictSchemata; -import com.google.cloud.aiplatform.v1beta1.SampledShapleyAttribution; -import com.google.cloud.aiplatform.v1beta1.TimestampSplit; -import com.google.cloud.aiplatform.v1beta1.TrainingPipeline; -import com.google.cloud.aiplatform.v1beta1.schema.trainingjob.definition.AutoMlTables; +import com.google.cloud.aiplatform.v1.DeployedModelRef; +import com.google.cloud.aiplatform.v1.EnvVar; +import com.google.cloud.aiplatform.v1.FilterSplit; +import com.google.cloud.aiplatform.v1.FractionSplit; +import com.google.cloud.aiplatform.v1.InputDataConfig; +import com.google.cloud.aiplatform.v1.LocationName; +import com.google.cloud.aiplatform.v1.Model; +import com.google.cloud.aiplatform.v1.ModelContainerSpec; +import com.google.cloud.aiplatform.v1.PipelineServiceClient; +import com.google.cloud.aiplatform.v1.PipelineServiceSettings; +import com.google.cloud.aiplatform.v1.Port; +import com.google.cloud.aiplatform.v1.PredefinedSplit; +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.protobuf.Value; -import com.google.protobuf.util.JsonFormat; import com.google.rpc.Status; import java.io.IOException; import java.util.ArrayList; @@ -295,25 +288,6 @@ static void createTrainingPipelineTableRegression( System.out.format("\t\tDeployed Model Id: %s\n", deployedModelRef.getDeployedModelId()); } - ExplanationSpec explanationSpec = modelResponse.getExplanationSpec(); - System.out.println("\tExplanation Spec"); - - ExplanationParameters explanationParameters = explanationSpec.getParameters(); - System.out.println("\t\tParameters"); - - SampledShapleyAttribution sampledShapleyAttribution = - explanationParameters.getSampledShapleyAttribution(); - System.out.println("\t\tSampled Shapley Attribution"); - System.out.format("\t\t\tPath Count: %s\n", sampledShapleyAttribution.getPathCount()); - - ExplanationMetadata explanationMetadata = explanationSpec.getMetadata(); - System.out.println("\t\tMetadata"); - System.out.format("\t\t\tInput: %s\n", explanationMetadata.getInputsMap()); - System.out.format("\t\t\tOutput: %s\n", explanationMetadata.getOutputsMap()); - System.out.format( - "\t\t\tFeature Attributions Schema Uri: %s\n", - explanationMetadata.getFeatureAttributionsSchemaUri()); - Status status = trainingPipelineResponse.getError(); System.out.println("\tError"); System.out.format("\t\tCode: %s\n", status.getCode()); diff --git a/samples/snippets/src/main/java/aiplatform/CreateTrainingPipelineTextClassificationSample.java b/samples/snippets/src/main/java/aiplatform/CreateTrainingPipelineTextClassificationSample.java index 194f2a71d..701d62949 100644 --- a/samples/snippets/src/main/java/aiplatform/CreateTrainingPipelineTextClassificationSample.java +++ b/samples/snippets/src/main/java/aiplatform/CreateTrainingPipelineTextClassificationSample.java @@ -19,26 +19,22 @@ // [START aiplatform_create_training_pipeline_text_classification_sample] import com.google.cloud.aiplatform.util.ValueConverter; -import com.google.cloud.aiplatform.v1beta1.DeployedModelRef; -import com.google.cloud.aiplatform.v1beta1.EnvVar; -import com.google.cloud.aiplatform.v1beta1.ExplanationMetadata; -import com.google.cloud.aiplatform.v1beta1.ExplanationParameters; -import com.google.cloud.aiplatform.v1beta1.ExplanationSpec; -import com.google.cloud.aiplatform.v1beta1.FilterSplit; -import com.google.cloud.aiplatform.v1beta1.FractionSplit; -import com.google.cloud.aiplatform.v1beta1.InputDataConfig; -import com.google.cloud.aiplatform.v1beta1.LocationName; -import com.google.cloud.aiplatform.v1beta1.Model; -import com.google.cloud.aiplatform.v1beta1.Model.ExportFormat; -import com.google.cloud.aiplatform.v1beta1.ModelContainerSpec; -import com.google.cloud.aiplatform.v1beta1.PipelineServiceClient; -import com.google.cloud.aiplatform.v1beta1.PipelineServiceSettings; -import com.google.cloud.aiplatform.v1beta1.Port; -import com.google.cloud.aiplatform.v1beta1.PredefinedSplit; -import com.google.cloud.aiplatform.v1beta1.PredictSchemata; -import com.google.cloud.aiplatform.v1beta1.SampledShapleyAttribution; -import com.google.cloud.aiplatform.v1beta1.TimestampSplit; -import com.google.cloud.aiplatform.v1beta1.TrainingPipeline; +import com.google.cloud.aiplatform.v1.DeployedModelRef; +import com.google.cloud.aiplatform.v1.EnvVar; +import com.google.cloud.aiplatform.v1.FilterSplit; +import com.google.cloud.aiplatform.v1.FractionSplit; +import com.google.cloud.aiplatform.v1.InputDataConfig; +import com.google.cloud.aiplatform.v1.LocationName; +import com.google.cloud.aiplatform.v1.Model; +import com.google.cloud.aiplatform.v1.Model.ExportFormat; +import com.google.cloud.aiplatform.v1.ModelContainerSpec; +import com.google.cloud.aiplatform.v1.PipelineServiceClient; +import com.google.cloud.aiplatform.v1.PipelineServiceSettings; +import com.google.cloud.aiplatform.v1.Port; +import com.google.cloud.aiplatform.v1.PredefinedSplit; +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.rpc.Status; import java.io.IOException; @@ -205,25 +201,6 @@ static void createTrainingPipelineTextClassificationSample( System.out.format("\t\t\tDeployed Model Id: %s\n", deployedModelRef.getDeployedModelId()); } - ExplanationSpec explanationSpec = modelResponse.getExplanationSpec(); - System.out.println("\t\tExplanation Spec"); - - ExplanationParameters explanationParameters = explanationSpec.getParameters(); - System.out.println("\t\t\tParameters"); - - SampledShapleyAttribution sampledShapleyAttribution = - explanationParameters.getSampledShapleyAttribution(); - System.out.println("\t\t\t\tSampled Shapley Attribution"); - System.out.format("\t\t\t\t\tPath Count: %s\n", sampledShapleyAttribution.getPathCount()); - - ExplanationMetadata explanationMetadata = explanationSpec.getMetadata(); - System.out.println("\t\t\tMetadata"); - System.out.format("\t\t\t\tInputs: %s\n", explanationMetadata.getInputsMap()); - System.out.format("\t\t\t\tOutputs: %s\n", explanationMetadata.getOutputsMap()); - System.out.format( - "\t\t\t\tFeature Attributions Schema_uri: %s\n", - explanationMetadata.getFeatureAttributionsSchemaUri()); - Status status = trainingPipelineResponse.getError(); System.out.println("\tError"); System.out.format("\t\tCode: %s\n", status.getCode()); diff --git a/samples/snippets/src/main/java/aiplatform/CreateTrainingPipelineTextEntityExtractionSample.java b/samples/snippets/src/main/java/aiplatform/CreateTrainingPipelineTextEntityExtractionSample.java index 577dc865a..63dc13484 100644 --- a/samples/snippets/src/main/java/aiplatform/CreateTrainingPipelineTextEntityExtractionSample.java +++ b/samples/snippets/src/main/java/aiplatform/CreateTrainingPipelineTextEntityExtractionSample.java @@ -19,28 +19,22 @@ // [START aiplatform_create_training_pipeline_text_entity_extraction_sample] import com.google.cloud.aiplatform.util.ValueConverter; -import com.google.cloud.aiplatform.v1beta1.DeployedModelRef; -import com.google.cloud.aiplatform.v1beta1.EnvVar; -import com.google.cloud.aiplatform.v1beta1.ExplanationMetadata; -import com.google.cloud.aiplatform.v1beta1.ExplanationParameters; -import com.google.cloud.aiplatform.v1beta1.ExplanationSpec; -import com.google.cloud.aiplatform.v1beta1.FilterSplit; -import com.google.cloud.aiplatform.v1beta1.FractionSplit; -import com.google.cloud.aiplatform.v1beta1.InputDataConfig; -import com.google.cloud.aiplatform.v1beta1.LocationName; -import com.google.cloud.aiplatform.v1beta1.Model; -import com.google.cloud.aiplatform.v1beta1.Model.ExportFormat; -import com.google.cloud.aiplatform.v1beta1.ModelContainerSpec; -import com.google.cloud.aiplatform.v1beta1.PipelineServiceClient; -import com.google.cloud.aiplatform.v1beta1.PipelineServiceSettings; -import com.google.cloud.aiplatform.v1beta1.Port; -import com.google.cloud.aiplatform.v1beta1.PredefinedSplit; -import com.google.cloud.aiplatform.v1beta1.PredictSchemata; -import com.google.cloud.aiplatform.v1beta1.SampledShapleyAttribution; -import com.google.cloud.aiplatform.v1beta1.TimestampSplit; -import com.google.cloud.aiplatform.v1beta1.TrainingPipeline; -import com.google.protobuf.Value; -import com.google.protobuf.util.JsonFormat; +import com.google.cloud.aiplatform.v1.DeployedModelRef; +import com.google.cloud.aiplatform.v1.EnvVar; +import com.google.cloud.aiplatform.v1.FilterSplit; +import com.google.cloud.aiplatform.v1.FractionSplit; +import com.google.cloud.aiplatform.v1.InputDataConfig; +import com.google.cloud.aiplatform.v1.LocationName; +import com.google.cloud.aiplatform.v1.Model; +import com.google.cloud.aiplatform.v1.Model.ExportFormat; +import com.google.cloud.aiplatform.v1.ModelContainerSpec; +import com.google.cloud.aiplatform.v1.PipelineServiceClient; +import com.google.cloud.aiplatform.v1.PipelineServiceSettings; +import com.google.cloud.aiplatform.v1.Port; +import com.google.cloud.aiplatform.v1.PredefinedSplit; +import com.google.cloud.aiplatform.v1.PredictSchemata; +import com.google.cloud.aiplatform.v1.TimestampSplit; +import com.google.cloud.aiplatform.v1.TrainingPipeline; import com.google.rpc.Status; import java.io.IOException; @@ -201,25 +195,6 @@ static void createTrainingPipelineTextEntityExtractionSample( System.out.format("\t\t\tDeployed Model Id: %s\n", deployedModelRef.getDeployedModelId()); } - ExplanationSpec explanationSpec = modelResponse.getExplanationSpec(); - System.out.println("\t\tExplanation Spec"); - - ExplanationParameters explanationParameters = explanationSpec.getParameters(); - System.out.println("\t\t\tParameters"); - - SampledShapleyAttribution sampledShapleyAttribution = - explanationParameters.getSampledShapleyAttribution(); - System.out.println("\t\t\t\tSampled Shapley Attribution"); - System.out.format("\t\t\t\t\tPath Count: %s\n", sampledShapleyAttribution.getPathCount()); - - ExplanationMetadata explanationMetadata = explanationSpec.getMetadata(); - System.out.println("\t\t\tMetadata"); - System.out.format("\t\t\t\tInputs: %s\n", explanationMetadata.getInputsMap()); - System.out.format("\t\t\t\tOutputs: %s\n", explanationMetadata.getOutputsMap()); - System.out.format( - "\t\t\t\tFeature Attributions Schema_uri: %s\n", - explanationMetadata.getFeatureAttributionsSchemaUri()); - Status status = trainingPipelineResponse.getError(); System.out.println("\tError"); System.out.format("\t\tCode: %s\n", status.getCode()); diff --git a/samples/snippets/src/main/java/aiplatform/CreateTrainingPipelineTextSentimentAnalysisSample.java b/samples/snippets/src/main/java/aiplatform/CreateTrainingPipelineTextSentimentAnalysisSample.java index 0a5903ae2..ef87a9bfd 100644 --- a/samples/snippets/src/main/java/aiplatform/CreateTrainingPipelineTextSentimentAnalysisSample.java +++ b/samples/snippets/src/main/java/aiplatform/CreateTrainingPipelineTextSentimentAnalysisSample.java @@ -19,27 +19,23 @@ // [START aiplatform_create_training_pipeline_text_sentiment_analysis_sample] import com.google.cloud.aiplatform.util.ValueConverter; -import com.google.cloud.aiplatform.v1beta1.DeployedModelRef; -import com.google.cloud.aiplatform.v1beta1.EnvVar; -import com.google.cloud.aiplatform.v1beta1.ExplanationMetadata; -import com.google.cloud.aiplatform.v1beta1.ExplanationParameters; -import com.google.cloud.aiplatform.v1beta1.ExplanationSpec; -import com.google.cloud.aiplatform.v1beta1.FilterSplit; -import com.google.cloud.aiplatform.v1beta1.FractionSplit; -import com.google.cloud.aiplatform.v1beta1.InputDataConfig; -import com.google.cloud.aiplatform.v1beta1.LocationName; -import com.google.cloud.aiplatform.v1beta1.Model; -import com.google.cloud.aiplatform.v1beta1.Model.ExportFormat; -import com.google.cloud.aiplatform.v1beta1.ModelContainerSpec; -import com.google.cloud.aiplatform.v1beta1.PipelineServiceClient; -import com.google.cloud.aiplatform.v1beta1.PipelineServiceSettings; -import com.google.cloud.aiplatform.v1beta1.Port; -import com.google.cloud.aiplatform.v1beta1.PredefinedSplit; -import com.google.cloud.aiplatform.v1beta1.PredictSchemata; -import com.google.cloud.aiplatform.v1beta1.SampledShapleyAttribution; -import com.google.cloud.aiplatform.v1beta1.TimestampSplit; -import com.google.cloud.aiplatform.v1beta1.TrainingPipeline; -import com.google.cloud.aiplatform.v1beta1.schema.trainingjob.definition.AutoMlTextSentimentInputs; +import com.google.cloud.aiplatform.v1.DeployedModelRef; +import com.google.cloud.aiplatform.v1.EnvVar; +import com.google.cloud.aiplatform.v1.FilterSplit; +import com.google.cloud.aiplatform.v1.FractionSplit; +import com.google.cloud.aiplatform.v1.InputDataConfig; +import com.google.cloud.aiplatform.v1.LocationName; +import com.google.cloud.aiplatform.v1.Model; +import com.google.cloud.aiplatform.v1.Model.ExportFormat; +import com.google.cloud.aiplatform.v1.ModelContainerSpec; +import com.google.cloud.aiplatform.v1.PipelineServiceClient; +import com.google.cloud.aiplatform.v1.PipelineServiceSettings; +import com.google.cloud.aiplatform.v1.Port; +import com.google.cloud.aiplatform.v1.PredefinedSplit; +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.v1.schema.trainingjob.definition.AutoMlTextSentimentInputs; import com.google.rpc.Status; import java.io.IOException; @@ -207,25 +203,6 @@ static void createTrainingPipelineTextSentimentAnalysisSample( System.out.format("\t\t\tDeployed Model Id: %s\n", deployedModelRef.getDeployedModelId()); } - ExplanationSpec explanationSpec = modelResponse.getExplanationSpec(); - System.out.println("\t\tExplanation Spec"); - - ExplanationParameters explanationParameters = explanationSpec.getParameters(); - System.out.println("\t\t\tParameters"); - - SampledShapleyAttribution sampledShapleyAttribution = - explanationParameters.getSampledShapleyAttribution(); - System.out.println("\t\t\t\tSampled Shapley Attribution"); - System.out.format("\t\t\t\t\tPath Count: %s\n", sampledShapleyAttribution.getPathCount()); - - ExplanationMetadata explanationMetadata = explanationSpec.getMetadata(); - System.out.println("\t\t\tMetadata"); - System.out.format("\t\t\t\tInputs: %s\n", explanationMetadata.getInputsMap()); - System.out.format("\t\t\t\tOutputs: %s\n", explanationMetadata.getOutputsMap()); - System.out.format( - "\t\t\t\tFeature Attributions Schema_uri: %s\n", - explanationMetadata.getFeatureAttributionsSchemaUri()); - Status status = trainingPipelineResponse.getError(); System.out.println("\tError"); System.out.format("\t\tCode: %s\n", status.getCode()); From 2b21ee42334f812bf26fc85c77bfeedc456d3291 Mon Sep 17 00:00:00 2001 From: Eric Schmidt Date: Wed, 31 Mar 2021 15:46:22 -0700 Subject: [PATCH 06/11] samples: more updates to v1 --- ...gPipelineVideoActionRecognitionSample.java | 16 ++++++------- ...ningPipelineVideoClassificationSample.java | 20 ++++++++-------- ...ningPipelineVideoObjectTrackingSample.java | 24 +++++++++---------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/samples/snippets/src/main/java/aiplatform/CreateTrainingPipelineVideoActionRecognitionSample.java b/samples/snippets/src/main/java/aiplatform/CreateTrainingPipelineVideoActionRecognitionSample.java index bd7320813..0b5ba9c06 100644 --- a/samples/snippets/src/main/java/aiplatform/CreateTrainingPipelineVideoActionRecognitionSample.java +++ b/samples/snippets/src/main/java/aiplatform/CreateTrainingPipelineVideoActionRecognitionSample.java @@ -18,14 +18,14 @@ // [START aiplatform_create_training_pipeline_video_action_recognition_sample] import com.google.cloud.aiplatform.util.ValueConverter; -import com.google.cloud.aiplatform.v1beta1.InputDataConfig; -import com.google.cloud.aiplatform.v1beta1.LocationName; -import com.google.cloud.aiplatform.v1beta1.Model; -import com.google.cloud.aiplatform.v1beta1.PipelineServiceClient; -import com.google.cloud.aiplatform.v1beta1.PipelineServiceSettings; -import com.google.cloud.aiplatform.v1beta1.TrainingPipeline; -import com.google.cloud.aiplatform.v1beta1.schema.trainingjob.definition.AutoMlVideoActionRecognitionInputs; -import com.google.cloud.aiplatform.v1beta1.schema.trainingjob.definition.AutoMlVideoActionRecognitionInputs.ModelType; +import com.google.cloud.aiplatform.v1.InputDataConfig; +import com.google.cloud.aiplatform.v1.LocationName; +import com.google.cloud.aiplatform.v1.Model; +import com.google.cloud.aiplatform.v1.PipelineServiceClient; +import com.google.cloud.aiplatform.v1.PipelineServiceSettings; +import com.google.cloud.aiplatform.v1.TrainingPipeline; +import com.google.cloud.aiplatform.v1.schema.trainingjob.definition.AutoMlVideoActionRecognitionInputs; +import com.google.cloud.aiplatform.v1.schema.trainingjob.definition.AutoMlVideoActionRecognitionInputs.ModelType; import java.io.IOException; public class CreateTrainingPipelineVideoActionRecognitionSample { diff --git a/samples/snippets/src/main/java/aiplatform/CreateTrainingPipelineVideoClassificationSample.java b/samples/snippets/src/main/java/aiplatform/CreateTrainingPipelineVideoClassificationSample.java index 7bb27c5ae..403476b24 100644 --- a/samples/snippets/src/main/java/aiplatform/CreateTrainingPipelineVideoClassificationSample.java +++ b/samples/snippets/src/main/java/aiplatform/CreateTrainingPipelineVideoClassificationSample.java @@ -19,16 +19,16 @@ // [START aiplatform_create_training_pipeline_video_classification_sample] import com.google.cloud.aiplatform.util.ValueConverter; -import com.google.cloud.aiplatform.v1beta1.FilterSplit; -import com.google.cloud.aiplatform.v1beta1.FractionSplit; -import com.google.cloud.aiplatform.v1beta1.InputDataConfig; -import com.google.cloud.aiplatform.v1beta1.LocationName; -import com.google.cloud.aiplatform.v1beta1.Model; -import com.google.cloud.aiplatform.v1beta1.PipelineServiceClient; -import com.google.cloud.aiplatform.v1beta1.PipelineServiceSettings; -import com.google.cloud.aiplatform.v1beta1.PredefinedSplit; -import com.google.cloud.aiplatform.v1beta1.TimestampSplit; -import com.google.cloud.aiplatform.v1beta1.TrainingPipeline; +import com.google.cloud.aiplatform.v1.FilterSplit; +import com.google.cloud.aiplatform.v1.FractionSplit; +import com.google.cloud.aiplatform.v1.InputDataConfig; +import com.google.cloud.aiplatform.v1.LocationName; +import com.google.cloud.aiplatform.v1.Model; +import com.google.cloud.aiplatform.v1.PipelineServiceClient; +import com.google.cloud.aiplatform.v1.PipelineServiceSettings; +import com.google.cloud.aiplatform.v1.PredefinedSplit; +import com.google.cloud.aiplatform.v1.TimestampSplit; +import com.google.cloud.aiplatform.v1.TrainingPipeline; import com.google.rpc.Status; import java.io.IOException; diff --git a/samples/snippets/src/main/java/aiplatform/CreateTrainingPipelineVideoObjectTrackingSample.java b/samples/snippets/src/main/java/aiplatform/CreateTrainingPipelineVideoObjectTrackingSample.java index 5cc64fe71..ffbb4e41d 100644 --- a/samples/snippets/src/main/java/aiplatform/CreateTrainingPipelineVideoObjectTrackingSample.java +++ b/samples/snippets/src/main/java/aiplatform/CreateTrainingPipelineVideoObjectTrackingSample.java @@ -19,18 +19,18 @@ // [START aiplatform_create_training_pipeline_video_object_tracking_sample] import com.google.cloud.aiplatform.util.ValueConverter; -import com.google.cloud.aiplatform.v1beta1.FilterSplit; -import com.google.cloud.aiplatform.v1beta1.FractionSplit; -import com.google.cloud.aiplatform.v1beta1.InputDataConfig; -import com.google.cloud.aiplatform.v1beta1.LocationName; -import com.google.cloud.aiplatform.v1beta1.Model; -import com.google.cloud.aiplatform.v1beta1.PipelineServiceClient; -import com.google.cloud.aiplatform.v1beta1.PipelineServiceSettings; -import com.google.cloud.aiplatform.v1beta1.PredefinedSplit; -import com.google.cloud.aiplatform.v1beta1.TimestampSplit; -import com.google.cloud.aiplatform.v1beta1.TrainingPipeline; -import com.google.cloud.aiplatform.v1beta1.schema.trainingjob.definition.AutoMlVideoObjectTrackingInputs; -import com.google.cloud.aiplatform.v1beta1.schema.trainingjob.definition.AutoMlVideoObjectTrackingInputs.ModelType; +import com.google.cloud.aiplatform.v1.FilterSplit; +import com.google.cloud.aiplatform.v1.FractionSplit; +import com.google.cloud.aiplatform.v1.InputDataConfig; +import com.google.cloud.aiplatform.v1.LocationName; +import com.google.cloud.aiplatform.v1.Model; +import com.google.cloud.aiplatform.v1.PipelineServiceClient; +import com.google.cloud.aiplatform.v1.PipelineServiceSettings; +import com.google.cloud.aiplatform.v1.PredefinedSplit; +import com.google.cloud.aiplatform.v1.TimestampSplit; +import com.google.cloud.aiplatform.v1.TrainingPipeline; +import com.google.cloud.aiplatform.v1.schema.trainingjob.definition.AutoMlVideoObjectTrackingInputs; +import com.google.cloud.aiplatform.v1.schema.trainingjob.definition.AutoMlVideoObjectTrackingInputs.ModelType; import com.google.rpc.Status; import java.io.IOException; From 71307f7bb2806a777b30174ffad298a657381539 Mon Sep 17 00:00:00 2001 From: Eric Schmidt Date: Wed, 14 Apr 2021 12:15:11 -0700 Subject: [PATCH 07/11] fix: reset files from other PR --- .../aiplatform/CreateDatasetImageSample.java | 10 +++--- .../java/aiplatform/CreateDatasetSample.java | 10 +++--- .../CreateDatasetTabularBigquerySample.java | 12 +++---- .../CreateDatasetTabularGcsSample.java | 10 +++--- .../aiplatform/CreateDatasetTextSample.java | 10 +++--- .../aiplatform/CreateDatasetVideoSample.java | 10 +++--- .../java/aiplatform/CreateEndpointSample.java | 10 +++--- ...parameterTuningJobPythonPackageSample.java | 36 +++++++++---------- .../CreateHyperparameterTuningJobSample.java | 20 +++++------ 9 files changed, 64 insertions(+), 64 deletions(-) diff --git a/samples/snippets/src/main/java/aiplatform/CreateDatasetImageSample.java b/samples/snippets/src/main/java/aiplatform/CreateDatasetImageSample.java index 6fcb27157..0ce9767c4 100644 --- a/samples/snippets/src/main/java/aiplatform/CreateDatasetImageSample.java +++ b/samples/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.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.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 java.io.IOException; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; diff --git a/samples/snippets/src/main/java/aiplatform/CreateDatasetSample.java b/samples/snippets/src/main/java/aiplatform/CreateDatasetSample.java index 0b0817f69..233a2e677 100644 --- a/samples/snippets/src/main/java/aiplatform/CreateDatasetSample.java +++ b/samples/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.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.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 java.io.IOException; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; diff --git a/samples/snippets/src/main/java/aiplatform/CreateDatasetTabularBigquerySample.java b/samples/snippets/src/main/java/aiplatform/CreateDatasetTabularBigquerySample.java index fd7628be2..bcaf5c94e 100644 --- a/samples/snippets/src/main/java/aiplatform/CreateDatasetTabularBigquerySample.java +++ b/samples/snippets/src/main/java/aiplatform/CreateDatasetTabularBigquerySample.java @@ -1,5 +1,5 @@ /* - * Copyright 2021 Google LLC + * Copyright 2020 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.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.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.protobuf.Value; import com.google.protobuf.util.JsonFormat; import java.io.IOException; diff --git a/samples/snippets/src/main/java/aiplatform/CreateDatasetTabularGcsSample.java b/samples/snippets/src/main/java/aiplatform/CreateDatasetTabularGcsSample.java index 87bb139c9..2b2f17f41 100644 --- a/samples/snippets/src/main/java/aiplatform/CreateDatasetTabularGcsSample.java +++ b/samples/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.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.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.protobuf.Value; import com.google.protobuf.util.JsonFormat; import java.io.IOException; diff --git a/samples/snippets/src/main/java/aiplatform/CreateDatasetTextSample.java b/samples/snippets/src/main/java/aiplatform/CreateDatasetTextSample.java index bb4fa16fe..ff3c93ee4 100644 --- a/samples/snippets/src/main/java/aiplatform/CreateDatasetTextSample.java +++ b/samples/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.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.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 java.io.IOException; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; diff --git a/samples/snippets/src/main/java/aiplatform/CreateDatasetVideoSample.java b/samples/snippets/src/main/java/aiplatform/CreateDatasetVideoSample.java index 65e96a7c8..537525c81 100644 --- a/samples/snippets/src/main/java/aiplatform/CreateDatasetVideoSample.java +++ b/samples/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.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.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 java.io.IOException; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; diff --git a/samples/snippets/src/main/java/aiplatform/CreateEndpointSample.java b/samples/snippets/src/main/java/aiplatform/CreateEndpointSample.java index e0d921434..382ebe2b3 100644 --- a/samples/snippets/src/main/java/aiplatform/CreateEndpointSample.java +++ b/samples/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.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 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 java.io.IOException; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; diff --git a/samples/snippets/src/main/java/aiplatform/CreateHyperparameterTuningJobPythonPackageSample.java b/samples/snippets/src/main/java/aiplatform/CreateHyperparameterTuningJobPythonPackageSample.java index 0d86232e2..9d1937f3d 100644 --- a/samples/snippets/src/main/java/aiplatform/CreateHyperparameterTuningJobPythonPackageSample.java +++ b/samples/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.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 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 java.io.IOException; import java.util.Arrays; diff --git a/samples/snippets/src/main/java/aiplatform/CreateHyperparameterTuningJobSample.java b/samples/snippets/src/main/java/aiplatform/CreateHyperparameterTuningJobSample.java index b2295270a..37e66d512 100644 --- a/samples/snippets/src/main/java/aiplatform/CreateHyperparameterTuningJobSample.java +++ b/samples/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.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 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 java.io.IOException; public class CreateHyperparameterTuningJobSample { From a702f2f86761df37b1f01cfceb7a135121ee31d3 Mon Sep 17 00:00:00 2001 From: Eric Schmidt Date: Thu, 15 Apr 2021 14:20:35 -0700 Subject: [PATCH 08/11] fix: tests --- .../test/java/aiplatform/CancelTrainingPipelineSampleTest.java | 2 +- .../CreateHyperparameterTuningJobPythonPackageSampleTest.java | 2 +- .../aiplatform/CreateHyperparameterTuningJobSampleTest.java | 2 +- ...eTrainingPipelineCustomTrainingManagedDatasetSampleTest.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/samples/snippets/src/test/java/aiplatform/CancelTrainingPipelineSampleTest.java b/samples/snippets/src/test/java/aiplatform/CancelTrainingPipelineSampleTest.java index f3daec201..a95073f9d 100644 --- a/samples/snippets/src/test/java/aiplatform/CancelTrainingPipelineSampleTest.java +++ b/samples/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/samples/snippets/src/test/java/aiplatform/CreateHyperparameterTuningJobPythonPackageSampleTest.java b/samples/snippets/src/test/java/aiplatform/CreateHyperparameterTuningJobPythonPackageSampleTest.java index 486322ce4..3cc2b9944 100644 --- a/samples/snippets/src/test/java/aiplatform/CreateHyperparameterTuningJobPythonPackageSampleTest.java +++ b/samples/snippets/src/test/java/aiplatform/CreateHyperparameterTuningJobPythonPackageSampleTest.java @@ -39,7 +39,7 @@ 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/samples/snippets/src/test/java/aiplatform/CreateHyperparameterTuningJobSampleTest.java b/samples/snippets/src/test/java/aiplatform/CreateHyperparameterTuningJobSampleTest.java index be9273c6e..a5a35add3 100644 --- a/samples/snippets/src/test/java/aiplatform/CreateHyperparameterTuningJobSampleTest.java +++ b/samples/snippets/src/test/java/aiplatform/CreateHyperparameterTuningJobSampleTest.java @@ -35,7 +35,7 @@ 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/samples/snippets/src/test/java/aiplatform/CreateTrainingPipelineCustomTrainingManagedDatasetSampleTest.java b/samples/snippets/src/test/java/aiplatform/CreateTrainingPipelineCustomTrainingManagedDatasetSampleTest.java index 9065f8191..ff1f16237 100644 --- a/samples/snippets/src/test/java/aiplatform/CreateTrainingPipelineCustomTrainingManagedDatasetSampleTest.java +++ b/samples/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 = From 9bc07b123528044516b8aa7425fdbd8996f41e0a Mon Sep 17 00:00:00 2001 From: Eric Schmidt Date: Thu, 15 Apr 2021 14:34:22 -0700 Subject: [PATCH 09/11] fix: lint --- .../aiplatform/CreateHyperparameterTuningJobSampleTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/samples/snippets/src/test/java/aiplatform/CreateHyperparameterTuningJobSampleTest.java b/samples/snippets/src/test/java/aiplatform/CreateHyperparameterTuningJobSampleTest.java index a5a35add3..48343412a 100644 --- a/samples/snippets/src/test/java/aiplatform/CreateHyperparameterTuningJobSampleTest.java +++ b/samples/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-sample-tests/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; From 7a9b21ddeae8c23278ea0abed593089fcaec198d Mon Sep 17 00:00:00 2001 From: Eric Schmidt Date: Mon, 19 Apr 2021 12:58:59 -0700 Subject: [PATCH 10/11] fix: linter --- .../CreateHyperparameterTuningJobPythonPackageSampleTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/samples/snippets/src/test/java/aiplatform/CreateHyperparameterTuningJobPythonPackageSampleTest.java b/samples/snippets/src/test/java/aiplatform/CreateHyperparameterTuningJobPythonPackageSampleTest.java index 3cc2b9944..8d580b3b2 100644 --- a/samples/snippets/src/test/java/aiplatform/CreateHyperparameterTuningJobPythonPackageSampleTest.java +++ b/samples/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://cloud-samples-data-us-central1/ai-platform-unified/training/python-packages/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; From 5397170c9f3fbf0c434a9e469dfffbb56631d938 Mon Sep 17 00:00:00 2001 From: Eric Schmidt Date: Mon, 19 Apr 2021 13:16:14 -0700 Subject: [PATCH 11/11] fix: lint --- .../CreateHyperparameterTuningJobPythonPackageSampleTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/snippets/src/test/java/aiplatform/CreateHyperparameterTuningJobPythonPackageSampleTest.java b/samples/snippets/src/test/java/aiplatform/CreateHyperparameterTuningJobPythonPackageSampleTest.java index 8d580b3b2..041428624 100644 --- a/samples/snippets/src/test/java/aiplatform/CreateHyperparameterTuningJobPythonPackageSampleTest.java +++ b/samples/snippets/src/test/java/aiplatform/CreateHyperparameterTuningJobPythonPackageSampleTest.java @@ -39,8 +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://cloud-samples-data-us-central1/ai-platform-unified/training/python-packages/" + - "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;