Update app.py

app.py

@@ -16,7 +16,13 @@ from datetime import datetime
 pillow_heif.register_heif_opener()
 
 # --- CONSTANTS & LAYOUT ---
-CONTENT_WIDTH_IN = 8.5 - (0.5 + 0.5)  # 7.5" total content width
+CONTENT_WIDTH_IN = 8.5 - (0.5 + 0.5)  # 7.5"
+# --- STRICT 1:4 RATIO ---
+DESC_COL_IN = CONTENT_WIDTH_IN * (1 / 5.0)   # 1 part = 1.5"
+PHOTO_COL_IN = CONTENT_WIDTH_IN * (4 / 5.0)  # 4 parts = 6.0"
+ROW_HEIGHT_IN = 4.5  # Two rows per page
+PHOTO_MAX_W_IN = PHOTO_COL_IN - 0.20  # Padding
+PHOTO_MAX_H_IN = ROW_HEIGHT_IN - 0.20
 
 JOB_MAP = {
     "WM 3155 SSM Parking": "T250014 Walmart 3155 Sault Ste. Marie FY26 Parking Lot Refresh\n446 Great Northern Rd.\nSault Ste. Marie, Ontario, P6B 4Z9",
@@ -159,88 +165,82 @@ def generate_report(image_items, job_details, compress_images, quality, progress
     footer = section.footer
     add_page_number(footer.paragraphs[0])
 
-    # --- LAYOUT FIX: TRUE 2x2 GRID (4 PHOTOS PER PAGE) ---
+    # --- LAYOUT FIX: Reverted to the original 2-photo-per-page layout ---
     num_images = len(image_items)
     processed = 0
 
-    for start in range(0, num_images, 4):  # Process 4 images per page
+    for start in range(0, num_images, 2): # Process 2 images per page
         if start > 0:
             doc.add_page_break()
 
-        page_items = image_items[start:start + 4]
+        page_items = image_items[start:start + 2]
 
-        # Create a true 2x2 table for the grid
+        # A 2x2 table: Row 1 is for Photo 1, Row 2 is for Photo 2
         page_table = doc.add_table(rows=2, cols=2)
         page_table.width = Inches(CONTENT_WIDTH_IN)
         set_table_fixed_layout(page_table)
         page_table.style = 'Table Grid'
         page_table.alignment = WD_TABLE_ALIGNMENT.CENTER
 
-        # Define dimensions for each cell in the 2x2 grid
-        COL_WIDTH_GRID_IN = CONTENT_WIDTH_IN / 2.0
-        ROW_HEIGHT_GRID_IN = 4.4  # Height for each of the two rows
+        # Set column widths to the strict 1:4 ratio
+        page_table.columns[0].width = Inches(DESC_COL_IN)
+        page_table.columns[1].width = Inches(PHOTO_COL_IN)
+        for r in page_table.rows:
+            r.height = Inches(ROW_HEIGHT_IN)
+            r.height_rule = WD_ROW_HEIGHT_RULE.EXACTLY
+            # Explicitly set cell widths as well for compatibility
+            r.cells[0].width = Inches(DESC_COL_IN)
+            r.cells[1].width = Inches(PHOTO_COL_IN)
+
+        # Fill the two rows
+        for row_idx in range(2):
+            # Only proceed if there is an item for this row
+            if row_idx < len(page_items):
+                item = page_items[row_idx]
+                desc_cell = page_table.cell(row_idx, 0)
+                photo_cell = page_table.cell(row_idx, 1)
+
+                ensure_cell_has_one_empty_paragraph(desc_cell)
+                ensure_cell_has_one_empty_paragraph(photo_cell)
+
+                desc_cell.vertical_alignment = WD_ALIGN_VERTICAL.TOP
+                photo_cell.vertical_alignment = WD_ALIGN_VERTICAL.CENTER
+
+                # Description
+                p_desc = desc_cell.paragraphs[0]
+                run_label = p_desc.add_run("Description:\n")
+                run_label.bold = True
+                p_desc.add_run(item.get('description', '') or '')
+
+                # Image processing and placement
+                rotation = item.get('rotation', 0) or 0
+                try:
+                    item['file'].seek(0)
+                    im = Image.open(item['file'])
+                    if rotation:
+                        im = im.rotate(rotation, expand=True)
+                    w_px, h_px = im.size
+                except Exception:
+                    w_px, h_px = (1000, 1000)
+
+                img_ratio = (w_px / h_px) if h_px else 1.0
+                box_ratio = PHOTO_MAX_W_IN / PHOTO_MAX_H_IN
+
+                img_stream = process_image(
+                    item['file'], compress=compress_images, quality=quality, rotation=rotation
+                )
 
-        # Set column widths and row heights
-        for col in page_table.columns:
-            col.width = Inches(COL_WIDTH_GRID_IN)
-        for row in page_table.rows:
-            row.height = Inches(ROW_HEIGHT_GRID_IN)
-            row.height_rule = WD_ROW_HEIGHT_RULE.EXACTLY
+                if img_stream:
+                    p_photo = photo_cell.paragraphs[0]
+                    p_photo.alignment = WD_ALIGN_PARAGRAPH.CENTER
+                    if img_ratio >= box_ratio:
+                        p_photo.add_run().add_picture(img_stream, width=Inches(PHOTO_MAX_W_IN))
+                    else:
+                        p_photo.add_run().add_picture(img_stream, height=Inches(PHOTO_MAX_H_IN))
 
-        # Loop through the grid cells and populate them
-        item_idx_on_page = 0
-        for row_idx in range(2):
-            for col_idx in range(2):
-                # Check if there is an image for this cell
-                if item_idx_on_page < len(page_items):
-                    item = page_items[item_idx_on_page]
-                    cell = page_table.cell(row_idx, col_idx)
-                    ensure_cell_has_one_empty_paragraph(cell)
-                    cell.vertical_alignment = WD_ALIGN_VERTICAL.TOP
-
-                    # Add description to the first paragraph
-                    p_desc = cell.paragraphs[0]
-                    p_desc.paragraph_format.space_after = Pt(6) # Add space after description
-                    run_label = p_desc.add_run("Description:\n")
-                    run_label.bold = True
-                    p_desc.add_run(item.get('description', '') or '')
-
-                    # Photo Sizing and Placement
-                    PHOTO_MAX_W_IN_GRID = COL_WIDTH_GRID_IN - 0.2
-                    # Roughly account for description text height
-                    PHOTO_MAX_H_IN_GRID = ROW_HEIGHT_GRID_IN - 0.8
-
-                    rotation = item.get('rotation', 0) or 0
-                    try:
-                        item['file'].seek(0)
-                        im = Image.open(item['file'])
-                        if rotation:
-                            im = im.rotate(rotation, expand=True)
-                        w_px, h_px = im.size
-                    except Exception:
-                        w_px, h_px = (1000, 1000)
-
-                    img_ratio = (w_px / h_px) if h_px else 1.0
-                    box_ratio = PHOTO_MAX_W_IN_GRID / PHOTO_MAX_H_IN_GRID
-
-                    img_stream = process_image(
-                        item['file'], compress=compress_images, quality=quality, rotation=rotation
-                    )
-
-                    if img_stream:
-                        # Add a new paragraph in the same cell for the photo
-                        p_photo = cell.add_paragraph()
-                        p_photo.alignment = WD_ALIGN_PARAGRAPH.CENTER
-                        if img_ratio >= box_ratio:
-                            p_photo.add_run().add_picture(img_stream, width=Inches(PHOTO_MAX_W_IN_GRID))
-                        else:
-                            p_photo.add_run().add_picture(img_stream, height=Inches(PHOTO_MAX_H_IN_GRID))
-
-                    processed += 1
-                    if num_images:
-                        progress_bar.progress(processed / num_images)
-                
-                item_idx_on_page += 1
+                processed += 1
+                if num_images:
+                    progress_bar.progress(processed / num_images)
 
     # Save DOCX
     doc_io = io.BytesIO()
@@ -305,7 +305,7 @@ with st.sidebar:
         st.rerun()
 
 st.header("Upload, Arrange, Rotate, and Describe Images")
-st.info("Arrange photos in the desired order. The report will be generated with a 2x2 grid (4 photos per page).")
+st.info("Arrange photos in the desired order. The report will have 2 photos per page.")
 uploaded_files = st.file_uploader(
     "Upload all your photos here",
     accept_multiple_files=True,
@@ -378,4 +378,5 @@ if generate_button:
                 c2.download_button("⬇️ Download PDF (.pdf)", pdf_io, f"{file_base}.pdf", use_container_width=True)
         except Exception as e:
             st.error(f"A critical error occurred: {e}")
-            progress_bar.empty()
+            progress_bar.empty()
+