update app.py

app.py

@@ -75,8 +75,7 @@ def get_ordered_groups():
         try: gid = u.split("-m")[0].split("/")[-1]
         except: gid = "unknown"
         if gid not in seen:
-            groups.append(gid)
-            seen.add(gid)
+            groups.append(gid); seen.add(gid)
     return groups
 
 def get_flagged_groups():
@@ -84,6 +83,7 @@ def get_flagged_groups():
     try:
         df = pd.read_csv(LABEL_FILE)
         if df.empty: return []
+        df['score'] = pd.to_numeric(df['score'], errors='coerce')
         df = df.drop_duplicates(subset=['url'], keep='last')
         errors = df[(df['score'] == 10) & (df['label'] != 'living_room')]
         return errors['group_id'].unique().tolist()
@@ -114,14 +114,16 @@ def get_stats_text():
         df_l = pd.read_csv(LABEL_FILE).drop_duplicates(subset=['url'], keep='last')
         l = len(df_l['group_id'].unique())
     except: l = 0
-    err_msg = f" | ⚠️ **Fix Needed:** {len(flagged)}" if flagged else ""
-    return f"**Properties:** {len(all_gids)} | **Labeled:** {l}{err_msg}"
+    err_msg = f" | ⚠️ **Fix:** {len(flagged)}" if flagged else ""
+    return f"**Total:** {len(all_gids)} | **Labeled:** {l}{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:
@@ -136,12 +138,13 @@ def render_workspace(mode, history, specific_index=None, move_back=False):
         except: l_done, v_done = set(), set()
         
         if mode == "fix":
-            candidates = flagged_pool
+            candidates = [g for g in flagged_pool if g != current_gid]
+            if not candidates and flagged_pool: candidates = flagged_pool 
         else:
             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 not candidates:
-             return {screen_menu: gr.update(visible=True), screen_work: gr.update(visible=False), log_box: "Done!"}
+             return {screen_menu: gr.update(visible=True), screen_work: gr.update(visible=False), log_box: "No more properties found in this mode."}
         target_gid = candidates[0]
 
     urls = get_group_urls(target_gid)
@@ -150,20 +153,20 @@ def render_workspace(mode, history, specific_index=None, move_back=False):
     r1_vals = get_saved_values(target_gid, "label") if mode == "verify" else {}
     target_idx = all_ordered.index(target_gid)
 
-    with ThreadPoolExecutor(max_workers=MAX_IMAGES) as executor:
+    with ThreadPoolExecutor(max_workers=MAX_IMAGES) as ex:
         def fetch(u):
             try:
                 res = requests.get(u, timeout=3, headers={'User-Agent': 'Mozilla/5.0'})
                 img = Image.open(BytesIO(res.content))
                 img.thumbnail(THUMB_SIZE); return img
             except: return None
-        processed_images = list(executor.map(fetch, urls))
+        processed_images = list(ex.map(fetch, urls))
 
     updates = {
         screen_menu: gr.update(visible=False), screen_work: gr.update(visible=True),
         header_md: f"# {mode.upper()} Property #{target_idx + 1} ({target_gid})",
         state_urls: urls, state_hist: history, state_idx: target_idx,
-        top_stats: get_stats_text(), log_box: f"Loaded {target_gid}"
+        top_stats: get_stats_text(), log_box: f"Viewing {target_gid}"
     }
 
     for i in range(MAX_IMAGES):
@@ -172,7 +175,7 @@ def render_workspace(mode, history, specific_index=None, move_back=False):
         if i < len(urls):
             u = urls[i]
             updates[img_objs[i]] = gr.update(value=processed_images[i], visible=True)
-            v_sc = saved_vals.get(u, {}).get('score', 5)
+            v_sc = int(float(saved_vals.get(u, {}).get('score', 5)))
             v_lbl = saved_vals.get(u, {}).get('label', "living_room")
             is_err = (v_sc == 10 and v_lbl != "living_room")
             
@@ -180,7 +183,7 @@ def render_workspace(mode, history, specific_index=None, move_back=False):
                 updates[c_sld] = gr.update(visible=True, value=v_sc, interactive=True)
                 updates[c_drp] = gr.update(visible=True, value=v_lbl, 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=Living Room only</span>")
+                updates[c_lbl] = gr.update(visible=True if is_err else False, value="<span style='color:red'>⚠️ ERROR: Score 10 is Living Room ONLY</span>")
             else:
                 p_lbl, p_sc = r1_vals.get(u, {}).get('label', "?"), r1_vals.get(u, {}).get('score', "?")
                 updates[c_sld] = gr.update(visible=True, value=v_sc if u in saved_vals else p_sc)
@@ -199,8 +202,8 @@ def save_data(mode, history, urls, *args):
     rows = []
     for i, u in enumerate(urls):
         sc, lbl, chk = args[i*4], args[i*4+1], args[i*4+2]
-        if mode in ["label", "fix"]: rows.append([ts, "user", gid, u, sc, lbl])
-        else: rows.append([ts, "user", gid, u, chk, lbl, sc])
+        if mode in ["label", "fix"]: rows.append([ts, "user", gid, u, int(sc), lbl])
+        else: rows.append([ts, "user", gid, u, chk, lbl, int(sc)])
     
     fname = LABEL_FILE if mode in ["label", "fix"] else VERIFY_FILE
     with FileLock(LOCK_FILE):