Update app.py

app.py

@@ -578,6 +578,13 @@
 # )
 
 
+
+
+
+
+
+
+
 import base64
 from PIL import Image
 import re
@@ -635,7 +642,7 @@ IOU_MERGE_THRESHOLD = 0.4
 IOA_SUPPRESSION_THRESHOLD = 0.7
 
 # ============================================================================
-# --- BOX COMBINATION LOGIC (Retained) ---
+# --- BOX COMBINATION LOGIC (FIXED) ---
 # ============================================================================
 
 def calculate_iou(box1, box2):
@@ -680,9 +687,11 @@ def filter_nested_boxes(detections, ioa_threshold=0.80):
 
 def merge_overlapping_boxes(detections, iou_threshold):
     if not detections: return []
+    # 1. Sort by confidence (YOLO standard)
     detections.sort(key=lambda d: d['conf'], reverse=True)
     merged_detections = []
     is_merged = [False] * len(detections)
+    
     for i in range(len(detections)):
         if is_merged[i]: continue
         current_box = detections[i]['coords']
@@ -700,14 +709,21 @@ def merge_overlapping_boxes(detections, iou_threshold):
                 is_merged[j] = True
         merged_detections.append({
             'coords': (merged_x1, merged_y1, merged_x2, merged_y2),
-            'y1': merged_y1, 'class': current_class, 'conf': detections[i]['conf']
+            # 'y1' is retained for clarity, though 'coords' contains it
+            'y1': merged_y1, 
+            'class': current_class, 
+            'conf': detections[i]['conf']
         })
-    # This step ensures top-to-bottom reading order for sequential numbering (EQUATION1, EQUATION2, etc.)
-    merged_detections.sort(key=lambda d: d['y1']) 
+    
+    # --- FIX IMPLEMENTATION: READING ORDER SORT ---
+    # Sort primarily by y1 (vertical position), secondarily by x1 (horizontal position).
+    # This correctly handles two-column layouts like Q.10 options (A), (B), (C), (D)
+    merged_detections.sort(key=lambda d: (d['coords'][1], d['coords'][0]))
+    
     return merged_detections
 
 # ============================================================================
-# --- UTILITY FUNCTIONS ---
+# --- UTILITY FUNCTIONS (Retained) ---
 # ============================================================================
 
 def pixmap_to_numpy(pix: fitz.Pixmap) -> np.ndarray:
@@ -804,6 +820,8 @@ def run_yolo_detection_and_count(
     merged_detections = merge_overlapping_boxes(yolo_detections, IOU_MERGE_THRESHOLD)
     final_detections = filter_nested_boxes(merged_detections, IOA_SUPPRESSION_THRESHOLD)
 
+    # Note: final_detections is now sorted by (y1, x1) in reading order.
+
     for det in final_detections:
         bbox = det["coords"]
         crop_pil = crop_and_convert_to_pil(image, bbox)
@@ -829,10 +847,9 @@ def run_yolo_detection_and_count(
 
 
 # ============================================================================
-# --- MAIN DOCUMENT PROCESSING FUNCTION (MODIFIED OUTPUT) ---
+# --- MAIN DOCUMENT PROCESSING FUNCTION (Retained Logic) ---
 # ============================================================================
 
-# The return type is updated to reflect the new structured output dictionary
 def run_single_pdf_preprocessing(
     pdf_path: str
 ) -> Tuple[int, int, int, str, float, Dict[str, Union[int, str]], List[Tuple[Image.Image, str]]]:
@@ -852,7 +869,6 @@ def run_single_pdf_preprocessing(
 
 
     # 1. Validation and Model Loading (YOLO)
-    # ... (Model loading logic retained)
     t0 = time.time()
     if not os.path.exists(pdf_path):
         report = f"❌ FATAL ERROR: Input PDF not found at {pdf_path}."
@@ -944,7 +960,7 @@ def run_single_pdf_preprocessing(
     
     # 4. Final Report Generation and Gallery Formatting
 
-    # --- NEW: Create the structured JSON output as requested by the user ---
+    # Create the structured JSON output as requested by the user
     structured_latex_output = {
         "Total Pages": total_pages,
         "Total Equations": total_equation_count,
@@ -988,7 +1004,7 @@ def run_single_pdf_preprocessing(
 
 
 # ============================================================================
-# --- GRADIO INTERFACE FUNCTION & DEFINITION (MODIFIED OUTPUT) ---
+# --- GRADIO INTERFACE FUNCTION & DEFINITION (Retained) ---
 # ============================================================================
 
 def gradio_process_pdf(pdf_file) -> Tuple[str, str, str, str, Dict[str, Union[int, str]], List[Tuple[Image.Image, str]]]:
@@ -1005,7 +1021,7 @@ def gradio_process_pdf(pdf_file) -> Tuple[str, str, str, str, Dict[str, Union[in
             num_figures, 
             report, 
             total_time, 
-            structured_latex_output, # Variable name changed to match the new output
+            structured_latex_output, 
             gallery_items
         ) = run_single_pdf_preprocessing(pdf_path)
 
@@ -1033,7 +1049,6 @@ if __name__ == "__main__":
     output_figures = gr.Textbox(label="Total Figures Detected", interactive=False)
     output_report = gr.Markdown(label="Processing Summary and Full Log")
     
-    # This JSON component now displays the structured output requested by the user
     output_structured_latex = gr.JSON(label="Structured LaTeX Output (EQUATIONx : <latex code>)") 
     
     output_gallery = gr.Gallery(
@@ -1052,12 +1067,12 @@ if __name__ == "__main__":
             output_equations, 
             output_figures, 
             output_report, 
-            output_structured_latex, # Updated component
+            output_structured_latex, 
             output_gallery
         ],
-        title="📊 YOLO Detection & Math OCR Pipeline (Structured Output)",
+        title="📊 YOLO Detection & Math OCR Pipeline (Reading Order Fix)",
         description=(
-            "Upload a PDF. YOLO detects equations/figures, and OCR converts equations to LaTeX. See the Structured LaTeX Output panel for the requested format."
+            "Upload a PDF. YOLO detects equations/figures, and OCR converts equations to LaTeX. Now includes a fix for two-column reading order."
         ),
     )