diff --git a/extensions-builtin/a1111-sd-webui-lycoris b/extensions-builtin/a1111-sd-webui-lycoris index 1e5db3921..e47548884 160000 --- a/extensions-builtin/a1111-sd-webui-lycoris +++ b/extensions-builtin/a1111-sd-webui-lycoris @@ -1 +1 @@ -Subproject commit 1e5db39210df4dd3bb6f3667d9e690c447939e71 +Subproject commit e47548884864da9cfe30f6f33fbaa8e731d3dd85 diff --git a/extensions-builtin/sd-webui-agent-scheduler b/extensions-builtin/sd-webui-agent-scheduler index 08cdc1854..340102006 160000 --- a/extensions-builtin/sd-webui-agent-scheduler +++ b/extensions-builtin/sd-webui-agent-scheduler @@ -1 +1 @@ -Subproject commit 08cdc1854f126ec213f8462bdf81cdb0032bee69 +Subproject commit 3401020066a20444594ec2902d95217b0cd95e94 diff --git a/extensions-builtin/sd-webui-controlnet b/extensions-builtin/sd-webui-controlnet index f36493878..1b2aa4a96 160000 --- a/extensions-builtin/sd-webui-controlnet +++ b/extensions-builtin/sd-webui-controlnet @@ -1 +1 @@ -Subproject commit f36493878b299c367bc51f2935fd7e6d19188569 +Subproject commit 1b2aa4a96e9241b96abfbce249284ed17fc98b11 diff --git a/extensions-builtin/stable-diffusion-webui-images-browser b/extensions-builtin/stable-diffusion-webui-images-browser index 488c5393d..342efe98c 160000 --- a/extensions-builtin/stable-diffusion-webui-images-browser +++ b/extensions-builtin/stable-diffusion-webui-images-browser @@ -1 +1 @@ -Subproject commit 488c5393db60f0b1ddfb8ab18f3db9119227c962 +Subproject commit 342efe98c747aecbdde35144d017f9eaf2dd025a diff --git a/javascript/extraNetworks.js b/javascript/extraNetworks.js index a8c54bf7b..d43aa2244 100644 --- a/javascript/extraNetworks.js +++ b/javascript/extraNetworks.js @@ -72,6 +72,7 @@ function cardClicked(tabname, textToAdd, allowNegativePrompt) { } function saveCardPreview(event, tabname, filename) { + console.log('saveCardPreview', event, tabname, filename) const textarea = gradioApp().querySelector(`#${tabname}_preview_filename > label > textarea`); const button = gradioApp().getElementById(`${tabname}_save_preview`); textarea.value = filename; diff --git a/modules/ui_extra_networks.py b/modules/ui_extra_networks.py index 80e7a9e7e..5119f2301 100644 --- a/modules/ui_extra_networks.py +++ b/modules/ui_extra_networks.py @@ -235,12 +235,12 @@ def create_ui(container, button, tabname): ui.description_input = gr.TextArea('', show_label=False, elem_id=tabname+"_description_input", placeholder="Save/Replace Extra Network Description...", lines=2) button_refresh = ToolButton(refresh_symbol, elem_id=tabname+"_extra_refresh") button_close = ToolButton(close_symbol, elem_id=tabname+"_extra_close") + ui.button_save_preview = gr.Button('Save preview', elem_id=tabname+"_save_preview", visible=False) + ui.preview_target_filename = gr.Textbox('Preview save filename', elem_id=tabname+"_preview_filename", visible=False) + ui.button_save_description = gr.Button('Save description', elem_id=tabname+"_save_description", visible=False) + ui.button_read_description = gr.Button('Read description', elem_id=tabname+"_read_description", visible=False) + ui.description_target_filename = gr.Textbox('Description save filename', elem_id=tabname+"_description_filename", visible=False) for page in ui.stored_extra_pages: - ui.button_save_preview = gr.Button('Save preview', elem_id=tabname+"_save_preview", visible=False) - ui.preview_target_filename = gr.Textbox('Preview save filename', elem_id=tabname+"_preview_filename", visible=False) - ui.button_save_description = gr.Button('Save description', elem_id=tabname+"_save_description", visible=False) - ui.button_read_description = gr.Button('Read description', elem_id=tabname+"_read_description", visible=False) - ui.description_target_filename = gr.Textbox('Description save filename', elem_id=tabname+"_description_filename", visible=False) with gr.Tab(page.title, id=page.title.lower().replace(" ", "_")): page_elem = gr.HTML(page.create_html(ui.tabname)) page_elem.change(fn=lambda: None, _js=f'() => refreshExtraNetworks("{tabname}")', inputs=[], outputs=[]) @@ -289,6 +289,7 @@ def setup_ui(ui, gallery): break assert is_allowed, f'writing to {filename} is not allowed' image.save(filename) + shared.log.info(f'Extra network save preview: {filename}') return [page.create_html(ui.tabname) for page in ui.stored_extra_pages] ui.button_save_preview.click( @@ -304,12 +305,11 @@ def setup_ui(ui, gallery): filename = filename[0:lastDotIndex]+".description.txt" if descrip != "": try: - f = open(filename,'w', encoding='utf-8') - except OSError: - print ("Could not open file to write: " + filename) - with f: - f.write(descrip) - f.close() + with open(filename,'w', encoding='utf-8') as f: + f.write(descrip) + shared.log.info(f'Extra network save description: {filename}') + except Exception as e: + shared.log.error(f'Extra network save preview: {filename} {e}') return [page.create_html(ui.tabname) for page in ui.stored_extra_pages] ui.button_save_description.click(