Update app.py

app.py

@@ -363,19 +363,19 @@ 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, output_folder):
-    try:
-        # 创建输出文件夹（如果不存在）
-        os.makedirs(output_folder, exist_ok=True)
+            
+def process_line(input_files):
+    output_folder = "/app/output"  # 默认输出路径
+    os.makedirs(output_folder, exist_ok=True)
 
-        # 存储处理后的图片路径
-        processed_images = []
+    processed_images = []
+    errors = []
 
-        # 遍历所有输入文件
+    try:
         for img_path in input_files:
             img_path = img_path.name  # 获取文件路径
 
-            # 处理图片的函数调用
+            # 调用处理函数
             depth_anything(img_path, os.path.join(output_folder, "depth_anything"))
             teed_imgs(img_path, os.path.join(output_folder, "teed_imgs"), [1, 7, 2])
             teed_imgs(os.path.join(output_folder, "depth_anything"), os.path.join(output_folder, "dp_teed_imgs"), [0, 7, 2])
@@ -390,32 +390,32 @@ def process_line(input_files, output_folder):
                             for f in os.listdir(os.path.join(output_folder, "merged_imgs"))
                             if f.lower().endswith(('.jpg', '.jpeg', '.png'))]
 
-        return processed_images, ""  # 返回处理后的图片路径和空错误信息
-    except Exception as e:
-        return [], f"发生错误: {str(e)}"  # 返回空图片和错误信息
+        # 将处理后的图片压缩成 ZIP
+        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))
 
+        return zip_file_path, ""  # 返回 ZIP 文件路径和空错误信息
+    except Exception as e:
+        return "", f"发生错误: {str(e)}"  # 返回空和错误信息
 
 def launch_interface():
     with gr.Blocks() as demo:
         # 允许用户选择多张图片
         input_files = gr.File(label="选择输入图片", file_count="multiple", type="filepath")
 
-        # 手动输入输出文件夹路径
-        output_folder = gr.Textbox(label="输出文件夹路径", placeholder="请输入输出文件夹路径", lines=1)
-
         submit_button = gr.Button("开始处理")
 
-        # 显示处理后的图片
-        output_gallery = gr.Gallery(label="处理后的图片", show_label=True, height='auto')
-
+        # 显示处理后的文件下载链接
+        output_file = gr.File(label="下载处理后的文件")
         # 显示错误信息
         error_text = gr.Textbox(label="错误信息", interactive=False, visible=False)
 
         # 点击按钮时调用 process_line 函数
-        submit_button.click(process_line, inputs=[input_files, output_folder], outputs=[output_gallery, error_text])
+        submit_button.click(process_line, inputs=[input_files], outputs=[output_file, error_text])
 
     demo.launch(share=True)
 
-
 if __name__ == "__main__":
     launch_interface()