michael/stable-diffusion-webui
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #6910 from EllangoK/master

Browse source 
Check model name values are set before merging
This commit is contained in:
AUTOMATIC1111 2023-01-19 08:48:27 +03:00 committed by GitHub
commit 01b1061a0b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
modules/extras.py
View file

@ -287,10 +287,19 @@ def run_modelmerger(primary_model_name, secondary_model_name, tertiary_model_nam
def add_difference(theta0, theta1_2_diff, alpha): def add_difference(theta0, theta1_2_diff, alpha):
return theta0 + (alpha * theta1_2_diff) return theta0 + (alpha * theta1_2_diff)
if not primary_model_name:
shared.state.textinfo = "Failed: Merging requires a primary model."
shared.state.end()
return ["Failed: Merging requires a primary model."] + [gr.Dropdown.update(choices=sd_models.checkpoint_tiles()) for _ in range(4)]
primary_model_info = sd_models.checkpoints_list[primary_model_name] primary_model_info = sd_models.checkpoints_list[primary_model_name]
if not secondary_model_name:
shared.state.textinfo = "Failed: Merging requires a secondary model."
shared.state.end()
return ["Failed: Merging requires a secondary model."] + [gr.Dropdown.update(choices=sd_models.checkpoint_tiles()) for _ in range(4)]
secondary_model_info = sd_models.checkpoints_list[secondary_model_name] secondary_model_info = sd_models.checkpoints_list[secondary_model_name]
tertiary_model_info = sd_models.checkpoints_list.get(tertiary_model_name, None)
result_is_inpainting_model = False
theta_funcs = { theta_funcs = {
"Weighted sum": (None, weighted_sum), "Weighted sum": (None, weighted_sum),
@ -298,10 +307,14 @@ def run_modelmerger(primary_model_name, secondary_model_name, tertiary_model_nam
} }
theta_func1, theta_func2 = theta_funcs[interp_method] theta_func1, theta_func2 = theta_funcs[interp_method]
if theta_func1 and not tertiary_model_info: if theta_func1 and not tertiary_model_name:
shared.state.textinfo = "Failed: Interpolation method requires a tertiary model." shared.state.textinfo = "Failed: Interpolation method requires a tertiary model."
shared.state.end() shared.state.end()
return ["Failed: Interpolation method requires a tertiary model."] + [gr.Dropdown.update(choices=sd_models.checkpoint_tiles()) for _ in range(4)] return [f"Failed: Interpolation method ({interp_method}) requires a tertiary model."] + [gr.Dropdown.update(choices=sd_models.checkpoint_tiles()) for _ in range(4)]
tertiary_model_info = sd_models.checkpoints_list[tertiary_model_name] if theta_func1 else None
result_is_inpainting_model = False
shared.state.textinfo = f"Loading {secondary_model_info.filename}..." shared.state.textinfo = f"Loading {secondary_model_info.filename}..."
print(f"Loading {secondary_model_info.filename}...") print(f"Loading {secondary_model_info.filename}...")