Merge branch 'dev' into improve-frontend-responsiveness

1 files changed, 28 insertions, 2 deletions

diff --git a/extensions-builtin/Lora/scripts/lora_script.py b/extensions-builtin/Lora/scripts/lora_script.py
index 0adab225..728e0b86 100644
--- a/extensions-builtin/Lora/scripts/lora_script.py
+++ b/extensions-builtin/Lora/scripts/lora_script.py
@@ -1,12 +1,12 @@
 import torch

 import gradio as gr

+from fastapi import FastAPI

 

 import lora

 import extra_networks_lora

 import ui_extra_networks_lora

 from modules import script_callbacks, ui_extra_networks, extra_networks, shared

 

-

 def unload():

     torch.nn.Linear.forward = torch.nn.Linear_forward_before_lora

     torch.nn.Linear._load_from_state_dict = torch.nn.Linear_load_state_dict_before_lora

@@ -49,8 +49,34 @@ torch.nn.MultiheadAttention._load_from_state_dict = lora.lora_MultiheadAttention
 script_callbacks.on_model_loaded(lora.assign_lora_names_to_compvis_modules)

 script_callbacks.on_script_unloaded(unload)

 script_callbacks.on_before_ui(before_ui)

+script_callbacks.on_infotext_pasted(lora.infotext_pasted)

 

 

 shared.options_templates.update(shared.options_section(('extra_networks', "Extra Networks"), {

-    "sd_lora": shared.OptionInfo("None", "Add Lora to prompt", gr.Dropdown, lambda: {"choices": [""] + [x for x in lora.available_loras]}, refresh=lora.list_available_loras),

+    "sd_lora": shared.OptionInfo("None", "Add Lora to prompt", gr.Dropdown, lambda: {"choices": ["None", *lora.available_loras]}, refresh=lora.list_available_loras),

+    "lora_preferred_name": shared.OptionInfo("Alias from file", "When adding to prompt, refer to lora by", gr.Radio, {"choices": ["Alias from file", "Filename"]}),

+}))

+

+

+shared.options_templates.update(shared.options_section(('compatibility', "Compatibility"), {

+    "lora_functional": shared.OptionInfo(False, "Lora: use old method that takes longer when you have multiple Loras active and produces same results as kohya-ss/sd-webui-additional-networks extension"),

 }))

+

+

+def create_lora_json(obj: lora.LoraOnDisk):

+    return {

+        "name": obj.name,

+        "alias": obj.alias,

+        "path": obj.filename,

+        "metadata": obj.metadata,

+    }

+

+

+def api_loras(_: gr.Blocks, app: FastAPI):

+    @app.get("/sdapi/v1/loras")

+    async def get_loras():

+        return [create_lora_json(obj) for obj in lora.available_loras.values()]

+

+

+script_callbacks.on_app_started(api_loras)

+