Update app.py

app.py

@@ -545,130 +545,157 @@ gr.HTML("""
 </div>
 """)
 
-with gr.Blocks(css=css) as demo:
-    image_data_state = gr.State([])
-    temp_dir_state = gr.State(None)
-
-    gr.HTML(lamp_html)
-
-    with gr.Row():
+with gr.Row():
         gr.Markdown("<h1>🖼️ Image Processor</h1>")
 
     with gr.Row():
+        # ─── Left column: Inputs ────────────────────────────────
         with gr.Column(scale=3):
             with gr.Group(elem_classes="panel"):
                 mode_toggle = gr.Radio(
-                    ["📄 Upload Workbook", "📤 Upload Images"],
+                    ["📄 Upload Workbook", "📁 Upload Images"],
                     value="📄 Upload Workbook",
                     label="Select Input Method"
                 )
 
-                workbook_upload = gr.File(
-                    label="📂 Upload .xlsx/.xlsm Workbook",
-                    file_types=['.xlsx', '.xlsm'],
+                workbook_input = gr.File(
+                    label="📄 Upload .xlsx or .xlsm",
+                    file_types=[".xlsx", ".xlsm"],
                     visible=True
                 )
-                status = gr.Textbox(
-                    label="📣 Status", lines=6, interactive=False, elem_id="status-box"
-                )
 
                 upload_box = gr.File(
-                    label="📁 Upload Images", file_count="multiple", visible=False
+                    label="📁 Upload Images",
+                    file_count="multiple",
+                    visible=False
                 )
                 image_url_input = gr.Textbox(
-                    label="🌐 Paste Image URL", visible=False
+                    label="🌐 Paste Image URLs",
+                    visible=False
                 )
 
+                # toggle visibility
                 def toggle_inputs(choice):
-                    is_workbook = choice.startswith("📄")
-                    return (
-                        gr.update(visible=is_workbook),
-                        gr.update(visible=not is_workbook),
-                        gr.update(visible=not is_workbook)
-                    )
-
+                    if choice == "📄 Upload Workbook":
+        # show only the sheet‐uploader
+                        return (
+                            gr.update(visible=True),   # workbook_input
+                            gr.update(visible=False),  # upload_box
+                            gr.update(visible=False)   # image_url_input
+                        )
+                    else:
+        # show BOTH the image uploader AND the URL textbox
+                        return (
+                            gr.update(visible=False),  # workbook_input
+                            gr.update(visible=True),   # upload_box
+                            gr.update(visible=True)    # image_url_input
+                        )
                 mode_toggle.change(
                     fn=toggle_inputs,
                     inputs=[mode_toggle],
-                    outputs=[workbook_upload, upload_box, image_url_input]
-                )
-
-                workbook_upload.change(
-                    fn=read_uploaded_workbook,
-                    inputs=[workbook_upload],
-                    outputs=[image_data_state, status]
+                    outputs=[workbook_input, upload_box, image_url_input]
                 )
 
-                upload_box.change(
-                    lambda files: f"{len(files)} files ready." if files else "No files selected",
-                    [upload_box],
-                    [status]
-                )
+            process_btn_url = gr.Button("⚙️ Process", elem_id="process-btn-url")
 
             with gr.Group(elem_classes="panel"):
-                format_choice = gr.Dropdown(
-                    ["JPEG", "PNG", "WEBP", "TIFF", "GIF", "JFIF", "AVIF"],
-                    label="🖼️ Format", value="JPEG", scale=1
-                )
-                width = gr.Number(label=" Width (px)", value=1000, precision=0, scale=1)
-                height = gr.Number(label=" Height (px)", value=1000, precision=0, scale=1)
+                with gr.Row():
+                    format_choice = gr.Dropdown(
+                        ["JPEG", "PNG", "WEBP", "TIFF", "GIF", "JFIF", "AVIF"],
+                        label="🖼️ Format",
+                        value="JPEG",
+                        scale=1
+                    )
+                    width = gr.Number(
+                        label="📏 Width (px)",
+                        value=1000,
+                        precision=0,
+                        scale=1
+                    )
+                    height = gr.Number(
+                        label="📐 Height (px)",
+                        value=1000,
+                        precision=0,
+                        scale=1
+                    )
 
+        # ─── Right column: Outputs ──────────────────────────────
         with gr.Column(scale=2):
             with gr.Group(elem_classes="panel"):
+                status           = gr.Textbox(
+                    label="📣 Status",
+                    lines=6,
+                    interactive=False,
+                    elem_id="status-box"
+                )
                 zip_download_btn = gr.Button("📦 Download ZIP")
-                zip_file_hidden = gr.File(visible=False)
-                with gr.Accordion("🧷 Individual Files", open=False):
-                    single_downloads = gr.File(label="Files", file_count="multiple")
+                zip_file_hidden  = gr.File(visible=False)
+
+                with gr.Accordion("🧷 Batch Individual Files", open=False):
+                    single_downloads = gr.File(
+                        label="Files",
+                        file_count="multiple"
+                    )
 
             with gr.Row(elem_classes="btn-row"):
-                stop_btn = gr.Button("Stop", elem_id="stop-btn")
-                clear_btn = gr.Button("Clear", elem_id="clear-btn")
-
-    gr.Markdown("<center style='margin-top:1rem;color:white'>Created with 💜 by Vishakha</center>")
-
-    process_btn = gr.Button("⚙️ Process", elem_id="process-btn-url")
-    process_btn.click(
-        fn=lambda mode, sd, ups, pu, fmt, w, h: (
-            process_url_images(sd, fmt, w, h) if mode.startswith("📄") and sd else
-            process_uploaded_images(ups, fmt, w, h) if mode.startswith("📤") and ups else
-            process_single_url_image(pu, fmt, w, h) if pu.strip() else
-            ([], None, "⚠️ No valid input provided", None)
-        ),
-        inputs=[mode_toggle, image_data_state, upload_box, image_url_input, format_choice, width, height],
-        outputs=[single_downloads, zip_file_hidden, status, temp_dir_state]
+                stop_btn  = gr.Button("⛔ Stop", elem_id="stop-btn")
+                clear_btn = gr.Button("🗑️ Clear", elem_id="clear-btn")
+
+    gr.HTML("<center style='margin-top:1rem; color:white;'>Created with 💜 by Vishakha</center>")
+
+
+    # ─── Dispatch callback ───────────────────────────────────
+        # ─── Dispatch callback ───────────────────────────────────
+    def dispatch(mode, wb, uploads, url, fmt, w, h):
+        if mode == "📄 Upload Workbook":
+            files, zip_path, msg = handle_batch(wb, fmt, w, h)
+            return files, zip_path, msg
+        else:
+            if uploads:
+                files, fpath, msg = handle_single_upload(uploads, fmt, w, h)
+            else:
+                files, fpath, msg = handle_single_url(url, fmt, w, h)
+            return ([fpath] if fpath else []), None, msg
+
+
+    # ─── Wire up the Process button here ───────────────────
+    process_btn_url.click(
+        fn=dispatch,
+        inputs=[
+            mode_toggle,
+            workbook_input,
+            upload_box,
+            image_url_input,
+            format_choice,
+            width,
+            height
+        ],
+        outputs=[
+            single_downloads,
+            zip_file_hidden,
+            status
+        ]
     )
 
     zip_download_btn.click(
         None,
         inputs=[zip_file_hidden],
-        js="(file) => { if (file) { window.open(file.url, '_blank'); } }"
+        js="(file) => { if (file) window.open(file.url,'_blank'); }"
     )
 
-    def clear_all(tmp_dir):
-        if tmp_dir and os.path.exists(tmp_dir):
-            shutil.rmtree(tmp_dir)
-        return "", [], [], gr.update(visible=False), [], "Cleared.", None, ""
-
     clear_btn.click(
-        clear_all,
-        [temp_dir_state],
-        [
-            workbook_upload,
-            image_data_state,
-            upload_box,
-            zip_file_hidden,
-            single_downloads,
-            status,
-            temp_dir_state,
-            image_url_input
+        fn=do_clear,
+        inputs=[temp_dir_state],
+        outputs=[
+          workbook_input,
+          image_data_state,
+          upload_box,
+          zip_file_hidden,
+          single_downloads,
+          status,
+          temp_dir_state
         ]
     )
 
-    def stop_processing():
-        stop_event.set()
-        return "🛑 Stop signal sent"
-
-    stop_btn.click(stop_processing, outputs=[status])
-
 if __name__ == "__main__":
     demo.queue().launch(debug=True)