diff --git a/scripts/faceswaplab_globals.py b/scripts/faceswaplab_globals.py index 99edff0..d8c4886 100644 --- a/scripts/faceswaplab_globals.py +++ b/scripts/faceswaplab_globals.py @@ -16,7 +16,7 @@ REFERENCE_PATH = os.path.join( ) # Defining the version flag for the application -VERSION_FLAG: str = "v1.2.7" +VERSION_FLAG: str = "v1.2.8" # Defining the path for 'sd-webui-faceswaplab' inside the 'extensions' directory EXTENSION_PATH = os.path.join("extensions", "sd-webui-faceswaplab") diff --git a/scripts/faceswaplab_ui/faceswaplab_inpainting_ui.py b/scripts/faceswaplab_ui/faceswaplab_inpainting_ui.py index 1c40d82..676ae28 100644 --- a/scripts/faceswaplab_ui/faceswaplab_inpainting_ui.py +++ b/scripts/faceswaplab_ui/faceswaplab_inpainting_ui.py @@ -45,7 +45,6 @@ def face_inpainting_ui(id_prefix: str = "faceswaplab") -> List[gr.components.Com inpaiting_model = gr.Dropdown( choices=["Current"] + sd_models.checkpoint_tiles(), - default="Current", label="sd model (experimental)", elem_id=f"{id_prefix}_pp_inpainting_sd_model", ) diff --git a/scripts/faceswaplab_ui/faceswaplab_tab.py b/scripts/faceswaplab_ui/faceswaplab_tab.py index f83716a..4f70ba8 100644 --- a/scripts/faceswaplab_ui/faceswaplab_tab.py +++ b/scripts/faceswaplab_ui/faceswaplab_tab.py @@ -249,10 +249,9 @@ def tools_ui() -> None: ) with gr.Row(): build_batch_files = gr.components.File( - type="file", + type="filepath", file_count="multiple", label="Batch Sources Images", - optional=True, elem_id="faceswaplab_build_batch_files", ) preview = gr.components.Image( @@ -265,20 +264,20 @@ def tools_ui() -> None: ) build_name = gr.Textbox( value="Face", - placeholder="Name of the character", + info="Name of the character", label="Name of the character", elem_id="faceswaplab_build_character_name", ) build_gender = gr.Dropdown( value=Gender.AUTO.name, choices=[e.name for e in Gender], - placeholder="Gender of the character", + info="Gender of the character", label="Gender of the character", elem_id="faceswaplab_build_character_gender", ) build_overwrite = gr.Checkbox( False, - placeholder="overwrite", + info="overwrite", label="Overwrite Checkpoint if exist (else will add number)", elem_id="faceswaplab_build_overwrite", ) @@ -310,10 +309,9 @@ def tools_ui() -> None: ) with gr.Row(): extracted_source_files = gr.components.File( - type="file", + type="filepath", file_count="multiple", label="Batch Sources Images", - optional=True, elem_id="faceswaplab_extract_batch_images", ) extracted_faces = gr.Gallery( @@ -366,10 +364,9 @@ def tools_ui() -> None: ) with gr.Row(): batch_source_files = gr.components.File( - type="file", + type="filepath", file_count="multiple", label="Batch Sources Images", - optional=True, elem_id="faceswaplab_batch_images", ) batch_results = gr.Gallery( diff --git a/scripts/faceswaplab_ui/faceswaplab_unit_ui.py b/scripts/faceswaplab_ui/faceswaplab_unit_ui.py index df5a803..1fb5d9d 100644 --- a/scripts/faceswaplab_ui/faceswaplab_unit_ui.py +++ b/scripts/faceswaplab_ui/faceswaplab_unit_ui.py @@ -113,10 +113,9 @@ def faceswap_unit_ui( elem_id=f"{id_prefix}_face{unit_num}_reference_image", ) batch_files = gr.components.File( - type="file", + type="filepath", file_count="multiple", label="Batch Sources Images", - optional=True, elem_id=f"{id_prefix}_face{unit_num}_batch_source_face_files", ) gr.Markdown( @@ -144,13 +143,13 @@ def faceswap_unit_ui( with gr.Row(): enable = gr.Checkbox( False, - placeholder="enable", + info="enable", label="Enable", elem_id=f"{id_prefix}_face{unit_num}_enable", ) blend_faces = gr.Checkbox( True, - placeholder="Blend Faces", + info="Blend Faces", label="Blend Faces ((Source|Checkpoint)+References = 1)", elem_id=f"{id_prefix}_face{unit_num}_blend_faces", interactive=True, @@ -162,19 +161,19 @@ def faceswap_unit_ui( with gr.Row(): same_gender = gr.Checkbox( False, - placeholder="Same Gender", + info="Same Gender", label="Same Gender", elem_id=f"{id_prefix}_face{unit_num}_same_gender", ) sort_by_size = gr.Checkbox( False, - placeholder="Sort by size", + info="Sort by size", label="Sort by size (larger>smaller)", elem_id=f"{id_prefix}_face{unit_num}_sort_by_size", ) target_faces_index = gr.Textbox( value=f"{unit_num-1}", - placeholder="Which face to swap (comma separated), start from 0 (by gender if same_gender is enabled)", + info="Which face to swap (comma separated), start from 0 (by gender if same_gender is enabled)", label="Target face : Comma separated face number(s)", elem_id=f"{id_prefix}_face{unit_num}_target_faces_index", ) @@ -185,7 +184,7 @@ def faceswap_unit_ui( value=0, precision=0, minimum=0, - placeholder="Which face to get from reference image start from 0", + info="Which face to get from reference image start from 0", label="Reference source face : start from 0", elem_id=f"{id_prefix}_face{unit_num}_reference_face_index", ) @@ -195,14 +194,14 @@ def faceswap_unit_ui( ) swap_in_source = gr.Checkbox( False, - placeholder="Swap face in source image", + info="Swap face in source image", label="Swap in source image (blended face)", visible=is_img2img, elem_id=f"{id_prefix}_face{unit_num}_swap_in_source", ) swap_in_generated = gr.Checkbox( True, - placeholder="Swap face in generated image", + info="Swap face in generated image", label="Swap in generated image", visible=is_img2img, elem_id=f"{id_prefix}_face{unit_num}_swap_in_generated", @@ -223,7 +222,7 @@ Otherwise, read the [doc](https://glucauze.github.io/sd-webui-faceswaplab/doc/) with gr.Row(): check_similarity = gr.Checkbox( False, - placeholder="discard", + info="discard", label="Check similarity", elem_id=f"{id_prefix}_face{unit_num}_check_similarity", )