Upload 41 files

app.py

@@ -96,7 +96,8 @@ def click_gaze(image, points, weight, event: gr.SelectData):
 def prepare_csv(file):
     """Read a CSV and expose its columns for explicit user mapping."""
     hidden = (None, gr.update(visible=False), gr.update(choices=[], value=None),
-              gr.update(choices=[], value=None), gr.update(choices=[], value=NO_DURATION),
+              gr.update(choices=[], value=None), gr.update(choices=[], value=None),
+              gr.update(choices=[], value=NO_DURATION),
               gr.update(visible=False))
     if file is None:
         return hidden
@@ -107,10 +108,12 @@ def prepare_csv(file):
             raise ValueError("CSV contains no rows.")
         columns = [str(column) for column in frame.columns]
         lower = {column.lower().strip(): column for column in columns}
+        id_guess = lower.get("id") or lower.get("image_id") or lower.get("image") or lower.get("filename") or columns[0]
         x_guess = lower.get("x") or lower.get("gaze_x") or lower.get("fix_x") or columns[0]
         y_guess = lower.get("y") or lower.get("gaze_y") or lower.get("fix_y") or columns[min(1, len(columns) - 1)]
         duration_guess = lower.get("duration") or lower.get("weight") or lower.get("fixation_duration") or NO_DURATION
         return (frame.to_json(orient="split"), gr.update(visible=True),
+                gr.update(choices=columns, value=id_guess),
                 gr.update(choices=columns, value=x_guess),
                 gr.update(choices=columns, value=y_guess),
                 gr.update(choices=[NO_DURATION] + columns, value=duration_guess),
@@ -120,25 +123,17 @@ def prepare_csv(file):
         return hidden
 
 
-def apply_csv(frame_json, x_col, y_col, duration_col, image, image_name):
+def apply_csv(frame_json, id_col, x_col, y_col, duration_col, image, image_name):
     if image is None:
         gr.Warning("Upload an image before applying gaze CSV data.")
         return gr.update(), gr.update()
-    if not frame_json or not x_col or not y_col:
-        gr.Warning("Select the X and Y columns first.")
+    if not frame_json or not id_col or not x_col or not y_col:
+        gr.Warning("Select the ID, X, and Y columns first.")
         return gr.update(), gr.update()
     try:
         frame = pd.read_json(frame_json, orient="split")
-        # ``utf-8-sig`` CSV exports can leave a BOM in the first header, so
-        # normalize it before locating the required ID column. Never fall back
-        # to importing every row: this file can contain gaze for many images.
-        id_col = next(
-            (column for column in frame.columns
-             if str(column).lstrip("\ufeff").strip().casefold() == "id"),
-            None,
-        )
-        if id_col is None:
-            raise ValueError('CSV must contain an "id" column to import gaze for the selected image.')
+        if id_col not in frame.columns:
+            raise ValueError(f'ID column "{id_col}" was not found in the CSV.')
         if not image_name:
             raise ValueError("The uploaded image name is unavailable for matching the CSV id column.")
         image_path = Path(image_name)
@@ -240,9 +235,10 @@ with gr.Blocks(title="GazeCorrect") as demo:
                 weight = gr.Slider(.1, 1, value=1, step=.1, label="Next click weight")
                 clear_button = gr.Button("Clear gaze", variant="secondary")
             with gr.Accordion("Import gaze CSV", open=False):
-                gr.Markdown("Upload a CSV with an `id` column, then choose the fixation X, Y, and optional duration/weight columns. Only rows whose ID matches the uploaded image filename (or filename without its extension) are imported.")
+                gr.Markdown("Upload a CSV and select its image ID, fixation X/Y, and optional duration/weight columns. Only rows whose selected ID matches the uploaded image filename (or filename without its extension) are imported.")
                 csv_file = gr.File(label="Choose CSV", file_types=[".csv", ".tsv", ".txt"])
                 with gr.Row(visible=False) as csv_mapping:
+                    id_column = gr.Dropdown(label="Image ID column")
                     x_column = gr.Dropdown(label="X column")
                     y_column = gr.Dropdown(label="Y column")
                     duration_column = gr.Dropdown(label="Duration / weight (optional)")
@@ -264,8 +260,8 @@ with gr.Blocks(title="GazeCorrect") as demo:
     upload.upload(load_image, upload, [image_state, points_state, image_name_state, panel])
     panel.select(click_gaze, [image_state, points_state, weight], [points_state, panel])
     clear_button.click(clear_gaze, image_state, [points_state, panel])
-    csv_file.upload(prepare_csv, csv_file, [csv_state, csv_mapping, x_column, y_column, duration_column, apply_csv_button])
-    apply_csv_button.click(apply_csv, [csv_state, x_column, y_column, duration_column, image_state, image_name_state], [points_state, panel])
+    csv_file.upload(prepare_csv, csv_file, [csv_state, csv_mapping, id_column, x_column, y_column, duration_column, apply_csv_button])
+    apply_csv_button.click(apply_csv, [csv_state, id_column, x_column, y_column, duration_column, image_state, image_name_state], [points_state, panel])
     button.click(generate, [image_state, points_state, description, sigma, degree, feather, strength, steps, seed], [gaze_out, noise_out, corrected_out, status])
 
 demo.queue().launch(show_error=True)