Update app.py

app.py

@@ -155,25 +155,29 @@ def save_and_next(source, target, score, rater_selector):
     save_to_json(new_entry, score_file)
 
     current_index += 1
-    if current_index < len(data):
-        next_source, next_target = get_current_text()
-        # [source, target, error_span, current_index_display, status]
-        return next_source, next_target, "", str(current_index), f"分數已保存到 {score_file.name}，請繼續下一筆！"
-    else:
-        return "已完成所有文本標註", "已完成所有文本標註", "", "", f"所有標記已完成並保存到 {score_file.name}！"
+    if current_index >= len(data):
+        return "已完成所有文本標記", "已完成所有文本標記", "", "", f"所有標記已完成並保存到 {score_file.name}！"
+        
+    next_source, next_target = get_current_text()
+    # [source, target, error_span, current_index_display, status]
+    return next_source, next_target, "", str(current_index), f"分數已保存到 {score_file.name}，請繼續下一筆！"
+
 
 def update_file_selection(selected_file):
     global data_path, data, current_index, annotations_file, score_file
     data_path = os.path.join(current_dir, selected_file)
     data = pd.read_csv(data_path)
-    current_index = int(data["id"].min()) # 每個檔案的最小id不一定由0開始
-
+    
+    all_ids = get_all_ids()
+    current_index = int(all_ids[0])  # 設定起始 index 為最小的 id
+    
     file_base_name = os.path.splitext(selected_file)[0]
     annotations_file = DATASET_DIR / f"{file_base_name}_annotations-{uuid4()}.json"
     score_file = DATASET_DIR / f"{file_base_name}_score-{uuid4()}.json"
 
     # 刷新index的選項
-    return get_current_text() + ("", get_all_ids(), str(current_index), f"已加載檔案：{selected_file}")
+    return get_current_text() + ("", all_ids, str(current_index), f"已加載檔案：{selected_file}")
+
 
 def update_index_selection(selected_index):
     global current_index, data