Skip to content

Commit

Permalink
samples: updates samples to v1 (1 of 8) (#206)
Browse files Browse the repository at this point in the history
* samples: updates samples to v1
* samples: adds NLP batch jobs
* samples: update copyright, added some env vars
* fix: test teardowns
  • Loading branch information
telpirion authored Apr 15, 2021
1 parent af5228b commit 0c8edf6
Show file tree
Hide file tree
Showing 36 changed files with 892 additions and 285 deletions.
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -18,9 +18,9 @@

// [START aiplatform_cancel_batch_prediction_job_sample]

import com.google.cloud.aiplatform.v1beta1.BatchPredictionJobName;
import com.google.cloud.aiplatform.v1beta1.JobServiceClient;
import com.google.cloud.aiplatform.v1beta1.JobServiceSettings;
import com.google.cloud.aiplatform.v1.BatchPredictionJobName;
import com.google.cloud.aiplatform.v1.JobServiceClient;
import com.google.cloud.aiplatform.v1.JobServiceSettings;
import java.io.IOException;

public class CancelBatchPredictionJobSample {
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -18,9 +18,9 @@

// [START aiplatform_cancel_data_labeling_job_sample]

import com.google.cloud.aiplatform.v1beta1.DataLabelingJobName;
import com.google.cloud.aiplatform.v1beta1.JobServiceClient;
import com.google.cloud.aiplatform.v1beta1.JobServiceSettings;
import com.google.cloud.aiplatform.v1.DataLabelingJobName;
import com.google.cloud.aiplatform.v1.JobServiceClient;
import com.google.cloud.aiplatform.v1.JobServiceSettings;
import java.io.IOException;

public class CancelDataLabelingJobSample {
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -18,9 +18,9 @@

// [START aiplatform_cancel_training_pipeline_sample]

import com.google.cloud.aiplatform.v1beta1.PipelineServiceClient;
import com.google.cloud.aiplatform.v1beta1.PipelineServiceSettings;
import com.google.cloud.aiplatform.v1beta1.TrainingPipelineName;
import com.google.cloud.aiplatform.v1.PipelineServiceClient;
import com.google.cloud.aiplatform.v1.PipelineServiceSettings;
import com.google.cloud.aiplatform.v1.TrainingPipelineName;
import java.io.IOException;

public class CancelTrainingPipelineSample {
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -17,13 +17,13 @@
package aiplatform;

// [START aiplatform_create_batch_prediction_job_bigquery_sample]
import com.google.cloud.aiplatform.v1beta1.BatchPredictionJob;
import com.google.cloud.aiplatform.v1beta1.BigQueryDestination;
import com.google.cloud.aiplatform.v1beta1.BigQuerySource;
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.ModelName;
import com.google.cloud.aiplatform.v1.BatchPredictionJob;
import com.google.cloud.aiplatform.v1.BigQueryDestination;
import com.google.cloud.aiplatform.v1.BigQuerySource;
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.ModelName;
import com.google.gson.JsonObject;
import com.google.protobuf.Value;
import com.google.protobuf.util.JsonFormat;
Expand Down Expand Up @@ -95,8 +95,6 @@ static void createBatchPredictionJobBigquerySample(
.setModelParameters(modelParameters)
.setInputConfig(inputConfig)
.setOutputConfig(outputConfig)
// optional
.setGenerateExplanation(true)
.build();
LocationName parent = LocationName.of(project, location);
BatchPredictionJob response = client.createBatchPredictionJob(parent, batchPredictionJob);
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -17,19 +17,18 @@
package aiplatform;

// [START aiplatform_create_batch_prediction_job_sample]
import com.google.cloud.aiplatform.v1beta1.AcceleratorType;
import com.google.cloud.aiplatform.v1beta1.BatchDedicatedResources;
import com.google.cloud.aiplatform.v1beta1.BatchPredictionJob;
import com.google.cloud.aiplatform.v1beta1.GcsDestination;
import com.google.cloud.aiplatform.v1beta1.GcsSource;
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.ModelName;
import com.google.gson.JsonObject;
import com.google.cloud.aiplatform.util.ValueConverter;
import com.google.cloud.aiplatform.v1.AcceleratorType;
import com.google.cloud.aiplatform.v1.BatchDedicatedResources;
import com.google.cloud.aiplatform.v1.BatchPredictionJob;
import com.google.cloud.aiplatform.v1.GcsDestination;
import com.google.cloud.aiplatform.v1.GcsSource;
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.ModelName;
import com.google.protobuf.Value;
import com.google.protobuf.util.JsonFormat;
import java.io.IOException;

public class CreateBatchPredictionJobSample {
Expand Down Expand Up @@ -74,10 +73,7 @@ static void createBatchPredictionJobSample(
try (JobServiceClient client = JobServiceClient.create(settings)) {

// Passing in an empty Value object for model parameters
JsonObject jsonModelParameters = new JsonObject();
Value.Builder modelParametersBuilder = Value.newBuilder();
JsonFormat.parser().merge(jsonModelParameters.toString(), modelParametersBuilder);
Value modelParameters = modelParametersBuilder.build();
Value modelParameters = ValueConverter.EMPTY_VALUE;

GcsSource gcsSource = GcsSource.newBuilder().addUris(gcsSourceUri).build();
BatchPredictionJob.InputConfig inputConfig =
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
/*
* 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_batch_prediction_job_text_classification_sample]
import com.google.api.gax.rpc.ApiException;
import com.google.cloud.aiplatform.v1.BatchPredictionJob;
import com.google.cloud.aiplatform.v1.GcsDestination;
import com.google.cloud.aiplatform.v1.GcsSource;
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.ModelName;
import java.io.IOException;

public class CreateBatchPredictionJobTextClassificationSample {

public static void main(String[] args) throws IOException {
// TODO(developer): Replace these variables before running the sample.
String project = "PROJECT";
String location = "us-central1";
String displayName = "DISPLAY_NAME";
String modelId = "MODEL_ID";
String gcsSourceUri = "GCS_SOURCE_URI";
String gcsDestinationOutputUriPrefix = "GCS_DESTINATION_OUTPUT_URI_PREFIX";
createBatchPredictionJobTextClassificationSample(
project, location, displayName, modelId, gcsSourceUri, gcsDestinationOutputUriPrefix);
}

static void createBatchPredictionJobTextClassificationSample(
String project,
String location,
String displayName,
String modelId,
String gcsSourceUri,
String gcsDestinationOutputUriPrefix)
throws IOException {
// The AI Platform services require regional API endpoints.
JobServiceSettings settings =
JobServiceSettings.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 (JobServiceClient client = JobServiceClient.create(settings)) {
try {
String modelName = ModelName.of(project, location, modelId).toString();
GcsSource gcsSource = GcsSource.newBuilder().addUris(gcsSourceUri).build();
BatchPredictionJob.InputConfig inputConfig =
BatchPredictionJob.InputConfig.newBuilder()
.setInstancesFormat("jsonl")
.setGcsSource(gcsSource)
.build();
GcsDestination gcsDestination =
GcsDestination.newBuilder().setOutputUriPrefix(gcsDestinationOutputUriPrefix).build();
BatchPredictionJob.OutputConfig outputConfig =
BatchPredictionJob.OutputConfig.newBuilder()
.setPredictionsFormat("jsonl")
.setGcsDestination(gcsDestination)
.build();
BatchPredictionJob batchPredictionJob =
BatchPredictionJob.newBuilder()
.setDisplayName(displayName)
.setModel(modelName)
.setInputConfig(inputConfig)
.setOutputConfig(outputConfig)
.build();
LocationName parent = LocationName.of(project, location);
BatchPredictionJob response = client.createBatchPredictionJob(parent, batchPredictionJob);
System.out.format("response: %s\n", response);
} catch (ApiException ex) {
System.out.format("Exception: %s\n", ex.getLocalizedMessage());
}
}
}
}

// [END aiplatform_create_batch_prediction_job_text_classification_sample]
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
/*
* 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_batch_prediction_job_text_entity_extraction_sample]
import com.google.api.gax.rpc.ApiException;
import com.google.cloud.aiplatform.v1.BatchPredictionJob;
import com.google.cloud.aiplatform.v1.GcsDestination;
import com.google.cloud.aiplatform.v1.GcsSource;
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.ModelName;
import java.io.IOException;

public class CreateBatchPredictionJobTextEntityExtractionSample {

public static void main(String[] args) throws IOException {
// TODO(developer): Replace these variables before running the sample.
String project = "PROJECT";
String location = "us-central1";
String displayName = "DISPLAY_NAME";
String modelId = "MODEL_ID";
String gcsSourceUri = "GCS_SOURCE_URI";
String gcsDestinationOutputUriPrefix = "GCS_DESTINATION_OUTPUT_URI_PREFIX";
createBatchPredictionJobTextEntityExtractionSample(
project, location, displayName, modelId, gcsSourceUri, gcsDestinationOutputUriPrefix);
}

static void createBatchPredictionJobTextEntityExtractionSample(
String project,
String location,
String displayName,
String modelId,
String gcsSourceUri,
String gcsDestinationOutputUriPrefix)
throws IOException {
// The AI Platform services require regional API endpoints.
JobServiceSettings settings =
JobServiceSettings.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 (JobServiceClient client = JobServiceClient.create(settings)) {
try {
String modelName = ModelName.of(project, location, modelId).toString();
GcsSource gcsSource = GcsSource.newBuilder().addUris(gcsSourceUri).build();
BatchPredictionJob.InputConfig inputConfig =
BatchPredictionJob.InputConfig.newBuilder()
.setInstancesFormat("jsonl")
.setGcsSource(gcsSource)
.build();
GcsDestination gcsDestination =
GcsDestination.newBuilder().setOutputUriPrefix(gcsDestinationOutputUriPrefix).build();
BatchPredictionJob.OutputConfig outputConfig =
BatchPredictionJob.OutputConfig.newBuilder()
.setPredictionsFormat("jsonl")
.setGcsDestination(gcsDestination)
.build();
BatchPredictionJob batchPredictionJob =
BatchPredictionJob.newBuilder()
.setDisplayName(displayName)
.setModel(modelName)
.setInputConfig(inputConfig)
.setOutputConfig(outputConfig)
.build();
LocationName parent = LocationName.of(project, location);
BatchPredictionJob response = client.createBatchPredictionJob(parent, batchPredictionJob);
System.out.format("response: %s\n", response);
System.out.format("\tname:%s\n", response.getName());
} catch (ApiException ex) {
System.out.format("Exception: %s\n", ex.getLocalizedMessage());
}
}
}
}

// [END aiplatform_create_batch_prediction_job_text_entity_extraction_sample]
Loading

0 comments on commit 0c8edf6

Please sign in to comment.