Update app.py

app.py

@@ -16,7 +16,6 @@ from datetime import datetime
 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" total content width
 
 JOB_MAP = {
@@ -137,7 +136,6 @@ def generate_report(image_items, job_details, compress_images, quality, progress
     # Header
     header = section.header
     header_table = header.add_table(rows=1, cols=2, width=Inches(CONTENT_WIDTH_IN))
-    header_table.autofit = False
     set_table_fixed_layout(header_table)
     header_table.columns[0].width = Inches(2.5)
     header_table.columns[1].width = Inches(CONTENT_WIDTH_IN - 2.5)
@@ -161,108 +159,95 @@ def generate_report(image_items, job_details, compress_images, quality, progress
     footer = section.footer
     add_page_number(footer.paragraphs[0])
 
-    # --- LAYOUT CHANGE: 2x2 GRID (4 PHOTOS PER PAGE) ---
+    # --- LAYOUT FIX: TRUE 2x2 GRID (4 PHOTOS PER PAGE) ---
     num_images = len(image_items)
     processed = 0
 
-    for start in range(0, num_images, 4):  # Process 4 images at a time
+    for start in range(0, num_images, 4):  # Process 4 images per page
         if start > 0:
             doc.add_page_break()
 
         page_items = image_items[start:start + 4]
 
-        # A 2x4 table holds two (Desc | Photo) pairs per row
-        page_table = doc.add_table(rows=2, cols=4)
+        # Create a true 2x2 table for the grid
+        page_table = doc.add_table(rows=2, cols=2)
         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
 
-        # 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)
+        # 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
 
-        # 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_GRID_IN)
-            r.height_rule = WD_ROW_HEIGHT_RULE.EXACTLY
-
-        # Clean all cells before populating
+        # 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:
-            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.
-
-            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
-
-            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))
-
-            processed += 1
-            if num_images:
-                progress_bar.progress(processed / num_images)
+            row.height = Inches(ROW_HEIGHT_GRID_IN)
+            row.height_rule = WD_ROW_HEIGHT_RULE.EXACTLY
+
+        # 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
 
     # Save DOCX
     doc_io = io.BytesIO()
     doc.save(doc_io)
     doc_io.seek(0)
 
-    # Optional PDF conversion via LibreOffice
+    # Optional PDF conversion
     pdf_io = None
     try:
         with open("temp_report.docx", "wb") as f:
@@ -393,5 +378,4 @@ 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()