feat: updates enhanced client library veneer and samples (#73)

GoogleCloudPlatform · Feb 12, 2021 · 4dc0382 · 4dc0382
1 parent 66ff554
commit 4dc0382
Show file tree

Hide file tree

Showing 31 changed files with 60 additions and 59 deletions.
diff --git a/ai-platform/snippets/create-batch-prediction-job-video-classification.js b/ai-platform/snippets/create-batch-prediction-job-video-classification.js
@@ -38,12 +38,10 @@ async function main(
   // const project = 'YOUR_PROJECT_ID';
   // const location = 'YOUR_PROJECT_LOCATION';
   const aiplatform = require('@google-cloud/aiplatform');
-  const {
-    params,
-  } = aiplatform.protos.google.cloud.aiplatform.v1beta1.schema.predict;
+  const {params} = aiplatform.protos.google.cloud.aiplatform.v1.schema.predict;
 
   // Imports the Google Cloud Job Service Client library
-  const {JobServiceClient} = require('@google-cloud/aiplatform');
+  const {JobServiceClient} = require('@google-cloud/aiplatform').v1;
 
   // Specifies the location of the api endpoint
   const clientOptions = {

diff --git a/ai-platform/snippets/create-batch-prediction-job-video-object-tracking.js b/ai-platform/snippets/create-batch-prediction-job-video-object-tracking.js
@@ -38,12 +38,10 @@ async function main(
   // const project = 'YOUR_PROJECT_ID';
   // const location = 'YOUR_PROJECT_LOCATION';
   const aiplatform = require('@google-cloud/aiplatform');
-  const {
-    params,
-  } = aiplatform.protos.google.cloud.aiplatform.v1beta1.schema.predict;
+  const {params} = aiplatform.protos.google.cloud.aiplatform.v1.schema.predict;
 
   // Imports the Google Cloud Job Service Client library
-  const {JobServiceClient} = require('@google-cloud/aiplatform');
+  const {JobServiceClient} = require('@google-cloud/aiplatform').v1;
 
   // Specifies the location of the api endpoint
   const clientOptions = {

diff --git a/ai-platform/snippets/create-training-pipeline-image-classification.js b/ai-platform/snippets/create-training-pipeline-image-classification.js
@@ -40,7 +40,7 @@ function main(
 
   const {
     definition,
-  } = aiplatform.protos.google.cloud.aiplatform.v1beta1.schema.trainingjob;
+  } = aiplatform.protos.google.cloud.aiplatform.v1.schema.trainingjob;
   const ModelType = definition.AutoMlImageClassificationInputs.ModelType;
 
   // Specifies the location of the api endpoint
@@ -49,9 +49,8 @@ function main(
   };
 
   // Instantiates a client
-  const pipelineServiceClient = new aiplatform.PipelineServiceClient(
-    clientOptions
-  );
+  const {PipelineServiceClient} = aiplatform.v1;
+  const pipelineServiceClient = new PipelineServiceClient(clientOptions);
 
   async function createTrainingPipelineImageClassification() {
     // Configure the parent resource

diff --git a/ai-platform/snippets/create-training-pipeline-image-object-detection.js b/ai-platform/snippets/create-training-pipeline-image-object-detection.js
@@ -38,11 +38,11 @@ async function main(
   const aiplatform = require('@google-cloud/aiplatform');
   const {
     definition,
-  } = aiplatform.protos.google.cloud.aiplatform.v1beta1.schema.trainingjob;
+  } = aiplatform.protos.google.cloud.aiplatform.v1.schema.trainingjob;
   const ModelType = definition.AutoMlImageObjectDetectionInputs.ModelType;
 
   // Imports the Google Cloud Pipeline Service Client library
-  const {PipelineServiceClient} = aiplatform;
+  const {PipelineServiceClient} = aiplatform.v1;
 
   // Specifies the location of the api endpoint
   const clientOptions = {

diff --git a/ai-platform/snippets/create-training-pipeline-tabular-classification.js b/ai-platform/snippets/create-training-pipeline-tabular-classification.js
@@ -39,10 +39,10 @@ async function main(
   const aiplatform = require('@google-cloud/aiplatform');
   const {
     definition,
-  } = aiplatform.protos.google.cloud.aiplatform.v1beta1.schema.trainingjob;
+  } = aiplatform.protos.google.cloud.aiplatform.v1.schema.trainingjob;
 
   // Imports the Google Cloud Pipeline Service Client library
-  const {PipelineServiceClient} = aiplatform;
+  const {PipelineServiceClient} = aiplatform.v1;
   // Specifies the location of the api endpoint
   const clientOptions = {
     apiEndpoint: 'us-central1-aiplatform.googleapis.com',

diff --git a/ai-platform/snippets/create-training-pipeline-tabular-regression.js b/ai-platform/snippets/create-training-pipeline-tabular-regression.js
@@ -39,10 +39,10 @@ async function main(
   const aiplatform = require('@google-cloud/aiplatform');
   const {
     definition,
-  } = aiplatform.protos.google.cloud.aiplatform.v1beta1.schema.trainingjob;
+  } = aiplatform.protos.google.cloud.aiplatform.v1.schema.trainingjob;
 
   // Imports the Google Cloud Pipeline Service Client library
-  const {PipelineServiceClient} = aiplatform;
+  const {PipelineServiceClient} = aiplatform.v1;
   // Specifies the location of the api endpoint
   const clientOptions = {
     apiEndpoint: 'us-central1-aiplatform.googleapis.com',

diff --git a/ai-platform/snippets/create-training-pipeline-text-classification.js b/ai-platform/snippets/create-training-pipeline-text-classification.js
@@ -37,10 +37,10 @@ async function main(
   const aiplatform = require('@google-cloud/aiplatform');
   const {
     definition,
-  } = aiplatform.protos.google.cloud.aiplatform.v1beta1.schema.trainingjob;
+  } = aiplatform.protos.google.cloud.aiplatform.v1.schema.trainingjob;
 
   // Imports the Google Cloud Pipeline Service Client library
-  const {PipelineServiceClient} = aiplatform;
+  const {PipelineServiceClient} = aiplatform.v1;
 
   // Specifies the location of the api endpoint
   const clientOptions = {

diff --git a/ai-platform/snippets/create-training-pipeline-text-entity-extraction.js b/ai-platform/snippets/create-training-pipeline-text-entity-extraction.js
@@ -37,10 +37,10 @@ async function main(
   const aiplatform = require('@google-cloud/aiplatform');
   const {
     definition,
-  } = aiplatform.protos.google.cloud.aiplatform.v1beta1.schema.trainingjob;
+  } = aiplatform.protos.google.cloud.aiplatform.v1.schema.trainingjob;
 
   // Imports the Google Cloud Pipeline Service Client library
-  const {PipelineServiceClient} = aiplatform;
+  const {PipelineServiceClient} = aiplatform.v1;
 
   // Specifies the location of the api endpoint
   const clientOptions = {

diff --git a/ai-platform/snippets/create-training-pipeline-text-sentiment-analysis.js b/ai-platform/snippets/create-training-pipeline-text-sentiment-analysis.js
@@ -37,10 +37,10 @@ async function main(
   const aiplatform = require('@google-cloud/aiplatform');
   const {
     definition,
-  } = aiplatform.protos.google.cloud.aiplatform.v1beta1.schema.trainingjob;
+  } = aiplatform.protos.google.cloud.aiplatform.v1.schema.trainingjob;
 
   // Imports the Google Cloud Pipeline Service Client library
-  const {PipelineServiceClient} = aiplatform;
+  const {PipelineServiceClient} = aiplatform.v1;
 
   // Specifies the location of the api endpoint
   const clientOptions = {

diff --git a/ai-platform/snippets/create-training-pipeline-video-classification.js b/ai-platform/snippets/create-training-pipeline-video-classification.js
@@ -37,10 +37,10 @@ async function main(
   const aiplatform = require('@google-cloud/aiplatform');
   const {
     definition,
-  } = aiplatform.protos.google.cloud.aiplatform.v1beta1.schema.trainingjob;
+  } = aiplatform.protos.google.cloud.aiplatform.v1.schema.trainingjob;
 
   // Imports the Google Cloud Pipeline Service Client library
-  const {PipelineServiceClient} = aiplatform;
+  const {PipelineServiceClient} = aiplatform.v1;
 
   // Specifies the location of the api endpoint
   const clientOptions = {

diff --git a/ai-platform/snippets/create-training-pipeline-video-object-tracking.js b/ai-platform/snippets/create-training-pipeline-video-object-tracking.js
@@ -37,11 +37,11 @@ async function main(
   const aiplatform = require('@google-cloud/aiplatform');
   const {
     definition,
-  } = aiplatform.protos.google.cloud.aiplatform.v1beta1.schema.trainingjob;
+  } = aiplatform.protos.google.cloud.aiplatform.v1.schema.trainingjob;
   const ModelType = definition.AutoMlVideoObjectTrackingInputs.ModelType;
 
   // Imports the Google Cloud Pipeline Service Client library
-  const {PipelineServiceClient} = aiplatform;
+  const {PipelineServiceClient} = aiplatform.v1;
 
   // Specifies the location of the api endpoint
   const clientOptions = {

diff --git a/ai-platform/snippets/get-model-evaluation-tabular-classification.js b/ai-platform/snippets/get-model-evaluation-tabular-classification.js
@@ -57,11 +57,11 @@ async function main(modelId, evaluationId, project, location = 'us-central1') {
 
     const modelExplanation = response.modelExplanation;
     console.log('\tModel explanation');
-    if (modelExplanation === null) {
+    if (!modelExplanation) {
       console.log('\t\t{}');
     } else {
       const meanAttributions = modelExplanation.meanAttributions;
-      if (meanAttributions === null) {
+      if (!meanAttributions) {
         console.log('\t\t\t []');
       } else {
         for (const meanAttribution of meanAttributions) {

diff --git a/ai-platform/snippets/get-model-evaluation-tabular-regression.js b/ai-platform/snippets/get-model-evaluation-tabular-regression.js
@@ -58,11 +58,11 @@ async function main(modelId, evaluationId, project, location = 'us-central1') {
 
     const modelExplanation = response.modelExplanation;
     console.log('\tModel explanation');
-    if (modelExplanation === null) {
+    if (!modelExplanation) {
       console.log('\t\t{}');
     } else {
       const meanAttributions = modelExplanation.meanAttributions;
-      if (meanAttributions === null) {
+      if (!meanAttributions) {
         console.log('\t\t\t []');
       } else {
         for (const meanAttribution of meanAttributions) {

diff --git a/ai-platform/snippets/predict-image-classification.js b/ai-platform/snippets/predict-image-classification.js
@@ -32,10 +32,10 @@ function main(filename, endpointId, project, location = 'us-central1') {
     instance,
     params,
     prediction,
-  } = aiplatform.protos.google.cloud.aiplatform.v1beta1.schema.predict;
+  } = aiplatform.protos.google.cloud.aiplatform.v1.schema.predict;
 
   // Imports the Google Cloud Prediction Service Client library
-  const {PredictionServiceClient} = aiplatform;
+  const {PredictionServiceClient} = aiplatform.v1;
 
   // Specifies the location of the api endpoint
   const clientOptions = {

diff --git a/ai-platform/snippets/predict-image-object-detection.js b/ai-platform/snippets/predict-image-object-detection.js
@@ -32,10 +32,10 @@ async function main(filename, endpointId, project, location = 'us-central1') {
     instance,
     params,
     prediction,
-  } = aiplatform.protos.google.cloud.aiplatform.v1beta1.schema.predict;
+  } = aiplatform.protos.google.cloud.aiplatform.v1.schema.predict;
 
   // Imports the Google Cloud Prediction Service Client library
-  const {PredictionServiceClient} = aiplatform;
+  const {PredictionServiceClient} = aiplatform.v1;
 
   // Specifies the location of the api endpoint
   const clientOptions = {

diff --git a/ai-platform/snippets/predict-tabular-classification.js b/ai-platform/snippets/predict-tabular-classification.js
@@ -29,10 +29,13 @@ async function main(endpointId, project, location = 'us-central1') {
   const aiplatform = require('@google-cloud/aiplatform');
   const {
     prediction,
-  } = aiplatform.protos.google.cloud.aiplatform.v1beta1.schema.predict;
+  } = aiplatform.protos.google.cloud.aiplatform.v1.schema.predict;
 
-  // Imports the Google Cloud Prediction Service Client library
-  const {PredictionServiceClient, helpers} = aiplatform;
+  // Imports the Google Cloud Prediction service client
+  const {PredictionServiceClient} = aiplatform.v1;
+
+  // Import the helper module for converting arbitrary protobuf.Value objects.
+  const {helpers} = aiplatform;
 
   // Specifies the location of the api endpoint
   const clientOptions = {

diff --git a/ai-platform/snippets/predict-tabular-regression.js b/ai-platform/snippets/predict-tabular-regression.js
@@ -29,10 +29,13 @@ async function main(endpointId, project, location = 'us-central1') {
   const aiplatform = require('@google-cloud/aiplatform');
   const {
     prediction,
-  } = aiplatform.protos.google.cloud.aiplatform.v1beta1.schema.predict;
+  } = aiplatform.protos.google.cloud.aiplatform.v1.schema.predict;
 
-  // Imports the Google Cloud Prediction Service Client library
-  const {PredictionServiceClient, helpers} = aiplatform;
+  // Imports the Google Cloud Prediction service client
+  const {PredictionServiceClient} = aiplatform.v1;
+
+  // Import the helper module for converting arbitrary protobuf.Value objects.
+  const {helpers} = aiplatform;
 
   // Specifies the location of the api endpoint
   const clientOptions = {

diff --git a/ai-platform/snippets/predict-text-classification.js b/ai-platform/snippets/predict-text-classification.js
@@ -31,10 +31,10 @@ async function main(text, endpointId, project, location) {
   const {
     instance,
     prediction,
-  } = aiplatform.protos.google.cloud.aiplatform.v1beta1.schema.predict;
+  } = aiplatform.protos.google.cloud.aiplatform.v1.schema.predict;
 
   // Imports the Google Cloud Model Service Client library
-  const {PredictionServiceClient} = aiplatform;
+  const {PredictionServiceClient} = aiplatform.v1;
 
   // Specifies the location of the api endpoint
   const clientOptions = {

diff --git a/ai-platform/snippets/predict-text-entity-extraction.js b/ai-platform/snippets/predict-text-entity-extraction.js
@@ -31,10 +31,10 @@ async function main(text, endpointId, project, location = 'us-central1') {
   const {
     instance,
     prediction,
-  } = aiplatform.protos.google.cloud.aiplatform.v1beta1.schema.predict;
+  } = aiplatform.protos.google.cloud.aiplatform.v1.schema.predict;
 
   // Imports the Google Cloud Model Service Client library
-  const {PredictionServiceClient} = aiplatform;
+  const {PredictionServiceClient} = aiplatform.v1;
 
   // Specifies the location of the api endpoint
   const clientOptions = {

diff --git a/ai-platform/snippets/predict-text-sentiment-analysis.js b/ai-platform/snippets/predict-text-sentiment-analysis.js
@@ -31,10 +31,10 @@ async function main(text, endpointId, project, location = 'us-central1') {
   const {
     instance,
     prediction,
-  } = aiplatform.protos.google.cloud.aiplatform.v1beta1.schema.predict;
+  } = aiplatform.protos.google.cloud.aiplatform.v1.schema.predict;
 
   // Imports the Google Cloud Model Service Client library
-  const {PredictionServiceClient} = aiplatform;
+  const {PredictionServiceClient} = aiplatform.v1;
 
   // Specifies the location of the api endpoint
   const clientOptions = {

diff --git a/ai-platform/snippets/test/create-batch-prediction-job-video-classification.test.js b/ai-platform/snippets/test/create-batch-prediction-job-video-classification.test.js
@@ -29,7 +29,7 @@ const clientOptions = {
   apiEndpoint: 'us-central1-aiplatform.googleapis.com',
 };
 
-const jobServiceClient = new aiplatform.JobServiceClient(clientOptions);
+const jobServiceClient = new aiplatform.v1.JobServiceClient(clientOptions);
 
 const batchPredictionDisplayName = `temp_create_batch_prediction_video_classification_test${uuid()}`;
 const modelId = '8596984660557299712';

diff --git a/ai-platform/snippets/test/create-batch-prediction-job-video-object-tracking.test.js b/ai-platform/snippets/test/create-batch-prediction-job-video-object-tracking.test.js
@@ -29,7 +29,7 @@ const clientOptions = {
   apiEndpoint: 'us-central1-aiplatform.googleapis.com',
 };
 
-const jobServiceClient = new aiplatform.JobServiceClient(clientOptions);
+const jobServiceClient = new aiplatform.v1.JobServiceClient(clientOptions);
 
 const batchPredictionDisplayName = `temp_create_batch_prediction_video_object_tracking_test${uuid()}`;
 const modelId = '8609932509485989888';

diff --git a/ai-platform/snippets/test/create-training-pipeline-image-classification.test.js b/ai-platform/snippets/test/create-training-pipeline-image-classification.test.js
@@ -28,7 +28,7 @@ const clientOptions = {
   apiEndpoint: 'us-central1-aiplatform.googleapis.com',
 };
 
-const pipelineServiceClient = new aiplatform.PipelineServiceClient(
+const pipelineServiceClient = new aiplatform.v1.PipelineServiceClient(
   clientOptions
 );
 

diff --git a/ai-platform/snippets/test/create-training-pipeline-image-object-detection.test.js b/ai-platform/snippets/test/create-training-pipeline-image-object-detection.test.js
@@ -30,7 +30,7 @@ const clientOptions = {
   apiEndpoint: 'us-central1-aiplatform.googleapis.com',
 };
 
-const pipelineServiceClient = new aiplatform.PipelineServiceClient(
+const pipelineServiceClient = new aiplatform.v1.PipelineServiceClient(
   clientOptions
 );
 

diff --git a/ai-platform/snippets/test/create-training-pipeline-tabular-classification.test.js b/ai-platform/snippets/test/create-training-pipeline-tabular-classification.test.js
@@ -30,7 +30,7 @@ const clientOptions = {
   apiEndpoint: 'us-central1-aiplatform.googleapis.com',
 };
 
-const pipelineServiceClient = new aiplatform.PipelineServiceClient(
+const pipelineServiceClient = new aiplatform.v1.PipelineServiceClient(
   clientOptions
 );
 

diff --git a/ai-platform/snippets/test/create-training-pipeline-tabular-regression.test.js b/ai-platform/snippets/test/create-training-pipeline-tabular-regression.test.js
@@ -30,7 +30,7 @@ const clientOptions = {
   apiEndpoint: 'us-central1-aiplatform.googleapis.com',
 };
 
-const pipelineServiceClient = new aiplatform.PipelineServiceClient(
+const pipelineServiceClient = new aiplatform.v1.PipelineServiceClient(
   clientOptions
 );
 

diff --git a/ai-platform/snippets/test/create-training-pipeline-text-classification.test.js b/ai-platform/snippets/test/create-training-pipeline-text-classification.test.js
@@ -30,7 +30,7 @@ const clientOptions = {
   apiEndpoint: 'us-central1-aiplatform.googleapis.com',
 };
 
-const pipelineServiceClient = new aiplatform.PipelineServiceClient(
+const pipelineServiceClient = new aiplatform.v1.PipelineServiceClient(
   clientOptions
 );
 

diff --git a/ai-platform/snippets/test/create-training-pipeline-text-entity-extraction.test.js b/ai-platform/snippets/test/create-training-pipeline-text-entity-extraction.test.js
@@ -30,7 +30,7 @@ const clientOptions = {
   apiEndpoint: 'us-central1-aiplatform.googleapis.com',
 };
 
-const pipelineServiceClient = new aiplatform.PipelineServiceClient(
+const pipelineServiceClient = new aiplatform.v1.PipelineServiceClient(
   clientOptions
 );
 

diff --git a/ai-platform/snippets/test/create-training-pipeline-text-sentiment-analysis.test.js b/ai-platform/snippets/test/create-training-pipeline-text-sentiment-analysis.test.js
@@ -30,7 +30,7 @@ const clientOptions = {
   apiEndpoint: 'us-central1-aiplatform.googleapis.com',
 };
 
-const pipelineServiceClient = new aiplatform.PipelineServiceClient(
+const pipelineServiceClient = new aiplatform.v1.PipelineServiceClient(
   clientOptions
 );
 

diff --git a/ai-platform/snippets/test/create-training-pipeline-video-classification.test.js b/ai-platform/snippets/test/create-training-pipeline-video-classification.test.js
@@ -30,7 +30,7 @@ const clientOptions = {
   apiEndpoint: 'us-central1-aiplatform.googleapis.com',
 };
 
-const pipelineServiceClient = new aiplatform.PipelineServiceClient(
+const pipelineServiceClient = new aiplatform.v1.PipelineServiceClient(
   clientOptions
 );
 

diff --git a/ai-platform/snippets/test/create-training-pipeline-video-object-tracking.test.js b/ai-platform/snippets/test/create-training-pipeline-video-object-tracking.test.js
@@ -30,7 +30,7 @@ const clientOptions = {
   apiEndpoint: 'us-central1-aiplatform.googleapis.com',
 };
 
-const pipelineServiceClient = new aiplatform.PipelineServiceClient(
+const pipelineServiceClient = new aiplatform.v1.PipelineServiceClient(
   clientOptions
 );