annotation and statistics

app.py

@@ -76,8 +76,24 @@ results = []           # list of {'image': fname, 'labels': '...'}
 annotations = {}       # {img_idx: [bool, ...]} aligned to ALL_LABELS
 label_counts = {lbl: 0 for lbl in ALL_LABELS}  # used in statistics mode
 
+
 # ---------------------------
-# Core Functions
+# Utilities to reset state
+# ---------------------------
+def reset_annotation_state():
+    global images, current_index, results, annotations
+    images = []
+    current_index = 0
+    results = []
+    annotations = {}
+
+def reset_statistics_state():
+    global label_counts
+    label_counts = {lbl: 0 for lbl in ALL_LABELS}
+
+
+# ---------------------------
+# Core Functions (Annotation)
 # ---------------------------
 def display_image(idx):
     """Displays the image at the given index and its saved annotations."""
@@ -104,59 +120,55 @@ def submit(*selections):
     if not images:
         return "No image to label", None
 
-    # Save selections to our annotations dictionary
     annotations[current_index] = list(selections)
     fname = os.path.basename(images[current_index])
     chosen_labels = [lbl for lbl, sel in zip(ALL_LABELS, selections) if sel]
 
     global results
-    # Remove any previous entry for this image to avoid duplicates
-    results = [r for r in results if r['image'] != fname]
+    results = [r for r in results if r['image'] != fname]  # dedupe this image
     results.append({'image': fname, 'labels': ', '.join(chosen_labels)})
 
-    # Write the updated results to a CSV file
     df = pd.DataFrame(results)
     df.to_csv('image_labels.csv', index=False)
 
     return "Labels saved!", 'image_labels.csv'
 
 def upload_images(files):
-    """Handles image uploads, resetting the application state."""
+    """
+    Handles image uploads, resetting the application state.
+    In Annotation mode's single Upload section: first upload IMAGES here.
+    After success, we hide the image uploader and reveal the CSV uploader
+    in the SAME section.
+    """
     global images, current_index, results, annotations
     if not files:
         return [None, "No images uploaded"] + [False] * len(ALL_LABELS) + [
-            gr.update(visible=True),   # image_upload stays visible if nothing came
-            gr.update(visible=False),  # csv_upload hidden
-            gr.update(visible=False)   # stats_csv_upload hidden
+            gr.update(visible=True, value=None),   # image_upload stays visible
+            gr.update(visible=False, value=None)   # csv_upload hidden & cleared
         ]
 
-    # Gradio File returns temp files with .name path
     images = [f.name for f in files]
     current_index = 0
     results = []
     annotations = {}
     outputs = display_image(0)
 
-    # Hide the image uploader after a successful upload; show per-image CSV upload
+    # In the same "Upload" section: hide image uploader, show CSV uploader
     return outputs + [
-        gr.update(visible=False),   # image_upload
-        gr.update(visible=True),    # csv_upload
-        gr.update(visible=False)    # stats_csv_upload
+        gr.update(visible=False),  # image_upload
+        gr.update(visible=True, value=None)   # csv_upload
     ]
 
 def load_annotations(csv_file):
     """Loads annotations from an uploaded CSV file (annotation mode)."""
     global annotations, results
     if csv_file is None or not images:
-        # If no CSV is uploaded or no images are loaded, do nothing.
         return display_image(current_index)
 
     try:
         df = pd.read_csv(csv_file.name)
-        # Create a quick lookup map from filename to its index in the `images` list
         image_map = {os.path.basename(name): i for i, name in enumerate(images)}
 
-        # Reset existing annotations and results
         annotations = {}
         results = df.to_dict('records')
 
@@ -164,23 +176,22 @@ def load_annotations(csv_file):
             fname = row.get('image', '')
             if fname in image_map:
                 img_idx = image_map[fname]
-                # Handle cases where labels might be empty (NaN)
                 if pd.notna(row.get('labels', None)):
                     saved_labels = set(l.strip() for l in str(row['labels']).split(',') if l.strip())
                 else:
                     saved_labels = set()
-                # Create the boolean state list for the checkboxes
                 states = [label in saved_labels for label in ALL_LABELS]
                 annotations[img_idx] = states
     except Exception as e:
         print(f"Error loading annotations: {e}")
-        # In case of error, just refresh the current view without changes
         return display_image(current_index)
 
-    # After loading, refresh the view to show the annotations for the current image
     return display_image(current_index)
 
-# ---------- Statistics Mode Helpers ----------
+
+# ---------------------------
+# Statistics Mode
+# ---------------------------
 def aggregate_label_counts(files):
     """Read multiple CSVs of annotations and aggregate per-label counts."""
     counts = {lbl: 0 for lbl in ALL_LABELS}
@@ -207,7 +218,6 @@ def aggregate_label_counts(files):
             for item in items:
                 if item in counts:
                     counts[item] += 1
-                # silently ignore labels not in ALL_LABELS
 
     return counts, file_ct, rows_ct
 
@@ -216,7 +226,6 @@ def upload_stats_csvs(files):
     global label_counts
     label_counts, file_ct, rows_ct = aggregate_label_counts(files)
 
-    # Create updates for every checkbox: label "(count)", disabled & unchecked
     checkbox_updates = [
         gr.update(label=f"{lbl} ({label_counts.get(lbl, 0)})", value=False, interactive=False)
         for lbl in ALL_LABELS
@@ -224,76 +233,90 @@ def upload_stats_csvs(files):
     note = f"Statistics mode: loaded {file_ct} file(s), counted {rows_ct} annotation row(s)."
     return checkbox_updates + [note]
 
+
+# ---------------------------
+# Mode Toggle (discard state)
+# ---------------------------
 def make_checkbox_updates_for_mode(is_stats):
     """Return a list of gr.update for all checkboxes depending on mode."""
     if is_stats:
-        # Show counts & disable
+        # stats: counts shown (initially 0), disabled & unchecked
         return [
             gr.update(label=f"{lbl} ({label_counts.get(lbl, 0)})", value=False, interactive=False)
             for lbl in ALL_LABELS
         ]
     else:
-        # Restore original labels & interactivity; set values to current image's saved state
-        states = annotations.get(current_index, [False] * len(ALL_LABELS))
+        # annotate: original labels, unchecked, interactive
         return [
-            gr.update(label=lbl, value=val, interactive=True)
-            for lbl, val in zip(ALL_LABELS, states)
+            gr.update(label=lbl, value=False, interactive=True)
+            for lbl in ALL_LABELS
         ]
 
 def toggle_mode(current_mode):
     """
-    Toggle between 'annotate' and 'stats' modes.
+    Switches modes and DISCARD previous mode's data fully.
     Returns updates for:
       - mode_state
-      - image_upload (visible)
-      - csv_upload (visible)
-      - stats_csv_upload (visible)
-      - img (visible)
-      - caption (visible)
+      - image_upload (visible/value)
+      - csv_upload (visible/value)
+      - stats_csv_upload (visible/value)
+      - img (value/visible)
+      - caption (value/visible)
       - prev_btn (visible)
       - next_btn (visible)
       - submit_btn (interactive)
-      - csv_downloader (visible)
+      - csv_downloader (visible/value)
       - status (value)
       - all checkboxes (labels/value/interactive)
     """
     new_mode = 'stats' if current_mode == 'annotate' else 'annotate'
     is_stats = (new_mode == 'stats')
 
-    # Visibility & interactivity updates
+    # DISCARD/RESET state from the mode we're leaving
+    if is_stats:
+        # leaving annotate -> stats
+        reset_annotation_state()
+        reset_statistics_state()  # also reset counters to zero
+    else:
+        # leaving stats -> annotate
+        reset_statistics_state()
+        reset_annotation_state()
+
+    # Build UI updates
     img_vis = not is_stats
     nav_vis = not is_stats
     submit_interactive = not is_stats
     downloader_vis = not is_stats
 
-    # Uploaders
     image_upload_vis = not is_stats
-    csv_upload_vis = not is_stats  # allow annotation CSV in annotate mode
+    csv_upload_vis = False if is_stats else False  # always hidden right after switch; shown only after images upload
     stats_csv_upload_vis = is_stats
 
     status_text = (
         "Statistics mode: upload CSV files to compute per-label counts."
         if is_stats
-        else "Annotation mode: select labels and submit. (Optional: load a CSV for existing annotations.)"
+        else "Annotation mode: first upload images, then upload the annotations CSV (same Upload section)."
     )
 
     checkbox_updates = make_checkbox_updates_for_mode(is_stats)
 
+    # Clear image/caption and any downloader file; clear uploaders' values
     return (
         new_mode,
-        gr.update(visible=image_upload_vis),    # image_upload
-        gr.update(visible=csv_upload_vis),      # csv_upload
-        gr.update(visible=stats_csv_upload_vis),# stats_csv_upload
-        gr.update(visible=img_vis),             # img
-        gr.update(visible=img_vis),             # caption
-        gr.update(visible=nav_vis),             # prev_btn
-        gr.update(visible=nav_vis),             # next_btn
-        gr.update(interactive=submit_interactive), # submit_btn
-        gr.update(visible=downloader_vis),      # csv_downloader
-        status_text,                            # status (value)
+        gr.update(visible=image_upload_vis, value=None),    # image_upload
+        gr.update(visible=csv_upload_vis, value=None),      # csv_upload (hidden immediately on switch)
+        gr.update(visible=stats_csv_upload_vis, value=None),# stats_csv_upload
+        gr.update(value=None, visible=img_vis),             # img
+        gr.update(value="No images uploaded", visible=img_vis),  # caption
+        gr.update(visible=nav_vis),                         # prev_btn
+        gr.update(visible=nav_vis),                         # next_btn
+        gr.update(interactive=submit_interactive),          # submit_btn
+        gr.update(visible=downloader_vis, value=None),      # csv_downloader
+        status_text,                                        # status (value)
         *checkbox_updates
     )
 
+
 # ---------------------------
 # Gradio UI
 # ---------------------------
@@ -301,11 +324,29 @@ with gr.Blocks(theme=gr.themes.Soft()) as demo:
     gr.Markdown("## Dermatology Annotation Tool")
 
     with gr.Row():
-        image_upload = gr.File(label="1. Upload Images", file_count="multiple", file_types=["image"])
-        # Annotation CSV (per-image) — hidden until an image set is uploaded
-        csv_upload = gr.File(label="2. (Optional) Upload Annotations CSV", file_types=[".csv"], visible=False)
-        # Statistics CSV uploader (multi) — hidden by default; shown in stats mode
-        stats_csv_upload = gr.File(label="Upload Annotation CSVs (Statistics Mode)", file_types=[".csv"], file_count="multiple", visible=False)
+        # ONE SINGLE 'Upload' SECTION AREA for Annotation mode;
+        # in Stats mode, this area is replaced by the stats uploader.
+        with gr.Group():
+            gr.Markdown("### Upload")
+            image_upload = gr.File(
+                label="1) Upload Images",
+                file_count="multiple",
+                file_types=["image"],
+                visible=True
+            )
+            # Same section: revealed after images are uploaded
+            csv_upload = gr.File(
+                label="2) (Optional) Upload Annotations CSV",
+                file_types=[".csv"],
+                visible=False
+            )
+            # Same section location but only for statistics mode
+            stats_csv_upload = gr.File(
+                label="Upload Annotation CSVs (Statistics Mode)",
+                file_types=[".csv"],
+                file_count="multiple",
+                visible=False
+            )
 
     checkbox_components = []
 
@@ -357,31 +398,30 @@ with gr.Blocks(theme=gr.themes.Soft()) as demo:
                 next_btn = gr.Button("Next ➡️")
 
         with gr.Column(scale=1):  # Controls and download column
-            # --- TOGGLE BUTTON placed just above Submit Labels ---
             mode_state = gr.State("annotate")  # 'annotate' or 'stats'
-            toggle_btn = gr.Button("🔀 Switch to Statistics Mode", variant="secondary")  # sits above Submit
+            # --- TOGGLE BUTTON placed just above Submit Labels ---
+            toggle_btn = gr.Button("Switch Mode", variant="secondary")
             submit_btn = gr.Button("Submit Labels")
             status = gr.Label()
             csv_downloader = gr.File(label="Download labels CSV")
 
     # --- Event Handling ---
 
-    # When images are uploaded (annotation mode)
+    # When images are uploaded (annotation mode, same section)
     image_upload.upload(
         fn=upload_images,
         inputs=image_upload,
-        outputs=[img, caption] + checkbox_components + [image_upload, csv_upload, stats_csv_upload]
+        outputs=[img, caption] + checkbox_components + [image_upload, csv_upload]
     )
 
-    # Load per-image annotations CSV (annotation mode)
+    # Load per-image annotations CSV (annotation mode, same section)
     csv_upload.upload(
         fn=load_annotations,
         inputs=csv_upload,
         outputs=[img, caption] + checkbox_components
     )
 
-    # Statistics CSVs upload (statistics mode)
-    # Updates all checkbox labels with counts & disables them, also sets status text
+    # Statistics CSVs upload (statistics mode, replaces same section)
     stats_csv_upload.upload(
         fn=upload_stats_csvs,
         inputs=stats_csv_upload,
@@ -405,11 +445,11 @@ with gr.Blocks(theme=gr.themes.Soft()) as demo:
         outputs=[status, csv_downloader]
     )
 
-    # Toggle mode (annotation <-> statistics)
+    # Toggle mode (ANNOTATE <-> STATS) and DISCARD state
     toggle_btn.click(
         fn=toggle_mode,
         inputs=[mode_state],
-        outputs=[  # keep order in sync with toggle_mode return
+        outputs=[
             mode_state,
             image_upload, csv_upload, stats_csv_upload,
             img, caption,