Skip to content

Commit e36e3dd

Browse files
nnegreynnegrey
authored
Update model evaluation due to canonical sample changes (#1743)
* Update model evaluation due to canonical sample changes * Update GetModelEvaluation.java * Run formatter and lint
1 parent 816eb78 commit e36e3dd

File tree

3 files changed

+104
-14
lines changed

3 files changed

+104
-14
lines changed

‎automl/cloud-client/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ small section of code to print out the `metadata` field.
5656
* [Delete Dataset](src/main/java/com/example/automl/DeleteDataset.java)
5757
### Model Management
5858
* [List Models](src/main/java/com/example/automl/ListModels.java)
59-
* [List Model Evaluation](src/main/java/com/example/automl/ListModelEvaluations.java)
59+
* [List Model Evaluation](src/main/java/com/example/automl/ListModelEvaluations.java) - For each AutoML Type the `metrics` field inside the model is unique, therefore each AutoML Type will have a small section of code to print out the `metrics` field.
6060
* [Get Model](src/main/java/com/example/automl/)
61-
* [Get Model Evaluation](src/main/java/com/example/automl/GetModelEvaluation.java)
61+
* [Get Model Evaluation](src/main/java/com/example/automl/GetModelEvaluation.java) - For each AutoML Type the `metrics` field inside the model is unique, therefore each AutoML Type will have a small section of code to print out the `metrics` field.
6262
* [Delete Model](src/main/java/com/example/automl/DeleteModel.java)
6363
* [Deploy Model](src/main/java/com/example/automl/DeployModel.java) - Not supported by Translation
6464
* [Uneploy Model](src/main/java/com/example/automl/UndeployModel.java) - Not supported by Translation

‎automl/cloud-client/src/main/java/com/example/automl/GetModelEvaluation.java‎

Lines changed: 51 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,13 @@
1616

1717
package com.example.automl;
1818

19-
// [START automl_get_model_evaluation]
19+
// [START automl_language_entity_extraction_get_model_evaluation]
20+
// [START automl_language_sentiment_analysis_get_model_evaluation]
21+
// [START automl_language_text_classification_get_model_evaluation]
22+
// [START automl_translate_get_model_evaluation]
23+
// [START automl_vision_classification_get_model_evaluation]
24+
// [START automl_vision_object_detection_get_model_evaluation]
25+
2026
import com.google.cloud.automl.v1.AutoMlClient;
2127
import com.google.cloud.automl.v1.ModelEvaluation;
2228
import com.google.cloud.automl.v1.ModelEvaluationName;
@@ -35,14 +41,14 @@ static void getModelEvaluation() throws IOException {
3541

3642
// Get a model evaluation
3743
static void getModelEvaluation(String projectId, String modelId, String modelEvaluationId)
38-
throws IOException {
44+
throws IOException {
3945
// Initialize client that will be used to send requests. This client only needs to be created
4046
// once, and can be reused for multiple requests. After completing all of your requests, call
4147
// the "close" method on the client to safely clean up any remaining background resources.
4248
try (AutoMlClient client = AutoMlClient.create()) {
4349
// Get the full path of the model evaluation.
4450
ModelEvaluationName modelEvaluationFullId =
45-
ModelEvaluationName.of(projectId, "us-central1", modelId, modelEvaluationId);
51+
ModelEvaluationName.of(projectId, "us-central1", modelId, modelEvaluationId);
4652

4753
// Get complete detail of the model evaluation.
4854
ModelEvaluation modelEvaluation = client.getModelEvaluation(modelEvaluationFullId);
@@ -53,10 +59,49 @@ static void getModelEvaluation(String projectId, String modelId, String modelEva
5359
System.out.format("\tseconds: %s\n", modelEvaluation.getCreateTime().getSeconds());
5460
System.out.format("\tnanos: %s", modelEvaluation.getCreateTime().getNanos() / 1e9);
5561
System.out.format(
56-
"Evalution Example Count: %d\n", modelEvaluation.getEvaluatedExampleCount());
62+
"Evalution Example Count: %d\n", modelEvaluation.getEvaluatedExampleCount());
63+
// [END automl_language_sentiment_analysis_get_model_evaluation]
64+
// [END automl_language_text_classification_get_model_evaluation]
65+
// [END automl_translate_get_model_evaluation]
66+
// [END automl_vision_classification_get_model_evaluation]
67+
// [END automl_vision_object_detection_get_model_evaluation]
68+
System.out.format("Entity Extraction Model Evaluation Metrics: %s\n",
69+
modelEvaluation.getTextExtractionEvaluationMetrics());
70+
// [END automl_language_entity_extraction_get_model_evaluation]
71+
72+
// [START automl_language_sentiment_analysis_get_model_evaluation]
73+
System.out.format("Sentiment Analysis Model Evaluation Metrics: %s\n",
74+
modelEvaluation.getTextSentimentEvaluationMetrics());
75+
// [END automl_language_sentiment_analysis_get_model_evaluation]
76+
77+
// [START automl_language_text_classification_get_model_evaluation]
78+
// [START automl_vision_classification_get_model_evaluation]
79+
System.out.format("Classification Model Evaluation Metrics: %s\n",
80+
modelEvaluation.getClassificationEvaluationMetrics());
81+
// [END automl_language_text_classification_get_model_evaluation]
82+
// [END automl_vision_classification_get_model_evaluation]
83+
84+
// [START automl_translate_get_model_evaluation]
5785
System.out.format(
58-
"Model Evaluation Metrics: %s\n", modelEvaluation.getTranslationEvaluationMetrics());
86+
"Translate Model Evaluation Metrics: %s\n",
87+
modelEvaluation.getTranslationEvaluationMetrics());
88+
// [END automl_translate_get_model_evaluation]
89+
90+
91+
// [START automl_vision_object_detection_get_model_evaluation]
92+
System.out.format("Object Detection Model Evaluation Metrics: %s\n",
93+
modelEvaluation.getImageObjectDetectionEvaluationMetrics());
94+
// [START automl_language_entity_extraction_get_model_evaluation]
95+
// [START automl_language_sentiment_analysis_get_model_evaluation]
96+
// [START automl_language_text_classification_get_model_evaluation]
97+
// [START automl_translate_get_model_evaluation]
98+
// [START automl_vision_classification_get_model_evaluation]
5999
}
60100
}
61101
}
62-
// [END automl_get_model_evaluation]
102+
// [END automl_language_entity_extraction_get_model_evaluation]
103+
// [END automl_language_sentiment_analysis_get_model_evaluation]
104+
// [END automl_language_text_classification_get_model_evaluation]
105+
// [END automl_translate_get_model_evaluation]
106+
// [END automl_vision_classification_get_model_evaluation]
107+
// [END automl_vision_object_detection_get_model_evaluation]

‎automl/cloud-client/src/main/java/com/example/automl/ListModelEvaluations.java‎

Lines changed: 51 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,13 @@
1616

1717
package com.example.automl;
1818

19-
// [START automl_list_model_evaluations]
19+
// [START automl_language_entity_extraction_list_model_evaluations]
20+
// [START automl_language_sentiment_analysis_list_model_evaluations]
21+
// [START automl_language_text_classification_list_model_evaluations]
22+
// [START automl_translate_list_model_evaluations]
23+
// [START automl_vision_classification_list_model_evaluations]
24+
// [START automl_vision_object_detection_list_model_evaluations]
25+
2026
import com.google.cloud.automl.v1.AutoMlClient;
2127
import com.google.cloud.automl.v1.ListModelEvaluationsRequest;
2228
import com.google.cloud.automl.v1.ModelEvaluation;
@@ -42,24 +48,63 @@ static void listModelEvaluations(String projectId, String modelId) throws IOExce
4248
// Get the full path of the model.
4349
ModelName modelFullId = ModelName.of(projectId, "us-central1", modelId);
4450
ListModelEvaluationsRequest modelEvaluationsrequest =
45-
ListModelEvaluationsRequest.newBuilder().setParent(modelFullId.toString()).build();
51+
ListModelEvaluationsRequest.newBuilder().setParent(modelFullId.toString()).build();
4652

4753
// List all the model evaluations in the model by applying filter.
4854
System.out.println("List of model evaluations:");
4955
for (ModelEvaluation modelEvaluation :
50-
client.listModelEvaluations(modelEvaluationsrequest).iterateAll()) {
56+
client.listModelEvaluations(modelEvaluationsrequest).iterateAll()) {
5157

5258
System.out.format("Model Evaluation Name: %s\n", modelEvaluation.getName());
5359
System.out.format("Model Annotation Spec Id: %s", modelEvaluation.getAnnotationSpecId());
5460
System.out.println("Create Time:");
5561
System.out.format("\tseconds: %s\n", modelEvaluation.getCreateTime().getSeconds());
5662
System.out.format("\tnanos: %s", modelEvaluation.getCreateTime().getNanos() / 1e9);
5763
System.out.format(
58-
"Evalution Example Count: %d\n", modelEvaluation.getEvaluatedExampleCount());
64+
"Evalution Example Count: %d\n", modelEvaluation.getEvaluatedExampleCount());
65+
// [END automl_language_sentiment_analysis_list_model_evaluations]
66+
// [END automl_language_text_classification_list_model_evaluations]
67+
// [END automl_translate_list_model_evaluations]
68+
// [END automl_vision_classification_list_model_evaluations]
69+
// [END automl_vision_object_detection_list_model_evaluations]
70+
System.out.format("Entity Extraction Model Evaluation Metrics: %s\n",
71+
modelEvaluation.getTextExtractionEvaluationMetrics());
72+
// [END automl_language_entity_extraction_list_model_evaluations]
73+
74+
// [START automl_language_sentiment_analysis_list_model_evaluations]
75+
System.out.format("Sentiment Analysis Model Evaluation Metrics: %s\n",
76+
modelEvaluation.getTextSentimentEvaluationMetrics());
77+
// [END automl_language_sentiment_analysis_list_model_evaluations]
78+
79+
// [START automl_language_text_classification_list_model_evaluations]
80+
// [START automl_vision_classification_list_model_evaluations]
81+
System.out.format("Classification Model Evaluation Metrics: %s\n",
82+
modelEvaluation.getClassificationEvaluationMetrics());
83+
// [END automl_language_text_classification_list_model_evaluations]
84+
// [END automl_vision_classification_list_model_evaluations]
85+
86+
// [START automl_translate_list_model_evaluations]
5987
System.out.format(
60-
"Model Evaluation Metrics: %s\n\n", modelEvaluation.getTranslationEvaluationMetrics());
88+
"Translate Model Evaluation Metrics: %s\n",
89+
modelEvaluation.getTranslationEvaluationMetrics());
90+
// [END automl_translate_list_model_evaluations]
91+
92+
93+
// [START automl_vision_object_detection_list_model_evaluations]
94+
System.out.format("Object Detection Model Evaluation Metrics: %s\n",
95+
modelEvaluation.getImageObjectDetectionEvaluationMetrics());
96+
// [START automl_language_entity_extraction_list_model_evaluations]
97+
// [START automl_language_sentiment_analysis_list_model_evaluations]
98+
// [START automl_language_text_classification_list_model_evaluations]
99+
// [START automl_translate_list_model_evaluations]
100+
// [START automl_vision_classification_list_model_evaluations]
61101
}
62102
}
63103
}
64104
}
65-
// [END automl_list_model_evaluations]
105+
// [END automl_language_entity_extraction_list_model_evaluations]
106+
// [END automl_language_sentiment_analysis_list_model_evaluations]
107+
// [END automl_language_text_classification_list_model_evaluations]
108+
// [END automl_translate_list_model_evaluations]
109+
// [END automl_vision_classification_list_model_evaluations]
110+
// [END automl_vision_object_detection_list_model_evaluations]

0 commit comments

Comments
 (0)