Update app.py

app.py

@@ -9,7 +9,6 @@ import pandas as pd
 import streamlit as st
 from PIL import Image
 from reportlab.pdfgen import canvas
-from reportlab.lib.units import inch
 from reportlab.lib.utils import ImageReader
 
 # --- App Configuration ----------------------------------
@@ -21,7 +20,7 @@ st.set_page_config(
 
 st.title("🖼️ Image → PDF • Comic-Book Layout Generator")
 st.markdown(
-    "Upload images, choose a page aspect ratio, filter/group by shape, reorder panels, and generate a high-definition PDF with smart naming."
+    "Upload images, choose aspect ratio, filter by shape, reorder visually, and generate a PDF."
 )
 
 # --- Sidebar: Page Settings -----------------------------
@@ -41,7 +40,6 @@ if ratio_choice != "Custom…":
 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_WIDTH_PT = st.sidebar.slider(
     "Base Page Width (pt)", min_value=400, max_value=1200, value=800, step=100
 )
@@ -49,106 +47,88 @@ 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, Inspect & Reorder -------------------
-st.header("2️⃣ Upload, Inspect & Reorder Images")
+# --- Main: Upload, Filter & Reorder -------------------
+st.header("2️⃣ Upload, Filter & Reorder Images")
 uploaded = st.file_uploader(
-    "📂 Select PNG/JPG images", type=["png", "jpg", "jpeg"], accept_multiple_files=True
+    "📂 Select PNG/JPG images", type=["png","jpg","jpeg"], accept_multiple_files=True
 )
 
+ordered_files = []
 if uploaded:
-    # Collect metadata
+    # ➊ 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,
-        })
+        orient = "Square" if 0.9 <= ar <= 1.1 else ("Landscape" if ar > 1.1 else "Portrait")
+        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)]
+    # ➋ Filter by orientation
+    dims = st.sidebar.multiselect(
+        "Include orientations:", options=["Landscape","Portrait","Square"],
+        default=["Landscape","Portrait","Square"]
+    )
+    df = df[df["orientation"].isin(dims)].reset_index(drop=True)
 
-    # Show table and allow numeric reordering
-st.markdown("#### Image Metadata")
-if uploaded:
+    # ➌ Show metadata table
+    st.markdown("#### Image Metadata")
     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,
-    )
-    # sort by user-defined order
-    ordered = edited.sort_values("order").reset_index(drop=True)
+    # ➍ Visual reorder via Data Editor
+    st.markdown("#### Reorder Panels (drag rows or adjust 'order')")
+    try:
+        edited = st.experimental_data_editor(
+            df, num_rows="fixed", use_container_width=True
+        )
+        ordered_df = edited
+    except Exception:
+        edited = st.data_editor(
+            df,
+            column_config={
+                "order": st.column_config.NumberColumn(
+                    "Order", min_value=0, max_value=len(df)-1
+                )
+            },
+            hide_index=True,
+            use_container_width=True,
+        )
+        ordered_df = edited.sort_values("order").reset_index(drop=True)
+
+    # Map filenames to ordered files
     name2file = {f.name: f for f in uploaded}
-    ordered_files = [name2file[n] for n in ordered["filename"] if n in name2file]
-else:
-    ordered_files = []
+    ordered_files = [name2file[n] for n in ordered_df["filename"] if n in name2file]
 
 # --- PDF Creation Logic ----------------------------------
-def top_n_words(filenames, n=5):
+def top_n_words(names, n=5):
     words = []
-    for fn in filenames:
+    for fn in names:
         stem = os.path.splitext(fn)[0]
         words += re.findall(r"\w+", stem.lower())
-    return [w for w, _ in Counter(words).most_common(n)]
-
+    return [w for w,_ in Counter(words).most_common(n)]
 
 def make_comic_pdf(images, 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))
-    pw = w_pt / cols
-    ph = h_pt / rows
-    for idx, img in enumerate(images):
-        im = Image.open(img)
+    rows = int(math.ceil(N/cols))
+    pw, ph = w_pt/cols, h_pt/rows
+    for idx, f in enumerate(images):
+        im = Image.open(f)
         iw, ih = im.size
-        tar_ar = pw / ph
-        img_ar = iw / ih
-        if img_ar > tar_ar:
-            nw = int(ih * tar_ar)
-            left = (iw - nw) // 2
-            im = im.crop((left, 0, left + nw, ih))
+        tar = pw/ph; ar = iw/ih
+        if ar>tar:
+            nw = int(ih*tar); left=(iw-nw)//2; im=im.crop((left,0,left+nw,ih))
         else:
-            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 * pw
-        y = h_pt - (row + 1) * ph
+            nh = int(iw/tar); top=(ih-nh)//2; im=im.crop((0,top,iw,top+nh))
+        im = im.resize((int(pw),int(ph)), Image.LANCZOS)
+        col, row = idx%cols, idx//cols
+        x, y = col*pw, h_pt - (row+1)*ph
         c.drawImage(ImageReader(im), x, y, pw, ph, preserveAspectRatio=False, mask='auto')
-    c.showPage()
-    c.save()
-    buf.seek(0)
+    c.showPage(); c.save(); buf.seek(0)
     return buf.getvalue()
 
 # --- Generate & Download -------------------------------
@@ -157,25 +137,22 @@ if st.button("🎉 Generate PDF"):
     if not ordered_files:
         st.warning("Upload and reorder at least one image.")
     else:
-        date_str = datetime.now().strftime("%Y-%m%d")
-        words = top_n_words([f.name for f in ordered_files], n=5)
+        date_s = datetime.now().strftime("%Y-%m%d")
+        words = top_n_words([f.name for f in ordered_files])
         slug = "-".join(words)
-        out_name = f"{date_str}-{slug}.pdf"
-        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_data,
-            file_name=out_name, mime="application/pdf"
-        )
-        st.markdown("#### PDF Preview")
+        fname = f"{date_s}-{slug}.pdf"
+        pdf = make_comic_pdf(ordered_files, page_width, page_height)
+        st.success(f"✅ PDF ready: **{fname}**")
+        st.download_button("⬇️ Download PDF", data=pdf, file_name=fname, mime="application/pdf")
+        st.markdown("#### Preview")
         try:
             import fitz
-            doc = fitz.open(stream=pdf_data, filetype="pdf")
-            pix = doc[0].get_pixmap(matrix=fitz.Matrix(1.5, 1.5))
+            doc = fitz.open(stream=pdf, filetype="pdf")
+            pix = doc[0].get_pixmap(matrix=fitz.Matrix(1.5,1.5))
             st.image(pix.tobytes(), use_container_width=True)
-        except Exception:
-            st.info("Install `pymupdf` for live PDF preview.")
+        except:
+            st.info("Install `pymupdf` for preview.")
 
 # --- Footer ------------------------------------------------
 st.sidebar.markdown("---")
-st.sidebar.markdown("Built by Aaron C. Wacker")
+st.sidebar.markdown("Built by Aaron C. Wacker • Senior AI Engineer")