samples: updates samples to v1 (3 of 8) (#215)

* samples: updates the samples to v1 (3 of 10) * samples: more updates to v1
GoogleCloudPlatform · Apr 21, 2021 · 2a0bbdc · 2a0bbdc
1 parent c257d88
commit 2a0bbdc
Show file tree

Hide file tree

Showing 14 changed files with 716 additions and 900 deletions.
diff --git a/aiplatform/snippets/src/main/java/aiplatform/CreateTrainingPipelineCustomJobSample.java b/aiplatform/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/...ts/src/main/java/aiplatform/CreateTrainingPipelineCustomTrainingManagedDatasetSample.java b/...ts/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/...rm/snippets/src/main/java/aiplatform/CreateTrainingPipelineImageClassificationSample.java b/...rm/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/...m/snippets/src/main/java/aiplatform/CreateTrainingPipelineImageObjectDetectionSample.java b/...m/snippets/src/main/java/aiplatform/CreateTrainingPipelineImageObjectDetectionSample.java
@@ -19,26 +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.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.rpc.Status;
@@ -204,25 +200,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/aiplatform/snippets/src/main/java/aiplatform/CreateTrainingPipelineSample.java b/aiplatform/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());