Skip to content

Commit 2a0bbdc

Browse files
telpiriontelpirion
authored
samples: updates samples to v1 (3 of 8) (#215)
* samples: updates the samples to v1 (3 of 10) * samples: more updates to v1
1 parent c257d88 commit 2a0bbdc

14 files changed

+716
-900
lines changed

‎aiplatform/snippets/src/main/java/aiplatform/CreateTrainingPipelineCustomJobSample.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2020 Google LLC
2+
* Copyright 2021 Google LLC
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -17,12 +17,12 @@
1717
package aiplatform;
1818

1919
// [START aiplatform_create_training_pipeline_custom_job_sample]
20-
import com.google.cloud.aiplatform.v1beta1.LocationName;
21-
import com.google.cloud.aiplatform.v1beta1.Model;
22-
import com.google.cloud.aiplatform.v1beta1.ModelContainerSpec;
23-
import com.google.cloud.aiplatform.v1beta1.PipelineServiceClient;
24-
import com.google.cloud.aiplatform.v1beta1.PipelineServiceSettings;
25-
import com.google.cloud.aiplatform.v1beta1.TrainingPipeline;
20+
import com.google.cloud.aiplatform.v1.LocationName;
21+
import com.google.cloud.aiplatform.v1.Model;
22+
import com.google.cloud.aiplatform.v1.ModelContainerSpec;
23+
import com.google.cloud.aiplatform.v1.PipelineServiceClient;
24+
import com.google.cloud.aiplatform.v1.PipelineServiceSettings;
25+
import com.google.cloud.aiplatform.v1.TrainingPipeline;
2626
import com.google.gson.JsonArray;
2727
import com.google.gson.JsonObject;
2828
import com.google.protobuf.Value;

‎aiplatform/snippets/src/main/java/aiplatform/CreateTrainingPipelineCustomTrainingManagedDatasetSample.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
package aiplatform;
1818

1919
// [START aiplatform_create_training_pipeline_custom_training_managed_dataset_sample]
20-
import com.google.cloud.aiplatform.v1beta1.GcsDestination;
21-
import com.google.cloud.aiplatform.v1beta1.InputDataConfig;
22-
import com.google.cloud.aiplatform.v1beta1.LocationName;
23-
import com.google.cloud.aiplatform.v1beta1.Model;
24-
import com.google.cloud.aiplatform.v1beta1.ModelContainerSpec;
25-
import com.google.cloud.aiplatform.v1beta1.PipelineServiceClient;
26-
import com.google.cloud.aiplatform.v1beta1.PipelineServiceSettings;
27-
import com.google.cloud.aiplatform.v1beta1.TrainingPipeline;
20+
import com.google.cloud.aiplatform.v1.GcsDestination;
21+
import com.google.cloud.aiplatform.v1.InputDataConfig;
22+
import com.google.cloud.aiplatform.v1.LocationName;
23+
import com.google.cloud.aiplatform.v1.Model;
24+
import com.google.cloud.aiplatform.v1.ModelContainerSpec;
25+
import com.google.cloud.aiplatform.v1.PipelineServiceClient;
26+
import com.google.cloud.aiplatform.v1.PipelineServiceSettings;
27+
import com.google.cloud.aiplatform.v1.TrainingPipeline;
2828
import com.google.gson.JsonArray;
2929
import com.google.gson.JsonObject;
3030
import com.google.protobuf.Value;

‎aiplatform/snippets/src/main/java/aiplatform/CreateTrainingPipelineImageClassificationSample.java‎

Lines changed: 18 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -18,28 +18,24 @@
1818

1919
// [START aiplatform_create_training_pipeline_image_classification_sample]
2020
import com.google.cloud.aiplatform.util.ValueConverter;
21-
import com.google.cloud.aiplatform.v1beta1.DeployedModelRef;
22-
import com.google.cloud.aiplatform.v1beta1.EnvVar;
23-
import com.google.cloud.aiplatform.v1beta1.ExplanationMetadata;
24-
import com.google.cloud.aiplatform.v1beta1.ExplanationParameters;
25-
import com.google.cloud.aiplatform.v1beta1.ExplanationSpec;
26-
import com.google.cloud.aiplatform.v1beta1.FilterSplit;
27-
import com.google.cloud.aiplatform.v1beta1.FractionSplit;
28-
import com.google.cloud.aiplatform.v1beta1.InputDataConfig;
29-
import com.google.cloud.aiplatform.v1beta1.LocationName;
30-
import com.google.cloud.aiplatform.v1beta1.Model;
31-
import com.google.cloud.aiplatform.v1beta1.Model.ExportFormat;
32-
import com.google.cloud.aiplatform.v1beta1.ModelContainerSpec;
33-
import com.google.cloud.aiplatform.v1beta1.PipelineServiceClient;
34-
import com.google.cloud.aiplatform.v1beta1.PipelineServiceSettings;
35-
import com.google.cloud.aiplatform.v1beta1.Port;
36-
import com.google.cloud.aiplatform.v1beta1.PredefinedSplit;
37-
import com.google.cloud.aiplatform.v1beta1.PredictSchemata;
38-
import com.google.cloud.aiplatform.v1beta1.SampledShapleyAttribution;
39-
import com.google.cloud.aiplatform.v1beta1.TimestampSplit;
40-
import com.google.cloud.aiplatform.v1beta1.TrainingPipeline;
41-
import com.google.cloud.aiplatform.v1beta1.schema.trainingjob.definition.AutoMlImageClassificationInputs;
42-
import com.google.cloud.aiplatform.v1beta1.schema.trainingjob.definition.AutoMlImageClassificationInputs.ModelType;
21+
import com.google.cloud.aiplatform.v1.DeployedModelRef;
22+
import com.google.cloud.aiplatform.v1.EnvVar;
23+
import com.google.cloud.aiplatform.v1.FilterSplit;
24+
import com.google.cloud.aiplatform.v1.FractionSplit;
25+
import com.google.cloud.aiplatform.v1.InputDataConfig;
26+
import com.google.cloud.aiplatform.v1.LocationName;
27+
import com.google.cloud.aiplatform.v1.Model;
28+
import com.google.cloud.aiplatform.v1.Model.ExportFormat;
29+
import com.google.cloud.aiplatform.v1.ModelContainerSpec;
30+
import com.google.cloud.aiplatform.v1.PipelineServiceClient;
31+
import com.google.cloud.aiplatform.v1.PipelineServiceSettings;
32+
import com.google.cloud.aiplatform.v1.Port;
33+
import com.google.cloud.aiplatform.v1.PredefinedSplit;
34+
import com.google.cloud.aiplatform.v1.PredictSchemata;
35+
import com.google.cloud.aiplatform.v1.TimestampSplit;
36+
import com.google.cloud.aiplatform.v1.TrainingPipeline;
37+
import com.google.cloud.aiplatform.v1.schema.trainingjob.definition.AutoMlImageClassificationInputs;
38+
import com.google.cloud.aiplatform.v1.schema.trainingjob.definition.AutoMlImageClassificationInputs.ModelType;
4339
import com.google.rpc.Status;
4440
import java.io.IOException;
4541

@@ -204,25 +200,6 @@ static void createTrainingPipelineImageClassificationSample(
204200
System.out.format("Deployed Model Id: %s\n", deployedModelRef.getDeployedModelId());
205201
}
206202

207-
ExplanationSpec explanationSpec = modelResponse.getExplanationSpec();
208-
System.out.println("Explanation Spec");
209-
210-
ExplanationParameters explanationParameters = explanationSpec.getParameters();
211-
System.out.println("Parameters");
212-
213-
SampledShapleyAttribution sampledShapleyAttribution =
214-
explanationParameters.getSampledShapleyAttribution();
215-
System.out.println("Sampled Shapley Attribution");
216-
System.out.format("Path Count: %s\n", sampledShapleyAttribution.getPathCount());
217-
218-
ExplanationMetadata explanationMetadata = explanationSpec.getMetadata();
219-
System.out.println("Metadata");
220-
System.out.format("Inputs: %s\n", explanationMetadata.getInputsMap());
221-
System.out.format("Outputs: %s\n", explanationMetadata.getOutputsMap());
222-
System.out.format(
223-
"Feature Attributions Schema_uri: %s\n",
224-
explanationMetadata.getFeatureAttributionsSchemaUri());
225-
226203
Status status = trainingPipelineResponse.getError();
227204
System.out.println("Error");
228205
System.out.format("Code: %s\n", status.getCode());

‎aiplatform/snippets/src/main/java/aiplatform/CreateTrainingPipelineImageObjectDetectionSample.java‎

Lines changed: 16 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -19,26 +19,22 @@
1919
// [START aiplatform_create_training_pipeline_image_object_detection_sample]
2020

2121
import com.google.cloud.aiplatform.util.ValueConverter;
22-
import com.google.cloud.aiplatform.v1beta1.DeployedModelRef;
23-
import com.google.cloud.aiplatform.v1beta1.EnvVar;
24-
import com.google.cloud.aiplatform.v1beta1.ExplanationMetadata;
25-
import com.google.cloud.aiplatform.v1beta1.ExplanationParameters;
26-
import com.google.cloud.aiplatform.v1beta1.ExplanationSpec;
27-
import com.google.cloud.aiplatform.v1beta1.FilterSplit;
28-
import com.google.cloud.aiplatform.v1beta1.FractionSplit;
29-
import com.google.cloud.aiplatform.v1beta1.InputDataConfig;
30-
import com.google.cloud.aiplatform.v1beta1.LocationName;
31-
import com.google.cloud.aiplatform.v1beta1.Model;
32-
import com.google.cloud.aiplatform.v1beta1.Model.ExportFormat;
33-
import com.google.cloud.aiplatform.v1beta1.ModelContainerSpec;
34-
import com.google.cloud.aiplatform.v1beta1.PipelineServiceClient;
35-
import com.google.cloud.aiplatform.v1beta1.PipelineServiceSettings;
36-
import com.google.cloud.aiplatform.v1beta1.Port;
37-
import com.google.cloud.aiplatform.v1beta1.PredefinedSplit;
38-
import com.google.cloud.aiplatform.v1beta1.PredictSchemata;
39-
import com.google.cloud.aiplatform.v1beta1.SampledShapleyAttribution;
40-
import com.google.cloud.aiplatform.v1beta1.TimestampSplit;
41-
import com.google.cloud.aiplatform.v1beta1.TrainingPipeline;
22+
import com.google.cloud.aiplatform.v1.DeployedModelRef;
23+
import com.google.cloud.aiplatform.v1.EnvVar;
24+
import com.google.cloud.aiplatform.v1.FilterSplit;
25+
import com.google.cloud.aiplatform.v1.FractionSplit;
26+
import com.google.cloud.aiplatform.v1.InputDataConfig;
27+
import com.google.cloud.aiplatform.v1.LocationName;
28+
import com.google.cloud.aiplatform.v1.Model;
29+
import com.google.cloud.aiplatform.v1.Model.ExportFormat;
30+
import com.google.cloud.aiplatform.v1.ModelContainerSpec;
31+
import com.google.cloud.aiplatform.v1.PipelineServiceClient;
32+
import com.google.cloud.aiplatform.v1.PipelineServiceSettings;
33+
import com.google.cloud.aiplatform.v1.Port;
34+
import com.google.cloud.aiplatform.v1.PredefinedSplit;
35+
import com.google.cloud.aiplatform.v1.PredictSchemata;
36+
import com.google.cloud.aiplatform.v1.TimestampSplit;
37+
import com.google.cloud.aiplatform.v1.TrainingPipeline;
4238
import com.google.cloud.aiplatform.v1beta1.schema.trainingjob.definition.AutoMlImageObjectDetectionInputs;
4339
import com.google.cloud.aiplatform.v1beta1.schema.trainingjob.definition.AutoMlImageObjectDetectionInputs.ModelType;
4440
import com.google.rpc.Status;
@@ -204,25 +200,6 @@ static void createTrainingPipelineImageObjectDetectionSample(
204200
System.out.format("Deployed Model Id: %s\n", deployedModelRef.getDeployedModelId());
205201
}
206202

207-
ExplanationSpec explanationSpec = modelResponse.getExplanationSpec();
208-
System.out.println("Explanation Spec");
209-
210-
ExplanationParameters explanationParameters = explanationSpec.getParameters();
211-
System.out.println("Parameters");
212-
213-
SampledShapleyAttribution sampledShapleyAttribution =
214-
explanationParameters.getSampledShapleyAttribution();
215-
System.out.println("Sampled Shapley Attribution");
216-
System.out.format("Path Count: %s\n", sampledShapleyAttribution.getPathCount());
217-
218-
ExplanationMetadata explanationMetadata = explanationSpec.getMetadata();
219-
System.out.println("Metadata");
220-
System.out.format("Inputs: %s\n", explanationMetadata.getInputsMap());
221-
System.out.format("Outputs: %s\n", explanationMetadata.getOutputsMap());
222-
System.out.format(
223-
"Feature Attributions Schema_uri: %s\n",
224-
explanationMetadata.getFeatureAttributionsSchemaUri());
225-
226203
Status status = trainingPipelineResponse.getError();
227204
System.out.println("Error");
228205
System.out.format("Code: %s\n", status.getCode());

‎aiplatform/snippets/src/main/java/aiplatform/CreateTrainingPipelineSample.java‎

Lines changed: 16 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -18,26 +18,22 @@
1818

1919
// [START aiplatform_create_training_pipeline_sample]
2020

21-
import com.google.cloud.aiplatform.v1beta1.DeployedModelRef;
22-
import com.google.cloud.aiplatform.v1beta1.EnvVar;
23-
import com.google.cloud.aiplatform.v1beta1.ExplanationMetadata;
24-
import com.google.cloud.aiplatform.v1beta1.ExplanationParameters;
25-
import com.google.cloud.aiplatform.v1beta1.ExplanationSpec;
26-
import com.google.cloud.aiplatform.v1beta1.FilterSplit;
27-
import com.google.cloud.aiplatform.v1beta1.FractionSplit;
28-
import com.google.cloud.aiplatform.v1beta1.InputDataConfig;
29-
import com.google.cloud.aiplatform.v1beta1.LocationName;
30-
import com.google.cloud.aiplatform.v1beta1.Model;
31-
import com.google.cloud.aiplatform.v1beta1.Model.ExportFormat;
32-
import com.google.cloud.aiplatform.v1beta1.ModelContainerSpec;
33-
import com.google.cloud.aiplatform.v1beta1.PipelineServiceClient;
34-
import com.google.cloud.aiplatform.v1beta1.PipelineServiceSettings;
35-
import com.google.cloud.aiplatform.v1beta1.Port;
36-
import com.google.cloud.aiplatform.v1beta1.PredefinedSplit;
37-
import com.google.cloud.aiplatform.v1beta1.PredictSchemata;
38-
import com.google.cloud.aiplatform.v1beta1.SampledShapleyAttribution;
39-
import com.google.cloud.aiplatform.v1beta1.TimestampSplit;
40-
import com.google.cloud.aiplatform.v1beta1.TrainingPipeline;
21+
import com.google.cloud.aiplatform.v1.DeployedModelRef;
22+
import com.google.cloud.aiplatform.v1.EnvVar;
23+
import com.google.cloud.aiplatform.v1.FilterSplit;
24+
import com.google.cloud.aiplatform.v1.FractionSplit;
25+
import com.google.cloud.aiplatform.v1.InputDataConfig;
26+
import com.google.cloud.aiplatform.v1.LocationName;
27+
import com.google.cloud.aiplatform.v1.Model;
28+
import com.google.cloud.aiplatform.v1.Model.ExportFormat;
29+
import com.google.cloud.aiplatform.v1.ModelContainerSpec;
30+
import com.google.cloud.aiplatform.v1.PipelineServiceClient;
31+
import com.google.cloud.aiplatform.v1.PipelineServiceSettings;
32+
import com.google.cloud.aiplatform.v1.Port;
33+
import com.google.cloud.aiplatform.v1.PredefinedSplit;
34+
import com.google.cloud.aiplatform.v1.PredictSchemata;
35+
import com.google.cloud.aiplatform.v1.TimestampSplit;
36+
import com.google.cloud.aiplatform.v1.TrainingPipeline;
4137
import com.google.protobuf.Value;
4238
import com.google.protobuf.util.JsonFormat;
4339
import com.google.rpc.Status;
@@ -204,25 +200,6 @@ static void createTrainingPipelineSample(
204200
System.out.format("Deployed Model Id: %s\n", deployedModelRef.getDeployedModelId());
205201
}
206202

207-
ExplanationSpec explanationSpec = modelResponse.getExplanationSpec();
208-
System.out.println("Explanation Spec");
209-
210-
ExplanationParameters explanationParameters = explanationSpec.getParameters();
211-
System.out.println("Parameters");
212-
213-
SampledShapleyAttribution sampledShapleyAttribution =
214-
explanationParameters.getSampledShapleyAttribution();
215-
System.out.println("Sampled Shapley Attribution");
216-
System.out.format("Path Count: %s\n", sampledShapleyAttribution.getPathCount());
217-
218-
ExplanationMetadata explanationMetadata = explanationSpec.getMetadata();
219-
System.out.println("Metadata");
220-
System.out.format("Inputs: %s\n", explanationMetadata.getInputsMap());
221-
System.out.format("Outputs: %s\n", explanationMetadata.getOutputsMap());
222-
System.out.format(
223-
"Feature Attributions Schema_uri: %s\n",
224-
explanationMetadata.getFeatureAttributionsSchemaUri());
225-
226203
Status status = trainingPipelineResponse.getError();
227204
System.out.println("Error");
228205
System.out.format("Code: %s\n", status.getCode());

0 commit comments

Comments
 (0)