Update app.py

app.py

@@ -1,7 +1,7 @@
 import streamlit as st
 from docx import Document
 from docx.shared import Inches, Pt
-from docx.enum.table import WD_TABLE_ALIGNMENT, WD_ALIGN_VERTICAL
+from docx.enum.table import WD_TABLE_ALIGNMENT, WD_ALIGN_VERTICAL, WD_ROW_HEIGHT_RULE
 from docx.enum.text import WD_ALIGN_PARAGRAPH
 from PIL import Image
 import pillow_heif
@@ -10,48 +10,81 @@ import io
 import subprocess
 from docx.oxml import OxmlElement
 from docx.oxml.ns import qn
+from datetime import datetime
 
 # Register the HEIC opener
 pillow_heif.register_heif_opener()
 
+# --- CONSTANTS ---
+CONTENT_WIDTH_IN = 7.5   # Letter width (8.5") - left/right margins (0.5" each)
+DESC_COL_IN = CONTENT_WIDTH_IN * (1 / 5.0)  # 1:4 ratio -> 1/5 of total
+PHOTO_COL_IN = CONTENT_WIDTH_IN * (4 / 5.0) # 1:4 ratio -> 4/5 of total
+ROW_HEIGHT_IN = 4.6      # Exact row height; two rows per page
+PHOTO_MAX_W_IN = PHOTO_COL_IN - 0.2  # Slight padding
+PHOTO_MAX_H_IN = ROW_HEIGHT_IN - 0.2
+
+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",
+    "GSDR GSN CC": "T250030 GSDR - Guru Nanak Sewa Community Centre\n1410 Stevenson Rd N\nOshawa, Ontario, L1L 0N6"
+}
+
 # --- IMAGE PROCESSING ---
-def process_image(uploaded_file, compress=False, quality=60):
-    """Opens, processes, and optionally compresses an image. Returns a BytesIO stream."""
+def process_image(uploaded_file, compress=False, quality=70, rotation=0):
+    """Opens, rotates, processes, and optionally compresses an image. Returns a BytesIO stream."""
     try:
         uploaded_file.seek(0)
         img = Image.open(uploaded_file)
+
+        # Apply rotation (Pillow rotates counterclockwise)
+        if rotation:
+            img = img.rotate(rotation, expand=True)
+
+        # Normalize mode
         if img.mode == 'RGBA':
             background = Image.new('RGB', img.size, (255, 255, 255))
             background.paste(img, mask=img.split()[3])
             img = background
         elif img.mode != 'RGB':
             img = img.convert('RGB')
-        
+
         img_io = io.BytesIO()
         save_format = 'JPEG' if compress else 'PNG'
         if compress:
-            img.save(img_io, format=save_format, optimize=True, quality=quality)
+            img.save(img_io, format=save_format, optimize=True, quality=int(quality))
         else:
-             img.save(img_io, format=save_format)
+            img.save(img_io, format=save_format)
         img_io.seek(0)
         return img_io
     except Exception as e:
-        st.error(f"Error processing image '{uploaded_file.name}': {e}")
+        st.error(f"Error processing image '{getattr(uploaded_file, 'name', 'Unknown')}': {e}")
+        return None
+
+def get_rotated_preview(uploaded_file, rotation=0):
+    """Returns a PIL Image for preview with rotation applied."""
+    try:
+        uploaded_file.seek(0)
+        img = Image.open(uploaded_file)
+        if rotation:
+            img = img.rotate(rotation, expand=True)
+        # Convert for display if needed
+        if img.mode not in ('RGB', 'RGBA'):
+            img = img.convert('RGB')
+        return img
+    except Exception as e:
+        st.error(f"Preview error: {e}")
         return None
 
 def add_page_number(paragraph):
     """Adds Page X of Y page numbering to a footer paragraph."""
     paragraph.alignment = WD_ALIGN_PARAGRAPH.RIGHT
-    
-    # Add "Page " run
+    # Add "Page "
     page_run = paragraph.add_run("Page ")
-    
-    # Add page number field
+    # Current page
     page_num_run = paragraph.add_run()
     fldChar1 = OxmlElement('w:fldChar')
     fldChar1.set(qn('w:fldCharType'), 'begin')
     page_num_run._r.append(fldChar1)
-    
+
     instr = OxmlElement('w:instrText')
     instr.set(qn('xml:space'), 'preserve')
     instr.text = "PAGE"
@@ -61,10 +94,10 @@ def add_page_number(paragraph):
     fldChar2.set(qn('w:fldCharType'), 'end')
     page_num_run._r.append(fldChar2)
 
-    # Add " of " run
+    # " of "
     of_run = paragraph.add_run(" of ")
 
-    # Add total pages field
+    # Total pages
     num_pages_run = paragraph.add_run()
     fldChar3 = OxmlElement('w:fldChar')
     fldChar3.set(qn('w:fldCharType'), 'begin')
@@ -81,90 +114,143 @@ def add_page_number(paragraph):
 
 
 # --- CORE REPORT GENERATION LOGIC ---
-def generate_report(image_items, job_details, compress_images, progress_bar):
-    """Generates the DOCX and PDF report with the corrected layout."""
+def generate_report(image_items, job_details, compress_images, quality, progress_bar):
+    """Generates the DOCX and PDF report with a locked 2x2 per-page layout."""
     doc = Document()
     section = doc.sections[0]
     section.left_margin = section.right_margin = Inches(0.5)
-    section.top_margin = section.bottom_margin = Inches(0.75) # Extra space for footer
+    section.top_margin = section.bottom_margin = Inches(0.75)  # extra space for footer
 
     # --- Header Setup ---
     header = section.header
-    header_table = header.add_table(rows=1, cols=2, width=Inches(7.5))
+    header_table = header.add_table(rows=1, cols=2, width=Inches(CONTENT_WIDTH_IN))
     header_table.autofit = False
     header_table.columns[0].width = Inches(2.5)
-    header_table.columns[1].width = Inches(5.0)
-    
+    header_table.columns[1].width = Inches(CONTENT_WIDTH_IN - 2.5)
+
     logo_cell = header_table.cell(0, 0)
     if os.path.exists("logo.png"):
         p_logo = logo_cell.paragraphs[0]
         p_logo.add_run().add_picture("logo.png", width=Inches(1.5))
         p_logo.add_run("\nHKC Construction").font.size = Pt(8)
-    
+
     info_cell = header_table.cell(0, 1)
     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
-    
+
     # --- Footer Setup ---
     footer = section.footer
     footer_para = footer.paragraphs[0]
     add_page_number(footer_para)
 
     num_images = len(image_items)
-    
-    # --- Corrected Layout: Two Items per Page ---
-    for i in range(0, num_images):
-        item = image_items[i]
-        
-        # Add a page break before the 3rd, 5th, 7th, etc. item
-        if i > 0 and i % 2 == 0:
+    processed = 0
+
+    def add_locked_page_table():
+        """Create a new 2x2 table with locked column widths and row heights."""
+        tbl = doc.add_table(rows=2, cols=2)
+        tbl.alignment = WD_TABLE_ALIGNMENT.CENTER
+        tbl.autofit = False
+
+        # Set locked widths
+        tbl.columns[0].width = Inches(DESC_COL_IN)
+        tbl.columns[1].width = Inches(PHOTO_COL_IN)
+        for r in tbl.rows:
+            r.height = Inches(ROW_HEIGHT_IN)
+            r.height_rule = WD_ROW_HEIGHT_RULE.EXACTLY
+        # Enforce widths at cell level too (helps "lock" in some Word versions)
+        for r in tbl.rows:
+            r.cells[0].width = Inches(DESC_COL_IN)
+            r.cells[1].width = Inches(PHOTO_COL_IN)
+
+        return tbl
+
+    # Build pages: exactly 2 per page, except last page can have 1
+    for start in range(0, num_images, 2):
+        if start > 0:
             doc.add_page_break()
 
-        # Main table for this item: Description on left, Photo on right
-        item_table = doc.add_table(rows=1, cols=2)
-        item_table.autofit = False
-        item_table.columns[0].width = Inches(3.0)
-        item_table.columns[1].width = Inches(4.5)
-        
-        # Description Cell (Left)
-        desc_cell = item_table.cell(0, 0)
-        desc_cell.vertical_alignment = WD_ALIGN_VERTICAL.TOP # Align to top
-        # Clear default paragraph and add our formatted one
-        desc_cell._element.clear_content() 
-        p_desc = desc_cell.add_paragraph()
-        run = p_desc.add_run('Description:\n')
-        run.bold = True
-        p_desc.add_run(item['description'])
-        
-        # Photo Cell (Right)
-        img_stream = process_image(item['file'], compress=compress_images)
-        if img_stream:
-            photo_cell = item_table.cell(0, 1)
-            photo_cell._element.clear_content()
-            p_photo = photo_cell.add_paragraph()
-            # Add picture, keeping aspect ratio by only setting width
-            p_photo.add_run().add_picture(img_stream, width=Inches(4.4))
-            p_photo.alignment = WD_ALIGN_PARAGRAPH.CENTER
-        
-        # Add some vertical space before the next item on the same page
-        doc.add_paragraph()
-        
-        progress_bar.progress((i + 1) / num_images)
+        page_items = image_items[start:start+2]
+        page_table = add_locked_page_table()
+
+        for row_idx in range(2):
+            desc_cell = page_table.cell(row_idx, 0)
+            photo_cell = page_table.cell(row_idx, 1)
+
+            # Clear default content
+            try:
+                desc_cell._element.clear_content()
+                photo_cell._element.clear_content()
+            except Exception:
+                # Fallback: remove paragraphs
+                for p in list(desc_cell.paragraphs):
+                    p._p.getparent().remove(p._p)
+                for p in list(photo_cell.paragraphs):
+                    p._p.getparent().remove(p._p)
 
+            if row_idx < len(page_items):
+                item = page_items[row_idx]
+                # Description
+                desc_cell.vertical_alignment = WD_ALIGN_VERTICAL.TOP
+                p_desc = desc_cell.add_paragraph()
+                run = p_desc.add_run('Description:\n')
+                run.bold = True
+                p_desc.add_run(item.get('description', '') or '')
+
+                # Photo
+                rotation = item.get('rotation', 0) or 0
+
+                # Determine fit rule based on aspect ratio after rotation
+                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:
+                    # fallback if any error reading preview dims
+                    w_px, h_px = (1000, 1000)
+
+                img_ratio = w_px / h_px if h_px else 1
+                allowed_ratio = PHOTO_MAX_W_IN / PHOTO_MAX_H_IN
+
+                img_stream = process_image(
+                    item['file'],
+                    compress=compress_images,
+                    quality=quality,
+                    rotation=rotation
+                )
+
+                if img_stream:
+                    p_photo = photo_cell.add_paragraph()
+                    # Fit inside the photo cell by width or height
+                    if img_ratio >= allowed_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))
+                    p_photo.alignment = WD_ALIGN_PARAGRAPH.CENTER
+
+                processed += 1
+                if num_images:
+                    progress_bar.progress(processed / num_images)
+
+            else:
+                # No item for this row (last page single photo case) — keep cells empty
+                pass
 
     # --- File Saving and Conversion ---
     doc_io = io.BytesIO()
     doc.save(doc_io)
     doc_io.seek(0)
-    
+
     pdf_io = None
     try:
         with open("temp_report.docx", "wb") as f:
             f.write(doc_io.getvalue())
         subprocess.run(
-            ['libreoffice', '--headless', '--convert-to', 'pdf', '--outdir', '.', 'temp_report.docx'], 
+            ['libreoffice', '--headless', '--convert-to', 'pdf', '--outdir', '.', 'temp_report.docx'],
             check=True, timeout=120
         )
         pdf_path = 'temp_report.pdf'
@@ -178,6 +264,7 @@ def generate_report(image_items, job_details, compress_images, progress_bar):
 
     return doc_io, pdf_io
 
+
 # --- STREAMLIT UI ---
 
 st.set_page_config(layout="centered", page_title="HKC Report Generator")
@@ -200,85 +287,115 @@ st.markdown("---")
 # --- Sidebar for Settings ---
 with st.sidebar:
     st.header("1. Job Information")
-    job_details = st.text_area(
-        "Job Details", 
-        "T250014 Walmart 3155 Sault Ste. Marie FY26 Parking Lot Refresh\n446 Great Northern Rd.\nSault Ste. Marie, Ontario, P6B 4Z9",
-        height=125,
-        help="Enter all job information here. It will appear in the header."
+    job_key = st.selectbox(
+        "Select Job",
+        options=list(JOB_MAP.keys()),
+        index=0,
+        help="This sets the header and the download file name."
     )
-    compress_images = st.checkbox("Compress Images", value=True, help="Greatly reduces final file size.")
-    
-    st.header("2. Actions")
+    job_details = JOB_MAP[job_key]
+    st.text_area("Job Details", job_details, height=125, disabled=True)
+
+    st.header("2. Image Settings")
+    compress_images = st.checkbox("Compress Images", value=True, help="Reduce final file size.")
+    quality = st.slider(
+        "Compression intensity (higher = better quality, larger file)",
+        min_value=10, max_value=95, value=70, step=5
+    )
+
+    st.header("3. Actions")
     generate_button = st.button("Generate Report", type="primary", use_container_width=True)
     if st.button("Reset All", use_container_width=True):
         reset_app()
         st.rerun()
 
 # --- Main Area ---
-st.header("3. Upload, Arrange, and Describe Images")
+st.header("Upload, Arrange, Rotate, and Describe Images")
 uploaded_files = st.file_uploader(
     "Upload all your photos here",
     accept_multiple_files=True,
-    type=["jpg", "jpeg", "png", "heic","jfif"],
+    type=["jpg", "jpeg", "png", "heic", "jfif"],
     key="file_uploader"
 )
 
+# Add new files into session state
 if uploaded_files:
     for file in uploaded_files:
-        if file.file_id not in st.session_state.image_dict:
+        if getattr(file, "file_id", None) not in st.session_state.image_dict:
             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] = {
+            st.session_state.image_dict[getattr(file, "file_id", file.name + str(id(file)))] = {
                 'file': file,
                 'description': '',
-                'order': current_max_order + 1
+                'order': current_max_order + 1,
+                'rotation': 0  # degrees (0, 90, 180, 270)
             }
-    
-    st.info("Set the report order using numbers, then add descriptions for each photo.")
-    
+
+if st.session_state.image_dict:
+    st.info("Set the report order, rotate if needed, then add descriptions. Exactly 2 photos per page (last page can have 1).")
+    # Sort by order for display
     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
+        file_id = getattr(item_data['file'], "file_id", item_data['file'].name + str(id(item_data['file'])))
         st.markdown("---")
         cols = st.columns([2, 3])
-        
+
         with cols[0]:
-            st.image(item_data['file'], use_column_width=True)
+            preview = get_rotated_preview(item_data['file'], item_data.get('rotation', 0))
+            if preview is not None:
+                st.image(preview, use_column_width=True)
+
+            rcols = st.columns(2)
+            if rcols[0].button("↺ Rotate Left", key=f"rotl_{file_id}"):
+                item_data['rotation'] = (item_data.get('rotation', 0) + 90) % 360
+                st.rerun()
+            if rcols[1].button("↻ Rotate Right", key=f"rotr_{file_id}"):
+                item_data['rotation'] = (item_data.get('rotation', 0) - 90) % 360
+                st.rerun()
 
         with cols[1]:
-            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}", height=120)
+            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}", height=120
+            )
 
 # --- Generation Logic ---
 if generate_button:
     if not job_details:
-        st.error("Please fill in the Job Details.")
+        st.error("Please select a job.")
     elif not st.session_state.image_dict:
         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.get('order', 0))
-        
+
         progress_bar = st.progress(0, text="Starting report generation...")
         try:
-            with st.spinner('Generating your report... This may take a moment.'):
+            with st.spinner('Generating your report...'):
                 doc_io, pdf_io = generate_report(
-                    sorted_image_items, 
-                    job_details, 
-                    compress_images, progress_bar
+                    sorted_image_items,
+                    job_details,
+                    compress_images,
+                    quality,
+                    progress_bar
                 )
             progress_bar.success("Report generated successfully!")
-            
-            st.header("4. Download Your Report")
+
+            # File naming per dropdown + yymmdd
+            date_str = datetime.now().strftime("%y%m%d")
+            file_base = f"{job_key} - {date_str}"
+
+            st.header("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
+                "⬇️ Download Word (.docx)", doc_io, f"{file_base}.docx", use_container_width=True
             )
             if pdf_io:
                 dl_col2.download_button(
-                    "⬇️ Download PDF (.pdf)", pdf_io, f"HKC_Report.pdf", use_container_width=True
+                    "⬇️ 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()