Upload folder using huggingface_hub

web_demo/app.py

@@ -43,10 +43,13 @@ from web_demo.supabase_client import (
     FEEDBACK_NO_ROW,
     FEEDBACK_DISABLED,
     list_measurements,
+    count_measurements,
     list_feedback,
+    count_feedback,
     list_measurements_for_stats,
     update_ground_truth,
     delete_measurement,
+    delete_feedback,
 )
 from src.confidence_constants import (
     CONFIDENCE_LEVEL_HIGH_THRESHOLD,
@@ -647,6 +650,19 @@ def api_fit_feedback():
 
 ADMIN_TOKEN = os.environ.get("ADMIN_TOKEN", "ringsizer2026")
 
+# Max rows the admin list endpoints fetch in one request. The DB may hold
+# more; the true total is sent in the X-Total-Count header so the front-end
+# can show "newest N of M" instead of silently hiding older rows.
+ADMIN_LIST_LIMIT = 500
+
+
+def _with_total(resp, total: Optional[int]):
+    """Attach the full row count as X-Total-Count (skipped when unknown,
+    e.g. persistence disabled). Lets the admin UI flag a truncated list."""
+    if total is not None:
+        resp.headers["X-Total-Count"] = str(total)
+    return resp
+
 
 @app.route("/admin")
 def admin_page():
@@ -662,16 +678,16 @@ def _check_admin_token():
 def api_admin_measurements():
     if not _check_admin_token():
         return jsonify({"error": "Unauthorized"}), 401
-    rows = list_measurements(limit=500)
-    return jsonify(rows)
+    rows = list_measurements(limit=ADMIN_LIST_LIMIT)
+    return _with_total(jsonify(rows), count_measurements())
 
 
 @app.route("/api/admin/feedback")
 def api_admin_feedback():
     if not _check_admin_token():
         return jsonify({"error": "Unauthorized"}), 401
-    rows = list_feedback(limit=500)
-    return jsonify(rows)
+    rows = list_feedback(limit=ADMIN_LIST_LIMIT)
+    return _with_total(jsonify(rows), count_feedback())
 
 
 @app.route("/api/admin/measurements/<measurement_id>/ground-truth", methods=["POST"])
@@ -695,6 +711,16 @@ def api_admin_delete(measurement_id: str):
     return jsonify({"success": False, "error": "Delete failed"}), 400
 
 
+@app.route("/api/admin/feedback/<feedback_id>", methods=["DELETE"])
+def api_admin_delete_feedback(feedback_id: str):
+    if not _check_admin_token():
+        return jsonify({"error": "Unauthorized"}), 401
+    ok = delete_feedback(feedback_id)
+    if ok:
+        return jsonify({"success": True})
+    return jsonify({"success": False, "error": "Delete failed"}), 400
+
+
 def _parse_iso_to_utc_date(iso_str: str) -> Optional[date]:
     """Parse a Supabase `created_at` ISO string to a UTC `date`.
 

web_demo/supabase_client.py

@@ -94,6 +94,47 @@ def upload_file(local_path: str, storage_path: str) -> Optional[str]:
         return None
 
 
+def _storage_path_from_public_url(public_url: str) -> Optional[str]:
+    """Extract the in-bucket object path from a Supabase public URL.
+
+    Public URLs look like
+    `<base>/storage/v1/object/public/ring-measurements/<path>`; newer
+    supabase-py may append a `?` query (cache-buster) which we strip.
+    Returns the bucket-relative `<path>` (e.g. `photos/f_x.jpg`) or None
+    when the URL isn't a public-object URL for our bucket (e.g. a null
+    photo_url on a demo run).
+    """
+    if not public_url:
+        return None
+    marker = f"/storage/v1/object/public/{BUCKET}/"
+    idx = public_url.find(marker)
+    if idx == -1:
+        return None
+    from urllib.parse import unquote
+    path = public_url[idx + len(marker):].split("?", 1)[0]
+    return unquote(path) or None
+
+
+def _remove_storage_objects(public_urls: List[str]) -> None:
+    """Best-effort delete of storage objects behind a list of public URLs.
+
+    Called after a row delete to avoid orphaning the uploaded photo/result
+    objects. Never raises: the row is already gone, and a leftover object
+    is not worth failing the request over (failures are logged).
+    """
+    client = _get_client()
+    if client is None:
+        return
+    paths = [p for p in (_storage_path_from_public_url(u) for u in public_urls) if p]
+    if not paths:
+        return
+    try:
+        client.storage.from_(BUCKET).remove(paths)
+        logger.info("Removed %d storage object(s): %s", len(paths), paths)
+    except Exception as e:
+        logger.error("Failed to remove storage objects %s: %s", paths, e)
+
+
 def save_measurement(record: Dict[str, Any]) -> Optional[str]:
     """Insert a measurement record. Returns row UUID or None."""
     client = _get_client()
@@ -149,6 +190,20 @@ def list_feedback(limit: int = 500, offset: int = 0) -> List[Dict[str, Any]]:
         return []
 
 
+def count_feedback() -> Optional[int]:
+    """Total feedback rows, ignoring the list limit. None if persistence is
+    disabled (lets the admin label distinguish 'unknown' from a real 0)."""
+    client = _get_client()
+    if client is None:
+        return None
+    try:
+        resp = client.table("feedback").select("id", count="exact", head=True).execute()
+        return resp.count
+    except Exception as e:
+        logger.error("Failed to count feedback: %s", e)
+        return None
+
+
 def list_measurements(limit: int = 200, offset: int = 0) -> List[Dict[str, Any]]:
     """Fetch measurements for admin page, newest first."""
     client = _get_client()
@@ -168,6 +223,20 @@ def list_measurements(limit: int = 200, offset: int = 0) -> List[Dict[str, Any]]
         return []
 
 
+def count_measurements() -> Optional[int]:
+    """Total measurement rows, ignoring the list limit. None if persistence
+    is disabled (lets the admin label distinguish 'unknown' from a real 0)."""
+    client = _get_client()
+    if client is None:
+        return None
+    try:
+        resp = client.table("measurements").select("id", count="exact", head=True).execute()
+        return resp.count
+    except Exception as e:
+        logger.error("Failed to count measurements: %s", e)
+        return None
+
+
 STATS_COLUMNS = (
     "id,created_at,kol_name,kol_email,mode,ring_model,confidence,fail_reason,"
     "overall_best_size,ring_fit,gt_index_size,gt_middle_size,gt_ring_size,"
@@ -235,18 +304,46 @@ def update_measurement_feedback(run_id: str, updates: Dict[str, Any]) -> str:
 
 
 def delete_measurement(measurement_id: str) -> bool:
-    """Delete a measurement record by ID."""
+    """Delete a measurement record by ID, sweeping its photo + result
+    objects from storage too (best-effort — the row delete is authoritative;
+    demo runs with null photo_url simply have nothing to sweep)."""
     client = _get_client()
     if client is None:
         return False
     try:
+        resp = (
+            client.table("measurements")
+            .select("photo_url,result_url")
+            .eq("id", measurement_id)
+            .execute()
+        )
+        rows = resp.data or []
         client.table("measurements").delete().eq("id", measurement_id).execute()
+        urls = [r.get("photo_url") for r in rows] + [r.get("result_url") for r in rows]
+        _remove_storage_objects(urls)
         return True
     except Exception as e:
         logger.error("Failed to delete %s: %s", measurement_id, e)
         return False
 
 
+def delete_feedback(feedback_id: str) -> bool:
+    """Delete a post-shipment fit-feedback row by ID, sweeping its photo
+    object from storage too (best-effort — the row delete is authoritative)."""
+    client = _get_client()
+    if client is None:
+        return False
+    try:
+        resp = client.table("feedback").select("photo_url").eq("id", feedback_id).execute()
+        rows = resp.data or []
+        client.table("feedback").delete().eq("id", feedback_id).execute()
+        _remove_storage_objects([r.get("photo_url") for r in rows])
+        return True
+    except Exception as e:
+        logger.error("Failed to delete feedback %s: %s", feedback_id, e)
+        return False
+
+
 GT_ALLOWED_FIELDS = {"gt_index_size", "gt_middle_size", "gt_ring_size", "ring_fit", "gt_best_finger", "gt_notes"}
 
 

web_demo/templates/admin.html

@@ -272,6 +272,8 @@
       <div class="toolbar">
         <a href="/">Back to Demo</a>
         <button id="fbRefreshBtn">Refresh</button>
+        <button id="fbPrevPageBtn" disabled>&lsaquo; Prev</button>
+        <button id="fbNextPageBtn" disabled>Next &rsaquo;</button>
         <span class="count" id="fbCountLabel">Loading...</span>
       </div>
 
@@ -288,10 +290,11 @@
               <th>Hand</th>
               <th>Photo</th>
               <th>Notes</th>
+              <th></th>
             </tr>
           </thead>
           <tbody id="fbTableBody">
-            <tr><td colspan="9" class="empty">Loading...</td></tr>
+            <tr><td colspan="10" class="empty">Loading...</td></tr>
           </tbody>
         </table>
       </div>
@@ -312,6 +315,13 @@
     const PAGE_SIZE = 25;
     let allRows = [];
     let currentPage = 1;
+    let serverTotal = null;  // full DB count from X-Total-Count (may exceed loaded rows)
+
+    // "N rows" or "newest N of M rows" when the server-side fetch was capped.
+    const countText = (loaded, total, noun) =>
+      (total != null && total > loaded)
+        ? `newest ${loaded} of ${total} ${noun}`
+        : `${loaded} ${noun}`;
 
     let adminToken = sessionStorage.getItem("admin_token") || "";
 
@@ -416,7 +426,7 @@
       } else {
         const start = (currentPage - 1) * PAGE_SIZE;
         const slice = allRows.slice(start, start + PAGE_SIZE);
-        countLabel.textContent = `${total} records · page ${currentPage}/${totalPages}`;
+        countLabel.textContent = `${countText(total, serverTotal, "records")} · page ${currentPage}/${totalPages}`;
         tbody.innerHTML = slice.map(rowHtml).join("");
       }
       prevPageBtn.disabled = currentPage <= 1;
@@ -433,6 +443,8 @@
           loginError.textContent = "Session expired. Please log in again.";
           return;
         }
+        serverTotal = parseInt(resp.headers.get("X-Total-Count"), 10);
+        if (isNaN(serverTotal)) serverTotal = null;
         allRows = await resp.json();
         currentPage = 1;
         renderPage();
@@ -452,6 +464,7 @@
         const result = await resp.json();
         if (result.success) {
           allRows = allRows.filter((r) => r.id !== id);
+          if (serverTotal != null) serverTotal--;
           renderPage();
         } else {
           alert("Delete failed: " + (result.error || "unknown"));
@@ -482,6 +495,12 @@
     // ------------------------------------------------------------------
     const fbTableBody = document.getElementById("fbTableBody");
     const fbCountLabel = document.getElementById("fbCountLabel");
+    const fbPrevPageBtn = document.getElementById("fbPrevPageBtn");
+    const fbNextPageBtn = document.getElementById("fbNextPageBtn");
+
+    let fbAllRows = [];
+    let fbCurrentPage = 1;
+    let fbServerTotal = null;  // full DB count from X-Total-Count
 
     // Map the stored value codes back to human labels (mirrors the
     // /feedback form's <option> text).
@@ -501,7 +520,7 @@
       const photoThumb = r.photo_url
         ? `<img class="thumb" loading="lazy" src="${esc(r.photo_url)}" onclick="window.open('${esc(r.photo_url)}')" />`
         : "-";
-      return `<tr>
+      return `<tr data-id="${esc(r.id)}">
         <td><strong>${esc(r.kol_email) || "-"}</strong></td>
         <td>${fmtDate(r.submitted_at)}</td>
         <td>${esc(r.received_size) || "-"}</td>
@@ -511,9 +530,28 @@
         <td>${fbLabel(FB_HAND, r.hand)}</td>
         <td>${photoThumb}</td>
         <td>${fmtComment(r.notes)}</td>
+        <td><button class="del-btn" onclick="deleteFbRow(this)">Delete</button></td>
       </tr>`;
     };
 
+    const renderFbPage = () => {
+      const total = fbAllRows.length;
+      const totalPages = Math.max(1, Math.ceil(total / PAGE_SIZE));
+      if (fbCurrentPage > totalPages) fbCurrentPage = totalPages;
+      if (fbCurrentPage < 1) fbCurrentPage = 1;
+      if (total === 0) {
+        fbCountLabel.textContent = "0 feedback rows";
+        fbTableBody.innerHTML = '<tr><td colspan="10" class="empty">No feedback yet</td></tr>';
+      } else {
+        const start = (fbCurrentPage - 1) * PAGE_SIZE;
+        const slice = fbAllRows.slice(start, start + PAGE_SIZE);
+        fbCountLabel.textContent = `${countText(total, fbServerTotal, "feedback rows")} · page ${fbCurrentPage}/${totalPages}`;
+        fbTableBody.innerHTML = slice.map(fbRowHtml).join("");
+      }
+      fbPrevPageBtn.disabled = fbCurrentPage <= 1;
+      fbNextPageBtn.disabled = fbCurrentPage >= totalPages;
+    };
+
     const loadFeedback = async () => {
       try {
         const resp = await fetch(`/api/admin/feedback?token=${encodeURIComponent(adminToken)}`);
@@ -524,19 +562,39 @@
           loginError.textContent = "Session expired. Please log in again.";
           return;
         }
-        const rows = await resp.json();
-        if (!rows.length) {
-          fbCountLabel.textContent = "0 feedback rows";
-          fbTableBody.innerHTML = '<tr><td colspan="9" class="empty">No feedback yet</td></tr>';
-          return;
+        fbServerTotal = parseInt(resp.headers.get("X-Total-Count"), 10);
+        if (isNaN(fbServerTotal)) fbServerTotal = null;
+        fbAllRows = await resp.json();
+        fbCurrentPage = 1;
+        renderFbPage();
+      } catch (e) {
+        fbTableBody.innerHTML = `<tr><td colspan="10" class="empty">Error loading feedback: ${e.message}</td></tr>`;
+      }
+    };
+
+    window.deleteFbRow = async (btn) => {
+      if (!confirm("Delete this feedback record?")) return;
+      const tr = btn.closest("tr");
+      const id = tr.dataset.id;
+      try {
+        const resp = await fetch(`/api/admin/feedback/${id}?token=${encodeURIComponent(adminToken)}`, {
+          method: "DELETE",
+        });
+        const result = await resp.json();
+        if (result.success) {
+          fbAllRows = fbAllRows.filter((r) => r.id !== id);
+          if (fbServerTotal != null) fbServerTotal--;
+          renderFbPage();
+        } else {
+          alert("Delete failed: " + (result.error || "unknown"));
         }
-        fbCountLabel.textContent = `${rows.length} feedback rows`;
-        fbTableBody.innerHTML = rows.map(fbRowHtml).join("");
       } catch (e) {
-        fbTableBody.innerHTML = `<tr><td colspan="9" class="empty">Error loading feedback: ${e.message}</td></tr>`;
+        alert("Network error: " + e.message);
       }
     };
 
+    fbPrevPageBtn.addEventListener("click", () => { fbCurrentPage--; renderFbPage(); });
+    fbNextPageBtn.addEventListener("click", () => { fbCurrentPage++; renderFbPage(); });
     document.getElementById("fbRefreshBtn").addEventListener("click", loadFeedback);
 
     // ------------------------------------------------------------------