diff --git a/extensions-builtin/sd-webui-controlnet b/extensions-builtin/sd-webui-controlnet index d520e9da0..4d4b1f8c0 160000 --- a/extensions-builtin/sd-webui-controlnet +++ b/extensions-builtin/sd-webui-controlnet @@ -1 +1 @@ -Subproject commit d520e9da0014073162817ceb1eae241bccba67b9 +Subproject commit 4d4b1f8c00a0355d1517465ac3c0e801d5a2d194 diff --git a/javascript/extraNetworks.js b/javascript/extraNetworks.js index 19b69ec8b..3ecb34639 100644 --- a/javascript/extraNetworks.js +++ b/javascript/extraNetworks.js @@ -118,16 +118,16 @@ function readCardDescription(event, tabname, filename, descript){ var textarea = gradioApp().querySelector("#" + tabname + '_description_filename > label > textarea') var description_textarea = gradioApp().querySelector("#" + tabname+ '_description_input > label > textarea') var button = gradioApp().getElementById(tabname + '_read_description') - textarea.value = filename description_textarea.value = descript - updateInput(textarea) updateInput(description_textarea) button.click() - event.stopPropagation() event.preventDefault() + requestGet("./sd_extra_networks/metadata", {"page": extraPage, "item": cardName}, (data) => { + if (data && data.metadata) extraNetworksShowMetadata(data.metadata) + }, () => {}) } function extraNetworksSearchButton(tabs_id, event){ @@ -171,7 +171,6 @@ function extraNetworksShowMetadata(text){ elem = document.createElement('pre') elem.classList.add('popup-metadata'); elem.textContent = text; - popup(elem); } @@ -201,7 +200,6 @@ function requestGet(url, data, handler, errorHandler){ function extraNetworksRequestMetadata(event, extraPage, cardName){ showError = function(){ extraNetworksShowMetadata("there was an error getting metadata"); } - requestGet("./sd_extra_networks/metadata", {"page": extraPage, "item": cardName}, function(data){ if(data && data.metadata){ extraNetworksShowMetadata(data.metadata) @@ -209,6 +207,5 @@ function extraNetworksRequestMetadata(event, extraPage, cardName){ showError() } }, showError) - event.stopPropagation() } diff --git a/modules/img2img.py b/modules/img2img.py index 4a3472d27..302ae61ec 100644 --- a/modules/img2img.py +++ b/modules/img2img.py @@ -151,7 +151,7 @@ def img2img(id_task: str, mode: int, prompt: str, negative_prompt: str, prompt_s ) p.scripts = modules.scripts.scripts_img2img - # p.script_args = args + p.script_args = args if mask: p.extra_generation_params["Mask blur"] = mask_blur diff --git a/modules/processing.py b/modules/processing.py index ce2d9f86e..118996cab 100644 --- a/modules/processing.py +++ b/modules/processing.py @@ -160,7 +160,7 @@ class StableDiffusionProcessing: self.seed_resize_from_h = 0 self.seed_resize_from_w = 0 self.scripts = None - self.script_args = script_args + self.script_args = script_args or [] self.per_script_args = {} self.all_prompts = None self.all_negative_prompts = None diff --git a/modules/scripts.py b/modules/scripts.py index f08adbb64..48df6c4dd 100644 --- a/modules/scripts.py +++ b/modules/scripts.py @@ -345,8 +345,8 @@ class ScriptRunner: script = self.selectable_scripts[script_index-1] if script is None: return None - args = p.per_script_args.get(script.title(), p.script_args[script.args_from:script.args_to]) - processed = script.run(p, *args) + parsed = p.per_script_args.get(script.title(), args[script.args_from:script.args_to]) + processed = script.run(p, *parsed) shared.total_tqdm.clear() return processed diff --git a/modules/txt2img.py b/modules/txt2img.py index dffe6d117..2fcb4c49d 100644 --- a/modules/txt2img.py +++ b/modules/txt2img.py @@ -41,7 +41,7 @@ def txt2img(id_task: str, prompt: str, negative_prompt: str, prompt_styles, step override_settings=override_settings, ) p.scripts = modules.scripts.scripts_txt2img - # p.script_args = args + p.script_args = args processed = modules.scripts.scripts_txt2img.run(p, *args) if processed is None: processed = process_images(p) diff --git a/modules/ui_extra_networks.py b/modules/ui_extra_networks.py index a8e3851b1..749a7789f 100644 --- a/modules/ui_extra_networks.py +++ b/modules/ui_extra_networks.py @@ -142,7 +142,7 @@ class ExtraNetworksPage: "card_clicked": onclick, "save_card_description": '"' + html.escape(f"""return saveCardDescription(event, {json.dumps(tabname)}, {json.dumps(item["local_preview"])})""") + '"', "save_card_preview": '"' + html.escape(f"""return saveCardPreview(event, {json.dumps(tabname)}, {json.dumps(item["local_preview"])})""") + '"', - "read_card_description": '"' + html.escape(f"""return readCardDescription(event, {json.dumps(tabname)}, {json.dumps(item["local_preview"])}, {json.dumps(item["description"])})""") + '"', + "read_card_description": '"' + html.escape(f"""return readCardDescription(event, {json.dumps(tabname)}, {json.dumps(item["local_preview"])}, {json.dumps(item["description"])}, {json.dumps(self.name)}, {json.dumps(item["name"])})""") + '"', "search_term": item.get("search_term", ""), "metadata_button": metadata_button, }