added tiling num to annotations

annotation_tab/annotation_logic.py

@@ -3,25 +3,16 @@ import pandas as pd
 import threading
 import gradio as gr
 from config import OUTPUT_DIR
+import re
 
 # ==== CONFIG ====
 IMAGE_FOLDER = os.path.join(OUTPUT_DIR, "blobs")
 os.makedirs(IMAGE_FOLDER, exist_ok=True)
-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)}"
+CSV_FILE = None
+df_annotations = pd.DataFrame(columns=["blob_id", "human_ocr"])
 
 # ==== STATE ====
-if os.path.exists(CSV_FILE):
-    df_annotations = pd.read_csv(CSV_FILE, dtype={"blob_id": str, "human_ocr": str})
-else:
-    df_annotations = pd.DataFrame(columns=["blob_id", "human_ocr"])
-    df_annotations.to_csv(CSV_FILE, index=False)
-
 all_images = [
     f for f in os.listdir(IMAGE_FOLDER)
     if f.lower().endswith(('.png', '.jpg', '.jpeg')) and '_margin' in f
@@ -29,34 +20,66 @@ all_images = [
 all_images_paths = [os.path.join(IMAGE_FOLDER, f) for f in all_images]
 current_index = 0
 
+# ==== TILE CSV ====
+def switch_tile_csv(selected_tile):
+    global CSV_FILE, df_annotations
+    tile_filename = os.path.basename(selected_tile["tile_path"])
+    tile_name, _ = os.path.splitext(tile_filename)
+    CSV_FILE = os.path.join(OUTPUT_DIR, f"annotations_{tile_name}.csv")
+    
+    if os.path.exists(CSV_FILE):
+        df_annotations = pd.read_csv(CSV_FILE, dtype={"blob_id": str, "human_ocr": str})
+    else:
+        df_annotations = pd.DataFrame(columns=["blob_id", "human_ocr"])
+        df_annotations.to_csv(CSV_FILE, index=False)
+    
+    return CSV_FILE
+
 # ==== HELPERS ====
+def get_progress_text():
+    if not all_images_paths:
+        return "No images loaded"
+    return f"Image {current_index + 1} of {len(all_images_paths)}"
+
 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 True if the image has any non-empty annotation, including 'DELETED'."""
+def get_annotation_for_image(image_path):
+    blob_id = os.path.basename(image_path).replace("_margin", "")
+    row = df_annotations[df_annotations["blob_id"] == blob_id]
+    if not row.empty:
+        return str(row["human_ocr"].values[-1])
+    return ""
+
+def is_annotated_or_deleted(image_path):
+    """Return True if image has an annotation or is deleted."""
     blob_id = os.path.basename(image_path).replace("_margin", "")
     row = df_annotations[df_annotations["blob_id"] == blob_id]
     if not row.empty:
         val = str(row["human_ocr"].values[-1]).strip()
-        return val != ""  # counts "DELETED" as annotated
+        return val != ""  # includes 'DELETED' as counted
     return False
 
-def get_annotation_for_image(image_path):
+def is_deleted(image_path):
     blob_id = os.path.basename(image_path).replace("_margin", "")
     row = df_annotations[df_annotations["blob_id"] == blob_id]
     if not row.empty:
-        return str(row["human_ocr"].values[-1])
-    return ""
+        return str(row["human_ocr"].values[-1]).strip() == "DELETED"
+    return False
+
+def all_processed():
+    """Return True if all images are either annotated or deleted."""
+    return all(is_annotated_or_deleted(p) for p in all_images_paths)
 
-def find_next_unannotated_index(start):
+def find_next_unprocessed_index(start):
+    """Return the next image index that is neither annotated nor deleted."""
     n = len(all_images_paths)
     idx = start
     for _ in range(n):
         idx = (idx + 1) % n
-        if not is_annotated(all_images_paths[idx]):
+        if not is_annotated_or_deleted(all_images_paths[idx]):
             return idx
     return None
 
@@ -64,7 +87,6 @@ def find_next_unannotated_index(start):
 def save_annotation(user_text):
     """Save the current annotation for the active image."""
     global df_annotations
-
     img_path = get_current_image_path()
     if not img_path:
         return
@@ -90,15 +112,14 @@ def save_and_next(user_text):
 
     save_annotation(user_text)
 
-    # Check if all images are annotated
-    if all(is_annotated(p) for p in all_images_paths):
+    if all_processed():
         current_index = 0
         img_path = get_current_image_path()
         annotation = get_annotation_for_image(img_path)
         return img_path, annotation, gr.update(visible=True, value="All images annotated."), img_path, get_progress_text()
 
-    next_idx = find_next_unannotated_index(current_index)
-    current_index = next_idx
+    next_idx = find_next_unprocessed_index(current_index)
+    current_index = next_idx if next_idx is not None else 0
     img_path = get_current_image_path()
     annotation = get_annotation_for_image(img_path)
     return img_path, annotation, gr.update(visible=False), img_path, get_progress_text()
@@ -116,7 +137,6 @@ def previous_image():
 def delete_and_next():
     """Mark current image as DELETED and move to next image."""
     global current_index, df_annotations
-
     img_path = get_current_image_path()
     if not img_path:
         return None, "", gr.update(visible=True, value="No images available."), "No image loaded", "No images loaded"
@@ -133,41 +153,29 @@ def delete_and_next():
 
     df_annotations.to_csv(CSV_FILE, index=False)
 
-    # Check if all images are annotated
-    if all(is_annotated(p) for p in all_images_paths):
+    if all_processed():
         current_index = 0
         img_path = get_current_image_path()
         annotation = get_annotation_for_image(img_path)
         return img_path, annotation, gr.update(visible=True, value="All images annotated."), img_path, get_progress_text()
 
-    # Otherwise, move to next unannotated image
-    next_idx = find_next_unannotated_index(current_index)
-    if next_idx is not None:
-        current_index = next_idx
-    else:
-        current_index = 0
-
+    next_idx = find_next_unprocessed_index(current_index)
+    current_index = next_idx if next_idx is not None else 0
     img_path = get_current_image_path()
     annotation = get_annotation_for_image(img_path)
     return img_path, annotation, gr.update(visible=False), img_path, get_progress_text()
 
-
 def save_and_exit(user_text):
     if get_current_image_path() is not None:
         save_annotation(user_text)
     threading.Timer(1, lambda: os._exit(0)).start()
     return None, "", gr.update(visible=True, value="Session closed."), "", get_progress_text()
 
-def get_current_annotations_path():
-    return CSV_FILE
-
 def refresh_image_list():
-    """Reload images and reset CSV and state."""
+    """Reload images for the current tile and clear the CSV."""
     global all_images_paths, current_index, df_annotations
 
-    df_annotations = pd.DataFrame(columns=["blob_id", "human_ocr"])
-    df_annotations.to_csv(CSV_FILE, index=False)
-
+    # Reload images
     all_images = [
         f for f in os.listdir(IMAGE_FOLDER)
         if f.lower().endswith(('.png', '.jpg', '.jpeg')) and '_margin' in f
@@ -175,9 +183,15 @@ def refresh_image_list():
     all_images_paths = [os.path.join(IMAGE_FOLDER, f) for f in all_images]
     current_index = 0
 
+    # Reset CSV for current tile
+    df_annotations = pd.DataFrame(columns=["blob_id", "human_ocr"])
+    if CSV_FILE:
+        df_annotations.to_csv(CSV_FILE, index=False)
+
     if not all_images_paths:
         return None, "", gr.update(visible=True, value="No images available."), "No image loaded", "No images loaded"
 
+    # Return first image
     img_path = get_current_image_path()
     annotation = get_annotation_for_image(img_path)
     return img_path, annotation, gr.update(visible=False), img_path, get_progress_text()

annotation_tab/annotation_setup.py

@@ -1,12 +1,14 @@
+import os
 import gradio as gr
+import pandas as pd
+from config import OUTPUT_DIR
 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
+    refresh_image_list, switch_tile_csv
 )
 
-
-def get_annotation_widgets():
+def get_annotation_widgets(selected_tile_state):
     message = gr.Markdown("", visible=False)
     image_path_display = gr.Markdown(
         value=get_current_image_path() or "No image loaded",
@@ -53,8 +55,10 @@ def get_annotation_widgets():
     #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
+        #lambda: get_current_annotations_path(),
+        fn=lambda selected_tile: switch_tile_csv(selected_tile),
+        inputs=[selected_tile_state],
+        outputs=[download_file]
     )
 
     return [

app.py

@@ -15,10 +15,11 @@ logging.basicConfig(level=logging.DEBUG)
 
 
 with gr.Blocks() as demo:
+    selected_tile_state=gr.State(value=None)
     with gr.Tab("Inference"):
-        image_input, gcp_input, city_name,user_crs, score_th, hist_th, hist_dic, run_button, output, download_file = get_inference_widgets(run_inference,georefImg)
+        image_input, gcp_input, city_name,user_crs, score_th, hist_th, hist_dic, run_button, output, download_file = get_inference_widgets(run_inference,georefImg, selected_tile_state)
     with gr.Tab("Annotation"):
-        get_annotation_widgets()
+        get_annotation_widgets(selected_tile_state)
     with gr.Tab("Map"): 
         get_map_widgets(city_name)  
 

inference_tab/inference_setup.py

@@ -77,7 +77,7 @@ def enable_textbox(file):
     return gr.update(interactive=bool(file))
 
 
-def get_inference_widgets(run_inference,georefImg):
+def get_inference_widgets(run_inference,georefImg,selected_tile_state):
     with gr.Row():
         # Left column
         with gr.Column(scale=1,min_width=500):
@@ -120,7 +120,8 @@ def get_inference_widgets(run_inference,georefImg):
                                     file_types=[".csv"],
                                     type="filepath")
 
-    selected_tile_path = gr.State()
+    # pass globally instead
+    #selected_tile_state = gr.State()
 
 
     # Wire events
@@ -129,12 +130,12 @@ def get_inference_widgets(run_inference,georefImg):
         outputs=[annotated_out, run_button]
     )
     annotated_out.select(
-        fn=select_tile, inputs=[selected_tile_path],
-        outputs=[selected_tile, run_button, selected_tile_path]
+        fn=select_tile, inputs=[selected_tile_state],
+        outputs=[selected_tile, run_button, selected_tile_state]
     )
     run_button.click(
         fn=run_inference,
-        inputs=[selected_tile_path, gcp_input,user_crs, city_name, score_th, hist_th,hist_dic],
+        inputs=[selected_tile_state, gcp_input,user_crs, city_name, score_th, hist_th,hist_dic],
         outputs=[output, download_file]
     )