Minor improvements

microsoft · Nov 6, 2023 · 7e5477a · 7e5477a
1 parent f147d8e
commit 7e5477a
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 27 deletions.
diff --git a/coml/magics.py b/coml/magics.py
@@ -66,6 +66,16 @@
 </style>
 """
 
+VERIFY_STATUS_ICON = {
+    "error": "❌",
+    "warning": "⚠️",
+    "info": "ℹ️",
+    "ok": "✅",
+    None: "❔",
+    True: "✅",
+    False: "❌",
+}
+
 
 @magics_class
 class CoMLMagics(Magics):
@@ -253,18 +263,8 @@ def comlverify(self, line):
             error, output = parse_cell_outputs(target_cell["outputs"])
             generated_vis = output and "<image/svg+xml>" in output
 
-        status_icon = {
-            "error": "❌",
-            "warning": "⚠️",
-            "info": "ℹ️",
-            "ok": "✅",
-            "unknown": "❔",
-            True: "✅",
-            False: "❌",
-        }
-
         def display_statuses(statuses):
-            # clear_output(wait=True)
+            clear_output(wait=True)
             html = VERIFY_STYLE + "\n"
             display_names = {
                 "lint": "PyLint",
@@ -287,7 +287,7 @@ def display_statuses(statuses):
                     display_names[name],
                     loading
                     if name not in statuses
-                    else status_icon[statuses[name]["result"]],
+                    else VERIFY_STATUS_ICON[statuses[name]["result"]],
                     detail_message,
                 )
 
@@ -327,7 +327,7 @@ def display_statuses(statuses):
                 )
                 details = ""
                 for detail in visualization_check_details:
-                    details += status_icon[detail[0]] + " " + detail[1] + "\n"
+                    details += VERIFY_STATUS_ICON[detail[0]] + " " + detail[1] + "\n"
                 result["vis"] = {
                     "result": visualization_check_result,
                     "details": details,

diff --git a/coml/vis_utils/verifier.py b/coml/vis_utils/verifier.py
@@ -616,11 +616,6 @@ def check_order(order: dict, chart_info: dict):
 
 
 NUM_SAMPLE = 3
-ANSWER_TYPE = {
-    "right": True,
-    "wrong": False,
-    "unknown": "unknown",
-}
 
 
 class VisVerifier:
@@ -634,11 +629,11 @@ def _add_verification(self, verification):
         self.verifications.append(verification)
         # display
         answer = ""
-        if verification["answer"] == ANSWER_TYPE["wrong"]:
-            answer = "❌"
-        elif verification["answer"] == ANSWER_TYPE["right"]:
+        if verification["answer"] is True:
             answer = "✅"
-        elif verification["answer"] == ANSWER_TYPE["unknown"]:
+        elif verification["answer"] is False:
+            answer = "❌"
+        elif verification["answer"] is None:
             answer = "❔"
         aspect = verification["aspect"].capitalize()
         rationale = verification["rationale"]
@@ -654,7 +649,7 @@ def verify(
     ):
         self.verifications = []
         understand_fail_result = {
-            "answer": ANSWER_TYPE["unknown"],
+            "answer": None,
             "aspect": "Visualization understanding",
             "rationale": "Cannot understand the visualization.",
         }
@@ -671,7 +666,7 @@ def verify(
                 self.verify_chart_info(request, chart_info, variable_descriptions)
                 pass_verify = all(
                     [
-                        verification["answer"] == ANSWER_TYPE["right"]
+                        verification["answer"] is True
                         for verification in self.verifications
                     ]
                 )
@@ -728,7 +723,7 @@ def verify_data(
                 if "title" not in encoding[channel]:
                     verification = {
                         "aspect": channel + " label",
-                        "answer": ANSWER_TYPE["unknown"],
+                        "answer": None,
                         "rationale": "Channel "
                         + channel
                         + " is not labeled, so accurate understanding of the data on the graph is difficult.",
@@ -768,12 +763,12 @@ def verify_data(
                     if verification:
                         self._add_verification(verification)
                         verifications.append(verification)
-                        if verification["answer"] != ANSWER_TYPE["right"]:
+                        if verification["answer"] is not True:
                             break
 
             pass_verify = all(
                 [
-                    verification["answer"] == ANSWER_TYPE["right"]
+                    verification["answer"] is True
                     for verification in verifications
                 ]
             )