progress tracking, cursor

annotation_tab/annotation_logic.py

@@ -5,9 +5,17 @@ import gradio as gr
 from config import OUTPUT_DIR
 
 # ==== CONFIG ====
-IMAGE_FOLDER = os.path.join(OUTPUT_DIR,"blobs")
+IMAGE_FOLDER = os.path.join(OUTPUT_DIR, "blobs")
 os.makedirs(IMAGE_FOLDER, exist_ok=True)
-CSV_FILE = os.path.join(OUTPUT_DIR,"annotations.csv")
+CSV_FILE = os.path.join(OUTPUT_DIR, "annotations.csv")
+
+
+# ==== HELPER COUNTER ====
+def get_progress_text():
+    if not all_images_paths:
+        return "No images loaded"
+    return f"Image {current_index + 1} of {len(all_images_paths)}"
+
 
 # ==== STATE ====
 if os.path.exists(CSV_FILE):
@@ -22,14 +30,17 @@ all_images = [f for f in os.listdir(IMAGE_FOLDER) if f.lower().endswith(('.png',
 all_images_paths = [os.path.join(IMAGE_FOLDER, f) for f in all_images]
 current_index = 0
 
+
 def get_current_image_path():
     if 0 <= current_index < len(all_images_paths):
         return all_images_paths[current_index]
     return None
 
+
 def is_annotated(image_path):
     return os.path.basename(image_path) in annotated_ids
 
+
 def get_annotation_for_image(image_path):
     filename = os.path.basename(image_path)
     row = df_annotations[df_annotations["blob_id"] == filename]
@@ -37,6 +48,7 @@ def get_annotation_for_image(image_path):
         return row["human_ocr"].values[0]
     return ""
 
+
 def find_next_unannotated_index(start):
     n = len(all_images_paths)
     idx = start
@@ -46,6 +58,7 @@ def find_next_unannotated_index(start):
             return idx
     return None
 
+
 def save_annotation(user_text):
     global df_annotations, annotated_ids
     img_path = get_current_image_path()
@@ -62,30 +75,33 @@ def save_annotation(user_text):
 
         df_annotations.to_csv(CSV_FILE, index=False)
 
+
 def save_and_next(user_text):
     global current_index
     if get_current_image_path() is None:
-        return None, "", gr.update(visible=True, value="No images available."), "No image loaded"
+        return None, "", gr.update(visible=True, value="No images available."), "No image loaded", "No images loaded"
 
     save_annotation(user_text)
     next_idx = find_next_unannotated_index(current_index)
     if next_idx is None:
-        return None, "", gr.update(visible=True, value="All images annotated."), ""
+        return None, "", gr.update(visible=True, value="All images annotated."), "", get_progress_text()
 
     current_index = next_idx
     img_path = get_current_image_path()
     annotation = get_annotation_for_image(img_path)
-    return img_path, annotation, gr.update(visible=False), img_path
+    return img_path, annotation, gr.update(visible=False), img_path, get_progress_text()
+
 
 def previous_image():
     global current_index
     if len(all_images_paths) == 0:
-        return None, "", gr.update(visible=True, value="No images available."), "No image loaded"
+        return None, "", gr.update(visible=True, value="No images available."), "No image loaded", "No images loaded"
 
     current_index = (current_index - 1) % len(all_images_paths)
     img_path = get_current_image_path()
     annotation = get_annotation_for_image(img_path)
-    return img_path, annotation, gr.update(visible=False), img_path
+    return img_path, annotation, gr.update(visible=False), img_path, get_progress_text()
+
 
 def delete_and_next():
     global current_index, all_images_paths, annotated_ids, df_annotations
@@ -102,27 +118,29 @@ def delete_and_next():
     del all_images_paths[current_index]
 
     if len(all_images_paths) == 0:
-        return None, "", gr.update(visible=True, value="No images left."), "No image loaded"
+        return None, "", gr.update(visible=True, value="No images left."), "No image loaded", "No images loaded"
 
     current_index = min(current_index, len(all_images_paths) - 1)
     img_path = get_current_image_path()
     annotation = get_annotation_for_image(img_path)
-    return img_path, annotation, gr.update(visible=False), img_path
+    return img_path, annotation, gr.update(visible=False), img_path, get_progress_text()
+
 
 def shutdown():
     os._exit(0)
 
+
 def save_and_exit(user_text):
     if get_current_image_path() is not None:
         save_annotation(user_text)
     threading.Timer(1, shutdown).start()
-    return None, "", gr.update(visible=True, value="Session closed."), ""
+    return None, "", gr.update(visible=True, value="Session closed."), "", get_progress_text()
 
 
 def get_current_annotations_path():
-    import os
     return os.path.join(OUTPUT_DIR, "annotations.csv")
 
+
 def refresh_image_list():
     """
     Rescan the blobs folder and update global image list.
@@ -134,8 +152,8 @@ def refresh_image_list():
     current_index = 0
 
     if not all_images_paths:
-        return None, "", gr.update(visible=True, value="No images available."), "No image loaded"
+        return None, "", gr.update(visible=True, value="No images available."), "No image loaded", "No images loaded"
 
     img_path = get_current_image_path()
     annotation = get_annotation_for_image(img_path)
-    return img_path, annotation, gr.update(visible=False), img_path
+    return img_path, annotation, gr.update(visible=False), img_path, get_progress_text()

annotation_tab/annotation_setup.py

@@ -1,39 +1,64 @@
 import gradio as gr
 from .annotation_logic import (
     save_and_next, previous_image, delete_and_next, save_and_exit,
-    get_current_image_path, get_annotation_for_image, get_current_annotations_path,refresh_image_list
+    get_current_image_path, get_annotation_for_image,
+    get_current_annotations_path, refresh_image_list
 )
 
 
-
-
 def get_annotation_widgets():
     message = gr.Markdown("", visible=False)
-    image_path_display = gr.Markdown(value=get_current_image_path() or "No image loaded", elem_id="image_path")
+    image_path_display = gr.Markdown(
+        value=get_current_image_path() or "No image loaded",
+        elem_id="image_path"
+    )
+    progress_display = gr.Markdown(value="No images loaded", elem_id="progress_display")
     img = gr.Image(type="filepath", value=get_current_image_path(), label="Blob")
-    txt = gr.Textbox(label="Transcription")
+    txt = gr.Textbox(label="Transcription", elem_id="transcription_box")
     hint = gr.Markdown("*If there are multiple street names in the image, please separate them with commas.*")
 
     with gr.Row():
         refresh_btn = gr.Button("Retrieve Images") 
         prev_btn = gr.Button("Previous")
-        next_btn = gr.Button("Save & Next")
+        next_btn = gr.Button("Save & Next", variant="primary")
         del_btn = gr.Button("Delete & Next", variant="stop")
         #exit_btn = gr.Button("Save & Exit", variant="secondary")
         download_btn = gr.Button("Download Annotations")
+
     with gr.Row():
         download_file = gr.File(label="Download CSV", interactive=False)  
 
+    # === Button wiring with progress_display as last output ===
     refresh_btn.click(
-        fn=lambda: refresh_image_list(),  # returns (image_path, text, message)
-        outputs=[img, txt, message, image_path_display]
+        fn=refresh_image_list,
+        outputs=[img, txt, message, image_path_display, progress_display]
     )
 
-    next_btn.click(save_and_next, inputs=txt, outputs=[img, txt, message, image_path_display])
-    prev_btn.click(previous_image, outputs=[img, txt, message, image_path_display])
-    del_btn.click(delete_and_next, outputs=[img, txt, message, image_path_display])
-    #exit_btn.click(save_and_exit, inputs=txt, outputs=[img, txt, message, image_path_display])
-    download_btn.click(lambda: get_current_annotations_path(),outputs=download_file)
+    next_btn.click(
+        save_and_next,
+        inputs=txt,
+        outputs=[img, txt, message, image_path_display, progress_display]
+    )
 
+    prev_btn.click(
+        previous_image,
+        outputs=[img, txt, message, image_path_display, progress_display]
+    )
+
+    del_btn.click(
+        delete_and_next,
+        outputs=[img, txt, message, image_path_display, progress_display]
+    )
+
+    #exit_btn.click(save_and_exit, inputs=txt, outputs=[img, txt, message, image_path_display, progress_display])
+
+    download_btn.click(
+        lambda: get_current_annotations_path(),
+        outputs=download_file
+    )
 
-    return [message, image_path_display, img, txt, hint,refresh_btn, prev_btn, next_btn, del_btn] #, exit_btn]
+    return [
+        message, image_path_display, progress_display, img, txt, hint,
+        refresh_btn, prev_btn, next_btn, del_btn
+        #, exit_btn
+    ]

app.py

@@ -16,8 +16,27 @@ with gr.Blocks() as demo:
         get_inference_widgets(run_inference,georefImg)
     with gr.Tab("Annotation"):
         get_annotation_widgets()
-    with gr.Tab("Map"): 
-        get_map_widgets()  
+    #with gr.Tab("Map"): 
+    #    get_map_widgets()  
+
+
+# Autofocus JavaScript: put cursor into Transcription box
+    demo.load(
+        None,
+        None,
+        _js="""
+            () => {
+                setTimeout(() => {
+                    const el = document.getElementById('transcription_box');
+                    if (el) {
+                        el.querySelector('textarea').focus();
+                        return;
+                    }
+                }, 100);
+            }
+        """
+    )
+
 
 # [DEBUG]
 demo.launch(inbrowser=True)