Update app.py

app.py

@@ -17,12 +17,7 @@ pillow_heif.register_heif_opener()
 
 # --- CONSTANTS & LAYOUT ---
 # Page: Letter 8.5" x 11", margins below
-CONTENT_WIDTH_IN = 8.5 - (0.5 + 0.5)  # 7.5"
-DESC_COL_IN = CONTENT_WIDTH_IN * (1 / 5.0)   # strict 1:4 ratio
-PHOTO_COL_IN = CONTENT_WIDTH_IN * (4 / 5.0)
-ROW_HEIGHT_IN = 4.5  # two rows per page (fits within 9.5" body height)
-PHOTO_MAX_W_IN = PHOTO_COL_IN - 0.20  # small padding
-PHOTO_MAX_H_IN = ROW_HEIGHT_IN - 0.20
+CONTENT_WIDTH_IN = 8.5 - (0.5 + 0.5)  # 7.5" total content width
 
 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",
@@ -141,7 +136,6 @@ def generate_report(image_items, job_details, compress_images, quality, progress
 
     # Header
     header = section.header
-    # --- FIX 1: The header's add_table method REQUIRES the width argument directly ---
     header_table = header.add_table(rows=1, cols=2, width=Inches(CONTENT_WIDTH_IN))
     header_table.autofit = False
     set_table_fixed_layout(header_table)
@@ -167,93 +161,101 @@ def generate_report(image_items, job_details, compress_images, quality, progress
     footer = section.footer
     add_page_number(footer.paragraphs[0])
 
-    # Build pages: 2 items per page; last page may have 1
+    # --- LAYOUT CHANGE: 2x2 GRID (4 PHOTOS PER PAGE) ---
     num_images = len(image_items)
     processed = 0
 
-    for start in range(0, num_images, 2):
+    for start in range(0, num_images, 4):  # Process 4 images at a time
         if start > 0:
             doc.add_page_break()
 
-        page_items = image_items[start:start + 2]
+        page_items = image_items[start:start + 4]
 
-        # --- FIX 2: The main document's add_table method does NOT accept the 'width' keyword ---
-        # So we create the table first, then set its width property.
-        page_table = doc.add_table(rows=2, cols=2)
+        # A 2x4 table holds two (Desc | Photo) pairs per row
+        page_table = doc.add_table(rows=2, cols=4)
         page_table.width = Inches(CONTENT_WIDTH_IN)
         page_table.autofit = False
         set_table_fixed_layout(page_table)
         page_table.style = 'Table Grid'
         page_table.alignment = WD_TABLE_ALIGNMENT.CENTER
 
-        # Lock column widths and row heights
-        page_table.columns[0].width = Inches(DESC_COL_IN)
-        page_table.columns[1].width = Inches(PHOTO_COL_IN)
+        # Define column widths for the new grid layout
+        PAIR_WIDTH_IN = CONTENT_WIDTH_IN / 2.0
+        DESC_COL_IN_GRID = PAIR_WIDTH_IN * (1 / 5.0)
+        PHOTO_COL_IN_GRID = PAIR_WIDTH_IN * (4 / 5.0)
+
+        # Lock column widths
+        page_table.columns[0].width = Inches(DESC_COL_IN_GRID)
+        page_table.columns[1].width = Inches(PHOTO_COL_IN_GRID)
+        page_table.columns[2].width = Inches(DESC_COL_IN_GRID)
+        page_table.columns[3].width = Inches(PHOTO_COL_IN_GRID)
+
+        # Define row heights to split the page
+        ROW_HEIGHT_GRID_IN = 4.4 # Height for each of the two main rows
+
+        # Lock row heights
         for r in page_table.rows:
-            r.height = Inches(ROW_HEIGHT_IN)
+            r.height = Inches(ROW_HEIGHT_GRID_IN)
             r.height_rule = WD_ROW_HEIGHT_RULE.EXACTLY
-            r.cells[0].width = Inches(DESC_COL_IN)
-            r.cells[1].width = Inches(PHOTO_COL_IN)
 
-        # Fill two rows
-        for row_idx in range(2):
-            desc_cell = page_table.cell(row_idx, 0)
-            photo_cell = page_table.cell(row_idx, 1)
+        # Clean all cells before populating
+        for row in page_table.rows:
+            for cell in row.cells:
+                ensure_cell_has_one_empty_paragraph(cell)
+
+        # Loop through the up-to-4 items for this page and place them in the grid
+        for item_idx, item in enumerate(page_items):
+            row_idx = item_idx // 2  # Item 0,1 -> row 0. Item 2,3 -> row 1.
+            pair_idx = item_idx % 2   # Item 0,2 -> pair 0. Item 1,3 -> pair 1.
 
-            ensure_cell_has_one_empty_paragraph(desc_cell)
-            ensure_cell_has_one_empty_paragraph(photo_cell)
+            desc_col_idx = pair_idx * 2
+            photo_col_idx = desc_col_idx + 1
+
+            desc_cell = page_table.cell(row_idx, desc_col_idx)
+            photo_cell = page_table.cell(row_idx, photo_col_idx)
 
             desc_cell.vertical_alignment = WD_ALIGN_VERTICAL.TOP
             photo_cell.vertical_alignment = WD_ALIGN_VERTICAL.CENTER
 
-            if row_idx < len(page_items):
-                item = page_items[row_idx]
-                rotation = item.get('rotation', 0) or 0
-
-                # Description
-                p_desc = desc_cell.paragraphs[0]
-                p_desc.paragraph_format.space_before = Pt(0)
-                p_desc.paragraph_format.space_after = Pt(0)
-                run_label = p_desc.add_run("Description:\n")
-                run_label.bold = True
-                p_desc.add_run(item.get('description', '') or '')
-
-                # Determine fit by aspect ratio
-                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
-
-                # Process (rotate + compress)
-                img_stream = process_image(
-                    item['file'],
-                    compress=compress_images,
-                    quality=quality,
-                    rotation=rotation
-                )
+            rotation = item.get('rotation', 0) or 0
+
+            # 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 '')
+
+            # Photo Sizing and Placement
+            PHOTO_MAX_W_IN_GRID = PHOTO_COL_IN_GRID - 0.15
+            PHOTO_MAX_H_IN_GRID = ROW_HEIGHT_GRID_IN - 0.15
+
+            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:
+                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_GRID))
+                else:
+                    p_photo.add_run().add_picture(img_stream, height=Inches(PHOTO_MAX_H_IN_GRID))
 
-                if img_stream:
-                    p_photo = photo_cell.paragraphs[0]
-                    p_photo.paragraph_format.space_before = Pt(0)
-                    p_photo.paragraph_format.space_after = Pt(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))
-
-                processed += 1
-                if num_images:
-                    progress_bar.progress(processed / num_images)
-            else:
-                pass
+            processed += 1
+            if num_images:
+                progress_bar.progress(processed / num_images)
 
     # Save DOCX
     doc_io = io.BytesIO()
@@ -318,6 +320,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).")
 uploaded_files = st.file_uploader(
     "Upload all your photos here",
     accept_multiple_files=True,
@@ -338,7 +341,6 @@ if uploaded_files:
             }
 
 if st.session_state.image_dict:
-    st.info("Set the order, rotate if needed, then add descriptions. Exactly 2 photos per page (last page may have 1).")
     items = list(st.session_state.image_dict.items())
     items.sort(key=lambda kv: kv[1].get('order', 0))
 
@@ -391,4 +393,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()
+