extra networks UI

rework of hypernets: rather than via settings, hypernets are added directly to prompt as <hypernet:name:weight>

1 files changed, 16 insertions, 5 deletions

diff --git a/modules/shared.py b/modules/shared.py
index 2f366454..c0e11f18 100644
--- a/modules/shared.py
+++ b/modules/shared.py
@@ -23,6 +23,7 @@ demo = None
 sd_default_config = os.path.join(script_path, "configs/v1-inference.yaml")

 sd_model_file = os.path.join(script_path, 'model.ckpt')

 default_sd_model_file = sd_model_file

+

 parser = argparse.ArgumentParser()

 parser.add_argument("--config", type=str, default=sd_default_config, help="path to config which constructs model",)

 parser.add_argument("--ckpt", type=str, default=sd_model_file, help="path to checkpoint of stable diffusion model; if specified, this checkpoint will be added to the list of checkpoints and loaded",)

@@ -145,7 +146,7 @@ config_filename = cmd_opts.ui_settings_file
 

 os.makedirs(cmd_opts.hypernetwork_dir, exist_ok=True)

 hypernetworks = {}

-loaded_hypernetwork = None

+loaded_hypernetworks = []

 

 

 def reload_hypernetworks():

@@ -153,8 +154,6 @@ def reload_hypernetworks():
     global hypernetworks

 

     hypernetworks = hypernetwork.list_hypernetworks(cmd_opts.hypernetwork_dir)

-    hypernetwork.load_hypernetwork(opts.sd_hypernetwork)

-

 

 

 class State:

@@ -399,8 +398,6 @@ options_templates.update(options_section(('sd', "Stable Diffusion"), {
     "sd_vae_checkpoint_cache": OptionInfo(0, "VAE Checkpoints to cache in RAM", gr.Slider, {"minimum": 0, "maximum": 10, "step": 1}),

     "sd_vae": OptionInfo("Automatic", "SD VAE", gr.Dropdown, lambda: {"choices": ["Automatic", "None"] + list(sd_vae.vae_dict)}, refresh=sd_vae.refresh_vae_list),

     "sd_vae_as_default": OptionInfo(True, "Ignore selected VAE for stable diffusion checkpoints that have their own .vae.pt next to them"),

-    "sd_hypernetwork": OptionInfo("None", "Hypernetwork", gr.Dropdown, lambda: {"choices": ["None"] + [x for x in hypernetworks.keys()]}, refresh=reload_hypernetworks),

-    "sd_hypernetwork_strength": OptionInfo(1.0, "Hypernetwork strength", gr.Slider, {"minimum": 0.0, "maximum": 1.0, "step": 0.001}),

     "inpainting_mask_weight": OptionInfo(1.0, "Inpainting conditioning mask strength", gr.Slider, {"minimum": 0.0, "maximum": 1.0, "step": 0.01}),

     "initial_noise_multiplier": OptionInfo(1.0, "Noise multiplier for img2img", gr.Slider, {"minimum": 0.5, "maximum": 1.5, "step": 0.01 }),

     "img2img_color_correction": OptionInfo(False, "Apply color correction to img2img results to match original colors."),

@@ -661,3 +658,17 @@ mem_mon.start()
 def listfiles(dirname):

     filenames = [os.path.join(dirname, x) for x in sorted(os.listdir(dirname)) if not x.startswith(".")]

     return [file for file in filenames if os.path.isfile(file)]

+

+

+def html_path(filename):

+    return os.path.join(script_path, "html", filename)

+

+

+def html(filename):

+    path = html_path(filename)

+

+    if os.path.exists(path):

+        with open(path, encoding="utf8") as file:

+            return file.read()

+

+    return ""