Update app.py

app.py

@@ -5,7 +5,6 @@ import numpy as np
 import zipfile
 import os
 from fpdf import FPDF
-from streamlit_drawable_canvas import st_canvas
 
 # --- PAGE CONFIG ---
 st.set_page_config(page_title="Smart Doc Scanner", page_icon="🖼️", layout="centered")
@@ -18,37 +17,21 @@ def resize_image(img, max_height=500):
         img = img.resize((new_width, max_height), resample=Image.Resampling.LANCZOS)
     return img
 
-# --- Custom Cropper (pass PIL Image directly) ---
-def custom_cropper(image, key="canvas_crop"):
-    st.markdown("🖍️ Draw a rectangle over the area you want to crop.")
-
-    canvas_result = st_canvas(
-        fill_color="rgba(255, 165, 0, 0.3)",
-        stroke_width=2,
-        stroke_color="#FFA500",
-        background_image=image,  # ✅ Pass PIL image directly (no np.array)
-        update_streamlit=True,
-        height=image.height,
-        width=image.width,
-        drawing_mode="rect",
-        key=key
-    )
-
-    if canvas_result.json_data and len(canvas_result.json_data["objects"]) > 0:
-        obj = canvas_result.json_data["objects"][-1]
-        left = int(obj["left"])
-        top = int(obj["top"])
-        width = int(obj["width"])
-        height = int(obj["height"])
-        cropped = image.crop((left, top, left + width, top + height))
-        return cropped
-    return None
+# --- Safe Cropping Using Sliders ---
+def crop_with_sliders(image, key_prefix):
+    w, h = image.size
+    st.markdown("### ✂️ Use sliders to crop the image")
+    left = st.slider("Crop from left", 0, w - 10, 0, key=f"{key_prefix}_left")
+    top = st.slider("Crop from top", 0, h - 10, 0, key=f"{key_prefix}_top")
+    right = st.slider("Crop from right", left + 10, w, w, key=f"{key_prefix}_right")
+    bottom = st.slider("Crop from bottom", top + 10, h, h, key=f"{key_prefix}_bottom")
+    return image.crop((left, top, right, bottom))
 
 # --- HEADER ---
 st.title("📄 Smart ID & Document Scanner")
 st.markdown("---")
 
-# --- Clear Session State on New Upload ---
+# --- Upload Section ---
 if "uploaded_files_hash" not in st.session_state:
     st.session_state.uploaded_files_hash = None
 
@@ -57,110 +40,80 @@ uploaded_files = st.file_uploader("📤 Upload your Images", type=["png", "jpg",
 if uploaded_files:
     uploaded_files_names = [file.name for file in uploaded_files]
     current_hash = hash(tuple(uploaded_files_names))
-
     if st.session_state.uploaded_files_hash != current_hash:
         st.session_state.clear()
         st.session_state.uploaded_files_hash = current_hash
 
-    app_mode = st.radio("🛠️ Select Mode:", ["Normal Mode (No Editing)", "Advanced Mode (Edit Each Image)"])
+    mode = st.radio("🛠️ Select Mode", ["Normal Mode", "Advanced Mode (Crop/Edit)"])
 
-    st.markdown("---")
     processed_images = []
 
-    if app_mode == "Normal Mode (No Editing)":
-        for uploaded_file in uploaded_files:
-            img = Image.open(uploaded_file).convert("RGB")
-            img = resize_image(img)
-            processed_images.append(img)
-            st.image(img, caption=uploaded_file.name, use_container_width=True)
-
-    else:  # Advanced Mode
-        for idx, uploaded_file in enumerate(uploaded_files):
-            st.subheader(f"🖼️ Editing: {uploaded_file.name}")
-
-            original_img = Image.open(uploaded_file).convert("RGB")
-            original_img = resize_image(original_img)
-
-            if f"edited_{idx}" not in st.session_state:
-                st.session_state[f"edited_{idx}"] = original_img
-                st.session_state[f"cropper_{idx}"] = original_img.copy()
-                st.session_state[f"preview_{idx}"] = None
-
-            col_cropper, col_preview = st.columns([1, 1])
-
-            with col_cropper:
-                st.markdown("### ✂️ Select Crop Area (Draw Rectangle):")
-                crop_output = custom_cropper(st.session_state[f"cropper_{idx}"], key=f"canvas_{idx}")
-
-                if crop_output is not None and st.button("✂️ Crop Now", key=f"crop_{idx}"):
-                    st.session_state[f"preview_{idx}"] = crop_output
-                    st.success("✅ Cropped! Now Edit Preview.")
-
-            with col_preview:
-                st.markdown("### 🎯 Preview and Edit:")
-                if st.session_state[f"preview_{idx}"] is not None:
-                    st.image(st.session_state[f"preview_{idx}"], caption=f"Preview: {uploaded_file.name}", use_container_width=True)
+    for idx, file in enumerate(uploaded_files):
+        st.subheader(f"🖼️ {file.name}")
+        original = Image.open(file).convert("RGB")
+        resized = resize_image(original)
+
+        if mode == "Normal Mode":
+            st.image(resized, use_container_width=True)
+            processed_images.append(resized)
+            continue
+
+        # Advanced Mode
+        with st.expander("✂️ Crop & Edit Options", expanded=True):
+            cropped = crop_with_sliders(resized, key_prefix=f"img_{idx}")
+            st.image(cropped, caption="Cropped Preview", use_container_width=True)
+
+            col1, col2 = st.columns(2)
+            with col1:
+                if st.button("✨ Enhance", key=f"enhance_{idx}"):
+                    enhancer = ImageEnhance.Contrast(cropped)
+                    cropped = enhancer.enhance(1.5)
+                    sharp = ImageEnhance.Sharpness(cropped).enhance(2.0)
+                    cropped = sharp
+                    st.success("Enhanced!")
+
+            with col2:
+                angle = st.slider("🌀 Rotate", -180, 180, 0, key=f"rotate_{idx}")
+                if angle != 0:
+                    cropped = cropped.rotate(angle, expand=True)
+
+            if st.button("✅ Use This Image", key=f"finalize_{idx}"):
+                st.session_state[f"final_image_{idx}"] = cropped
+                st.success("Saved to export list!")
+
+        final = st.session_state.get(f"final_image_{idx}", resized)
+        processed_images.append(final)
 
-                    if st.button("✨ Enhance Image", key=f"enhance_{idx}"):
-                        enhancer = ImageEnhance.Contrast(st.session_state[f"preview_{idx}"])
-                        sharpener = ImageEnhance.Sharpness(enhancer.enhance(1.5))
-                        st.session_state[f"preview_{idx}"] = sharpener.enhance(2.0)
-
-                    angle = st.slider("🌀 Rotate Angle", -180, 180, 0, key=f"rotate_slider_{idx}")
-
-                    if st.button("🔄 Rotate Image", key=f"rotate_{idx}"):
-                        rotated_img = st.session_state[f"preview_{idx}"].rotate(angle, expand=True)
-                        st.session_state[f"preview_{idx}"] = rotated_img
-
-                    if st.button("🗑️ Reset Preview", key=f"reset_preview_{idx}"):
-                        st.session_state[f"preview_{idx}"] = crop_output.copy()
-
-                    if st.button("✅ Apply Changes", key=f"apply_{idx}"):
-                        st.session_state[f"edited_{idx}"] = st.session_state[f"preview_{idx}"].copy()
-                        st.success("✅ Changes Applied!")
-
-                else:
-                    st.info("✂️ Please draw and crop an area first.")
-
-            processed_images.append(st.session_state.get(f"edited_{idx}", original_img))
-            st.markdown("---")
-
-    # --- EXPORT OPTIONS ---
+    st.markdown("---")
     st.header("📥 Download Options")
 
     col1, col2 = st.columns(2)
 
     with col1:
-        if st.button("📸 Download All as ZIP"):
-            with st.spinner("Creating ZIP..."):
-                zip_buffer = BytesIO()
-                with zipfile.ZipFile(zip_buffer, "a", zipfile.ZIP_DEFLATED) as zip_file:
-                    for idx, img in enumerate(processed_images):
-                        img_bytes = BytesIO()
-                        img.save(img_bytes, format='PNG')
-                        img_bytes.seek(0)
-                        zip_file.writestr(f"image_{idx+1}.png", img_bytes.read())
-                zip_buffer.seek(0)
-                st.download_button(label="📥 Download ZIP", data=zip_buffer, file_name="images.zip", mime="application/zip")
+        if st.button("📸 Download ZIP"):
+            zip_buffer = BytesIO()
+            with zipfile.ZipFile(zip_buffer, "a", zipfile.ZIP_DEFLATED) as zipf:
+                for i, img in enumerate(processed_images):
+                    img_bytes = BytesIO()
+                    img.save(img_bytes, format="PNG")
+                    img_bytes.seek(0)
+                    zipf.writestr(f"image_{i+1}.png", img_bytes.read())
+            zip_buffer.seek(0)
+            st.download_button("📥 Download ZIP", zip_buffer, "images.zip", "application/zip")
 
     with col2:
-        if st.button("📄 Download All as PDF"):
-            with st.spinner("Generating PDF..."):
-                pdf = FPDF()
-                temp_image_paths = []
-                for img in processed_images:
-                    temp_path = f"/tmp/{np.random.randint(0, 999999)}.jpg"
-                    img.save(temp_path, format="JPEG")
-                    temp_image_paths.append(temp_path)
-                    pdf.add_page()
-                    pdf.image(temp_path, x=10, y=10, w=190)
-
-                pdf_output_path = "/tmp/converted.pdf"
-                pdf.output(pdf_output_path)
-
-                with open(pdf_output_path, "rb") as f:
-                    st.download_button(label="📥 Download PDF", data=f, file_name="converted_document.pdf", mime="application/pdf")
-
-                for path in temp_image_paths:
-                    os.remove(path)
-                os.remove(pdf_output_path)
+        if st.button("📄 Download PDF"):
+            pdf = FPDF()
+            tmp_files = []
+            for img in processed_images:
+                path = f"/tmp/{np.random.randint(0, 1e6)}.jpg"
+                img.save(path, "JPEG")
+                pdf.add_page()
+                pdf.image(path, x=10, y=10, w=190)
+                tmp_files.append(path)
+            output = "/tmp/output.pdf"
+            pdf.output(output)
+            with open(output, "rb") as f:
+                st.download_button("📥 Download PDF", f, "scanned.pdf", "application/pdf")
+            for f in tmp_files + [output]:
+                os.remove(f)