Update src/streamlit_app.py

src/streamlit_app.py

@@ -211,11 +211,12 @@ def has_any_label(fname: str) -> bool:
     vals = st.session_state.field_values.get(fname, {})
     return any(str(v).strip() for v in vals.values())
 
-# --- Upload ---
+# --- Upload (compact) ---
 uploaded_files = st.file_uploader(
     "Upload remittance images",
     type=["png", "jpg", "jpeg"],
     accept_multiple_files=True,
+    label_visibility="collapsed"
 )
 
 if not uploaded_files:
@@ -233,7 +234,9 @@ for f in uploaded_files:
     images.append({"name": f.name, "image": img, "bytes": st.session_state.image_data[f.name]})
 
 file_names = [img["name"] for img in images]
-selected_name = st.selectbox("Select image", file_names)
+
+# Image selector dropdown only (no duplicate list above)
+selected_name = st.selectbox("Select image", file_names, label_visibility="collapsed")
 st.session_state.selected_image = selected_name
 
 selected_img_data = next(img for img in images if img["name"] == selected_name)
@@ -252,36 +255,36 @@ if selected_name not in st.session_state.rect_version:
 if selected_name not in st.session_state.zoom_values:
     st.session_state.zoom_values[selected_name] = get_default_zoom(pil_image)
 
-# ========== FIELD SELECTION ==========
-st.markdown("---")
-
-def add_line_item():
-    img = st.session_state.selected_image
-    if img:
-        st.session_state.num_line_items[img] += 1
-
-def remove_line_item():
-    img = st.session_state.selected_image
-    if img and st.session_state.num_line_items[img] > 1:
-        last_num = st.session_state.num_line_items[img]
-        for lif in LINE_ITEM_FIELDS:
-            key = f"Line {last_num}: {lif}"
-            st.session_state.field_values[img].pop(key, None)
-            st.session_state.field_rects_orig[img].pop(key, None)
-        st.session_state.num_line_items[img] -= 1
-        st.session_state.rect_version[img] += 1
+# ========== MAIN COLUMNS ==========
+col1, col2 = st.columns([3, 2])
 
 # Initialize field variables with defaults
 display_field_name = SINGLE_FIELDS[0]
 storage_field_name = SINGLE_FIELDS[0]
 base_field_for_color = SINGLE_FIELDS[0]
 
-sel_col1, sel_col2, sel_col3, sel_col4 = st.columns([1.5, 1.5, 2, 2])
+with col2:
+    # ========== FIELD SELECTION (NOW ON RHS) ==========
+    st.markdown("#### 🎯 Field Selection")
+    
+    def add_line_item():
+        img = st.session_state.selected_image
+        if img:
+            st.session_state.num_line_items[img] += 1
+
+    def remove_line_item():
+        img = st.session_state.selected_image
+        if img and st.session_state.num_line_items[img] > 1:
+            last_num = st.session_state.num_line_items[img]
+            for lif in LINE_ITEM_FIELDS:
+                key = f"Line {last_num}: {lif}"
+                st.session_state.field_values[img].pop(key, None)
+                st.session_state.field_rects_orig[img].pop(key, None)
+            st.session_state.num_line_items[img] -= 1
+            st.session_state.rect_version[img] += 1
 
-with sel_col1:
     field_type = st.radio("Type", ["Single", "Line Item"], horizontal=True, label_visibility="collapsed")
 
-with sel_col2:
     if field_type == "Single":
         field_name = st.selectbox("Field", SINGLE_FIELDS, label_visibility="collapsed")
         display_field_name = field_name
@@ -289,46 +292,40 @@ with sel_col2:
         base_field_for_color = field_name
     else:
         num_items = st.session_state.num_line_items[selected_name]
-        line_item_options = [f"Line {i+1}" for i in range(num_items)]
-        selected_line_item = st.selectbox("Line", line_item_options, label_visibility="collapsed")
-        line_item_num = int(selected_line_item.split()[1])
-
-with sel_col3:
-    if field_type == "Line Item":
+        
+        line_col1, line_col2 = st.columns([2, 1])
+        with line_col1:
+            line_item_options = [f"Line {i+1}" for i in range(num_items)]
+            selected_line_item = st.selectbox("Line", line_item_options, label_visibility="collapsed")
+            line_item_num = int(selected_line_item.split()[1])
+        
+        with line_col2:
+            add_col, rem_col = st.columns(2)
+            with add_col:
+                st.button("➕", key=f"addli_{selected_name}", on_click=add_line_item, help="Add line item")
+            with rem_col:
+                if st.session_state.num_line_items[selected_name] > 1:
+                    st.button("➖", key=f"remli_{selected_name}", on_click=remove_line_item, help="Remove line item")
+        
         base_field = st.selectbox("Field", LINE_ITEM_FIELDS, label_visibility="collapsed")
         display_field_name = f"{selected_line_item}: {base_field}"
         storage_field_name = f"Line {line_item_num}: {base_field}"
         base_field_for_color = base_field
 
-with sel_col4:
-    if field_type == "Line Item":
-        # Line items +/- buttons next to line item dropdown
-        add_col, rem_col, info_col = st.columns([1, 1, 2])
-        with add_col:
-            st.button("➕", key=f"addli_{selected_name}", on_click=add_line_item, help="Add line item")
-        with rem_col:
-            if st.session_state.num_line_items[selected_name] > 1:
-                st.button("➖", key=f"remli_{selected_name}", on_click=remove_line_item, help="Remove line item")
-        with info_col:
-            st.write(f"Lines: **{st.session_state.num_line_items[selected_name]}**")
-
-# Guard in case something weird happens
-if not storage_field_name:
-    storage_field_name = display_field_name
+    # Guard in case something weird happens
+    if not storage_field_name:
+        storage_field_name = display_field_name
 
-field_color = FIELD_COLORS.get(base_field_for_color or display_field_name, "#FF0000")
+    field_color = FIELD_COLORS.get(base_field_for_color or display_field_name, "#FF0000")
+    st.markdown(f"**Current:** <span style='color:{field_color}'>●</span> {display_field_name}", unsafe_allow_html=True)
 
-st.markdown(f"**Current:** <span style='color:{field_color}'>●</span> {display_field_name}", unsafe_allow_html=True)
-
-# ========== MAIN COLUMNS ==========
-col1, col2 = st.columns([3, 2])
-
-with col1:
-    # Zoom controls - selectbox + buttons
+    # ========== ZOOM CONTROLS (NOW ON RHS) ==========
+    st.markdown("---")
+    st.markdown("#### 🔍 Zoom")
+    
     current_zoom = st.session_state.zoom_values[selected_name]
     zoom_index = ZOOM_OPTIONS.index(current_zoom) if current_zoom in ZOOM_OPTIONS else 0
     
-    # Zoom callbacks
     def do_zoom_out():
         img = st.session_state.selected_image
         curr = st.session_state.zoom_values[img]
@@ -350,11 +347,11 @@ with col1:
             pil_img = load_image(img_bytes)
             st.session_state.zoom_values[img] = get_default_zoom(pil_img)
     
-    zoom_row1, zoom_row2, zoom_row3, zoom_row4 = st.columns([2, 1, 1, 1])
+    zoom_col1, zoom_col2, zoom_col3, zoom_col4 = st.columns([2, 1, 1, 1])
     
-    with zoom_row1:
+    with zoom_col1:
         zoom = st.selectbox(
-            "🔍 Zoom",
+            "Zoom",
             options=ZOOM_OPTIONS,
             index=zoom_index,
             format_func=lambda x: f"{x}%",
@@ -363,16 +360,113 @@ with col1:
         )
         st.session_state.zoom_values[selected_name] = zoom
     
-    with zoom_row2:
+    with zoom_col2:
         st.button("➖", key="zoom_out", help="Zoom out", on_click=do_zoom_out)
     
-    with zoom_row3:
+    with zoom_col3:
         st.button("➕", key="zoom_in", help="Zoom in", on_click=do_zoom_in)
     
-    with zoom_row4:
+    with zoom_col4:
         st.button("Fit", key="zoom_fit", help="Fit to screen", on_click=do_zoom_fit)
+
+    st.caption(f"Original: {pil_image.width}×{pil_image.height}")
+
+    # ========== OCR & VALUE SECTION ==========
+    st.markdown("---")
+    st.markdown("#### ✏️ OCR & Value")
+
+    current_rect_orig = st.session_state.field_rects_orig[selected_name].get(storage_field_name)
+    current_val = st.session_state.field_values[selected_name].get(storage_field_name, "")
+    
+    new_val = st.text_area("Value (auto-filled by OCR)", value=current_val, height=80, label_visibility="collapsed", placeholder="Value (auto-filled by OCR)")
+    
+    col_btn1, col_btn2, col_btn3 = st.columns(3)
+    
+    with col_btn1:
+        if st.button("💾 Save"):
+            st.session_state.field_values[selected_name][storage_field_name] = new_val
+            st.success("Saved!")
+    
+    with col_btn2:
+        if current_rect_orig and st.button("🔄 Re-OCR"):
+            x1 = max(0, int(current_rect_orig["left"]))
+            y1 = max(0, int(current_rect_orig["top"]))
+            x2 = min(pil_image.width, int(current_rect_orig["left"] + current_rect_orig["width"]))
+            y2 = min(pil_image.height, int(current_rect_orig["top"] + current_rect_orig["height"]))
+            if x2 > x1 and y2 > y1:
+                crop = pil_image.crop((x1, y1, x2, y2))
+                try:
+                    text = pytesseract.image_to_string(crop, config="--psm 6").strip()
+                    if text:
+                        st.session_state.field_values[selected_name][storage_field_name] = text
+                        st.success(f"OCR: {text}")
+                    else:
+                        st.warning("Empty result")
+                except Exception as e:
+                    st.error(f"OCR failed: {e}")
     
-    # Get current zoom value
+    with col_btn3:
+        def delete_rect():
+            st.session_state.pending_delete = (selected_name, storage_field_name)
+        
+        if current_rect_orig:
+            st.button("🗑️ Delete", on_click=delete_rect)
+
+    # ========== ALL VALUES SECTION ==========
+    with st.expander("📋 All Values"):
+        for f in SINGLE_FIELDS:
+            v = st.session_state.field_values[selected_name].get(f, "")
+            if v.strip():
+                st.write(f"**{f}:** {v}")
+        num_items = st.session_state.num_line_items[selected_name]
+        for i in range(1, num_items + 1):
+            vals = [(lif, st.session_state.field_values[selected_name].get(f"Line {i}: {lif}", "")) 
+                    for lif in LINE_ITEM_FIELDS]
+            vals = [(lif, v) for lif, v in vals if v.strip()]
+            if vals:
+                st.write(f"**Line {i}:**")
+                for lif, v in vals:
+                    st.write(f"  {lif}: {v}")
+
+    # ========== EXPORT SECTION ==========
+    st.markdown("---")
+    st.markdown("#### 📤 JSONL Export")
+
+    # Export ALL labeled remittances
+    records_all = [
+        build_gt_record_for_file(img["name"])
+        for img in images
+        if has_any_label(img["name"])
+    ]
+
+    if records_all:
+        all_jsonl_str = "\n".join(
+            json.dumps(rec, ensure_ascii=False) for rec in records_all
+        )
+        st.download_button(
+            "⬇️ Export ALL labeled (JSONL)",
+            data=all_jsonl_str.encode("utf-8"),
+            file_name="remittances_ground_truth.jsonl",
+            mime="application/json",
+        )
+    else:
+        st.caption("No labeled remittances yet.")
+
+    # Export CURRENT remittance
+    current_record = build_gt_record_for_file(selected_name)
+    with st.expander("Preview CURRENT JSON"):
+        st.json(current_record)
+
+    current_jsonl_str = json.dumps(current_record, ensure_ascii=False) + "\n"
+    st.download_button(
+        "⬇️ Export CURRENT (JSONL)",
+        data=current_jsonl_str.encode("utf-8"),
+        file_name=f"{os.path.splitext(selected_name)[0]}_remittance.jsonl",
+        mime="application/json",
+    )
+
+with col1:
+    # ========== CANVAS / IMAGE (LEFT SIDE) ==========
     zoom = st.session_state.zoom_values[selected_name]
     
     scale = zoom / 100.0
@@ -381,14 +475,6 @@ with col1:
     
     # Get display image - fresh PIL object each time from stable bytes
     display_image = get_display_image_from_bytes(image_bytes, disp_w, disp_h)
-    
-    st.caption(f"Original: {pil_image.width}×{pil_image.height} | Display: {disp_w}×{disp_h}")
-
-    has_rect = storage_field_name in st.session_state.field_rects_orig[selected_name]
-    if has_rect:
-        st.success(f"✅ Has rectangle. Draw again to replace.")
-    else:
-        st.warning(f"⬜ Draw rectangle for this field")
 
     def orig_to_display(rect_orig, s):
         return {
@@ -472,116 +558,4 @@ with col1:
                     else:
                         st.toast(f"✅ Rectangle saved (no text detected)")
                 except Exception:
-                    st.toast(f"✅ Rectangle saved")
-
-with col2:
-    # ========== ALL VALUES SECTION (MOVED UP) ==========
-    st.markdown("---")
-    single_rects = sum(1 for f in st.session_state.field_rects_orig[selected_name] if not f.startswith("Line "))
-    num_items = st.session_state.num_line_items[selected_name]
-    line_rects = sum(1 for f in st.session_state.field_rects_orig[selected_name] if f.startswith("Line "))
-    
-    st.write(f"**Single:** {single_rects}/{len(SINGLE_FIELDS)} | **Lines ({num_items}):** {line_rects}/{num_items * len(LINE_ITEM_FIELDS)}")
-
-    with st.expander("📋 All Values"):
-        for f in SINGLE_FIELDS:
-            v = st.session_state.field_values[selected_name].get(f, "")
-            if v.strip():
-                st.write(f"**{f}:** {v}")
-        for i in range(1, num_items + 1):
-            vals = [(lif, st.session_state.field_values[selected_name].get(f"Line {i}: {lif}", "")) 
-                    for lif in LINE_ITEM_FIELDS]
-            vals = [(lif, v) for lif, v in vals if v.strip()]
-            if vals:
-                st.write(f"**Line {i}:**")
-                for lif, v in vals:
-                    st.write(f"  {lif}: {v}")
-
-    # ========== OCR & VALUE SECTION (MOVED DOWN) ==========
-    st.markdown("---")
-    st.subheader("OCR & Value")
-
-    current_rect_orig = st.session_state.field_rects_orig[selected_name].get(storage_field_name)
-    current_val = st.session_state.field_values[selected_name].get(storage_field_name, "")
-    
-    if current_rect_orig:
-        st.caption(f"📐 ({current_rect_orig['left']:.0f}, {current_rect_orig['top']:.0f}) - {current_rect_orig['width']:.0f}×{current_rect_orig['height']:.0f}")
-        
-        x1 = max(0, int(current_rect_orig["left"]))
-        y1 = max(0, int(current_rect_orig["top"]))
-        x2 = min(pil_image.width, int(current_rect_orig["left"] + current_rect_orig["width"]))
-        y2 = min(pil_image.height, int(current_rect_orig["top"] + current_rect_orig["height"]))
-        if x2 > x1 and y2 > y1:
-            crop = pil_image.crop((x1, y1, x2, y2))
-            st.image(crop, caption="Selected Region", width=200)
-    
-    new_val = st.text_area("Value (auto-filled by OCR)", value=current_val, height=80)
-    
-    col_btn1, col_btn2, col_btn3 = st.columns(3)
-    
-    with col_btn1:
-        if st.button("💾 Save"):
-            st.session_state.field_values[selected_name][storage_field_name] = new_val
-            st.success("Saved!")
-    
-    with col_btn2:
-        if current_rect_orig and st.button("🔄 Re-OCR"):
-            x1 = max(0, int(current_rect_orig["left"]))
-            y1 = max(0, int(current_rect_orig["top"]))
-            x2 = min(pil_image.width, int(current_rect_orig["left"] + current_rect_orig["width"]))
-            y2 = min(pil_image.height, int(current_rect_orig["top"] + current_rect_orig["height"]))
-            if x2 > x1 and y2 > y1:
-                crop = pil_image.crop((x1, y1, x2, y2))
-                try:
-                    text = pytesseract.image_to_string(crop, config="--psm 6").strip()
-                    if text:
-                        st.session_state.field_values[selected_name][storage_field_name] = text
-                        st.success(f"OCR: {text}")
-                    else:
-                        st.warning("Empty result")
-                except Exception as e:
-                    st.error(f"OCR failed: {e}")
-    
-    with col_btn3:
-        def delete_rect():
-            st.session_state.pending_delete = (selected_name, storage_field_name)
-        
-        if current_rect_orig:
-            st.button("🗑️ Delete", on_click=delete_rect)
-
-    # ========== EXPORT SECTION ==========
-    st.markdown("---")
-    st.subheader("📤 JSONL Export")
-
-    # Export ALL labeled remittances
-    records_all = [
-        build_gt_record_for_file(img["name"])
-        for img in images
-        if has_any_label(img["name"])
-    ]
-
-    if records_all:
-        all_jsonl_str = "\n".join(
-            json.dumps(rec, ensure_ascii=False) for rec in records_all
-        )
-        st.download_button(
-            "⬇️ Export ALL labeled remittances (JSONL)",
-            data=all_jsonl_str.encode("utf-8"),
-            file_name="remittances_ground_truth.jsonl",
-            mime="application/json",
-        )
-    else:
-        st.caption("No labeled remittances yet to export in bulk.")
-
-    # Export CURRENT remittance
-    current_record = build_gt_record_for_file(selected_name)
-    with st.expander("Preview CURRENT remittance JSON"):
-        st.json(current_record)
-
-    current_jsonl_str = json.dumps(current_record, ensure_ascii=False) + "\n"
-    st.download_button(
-        "⬇️ Export CURRENT remittance (JSONL)",
-        data=current_jsonl_str.encode("utf-8"),
-        file_name=f"{os.path.splitext(selected_name)[0]}_remittance.jsonl",
-        mime="application/json",
-    )
+                    st.toast(f"✅ Rectangle saved")