Industry leading face manipulation platform
Add clear button to benchmark and fire clear_temp() via the UI
henryruhsf3158ed4c16f
diff --git a/facefusion/core.py b/facefusion/core.pyindex 4504a8f0..8a6edc61 100755--- a/facefusion/core.py+++ b/facefusion/core.py@@ -20,7 +20,7 @@ import facefusion.globalsfrom facefusion import wording, metadatafrom facefusion.predictor import predict_image, predict_videofrom facefusion.processors.frame.core import get_frame_processors_modules-from facefusion.utilities import 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, list_module_names, decode_execution_providers, encode_execution_providers+from facefusion.utilities import is_image, is_video, detect_fps, create_video, extract_frames, get_temp_frame_paths, restore_audio, create_temp, move_temp, clear_temp, normalize_output_path, list_module_names, decode_execution_providers, encode_execution_providerswarnings.filterwarnings('ignore', category = FutureWarning, module = 'insightface')warnings.filterwarnings('ignore', category = UserWarning, module = 'torchvision')@@ -191,8 +191,8 @@ def process_video() -> None:update_status(wording.get('restoring_audio_issues'))restore_audio(facefusion.globals.target_path, facefusion.globals.output_path)# clean temp- update_status(wording.get('cleaning_temp'))- clean_temp(facefusion.globals.target_path)+ update_status(wording.get('clearing_temp'))+ clear_temp(facefusion.globals.target_path)# validate videoif is_video(facefusion.globals.target_path):update_status(wording.get('processing_video_succeed'))@@ -230,5 +230,5 @@ def run() -> None:def destroy() -> None:if facefusion.globals.target_path:- clean_temp(facefusion.globals.target_path)+ clear_temp(facefusion.globals.target_path)sys.exit()diff --git a/facefusion/uis/components/benchmark.py b/facefusion/uis/components/benchmark.pyindex 26d26e8e..a9dbaf4b 100644--- a/facefusion/uis/components/benchmark.py+++ b/facefusion/uis/components/benchmark.py@@ -9,17 +9,19 @@ from facefusion import wordingfrom facefusion.capturer import get_video_frame_totalfrom facefusion.core import conditional_processfrom facefusion.uis.typing import Update-from facefusion.utilities import normalize_output_path+from facefusion.utilities import normalize_output_path, clear_tempBENCHMARK_RESULT_DATAFRAME : Optional[gradio.Dataframe] = NoneBENCHMARK_CYCLES_SLIDER : Optional[gradio.Button] = NoneBENCHMARK_START_BUTTON : Optional[gradio.Button] = None+BENCHMARK_CLEAR_BUTTON : Optional[gradio.Button] = Nonedef render() -> None:global BENCHMARK_RESULT_DATAFRAMEglobal BENCHMARK_CYCLES_SLIDERglobal BENCHMARK_START_BUTTON+ global BENCHMARK_CLEAR_BUTTONwith gradio.Box():BENCHMARK_RESULT_DATAFRAME = gradio.Dataframe(@@ -27,7 +29,7 @@ def render() -> None:headers =['target_path',- 'cycles',+ 'benchmark_cycles','average_run','fastest_run','slowest_run',@@ -52,11 +54,14 @@ def render() -> None:value = 3,maximum = 10)- BENCHMARK_START_BUTTON = gradio.Button(wording.get('start_button_label'))+ with gradio.Row():+ BENCHMARK_START_BUTTON = gradio.Button(wording.get('start_button_label'))+ BENCHMARK_CLEAR_BUTTON = gradio.Button(wording.get('clear_button_label'))def listen() -> None:BENCHMARK_START_BUTTON.click(update, inputs = BENCHMARK_CYCLES_SLIDER, outputs = BENCHMARK_RESULT_DATAFRAME)+ BENCHMARK_CLEAR_BUTTON.click(clear, outputs = BENCHMARK_RESULT_DATAFRAME)def update(benchmark_cycles : int) -> Update:@@ -74,10 +79,10 @@ def update(benchmark_cycles : int) -> Update:return gradio.update(value = value)-def benchmark(target_path : str, cycles : int) -> List[Any]:+def benchmark(target_path : str, benchmark_cycles : int) -> List[Any]:process_times = []total_fps = 0.0- for i in range(cycles + 1):+ for i in range(benchmark_cycles + 1):facefusion.globals.target_path = target_pathfacefusion.globals.output_path = normalize_output_path(facefusion.globals.source_path, facefusion.globals.target_path, tempfile.gettempdir())video_frame_total = get_video_frame_total(facefusion.globals.target_path)@@ -89,16 +94,22 @@ def benchmark(target_path : str, cycles : int) -> List[Any]:if i > 0:process_times.append(process_time)total_fps += fps- average_process_time = round(statistics.mean(process_times), 2)- fastest_process_time = round(min(process_times), 2)- slowest_process_time = round(max(process_times), 2)- average_fps = round(total_fps / cycles, 2)+ average_run = round(statistics.mean(process_times), 2)+ fastest_run = round(min(process_times), 2)+ slowest_run = round(max(process_times), 2)+ relative_fps = round(total_fps / benchmark_cycles, 2)return\[facefusion.globals.target_path,- cycles,- average_process_time,- fastest_process_time,- slowest_process_time,- average_fps+ benchmark_cycles,+ average_run,+ fastest_run,+ slowest_run,+ relative_fps]+++def clear() -> Update:+ if facefusion.globals.target_path:+ clear_temp(facefusion.globals.target_path)+ return gradio.update(value = None)diff --git a/facefusion/uis/components/output.py b/facefusion/uis/components/output.pyindex 337f3366..78655f5e 100644--- a/facefusion/uis/components/output.py+++ b/facefusion/uis/components/output.py@@ -5,7 +5,7 @@ import facefusion.globalsfrom facefusion import wordingfrom facefusion.core import conditional_processfrom facefusion.uis.typing import Update-from facefusion.utilities import is_image, is_video, normalize_output_path+from facefusion.utilities import is_image, is_video, normalize_output_path, clear_tempOUTPUT_START_BUTTON : Optional[gradio.Button] = NoneOUTPUT_CLEAR_BUTTON : Optional[gradio.Button] = None@@ -50,4 +50,6 @@ def update() -> Tuple[Update, Update]:def clear() -> Tuple[Update, Update]:+ if facefusion.globals.target_path:+ clear_temp(facefusion.globals.target_path)return gradio.update(value = None), gradio.update(value = None)diff --git a/facefusion/utilities.py b/facefusion/utilities.pyindex 01d9a2ac..1f5e8327 100644--- a/facefusion/utilities.py+++ b/facefusion/utilities.py@@ -129,7 +129,7 @@ def move_temp(target_path : str, output_path : str) -> None:shutil.move(temp_output_path, output_path)-def clean_temp(target_path : str) -> None:+def clear_temp(target_path : str) -> None:temp_directory_path = get_temp_directory_path(target_path)parent_directory_path = os.path.dirname(temp_directory_path)if not facefusion.globals.keep_temp and os.path.isdir(temp_directory_path):diff --git a/facefusion/wording.py b/facefusion/wording.pyindex b5634bae..8a8dc717 100644--- a/facefusion/wording.py+++ b/facefusion/wording.py@@ -27,7 +27,7 @@ WORDING =\'execution_providers_help': 'choose from the available execution providers (choices: {choices}, ...)','execution_thread_count_help': 'specify the number of execution threads','execution_queue_count_help': 'specify the number of execution queries',- 'creating_temp': 'creating temporary resources',+ 'creating_temp': 'Creating temporary resources','extracting_frames_fps': 'Extracting frames with {fps} FPS','processing': 'Processing','downloading': 'Downloading',@@ -37,7 +37,7 @@ WORDING =\'skipping_audio': 'Skipping audio','restoring_audio': 'Restoring audio','restoring_audio_issues': 'Restoring audio might cause issues as fps are not kept',- 'cleaning_temp': 'Cleaning temporary resources',+ 'clearing_temp': 'Clearing temporary resources','processing_image_succeed': 'Processing to image succeed','processing_image_failed': 'Processing to image failed','processing_video_succeed': 'Processing to video succeed',