Update app.py

app.py

@@ -5,7 +5,6 @@ from docx.enum.table import WD_TABLE_ALIGNMENT, WD_ALIGN_VERTICAL
 from docx.enum.text import WD_ALIGN_PARAGRAPH
 from PIL import Image
 import pillow_heif
-from datetime import datetime
 import os
 import io
 import subprocess
@@ -19,7 +18,6 @@ def process_image(uploaded_file, compress=False, quality=60):
     try:
         uploaded_file.seek(0)
         img = Image.open(uploaded_file)
-        # Handle transparency and convert to RGB
         if img.mode == 'RGBA':
             background = Image.new('RGB', img.size, (255, 255, 255))
             background.paste(img, mask=img.split()[3])
@@ -40,11 +38,10 @@ def process_image(uploaded_file, compress=False, quality=60):
         return None
 
 # --- CORE REPORT GENERATION LOGIC ---
-def generate_report(image_items, job_details, layout_style, compress_images, progress_bar):
+def generate_report(image_items, job_details, compress_images, progress_bar):
     """Generates the DOCX and PDF report."""
     doc = Document()
     section = doc.sections[0]
-    # Set page margins
     section.left_margin = section.right_margin = Inches(0.5)
     section.top_margin = section.bottom_margin = Inches(0.5)
 
@@ -55,66 +52,75 @@ def generate_report(image_items, job_details, layout_style, compress_images, pro
     header_table.columns[0].width = Inches(2.5)
     header_table.columns[1].width = Inches(5.0)
 
-    # Left cell: Logo
     logo_cell = header_table.cell(0, 0)
     if os.path.exists("logo.png"):
         logo_cell.paragraphs[0].add_run().add_picture("logo.png", width=Inches(1.5))
     
-    # Right cell: Job Details (now from a single multiline input)
     info_cell = header_table.cell(0, 1)
-    p = info_cell.paragraphs[0]
-    p.text = job_details
-    p.alignment = WD_ALIGN_PARAGRAPH.RIGHT
+    p_info = info_cell.paragraphs[0]
+    p_info.text = job_details
+    p_info.alignment = WD_ALIGN_PARAGRAPH.RIGHT
     info_cell.vertical_alignment = WD_ALIGN_VERTICAL.CENTER
 
     num_images = len(image_items)
     
-    # --- Strict Two-per-Page Layout ---
-    if layout_style == 'Two Photos per Page':
-        # Iterate through images two at a time
-        for i in range(0, num_images, 2):
-            # Create a table for the pair of images. This ensures uniformity.
-            table = doc.add_table(rows=1, cols=2)
-            table.autofit = False
-            table.alignment = WD_TABLE_ALIGNMENT.CENTER
-            # Set column widths to be equal
-            table.columns[0].width = Inches(3.7)
-            table.columns[1].width = Inches(3.7)
-
-            # --- Process and place the first image (left) ---
-            item1 = image_items[i]
-            cell1 = table.cell(0, 0)
+    # --- NEW: Corrected Layout Logic ---
+    # Iterate through images, placing two items per page
+    for i in range(0, num_images, 2):
+        # Add a page break before the next set of items, but not on the first page
+        if i > 0:
+            doc.add_page_break()
             
-            # Add picture, resized to fit the cell width
-            img_stream1 = process_image(item1['file'], compress=compress_images)
-            if img_stream1:
-                cell1.paragraphs[0].add_run().add_picture(img_stream1, width=Inches(3.5))
-
-            # Add description below the picture
-            desc_p1 = cell1.add_paragraph()
-            desc_p1.add_run(f"Description: ").bold = True
-            desc_p1.add_run(item1['description'])
-            desc_p1.alignment = WD_ALIGN_PARAGRAPH.LEFT
-
-            progress_bar.progress((i + 1) / num_images)
-
-            # --- Process and place the second image (right) if it exists ---
-            if i + 1 < num_images:
-                item2 = image_items[i + 1]
-                cell2 = table.cell(0, 1)
-
-                img_stream2 = process_image(item2['file'], compress=compress_images)
-                if img_stream2:
-                    cell2.paragraphs[0].add_run().add_picture(img_stream2, width=Inches(3.5))
-
-                desc_p2 = cell2.add_paragraph()
-                desc_p2.add_run(f"Description: ").bold = True
-                desc_p2.add_run(item2['description'])
-                desc_p2.alignment = WD_ALIGN_PARAGRAPH.LEFT
-                
-                progress_bar.progress((i + 2) / num_images)
-
-            doc.add_paragraph() # Add a little space after the table
+        # --- First Item on Page ---
+        item1 = image_items[i]
+        table1 = doc.add_table(rows=1, cols=2)
+        table1.autofit = False
+        table1.columns[0].width = Inches(3.0) # Description column
+        table1.columns[1].width = Inches(4.5) # Photo column
+        
+        # Add description to the left cell
+        desc_cell1 = table1.cell(0, 0)
+        desc_cell1.text = item1['description']
+        desc_cell1.vertical_alignment = WD_ALIGN_VERTICAL.CENTER
+        
+        # Add photo to the right cell
+        img_stream1 = process_image(item1['file'], compress=compress_images)
+        if img_stream1:
+            photo_cell1 = table1.cell(0, 1)
+            # Must clear the cell before adding a picture to avoid extra paragraphs
+            photo_cell1._element.clear_content()
+            p = photo_cell1.add_paragraph()
+            p.add_run().add_picture(img_stream1, width=Inches(4.4))
+            p.alignment = WD_ALIGN_PARAGRAPH.CENTER
+        
+        progress_bar.progress((i + 1) / num_images)
+        
+        # Add space between the two items on the page
+        doc.add_paragraph()
+
+        # --- Second Item on Page (if it exists) ---
+        if i + 1 < num_images:
+            item2 = image_items[i + 1]
+            table2 = doc.add_table(rows=1, cols=2)
+            table2.autofit = False
+            table2.columns[0].width = Inches(3.0)
+            table2.columns[1].width = Inches(4.5)
+
+            # Add description
+            desc_cell2 = table2.cell(0, 0)
+            desc_cell2.text = item2['description']
+            desc_cell2.vertical_alignment = WD_ALIGN_VERTICAL.CENTER
+
+            # Add photo
+            img_stream2 = process_image(item2['file'], compress=compress_images)
+            if img_stream2:
+                photo_cell2 = table2.cell(0, 1)
+                photo_cell2._element.clear_content()
+                p = photo_cell2.add_paragraph()
+                p.add_run().add_picture(img_stream2, width=Inches(4.4))
+                p.alignment = WD_ALIGN_PARAGRAPH.CENTER
+            
+            progress_bar.progress((i + 2) / num_images)
 
     # --- File Saving and Conversion ---
     doc_io = io.BytesIO()
@@ -127,7 +133,7 @@ def generate_report(image_items, job_details, layout_style, compress_images, pro
             f.write(doc_io.getvalue())
         subprocess.run(
             ['libreoffice', '--headless', '--convert-to', 'pdf', '--outdir', '.', 'temp_report.docx'], 
-            check=True, timeout=90
+            check=True, timeout=120 # Increased timeout for larger reports
         )
         pdf_path = 'temp_report.pdf'
         if os.path.exists(pdf_path):
@@ -150,8 +156,7 @@ if 'image_dict' not in st.session_state:
 
 def reset_app():
     """Clears all session state and reruns the app."""
-    for key in st.session_state.keys():
-        del st.session_state[key]
+    st.session_state.clear()
     st.rerun()
 
 # --- UI Layout ---
@@ -164,28 +169,20 @@ st.markdown("---")
 # --- Sidebar for Settings ---
 with st.sidebar:
     st.header("1. Job Information")
-    # A single multi-line input for all job details
     job_details = st.text_area(
         "Job Details", 
         "T250014 Walmart 3155 Sault Ste. Marie\n446 Great Northern Rd\nSault Ste. Marie, Ontario, P6B 4Z9",
-        height=100
-    )
-
-    st.header("2. Report Options")
-    # Simplified layout option
-    layout_style = st.radio(
-        "Select Layout Style", 
-        ('Two Photos per Page',), # Only one style for now as requested
-        help="Choose how photos are arranged in the report."
+        height=100,
+        help="Enter all job information here. It will appear in the header."
     )
-    compress_images = st.checkbox("Compress Images", value=True, help="Reduces final file size.")
+    compress_images = st.checkbox("Compress Images", value=True, help="Greatly reduces final file size.")
     
-    st.header("3. Actions")
+    st.header("2. Actions")
     generate_button = st.button("Generate Report", type="primary", use_container_width=True)
     reset_button = st.button("Reset All", use_container_width=True, on_click=reset_app)
 
-# --- Main Area: File Uploader and Image Editor ---
-st.header("4. Upload, Arrange, and Describe Images")
+# --- Main Area ---
+st.header("3. Upload, Arrange, and Describe Images")
 uploaded_files = st.file_uploader(
     "Upload all your photos here",
     accept_multiple_files=True,
@@ -194,30 +191,30 @@ uploaded_files = st.file_uploader(
 )
 
 if uploaded_files:
-    for i, file in enumerate(uploaded_files):
+    for file in uploaded_files:
         if file.file_id not in st.session_state.image_dict:
-            current_max_order = max([d['order'] for d in st.session_state.image_dict.values()], default=0)
+            current_max_order = max([d.get('order', 0) for d in st.session_state.image_dict.values()], default=0)
             st.session_state.image_dict[file.file_id] = {
                 'file': file,
                 'description': '',
                 'order': current_max_order + 1
             }
     
-    st.info("Set the order using numbers, then add descriptions for each photo.")
+    st.info("Set the report order using numbers, then add descriptions for each photo.")
     
-    sorted_display_items = sorted(st.session_state.image_dict.values(), key=lambda x: x['order'])
+    sorted_display_items = sorted(st.session_state.image_dict.values(), key=lambda x: x.get('order', 0))
 
     for item_data in sorted_display_items:
         file_id = item_data['file'].file_id
         st.markdown("---")
-        cols = st.columns([1, 3])
+        cols = st.columns([2, 3])
         
         with cols[0]:
             st.image(item_data['file'], use_column_width=True)
 
         with cols[1]:
-            item_data['order'] = st.number_input("Order", min_value=1, value=item_data['order'], key=f"order_{file_id}")
-            item_data['description'] = st.text_area("Description", value=item_data['description'], key=f"desc_{file_id}")
+            item_data['order'] = st.number_input("Order", min_value=1, value=item_data.get('order', 1), key=f"order_{file_id}")
+            item_data['description'] = st.text_area("Description", value=item_data.get('description', ''), key=f"desc_{file_id}")
 
 # --- Generation Logic ---
 if generate_button:
@@ -227,19 +224,20 @@ if generate_button:
         st.error("Please upload at least one image.")
     else:
         items_to_sort = list(st.session_state.image_dict.values())
-        sorted_image_items = sorted(items_to_sort, key=lambda x: x['order'])
+        sorted_image_items = sorted(items_to_sort, key=lambda x: x.get('order', 0))
         
         progress_bar = st.progress(0, text="Starting report generation...")
         try:
-            with st.spinner('Generating your report... Please wait.'):
+            with st.spinner('Generating your report... This may take a moment.'):
+                # The layout style is now fixed, so we don't need to pass it as a variable
                 doc_io, pdf_io = generate_report(
                     sorted_image_items, 
                     job_details, 
-                    layout_style, compress_images, progress_bar
+                    compress_images, progress_bar
                 )
             progress_bar.success("Report generated successfully!")
             
-            st.header("5. Download Your Report")
+            st.header("4. Download Your Report")
             dl_col1, dl_col2 = st.columns(2)
             dl_col1.download_button(
                 "⬇️ Download Word (.docx)", doc_io, f"HKC_Report.docx", use_container_width=True