Update app.py

app.py

@@ -325,8 +325,8 @@ def sample_questions(mode: str, num_rounds: int) -> list[dict]:
 
 
 def get_image_path(rel_path: str) -> Path:
-    """Get image absolute path, relative to data/."""
-    return DATA_DIR / rel_path
+    """Get image absolute path under data/images/ (filename or subpath)."""
+    return IMAGES_DIR / rel_path
 
 
 def _create_placeholder_image() -> Path:
@@ -437,9 +437,22 @@ def build_round_table_and_stats(round_results: list[dict]) -> tuple[list[list],
 
 
 def _extract_markdown_json_block(text: str) -> str:
-    """Extract JSON text from ```json ... ```."""
-    m = re.search(r"```(?:json)?\s*([\s\S]*?)\s*```", text, flags=re.IGNORECASE)
-    return m.group(1).strip() if m else text.strip()
+    """Extract JSON text from ```json ... ``` or ``` ... ``` (robust for stored strings)."""
+    t = text.strip()
+    # 1) Regex: 匹配 ```json 或 ``` 与结尾 ```
+    m = re.search(r"```(?:json)?\s*([\s\S]*?)\s*```", t, flags=re.IGNORECASE)
+    if m:
+        return m.group(1).strip()
+    # 2) 手动剥离：以 ``` 开头时去掉首行并截到最后一个 ```
+    if t.startswith("```"):
+        first_line_end = t.find("\n")
+        if first_line_end >= 0:
+            t = t[first_line_end + 1 :]
+        end = t.rfind("```")
+        if end >= 0:
+            t = t[:end]
+        return t.strip()
+    return t
 
 
 def _extract_balanced_json_object(text: str) -> str | None:
@@ -492,6 +505,7 @@ def parse_ai_analysis_payload(raw: str | dict | None) -> tuple[dict, str]:
         data = None
         method = "fallback-regex"
         if text:
+            # 优先剥离 ```json ... ``` 再解析，兼容 selected_results 等存储格式
             candidate = _extract_markdown_json_block(text)
             try:
                 data = json.loads(candidate)
@@ -501,13 +515,16 @@ def parse_ai_analysis_payload(raw: str | dict | None) -> tuple[dict, str]:
                     data = json.loads(text)
                     method = "json-direct"
                 except Exception:
-                    obj = _extract_balanced_json_object(text)
+                    # 对已剥离的 candidate 再试一次平衡括号提取（防止尾部杂项）
+                    obj = _extract_balanced_json_object(candidate) or _extract_balanced_json_object(text)
                     if obj:
                         try:
                             data = json.loads(obj)
                             method = "balanced-object-json"
                         except Exception:
                             data = None
+                    else:
+                        data = None
         if data is None:
             # Fallback: regex extract partial info
             def _rx(pattern: str) -> str:
@@ -737,8 +754,8 @@ def build_result_map(
     user_label = "Your Answer"
     true_label = "True Location"
     markers = [
-        {"lat": disp_true_lat, "lng": disp_true_lng, "color": "red", "label": true_label},
-        {"lat": disp_user_lat, "lng": disp_user_lng, "color": "blue", "label": user_label},
+        {"lat": disp_true_lat, "lng": disp_true_lng, "color": "green", "label": true_label},
+        {"lat": disp_user_lat, "lng": disp_user_lng, "color": "red", "label": user_label},
     ]
     lines = [
         {
@@ -766,8 +783,8 @@ def build_ai_map(
     ai_label = "AI Answer"
     true_label = "True Location"
     markers = [
-        {"lat": disp_true_lat, "lng": disp_true_lng, "color": "red", "label": true_label},
-        {"lat": disp_ai_lat, "lng": disp_ai_lng, "color": "green", "label": ai_label},
+        {"lat": disp_true_lat, "lng": disp_true_lng, "color": "green", "label": true_label},
+        {"lat": disp_ai_lat, "lng": disp_ai_lng, "color": "red", "label": ai_label},
     ]
     lines = [
         {
@@ -796,7 +813,7 @@ def on_lat_lng_change(lat, lng, state: dict) -> tuple:
     except (TypeError, ValueError):
         return gr.update(), gr.update(), state
     mode = state.get("mode", "world")
-    markers = [{"lat": lat_f, "lng": lng_f, "color": "blue", "label": "To Be Confirmed"}]
+    markers = [{"lat": lat_f, "lng": lng_f, "color": "red", "label": "To Be Confirmed"}]
     m = _create_folium_map(mode=mode, center=(lat_f, lng_f), zoom=8, markers=markers)
     return gr.update(value=m), gr.update(value=coord), {**state, "pending_lat": lat_f, "pending_lng": lng_f}