test

Dockerfile

@@ -35,6 +35,9 @@ ENV MPLCONFIGDIR=/tmp/matplotlib
 RUN mkdir -p /.fonts /.config /app/models && \
     chmod -R 777 /.fonts /.config /app/models
 
+RUN mkdir -p /app/flagged && chmod 777 /app/flagged
+
+
 # 创建非 root 用户
 RUN useradd -m appuser
 USER appuser

app.py

@@ -22,7 +22,8 @@ iface = gr.Interface(
     ],
     outputs=gr.Image(type="filepath", label="Output Image"),
     title="Face Swapper",
-    description="Upload a source face and a target image to swap faces."
+    description="Upload a source face and a target image to swap faces.",
+    flagging_dir="/app/flagged"
 )
 
 iface.launch()

modules/core.py

@@ -18,6 +18,7 @@ import tensorflow
 import modules.globals
 import modules.metadata
 import modules.ui as ui
+import modules.ui2 as ui2
 from modules.processors.frame.core import get_frame_processors_modules
 from modules.utilities import has_image_extension, is_image, is_video, detect_fps, create_video, extract_frames, get_temp_frame_paths, restore_audio, create_temp, move_temp, clean_temp, normalize_output_path
 
@@ -167,12 +168,9 @@ def pre_check() -> bool:
 
 
 def update_status(message: str, scope: str = 'DLC.CORE') -> None:
-    if 'DISPLAY' in os.environ:
-        # GUI 环境
+    print(f'[{scope}] {message}')
+    if not modules.globals.headless:
         ui.update_status(message)
-    else:
-        # 非 GUI 环境
-        print(f"[{scope}] {message}")
 
 def start() -> None:
     for frame_processor in get_frame_processors_modules(modules.globals.frame_processors):
@@ -254,5 +252,5 @@ def run() -> None:
     if modules.globals.headless:
         start()
     else:
-        window = ui.init(start, destroy)
-        window.mainloop()
+        demo = ui2.create_ui(start, destroy)
+        demo.launch()

modules/ui2.py

@@ -0,0 +1,132 @@
+import os
+import webbrowser
+import customtkinter as ctk
+from typing import Callable, Tuple
+import cv2
+from PIL import Image, ImageOps
+import tkinterdnd2 as tkdnd
+import gradio as gr
+import traceback
+import logging
+import io
+
+import modules.globals
+import modules.metadata
+from modules.face_analyser import (
+    get_one_face,
+    get_unique_faces_from_target_image,
+    get_unique_faces_from_target_video,
+    add_blank_map,
+    has_valid_map,
+    simplify_maps,
+)
+from modules.capturer import get_video_frame, get_video_frame_total
+from modules.processors.frame.core import get_frame_processors_modules
+from modules.utilities import (
+    is_image,
+    is_video,
+    resolve_relative_path,
+    has_image_extension,
+)
+import gradio as gr
+
+# 创建一个StringIO对象来捕获日志
+log_capture_string = io.StringIO()
+logging.basicConfig(stream=log_capture_string, level=logging.INFO, 
+                    format='%(asctime)s - %(levelname)s - %(message)s')
+
+def create_ui(start, destroy):
+    # 使用gr.State来存储文件路径，给予初始值
+    source_path = gr.State(value="")
+    target_path = gr.State(value="")
+
+    def process(src_path, tgt_path):
+        """
+        处理源图像和目标图像/视频
+        
+        参数:
+        src_path (str): 源图像路径
+        tgt_path (str): 目标图像/视频路径
+        
+        返回:
+        tuple: (处理结果信息, 错误日志)
+        """
+        try:
+            if src_path and tgt_path:
+                logging.info(f"源路径: {src_path}")
+                logging.info(f"目标路径: {tgt_path}")
+                modules.globals.source_path = src_path
+                modules.globals.target_path = tgt_path
+                logging.info("开始处理...")
+                start()
+                return "处理完成", error_log_capture.getvalue()
+            else:
+                return "请先选择源图像和目标图像/视频", ""
+        except Exception as e:
+            error_msg = f"处理过程中出错: {str(e)}\n{traceback.format_exc()}"
+            logging.error(error_msg)
+            return "处理失败", error_log_capture.getvalue()
+
+    def update_source(image):
+        """
+        更新源图像
+        
+        参数:
+        image (PIL.Image): 上传的图像
+        
+        返回:
+        str: 更新后的源图像路径
+        """
+        if image is not None:
+            temp_path = "temp_source.png"
+            image.save(temp_path)
+            return temp_path
+        return ""
+
+    def update_target(file):
+        """
+        更新目标文件并生成预览
+        
+        参数:
+        file (UploadedFile): 上传的文件对象
+        
+        返回:
+        tuple: (文件路径, 预览图像路径, 预览可见性更新)
+        """
+        if file is not None:
+            file_path = file.name
+            if is_image(file_path):
+                return file_path, file_path, gr.update(visible=True)
+            elif is_video(file_path):
+                video = cv2.VideoCapture(file_path)
+                success, frame = video.read()
+                if success:
+                    preview_path = "temp_preview.jpg"
+                    cv2.imwrite(preview_path, frame)
+                    video.release()
+                    return file_path, preview_path, gr.update(visible=True)
+        return "", None, gr.update(visible=False)
+
+    # 创建Gradio界面
+    with gr.Blocks() as demo:
+        gr.Markdown("# 人脸交换")
+        
+        with gr.Row():
+            source_image = gr.Image(label="源图像", type="pil", elem_id="source_image")
+            target_file = gr.File(label="目标图像/视频", elem_id="target_file")
+        
+        target_preview = gr.Image(label="目标预览", visible=False, elem_id="target_preview")
+        
+        process_btn = gr.Button("开始处理", elem_id="process_btn")
+        
+        output = gr.Textbox(label="输出信息", elem_id="output")
+        
+        # 错误日志显示区域
+        error_log_output = gr.Textbox(label="错误日志", lines=5, elem_id="error_log")
+        
+        # 设置组件事件
+        source_image.change(update_source, inputs=[source_image], outputs=[source_path])
+        target_file.change(update_target, inputs=[target_file], outputs=[target_path, target_preview, target_preview])
+        process_btn.click(process, inputs=[source_path, target_path], outputs=[output, error_log_output])
+
+    return demo