Add files using upload-large-folder tool

annotator/annotate.py

@@ -2,26 +2,53 @@ import os
 import json
 from datetime import datetime
 from utils import divide_prompt
+import argparse
 from flask import Flask, render_template, request, send_from_directory, jsonify
 
 app = Flask(__name__)
 
+FILE_PATH = os.path.dirname(os.path.abspath(__file__))
+
 # 设置图像目录路径
-IMAGE_DIR = "../images_divided"
+IMAGE_DIR = os.path.join(FILE_PATH, "../images_divided")
 ITEMS_PER_PAGE = 1  # 每页显示的 data 项目数
-DATA_FILE = "data/annotation.jsonl"  # 保存排序结果的文件
-PROMPT_DATA_FILE = 'data/extended_data_summary_v2.jsonl'
+# PROMPT_DATA_FILE = os.path.join(FILE_PATH, 'data/extended_data_summary_v2.jsonl')
+PROMPT_DATA_FILE = os.path.join(FILE_PATH, 'data/2by2_data_summary.jsonl')
 
 with open(PROMPT_DATA_FILE, 'r', encoding='utf-8') as f:
     PROMPT_DATA = [json.loads(line) for line in f if line.strip()]
     PROMPT_DATA = {item['idx']: item for item in PROMPT_DATA}
 
+def load_metadata():
+    """加载用户的元数据"""
+    if not os.path.exists(METADATA_FILE):
+        return {"last_page": None, "last_updated": None}
+    try:
+        with open(METADATA_FILE, 'r', encoding='utf-8') as f:
+            return json.load(f)
+    except:
+        return {"last_page": None, "last_updated": None}
+
+def save_metadata(page):
+    """保存当前页码到元数据文件"""
+    metadata = {
+        "last_page": page,
+        "last_updated": datetime.now().isoformat()
+    }
+    os.makedirs(os.path.dirname(METADATA_FILE), exist_ok=True)
+    with open(METADATA_FILE, 'w', encoding='utf-8') as f:
+        json.dump(metadata, f, ensure_ascii=False, indent=2)
+
 @app.route('/')
 def index():
     # 读取所有文件夹
+    # folders = sorted([
+    #     f for f in os.listdir(IMAGE_DIR)
+    #     if os.path.isdir(os.path.join(IMAGE_DIR, f)) and not f.startswith('.')
+    # ])
     folders = sorted([
-        f for f in os.listdir(IMAGE_DIR)
-        if os.path.isdir(os.path.join(IMAGE_DIR, f)) and not f.startswith('.')
+        idx for idx in PROMPT_DATA.keys()
+        if os.path.isdir(os.path.join(IMAGE_DIR, idx))
     ])
     data = []
     
@@ -31,12 +58,9 @@ def index():
     for record in existing_records:
         folder = record.get('folder')
         ref_image = record.get('ref_image')
-        compare_images = tuple(sorted(record.get('compare_images', [])))  # 使用排序后的元组作为键的一部分
+        compare_images = tuple(sorted(record.get('compare_images', [])))
         key = (folder, ref_image, compare_images)
-        existing_dict[key] = {
-            'compare_images': record.get('compare_images', []),
-            'rank_images': record.get('rank_images', [])
-        }
+        existing_dict[key] = record
     
     for cnt, idx in enumerate(folders):
         folder_path = os.path.join(IMAGE_DIR, idx)
@@ -59,39 +83,59 @@ def index():
                     for y in second_indices if y != j
                 ]
                 
-                items = [
-                    {
+                items = []
+                for y, cand in zip([y for y in second_indices if y != j], candidates):
+                    item = {
                         'ref_image': f"/images/{idx}/{ref_img}",
-                        'compare_images': [f"/images/{idx}/{cand_img}" for cand_img in cand],  # 待比较的图像列表
+                        'compare_images': [f"/images/{idx}/{cand_img}" for cand_img in cand],
                         'folder': idx,
                         'ref_index': (i, j),
                         'candidate_column': y,
                         'prompt': divide_prompt(PROMPT_DATA[idx]['prompt'])[0] if idx in PROMPT_DATA and 'prompt' in PROMPT_DATA[idx] else '',
-                        'existing_compare_images': [],  # 临时占位，后面会更新
-                        'existing_rank_images': [],  # 临时占位，后面会更新
-                        'is_annotated': False,  # 临时占位，后面会更新
-                    } for y, cand in zip([y for y in second_indices if y != j], candidates)
-                ]
-                
-                # 对每个 item 检查是否已有标注
-                for item in items:
-                    # 从完整路径中提取文件名
+                        'existing_compare_images': [],
+                        'existing_rank_images': [],
+                        'is_annotated': False,
+                        'stared': False,
+                        'discarded': False,
+                        'grid_issue': False
+                    }
                     current_compare_images = [img.split('/')[-1] for img in item['compare_images']]
-                    
-                    # 检查是否已有标注（使用 ref_image 和 compare_images 一起判定）
                     ref_filename = item['ref_image'].split('/')[-1]
                     lookup_key = (idx, ref_filename, tuple(sorted(current_compare_images)))
                     existing_data = existing_dict.get(lookup_key, {})
                     
-                    # 更新 item 的标注信息
                     item['existing_compare_images'] = existing_data.get('compare_images', [])
                     item['existing_rank_images'] = existing_data.get('rank_images', [])
-                    item['is_annotated'] = len(existing_data.get('rank_images', [])) > 0
+                    item['is_annotated'] = len(item['existing_rank_images']) > 0
+                    item['stared'] = existing_data.get('stared', False)
+                    item['discarded'] = existing_data.get('discarded', False)
+                    item['grid_issue'] = existing_data.get('grid_issue', False)
+                    items.append(item)
                 
                 data.extend(items)
 
-    # 分页逻辑
-    page = int(request.args.get('page', 1))
+    # 获取页码参数，优先级：URL参数 > 元数据文件 > start_idx配置 > 默认1
+    url_page = request.args.get('page')
+    if url_page:
+        # 如果URL明确指定了页码，使用URL的页码
+        page = int(url_page)
+    else:
+        metadata = load_metadata()
+        last_page = metadata.get('last_page', None)
+        if last_page:
+            # 如果元数据文件中有记录，使用元数据中的页码
+            page = last_page
+        elif not app.config.get('START_IDX_USED', False):
+            # 如果start_idx还没被使用过，使用start_idx
+            page = app.config.get('START_IDX', 1)
+            app.config['START_IDX_USED'] = True
+        else:
+            # 否则使用默认页码1
+            page = 1
+
+    # 保存当前页码到元数据
+    save_metadata(page)
+    
     start = (page - 1) * ITEMS_PER_PAGE
     end = start + ITEMS_PER_PAGE
     paginated_data = data[start:end]
@@ -103,135 +147,252 @@ def index():
         total_pages=(len(data) + ITEMS_PER_PAGE - 1) // ITEMS_PER_PAGE
     )
 
+@app.route('/update_page', methods=['POST'])
+def update_page():
+    """更新当前页码到元数据文件"""
+    try:
+        data = request.get_json()
+        page = data.get('page')
+        if page:
+            save_metadata(int(page))
+            return jsonify({'status': 'success'})
+        return jsonify({'status': 'error', 'message': '无效的页码'}), 400
+    except Exception as e:
+        return jsonify({'status': 'error', 'message': str(e)}), 500
+
 @app.route('/sort', methods=['POST'])
 def sort_images():
     try:
-        # 获取排序后的数据
         sorted_images = request.form.getlist('sorted_images')
-        
         if not sorted_images:
             return jsonify({'status': 'error', 'message': '没有排序数据'}), 400
         
-        # 解析排序数据
         ranking = []
         for item in sorted_images:
             rank, image_path = item.split(':', 1)
-            ranking.append({
-                'rank': int(rank),
-                'image_path': image_path
-            })
-        
-        # 排序以确保顺序正确
+            ranking.append({'rank': int(rank), 'image_path': image_path})
         ranking.sort(key=lambda x: x['rank'])
         
-        # 提取有用信息
         if ranking:
             first_image = ranking[0]['image_path']
             parts = first_image.split('/')
-            folder = parts[2]  # folder_name
-            
-            # 获取参考图像信息（从表单中）
+            folder = parts[2]
             ref_image = request.form.get('ref_image', '')
-            
-            # 解析参考图像文件名
-            ref_filename = ref_image.split('/')[-1]  # x_y.png
-            
-            # 获取原始的 compare_images（所有候选图像的原始顺序）
+            ref_filename = ref_image.split('/')[-1]
             all_compare_images = request.form.get('all_compare_images', '')
             if all_compare_images:
                 all_compare_images = json.loads(all_compare_images)
             else:
                 all_compare_images = []
+            ranked_filenames = [item['image_path'].split('/')[-1] for item in ranking]
             
-            # 解析排序图像的文件名 - 这是用户的排序结果
-            ranked_filenames = []
-            for item in ranking:
-                filename = item['image_path'].split('/')[-1]
-                ranked_filenames.append(filename)
-            
-            # 创建唯一的数据记录
             record = {
                 'folder': folder,
                 'ref_image': ref_filename,
-                'compare_images': all_compare_images,  # 原始顺序的所有候选图像
-                'rank_images': ranked_filenames,  # 用户的排序结果
+                'compare_images': all_compare_images,
+                'rank_images': ranked_filenames,
                 'timestamp': datetime.now().isoformat()
             }
             
-            # 读取现有数据以检查唯一性
             existing_records = load_existing_records()
-            
-            # 检查是否已存在相同的记录（基于 folder, ref_image 和 compare_images）
             updated = False
             for i, existing in enumerate(existing_records):
-                existing_compare_sorted = tuple(sorted(existing.get('compare_images', [])))
-                current_compare_sorted = tuple(sorted(all_compare_images))
-                
                 if (existing.get('folder') == folder and 
                     existing.get('ref_image') == ref_filename and
-                    existing_compare_sorted == current_compare_sorted):
-                    # 更新现有记录
+                    tuple(sorted(existing.get('compare_images', []))) == tuple(sorted(all_compare_images))):
+                    record['stared'] = existing.get('stared', False)
+                    record['discarded'] = existing.get('discarded', False)
+                    record['grid_issue'] = existing.get('grid_issue', False)
                     existing_records[i] = record
                     updated = True
                     break
             
             if not updated:
-                # 添加新记录
+                record['stared'] = False
+                record['discarded'] = False
+                record['grid_issue'] = False
                 existing_records.append(record)
             
-            # 保存到文件
             save_records(existing_records)
-            
-            print(f"{'更新' if updated else '添加'}排序记录:", record)
-            
-            return jsonify({
-                'status': 'success', 
-                'message': f"排序已{'更新' if updated else '保存'}！",
-                'record': record
-            })
+            return jsonify({'status': 'success','message': f"排序已{'更新' if updated else '保存'}！",'record': record})
     
     except Exception as e:
-        print(f"错误: {str(e)}")
-        import traceback
-        traceback.print_exc()
         return jsonify({'status': 'error', 'message': str(e)}), 500
 
+@app.route('/star', methods=['POST'])
+def star_image():
+    try:
+        data = request.get_json()
+        folder = data.get("folder")
+        ref_image = data.get("ref_image")
+        stared = data.get("stared", False)
+        compare_images = data.get("compare_images", [])
+        rank_images = data.get("rank_images", [])
+
+        existing_records = load_existing_records()
+        updated = False
+        
+        for record in existing_records:
+            if (record.get("folder") == folder and 
+                record.get("ref_image") == ref_image and
+                tuple(sorted(record.get("compare_images", []))) == tuple(sorted(compare_images))):
+                record["stared"] = stared
+                if rank_images:
+                    record["rank_images"] = rank_images
+                record["timestamp"] = datetime.now().isoformat()
+                updated = True
+                break
+        
+        if not updated:
+            new_record = {
+                "folder": folder,
+                "ref_image": ref_image,
+                "compare_images": compare_images,
+                "rank_images": rank_images,
+                "stared": stared,
+                "timestamp": datetime.now().isoformat()
+            }
+            existing_records.append(new_record)
+
+        save_records(existing_records)
+        return jsonify({"status": "success", "message": f"{'已收藏' if stared else '已取消收藏'}"})
+    except Exception as e:
+        print(f"Error in star_image: {str(e)}")
+        return jsonify({"status": "error", "message": str(e)}), 500
+
+@app.route('/discard', methods=['POST'])
+def discard_image():
+    try:
+        data = request.get_json()
+        folder = data.get("folder")
+        ref_image = data.get("ref_image")
+        discarded = data.get("discarded", False)
+        compare_images = data.get("compare_images", [])
+        rank_images = data.get("rank_images", [])
+
+        existing_records = load_existing_records()
+        updated = False
+        
+        for record in existing_records:
+            if (record.get("folder") == folder and 
+                record.get("ref_image") == ref_image and
+                tuple(sorted(record.get("compare_images", []))) == tuple(sorted(compare_images))):
+                record["discarded"] = discarded
+                if rank_images:
+                    record["rank_images"] = rank_images
+                record["timestamp"] = datetime.now().isoformat()
+                updated = True
+                break
+        
+        if not updated:
+            new_record = {
+                "folder": folder,
+                "ref_image": ref_image,
+                "compare_images": compare_images,
+                "rank_images": rank_images,
+                "discarded": discarded,
+                "timestamp": datetime.now().isoformat()
+            }
+            existing_records.append(new_record)
+
+        save_records(existing_records)
+        return jsonify({"status": "success", "message": f"{'已丢弃' if discarded else '已取消丢弃'}"})
+    except Exception as e:
+        print(f"Error in discard_image: {str(e)}")
+        return jsonify({"status": "error", "message": str(e)}), 500
+
 def load_existing_records():
-    """加载现有的记录"""
     if not os.path.exists(DATA_FILE):
         return []
-    
     records = []
     with open(DATA_FILE, 'r', encoding='utf-8') as f:
         for line in f:
-            line = line.strip()
-            if line:
+            try:
                 records.append(json.loads(line))
+            except json.JSONDecodeError:
+                continue
     return records
 
 def save_records(records):
-    """保存记录到JSONL文件"""
-    # 确保目录存在
-    os.makedirs(os.path.dirname(DATA_FILE), exist_ok=True)
-    
     with open(DATA_FILE, 'w', encoding='utf-8') as f:
         for record in records:
             f.write(json.dumps(record, ensure_ascii=False) + '\n')
 
-# 添加一个路由来提供图片文件
+@app.route('/grid_issue', methods=['POST'])
+def grid_issue_image():
+    try:
+        data = request.get_json()
+        folder = data.get("folder")
+        ref_image = data.get("ref_image")
+        grid_issue = data.get("grid_issue", False)
+        compare_images = data.get("compare_images", [])
+        rank_images = data.get("rank_images", [])
+
+        existing_records = load_existing_records()
+        updated = False
+        
+        for record in existing_records:
+            if (record.get("folder") == folder and 
+                record.get("ref_image") == ref_image and
+                tuple(sorted(record.get("compare_images", []))) == tuple(sorted(compare_images))):
+                record["grid_issue"] = grid_issue
+                if rank_images:
+                    record["rank_images"] = rank_images
+                record["timestamp"] = datetime.now().isoformat()
+                updated = True
+                break
+        
+        if not updated:
+            new_record = {
+                "folder": folder,
+                "ref_image": ref_image,
+                "compare_images": compare_images,
+                "rank_images": rank_images,
+                "grid_issue": grid_issue,
+                "timestamp": datetime.now().isoformat()
+            }
+            existing_records.append(new_record)
+
+        save_records(existing_records)
+        return jsonify({"status": "success", "message": f"{'已标记网格问题' if grid_issue else '已取消网格问题标记'}"})
+    except Exception as e:
+        print(f"Error in grid_issue_image: {str(e)}")
+        return jsonify({"status": "error", "message": str(e)}), 500
+
 @app.route('/images/<path:filename>')
-def serve_images(filename):
+def images(filename):
     return send_from_directory(IMAGE_DIR, filename)
 
-# 添加一个查看已保存数据的路由
 @app.route('/view_data')
 def view_data():
-    """查看已保存的排序数据"""
-    records = load_existing_records()
-    return jsonify({
-        'total': len(records),
-        'records': records
-    })
+    existing_records = load_existing_records()
+    return jsonify(existing_records)
+
+def parse_args():
+    parser = argparse.ArgumentParser(description="Run the annotation server.")
+    parser.add_argument('--port', type=str, default='5000', help='Host address to run the server on')
+    parser.add_argument('--user', type=str, default='user', help='User name for the session')
+    parser.add_argument('--start_idx', type=int, default=1, help='Starting page index for initialization')
+    return parser.parse_args()
 
 if __name__ == '__main__':
-    app.run(debug=True)
+    args = parse_args()
+    user = args.user
+    port = int(args.port)
+    start_idx = args.start_idx
+    
+    global DATA_FILE, METADATA_FILE
+    DATA_FILE = os.path.join(FILE_PATH, "data", f"annotation_{user}.jsonl")
+    METADATA_FILE = os.path.join(FILE_PATH, "data", f"metadata_{user}.json")
+    
+    # 将start_idx存储到app配置中
+    app.config['START_IDX'] = start_idx
+    
+    print(f"启动服务器:")
+    print(f"  用户: {user}")
+    print(f"  端口: {port}")
+    print(f"  起始页码: {start_idx}")
+    print(f"  数据文件: {DATA_FILE}")
+    print(f"  元数据文件: {METADATA_FILE}")
+    
+    app.run(debug=True, port=port)

annotator/data/annotation_jcy.jsonl

@@ -0,0 +1,54 @@
+{"folder": "1191", "ref_image": "3_5.png", "compare_images": ["0_3.png", "1_3.png", "2_3.png", "3_3.png"], "rank_images": ["0_3.png", "1_3.png", "2_3.png", "3_3.png"], "timestamp": "2025-10-03T13:02:28.341510", "stared": false, "discarded": false, "grid_issue": false}
+{"folder": "0857", "ref_image": "2_0.png", "compare_images": ["0_1.png", "1_1.png", "2_1.png", "3_1.png"], "rank_images": ["0_1.png", "2_1.png", "1_1.png", "3_1.png"], "timestamp": "2025-10-03T21:49:59.362507", "stared": false, "discarded": false, "grid_issue": false}
+{"folder": "0857", "ref_image": "2_0.png", "compare_images": ["0_3.png", "1_3.png", "2_3.png", "3_3.png"], "rank_images": ["2_3.png", "1_3.png", "3_3.png", "0_3.png"], "timestamp": "2025-10-03T21:53:25.454401", "stared": false, "discarded": false, "grid_issue": false}
+{"folder": "0857", "ref_image": "2_1.png", "compare_images": ["0_0.png", "1_0.png", "2_0.png", "3_0.png"], "rank_images": ["2_0.png", "1_0.png", "0_0.png", "3_0.png"], "timestamp": "2025-10-03T21:54:09.560820", "stared": false, "discarded": false, "grid_issue": false}
+{"folder": "0857", "ref_image": "2_1.png", "compare_images": ["0_2.png", "1_2.png", "2_2.png", "3_2.png"], "rank_images": ["2_2.png", "1_2.png", "3_2.png", "0_2.png"], "timestamp": "2025-10-03T21:54:30.138636", "stared": false, "discarded": false, "grid_issue": false}
+{"folder": "0857", "ref_image": "2_1.png", "compare_images": ["0_3.png", "1_3.png", "2_3.png", "3_3.png"], "rank_images": ["2_3.png", "1_3.png", "3_3.png", "0_3.png"], "timestamp": "2025-10-03T21:55:22.814752", "stared": false, "discarded": false, "grid_issue": false}
+{"folder": "0857", "ref_image": "2_2.png", "compare_images": ["0_0.png", "1_0.png", "2_0.png", "3_0.png"], "rank_images": ["2_0.png", "1_0.png", "3_0.png", "0_0.png"], "timestamp": "2025-10-03T21:55:41.729521", "stared": false, "discarded": false, "grid_issue": false}
+{"folder": "0857", "ref_image": "2_2.png", "compare_images": ["0_1.png", "1_1.png", "2_1.png", "3_1.png"], "rank_images": ["2_1.png", "1_1.png", "0_1.png", "3_1.png"], "timestamp": "2025-10-03T21:55:59.291103", "stared": false, "discarded": false, "grid_issue": false}
+{"folder": "0857", "ref_image": "2_2.png", "compare_images": ["0_3.png", "1_3.png", "2_3.png", "3_3.png"], "rank_images": ["1_3.png", "2_3.png", "0_3.png", "3_3.png"], "timestamp": "2025-10-03T21:56:23.223379", "stared": false, "discarded": false, "grid_issue": false}
+{"folder": "0857", "ref_image": "2_3.png", "compare_images": ["0_0.png", "1_0.png", "2_0.png", "3_0.png"], "rank_images": ["2_0.png", "1_0.png", "3_0.png", "0_0.png"], "timestamp": "2025-10-03T21:58:00.541402", "stared": false, "discarded": false, "grid_issue": false}
+{"folder": "0857", "ref_image": "2_3.png", "compare_images": ["0_1.png", "1_1.png", "2_1.png", "3_1.png"], "rank_images": ["2_1.png", "1_1.png", "0_1.png", "3_1.png"], "timestamp": "2025-10-03T21:58:14.974827", "stared": false, "discarded": false, "grid_issue": false}
+{"folder": "0857", "ref_image": "2_3.png", "compare_images": ["0_2.png", "1_2.png", "2_2.png", "3_2.png"], "rank_images": ["2_2.png", "1_2.png", "3_2.png", "0_2.png"], "timestamp": "2025-10-03T21:58:30.908891", "stared": false, "discarded": false, "grid_issue": false}
+{"folder": "0857", "ref_image": "3_0.png", "compare_images": ["0_1.png", "1_1.png", "2_1.png", "3_1.png"], "rank_images": ["3_1.png", "0_1.png", "1_1.png", "2_1.png"], "timestamp": "2025-10-03T21:58:54.567588", "stared": false, "discarded": false, "grid_issue": false}
+{"folder": "0857", "ref_image": "3_0.png", "compare_images": ["0_2.png", "1_2.png", "2_2.png", "3_2.png"], "rank_images": ["3_2.png", "1_2.png", "2_2.png", "0_2.png"], "timestamp": "2025-10-03T21:59:14.418967", "stared": false, "discarded": false, "grid_issue": false}
+{"folder": "0857", "ref_image": "3_0.png", "compare_images": ["0_3.png", "1_3.png", "2_3.png", "3_3.png"], "rank_images": ["0_3.png", "1_3.png", "3_3.png", "2_3.png"], "timestamp": "2025-10-03T21:59:35.663823", "stared": false, "discarded": false, "grid_issue": false}
+{"folder": "0857", "ref_image": "3_1.png", "compare_images": ["0_0.png", "1_0.png", "2_0.png", "3_0.png"], "rank_images": ["2_0.png", "1_0.png", "3_0.png", "0_0.png"], "timestamp": "2025-10-03T21:59:52.769238", "stared": false, "discarded": false, "grid_issue": false}
+{"folder": "0857", "ref_image": "3_1.png", "compare_images": ["0_2.png", "1_2.png", "2_2.png", "3_2.png"], "rank_images": ["2_2.png", "1_2.png", "3_2.png", "0_2.png"], "timestamp": "2025-10-03T22:00:08.141177", "stared": false, "discarded": false, "grid_issue": false}
+{"folder": "0857", "ref_image": "3_1.png", "compare_images": ["0_3.png", "1_3.png", "2_3.png", "3_3.png"], "rank_images": ["3_3.png", "0_3.png", "1_3.png", "2_3.png"], "timestamp": "2025-10-03T22:00:24.770808", "stared": false, "discarded": false, "grid_issue": false}
+{"folder": "0857", "ref_image": "3_2.png", "compare_images": ["0_0.png", "1_0.png", "2_0.png", "3_0.png"], "rank_images": ["3_0.png", "1_0.png", "2_0.png", "0_0.png"], "timestamp": "2025-10-03T22:00:42.386253", "stared": false, "discarded": false, "grid_issue": false}
+{"folder": "0857", "ref_image": "3_2.png", "compare_images": ["0_1.png", "1_1.png", "2_1.png", "3_1.png"], "rank_images": ["1_1.png", "3_1.png", "0_1.png", "2_1.png"], "timestamp": "2025-10-03T22:01:06.104992", "stared": false, "discarded": false, "grid_issue": false}
+{"folder": "0857", "ref_image": "3_2.png", "compare_images": ["0_3.png", "1_3.png", "2_3.png", "3_3.png"], "rank_images": ["0_3.png", "1_3.png", "3_3.png", "2_3.png"], "timestamp": "2025-10-03T22:01:25.057215", "stared": false, "discarded": false, "grid_issue": false}
+{"folder": "0857", "ref_image": "3_3.png", "compare_images": ["0_0.png", "1_0.png", "2_0.png", "3_0.png"], "rank_images": ["3_0.png", "1_0.png", "2_0.png", "0_0.png"], "timestamp": "2025-10-03T22:02:24.904242", "stared": false, "discarded": false, "grid_issue": false}
+{"folder": "0857", "ref_image": "3_3.png", "compare_images": ["0_1.png", "1_1.png", "2_1.png", "3_1.png"], "rank_images": ["1_1.png", "0_1.png", "2_1.png", "3_1.png"], "timestamp": "2025-10-03T22:02:44.461246", "stared": false, "discarded": false, "grid_issue": false}
+{"folder": "0857", "ref_image": "3_3.png", "compare_images": ["0_2.png", "1_2.png", "2_2.png", "3_2.png"], "rank_images": ["1_2.png", "3_2.png", "2_2.png", "0_2.png"], "timestamp": "2025-10-03T22:03:02.705541", "stared": false, "discarded": false, "grid_issue": false}
+{"folder": "0867", "ref_image": "0_0.png", "compare_images": ["0_1.png", "1_1.png", "2_1.png", "3_1.png"], "rank_images": ["3_1.png", "2_1.png", "1_1.png", "0_1.png"], "timestamp": "2025-10-03T22:04:25.943013", "stared": false, "discarded": false, "grid_issue": false}
+{"folder": "0867", "ref_image": "0_0.png", "compare_images": ["0_2.png", "1_2.png", "2_2.png", "3_2.png"], "rank_images": ["1_2.png", "2_2.png", "0_2.png", "3_2.png"], "timestamp": "2025-10-03T22:04:48.945051", "stared": false, "discarded": false, "grid_issue": false}
+{"folder": "0867", "ref_image": "0_0.png", "compare_images": ["0_3.png", "1_3.png", "2_3.png", "3_3.png"], "rank_images": ["2_3.png", "1_3.png", "3_3.png", "0_3.png"], "timestamp": "2025-10-03T22:05:25.104251", "stared": false, "discarded": false, "grid_issue": false}
+{"folder": "0867", "ref_image": "0_1.png", "compare_images": ["0_0.png", "1_0.png", "2_0.png", "3_0.png"], "rank_images": ["1_0.png", "3_0.png", "2_0.png", "0_0.png"], "timestamp": "2025-10-03T22:06:29.925387", "stared": false, "discarded": false, "grid_issue": false}
+{"folder": "0867", "ref_image": "0_1.png", "compare_images": ["0_2.png", "1_2.png", "2_2.png", "3_2.png"], "rank_images": ["0_2.png", "2_2.png", "1_2.png", "3_2.png"], "timestamp": "2025-10-03T22:06:49.091470", "stared": false, "discarded": false, "grid_issue": false}
+{"folder": "0867", "ref_image": "0_1.png", "compare_images": ["0_3.png", "1_3.png", "2_3.png", "3_3.png"], "rank_images": [], "discarded": true, "timestamp": "2025-10-03T22:07:17.770983"}
+{"folder": "0867", "ref_image": "0_2.png", "compare_images": ["0_0.png", "1_0.png", "2_0.png", "3_0.png"], "rank_images": ["1_0.png", "0_0.png", "2_0.png", "3_0.png"], "timestamp": "2025-10-03T22:07:36.797015", "stared": false, "discarded": false, "grid_issue": false}
+{"folder": "0867", "ref_image": "0_2.png", "compare_images": ["0_1.png", "1_1.png", "2_1.png", "3_1.png"], "rank_images": ["2_1.png", "0_1.png", "1_1.png", "3_1.png"], "timestamp": "2025-10-03T22:07:54.571586", "stared": false, "discarded": false, "grid_issue": false}
+{"folder": "0867", "ref_image": "0_2.png", "compare_images": ["0_3.png", "1_3.png", "2_3.png", "3_3.png"], "rank_images": [], "discarded": true, "timestamp": "2025-10-03T22:08:10.545457"}
+{"folder": "0867", "ref_image": "0_3.png", "compare_images": ["0_0.png", "1_0.png", "2_0.png", "3_0.png"], "rank_images": ["0_0.png", "3_0.png", "1_0.png", "2_0.png"], "timestamp": "2025-10-03T22:08:26.360537", "stared": false, "discarded": false, "grid_issue": false}
+{"folder": "0867", "ref_image": "0_3.png", "compare_images": ["0_1.png", "1_1.png", "2_1.png", "3_1.png"], "rank_images": ["3_1.png", "2_1.png", "1_1.png", "0_1.png"], "timestamp": "2025-10-03T22:08:44.908431", "stared": false, "discarded": false, "grid_issue": false}
+{"folder": "0867", "ref_image": "0_3.png", "compare_images": ["0_2.png", "1_2.png", "2_2.png", "3_2.png"], "rank_images": ["1_2.png", "0_2.png", "2_2.png", "3_2.png"], "timestamp": "2025-10-03T22:09:02.813181", "stared": false, "discarded": false, "grid_issue": false}
+{"folder": "0867", "ref_image": "1_0.png", "compare_images": ["0_1.png", "1_1.png", "2_1.png", "3_1.png"], "rank_images": ["0_1.png", "3_1.png", "2_1.png", "1_1.png"], "timestamp": "2025-10-03T22:09:32.613520", "stared": false, "discarded": false, "grid_issue": false}
+{"folder": "0867", "ref_image": "1_0.png", "compare_images": ["0_2.png", "1_2.png", "2_2.png", "3_2.png"], "rank_images": ["1_2.png", "0_2.png", "2_2.png", "3_2.png"], "timestamp": "2025-10-03T22:09:50.270377", "stared": false, "discarded": false, "grid_issue": false}
+{"folder": "0867", "ref_image": "1_0.png", "compare_images": ["0_3.png", "1_3.png", "2_3.png", "3_3.png"], "rank_images": ["0_3.png", "2_3.png", "1_3.png", "3_3.png"], "timestamp": "2025-10-03T22:10:05.132118", "stared": false, "discarded": false, "grid_issue": false}
+{"folder": "0867", "ref_image": "1_1.png", "compare_images": ["0_0.png", "1_0.png", "2_0.png", "3_0.png"], "rank_images": ["2_0.png", "3_0.png", "1_0.png", "0_0.png"], "timestamp": "2025-10-03T22:10:20.460630", "stared": false, "discarded": false, "grid_issue": false}
+{"folder": "0867", "ref_image": "1_1.png", "compare_images": ["0_2.png", "1_2.png", "2_2.png", "3_2.png"], "rank_images": ["1_2.png", "2_2.png", "3_2.png", "0_2.png"], "timestamp": "2025-10-03T22:11:18.256846", "stared": false, "discarded": false, "grid_issue": false}
+{"folder": "0867", "ref_image": "1_1.png", "compare_images": ["0_3.png", "1_3.png", "2_3.png", "3_3.png"], "rank_images": ["2_3.png", "0_3.png", "3_3.png", "1_3.png"], "timestamp": "2025-10-03T22:11:51.577986", "stared": false, "discarded": false, "grid_issue": false}
+{"folder": "0867", "ref_image": "1_2.png", "compare_images": ["0_0.png", "1_0.png", "2_0.png", "3_0.png"], "rank_images": ["1_0.png", "0_0.png", "2_0.png", "3_0.png"], "timestamp": "2025-10-03T22:12:06.619408", "stared": false, "discarded": false, "grid_issue": false}
+{"folder": "0867", "ref_image": "1_2.png", "compare_images": ["0_1.png", "1_1.png", "2_1.png", "3_1.png"], "rank_images": ["3_1.png", "0_1.png", "1_1.png", "2_1.png"], "timestamp": "2025-10-03T22:12:22.297656", "stared": false, "discarded": false, "grid_issue": false}
+{"folder": "0867", "ref_image": "1_2.png", "compare_images": ["0_3.png", "1_3.png", "2_3.png", "3_3.png"], "rank_images": ["0_3.png", "2_3.png", "3_3.png", "1_3.png"], "timestamp": "2025-10-03T22:12:34.811645", "stared": false, "discarded": false, "grid_issue": false}
+{"folder": "0867", "ref_image": "1_3.png", "compare_images": ["0_0.png", "1_0.png", "2_0.png", "3_0.png"], "rank_images": ["0_0.png", "3_0.png", "1_0.png", "2_0.png"], "timestamp": "2025-10-03T22:12:47.534657", "stared": false, "discarded": false, "grid_issue": false}
+{"folder": "0867", "ref_image": "1_3.png", "compare_images": ["0_1.png", "1_1.png", "2_1.png", "3_1.png"], "rank_images": ["3_1.png", "0_1.png", "2_1.png", "1_1.png"], "timestamp": "2025-10-03T22:13:05.897688", "stared": false, "discarded": false, "grid_issue": false}
+{"folder": "0867", "ref_image": "1_3.png", "compare_images": ["0_2.png", "1_2.png", "2_2.png", "3_2.png"], "rank_images": ["1_2.png", "3_2.png", "2_2.png", "0_2.png"], "timestamp": "2025-10-03T22:14:16.835026", "stared": false, "discarded": false, "grid_issue": false}
+{"folder": "0867", "ref_image": "2_0.png", "compare_images": ["0_1.png", "1_1.png", "2_1.png", "3_1.png"], "rank_images": ["2_1.png", "3_1.png", "1_1.png", "0_1.png"], "timestamp": "2025-10-03T22:14:34.012034", "stared": false, "discarded": false, "grid_issue": false}
+{"folder": "0867", "ref_image": "2_0.png", "compare_images": ["0_2.png", "1_2.png", "2_2.png", "3_2.png"], "rank_images": ["3_2.png", "0_2.png", "2_2.png", "1_2.png"], "timestamp": "2025-10-03T22:15:09.533749", "stared": false, "discarded": false, "grid_issue": false}
+{"folder": "0867", "ref_image": "2_0.png", "compare_images": ["0_3.png", "1_3.png", "2_3.png", "3_3.png"], "rank_images": ["0_3.png", "2_3.png", "1_3.png", "3_3.png"], "timestamp": "2025-10-03T22:15:26.137162", "stared": false, "discarded": false, "grid_issue": false}
+{"folder": "0867", "ref_image": "2_1.png", "compare_images": ["0_0.png", "1_0.png", "2_0.png", "3_0.png"], "rank_images": ["2_0.png", "1_0.png", "0_0.png", "3_0.png"], "timestamp": "2025-10-03T22:15:44.115114", "stared": false, "discarded": false, "grid_issue": false}
+{"folder": "0867", "ref_image": "2_1.png", "compare_images": ["0_2.png", "1_2.png", "2_2.png", "3_2.png"], "rank_images": ["0_2.png", "3_2.png", "2_2.png", "1_2.png"], "timestamp": "2025-10-03T22:16:24.396877", "stared": false, "discarded": false, "grid_issue": false}
+{"folder": "0867", "ref_image": "2_1.png", "compare_images": ["0_3.png", "1_3.png", "2_3.png", "3_3.png"], "rank_images": ["2_3.png", "0_3.png", "3_3.png", "1_3.png"], "timestamp": "2025-10-03T22:17:31.696199", "stared": false, "discarded": false, "grid_issue": false}

annotator/data/annotation_wcx.jsonl

@@ -0,0 +1,6 @@
+{"folder": "0194", "ref_image": "2_3.png", "compare_images": ["0_4.png", "1_4.png", "2_4.png", "3_4.png"], "rank_images": [], "grid_issue": false, "timestamp": "2025-10-03T13:59:56.317772"}
+{"folder": "0043", "ref_image": "0_0.png", "compare_images": ["0_1.png", "1_1.png", "2_1.png", "3_1.png"], "rank_images": ["0_1.png", "3_1.png", "2_1.png", "1_1.png"], "timestamp": "2025-10-03T14:01:51.212963", "stared": false, "discarded": false, "grid_issue": false}
+{"folder": "2151", "ref_image": "3_1.png", "compare_images": ["0_4.png", "1_4.png", "2_4.png", "3_4.png"], "rank_images": [], "grid_issue": true, "timestamp": "2025-10-03T14:02:33.834546"}
+{"folder": "2151", "ref_image": "3_2.png", "compare_images": ["0_0.png", "1_0.png", "2_0.png", "3_0.png"], "rank_images": [], "grid_issue": true, "timestamp": "2025-10-03T14:03:13.020670"}
+{"folder": "2168", "ref_image": "3_1.png", "compare_images": ["0_2.png", "1_2.png", "2_2.png", "3_2.png"], "rank_images": [], "discarded": true, "timestamp": "2025-10-03T19:13:35.202185"}
+{"folder": "2168", "ref_image": "3_2.png", "compare_images": ["0_1.png", "1_1.png", "2_1.png", "3_1.png"], "rank_images": [], "discarded": false, "timestamp": "2025-10-03T19:14:57.777722"}

annotator/data/annotation_xcl.jsonl

@@ -0,0 +1,7 @@
+{"folder": "0328", "ref_image": "3_2.png", "compare_images": ["0_1.png", "1_1.png", "2_1.png", "3_1.png"], "rank_images": [], "stared": true, "timestamp": "2025-10-03T13:11:54.328616"}
+{"folder": "0329", "ref_image": "0_0.png", "compare_images": ["0_1.png", "1_1.png", "2_1.png", "3_1.png"], "rank_images": ["0_1.png", "3_1.png", "1_1.png", "2_1.png"], "timestamp": "2025-10-03T13:12:58.055853", "stared": false, "discarded": false, "grid_issue": false}
+{"folder": "0518", "ref_image": "3_1.png", "compare_images": ["0_0.png", "1_0.png", "2_0.png", "3_0.png"], "rank_images": [], "grid_issue": false, "timestamp": "2025-10-03T13:13:53.689728", "stared": true}
+{"folder": "0592", "ref_image": "3_0.png", "compare_images": ["0_4.png", "1_4.png", "2_4.png", "3_4.png"], "rank_images": [], "grid_issue": true, "timestamp": "2025-10-03T13:14:06.347085"}
+{"folder": "0671", "ref_image": "2_3.png", "compare_images": ["0_4.png", "1_4.png", "2_4.png", "3_4.png"], "rank_images": ["2_4.png", "3_4.png", "1_4.png", "0_4.png"], "timestamp": "2025-10-03T13:14:38.075308", "stared": false, "discarded": false, "grid_issue": false}
+{"folder": "0984", "ref_image": "1_4.png", "compare_images": ["0_3.png", "1_3.png", "2_3.png", "3_3.png"], "rank_images": [], "grid_issue": true, "timestamp": "2025-10-03T13:15:03.189176"}
+{"folder": "1453", "ref_image": "3_3.png", "compare_images": ["0_2.png", "1_2.png", "2_2.png", "3_2.png"], "rank_images": ["3_2.png", "0_2.png", "1_2.png", "2_2.png"], "timestamp": "2025-10-03T13:16:18.934409", "stared": false, "discarded": false, "grid_issue": false}

annotator/data/metadata_jcy.json

@@ -0,0 +1,4 @@
+{
+  "last_page": 16063,
+  "last_updated": "2025-10-03T22:17:40.608391"
+}

annotator/data/metadata_pbw.json

@@ -0,0 +1,4 @@
+{
+  "last_page": 11041,
+  "last_updated": "2025-10-03T22:15:39.557914"
+}

annotator/data/metadata_wjy.json

@@ -0,0 +1,4 @@
+{
+  "last_page": 21345,
+  "last_updated": "2025-10-03T21:45:38.747150"
+}

annotator/templates/index.html

@@ -8,6 +8,95 @@
         body {
             font-family: Arial, sans-serif;
             padding: 20px;
+            padding-top: 80px;
+        }
+
+        /* 进度条样式 */
+        .progress-container {
+            position: fixed;
+            top: 0;
+            left: 0;
+            right: 0;
+            background-color: white;
+            padding: 15px 20px;
+            box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+            z-index: 999;
+            display: flex;
+            align-items: center;
+            gap: 15px;
+            justify-content: flex-end; /* 右上角对齐 */
+        }
+
+        .progress-info {
+            display: flex;
+            align-items: center;
+            gap: 8px;
+            font-size: 16px;
+            font-weight: bold;
+            color: #333;
+        }
+
+        .progress-input {
+            width: 80px;
+            padding: 5px 8px;
+            border: 2px solid #2196F3;
+            border-radius: 4px;
+            font-size: 16px;
+            font-weight: bold;
+            text-align: center;
+        }
+
+        .progress-input:focus {
+            outline: none;
+            border-color: #0b7dda;
+            box-shadow: 0 0 0 3px rgba(33, 150, 243, 0.1);
+        }
+
+        .progress-bar-wrapper {
+            flex: 1;
+            height: 20px;
+            background-color: #e0e0e0;
+            border-radius: 10px;
+            overflow: hidden;
+            position: relative;
+        }
+
+        .progress-bar {
+            height: 100%;
+            background: linear-gradient(90deg, #4CAF50 0%, #2196F3 100%);
+            transition: width 0.3s ease;
+            border-radius: 10px;
+        }
+
+        .progress-percentage {
+            position: absolute;
+            top: 50%;
+            left: 50%;
+            transform: translate(-50%, -50%);
+            font-size: 12px;
+            font-weight: bold;
+            color: #333;
+            text-shadow: 0 0 3px white;
+        }
+
+        .jump-btn {
+            padding: 6px 15px;
+            background-color: #2196F3;
+            color: white;
+            border: none;
+            border-radius: 4px;
+            cursor: pointer;
+            font-size: 14px;
+            font-weight: bold;
+            transition: background-color 0.3s;
+        }
+
+        .jump-btn:hover {
+            background-color: #0b7dda;
+        }
+
+        .jump-btn:active {
+            transform: scale(0.98);
         }
 
         .rank-btn {
@@ -68,6 +157,72 @@
             font-size: 14px;
             font-weight: bold;
         }
+        
+        /* 收藏按钮样式 */
+        .star-btn {
+            display: inline-block;
+            margin-left: 15px;
+            padding: 8px 15px;
+            background-color: transparent;
+            border: 2px solid #FFC107;
+            color: #FFC107;
+            border-radius: 4px;
+            cursor: pointer;
+            font-size: 20px;
+            transition: all 0.3s ease;
+            vertical-align: middle;
+        }
+        .star-btn:hover {
+            transform: scale(1.1);
+        }
+        .star-btn.starred {
+            background-color: #FFC107;
+            color: white;
+        }
+        .discard-btn {
+            display: inline-block;
+            margin-left: 15px;
+            padding: 8px 15px;
+            background-color: transparent;
+            border: 2px solid #F44336;
+            color: #F44336;
+            border-radius: 4px;
+            cursor: pointer;
+            font-size: 18px;
+            font-weight: bold;
+            transition: all 0.3s ease;
+            vertical-align: middle;
+        }
+        .discard-btn:hover {
+            transform: scale(1.1);
+        }
+        .discard-btn.discarded {
+            background-color: #F44336;
+            color: white;
+        }
+        /* 网格问题按钮样式 */
+        .grid-issue-btn {
+            display: inline-block;
+            margin-left: 15px;
+            padding: 8px 15px;
+            background-color: transparent;
+            border: 2px solid #9C27B0;
+            color: #9C27B0;
+            border-radius: 4px;
+            cursor: pointer;
+            font-size: 16px;
+            font-weight: bold;
+            transition: all 0.3s ease;
+            vertical-align: middle;
+        }
+        .grid-issue-btn:hover {
+            transform: scale(1.1);
+        }
+        .grid-issue-btn.grid-issue {
+            background-color: #9C27B0;
+            color: white;
+        }
+        
         /* 消息提示样式 */
         .message-box {
             position: fixed;
@@ -116,45 +271,51 @@
         .message-box.hiding {
             animation: slideOut 0.3s ease-out;
         }
+    </style>
+    <script>
+        let rankCounter = 1;
+        const rankedImages = new Map();
+        let allCompareImages = [];
+        
+        // 获取当前页面和总页数
+        const currentPage = {{ page }};
+        const totalPages = {{ total_pages }};
 
-        /* 固定在右上角的分页条 */
-        .page-control {
-            position: fixed;
-            top: 20px;
-            right: 20px;
-            background: rgba(255,255,255,0.9);
-            border: 1px solid #ddd;
-            padding: 8px 12px;
-            border-radius: 6px;
-            box-shadow: 0 2px 6px rgba(0,0,0,0.1);
-            z-index: 999;
-            display: flex;
-            align-items: center;
-            gap: 8px;
-            font-size: 14px;
-        }
-        .page-control input {
-            width: 60px;
-            padding: 3px 5px;
-            border: 1px solid #ccc;
-            border-radius: 4px;
+        function updatePageMetadata(page) {
+            // 异步更新页码到后端
+            fetch('/update_page', {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/json',
+                },
+                body: JSON.stringify({ page: page })
+            }).catch(error => {
+                console.error('Error updating page metadata:', error);
+            });
         }
-        .page-control button {
-            padding: 4px 8px;
-            background-color: #2196F3;
-            color: white;
-            border: none;
-            border-radius: 4px;
-            cursor: pointer;
+
+        function updateProgressBar() {
+            const progressBar = document.querySelector('.progress-bar');
+            const progressPercentage = document.querySelector('.progress-percentage');
+            const percentage = (currentPage / totalPages * 100).toFixed(1);
+            progressBar.style.width = percentage + '%';
+            progressPercentage.textContent = percentage + '%';
         }
-        .page-control button:hover {
-            background-color: #0b7dda;
+
+        function jumpToPage() {
+            const input = document.getElementById('pageInput');
+            const targetPage = parseInt(input.value);
+            
+            if (isNaN(targetPage) || targetPage < 1 || targetPage > totalPages) {
+                showMessage(`请输入1到${totalPages}之间的页码`, 'error');
+                input.value = currentPage;
+                return;
+            }
+            
+            // 在跳转前更新元数据
+            updatePageMetadata(targetPage);
+            window.location.href = `/?page=${targetPage}`;
         }
-    </style>
-    <script>
-        let rankCounter = 1;
-        const rankedImages = new Map(); 
-        let allCompareImages = []; 
 
         function initializeCompareImages() {
             allCompareImages = [];
@@ -167,39 +328,479 @@
                 }
             });
         }
+
         window.addEventListener('DOMContentLoaded', function() {
             initializeCompareImages();
+            setupKeyboardShortcuts();
+            updateProgressBar();
+            // 页面加载时更新元数据
+            updatePageMetadata(currentPage);
         });
 
-        /* 这里省略 rankImage、loadExistingAnnotation、showMessage、submitRanking 的原有实现 */
-        /* ... 你的原始脚本保持不变 ... */
+        function setupKeyboardShortcuts() {
+            const pageInput = document.getElementById('pageInput');
+            
+            document.addEventListener('keydown', function(event) {
+                // 在输入框中按Enter键跳转页面
+                if (event.target === pageInput && event.key === 'Enter') {
+                    jumpToPage();
+                    event.preventDefault();
+                    return;
+                }
+                
+                // 忽略在输入框中的其他按键
+                if (event.target.tagName === 'INPUT' || event.target.tagName === 'TEXTAREA') {
+                    return;
+                }
+
+                // 数字键 1-4 对应第 0-3 张图像
+                if (event.key >= '1' && event.key <= '4') {
+                    const index = parseInt(event.key) - 1;
+                    const rankButtons = document.querySelectorAll('.rank-btn');
+                    if (index < rankButtons.length) {
+                        const button = rankButtons[index];
+                        const imagePath = button.getAttribute('data-image');
+                        rankImage(button, imagePath);
+                    }
+                    event.preventDefault();
+                }
+
+                // S 键收藏/取消收藏
+                if (event.key === 's' || event.key === 'S') {
+                    const starButton = document.querySelector('.star-btn');
+                    if (starButton) {
+                        starButton.click();
+                    }
+                    event.preventDefault();
+                }
+                
+                // D 键丢弃/取消丢弃
+                if (event.key === 'd' || event.key === 'D') {
+                    const discardButton = document.querySelector('.discard-btn');
+                    if (discardButton) {
+                        discardButton.click();
+                    }
+                    event.preventDefault();
+                }
+                // G 键网格问题/取消网格问题
+                if (event.key === 'g' || event.key === 'G') {
+                    const gridIssueButton = document.querySelector('.grid-issue-btn');
+                    if (gridIssueButton) {
+                        gridIssueButton.click();
+                    }
+                    event.preventDefault();
+                }
+                
+                // Shift + 左箭头/上箭头 = 上一页
+                if (event.shiftKey && (event.key === 'ArrowLeft' || event.key === 'ArrowUp')) {
+                    const prevLink = document.querySelector('a[href*="page="]');
+                    if (prevLink && prevLink.textContent.includes('上一页')) {
+                        const url = new URL(prevLink.href);
+                        const prevPage = parseInt(url.searchParams.get('page'));
+                        updatePageMetadata(prevPage);
+                        window.location.href = prevLink.href;
+                    }
+                    event.preventDefault();
+                }
+
+                // Shift + 右箭头/下箭头 = 下一页
+                if (event.shiftKey && (event.key === 'ArrowRight' || event.key === 'ArrowDown')) {
+                    const links = document.querySelectorAll('a[href*="page="]');
+                    links.forEach(link => {
+                        if (link.textContent.includes('下一页')) {
+                            const url = new URL(link.href);
+                            const nextPage = parseInt(url.searchParams.get('page'));
+                            updatePageMetadata(nextPage);
+                            window.location.href = link.href;
+                        }
+                    });
+                    event.preventDefault();
+                }
+
+                // Enter 键提交排序
+                if (event.key === 'Enter') {
+                    const form = document.getElementById('rankingForm');
+                    const submitEvent = new Event('submit', { bubbles: true, cancelable: true });
+                    form.dispatchEvent(submitEvent);
+                    event.preventDefault();
+                }
+            });
+        }
+
+        function rankImage(button, imagePath) {
+            const currentRank = button.dataset.rank;
+
+            if (!currentRank) {
+                button.textContent = rankCounter;
+                button.dataset.rank = rankCounter;
+                button.classList.add('ranked');
+                
+                rankedImages.set(imagePath, rankCounter);
+
+                const input = document.createElement('input');
+                input.type = 'hidden';
+                input.name = 'sorted_images';
+                input.value = `${rankCounter}:${imagePath}`;
+                input.id = `input-${imagePath.replace(/[^a-zA-Z0-9]/g, '_')}`;
+                document.getElementById('rankingForm').appendChild(input);
+
+                rankCounter++;
+            } else {
+                const rankToRemove = parseInt(currentRank);
+                
+                button.textContent = "排序";
+                button.removeAttribute('data-rank');
+                button.classList.remove('ranked');
+                
+                rankedImages.delete(imagePath);
+
+                const inputId = `input-${imagePath.replace(/[^a-zA-Z0-9]/g, '_')}`;
+                const inputToRemove = document.getElementById(inputId);
+                if (inputToRemove) {
+                    inputToRemove.remove();
+                }
+
+                const allButtons = document.querySelectorAll('.rank-btn[data-rank]');
+                allButtons.forEach(btn => {
+                    const btnRank = parseInt(btn.dataset.rank);
+                    if (btnRank > rankToRemove) {
+                        const newRank = btnRank - 1;
+                        btn.dataset.rank = newRank;
+                        btn.textContent = newRank;
+                        
+                        const btnImagePath = btn.getAttribute('data-image');
+                        rankedImages.set(btnImagePath, newRank);
+                        
+                        const btnInputId = `input-${btnImagePath.replace(/[^a-zA-Z0-9]/g, '_')}`;
+                        const btnInput = document.getElementById(btnInputId);
+                        if (btnInput) {
+                            btnInput.value = `${newRank}:${btnImagePath}`;
+                        }
+                    }
+                });
+
+                rankCounter--;
+            }
+
+            button.blur();
+        }
+
+        function toggleStar(button, folder, refImage) {
+            const isStarred = button.classList.contains('starred');
+            const newStarState = !isStarred;
+            
+            // 获取当前排序结果
+            const currentRankImages = [];
+            for (let i = 1; i < rankCounter; i++) {
+                for (const [imagePath, rank] of rankedImages.entries()) {
+                    if (rank === i) {
+                        currentRankImages.push(imagePath.split('/').pop());
+                        break;
+                    }
+                }
+            }
+            
+            fetch('/star', {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/json',
+                },
+                body: JSON.stringify({
+                    folder: folder,
+                    ref_image: refImage,
+                    stared: newStarState,
+                    compare_images: allCompareImages,
+                    rank_images: currentRankImages
+                })
+            })
+            .then(response => response.json())
+            .then(data => {
+                if (data.status === 'success') {
+                    if (newStarState) {
+                        button.classList.add('starred');
+                        button.textContent = '★';
+                    } else {
+                        button.classList.remove('starred');
+                        button.textContent = '☆';
+                    }
+                    showMessage(data.message, 'success');
+                } else {
+                    showMessage(data.message || '收藏操作失败', 'error');
+                }
+            })
+            .catch(error => {
+                console.error('Error:', error);
+                showMessage('收藏操作时发生错误', 'error');
+            });
+        }
 
-        // 新增跳转函数
-        function jumpToPage(event) {
+        function toggleDiscard(button, folder, refImage) {
+            const isDiscarded = button.classList.contains('discarded');
+            const newDiscardState = !isDiscarded;
+            
+            // 获取当前排序结果
+            const currentRankImages = [];
+            for (let i = 1; i < rankCounter; i++) {
+                for (const [imagePath, rank] of rankedImages.entries()) {
+                    if (rank === i) {
+                        currentRankImages.push(imagePath.split('/').pop());
+                        break;
+                    }
+                }
+            }
+            
+            fetch('/discard', {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/json',
+                },
+                body: JSON.stringify({
+                    folder: folder,
+                    ref_image: refImage,
+                    discarded: newDiscardState,
+                    compare_images: allCompareImages,
+                    rank_images: currentRankImages
+                })
+            })
+            .then(response => response.json())
+            .then(data => {
+                if (data.status === 'success') {
+                    if (newDiscardState) {
+                        button.classList.add('discarded');
+                        button.textContent = '🗑️';
+                    } else {
+                        button.classList.remove('discarded');
+                        button.textContent = '丢弃';
+                    }
+                    showMessage(data.message, 'success');
+                } else {
+                    showMessage(data.message || '丢弃操作失败', 'error');
+                }
+            })
+            .catch(error => {
+                console.error('Error:', error);
+                showMessage('丢弃操作时发生错误', 'error');
+            });
+        }
+        function toggleGridIssue(button, folder, refImage) {
+            const isGridIssue = button.classList.contains('grid-issue');
+            const newGridIssueState = !isGridIssue;
+            
+            // 获取当前排序结果
+            const currentRankImages = [];
+            for (let i = 1; i < rankCounter; i++) {
+                for (const [imagePath, rank] of rankedImages.entries()) {
+                    if (rank === i) {
+                        currentRankImages.push(imagePath.split('/').pop());
+                        break;
+                    }
+                }
+            }
+            
+            fetch('/grid_issue', {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/json',
+                },
+                body: JSON.stringify({
+                    folder: folder,
+                    ref_image: refImage,
+                    grid_issue: newGridIssueState,
+                    compare_images: allCompareImages,
+                    rank_images: currentRankImages
+                })
+            })
+            .then(response => response.json())
+            .then(data => {
+                if (data.status === 'success') {
+                    if (newGridIssueState) {
+                        button.classList.add('grid-issue');
+                        button.textContent = '⚠️';
+                    } else {
+                        button.classList.remove('grid-issue');
+                        button.textContent = '网格问题';
+                    }
+                    showMessage(data.message, 'success');
+                } else {
+                    showMessage(data.message || '网格问题标记失败', 'error');
+                }
+            })
+            .catch(error => {
+                console.error('Error:', error);
+                showMessage('网格问题标记时发生错误', 'error');
+            });
+        }
+
+        function loadExistingAnnotation(button, folder, refImage, rankImagesFilenames) {
+            const isLoaded = button.dataset.loaded === 'true';
+            
+            if (isLoaded) {
+                const allButtons = document.querySelectorAll('.rank-btn');
+                allButtons.forEach(btn => {
+                    btn.textContent = "排序";
+                    btn.removeAttribute('data-rank');
+                    btn.classList.remove('ranked');
+                });
+                
+                rankedImages.clear();
+                rankCounter = 1;
+                
+                const hiddenInputs = document.querySelectorAll('input[name="sorted_images"]');
+                hiddenInputs.forEach(input => input.remove());
+                
+                button.textContent = '显示已有标注';
+                button.dataset.loaded = 'false';
+                showMessage('已清除标注结果', 'success');
+            } else {
+                const allButtons = document.querySelectorAll('.rank-btn');
+                allButtons.forEach(btn => {
+                    btn.textContent = "排序";
+                    btn.removeAttribute('data-rank');
+                    btn.classList.remove('ranked');
+                });
+                
+                rankedImages.clear();
+                rankCounter = 1;
+                
+                const hiddenInputs = document.querySelectorAll('input[name="sorted_images"]');
+                hiddenInputs.forEach(input => input.remove());
+                
+                rankImagesFilenames.forEach((filename, index) => {
+                    const rank = index + 1;
+                    const imagePath = `/images/${folder}/${filename}`;
+                    
+                    const rankBtn = document.querySelector(`.rank-btn[data-image="${imagePath}"]`);
+                    
+                    if (rankBtn) {
+                        rankBtn.textContent = rank;
+                        rankBtn.dataset.rank = rank;
+                        rankBtn.classList.add('ranked');
+                        
+                        rankedImages.set(imagePath, rank);
+                        
+                        const input = document.createElement('input');
+                        input.type = 'hidden';
+                        input.name = 'sorted_images';
+                        input.value = `${rank}:${imagePath}`;
+                        input.id = `input-${imagePath.replace(/[^a-zA-Z0-9]/g, '_')}`;
+                        document.getElementById('rankingForm').appendChild(input);
+                    }
+                });
+                
+                rankCounter = rankImagesFilenames.length + 1;
+                
+                button.textContent = '关闭已有标注';
+                button.dataset.loaded = 'true';
+                showMessage('已加载现有标注结果', 'success');
+            }
+        }
+
+        function showMessage(message, type = 'success', duration = 2000) {
+            const messageBox = document.getElementById('messageBox');
+            messageBox.textContent = message;
+            messageBox.className = `message-box ${type} show`;
+            
+            setTimeout(() => {
+                messageBox.classList.add('hiding');
+                setTimeout(() => {
+                    messageBox.classList.remove('show', 'hiding');
+                }, 300);
+            }, duration);
+        }
+
+        function submitRanking(event) {
             event.preventDefault();
-            const input = document.getElementById('pageInput');
-            let page = parseInt(input.value);
-            if (isNaN(page) || page < 1) page = 1;
-            if (page > {{ total_pages }}) page = {{ total_pages }};
-            window.location.href = "/?page=" + page;
+            
+            if (rankedImages.size === 0) {
+                showMessage('请至少选择一张图片进行排序!', 'error');
+                return false;
+            }
+
+            const form = document.getElementById('rankingForm');
+            const formData = new FormData(form);
+            
+            formData.append('all_compare_images', JSON.stringify(allCompareImages));
+            
+            const submitBtn = form.querySelector('.submit-btn');
+            
+            submitBtn.disabled = true;
+            submitBtn.textContent = '提交中...';
+
+            fetch('/sort', {
+                method: 'POST',
+                body: formData
+            })
+            .then(response => response.json())
+            .then(data => {
+                if (data.status === 'success') {
+                    showMessage(data.message, 'success');
+                    const statusBadge = document.querySelector('.annotation-status');
+                    if (!statusBadge) {
+                        const h3 = document.querySelector('h3');
+                        if (h3) {
+                            const badge = document.createElement('span');
+                            badge.className = 'annotation-status';
+                            badge.textContent = '已标注';
+                            h3.appendChild(badge);
+                        }
+                    }
+                } else {
+                    showMessage(data.message || '提交失败', 'error');
+                }
+            })
+            .catch(error => {
+                console.error('Error:', error);
+                showMessage('提交时发生错误', 'error');
+            })
+            .finally(() => {
+                submitBtn.disabled = false;
+                submitBtn.textContent = '提交排序';
+            });
+
             return false;
         }
     </script>
 </head>
 <body>
-    <!-- 消息提示框 -->
-    <div id="messageBox" class="message-box"></div>
 
-    <!-- 固定在右上角的分页控制条 -->
-    <div class="page-control">
-        <span>{{ page }}/{{ total_pages }}</span>
-        <form id="pageJumpForm" onsubmit="return jumpToPage(event)" style="display:inline;">
-            <input type="number" id="pageInput" min="1" max="{{ total_pages }}" value="{{ page }}">
-            <button type="submit">跳转</button>
-        </form>
+    <div class="progress-container">
+        <div class="progress-info">
+            <input id="pageInput"
+                   class="progress-input"
+                   type="number"
+                   min="1"
+                   max="{{ total_pages }}"
+                   value="{{ page }}"
+                   aria-label="页码">
+            <span>/ {{ total_pages }}</span>
+        </div>
+        <div class="progress-bar-wrapper" aria-label="进度">
+            <div class="progress-bar" style="width: 0%"></div>
+            <div class="progress-percentage">0%</div>
+        </div>
+        <button class="jump-btn" type="button" onclick="jumpToPage()">跳转</button>
     </div>
+    
+    <div id="messageBox" class="message-box"></div>
 
     <h1>Image Ranking</h1>
+    <div style="background-color: #e3f2fd; padding: 12px 20px; margin-bottom: 20px; border-radius: 4px; border-left: 4px solid #2196F3;">
+        <div style="background-color: #e3f2fd; padding: 12px 20px; margin-bottom: 20px; border-radius: 4px; border-left: 4px solid #2196F3;">
+            <p style="margin: 0; font-size: 14px; color: #1976d2; line-height: 1.8;">
+                <strong>快捷键提示：</strong><br>
+                按 <kbd style="background: #fff; padding: 2px 6px; border: 1px solid #ccc; border-radius: 3px; font-family: monospace;">S</kbd> 收藏 | 
+                按 <kbd style="background: #fff; padding: 2px 6px; border: 1px solid #ccc; border-radius: 3px; font-family: monospace;">D</kbd> 丢弃 | 
+                按 <kbd style="background: #fff; padding: 2px 6px; border: 1px solid #ccc; border-radius: 3px; font-family: monospace;">G</kbd> 网格问题 | 
+                按 <kbd style="background: #fff; padding: 2px 6px; border: 1px solid #ccc; border-radius: 3px; font-family: monospace;">Enter</kbd> 提交排序<br>
+                对前4张图像排序 | 
+                按 <kbd style="background: #fff; padding: 2px 6px; border: 1px solid #ccc; border-radius: 3px; font-family: monospace;">S</kbd> 收藏 | 
+                按 <kbd style="background: #fff; padding: 2px 6px; border: 1px solid #ccc; border-radius: 3px; font-family: monospace;">D</kbd> 丢弃 | 
+                按 <kbd style="background: #fff; padding: 2px 6px; border: 1px solid #ccc; border-radius: 3px; font-family: monospace;">Enter</kbd> 提交排序<br>
+                按 <kbd style="background: #fff; padding: 2px 6px; border: 1px solid #ccc; border-radius: 3px; font-family: monospace;">Shift+←/↑</kbd> 上一条 | 
+                按 <kbd style="background: #fff; padding: 2px 6px; border: 1px solid #ccc; border-radius: 3px; font-family: monospace;">Shift+→/↓</kbd> 下一条
+            </p>
+        </div>
+    </div>
     <form id="rankingForm" action="/sort" method="POST" onsubmit="return submitRanking(event)">
         {% for item in data %}
             <div>
@@ -209,26 +810,44 @@
                     <p style="font-size: 16px; line-height: 1.6; margin-bottom: 0; color: #555;">{{ item.prompt }}</p>
                 </div>
                 {% endif %}
-                <h3>Reference Image: {{ item.ref_image }}
+                <h3>
+                    Reference Image: {{ item.ref_image }}
                     {% if item.is_annotated %}
                     <span class="annotation-status">已标注</span>
                     {% endif %}
+                    <button type="button" 
+                            class="star-btn {% if item.stared %}starred{% endif %}" 
+                            onclick="toggleStar(this, '{{ item.folder }}', '{{ item.ref_image.split('/')[-1] }}')">
+                        {% if item.stared %}★{% else %}☆{% endif %}
+                    </button>
+                    <button type="button" 
+                            class="discard-btn {% if item.discarded %}discarded{% endif %}" 
+                            onclick="toggleDiscard(this, '{{ item.folder }}', '{{ item.ref_image.split('/')[-1] }}')">
+                        {% if item.discarded %}🗑️{% else %}丢弃{% endif %}
+                    </button>
+                    <button type="button" 
+                            class="grid-issue-btn {% if item.grid_issue %}grid-issue{% endif %}" 
+                            onclick="toggleGridIssue(this, '{{ item.folder }}', '{{ item.ref_image.split('/')[-1] }}')">
+                        {% if item.grid_issue %}⚠️{% else %}网格问题{% endif %}
+                    </button>
+                </h3>
                 </h3>
                 <p>Folder: {{ item.folder }}</p>
-                <img src="{{ item.ref_image }}" alt="ref_image" width="200">
+                <div style="text-align: center; margin: 20px 0;">
+                    <img src="{{ item.ref_image }}" alt="ref_image" width="400">
+                </div>
                 <input type="hidden" name="ref_image" value="{{ item.ref_image }}">
                 {% if item.is_annotated %}
                 <button type="button" class="show-annotation-btn" 
-                        data-loaded="false"
                         onclick='loadExistingAnnotation(this, "{{ item.folder }}", "{{ item.ref_image.split("/")[-1] }}", {{ item.existing_rank_images|tojson|safe }})'>
                     显示已有标注
                 </button>
                 {% endif %}
                 <h4>Compare Images:</h4>
-                <div style="display: flex; gap: 15px; flex-wrap: wrap; align-items: flex-start;">
+                <div style="display: grid; grid-template-columns: repeat(4, 1fr); gap: 20px; width: 100%;">
                     {% for compare_image in item.compare_images %}
-                        <div class="image-item" style="display: flex; flex-direction: column; align-items: center; gap: 5px;">
-                            <img src="{{ compare_image }}" alt="compare_image" width="100">
+                        <div class="image-item" style="display: flex; flex-direction: column; align-items: center; gap: 8px;">
+                            <img src="{{ compare_image }}" alt="compare_image" style="width: 100%; height: auto; max-width: 100%;">
                             <button type="button" 
                                     class="rank-btn" 
                                     data-image="{{ compare_image }}"
@@ -252,4 +871,4 @@
         {% endif %}
     </div>
 </body>
-</html>
+</html>

annotator/test.ipynb

@@ -2,8 +2,8 @@
  "cells": [
   {
    "cell_type": "code",
-   "execution_count": 16,
-   "id": "5bdfe87c",
+   "execution_count": 1,
+   "id": "4835cc14",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -13,6 +13,25 @@
     "IMAGE_DIR = \"/root/siton-tmp/images_divided\""
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": 3,
+   "id": "5bdfe87c",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "data_file = 'data/extended_data_summary_v2.jsonl'\n",
+    "with open(data_file, 'r') as f:\n",
+    "    data = [json.loads(line) for line in f]\n",
+    "\n",
+    "data_2by2 = [\n",
+    "    item for item in data if item['layout'] == '2x2'\n",
+    "]\n",
+    "with open('data/2by2_data_summary.jsonl', 'w') as f:\n",
+    "    for item in data_2by2:\n",
+    "        f.write(json.dumps(item) + '\\n')"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -108,7 +127,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "pytorch-env",
+   "display_name": "pbw-torch-env",
    "language": "python",
    "name": "python3"
   },

launch.py

@@ -0,0 +1,48 @@
+import os
+import argparse
+import json
+
+user_names = [
+    'xcl', 'sx', 'pbw', 'jcy', 'wjy', 'wcx'
+]
+user_to_port = {
+    'pbw': 5002,
+    'jcy': 5011,
+    'xcl': 5021,
+    'sx': 5031,
+    'wjy': 5041,
+    'wcx': 5051,
+}
+
+total_data_num = 32016
+data_per_user = total_data_num // len(user_names)
+user_to_data_range = {
+    user: start_idx for user, start_idx in zip(
+        user_names,
+        range(1, total_data_num + 1, data_per_user)
+    )
+}
+
+def launch(user):
+    if user not in user_names:
+        raise ValueError(f"User {user} not recognized. Available users: {user_names}")
+    
+    port = user_to_port[user]
+    start_idx = user_to_data_range[user]
+    
+    command = f"python annotator/annotate.py --user {user} --port {port} --start_idx {start_idx}"
+    print(f"Launching for user {user} on port {port}")
+    os.system(command)
+
+def parse_args():
+    parser = argparse.ArgumentParser(description="Launch annotation server for a specific user.")
+    parser.add_argument('--user', type=str, required=True, help='Username to launch the server for.')
+    args = parser.parse_args()
+    return args
+
+def main():
+    args = parse_args()
+    launch(args.user)
+
+if __name__ == "__main__":
+    main()

note.md

@@ -0,0 +1,7 @@
+# Stars
+
+star: 所有compare_images的一致性都较好，难以选出最优和最劣。
+discard: 所有compare_images的一致性都很差。
+网格问题：ref_image存在网格问题。如果compare_images存在网格问题，则视为一致性很差即可。
+
+pbw: 10673->11041