Update app.py

app.py

@@ -8,12 +8,10 @@ import pandas as pd
 from PIL import Image
 from filelock import FileLock
 
-from huggingface_hub import HfApi
-
-
 # ---------------- Config ----------------
+BASE_DIR = Path(__file__).parent.resolve()
 IMAGE_DIR = os.getenv("IMAGE_DIR", "images")
-LABELS_CSV = os.getenv("LABELS_CSV", "labels.csv")
+LABELS_CSV = os.getenv("LABELS_CSV", str(BASE_DIR / "labels.csv"))
 LABEL_LEFT = os.getenv("LABEL_A", "Class A")
 LABEL_RIGHT = os.getenv("LABEL_B", "Class B")
 SHOW_ALREADY_LABELED = os.getenv("SHOW_ALREADY_LABELED", "0") == "1"
@@ -21,29 +19,32 @@ SUPPORTED_EXTS = (".png", ".jpg", ".jpeg", ".bmp", ".gif", ".tif", ".tiff", ".we
 
 st.set_page_config(page_title="Two-Button Image Labeler", layout="centered")
 
+
 # --------------- Helpers ----------------
 def list_images():
-    """Return sorted list of image filepaths inside IMAGE_DIR (recursively)."""
     paths = []
     for p in glob.glob(os.path.join(IMAGE_DIR, "**", "*"), recursive=True):
         if p.lower().endswith(SUPPORTED_EXTS):
             paths.append(p)
     return sorted(paths)
 
-def read_labels() -> pd.DataFrame:
+
+def read_labels():
     if os.path.exists(LABELS_CSV):
         try:
             return pd.read_csv(LABELS_CSV)
         except Exception:
-            pass
+            return pd.DataFrame(columns=["image", "label", "annotator", "timestamp"])
     return pd.DataFrame(columns=["image", "label", "annotator", "timestamp"])
 
-def rel_to_image_dir(p: str) -> str:
+
+def rel_to_image_dir(p: str):
     try:
         return str(Path(p).resolve().relative_to(Path(IMAGE_DIR).resolve()))
     except Exception:
         return p
 
+
 def write_label(image_path: str, label: str, annotator: str):
     os.makedirs(os.path.dirname(LABELS_CSV) or ".", exist_ok=True)
     record = {
@@ -52,58 +53,38 @@ def write_label(image_path: str, label: str, annotator: str):
         "annotator": annotator,
         "timestamp": datetime.now(timezone.utc).isoformat(),
     }
-    # append locally (so the app logic can read it right away)
     with FileLock(LABELS_CSV + ".lock", timeout=10):
         exists = os.path.exists(LABELS_CSV)
         df = pd.DataFrame([record])
         df.to_csv(LABELS_CSV, mode="a", header=not exists, index=False)
 
-    # push to the Space repo so it appears in the Files tab
-    token = os.getenv("HF_TOKEN")
-    space_id = os.getenv("SPACE_ID")
-    if token and space_id:
-        try:
-            api = HfApi(token=token)
-            api.upload_file(
-                path_or_fileobj=LABELS_CSV,
-                path_in_repo=LABELS_CSV,
-                repo_id=space_id,
-                repo_type="space",
-                commit_message=f"Add label: {record['image']} -> {record['label']} by {annotator}",
-            )
-        except Exception as e:
-            # Non-fatal: still saved locally; just surface a hint
-            st.toast(f"Saved locally; upload pending ({e})", icon="⚠️")
 
 # --------------- UI ---------------------
 st.title("🏷️ Two-Button Image Labeler")
-st.write("Enter your name, click **Start**, then label each image using the big buttons. "
-         "Use **Skip** to bypass an image.")
+st.write(
+    "Enter your name, click **Start**, then label each image using the big buttons. "
+    "Use **Skip** to bypass an image."
+)
 
-# ---- Sidebar controls (start + restart) ----
 with st.sidebar:
     default_name = st.session_state.get("annotator", "")
-    annotator = st.text_input("Your name*", value=default_name, placeholder="e.g., Dr. Smith")
+    annotator = st.text_input(
+        "Your name*", value=default_name, placeholder="e.g., Dr. Smith"
+    )
 
     c1, c2 = st.columns(2)
     with c1:
-        start = st.button("Start", type="primary")
+        start_btn = st.button("Start", type="primary")
     with c2:
-        restart_req = st.button("Restart")
+        restart_btn = st.button("Restart")
 
     continue_by_name = st.toggle(
         "Only show images I haven't labeled yet",
         value=True,
         help="Continue where you left off, based on your name in labels.csv",
     )
-# Handle sidebar Restart (allows switching annotator anytime)
-if restart_req:
-    for k in ["started", "order", "idx", "total"]:
-        st.session_state.pop(k, None)
-    st.session_state["annotator"] = annotator.strip()
-    st.rerun()
 
-# Initialize session state
+# session state
 if "order" not in st.session_state:
     st.session_state.order = []
 if "idx" not in st.session_state:
@@ -113,35 +94,45 @@ if "total" not in st.session_state:
 if "started" not in st.session_state:
     st.session_state.started = False
 
-# ---- Start pressed: build the queue for this annotator ----
+# Restart clears session
+if restart_btn:
+    st.session_state.order = []
+    st.session_state.idx = 0
+    st.session_state.total = 0
+    st.session_state.started = False
+    st.rerun()
+
 # Start flow
-if start:
+if start_btn:
     if not annotator.strip():
         st.sidebar.error("Please enter your name.")
     else:
+        st.session_state["annotator"] = annotator.strip()
         imgs = list_images()
-        labels_df = st.session_state.labels_df
-
-        # compute relative paths once
+        labels_df = read_labels()
         rel_imgs = [rel_to_image_dir(p) for p in imgs]
 
         if continue_by_name:
-            # show only images THIS annotator hasn't labeled yet
+            # only show images THIS annotator hasn't labeled yet
             done_by_me = set(
                 labels_df.query("annotator == @annotator.strip()")["image"].astype(str)
             )
             imgs = [p for p, r in zip(imgs, rel_imgs) if r not in done_by_me]
 
         elif not SHOW_ALREADY_LABELED:
-            # old behavior: hide anything labeled by anyone
+            # hide anything labeled by anyone
             done_any = set(labels_df["image"].astype(str))
             imgs = [p for p, r in zip(imgs, rel_imgs) if r not in done_any]
 
         if not imgs:
             if continue_by_name:
-                st.success(f"All caught up for **{annotator}** 🎉 Nothing left to label.")
+                st.success(
+                    f"All caught up for **{annotator.strip()}** 🎉 Nothing left to label."
+                )
             else:
-                st.warning("No images found (or all labeled). Upload PNG/JPG/etc. to the `images/` folder.")
+                st.warning(
+                    "No images found (or all labeled). Upload PNG/JPG/etc. to the `images/` folder."
+                )
         else:
             st.session_state.order = imgs
             st.session_state.idx = 0
@@ -149,7 +140,7 @@ if start:
             st.session_state.started = True
             st.rerun()
 
-# ---- Main panel ----
+# main panel
 if not st.session_state.started:
     st.info("Fill your name on the left and press **Start**.")
 else:
@@ -157,43 +148,36 @@ else:
     total = st.session_state.total
     if idx >= total:
         st.success("All done 🎉 Thank you!")
-        if st.button("🔄 Restart labeling"):
-            for k in ["started", "order", "idx", "total"]:
-                st.session_state.pop(k, None)
-            st.rerun()
     else:
         current_image = st.session_state.order[idx]
-        st.caption(f"Annotator: **{st.session_state.get('annotator','')}** — {idx} / {total}")
+        st.caption(f"{idx} / {total}")
         try:
             img = Image.open(current_image)
-            # If multipage TIFF, show first page
             if getattr(img, "n_frames", 1) > 1:
                 img.seek(0)
-            # Convert to RGB for browsers
             if img.mode not in ("RGB", "RGBA"):
                 img = img.convert("RGB")
-            st.image(img, use_container_width=True)
+            st.image(img, use_column_width=True)
         except Exception as e:
             st.warning(f"Could not display image: {current_image}\n{e}")
 
         col1, col2, col3 = st.columns([1, 1, 1])
         with col1:
             if st.button(f"⬅️ {LABEL_LEFT}", use_container_width=True):
-                write_label(current_image, LABEL_LEFT, st.session_state.get("annotator",""))
+                write_label(current_image, LABEL_LEFT, annotator.strip())
                 st.session_state.idx += 1
                 st.rerun()
         with col2:
             if st.button("Skip", use_container_width=True):
-                write_label(current_image, "Skip", st.session_state.get("annotator",""))
+                write_label(current_image, "Skip", annotator.strip())
                 st.session_state.idx += 1
                 st.rerun()
         with col3:
             if st.button(f"{LABEL_RIGHT} ➡️", use_container_width=True):
-                write_label(current_image, LABEL_RIGHT, st.session_state.get("annotator",""))
+                write_label(current_image, LABEL_RIGHT, annotator.strip())
                 st.session_state.idx += 1
                 st.rerun()
 
-# ---- Footer ----
+# Footer / admin
 st.divider()
-st.caption("Labels are saved to `labels.csv` in this Space’s working directory. "
-           "You’ll see it in the **Files** tab after the app writes to it.")
+st.caption("Labels are saved to `labels.csv` in this Space. You can download it from the Files tab.")