Update app.py

app.py

@@ -23,7 +23,6 @@ def stitch_images_vertically(images: List[Image.Image]) -> Image.Image:
 
     max_width = max(img.width for img in images)
     total_height = sum(img.height for img in images)
-
     stitched_image = Image.new('RGB', (max_width, total_height), (255, 255, 255))
 
     current_y = 0
@@ -33,11 +32,16 @@ def stitch_images_vertically(images: List[Image.Image]) -> Image.Image:
         
     return stitched_image
 
-def stitch_images_in_grid(images: List[Image.Image], num_columns: int) -> Image.Image:
+def stitch_images_in_grid(images: List[Image.Image], num_columns: int, page_order: str) -> Image.Image:
     if not images:
         return None
 
-    columns = [images[i::num_columns] for i in range(num_columns)]
+    if page_order == "Top-to-Bottom (down)":
+        num_images = len(images)
+        num_rows = math.ceil(num_images / num_columns)
+        columns = [images[i*num_rows : (i+1)*num_rows] for i in range(num_columns)]
+    else: # Default to "Left-to-Right (across)"
+        columns = [images[i::num_columns] for i in range(num_columns)]
     
     stitched_columns = [stitch_images_vertically(col) for col in columns if col]
     
@@ -46,7 +50,6 @@ def stitch_images_in_grid(images: List[Image.Image], num_columns: int) -> Image.
         
     max_height = max(col.height for col in stitched_columns if col)
     total_width = sum(col.width for col in stitched_columns if col)
-    
     grid_image = Image.new('RGB', (total_width, max_height), (255, 255, 255))
     
     current_x = 0
@@ -57,7 +60,7 @@ def stitch_images_in_grid(images: List[Image.Image], num_columns: int) -> Image.
             
     return grid_image
 
-def process_pdf(pdf_file, pdf_url, dpi, num_columns, crop_top, crop_bottom, crop_left, crop_right, progress=gr.Progress()):
+def process_pdf(pdf_file, pdf_url, dpi, num_columns, crop_top, crop_bottom, crop_left, crop_right, hide_annotations, page_order, progress=gr.Progress()):
     pdf_input_source = None
     is_bytes = False
     source_name = "document"
@@ -83,12 +86,12 @@ def process_pdf(pdf_file, pdf_url, dpi, num_columns, crop_top, crop_bottom, crop
         raise gr.Error("Please upload a PDF file or provide a valid URL.")
 
     progress(0.3, desc="Converting PDF pages to images...")
-    logger.info(f"Using DPI: {dpi}")
+    logger.info(f"Using DPI: {dpi}, Hide Annotations: {hide_annotations}")
     try:
         if is_bytes:
-            images = convert_from_bytes(pdf_input_source, dpi=dpi)
+            images = convert_from_bytes(pdf_input_source, dpi=dpi, hide_annotations=hide_annotations)
         else:
-            images = convert_from_path(pdf_input_source, dpi=dpi)
+            images = convert_from_path(pdf_input_source, dpi=dpi, hide_annotations=hide_annotations)
     except (PDFInfoNotInstalledError, FileNotFoundError):
         raise gr.Error("Server configuration error: Poppler dependency is missing.")
     except (PDFPageCountError, Exception) as e:
@@ -104,15 +107,9 @@ def process_pdf(pdf_file, pdf_url, dpi, num_columns, crop_top, crop_bottom, crop
         progress(0.6, desc="Cropping images...")
         for i, img in enumerate(images):
             width, height = img.size
-            
-            left = crop_left
-            top = crop_top
-            right = width - crop_right
-            bottom = height - crop_bottom
-
+            left, top, right, bottom = crop_left, crop_top, width - crop_right, height - crop_bottom
             if left >= right or top >= bottom:
                 raise gr.Error(f"Crop values are too large for page {i+1}. The page dimensions are {width}x{height}, but crop settings result in an invalid area.")
-            
             cropped_images.append(img.crop((left, top, right, bottom)))
     else:
         cropped_images = images
@@ -120,17 +117,15 @@ def process_pdf(pdf_file, pdf_url, dpi, num_columns, crop_top, crop_bottom, crop
     progress(0.7, desc=f"Stitching {len(cropped_images)} images together...")
     
     if num_columns > 1:
-        stitched_image = stitch_images_in_grid(cropped_images, num_columns)
+        stitched_image = stitch_images_in_grid(cropped_images, num_columns, page_order)
     else:
         stitched_image = stitch_images_vertically(cropped_images)
         
     if stitched_image is None:
         raise gr.Error("Image stitching failed.")
-        
     logger.info("Image stitching complete.")
 
     progress(0.9, desc="Saving final image...")
-    
     with tempfile.NamedTemporaryFile(delete=False, suffix=".png", prefix=f"{source_name}_stitched_") as tmp_file:
         stitched_image.save(tmp_file.name, "PNG")
         output_path = tmp_file.name
@@ -148,22 +143,20 @@ with gr.Blocks(theme=gr.themes.Soft()) as demo:
         and then append them to create a single image that you can download.
         """
     )
-
     with gr.Row():
         with gr.Column(scale=1):
             with gr.Tabs():
                 with gr.TabItem("Upload PDF"):
                     pdf_file_input = gr.File(label="Upload PDF File", file_types=[".pdf"])
                 with gr.TabItem("From URL"):
-                    pdf_url_input = gr.Textbox(
-                        label="PDF URL",
-                        placeholder="e.g., https://arxiv.org/pdf/1706.03762.pdf"
-                    )
+                    pdf_url_input = gr.Textbox(label="PDF URL", placeholder="e.g., https://arxiv.org/pdf/1706.03762.pdf")
             
-            dpi_slider = gr.Slider(minimum=100, maximum=600, step=5, value=200, label="Image Resolution (DPI)")
+            dpi_slider = gr.Slider(minimum=100, maximum=600, step=50, value=200, label="Image Resolution (DPI)")
             columns_slider = gr.Slider(minimum=1, maximum=10, step=1, value=1, label="Number of Columns")
 
             with gr.Accordion("Advanced Options", open=False):
+                hide_annotations_toggle = gr.Checkbox(value=True, label="Hide PDF Annotations (Links/Highlights)", info="Turn this on to remove the colored boxes that can appear around links and references.")
+                page_order_radio = gr.Radio(["Left-to-Right (across)", "Top-to-Bottom (down)"], value="Left-to-Right (across)", label="Multi-Column Page Order", info="Determines how pages fill the columns.")
                 with gr.Row():
                     crop_left = gr.Slider(minimum=0, maximum=500, step=10, value=0, label="Crop Left")
                     crop_right = gr.Slider(minimum=0, maximum=500, step=10, value=0, label="Crop Right")
@@ -188,7 +181,9 @@ with gr.Blocks(theme=gr.themes.Soft()) as demo:
             crop_top, 
             crop_bottom, 
             crop_left, 
-            crop_right
+            crop_right,
+            hide_annotations_toggle,
+            page_order_radio
         ],
         outputs=[output_image_preview, output_image_download]
     )