update app.py

app.py

@@ -86,7 +86,9 @@ def get_clean_df(filepath):
         df = pd.read_csv(filepath)
         if df.empty: return df
         if 'label' in df.columns: df['label'] = df['label'].astype(str).str.strip().str.lower()
+        if 'corrected_label' in df.columns: df['corrected_label'] = df['corrected_label'].astype(str).str.strip().str.lower()
         if 'score' in df.columns: df['score'] = pd.to_numeric(df['score'], errors='coerce').fillna(0).astype(int)
+        if 'corrected_score' in df.columns: df['corrected_score'] = pd.to_numeric(df['corrected_score'], errors='coerce').fillna(0).astype(int)
         return df.drop_duplicates(subset=['url'], keep='last')
     except: return pd.DataFrame()
 
@@ -101,15 +103,17 @@ def get_stats_text():
     all_gids = get_ordered_groups()
     flagged = get_flagged_groups()
     df_l = get_clean_df(LABEL_FILE)
+    df_v = get_clean_df(VERIFY_FILE)
     l_count = len(df_l['group_id'].unique()) if not df_l.empty else 0
-    return f"**Total Properties:** {len(all_gids)} | **Labeled:** {l_count} | **⚠️ Needs Fix:** {len(flagged)}"
+    v_count = len(df_v['group_id'].unique()) if not df_v.empty else 0
+    err_msg = f" | ⚠️ **Fix:** {len(flagged)}" if flagged else " | ✅ Clean"
+    return f"**Total:** {len(all_gids)} | **Labeled:** {l_count} | **Verified:** {v_count}{err_msg}"
 
 def render_workspace(mode, history, specific_index=None, move_back=False):
     all_ordered = get_ordered_groups()
     flagged_pool = get_flagged_groups()
     current_gid = history[-1] if history else None
     target_gid = None
-
     if specific_index is not None:
         if 0 <= specific_index < len(all_ordered): target_gid = all_ordered[specific_index]
     elif move_back and len(history) > 1:
@@ -125,19 +129,15 @@ def render_workspace(mode, history, specific_index=None, move_back=False):
             v_done = set(df_v['group_id'].unique()) if not df_v.empty else set()
             candidates = [g for g in all_ordered if (mode=="label" and g not in l_done) or (mode=="verify" and g in l_done and g not in v_done)]
             if candidates: target_gid = random.choice(candidates)
-    
-    if not target_gid: return {screen_menu: gr.update(visible=True), screen_work: gr.update(visible=False), log_box: "🎉 Finished!"}
-
+    if not target_gid: return {screen_menu: gr.update(visible=True), screen_work: gr.update(visible=False), log_box: "Done!"}
     urls = [u for u in load_all_urls() if target_gid in u][:MAX_IMAGES]
     if not history or history[-1] != target_gid: history.append(target_gid)
-    
     saved_vals = {}
     df_mode = get_clean_df(LABEL_FILE if mode in ["label", "fix"] else VERIFY_FILE)
     if not df_mode.empty:
         for _, r in df_mode[df_mode['group_id'] == target_gid].iterrows():
             if mode in ["label", "fix"]: saved_vals[r['url']] = {"score": r['score'], "label": r['label']}
             else: saved_vals[r['url']] = {"is_correct": r['is_correct'], "label": r['corrected_label'], "score": r['corrected_score']}
-
     with ThreadPoolExecutor(max_workers=MAX_IMAGES) as ex:
         def fetch(u):
             try:
@@ -145,15 +145,13 @@ def render_workspace(mode, history, specific_index=None, move_back=False):
                 img = Image.open(BytesIO(res.content)); img.thumbnail(THUMB_SIZE); return img
             except: return None
         processed_images = list(ex.map(fetch, urls))
-
     target_idx = all_ordered.index(target_gid)
     updates = {
         screen_menu: gr.update(visible=False), screen_work: gr.update(visible=True),
-        header_md: f"# {mode.upper()} - Property #{target_idx + 1} ({target_gid})",
+        header_md: f"# {mode.upper()} - Prop #{target_idx + 1} ({target_gid})",
         state_urls: urls, state_hist: history, state_idx: target_idx,
-        top_stats: get_stats_text(), log_box: f"Active: {target_gid}"
+        top_stats: get_stats_text(), log_box: f"Viewing: {target_gid}"
     }
-
     for i in range(MAX_IMAGES):
         base = i * 4
         c_sld, c_drp, c_chk, c_lbl = input_objs[base:base+4]
@@ -166,8 +164,7 @@ def render_workspace(mode, history, specific_index=None, move_back=False):
             if mode in ["label", "fix"]:
                 updates[c_sld] = gr.update(visible=True, value=v_sc, interactive=True)
                 updates[c_drp] = gr.update(visible=True, value=v_lbl if v_lbl in ROOM_CLASSES else "living_room", interactive=True)
-                updates[c_chk] = gr.update(visible=False)
-                updates[c_lbl] = gr.update(visible=True if is_err else False, value="<span style='color:red'>⚠️ Score 10 ONLY for Living Room</span>")
+                updates[c_chk], updates[c_lbl] = gr.update(visible=False), gr.update(visible=True if is_err else False, value="<span style='color:red'>⚠️ Score 10 Only for Living Room</span>")
             else:
                 updates[c_sld], updates[c_drp] = gr.update(visible=True, value=v_sc), gr.update(visible=True, value=v_lbl)
                 updates[c_chk], updates[c_lbl] = gr.update(visible=True, value=True), gr.update(visible=True, value=f"Prev: {v_lbl}")
@@ -179,17 +176,15 @@ def render_workspace(mode, history, specific_index=None, move_back=False):
 def save_data(mode, history, urls, *args):
     if not history: return
     gid = history[-1]
-    FIXED_IN_SESSION.add(gid)
+    if mode == "fix": FIXED_IN_SESSION.add(gid)
     ts = datetime.now().isoformat(); rows = []
     for i, u in enumerate(urls):
         sc, lbl, chk = args[i*4], args[i*4+1], args[i*4+2]
         clean_lbl = str(lbl).strip().lower()
         if mode in ["label", "fix"]: rows.append([ts, "user", gid, u, int(sc), clean_lbl])
         else: rows.append([ts, "user", gid, u, chk, clean_lbl, int(sc)])
-    
     with FileLock(LOCK_FILE):
         with open(LABEL_FILE if mode in ["label", "fix"] else VERIFY_FILE, "a", newline="") as f: csv.writer(f).writerows(rows)
-    
     sync_push_background(LABEL_FILE if mode in ["label", "fix"] else VERIFY_FILE, os.path.basename(LABEL_FILE if mode in ["label", "fix"] else VERIFY_FILE))
     return render_workspace(mode, history)
 
@@ -202,10 +197,10 @@ def refresh_cat():
     data = [[i+1, "⚠️ Fix Needed" if gid in flagged else "✅ Verified" if gid in v_set else "🔵 Labeled" if gid in l_set else "⚪ Pending", gid] for i, gid in enumerate(all_gids)]
     return pd.DataFrame(data, columns=["#", "Status", "ID"])
 
-with gr.Blocks(theme=gr.themes.Soft()) as demo:
+with gr.Blocks(theme=gr.themes.Soft(), title="Labeler Pro") as demo:
     state_mode, state_hist, state_urls, state_idx = gr.State("label"), gr.State([]), gr.State([]), gr.State(0)
     with gr.Row():
-        top_stats = gr.Markdown("Initializing...")
+        top_stats = gr.Markdown("Loading...")
         btn_home = gr.Button("🏠 Home", size="sm", scale=0)
     with gr.Tabs():
         with gr.Tab("Workspace"):
@@ -224,14 +219,13 @@ with gr.Blocks(theme=gr.themes.Soft()) as demo:
                             img_objs.append(img); input_objs.extend([sld, drp, chk, lbl])
                 with gr.Row():
                     b_back, b_save = gr.Button("⬅ Back"), gr.Button("💾 Save & Next", variant="primary")
-                log_box = gr.Textbox(label="Last Action", interactive=False)
+                log_box = gr.Textbox(label="Status", interactive=False)
         with gr.Tab("Catalog"):
             with gr.Row():
                 num_in = gr.Number(value=1, label="Prop #", precision=0)
                 b_go_l, b_go_v, b_go_f = gr.Button("Go Label"), gr.Button("Go Verify"), gr.Button("Go Fix")
             df_cat = gr.Dataframe(interactive=False)
             b_ref_cat = gr.Button("Refresh Catalog")
-
     ALL_IO = [screen_menu, screen_work, header_md, state_urls, state_hist, state_idx, top_stats, log_box] + img_objs + input_objs
     b_start_l.click(lambda: "label", None, state_mode).then(render_workspace, [state_mode, state_hist], ALL_IO)
     b_start_v.click(lambda: "verify", None, state_mode).then(render_workspace, [state_mode, state_hist], ALL_IO)
@@ -244,5 +238,4 @@ with gr.Blocks(theme=gr.themes.Soft()) as demo:
     b_go_f.click(lambda: "fix", None, state_mode).then(lambda n,m,h: render_workspace(m,h,int(n)-1), [num_in, state_mode, state_hist], ALL_IO)
     b_ref_cat.click(refresh_cat, None, df_cat).then(get_stats_text, None, top_stats)
     demo.load(refresh_cat, None, df_cat).then(get_stats_text, None, top_stats)
-
 demo.queue().launch(server_name="0.0.0.0", server_port=7860)