Update app.py

app.py

@@ -21,10 +21,9 @@ st.set_page_config(
 
 st.title("🖼️ Image → PDF • Comic-Book Layout Generator")
 st.markdown(
-    "Upload images, choose a page aspect ratio, reorder panels, and generate a high‑definition PDF with smart naming."
+    "Upload images, choose a page aspect ratio, filter/group by shape, reorder panels, and generate a high-definition PDF with smart naming."
 )
 
-
 # --- Sidebar: Page Settings -----------------------------
 st.sidebar.header("1️⃣ Page Aspect Ratio & Size")
 ratio_map = {
@@ -43,38 +42,75 @@ else:
     rw = st.sidebar.number_input("Custom Width Ratio", min_value=1, value=4)
     rh = st.sidebar.number_input("Custom Height Ratio", min_value=1, value=3)
 
-# Base page width in points (1pt = 1/72 inch)
 BASE_WIDTH_PT = st.sidebar.slider(
     "Base Page Width (pt)", min_value=400, max_value=1200, value=800, step=100
 )
 page_width = BASE_WIDTH_PT
 page_height = int(BASE_WIDTH_PT * (rh / rw))
-
 st.sidebar.markdown(f"**Page size:** {page_width}×{page_height} pt")
 
-
-# --- Main: Upload & Reorder -----------------------------
-st.header("2️⃣ Upload & Reorder Images")
-uploaded_files = st.file_uploader(
+# --- Main: Upload, Inspect & Reorder -------------------
+st.header("2️⃣ Upload, Inspect & Reorder Images")
+uploaded = st.file_uploader(
     "📂 Select PNG/JPG images", type=["png", "jpg", "jpeg"], accept_multiple_files=True
 )
 
-# Build ordering table
-if uploaded_files:
-    df = pd.DataFrame({"filename": [f.name for f in uploaded_files]})
-    st.markdown("Drag to reorder panels below:")
-    ordered = st.data_editor(
-        df, num_rows="fixed", use_container_width=True
+if uploaded:
+    # Collect metadata
+    records = []
+    for idx, f in enumerate(uploaded):
+        im = Image.open(f)
+        w, h = im.size
+        ar = round(w / h, 2)
+        if ar > 1.1:
+            orient = "Landscape"
+        elif ar < 0.9:
+            orient = "Portrait"
+        else:
+            orient = "Square"
+        records.append({
+            "filename": f.name,
+            "width": w,
+            "height": h,
+            "aspect_ratio": ar,
+            "orientation": orient,
+            "order": idx,
+        })
+    df = pd.DataFrame(records)
+
+    # Filter by orientation
+dims = st.sidebar.multiselect(
+    "Include orientations:",
+    options=["Landscape", "Portrait", "Square"],
+    default=["Landscape", "Portrait", "Square"]
+)
+df = df[df["orientation"].isin(dims)]
+
+    # Show table and allow numeric reordering
+st.markdown("#### Image Metadata")
+if uploaded:
+    st.dataframe(df.style.format({"aspect_ratio": "{:.2f}"}), use_container_width=True)
+
+st.markdown("#### Reorder Panels")
+if uploaded:
+    edited = st.data_editor(
+        df,
+        column_config={
+            "order": st.column_config.NumberColumn(
+                "Order", min_value=0, max_value=len(df) - 1
+            )
+        },
+        hide_dataframe_index=True,
+        use_container_width=True,
     )
-    # Map back to actual file objects in new order
-    name2file = {f.name: f for f in uploaded_files}
+    # sort by user-defined order
+    ordered = edited.sort_values("order").reset_index(drop=True)
+    name2file = {f.name: f for f in uploaded}
     ordered_files = [name2file[n] for n in ordered["filename"] if n in name2file]
 else:
     ordered_files = []
 
-
 # --- PDF Creation Logic ----------------------------------
-
 def top_n_words(filenames, n=5):
     words = []
     for fn in filenames:
@@ -84,82 +120,62 @@ def top_n_words(filenames, n=5):
 
 
 def make_comic_pdf(images, w_pt, h_pt):
-    buffer = io.BytesIO()
-    c = canvas.Canvas(buffer, pagesize=(w_pt, h_pt))
-
+    buf = io.BytesIO()
+    c = canvas.Canvas(buf, pagesize=(w_pt, h_pt))
     N = len(images)
     cols = int(math.ceil(math.sqrt(N)))
     rows = int(math.ceil(N / cols))
-    panel_w = w_pt  / cols
-    panel_h = h_pt / rows
-
-    for idx, img_file in enumerate(images):
-        im = Image.open(img_file)
+    pw = w_pt / cols
+    ph = h_pt / rows
+    for idx, img in enumerate(images):
+        im = Image.open(img)
         iw, ih = im.size
-        target_ar = panel_w / panel_h
+        tar_ar = pw / ph
         img_ar = iw / ih
-
-        # Center-crop to panel aspect
-        if img_ar > target_ar:
-            new_w = int(ih * target_ar)
-            left = (iw - new_w) // 2
-            im = im.crop((left, 0, left + new_w, ih))
+        if img_ar > tar_ar:
+            nw = int(ih * tar_ar)
+            left = (iw - nw) // 2
+            im = im.crop((left, 0, left + nw, ih))
         else:
-            new_h = int(iw / target_ar)
-            top = (ih - new_h) // 2
-            im = im.crop((0, top, iw, top + new_h))
-
-        im = im.resize((int(panel_w), int(panel_h)), Image.LANCZOS)
-
+            nh = int(iw / tar_ar)
+            top = (ih - nh) // 2
+            im = im.crop((0, top, iw, top + nh))
+        im = im.resize((int(pw), int(ph)), Image.LANCZOS)
         col = idx % cols
         row = idx // cols
-        x = col * panel_w
-        y = h_pt - (row + 1) * panel_h
-
-        c.drawImage(
-            ImageReader(im), x, y, panel_w, panel_h,
-            preserveAspectRatio=False, mask='auto'
-        )
-
+        x = col * pw
+        y = h_pt - (row + 1) * ph
+        c.drawImage(ImageReader(im), x, y, pw, ph, preserveAspectRatio=False, mask='auto')
     c.showPage()
     c.save()
-    buffer.seek(0)
-    return buffer.getvalue()
-
+    buf.seek(0)
+    return buf.getvalue()
 
 # --- Generate & Download -------------------------------
 st.header("3️⃣ Generate & Download PDF")
 if st.button("🎉 Generate PDF"):
     if not ordered_files:
-        st.warning("Please upload and order at least one image.")
+        st.warning("Upload and reorder at least one image.")
     else:
-        # Build filename: YYYY-MMdd-top5words.pdf
         date_str = datetime.now().strftime("%Y-%m%d")
         words = top_n_words([f.name for f in ordered_files], n=5)
-        slug  = "-".join(words)
+        slug = "-".join(words)
         out_name = f"{date_str}-{slug}.pdf"
-
-        pdf_bytes = make_comic_pdf(ordered_files, page_width, page_height)
-
+        pdf_data = make_comic_pdf(ordered_files, page_width, page_height)
         st.success(f"✅ PDF ready: **{out_name}**")
         st.download_button(
-            "⬇️ Download PDF", data=pdf_bytes,
+            "⬇️ Download PDF", data=pdf_data,
             file_name=out_name, mime="application/pdf"
         )
-
-        # Preview first page (requires pymupdf)
         st.markdown("#### PDF Preview")
         try:
-            import fitz  # pymupdf
-            doc = fitz.open(stream=pdf_bytes, filetype="pdf")
+            import fitz
+            doc = fitz.open(stream=pdf_data, filetype="pdf")
             pix = doc[0].get_pixmap(matrix=fitz.Matrix(1.5, 1.5))
-            st.image(pix.tobytes(), use_column_width=True)
+            st.image(pix.tobytes(), use_container_width=True)
         except Exception:
             st.info("Install `pymupdf` for live PDF preview.")
 
-
 # --- Footer ------------------------------------------------
 st.sidebar.markdown("---")
-st.sidebar.markdown(
-    "Built by Aaron C. Wacker • Senior AI Engineer"
-)
+st.sidebar.markdown("Built by Aaron C. Wacker")