Update app.py

app.py

@@ -3,7 +3,7 @@ import numpy as np
 import fitz  # PyMuPDF
 from PIL import Image
 
-# 設定常數
+# 設定
 OUTPUT_DIR = "output"
 ZIP_PATH = os.path.join(OUTPUT_DIR, "results.zip")
 BG_PATH = "background.jpg"
@@ -11,41 +11,34 @@ TARGET_WIDTH, TARGET_HEIGHT = 2133, 1200
 POS1 = (1032, 0)
 POS2 = (4666, 0)
 
-# 檢查並建立資料夾
+# 檢查資料夾
 def ensure_dir(path):
     os.makedirs(path, exist_ok=True)
     if not os.access(path, os.W_OK):
         raise RuntimeError(f"❌ 無法寫入：{path}")
 ensure_dir(OUTPUT_DIR)
 
-# PDF 轉圖片（PyMuPDF）
-def pdf_to_images(file):
+# PDF轉圖片
+def pdf_to_images(pdf_file):
     images = []
-    doc = fitz.open(file.name)
-    for page in doc:
-        pix = page.get_pixmap(matrix=fitz.Matrix(2, 2), colorspace=fitz.csRGB)
-        img = np.frombuffer(pix.samples, dtype=np.uint8).reshape(pix.height, pix.width, 3)
-        images.append(img)
+    with fitz.open(pdf_file.name) as doc:
+        for page in doc:
+            pix = page.get_pixmap(matrix=fitz.Matrix(2, 2), colorspace=fitz.csRGB)
+            img = Image.frombytes("RGB", [pix.width, pix.height], pix.samples)
+            images.append(img)
     return images
 
-# 圖像合成功能
+# 合成圖像
 def overlay_image(bg, fg_img, x, y):
-    fg = cv2.resize(np.array(fg_img), (TARGET_WIDTH, TARGET_HEIGHT), interpolation=cv2.INTER_AREA)
-    if fg.shape[2] == 4:
-        alpha = fg[:, :, 3] / 255.0
-        for c in range(3):
-            bg[y:y+TARGET_HEIGHT, x:x+TARGET_WIDTH, c] = (
-                alpha * fg[:, :, c] + (1 - alpha) * bg[y:y+TARGET_HEIGHT, x:x+TARGET_WIDTH, c]
-            )
-    else:
-        bg[y:y+TARGET_HEIGHT, x:x+TARGET_WIDTH] = fg
+    fg = fg_img.resize((TARGET_WIDTH, TARGET_HEIGHT), resample=Image.BILINEAR)
+    fg = np.array(fg)
+    bg[y:y+TARGET_HEIGHT, x:x+TARGET_WIDTH] = fg[:, :, :3]
     return bg
 
-# 主處理邏輯
+# 合成 + 壓縮
 def process_and_combine(images, prefix):
-    bg = cv2.imread(BG_PATH)
-    if bg is None:
-        raise gr.Error("❌ 無法讀取 background.jpg")
+    bg_pil = Image.open(BG_PATH).convert("RGB")
+    bg = np.array(bg_pil)
 
     for f in os.listdir(OUTPUT_DIR):
         if f.endswith(".jpg"):
@@ -56,9 +49,8 @@ def process_and_combine(images, prefix):
         combined = overlay_image(bg.copy(), img, *POS1)
         combined = overlay_image(combined, img, *POS2)
         output_path = os.path.join(OUTPUT_DIR, f"{prefix}{i:03d}.jpg")
-        cv2.imwrite(output_path, combined)
+        cv2.imwrite(output_path, cv2.cvtColor(combined, cv2.COLOR_RGB2BGR))
         results.append((output_path, f"{prefix}{i:03d}"))
-
         if i % 10 == 0:
             gc.collect()
 
@@ -69,10 +61,9 @@ def process_and_combine(images, prefix):
         for f in sorted(os.listdir(OUTPUT_DIR)):
             if f.endswith(".jpg"):
                 zipf.write(os.path.join(OUTPUT_DIR, f), arcname=f)
+    return results, ZIP_PATH, f"✅ 共合成 {len(results)} 張圖，已打包 ZIP"
 
-    return results, ZIP_PATH, f"✅ 共合成 {len(results)} 張圖片，已打包 ZIP"
-
-# 處理輸入
+# 主流程
 def process_inputs(files, prefix):
     prefix = prefix.strip() or "result_"
     images = []
@@ -81,27 +72,32 @@ def process_inputs(files, prefix):
         if name.endswith(".pdf"):
             images.extend(pdf_to_images(file))
         elif name.endswith((".png", ".jpg", ".jpeg")):
-            img = Image.open(file).convert("RGBA")
+            img = Image.open(file)
+            if img.mode != "RGB":
+                img = img.convert("RGB")
             images.append(img)
         else:
             raise gr.Error(f"不支援的檔案格式：{name}")
     return process_and_combine(images, prefix)
 
-# Gradio Blocks UI
-with gr.Blocks(title="PDF與圖片合成工具") as demo:
-    gr.Markdown("### 📄🖼️ PDF / 圖片 雙輸入合成工具（背景為 7872x1200）")
-
-    with gr.Row():
-        files = gr.Files(label="📎 上傳 PDF 或圖片", file_types=[".pdf", ".jpg", ".jpeg", ".png"])
-        prefix = gr.Textbox(label="輸出檔名前綴", placeholder="例如：poster_", value="result_")
-        run_btn = gr.Button("🚀 開始合成", variant="primary")
-
-    with gr.Row():
-        gallery = gr.Gallery(label="🖼️ 預覽", columns=3, height="auto")
-        zip_file = gr.File(label="⬇️ 下載 ZIP")
-        log = gr.Textbox(label="📄 日誌", interactive=False)
-
-    run_btn.click(fn=process_inputs, inputs=[files, prefix], outputs=[gallery, zip_file, log])
+# Gradio UI with Interface
+def ui_interface(files, prefix):
+    return process_inputs(files, prefix)
+
+demo = gr.Interface(
+    fn=ui_interface,
+    inputs=[
+        gr.File(label="📎 上傳 PDF 或圖片", file_types=[".pdf", ".png", ".jpg", ".jpeg"], multiple=True),
+        gr.Textbox(label="檔名前綴（可選）", placeholder="例如：poster_")
+    ],
+    outputs=[
+        gr.Gallery(label="🖼️ 預覽", columns=3, height="auto"),
+        gr.File(label="⬇️ 下載 ZIP"),
+        gr.Textbox(label="📄 日誌")
+    ],
+    title="PDF 圖片合成���具",
+    description="📄🖼️ 將 PDF 或圖片套用背景合成為長圖，背景為固定寬度 7872x1200。"
+)
 
 if __name__ == "__main__":
     demo.launch()