Update app.py

app.py

@@ -365,9 +365,6 @@ def process_images(input_folder='./output/merged_imgs'):
             print(f"Error processing file {image_file}: {e}")
             
 def process_line(input_files):
-    output_folder = "/app/output"  # 默认输出路径
-    os.makedirs(output_folder, exist_ok=True)
-
     processed_images = []
     errors = []
 
@@ -376,22 +373,17 @@ def process_line(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])
-            merge_images_in_2_folder(os.path.join(output_folder, "teed_imgs"),
-                                      os.path.join(output_folder, "dp_teed_imgs"),
-                                      os.path.join(output_folder, "merged_imgs"),
-                                      '_depth', 1, 'multiply', [[2, 0], [2, 1]], [1, 0])
-            process_images(os.path.join(output_folder, "merged_imgs"))
-
-        # 获取 merged_imgs 中的图片路径
-        processed_images = [os.path.join(output_folder, "merged_imgs", f)
-                            for f in os.listdir(os.path.join(output_folder, "merged_imgs"))
-                            if f.lower().endswith(('.jpg', '.jpeg', '.png'))]
+            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")
 
         # 将处理后的图片压缩成 ZIP
-        zip_file_path = os.path.join(output_folder, "processed_images.zip")
+        zip_file_path = "processed_images.zip"
         with zipfile.ZipFile(zip_file_path, 'w') as zipf:
             for image in processed_images:
                 zipf.write(image, os.path.basename(image))