Merge pull request #85 from kohya-ss/dev

Dev

Author: kohya-ss

README.md

@@ -8,6 +8,9 @@ __Stable Diffusion web UI now seems to support LoRA trained by ``sd-scripts``.__
 
 Note: Currently the models models for SD 2.x does not seem to be supported in Web UI. The models trained by the scripts 0.4.0 seem to be supported. 
 
+- 1 Feb. 2023, 2023/2/1
+  - Add ``send to metadata editor`` button in ``Additional Network`` in ``txt2img`` and other tabs. Thanks to space-nuko!
+  - ``txt2img``タブ等にメタデータエディタに送るボタンが付きました。space-nuko氏に感謝します。
 - 31 Jan. 2023, 2023/1/31
   - Metadata editor for LoRA models is now integrated in ``Additional Network`` tab. Documentation will be added later. Thanks to space-nuko!
   - LoRAモデル用のメタデータエディタ ``Additional Network`` タブに追加されました。ドキュメントはのちほど追加予定です。space-nuko氏に感謝します。

javascript/additional_networks.js

@@ -10,7 +10,31 @@ function addnet_switch_to_img2img(){
   return args_to_array(arguments);
 }
 
-function addnet_switch_to_addnet(){
-  Array.from(gradioApp().querySelector('#tabs').querySelectorAll('button')).filter(e => e.textContent.trim() === "Additional Networks")[0].click()
+function addnet_switch_to_metadata_editor(){
+  Array.from(gradioApp().querySelector('#tabs').querySelectorAll('button')).filter(e => e.textContent.trim() === "Additional Networks")[0].click();
+  return args_to_array(arguments);
+}
+
+function addnet_send_to_metadata_editor() {
+  var module = arguments[0];
+  var model_path = arguments[1];
+
+  if (model_path == "None") {
+    return args_to_array(arguments);
+  }
+
+  console.log(arguments);
+  console.log(model_path);
+  var select = gradioApp().querySelector("#additional_networks_metadata_editor_model > label > select");
+
+  var opt = [...select.options].filter(o => o.text == model_path)[0];
+  if (opt == null) {
+    return;
+  }
+
+  addnet_switch_to_metadata_editor();
+  select.selectedIndex = opt.index;
+  select.dispatchEvent(new Event("change", { bubbles: true }));
+
   return args_to_array(arguments);
 }

scripts/additional_networks.py

@@ -4,7 +4,6 @@
 
 import modules.scripts as scripts
 from modules import shared, script_callbacks
-from modules.ui_components import ToolButton
 import gradio as gr
 
 import modules.ui
@@ -13,6 +12,7 @@
 from scripts.model_util import lora_models, MAX_MODEL_COUNT
 
 
+memo_symbol = '\U0001F4DD' # 📝
 addnet_paste_params = {"txt2img": [], "img2img": []}
 
 
@@ -62,6 +62,16 @@ def ui(self, is_img2img):
             model = gr.Dropdown(list(lora_models.keys()),
                                 label=f"Model {i+1}",
                                 value="None")
+            with gr.Row(visible=False):
+              model_path = gr.Textbox(value="None", interactive=False, visible=False)
+            model.change(lambda module, model, i=i: model_util.lora_models.get(model, "None"), inputs=[module, model], outputs=[model_path])
+
+            # Sending from the script UI to the metadata editor has to bypass
+            # gradio since this button will exit the gr.Blocks context by the
+            # time the metadata editor tab is created, so event handlers can't
+            # be registered on it by then.
+            model_info = gr.Button(value=memo_symbol, elem_id=f"additional_networks_send_to_metadata_editor_{i}")
+            model_info.click(fn=None, _js="addnet_send_to_metadata_editor", inputs=[module, model_path], outputs=[])
 
             module.change(lambda module, model, i=i: xyz_grid_support.update_axis_params(i, module, model), inputs=[module, model], outputs=[])
             model.change(lambda module, model, i=i: xyz_grid_support.update_axis_params(i, module, model), inputs=[module, model], outputs=[])

scripts/metadata_editor.py

@@ -290,6 +290,21 @@ def save_metadata(module, model_path, cover_image, display_name, author, source,
   return f"Model saved: {model_name}", model_hash, legacy_hash
 
 
+model_name_filter = ""
+
+
+def get_filtered_model_paths(s):
+  if not s:
+    return ["None"] + list(model_util.lora_models.values())
+
+  return ["None"] + [v for v in model_util.lora_models.values() if v and s in v.lower()]
+
+
+def get_filtered_model_paths_global():
+  global model_name_filter
+  return get_filtered_model_paths(model_name_filter)
+
+
 def setup_ui(addnet_paste_params):
   """
 :dict addnet_paste_params: Dictionary of txt2img/img2img controls for each model weight slider,
@@ -304,9 +319,23 @@ def setup_ui(addnet_paste_params):
 
       # Module and model selector
       with gr.Row():
-        module = gr.Dropdown(["LoRA"], label="Network module", value="LoRA", interactive=True)
-        model = gr.Dropdown(["None"] + list(model_util.lora_models.values()), label="Model", value="None", interactive=True)
-        modules.ui.create_refresh_button(model, model_util.update_models, lambda: {"choices": ["None"] + list(model_util.lora_models.values())}, "refresh_lora_models")
+        model_filter = gr.Textbox("", label="Model path filter", placeholder="Filter models by path name")
+        def update_model_filter(s):
+          global model_name_filter
+          model_name_filter = s.strip().lower()
+        model_filter.change(update_model_filter, inputs=[model_filter], outputs=[])
+      with gr.Row():
+        module = gr.Dropdown(["LoRA"], label="Network module", value="LoRA", interactive=True, elem_id="additional_networks_metadata_editor_module")
+        model = gr.Dropdown(get_filtered_model_paths_global(), label="Model", value="None", interactive=True,
+                                elem_id="additional_networks_metadata_editor_model")
+        modules.ui.create_refresh_button(model, model_util.update_models, lambda: {"choices": get_filtered_model_paths_global()}, "refresh_lora_models")
+
+        def submit_model_filter(s):
+          global model_name_filter
+          model_name_filter = s
+          paths = get_filtered_model_paths(s)
+          return gr.Dropdown.update(choices=paths, value="None")
+        model_filter.submit(submit_model_filter, inputs=[model_filter], outputs=[model])
 
       # Model hashes and path
       with gr.Row():

style.css

@@ -16,3 +16,8 @@
     min-width: 2.5em;
     height: 2.4em;
 }
+
+
+[id^=additional_networks_send_to_metadata_editor_] {
+    transform: translateY(25%);
+}