Update app.py

app.py

@@ -233,29 +233,30 @@ def depth_anything(img_path = './input', outdir = './output/depth_anything', enc
             
             cv2.imwrite(os.path.join(outdir, filename[:filename.rfind('.')] + '_img_depth.png'), final_result)
 
-def teed_imgs(img_path = './input', outdir = './output/teed_imgs',gaussianBlur = [0,3,0]):
-    args, train_info = parse_args(is_testing=True, pl_opt_dir=outdir)
+def teed_imgs(img_path='./input', outdir='./output/teed_imgs', gaussianBlur=[0, 3, 0]):
+    os.makedirs(outdir, exist_ok=True)
     os.makedirs('teed_tmp', exist_ok=True)
+
+    # 处理上传的单个图片
     if os.path.isfile(img_path):
-        name, extension = os.path.splitext(img_path)
-        if extension:
-            if extension.lower() == 'txt':
-                with open(img_path, 'r',encoding= 'utf-8') as f:
-                    filenames = f.read().splitlines()
-            elif extension.lower() in ['.jpg', '.jpeg', '.png', '.gif', '.bmp', '.tiff', '.webp','tif']:
-                filenames = [img_path]
+        filenames = [img_path]
     else:
         filenames = os.listdir(img_path)
-        filenames = [os.path.join(img_path, filename) for filename in filenames if not filename.startswith('.') and filename.lower().endswith(('.jpg', '.jpeg', '.png', '.gif', '.bmp', '.tiff', '.webp','tif'))]
+        filenames = [os.path.join(img_path, filename) for filename in filenames if not filename.startswith('.') and filename.lower().endswith(('.jpg', '.jpeg', '.png', '.gif', '.bmp', '.tiff', '.webp', 'tif'))]
         filenames.sort()
+
     for filename in tqdm(filenames):
         if gaussianBlur[0] != 0:
             img = cv2.imread(filename)
-            img = cv2.GaussianBlur(img, (gaussianBlur[1],gaussianBlur[1]), gaussianBlur[2])
+            img = cv2.GaussianBlur(img, (gaussianBlur[1], gaussianBlur[1]), gaussianBlur[2])
             cv2.imwrite(os.path.join('teed_tmp', os.path.basename(filename)), img)
         else:
-            copy_file(filename, 'teed_tmp')
+            shutil.copy(filename, 'teed_tmp')
+
+    # 这里调用您的其他处理代码
+    args, train_info = parse_args(is_testing=True, pl_opt_dir=outdir)
     teed.main(args, train_info)
+
     shutil.rmtree('teed_tmp')
 
 def merge_2_images(img1, img2, mode, erosion_para = [[0,0],[0,0]], dilate = [0,0]): #将 img1 合并至 img2，调整大小与 img2 相同
@@ -342,11 +343,26 @@ def process_images(input_folder='./output/merged_imgs'):
             print(f"Error processing file {image_file}: {e}")
 
 def process_line(img_path='./input', outdir='./output'):
+    # 处理深度图像
     depth_anything(img_path, os.path.join(outdir, "depth_anything"))
+
+    # 处理 teed_imgs
     teed_imgs(img_path, os.path.join(outdir, "teed_imgs"), [1, 7, 2])
+    
+    # 处理深度图的 teed_imgs
     teed_imgs(os.path.join(outdir, "depth_anything"), os.path.join(outdir, "dp_teed_imgs"), [0, 7, 2])
-    merge_images_in_2_folder(os.path.join(outdir, "teed_imgs"), os.path.join(outdir, "dp_teed_imgs"), os.path.join(outdir, "merged_imgs"), '_depth', 1, 'multiply', [[2, 0], [2, 1]], [1, 0])
-    process_images(os.path.join(outdir, "merged_imgs"))  # 处理merged_imgs文件夹中的图片
+    
+    # 合并图像
+    merge_images_in_2_folder(
+        os.path.join(outdir, "teed_imgs"),
+        os.path.join(outdir, "dp_teed_imgs"),
+        os.path.join(outdir, "merged_imgs"),
+        '_depth',
+        1,
+        'multiply',
+        [[2, 0], [2, 1]],
+        [1, 0]
+    )
 
 
 
@@ -357,16 +373,14 @@ if __name__ == '__main__':
     from PIL import Image
 
     def gradio_process_line(img):
-        # 保存输入图像到临时文件
-        img_path = './temp_input.png'
-        img.save(img_path)
+    img_path = './temp_input.png'
+    img.save(img_path)
+
+    process_line(img_path, './output')
 
-        # 调用处理函数
-        process_line(img_path, './output')
+    output_image_path = './output/teed_imgs/processed_image.png'  # 更新为实际输出路径
+    return Image.open(output_image_path)
 
-        # 返回输出图像
-        output_image_path = './output/merged_imgs/your_final_image_name.png'  # 修改为实际输出路径
-        return Image.open(output_image_path)
 
     # 定义 Gradio 接口
     iface = gr.Interface(
@@ -378,7 +392,7 @@ if __name__ == '__main__':
     )
 
     # 启动 Gradio 应用
-    iface.launch(share=True)
+    iface.launch()