Update app.py

app.py

@@ -9,17 +9,15 @@ from PIL import Image
 from filelock import FileLock
 
 # ---------------- Config ----------------
-BASE_DIR = Path(__file__).parent.resolve()
+BASE_DIR = Path(".").resolve()   # Space root
 IMAGE_DIR = os.getenv("IMAGE_DIR", "images")
 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"
 SUPPORTED_EXTS = (".png", ".jpg", ".jpeg", ".bmp", ".gif", ".tif", ".tiff", ".webp")
 
 st.set_page_config(page_title="Two-Button Image Labeler", layout="centered")
 
-
 # --------------- Helpers ----------------
 def list_images():
     paths = []
@@ -28,7 +26,6 @@ def list_images():
             paths.append(p)
     return sorted(paths)
 
-
 def read_labels():
     if os.path.exists(LABELS_CSV):
         try:
@@ -37,46 +34,38 @@ def read_labels():
             return pd.DataFrame(columns=["image", "label", "annotator", "timestamp"])
     return pd.DataFrame(columns=["image", "label", "annotator", "timestamp"])
 
-
 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)
+    os.makedirs(Path(LABELS_CSV).parent, exist_ok=True)
     record = {
         "image": rel_to_image_dir(image_path),
         "label": label,
         "annotator": annotator,
-        "timestamp": datetime.now(timezone.utc).isoformat(),
+        "timestamp": datetime.now(timezone.utc).isoformat()
     }
     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)
 
-
 # --------------- 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.")
 
 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_btn = st.button("Start", type="primary")
     with c2:
-        restart_btn = st.button("Restart")
+        restart_req = st.button("Restart")
 
     continue_by_name = st.toggle(
         "Only show images I haven't labeled yet",
@@ -93,52 +82,40 @@ if "total" not in st.session_state:
     st.session_state.total = 0
 if "started" not in st.session_state:
     st.session_state.started = False
+if "annotator" not in st.session_state:
+    st.session_state.annotator = ""
 
-# Restart clears session
-if restart_btn:
+# restart clears state
+if restart_req:
     st.session_state.order = []
     st.session_state.idx = 0
     st.session_state.total = 0
     st.session_state.started = False
+    st.session_state.annotator = ""
     st.rerun()
 
-# Start flow
+# start
 if start_btn:
     if not annotator.strip():
         st.sidebar.error("Please enter your name.")
     else:
-        st.session_state["annotator"] = annotator.strip()
+        st.session_state.annotator = annotator.strip()
         imgs = list_images()
         labels_df = read_labels()
-        rel_imgs = [rel_to_image_dir(p) for p in imgs]
-
-        if continue_by_name:
-            # 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:
-            # 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]
+        # Already labeled by this annotator?
+        if continue_by_name and len(labels_df) > 0:
+            labeled = set(labels_df.query("annotator == @annotator")["image"].astype(str).tolist())
+            rel_imgs = [rel_to_image_dir(p) for p in imgs]
+            imgs = [p for p, r in zip(imgs, rel_imgs) if r not in labeled]
 
         if not imgs:
-            if continue_by_name:
-                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 by you). Upload PNG/JPG/etc. to the `images/` folder.")
         else:
             st.session_state.order = imgs
             st.session_state.idx = 0
             st.session_state.total = len(imgs)
             st.session_state.started = True
-            st.rerun()
 
 # main panel
 if not st.session_state.started:
@@ -153,28 +130,30 @@ else:
         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_column_width=True)
+            st.image(img, use_container_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])
+        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, annotator.strip())
+                write_label(current_image, LABEL_LEFT, st.session_state.annotator)
                 st.session_state.idx += 1
                 st.rerun()
         with col2:
             if st.button("Skip", use_container_width=True):
-                write_label(current_image, "Skip", annotator.strip())
+                write_label(current_image, "Skip", st.session_state.annotator)
                 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, annotator.strip())
+                write_label(current_image, LABEL_RIGHT, st.session_state.annotator)
                 st.session_state.idx += 1
                 st.rerun()