Update app.py

app.py

@@ -10,23 +10,22 @@ from filelock import FileLock
 from huggingface_hub import HfApi
 
 # ---------------- Config ----------------
-IMAGE_DIR = os.getenv("IMAGE_DIR", "images")
-
-# Label-Namen zentral definieren
-LABEL_LEFT = os.getenv("LABEL_A", "NON-BLAST")   # oder "NORMAL"
-LABEL_RIGHT = os.getenv("LABEL_B", "BLAST")
-LABEL_UNCERTAIN = os.getenv("LABEL_UNCERTAIN", "UNCERTAIN")
-LABEL_TRASH = os.getenv("LABEL_TRASH", "LOW_QUALITY")  # alternativ "TRASH"
-
-LABELS_CSV = os.getenv("LABELS_CSV", "labels.csv")
+IMAGE_DIR   = os.getenv("IMAGE_DIR", "images")
+LABELS_CSV  = os.getenv("LABELS_CSV", "labels.csv")
 SUPPORTED_EXTS = (".png", ".jpg", ".jpeg", ".bmp", ".gif", ".tif", ".tiff", ".webp")
 
-HF_TOKEN = os.getenv("HF_TOKEN")  # stored in Space secrets
-SPACE_ID = os.getenv("SPACE_ID", "MichaelDeutges/LabelingTest")  # ggf. anpassen
+# Label names
+LABEL_NONBLAST  = os.getenv("LABEL_NONBLAST", "NON-BLAST")
+LABEL_BLAST     = os.getenv("LABEL_BLAST", "BLAST")
+LABEL_UNCERTAIN = os.getenv("LABEL_UNCERTAIN", "UNCERTAIN")
+LABEL_TRASH     = os.getenv("LABEL_TRASH", "LOW_QUALITY")
 
+# (Optional) Hugging Face sync
+HF_TOKEN = os.getenv("HF_TOKEN")  # set as a Secret in Space settings
+SPACE_ID = os.getenv("SPACE_ID", "MichaelDeutges/LabelingTest")  # set to your Space id
 api = HfApi()
 
-st.set_page_config(page_title="Image Labeler", layout="centered")
+st.set_page_config(page_title="Two-Button Image Labeler", layout="centered")
 
 # --------------- Helpers ----------------
 def list_images():
@@ -51,6 +50,7 @@ def rel_to_image_dir(p: str):
         return p
 
 def write_label(image_path: str, label: str, annotator: str):
+    """Append one row to labels.csv and (optionally) push to the Space repo."""
     os.makedirs(os.path.dirname(LABELS_CSV) or ".", exist_ok=True)
     record = {
         "image": rel_to_image_dir(image_path),
@@ -60,26 +60,31 @@ def write_label(image_path: str, label: str, annotator: str):
     }
     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)
+        pd.DataFrame([record]).to_csv(LABELS_CSV, mode="a", header=not exists, index=False)
 
-    # Upload to Hugging Face repo (persistentes Files-Tab)
-    try:
-        api.upload_file(
-            path_or_fileobj=LABELS_CSV,
-            path_in_repo="labels.csv",
-            repo_id=SPACE_ID,
-            repo_type="space",
-            token=HF_TOKEN
-        )
-    except Exception as e:
-        print("Upload failed:", e)
+    # best-effort sync to Hugging Face repo (safe to skip if no token/space id)
+    if HF_TOKEN and SPACE_ID:
+        try:
+            api.upload_file(
+                path_or_fileobj=LABELS_CSV,
+                path_in_repo="labels.csv",
+                repo_id=SPACE_ID,
+                repo_type="space",
+                token=HF_TOKEN
+            )
+        except Exception as e:
+            print("Upload failed:", e)
 
 # --------------- UI ---------------------
-st.title("🏷️ Image Labeler")
-st.write("Name eingeben → **Start** → pro Bild Button klicken. **Skip** überspringt ohne Label (kommt später wieder).")
+st.title("🏷️ Two-Button Image Labeler")
+st.write(
+    "Enter your name, click **Start**, then classify each image. "
+    "Use **UNCERTAIN** if you’re not sure. "
+    "Use the 🗑️ icon for **LOW_QUALITY** images."
+)
 
 with st.sidebar:
+    # remember last annotator
     default_name = st.session_state.get("annotator", "")
     annotator = st.text_input("Your name*", value=default_name, placeholder="e.g., Dr. Smith")
 
@@ -92,25 +97,18 @@ with st.sidebar:
     continue_by_name = st.toggle(
         "Only show images I haven't labeled yet",
         value=True,
-        help="Zeigt nur Bilder, die DU noch nicht gelabelt hast (Skip zählt NICHT als gelabelt).",
+        help="Continue where you left off, based on your name in labels.csv",
     )
 
 # session state
-if "order" not in st.session_state:
-    st.session_state.order = []
-if "idx" not in st.session_state:
-    st.session_state.idx = 0
-if "total" not in st.session_state:
-    st.session_state.total = 0
-if "started" not in st.session_state:
-    st.session_state.started = False
+st.session_state.setdefault("order", [])
+st.session_state.setdefault("idx", 0)
+st.session_state.setdefault("total", 0)
+st.session_state.setdefault("started", False)
 
 # reset
 if reset_btn:
-    st.session_state.started = False
-    st.session_state.order = []
-    st.session_state.idx = 0
-    st.session_state.total = 0
+    st.session_state.update({"started": False, "order": [], "idx": 0, "total": 0})
     st.rerun()
 
 # start
@@ -123,20 +121,16 @@ if start_btn:
         labels_df = read_labels()
 
         if continue_by_name and len(labels_df) > 0:
-            # Nur als "erledigt" zählen: alles außer Skip
             already = set(
-                labels_df.query("annotator == @annotator and label != 'Skip'")["image"].astype(str).tolist()
+                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 already]
 
         if not imgs:
-            st.warning("No images found (oder für dich alles erledigt).")
+            st.warning("No images found (or all labeled). Upload 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.session_state.update({"order": imgs, "idx": 0, "total": len(imgs), "started": True})
 
 # main panel
 if not st.session_state.started:
@@ -149,6 +143,16 @@ else:
     else:
         current_image = st.session_state.order[idx]
         st.caption(f"{idx+1} / {total}")
+
+        # top-right trash
+        spacer, trash_col = st.columns([9, 1])
+        with trash_col:
+            if st.button("🗑️", help=f"Mark as {LABEL_TRASH}", use_container_width=True):
+                write_label(current_image, LABEL_TRASH, annotator.strip())
+                st.session_state.idx += 1
+                st.rerun()
+
+        # image
         try:
             img = Image.open(current_image)
             if getattr(img, "n_frames", 1) > 1:
@@ -159,37 +163,27 @@ else:
         except Exception as e:
             st.warning(f"Could not display image: {current_image}\n{e}")
 
-        # Zeile 1: die beiden Hauptklassen
-        c1, c2, c3 = st.columns([1, 1, 1])
-        with c1:
-            if st.button(f"⬅️ {LABEL_LEFT}", use_container_width=True):
-                write_label(current_image, LABEL_LEFT, annotator.strip())
-                st.session_state.idx += 1
-                st.rerun()
-        with c2:
-            if st.button("Skip", use_container_width=True):
-                # Skip wird gespeichert, zählt aber NICHT als erledigt beim Continue-Filter
-                write_label(current_image, "Skip", annotator.strip())
-                st.session_state.idx += 1
-                st.rerun()
-        with c3:
-            if st.button(f"{LABEL_RIGHT} ➡️", use_container_width=True):
-                write_label(current_image, LABEL_RIGHT, annotator.strip())
+        # main classification row: NON-BLAST | UNCERTAIN | BLAST
+        c_left, c_mid, c_right = st.columns([1, 1, 1])
+
+        with c_left:
+            if st.button(f"⬅️ {LABEL_NONBLAST}", use_container_width=True):
+                write_label(current_image, LABEL_NONBLAST, annotator.strip())
                 st.session_state.idx += 1
                 st.rerun()
 
-        # Zeile 2: zusätzliche Qualitäts-/Unsicherheits-Klassen
-        c4, c5 = st.columns([1, 1])
-        with c4:
-            if st.button(LABEL_UNCERTAIN, use_container_width=True):
+        with c_mid:
+            if st.button(f"❓ {LABEL_UNCERTAIN}", use_container_width=True):
                 write_label(current_image, LABEL_UNCERTAIN, annotator.strip())
                 st.session_state.idx += 1
                 st.rerun()
-        with c5:
-            if st.button(LABEL_TRASH, use_container_width=True):
-                write_label(current_image, LABEL_TRASH, annotator.strip())
+
+        with c_right:
+            if st.button(f"{LABEL_BLAST} ➡️", use_container_width=True):
+                write_label(current_image, LABEL_BLAST, annotator.strip())
                 st.session_state.idx += 1
                 st.rerun()
 
 st.divider()
-st.caption("Labels are saved to `labels.csv` and synced to this Space.")
+st.caption("Labels are saved to `labels.csv` (and synced to this Space if HF_TOKEN is set).")
+