Update app.py

app.py

@@ -234,13 +234,29 @@ def get_error_dataframe():
     display_df["分類"] = df["category"].apply(map_category)
     return display_df
 
+# === 關鍵修正：把「保存並繼續標記」後，要同時更新表格與螢光區 ===
 def save_current(source, target, rater_selector, error_span, category, subcategory, severity, other):
+    """
+    原本的邏輯 + 一次回傳 error_span, status, error_table, highlighted_target，
+    使得按下按鈕後能同步更新介面。
+    """
     global current_index, data, current_errors
+    # 若已標記超過 5 處錯誤
     if len(current_errors) >= 5:
-        return "", "您已標記超過 5 處錯誤，可直接按『過多錯誤』或繼續。"
+        return (
+            "",  # error_span 清空
+            "您已標記超過 5 處錯誤，可直接按『過多錯誤』或繼續。",
+            get_error_dataframe(),
+            highlight_errors_in_text(target, current_errors)
+        )
 
     if error_span and error_span not in target:
-        return "", "錯誤區間不存在於翻譯文本，請檢查！"
+        return (
+            "",
+            "錯誤區間不存在於翻譯文本，請檢查！",
+            get_error_dataframe(),
+            highlight_errors_in_text(target, current_errors)
+        )
 
     # 轉英文
     cat_val, subcat_val = subcategory_map.get((category, subcategory), (category_map.get(category, "Other"), "Other"))
@@ -250,9 +266,15 @@ def save_current(source, target, rater_selector, error_span, category, subcatego
         start = target.find(error_span)
         end = start + len(error_span)
 
+        # 檢查是否重複標記
         for err in current_errors:
             if err["start"] == start and err["end"] == end:
-                return "", "此錯誤區間已標記過，請勿重複。"
+                return (
+                    "",
+                    "此錯誤區間已標記過，請勿重複。",
+                    get_error_dataframe(),
+                    highlight_errors_in_text(target, current_errors)
+                )
 
         if subcat_val == "Other" and other.strip():
             subcat_val = other.strip()
@@ -264,11 +286,23 @@ def save_current(source, target, rater_selector, error_span, category, subcatego
             "end": end,
             "category": f"{cat_val}/{subcat_val}"
         })
-        return "", f"已標記錯誤: {error_span} (範圍 {start}-{end})"
+        status_msg = f"已標記錯誤: {error_span} (範圍 {start}-{end})"
     else:
-        return "", "尚未輸入錯誤區間，如無錯誤請按『完全正確』"
+        # 未輸入錯誤區間
+        status_msg = "尚未輸入錯誤區間，如無錯誤請按『完全正確』"
 
-def mark_as_correct():
+    return (
+        "",
+        status_msg,
+        get_error_dataframe(),
+        highlight_errors_in_text(target, current_errors)
+    )
+
+
+def mark_as_correct(target):
+    """
+    標記為完全正確 (No-error)，同時更新表格 & 螢光區。
+    """
     global current_errors
     current_errors.append({
         "text": "",
@@ -277,9 +311,18 @@ def mark_as_correct():
         "end": 0,
         "category": "No-error"
     })
-    return "", "標註為完全正確！", get_error_dataframe()
+    return (
+        "",  # error_span
+        "標註為完全正確！",
+        get_error_dataframe(),
+        highlight_errors_in_text(target, current_errors)
+    )
+
 
-def mark_as_too_many_errors():
+def mark_as_too_many_errors(target):
+    """
+    標記為過多錯誤 (Non-translation)，同時更新表格 & 螢光區。
+    """
     global current_errors
     current_errors.append({
         "text": "",
@@ -288,7 +331,68 @@ def mark_as_too_many_errors():
         "end": 0,
         "category": "Non-translation"
     })
-    return "", "已標註為過多錯誤！", get_error_dataframe()
+    return (
+        "",
+        "已標註為過多錯誤！",
+        get_error_dataframe(),
+        highlight_errors_in_text(target, current_errors)
+    )
+    
+# def save_current(source, target, rater_selector, error_span, category, subcategory, severity, other):
+#     global current_index, data, current_errors
+#     if len(current_errors) >= 5:
+#         return "", "您已標記超過 5 處錯誤，可直接按『過多錯誤』或繼續。"
+
+#     if error_span and error_span not in target:
+#         return "", "錯誤區間不存在於翻譯文本，請檢查！"
+
+#     # 轉英文
+#     cat_val, subcat_val = subcategory_map.get((category, subcategory), (category_map.get(category, "Other"), "Other"))
+#     severity_val = severity_map.get(severity, "Minor")
+
+#     if error_span:
+#         start = target.find(error_span)
+#         end = start + len(error_span)
+
+#         for err in current_errors:
+#             if err["start"] == start and err["end"] == end:
+#                 return "", "此錯誤區間已標記過，請勿重複。"
+
+#         if subcat_val == "Other" and other.strip():
+#             subcat_val = other.strip()
+
+#         current_errors.append({
+#             "text": error_span,
+#             "severity": severity_val,
+#             "start": start,
+#             "end": end,
+#             "category": f"{cat_val}/{subcat_val}"
+#         })
+#         return "", f"已標記錯誤: {error_span} (範圍 {start}-{end})"
+#     else:
+#         return "", "尚未輸入錯誤區間，如無錯誤請按『完全正確』"
+
+# def mark_as_correct():
+#     global current_errors
+#     current_errors.append({
+#         "text": "",
+#         "severity": "No-error",
+#         "start": 0,
+#         "end": 0,
+#         "category": "No-error"
+#     })
+#     return "", "標註為完全正確！", get_error_dataframe()
+
+# def mark_as_too_many_errors():
+#     global current_errors
+#     current_errors.append({
+#         "text": "",
+#         "severity": "Major",
+#         "start": 0,
+#         "end": 0,
+#         "category": "Non-translation"
+#     })
+#     return "", "已標註為過多錯誤！", get_error_dataframe()
 
 def save_and_next(source, target, score, rater_selector, alternative_translation):
     global current_index, data, annotations_file, current_errors, annotation_history
@@ -347,7 +451,7 @@ def save_and_next(source, target, score, rater_selector, alternative_translation
         )
 
     next_source, next_target = get_current_text()
-    status_msg = f"已提交！目前進度：第 {current_index} 筆 (id={current_index-1}) / 共 {len(data)} 筆。"
+    status_msg = f"已提交！目前進度：已完成第 {current_index} 筆 (id={current_index-1}) / 共 {len(data)} 筆。"
 
     highlighted_next = highlight_errors_in_text(next_target, current_errors)
     return (
@@ -556,7 +660,7 @@ with gr.Blocks(css="""
     # ------------------- 當前狀態 -------------------  
     status = gr.Textbox(label="當前狀態", lines=1, interactive=False)
 
-    # ------------------- 邏輯綁定 -------------------
+    # ------------------- callback 綁定 -------------------
     def update_subcats(selected_category):
         subcats = categories_display[selected_category]
         return gr.update(choices=subcats, value=subcats[0])
@@ -584,26 +688,44 @@ with gr.Blocks(css="""
         outputs=[subcategory]
     )
 
+    # correct_button.click(
+    #     mark_as_correct,
+    #     outputs=[error_span, status, error_table]
+    # )
+    # too_many_errors_button.click(
+    #     mark_as_too_many_errors,
+    #     outputs=[error_span, status, error_table]
+    # )
+
+    # # 按「保存並繼續標記」 -> 在同一句上加錯誤
+    # save_current_button.click(
+    #     save_current,
+    #     inputs=[source, target, rater_selector, error_span, category, subcategory, severity, other],
+    #     outputs=[error_span, status]
+    # )
+    # # 再更新表格 & 高亮
+    # save_current_button.click(
+    #     fn=lambda tgt: (get_error_dataframe(), highlight_errors_in_text(tgt, current_errors)),
+    #     inputs=[target],
+    #     outputs=[error_table, highlighted_target]
+    # )
+    
+    # === 以下三個按鈕，皆一次更新表格與螢光區 ===
+    # 按「保存並繼續標記」 -> 在同一句上加錯誤並更新表格 & 高亮
     correct_button.click(
         mark_as_correct,
-        outputs=[error_span, status, error_table]
+        inputs=[target],
+        outputs=[error_span, status, error_table, highlighted_target]
     )
     too_many_errors_button.click(
         mark_as_too_many_errors,
-        outputs=[error_span, status, error_table]
+        inputs=[target],
+        outputs=[error_span, status, error_table, highlighted_target]
     )
-
-    # 按「保存並繼續標記」 -> 在同一句上加錯誤
     save_current_button.click(
         save_current,
         inputs=[source, target, rater_selector, error_span, category, subcategory, severity, other],
-        outputs=[error_span, status]
-    )
-    # 再更新表格 & 高亮
-    save_current_button.click(
-        fn=lambda tgt: (get_error_dataframe(), highlight_errors_in_text(tgt, current_errors)),
-        inputs=[target],
-        outputs=[error_table, highlighted_target]
+        outputs=[error_span, status, error_table, highlighted_target]
     )
 
     # 按「保存並顯示下一筆」 -> 送出當前整句標註 & 進下一句