Update app.py

app.py

@@ -153,11 +153,11 @@ def save_and_next(source, target, score, rater_selector):
     save_to_json(new_entry, score_file)
 
     current_index += 1
-    if current_index < len(data):
+    if current_index + 1 < len(data):
         next_source, next_target = get_current_text()
-        return next_source, next_target, "", "", f"分數已保存到 {score_file.name}，請繼續下一筆！"
+        return next_source, next_target, "", "", str(current_index), f"分數已保存到 {score_file.name}，請繼續下一筆！"
     else:
-        return "已完成所有文本標記", "已完成所有文本標記", "", f"所有標記已完成並保存到 {score_file.name}！"
+        return "已完成所有文本標記", "已完成所有文本標記", "", str(current_index), f"所有標記已完成並保存到 {score_file.name}！"
 
 def update_file_selection(selected_file):
     global data_path, data, current_index, annotations_file, score_file
@@ -213,17 +213,14 @@ with gr.Blocks() as demo:
     with gr.Tab("標記工具"):                
         with gr.Row(equal_height=True):
             with gr.Column(scale=1):
-                with gr.Row(equal_height=True):
-                    rater_selector = gr.Dropdown(label="標註人員", choices=rater, value="rater1")
-                with gr.Row(equal_height=True):
-                    file_selector = gr.Dropdown(label="選擇檔案", choices=csv_files, value="test.csv")
-                with gr.Row(equal_height=True):
-                    index_selector = gr.Dropdown(label="選擇索引", choices=get_all_ids(), value=0)
-                    current_index_display = gr.Textbox(label="當前索引", value=str(current_index), interactive=False)
-            with gr.Column(scale=3):
-                source = gr.Textbox(label="原始文本", interactive=False)
-            with gr.Column(scale=3):
-                target = gr.Textbox(label="翻譯文本", interactive=False)
+                rater_selector = gr.Dropdown(label="標註人員", choices=rater, value="rater1")
+                file_selector = gr.Dropdown(label="選擇檔案", choices=csv_files, value="test.csv")
+                index_selector = gr.Dropdown(label="選擇索引", choices=get_all_ids(), value=0)
+                current_index_display = gr.Textbox(label="當前索引", value=str(current_index), interactive=False)
+            with gr.Column(scale=6):
+                source = gr.Textbox(label="原始文本", lines=10, interactive=False)
+            with gr.Column(scale=6):
+                target = gr.Textbox(label="翻譯文本", lines=10, interactive=False)
 
         with gr.Row(variant='panel', equal_height=True):
             with gr.Column(scale=1):
@@ -255,7 +252,7 @@ with gr.Blocks() as demo:
         index_selector.change(update_index_selection, inputs=[index_selector], outputs=[source, target, current_index_display, status])
         category.change(update_subcategories, inputs=[category], outputs=[subcategory])
         save_current_button.click(save_current, inputs=[source, target, rater_selector, error_span, category, subcategory, severity, other], outputs=[error_span, status])
-        save_next_button.click(save_and_next, inputs=[source, target, score, rater_selector], outputs=[source, target, error_span, status])
+        save_next_button.click(save_and_next, inputs=[source, target, score, rater_selector], outputs=[source, target, error_span, current_index_display, status])
 
         original, translated = get_current_text()
         source.value = original