Merge pull request #63 from glucauze/v1.2.3

change model link

CHANGELOG.md

@@ -1,13 +1,3 @@
-# 1.2.5
-
-Allow seed selection in inpainting.
-
-# 1.2.4
-
-Fix default settings by marking only managed field as do_not_save.
-
-See the discussion here : https://github.com/glucauze/sd-webui-faceswaplab/issues/62
-
 # 1.2.3
 
 Speed up ui : change the way default settings are manage by not storing them in ui-config.json

README.md

@@ -32,32 +32,6 @@ More on this here : https://glucauze.github.io/sd-webui-faceswaplab/
 
 ## Quick Start
 
-Here are some gifs to explain (non cherry picked, just random pictures) : 
-
-## Simple Usage (roop like)
-
-This use codeformer on all faces (including non swapped)
-
-[simple.webm](https://github.com/glucauze/sd-webui-faceswaplab/assets/137925069/de00b685-d441-44f9-bae3-71cd7abef113)
-
-## Advanced options 
-
-This is use to improve results. This use upscaling and codeformer only on swapped faces
-
-[advanced.webm](https://github.com/glucauze/sd-webui-faceswaplab/assets/137925069/50630311-bd25-487f-871b-0a44eecd435d)
-
-## Inpainting 
-
-This add inpainting on faces : 
-
-[inpainting.webm](https://github.com/glucauze/sd-webui-faceswaplab/assets/137925069/3d3508e9-5be4-4566-8c41-8301b2d08355)
-
-## Build and use checkpoints : 
-
-[build.webm](https://github.com/glucauze/sd-webui-faceswaplab/assets/137925069/e84e9a3c-840d-4536-9fbb-09ed256406d7)
-
-
-
 ### Simple
 
 1. Put a face in the reference.

client_api/api_utils.py

@@ -48,7 +48,6 @@ class InpaintingOptions(BaseModel):
     inpainting_model: str = Field(
         description="Inpainting model", examples=["Current"], default="Current"
     )
-    inpainting_seed: int = Field(description="Inpainting Seed", ge=-1, default=-1)
 
 
 class InswappperOptions(BaseModel):

install.py

@@ -2,11 +2,12 @@ import launch
 import os
 import sys
 import pkg_resources
+from modules import shared
 from packaging.version import parse
 
 
 def check_install() -> None:
-    use_gpu = True
+    use_gpu = not getattr(shared.cmd_opts, "use-cpu", False)
 
     if use_gpu and sys.platform != "darwin":
         print("Faceswaplab : Use GPU requirements")

preload.py

@@ -8,3 +8,8 @@ def preload(parser: ArgumentParser) -> None:
         choices=["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"],
         help="Set the log level (DEBUG, INFO, WARNING, ERROR, CRITICAL)",
     )
+    parser.add_argument(
+        "--faceswaplab_gpu",
+        action="store_true",
+        help="Enable GPU if set, disable if not set",
+    )

scripts/faceswaplab.py

@@ -111,6 +111,9 @@ class FaceSwapScript(scripts.Script):
         # If the order is modified, the before_process should be changed accordingly.
 
         components = components + post_processing
+        # Ask sd to not store in ui-config.json
+        for component in components:
+            setattr(component, "do_not_save_to_config", True)
 
         return components
 

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.5"
+VERSION_FLAG: str = "v1.2.3"
 # Defining the path for 'sd-webui-faceswaplab' inside the 'extensions' directory
 EXTENSION_PATH = os.path.join("extensions", "sd-webui-faceswaplab")
 

scripts/faceswaplab_inpainting/faceswaplab_inpainting.py

@@ -12,7 +12,6 @@ class InpaintingOptions:
     inpainting_steps: int = 20
     inpainting_sampler: str = "Euler"
     inpainting_model: str = "Current"
-    inpainting_seed: int = -1
 
     @staticmethod
     def from_gradio(components: List[gr.components.Component]) -> "InpaintingOptions":
@@ -39,5 +38,4 @@ class InpaintingOptions:
             inpainting_steps=dto.inpainting_steps,
             inpainting_sampler=dto.inpainting_sampler,
             inpainting_model=dto.inpainting_model,
-            inpainting_seed=dto.inpainting_seed,
         )

scripts/faceswaplab_inpainting/i2i_pp.py

@@ -52,7 +52,6 @@ inpainting_steps : {options.inpainting_steps}
                 )
 
                 i2i_kwargs = {
-                    "init_images": [img],
                     "sampler_name": options.inpainting_sampler,
                     "do_not_save_samples": True,
                     "steps": options.inpainting_steps,
@@ -64,16 +63,23 @@ inpainting_steps : {options.inpainting_steps}
                     "prompt": prompt,
                     "negative_prompt": negative_prompt,
                     "denoising_strength": options.inpainting_denoising_strengh,
-                    "seed": options.inpainting_seed,
+                    "override_settings": {
+                        "return_mask_composite": False,
+                        "save_images_before_face_restoration": False,
+                        "save_images_before_highres_fix": False,
+                        "save_images_before_color_correction": False,
+                        "save_mask": False,
+                        "save_mask_composite": False,
+                        "samples_save": False,
+                    },
                 }
-
                 current_model_checkpoint = shared.opts.sd_model_checkpoint
                 if options.inpainting_model and options.inpainting_model != "Current":
                     # Change checkpoint
                     shared.opts.sd_model_checkpoint = options.inpainting_model
                     sd_models.select_checkpoint
                     sd_models.load_model()
-                i2i_p = StableDiffusionProcessingImg2Img(**i2i_kwargs)
+                i2i_p = StableDiffusionProcessingImg2Img([img], **i2i_kwargs)
                 i2i_processed = processing.process_images(i2i_p)
                 if options.inpainting_model and options.inpainting_model != "Current":
                     # Restore checkpoint

scripts/faceswaplab_ui/faceswaplab_inpainting_ui.py

@@ -4,71 +4,65 @@ from modules import sd_models, sd_samplers
 from scripts.faceswaplab_utils.sd_utils import get_sd_option
 
 
-def face_inpainting_ui(id_prefix: str = "faceswaplab") -> List[gr.components.Component]:
-    inpainting_denoising_strength = gr.Slider(
-        0,
-        1,
-        0,
-        step=0.01,
-        elem_id=f"{id_prefix}_pp_inpainting_denoising_strength",
-        label="Denoising strenght",
-    )
-
-    inpainting_denoising_prompt = gr.Textbox(
-        get_sd_option(
-            "faceswaplab_pp_default_inpainting_prompt", "Portrait of a [gender]"
-        ),
-        elem_id=f"{id_prefix}_pp_inpainting_denoising_prompt",
-        label="Inpainting prompt use [gender] instead of men or woman",
-    )
-    inpainting_denoising_negative_prompt = gr.Textbox(
-        get_sd_option("faceswaplab_pp_default_inpainting_negative_prompt", "blurry"),
-        elem_id=f"{id_prefix}_pp_inpainting_denoising_neg_prompt",
-        label="Inpainting negative prompt use [gender] instead of men or woman",
-    )
-    with gr.Row():
-        samplers_names = [s.name for s in sd_samplers.all_samplers]
-        inpainting_sampler = gr.Dropdown(
-            choices=samplers_names,
-            value=[samplers_names[0]],
-            label="Inpainting Sampler",
-            elem_id=f"{id_prefix}_pp_inpainting_sampler",
-        )
-        inpainting_denoising_steps = gr.Slider(
+def face_inpainting_ui(
+    name: str, id_prefix: str = "faceswaplab", description: str = ""
+) -> List[gr.components.Component]:
+    with gr.Accordion(name, open=False):
+        gr.Markdown(description)
+        inpainting_denoising_strength = gr.Slider(
+            0,
             1,
-            150,
-            20,
-            step=1,
-            label="Inpainting steps",
-            elem_id=f"{id_prefix}_pp_inpainting_steps",
+            0,
+            step=0.01,
+            elem_id=f"{id_prefix}_pp_inpainting_denoising_strength",
+            label="Denoising strenght",
         )
 
-    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",
-    )
+        inpainting_denoising_prompt = gr.Textbox(
+            get_sd_option(
+                "faceswaplab_pp_default_inpainting_prompt", "Portrait of a [gender]"
+            ),
+            elem_id=f"{id_prefix}_pp_inpainting_denoising_prompt",
+            label="Inpainting prompt use [gender] instead of men or woman",
+        )
+        inpainting_denoising_negative_prompt = gr.Textbox(
+            get_sd_option(
+                "faceswaplab_pp_default_inpainting_negative_prompt", "blurry"
+            ),
+            elem_id=f"{id_prefix}_pp_inpainting_denoising_neg_prompt",
+            label="Inpainting negative prompt use [gender] instead of men or woman",
+        )
+        with gr.Row():
+            samplers_names = [s.name for s in sd_samplers.all_samplers]
+            inpainting_sampler = gr.Dropdown(
+                choices=samplers_names,
+                value=[samplers_names[0]],
+                label="Inpainting Sampler",
+                elem_id=f"{id_prefix}_pp_inpainting_sampler",
+            )
+            inpainting_denoising_steps = gr.Slider(
+                1,
+                150,
+                20,
+                step=1,
+                label="Inpainting steps",
+                elem_id=f"{id_prefix}_pp_inpainting_steps",
+            )
 
-    inpaiting_seed = gr.Number(
-        label="Inpainting seed",
-        value=0,
-        minimum=0,
-        precision=0,
-        elem_id=f"{id_prefix}_pp_inpainting_seed",
-    )
+        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",
+        )
 
-    gradio_components: List[gr.components.Component] = [
-        inpainting_denoising_strength,
-        inpainting_denoising_prompt,
-        inpainting_denoising_negative_prompt,
-        inpainting_denoising_steps,
-        inpainting_sampler,
-        inpaiting_model,
-        inpaiting_seed,
-    ]
+        gradio_components: List[gr.components.Component] = [
+            inpainting_denoising_strength,
+            inpainting_denoising_prompt,
+            inpainting_denoising_negative_prompt,
+            inpainting_denoising_steps,
+            inpainting_sampler,
+            inpaiting_model,
+        ]
 
-    for component in gradio_components:
-        setattr(component, "do_not_save_to_config", True)
-
-    return gradio_components
+        return gradio_components

scripts/faceswaplab_ui/faceswaplab_postprocessing_ui.py

@@ -1,9 +1,9 @@
 from typing import List
 import gradio as gr
-from modules import shared
+import modules
+from modules import shared, sd_models
 from scripts.faceswaplab_postprocessing.postprocessing_options import InpaintingWhen
 from scripts.faceswaplab_utils.sd_utils import get_sd_option
-from scripts.faceswaplab_ui.faceswaplab_inpainting_ui import face_inpainting_ui
 
 
 def postprocessing_ui() -> List[gr.components.Component]:
@@ -66,10 +66,9 @@ def postprocessing_ui() -> List[gr.components.Component]:
             label="Upscaler visibility (if scale = 1)",
             elem_id="faceswaplab_pp_upscaler_visibility",
         )
-
-        with gr.Accordion(label="Global-Inpainting (all faces)", open=False):
+        with gr.Accordion(f"Post Inpainting", open=True):
             gr.Markdown(
-                "Inpainting sends image to inpainting with a mask on face (once for each faces)."
+                """Inpainting sends image to inpainting with a mask on face (once for each faces)."""
             )
             inpainting_when = gr.Dropdown(
                 elem_id="faceswaplab_pp_inpainting_when",
@@ -77,8 +76,52 @@ def postprocessing_ui() -> List[gr.components.Component]:
                 value=[InpaintingWhen.BEFORE_RESTORE_FACE.value],
                 label="Enable/When",
             )
-            global_inpainting = face_inpainting_ui("faceswaplab_gpp")
+            inpainting_denoising_strength = gr.Slider(
+                0,
+                1,
+                0,
+                step=0.01,
+                elem_id="faceswaplab_pp_inpainting_denoising_strength",
+                label="Denoising strenght (will send face to img2img after processing)",
+            )
 
+            inpainting_denoising_prompt = gr.Textbox(
+                get_sd_option(
+                    "faceswaplab_pp_default_inpainting_prompt", "Portrait of a [gender]"
+                ),
+                elem_id="faceswaplab_pp_inpainting_denoising_prompt",
+                label="Inpainting prompt use [gender] instead of men or woman",
+            )
+            inpainting_denoising_negative_prompt = gr.Textbox(
+                get_sd_option(
+                    "faceswaplab_pp_default_inpainting_negative_prompt", "blurry"
+                ),
+                elem_id="faceswaplab_pp_inpainting_denoising_neg_prompt",
+                label="Inpainting negative prompt use [gender] instead of men or woman",
+            )
+            with gr.Row():
+                samplers_names = [s.name for s in modules.sd_samplers.all_samplers]  # type: ignore
+                inpainting_sampler = gr.Dropdown(
+                    choices=samplers_names,
+                    value=[samplers_names[0]],
+                    label="Inpainting Sampler",
+                    elem_id="faceswaplab_pp_inpainting_sampler",
+                )
+                inpainting_denoising_steps = gr.Slider(
+                    1,
+                    150,
+                    20,
+                    step=1,
+                    label="Inpainting steps",
+                    elem_id="faceswaplab_pp_inpainting_steps",
+                )
+
+            inpaiting_model = gr.Dropdown(
+                choices=["Current"] + sd_models.checkpoint_tiles(),
+                default="Current",
+                label="sd model (experimental)",
+                elem_id="faceswaplab_pp_inpainting_sd_model",
+            )
     components = [
         face_restorer_name,
         face_restorer_visibility,
@@ -87,7 +130,13 @@ def postprocessing_ui() -> List[gr.components.Component]:
         upscaler_scale,
         upscaler_visibility,
         inpainting_when,
-    ] + global_inpainting
+        inpainting_denoising_strength,
+        inpainting_denoising_prompt,
+        inpainting_denoising_negative_prompt,
+        inpainting_denoising_steps,
+        inpainting_sampler,
+        inpaiting_model,
+    ]
 
     # Ask sd to not store in ui-config.json
     for component in components:

scripts/faceswaplab_ui/faceswaplab_unit_ui.py

@@ -80,7 +80,7 @@ def faceswap_unit_advanced_options(
             elem_id=f"{id_prefix}_face{unit_num}_erosion_factor",
         )
 
-    components = [
+    return [
         face_restorer_name,
         face_restorer_visibility,
         codeformer_weight,
@@ -91,11 +91,6 @@ def faceswap_unit_advanced_options(
         erosion_factor,
     ]
 
-    for component in components:
-        setattr(component, "do_not_save_to_config", True)
-
-    return components
-
 
 def faceswap_unit_ui(
     is_img2img: bool, unit_num: int = 1, id_prefix: str = "faceswaplab"
@@ -249,19 +244,19 @@ Otherwise, read the [doc](https://glucauze.github.io/sd-webui-faceswaplab/doc/)
                 elem_id=f"{id_prefix}_face{unit_num}_min_ref_similarity",
             )
 
-        with gr.Accordion(label="Pre-Inpainting (before swapping)", open=False):
-            gr.Markdown("Pre-inpainting sends face to inpainting before swapping")
-            pre_inpainting = face_inpainting_ui(
-                id_prefix=f"{id_prefix}_face{unit_num}_preinpainting",
-            )
+        pre_inpainting = face_inpainting_ui(
+            name="Pre-Inpainting (Before swapping)",
+            id_prefix=f"{id_prefix}_face{unit_num}_preinpainting",
+            description="Pre-inpainting sends face to inpainting before swapping",
+        )
 
         options = faceswap_unit_advanced_options(is_img2img, unit_num, id_prefix)
 
-        with gr.Accordion(label="Post-Inpainting (After swapping)", open=False):
-            gr.Markdown("Pre-inpainting sends face to inpainting before swapping")
-            post_inpainting = face_inpainting_ui(
-                id_prefix=f"{id_prefix}_face{unit_num}_postinpainting",
-            )
+        post_inpainting = face_inpainting_ui(
+            name="Post-Inpainting (After swapping)",
+            id_prefix=f"{id_prefix}_face{unit_num}_postinpainting",
+            description="Post-inpainting sends face to inpainting after swapping",
+        )
 
     gradio_components: List[gr.components.Component] = (
         [
@@ -286,6 +281,10 @@ Otherwise, read the [doc](https://glucauze.github.io/sd-webui-faceswaplab/doc/)
         + post_inpainting
     )
 
+    # Ask sd to not store in ui-config.json
+    for component in gradio_components:
+        setattr(component, "do_not_save_to_config", True)
+
     # If changed, you need to change FaceSwapUnitSettings accordingly
     # ORDER of parameters is IMPORTANT. It should match the result of FaceSwapUnitSettings
     return gradio_components