fix app

app.py

@@ -1,12 +1,13 @@
 import gradio as gr
 import pandas as pd
 import folium
-import ast
+import os
 
-# ── Data paths ──────────────────────────────────────────────────────────────
-STAY_POINTS = "data/demographics_sampled.csv"
-POI_PATH    = "data/poi_sampled.csv"
-DEMO_PATH   = "data/demographics_sampled.csv"
+# ── Data paths ───────────────────────────────────────────────────────────────
+BASE = os.path.dirname(os.path.abspath(__file__))
+STAY_POINTS = os.path.join(BASE, "data", "stay_points_sampled.csv")
+POI_PATH    = os.path.join(BASE, "data", "poi_sampled.csv")
+DEMO_PATH   = os.path.join(BASE, "data", "demographics_sampled.csv")
 
 AGE_MAP = {1:"<18", 2:"18-24", 3:"25-34", 4:"35-44", 5:"45-54", 6:"55-64", 7:"65+"}
 SEX_MAP = {1:"Male", 2:"Female"}
@@ -14,65 +15,38 @@ EDU_MAP = {1:"No HS", 2:"HS Grad", 3:"Some College", 4:"Bachelor's", 5:"Graduate
 INC_MAP = {1:"<$10k", 2:"$10-15k", 3:"$15-25k", 4:"$25-35k", 5:"$35-50k",
            6:"$50-75k", 7:"$75-100k", 8:"$100-125k", 9:"$125-150k", 10:">$150k"}
 
-# ── Load data ────────────────────────────────────────────────────────────────
+# ── Load ─────────────────────────────────────────────────────────────────────
 print("Loading data...")
-sp = pd.read_csv(STAY_POINTS, nrows=200000)
-poi = pd.read_csv(POI_PATH)
+sp   = pd.read_csv(STAY_POINTS)
+poi  = pd.read_csv(POI_PATH)
 demo = pd.read_csv(DEMO_PATH)
 
-# 加这两行
-sp["poi_id"] = sp["poi_id"].astype(int)
-poi["poi_id"] = poi["poi_id"].astype(int)
-
-sp = sp.merge(poi, on="poi_id", how="left")
-
-# parse act_types string like "[ 2 15]" → list
-def parse_act(x):
-    try:
-        return list(map(int, str(x).strip("[]").split()))
-    except:
-        return []
-
-poi["act_types"] = poi["act_types"].apply(parse_act)
-
-# join stay_points with poi
-sp = sp.merge(poi, on="poi_id", how="left")
+sp  = sp.merge(poi, on="poi_id", how="left")
 sp["start_datetime"] = pd.to_datetime(sp["start_datetime"], utc=True)
 sp["end_datetime"]   = pd.to_datetime(sp["end_datetime"],   utc=True)
 sp["duration_min"]   = ((sp["end_datetime"] - sp["start_datetime"]).dt.total_seconds() / 60).round(1)
 
-# pick 30 sample agents
-sample_agents = sorted(sp["agent_id"].value_counts().head(30).index.tolist())
-print(f"Loaded. Sample agents: {sample_agents[:5]}...")
-
-
-# ── Core functions ───────────────────────────────────────────────────────────
-def get_agent_data(agent_id):
-    agent_sp   = sp[sp["agent_id"] == agent_id].sort_values("start_datetime")
-    agent_demo = demo[demo["agent_id"] == agent_id].iloc[0]
-    return agent_sp, agent_demo
-
+sample_agents = sorted(sp["agent_id"].unique().tolist())
+print(f"Ready. {len(sample_agents)} agents loaded.")
 
+# ── Helpers ───────────────────────────────────────────────────────────────────
 def build_map(agent_sp):
     lat = agent_sp["latitude"].mean()
     lon = agent_sp["longitude"].mean()
     m = folium.Map(location=[lat, lon], zoom_start=12, tiles="CartoDB positron")
 
-    # trajectory line
     coords = list(zip(agent_sp["latitude"], agent_sp["longitude"]))
     if len(coords) > 1:
         folium.PolyLine(coords, color="#4f86c6", weight=2, opacity=0.6).add_to(m)
 
-    # markers
-    for i, row in agent_sp.iterrows():
+    for _, row in agent_sp.iterrows():
         folium.CircleMarker(
             location=[row["latitude"], row["longitude"]],
-            radius=6,
-            color="#e05c5c",
-            fill=True,
-            fill_opacity=0.8,
+            radius=6, color="#e05c5c", fill=True, fill_opacity=0.8,
             popup=folium.Popup(
-                f"<b>{row['name']}</b><br>{row['start_datetime'].strftime('%a %m/%d %H:%M')}<br>{row['duration_min']} min",
+                f"<b>{row['name']}</b><br>"
+                f"{row['start_datetime'].strftime('%a %m/%d %H:%M')}<br>"
+                f"{int(row['duration_min'])} min",
                 max_width=200
             )
         ).add_to(m)
@@ -83,61 +57,44 @@ def build_map(agent_sp):
 def build_poi_sequence(agent_sp):
     lines = []
     for _, row in agent_sp.iterrows():
-        dt = row["start_datetime"]
         lines.append(
-            f"{dt.strftime('%a %m/%d')}  {dt.strftime('%H:%M')}–{row['end_datetime'].strftime('%H:%M')}"
-            f"  ({int(row['duration_min'])} min)  |  {row['name']}  |  act:{row['act_types']}"
+            f"{row['start_datetime'].strftime('%a %m/%d')}  "
+            f"{row['start_datetime'].strftime('%H:%M')}–{row['end_datetime'].strftime('%H:%M')}  "
+            f"({int(row['duration_min'])} min)  |  {row['name']}  |  {row['act_types']}"
         )
     return "\n".join(lines)
 
 
-def build_demo_text(agent_demo):
+def build_demo_text(row):
     return (
-        f"Age: {AGE_MAP.get(agent_demo['age'], agent_demo['age'])}  |  "
-        f"Sex: {SEX_MAP.get(agent_demo['sex'], agent_demo['sex'])}  |  "
-        f"Education: {EDU_MAP.get(agent_demo['education'], agent_demo['education'])}  |  "
-        f"Income: {INC_MAP.get(agent_demo['hh_income'], agent_demo['hh_income'])}"
+        f"Age: {AGE_MAP.get(row['age'], row['age'])}  |  "
+        f"Sex: {SEX_MAP.get(row['sex'], row['sex'])}  |  "
+        f"Education: {EDU_MAP.get(row['education'], row['education'])}  |  "
+        f"Income: {INC_MAP.get(row['hh_income'], row['hh_income'])}"
     )
 
 
 def on_select(agent_id):
-    agent_sp, agent_demo = get_agent_data(int(agent_id))
-    map_html  = build_map(agent_sp)
-    poi_seq   = build_poi_sequence(agent_sp)
-    demo_text = build_demo_text(agent_demo)
-    return map_html, poi_seq, demo_text
+    agent_id   = int(agent_id)
+    agent_sp   = sp[sp["agent_id"] == agent_id].sort_values("start_datetime")
+    agent_demo = demo[demo["agent_id"] == agent_id].iloc[0]
+    return build_map(agent_sp), build_poi_sequence(agent_sp), build_demo_text(agent_demo)
 
 
-# ── UI ───────────────────────────────────────────────────────────────────────
-with gr.Blocks(title="HiCoTraj Demo", theme=gr.themes.Soft()) as demo_app:
+# ── UI ────────────────────────────────────────────────────────────────────────
+with gr.Blocks(title="HiCoTraj Demo", theme=gr.themes.Soft()) as app:
     gr.Markdown("## HiCoTraj: Trajectory Visualization")
 
     with gr.Row():
-        agent_dropdown = gr.Dropdown(
-            choices=[str(a) for a in sample_agents],
-            label="Select Agent",
-            value=str(sample_agents[0])
-        )
+        agent_dd   = gr.Dropdown(choices=[str(a) for a in sample_agents],
+                                 label="Select Agent", value=str(sample_agents[0]))
         demo_label = gr.Textbox(label="Ground Truth Demographics", interactive=False)
 
-    with gr.Row():
-        map_out = gr.HTML(label="Trajectory Map")
+    map_out = gr.HTML(label="Trajectory Map")
+    poi_out = gr.Textbox(label="POI Sequence", lines=20, interactive=False)
 
-    with gr.Row():
-        poi_out = gr.Textbox(label="POI Sequence", lines=20, interactive=False)
-
-    agent_dropdown.change(
-        fn=on_select,
-        inputs=agent_dropdown,
-        outputs=[map_out, poi_out, demo_label]
-    )
-
-    # load first agent on startup
-    demo_app.load(
-        fn=on_select,
-        inputs=agent_dropdown,
-        outputs=[map_out, poi_out, demo_label]
-    )
+    agent_dd.change(fn=on_select, inputs=agent_dd, outputs=[map_out, poi_out, demo_label])
+    app.load(fn=on_select, inputs=agent_dd, outputs=[map_out, poi_out, demo_label])
 
 if __name__ == "__main__":
-    demo_app.launch()
+    app.launch()