Update app.py

app.py

@@ -1,109 +1,98 @@
 import gradio as gr
-from PIL import Image
-import os
-import shutil
-import random
-
-def process_transparent_image(image, padding_color):
-    """Handle images with transparency by converting transparent areas to a solid color."""
-    if image.mode in ("RGBA", "LA") or (image.mode == "P" and "transparency" in image.info):
-        alpha = image.convert("RGBA").getchannel("A")  # Extract the alpha channel
-        background = Image.new("RGBA", image.size, padding_color + (255,))
-        background.paste(image, mask=alpha)  # Paste with transparency mask
-        return background.convert("RGB")  # Convert back to RGB
-    return image.convert("RGB")  # For non-transparent images
-
-def resize_and_pad(image, target_size):
-    """Resize the image and pad it to match target size."""
-    padding_color = (255, 255, 255) if random.choice([True, False]) else (0, 0, 0)
-    img = process_transparent_image(image, padding_color)
-
-    aspect_ratio = img.width / img.height
-    target_aspect_ratio = target_size[0] / target_size[1]
-
-    if aspect_ratio > target_aspect_ratio:
-        new_width = target_size[0]
-        new_height = int(new_width / aspect_ratio)
-    else:
-        new_height = target_size[1]
-        new_width = int(new_height * aspect_ratio)
-
-    img = img.resize((new_width, new_height), Image.Resampling.LANCZOS)
-
-    new_img = Image.new("RGB", target_size, padding_color)
-    offset = ((target_size[0] - new_width) // 2, (target_size[1] - new_height) // 2)
-    new_img.paste(img, offset)
-    return new_img
-
-def combine_images(images, target_size=(2048, 2048)):
-    """Combine four images into a single one."""
-    num_images = len(images)
-    output_images = []
-
-    for i in range(0, num_images, 4):
-        group = images[i:i+4]
-        if len(group) < 4:
-            continue
-
-        resized_images = [resize_and_pad(img, (512, 512)) for img in group]
-        combined_img = Image.new("RGB", (1024, 1024), (0, 0, 0))
-        combined_img.paste(resized_images[0], (0, 0))
-        combined_img.paste(resized_images[1], (512, 0))
-        combined_img.paste(resized_images[2], (0, 512))
-        combined_img.paste(resized_images[3], (512, 512))
-
-        if combined_img.width > target_size[0] or combined_img.height > target_size[1]:
-            combined_img = combined_img.resize(target_size, Image.Resampling.LANCZOS)
-
-        output_images.append(combined_img)
-
-    return output_images
-
-def process_images(uploaded_images):
-    """Main processing function."""
-    images = [Image.open(img) for img in uploaded_images]
-    combined_images = combine_images(images)
-
-    # Save combined images
-    output_dir = "output_images"
-    os.makedirs(output_dir, exist_ok=True)
-    for idx, img in enumerate(combined_images):
-        output_path = os.path.join(output_dir, f"combined_{idx + 1}.png")
-        img.save(output_path)
-
-    zip_path = "combined_images.zip"
-    shutil.make_archive("combined_images", 'zip', output_dir)
-    return combined_images, zip_path
-
-# Gradio UI
-def main_interface():
-    with gr.Blocks(css=".gradio-container { height: 100vh; }") as interface:
-        with gr.Row():
-            gr.Markdown("### Image Resizer and Combiner")
-
-        with gr.Row():
-            with gr.Column(scale=1, elem_id="left-panel"):
-                uploaded_files = gr.Files(file_types=["image"], label="Upload Images", interactive=True)
-                combine_button = gr.Button("Combine and Process", elem_id="combine-button")
-
-            with gr.Column(scale=2, elem_id="right-panel"):
-                preview_gallery = gr.Gallery(label="Preview Combined Images", columns=3, elem_id="preview-gallery")
-                download_zip_button = gr.Button("Download ZIP", elem_id="download-zip", visible=False)
-                output_zip = gr.File(label="Download Combined ZIP", visible=False)
-
-        # Button actions
-        combine_button.click(
-            process_images,
-            inputs=[uploaded_files],
-            outputs=[preview_gallery, output_zip],
-        )
-
-        download_zip_button.click(
-            lambda zip_path: zip_path,
-            inputs=[output_zip],
-            outputs=[output_zip],
-        )
-
-    return interface
-
-main_interface().launch()
+import io
+import zipfile
+
+# 自定义CSS，固定左右面板的大小 & 按钮样式
+CUSTOM_CSS = """
+/* 左侧面板 */
+#left-panel {
+    width: 300px;
+    height: 400px;      /* 固定高度，你可根据需求调整 */
+    overflow-y: auto;   /* 超出时滚动 */
+    border-right: 1px solid #ccc;
+    padding: 10px;
+    box-sizing: border-box;
+}
+
+/* 右侧面板 */
+#right-panel {
+    width: 300px;
+    height: 400px;      /* 固定高度 */
+    overflow-y: auto;
+    border-left: 1px solid #ccc;
+    padding: 10px;
+    box-sizing: border-box;
+}
+
+/* 合并按钮 */
+#combine-button {
+    background-color: orange;
+    color: white;
+    font-size: 16px;
+    border-radius: 5px;
+    border: none;
+    padding: 10px 20px;
+    cursor: pointer;
+}
+
+/* 下载ZIP按钮 */
+#download-zip {
+    background-color: blue;
+    color: white;
+    font-size: 16px;
+    border-radius: 5px;
+    border: none;
+    padding: 10px 20px;
+    cursor: pointer;
+}
+"""
+
+def combine_action():
+    """
+    合并按钮点击后，你可以在这里执行实际逻辑。
+    下面仅示例返回一个字符串或做一个简单处理。
+    """
+    print("合并逻辑被触发！")
+    return "已合并（此处可替换为实际处理逻辑）"
+
+def create_zip():
+    """
+    动态生成并返回一个 zip 文件（内存中）。
+    Gradio 会将返回的 BytesIO 作为 File 下载。
+    """
+    buf = io.BytesIO()
+    with zipfile.ZipFile(buf, 'w') as zf:
+        # 往 zip 中写一个示例文件
+        zf.writestr("test.txt", "这是一个测试文件！\nHello World!")
+    buf.seek(0)
+    return buf  # 返回内存中的 zip
+
+with gr.Blocks(css=CUSTOM_CSS) as demo:
+    # 主布局
+    with gr.Row():
+        # 左侧面板
+        with gr.Box(elem_id="left-panel"):
+            gr.Markdown("**上传区域**")
+            uploader = gr.File(label="在此处上传文件")
+
+        # 右侧面板
+        with gr.Box(elem_id="right-panel"):
+            gr.Markdown("**结果缩略图**")
+            gr.Markdown("这里可以放置处理后的缩略图或任何输出")
+
+    # 底部按钮
+    with gr.Row():
+        combine_btn = gr.Button("合并", elem_id="combine-button")
+        download_btn = gr.Button("下载 Zip", elem_id="download-zip")
+
+    # 点击“合并”时（这里仅做一个演示）
+    combine_btn.click(fn=combine_action, inputs=[], outputs=[])
+
+    # 准备一个隐藏的 File 组件，用来承载生成的 zip 文件
+    # 一旦函数返回文件，该组件就会显示“下载链接”
+    zip_file = gr.File(label="点此下载生成的 ZIP", visible=False)
+
+    # 点击“下载 Zip”时，调用 create_zip，输出到 zip_file
+    download_btn.click(fn=create_zip, inputs=[], outputs=zip_file)
+
+demo.launch()