Update app.py

app.py

@@ -7,99 +7,77 @@ import streamlit as st
 import pandas as pd
 from PIL import Image
 from filelock import FileLock
-from huggingface_hub import HfApi
-
-# -------------------------------------------------------------------
-# Sichtbare/verlässliche Pfade: alles IM Repo-Ordner (/home/user/app)
-# -------------------------------------------------------------------
-BASE_DIR = Path(__file__).parent.resolve()
-IMAGE_DIR = Path(os.getenv("IMAGE_DIR", str(BASE_DIR / "images")))
-LABELS_CSV = Path(os.getenv("LABELS_CSV", str(BASE_DIR / "labels.csv")))
 
+# ---------------- Config ----------------
+IMAGE_DIR = os.getenv("IMAGE_DIR", "images")
+LABELS_CSV = os.getenv("LABELS_CSV", "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")
 
-# Repo-ID für Uploads (nimmt SPACE_ID, sonst Fallback auf festen Namen)
-REPO_ID = os.environ.get("SPACE_ID", "MichaelDeutges/LabelingTest")
-
 st.set_page_config(page_title="Two-Button Image Labeler", layout="centered")
 
-# labels.csv anlegen (Header), damit sie sofort im Files-Tab auftaucht
-if not LABELS_CSV.exists():
-    LABELS_CSV.write_text("image,label,annotator,timestamp\n", encoding="utf-8")
-
-# ----------------------- Helpers -----------------------------------
+# --------------- Helpers ----------------
 def list_images():
-    if not IMAGE_DIR.exists():
-        return []
+    """Return sorted list of image filepaths inside IMAGE_DIR (recursively)."""
     paths = []
-    for p in glob.glob(str(IMAGE_DIR / "**" / "*"), recursive=True):
+    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():
-    try:
-        return pd.read_csv(LABELS_CSV) if LABELS_CSV.exists() else pd.DataFrame(
-            columns=["image", "label", "annotator", "timestamp"]
-        )
-    except Exception:
-        return pd.DataFrame(columns=["image", "label", "annotator", "timestamp"])
+def read_labels() -> pd.DataFrame:
+    if os.path.exists(LABELS_CSV):
+        try:
+            return pd.read_csv(LABELS_CSV)
+        except Exception:
+            pass
+    return pd.DataFrame(columns=["image", "label", "annotator", "timestamp"])
 
-def rel_to_image_dir(p: str):
+def rel_to_image_dir(p: str) -> str:
     try:
-        return str(Path(p).resolve().relative_to(IMAGE_DIR.resolve()))
+        return str(Path(p).resolve().relative_to(Path(IMAGE_DIR).resolve()))
     except Exception:
         return p
 
-def push_labels_to_repo():
-    """Lädt labels.csv in das Space-Repo hoch (erscheint im Files-Tab)."""
-    token = os.environ.get("HF_TOKEN")
-    if not token:
-        # kein Token gesetzt -> still und gut (App läuft trotzdem)
-        return
-    try:
-        api = HfApi()
-        api.upload_file(
-            path_or_fileobj=str(LABELS_CSV),
-            path_in_repo="labels.csv",
-            repo_id=REPO_ID,
-            repo_type="space",
-            commit_message="Update labels.csv",
-            token=token,
-        )
-    except Exception as e:
-        print("push_labels_to_repo error:", e)
-
 def write_label(image_path: str, label: str, annotator: str):
-    LABELS_CSV.parent.mkdir(parents=True, exist_ok=True)
+    """Append one row to labels.csv with a file lock so concurrent users are safe."""
+    os.makedirs(os.path.dirname(LABELS_CSV) or ".", 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(str(LABELS_CSV) + ".lock", timeout=10):
-        exists = LABELS_CSV.exists()
-        df = pd.DataFrame([record])
-        df.to_csv(LABELS_CSV, mode="a", header=not exists, index=False)
-    # nach jedem Klick committen
-    push_labels_to_repo()
-
-# ----------------------- UI ----------------------------------------
+    with FileLock(LABELS_CSV + ".lock", timeout=10):
+        exists = os.path.exists(LABELS_CSV)
+        pd.DataFrame([record]).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.")
 
+# ---- Sidebar controls (start + restart) ----
 with st.sidebar:
-    annotator = st.text_input("Your name*", value="")
-    start = st.button("Start", type="primary")
-
-# session state
+    default_name = st.session_state.get("annotator", "")
+    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")
+    with c2:
+        restart_req = st.button("Restart")
+
+# 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
 if "order" not in st.session_state:
     st.session_state.order = []
 if "idx" not in st.session_state:
@@ -109,11 +87,13 @@ if "total" not in st.session_state:
 if "started" not in st.session_state:
     st.session_state.started = False
 
-# start logic
+# ---- Start pressed: build the queue for this annotator ----
 if start:
     if not annotator.strip():
         st.sidebar.error("Please enter your name.")
     else:
+        st.session_state["annotator"] = annotator.strip()
+
         imgs = list_images()
         labels_df = read_labels()
         if not SHOW_ALREADY_LABELED and len(labels_df) > 0:
@@ -124,12 +104,13 @@ if start:
         if not imgs:
             st.warning("No images found (or all labeled). Upload PNG/JPG/etc. to the `images/` folder.")
         else:
-            st.session_state.order = imgs            # deterministische Reihenfolge
+            # Deterministic order (shuffle if you want random)
+            st.session_state.order = imgs
             st.session_state.idx = 0
             st.session_state.total = len(imgs)
             st.session_state.started = True
 
-# main area
+# ---- Main panel ----
 if not st.session_state.started:
     st.info("Fill your name on the left and press **Start**.")
 else:
@@ -137,13 +118,19 @@ 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"{idx} / {total}")
+        st.caption(f"Annotator: **{st.session_state.get('annotator','')}** — {idx} / {total}")
         try:
             img = Image.open(current_image)
-            if getattr(img, "n_frames", 1) > 1:  # multipage TIFF → erste Seite
+            # 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)
@@ -153,19 +140,21 @@ else:
         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.get("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.get("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.get("annotator",""))
                 st.session_state.idx += 1
                 st.rerun()
 
+# ---- Footer ----
 st.divider()
-st.caption("Labels are saved & committed as `labels.csv` to this Space (see the Files tab).")
+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.")