Update model evaluation due to canonical sample changes (#1743)

* Update model evaluation due to canonical sample changes * Update GetModelEvaluation.java * Run formatter and lint
GoogleCloudPlatform · Nov 19, 2019 · e36e3dd · e36e3dd
1 parent 816eb78
commit e36e3dd
Show file tree

Hide file tree

Showing 3 changed files with 104 additions and 14 deletions.
diff --git a/automl/cloud-client/README.md b/automl/cloud-client/README.md
@@ -56,9 +56,9 @@ small section of code to print out the `metadata` field.
 * [Delete Dataset](src/main/java/com/example/automl/DeleteDataset.java)
 ### Model Management
 * [List Models](src/main/java/com/example/automl/ListModels.java)
-* [List Model Evaluation](src/main/java/com/example/automl/ListModelEvaluations.java)
+* [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.
 * [Get Model](src/main/java/com/example/automl/)
-* [Get Model Evaluation](src/main/java/com/example/automl/GetModelEvaluation.java)
+* [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.
 * [Delete Model](src/main/java/com/example/automl/DeleteModel.java)
 * [Deploy Model](src/main/java/com/example/automl/DeployModel.java) - Not supported by Translation
 * [Uneploy Model](src/main/java/com/example/automl/UndeployModel.java) - Not supported by Translation

diff --git a/automl/cloud-client/src/main/java/com/example/automl/GetModelEvaluation.java b/automl/cloud-client/src/main/java/com/example/automl/GetModelEvaluation.java
@@ -16,7 +16,13 @@
 
 package com.example.automl;
 
-// [START automl_get_model_evaluation]
+// [START automl_language_entity_extraction_get_model_evaluation]
+// [START automl_language_sentiment_analysis_get_model_evaluation]
+// [START automl_language_text_classification_get_model_evaluation]
+// [START automl_translate_get_model_evaluation]
+// [START automl_vision_classification_get_model_evaluation]
+// [START automl_vision_object_detection_get_model_evaluation]
+
 import com.google.cloud.automl.v1.AutoMlClient;
 import com.google.cloud.automl.v1.ModelEvaluation;
 import com.google.cloud.automl.v1.ModelEvaluationName;
@@ -35,14 +41,14 @@ static void getModelEvaluation() throws IOException {
 
   // Get a model evaluation
   static void getModelEvaluation(String projectId, String modelId, String modelEvaluationId)
-      throws IOException {
+          throws IOException {
     // 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 (AutoMlClient client = AutoMlClient.create()) {
       // Get the full path of the model evaluation.
       ModelEvaluationName modelEvaluationFullId =
-          ModelEvaluationName.of(projectId, "us-central1", modelId, modelEvaluationId);
+              ModelEvaluationName.of(projectId, "us-central1", modelId, modelEvaluationId);
 
       // Get complete detail of the model evaluation.
       ModelEvaluation modelEvaluation = client.getModelEvaluation(modelEvaluationFullId);
@@ -53,10 +59,49 @@ static void getModelEvaluation(String projectId, String modelId, String modelEva
       System.out.format("\tseconds: %s\n", modelEvaluation.getCreateTime().getSeconds());
       System.out.format("\tnanos: %s", modelEvaluation.getCreateTime().getNanos() / 1e9);
       System.out.format(
-          "Evalution Example Count: %d\n", modelEvaluation.getEvaluatedExampleCount());
+              "Evalution Example Count: %d\n", modelEvaluation.getEvaluatedExampleCount());
+      // [END automl_language_sentiment_analysis_get_model_evaluation]
+      // [END automl_language_text_classification_get_model_evaluation]
+      // [END automl_translate_get_model_evaluation]
+      // [END automl_vision_classification_get_model_evaluation]
+      // [END automl_vision_object_detection_get_model_evaluation]
+      System.out.format("Entity Extraction Model Evaluation Metrics: %s\n",
+              modelEvaluation.getTextExtractionEvaluationMetrics());
+      // [END automl_language_entity_extraction_get_model_evaluation]
+
+      // [START automl_language_sentiment_analysis_get_model_evaluation]
+      System.out.format("Sentiment Analysis Model Evaluation Metrics: %s\n",
+              modelEvaluation.getTextSentimentEvaluationMetrics());
+      // [END automl_language_sentiment_analysis_get_model_evaluation]
+
+      // [START automl_language_text_classification_get_model_evaluation]
+      // [START automl_vision_classification_get_model_evaluation]
+      System.out.format("Classification Model Evaluation Metrics: %s\n",
+              modelEvaluation.getClassificationEvaluationMetrics());
+      // [END automl_language_text_classification_get_model_evaluation]
+      // [END automl_vision_classification_get_model_evaluation]
+
+      // [START automl_translate_get_model_evaluation]
       System.out.format(
-          "Model Evaluation Metrics: %s\n", modelEvaluation.getTranslationEvaluationMetrics());
+              "Translate Model Evaluation Metrics: %s\n",
+              modelEvaluation.getTranslationEvaluationMetrics());
+      // [END automl_translate_get_model_evaluation]
+
+
+      // [START automl_vision_object_detection_get_model_evaluation]
+      System.out.format("Object Detection Model Evaluation Metrics: %s\n",
+              modelEvaluation.getImageObjectDetectionEvaluationMetrics());
+      // [START automl_language_entity_extraction_get_model_evaluation]
+      // [START automl_language_sentiment_analysis_get_model_evaluation]
+      // [START automl_language_text_classification_get_model_evaluation]
+      // [START automl_translate_get_model_evaluation]
+      // [START automl_vision_classification_get_model_evaluation]
     }
   }
 }
-// [END automl_get_model_evaluation]
+// [END automl_language_entity_extraction_get_model_evaluation]
+// [END automl_language_sentiment_analysis_get_model_evaluation]
+// [END automl_language_text_classification_get_model_evaluation]
+// [END automl_translate_get_model_evaluation]
+// [END automl_vision_classification_get_model_evaluation]
+// [END automl_vision_object_detection_get_model_evaluation]
diff --git a/automl/cloud-client/src/main/java/com/example/automl/ListModelEvaluations.java b/automl/cloud-client/src/main/java/com/example/automl/ListModelEvaluations.java
@@ -16,7 +16,13 @@
 
 package com.example.automl;
 
-// [START automl_list_model_evaluations]
+// [START automl_language_entity_extraction_list_model_evaluations]
+// [START automl_language_sentiment_analysis_list_model_evaluations]
+// [START automl_language_text_classification_list_model_evaluations]
+// [START automl_translate_list_model_evaluations]
+// [START automl_vision_classification_list_model_evaluations]
+// [START automl_vision_object_detection_list_model_evaluations]
+
 import com.google.cloud.automl.v1.AutoMlClient;
 import com.google.cloud.automl.v1.ListModelEvaluationsRequest;
 import com.google.cloud.automl.v1.ModelEvaluation;
@@ -42,24 +48,63 @@ static void listModelEvaluations(String projectId, String modelId) throws IOExce
       // Get the full path of the model.
       ModelName modelFullId = ModelName.of(projectId, "us-central1", modelId);
       ListModelEvaluationsRequest modelEvaluationsrequest =
-          ListModelEvaluationsRequest.newBuilder().setParent(modelFullId.toString()).build();
+              ListModelEvaluationsRequest.newBuilder().setParent(modelFullId.toString()).build();
 
       // List all the model evaluations in the model by applying filter.
       System.out.println("List of model evaluations:");
       for (ModelEvaluation modelEvaluation :
-          client.listModelEvaluations(modelEvaluationsrequest).iterateAll()) {
+              client.listModelEvaluations(modelEvaluationsrequest).iterateAll()) {
 
         System.out.format("Model Evaluation Name: %s\n", modelEvaluation.getName());
         System.out.format("Model Annotation Spec Id: %s", modelEvaluation.getAnnotationSpecId());
         System.out.println("Create Time:");
         System.out.format("\tseconds: %s\n", modelEvaluation.getCreateTime().getSeconds());
         System.out.format("\tnanos: %s", modelEvaluation.getCreateTime().getNanos() / 1e9);
         System.out.format(
-            "Evalution Example Count: %d\n", modelEvaluation.getEvaluatedExampleCount());
+                "Evalution Example Count: %d\n", modelEvaluation.getEvaluatedExampleCount());
+        // [END automl_language_sentiment_analysis_list_model_evaluations]
+        // [END automl_language_text_classification_list_model_evaluations]
+        // [END automl_translate_list_model_evaluations]
+        // [END automl_vision_classification_list_model_evaluations]
+        // [END automl_vision_object_detection_list_model_evaluations]
+        System.out.format("Entity Extraction Model Evaluation Metrics: %s\n",
+                modelEvaluation.getTextExtractionEvaluationMetrics());
+        // [END automl_language_entity_extraction_list_model_evaluations]
+
+        // [START automl_language_sentiment_analysis_list_model_evaluations]
+        System.out.format("Sentiment Analysis Model Evaluation Metrics: %s\n",
+                modelEvaluation.getTextSentimentEvaluationMetrics());
+        // [END automl_language_sentiment_analysis_list_model_evaluations]
+
+        // [START automl_language_text_classification_list_model_evaluations]
+        // [START automl_vision_classification_list_model_evaluations]
+        System.out.format("Classification Model Evaluation Metrics: %s\n",
+                modelEvaluation.getClassificationEvaluationMetrics());
+        // [END automl_language_text_classification_list_model_evaluations]
+        // [END automl_vision_classification_list_model_evaluations]
+
+        // [START automl_translate_list_model_evaluations]
         System.out.format(
-            "Model Evaluation Metrics: %s\n\n", modelEvaluation.getTranslationEvaluationMetrics());
+                "Translate Model Evaluation Metrics: %s\n",
+                modelEvaluation.getTranslationEvaluationMetrics());
+        // [END automl_translate_list_model_evaluations]
+
+
+        // [START automl_vision_object_detection_list_model_evaluations]
+        System.out.format("Object Detection Model Evaluation Metrics: %s\n",
+                modelEvaluation.getImageObjectDetectionEvaluationMetrics());
+        // [START automl_language_entity_extraction_list_model_evaluations]
+        // [START automl_language_sentiment_analysis_list_model_evaluations]
+        // [START automl_language_text_classification_list_model_evaluations]
+        // [START automl_translate_list_model_evaluations]
+        // [START automl_vision_classification_list_model_evaluations]
       }
     }
   }
 }
-// [END automl_list_model_evaluations]
+// [END automl_language_entity_extraction_list_model_evaluations]
+// [END automl_language_sentiment_analysis_list_model_evaluations]
+// [END automl_language_text_classification_list_model_evaluations]
+// [END automl_translate_list_model_evaluations]
+// [END automl_vision_classification_list_model_evaluations]
+// [END automl_vision_object_detection_list_model_evaluations]