Update app.py

app.py

@@ -4,9 +4,12 @@
 # 输出图片
 # 使用 depth-anything + teed 生成外轮廓
 # 使用 teed + 腐蚀算法 生成内边缘
+import zipfile
+
 from PIL import Image
 
 import cv2
+import cv2_ext
 import numpy as np
 import gradio as gr
 import os
@@ -363,33 +366,51 @@ def process_images(input_folder='./output/merged_imgs'):
                     raise ValueError(f"Failed to read image: {image_file}")
         except Exception as e:
             print(f"Error processing file {image_file}: {e}")
-            
 def process_line(input_files):
-    processed_images = []
-    errors = []
-
     try:
+        # 创建临时输出文件夹
+        output_folder = "temp_output"
+        os.makedirs(output_folder, exist_ok=True)
+
+        # 存储处理后的图片路径
+        processed_images = []
+
+        # 遍历所有输入文件
         for img_path in input_files:
             img_path = img_path.name  # 获取文件路径
-            # 调用处理函数
-            depth_anything(img_path, "depth_anything_output.jpg")  # 直接指定输出文件名
-            teed_imgs(img_path, "teed_imgs_output.jpg", [1, 7, 2])
-            teed_imgs("depth_anything_output.jpg", "dp_teed_imgs_output.jpg", [0, 7, 2])
-            merge_images_in_2_folder("teed_imgs_output.jpg", "dp_teed_imgs_output.jpg", "merged_imgs_output.jpg", '_depth', 1, 'multiply', [[2, 0], [2, 1]], [1, 0])
-            process_images("merged_imgs_output.jpg")
 
-        # 假设 merged_imgs_output.jpg 是处理后的输出文件
-        processed_images.append("merged_imgs_output.jpg")
+            # 处理图片的文件夹
+            depth_folder = os.path.join(output_folder, "depth_anything")
+            teed_folder = os.path.join(output_folder, "teed_imgs")
+            dp_teed_folder = os.path.join(output_folder, "dp_teed_imgs")
+            merged_folder = os.path.join(output_folder, "merged_imgs")
+
+            # 创建每个处理步骤的文件夹
+            os.makedirs(depth_folder, exist_ok=True)
+            os.makedirs(teed_folder, exist_ok=True)
+            os.makedirs(dp_teed_folder, exist_ok=True)
+            os.makedirs(merged_folder, exist_ok=True)
 
-        # 将处理后的图片压缩成 ZIP
-        zip_file_path = "processed_images.zip"
+            # 调用处理函数
+            depth_anything(img_path, depth_folder)
+            teed_imgs(img_path, teed_folder, [1, 7, 2])
+            teed_imgs(depth_folder, dp_teed_folder, [0, 7, 2])
+            merge_images_in_2_folder(teed_folder, dp_teed_folder, merged_folder, '_depth', 1, 'multiply', [[2, 0], [2, 1]], [1, 0])
+            process_images(merged_folder)
+
+        # 创建压缩包
+        zip_file_path = os.path.join(output_folder, "processed_images.zip")
         with zipfile.ZipFile(zip_file_path, 'w') as zipf:
-            for image in processed_images:
-                zipf.write(image, os.path.basename(image))
+            # 将每个步骤的文件夹添加到压缩包中
+            for folder in [depth_folder, teed_folder, dp_teed_folder, merged_folder]:
+                for root, _, files in os.walk(folder):
+                    for file in files:
+                        zipf.write(os.path.join(root, file), os.path.relpath(os.path.join(root, file), output_folder))
 
-        return zip_file_path, ""  # 返回 ZIP 文件路径和空错误信息
+        return [zip_file_path], ""  # 返回压缩包路径和空错误信息
     except Exception as e:
-        return "", f"发生错误: {str(e)}"  # 返回空和错误信息
+        return [], f"发生错误: {str(e)}"  # 返回空图片和错误信息
+
 
 def launch_interface():
     with gr.Blocks() as demo: