Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

V1.2.4 #68

Merged
merged 2 commits into from
Aug 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions preload.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,3 @@ 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",
)
3 changes: 0 additions & 3 deletions scripts/faceswaplab.py
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,6 @@ def ui(self, is_img2img: bool) -> List[gr.components.Component]:
# 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

Expand Down
2 changes: 1 addition & 1 deletion scripts/faceswaplab_globals.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
)

# Defining the version flag for the application
VERSION_FLAG: str = "v1.2.3"
VERSION_FLAG: str = "v1.2.4"
# Defining the path for 'sd-webui-faceswaplab' inside the 'extensions' directory
EXTENSION_PATH = os.path.join("extensions", "sd-webui-faceswaplab")

Expand Down
20 changes: 11 additions & 9 deletions scripts/faceswaplab_inpainting/i2i_pp.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,16 +63,18 @@ def img2img_diffusion(
"prompt": prompt,
"negative_prompt": negative_prompt,
"denoising_strength": options.inpainting_denoising_strengh,
"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,
},
}
# Remove the following as they are not always supported on all platform :
# "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
Expand Down
3 changes: 3 additions & 0 deletions scripts/faceswaplab_ui/faceswaplab_inpainting_ui.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,4 +65,7 @@ def face_inpainting_ui(
inpaiting_model,
]

for component in gradio_components:
setattr(component, "do_not_save_to_config", True)

return gradio_components
11 changes: 6 additions & 5 deletions scripts/faceswaplab_ui/faceswaplab_unit_ui.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ def faceswap_unit_advanced_options(
elem_id=f"{id_prefix}_face{unit_num}_erosion_factor",
)

return [
components = [
face_restorer_name,
face_restorer_visibility,
codeformer_weight,
Expand All @@ -91,6 +91,11 @@ 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"
Expand Down Expand Up @@ -281,10 +286,6 @@ def refresh_fn(selected: str):
+ 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