From be75ed7e9ff2a94daeb93ddf32e51b6d3e7a4a8b Mon Sep 17 00:00:00 2001 From: Vladimir Mandic Date: Sun, 22 Oct 2023 09:58:51 -0400 Subject: [PATCH] compatibility items --- CHANGELOG.md | 6 ++++++ extensions-builtin/Lora/networks.py | 1 + modules/images.py | 4 ++-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d6bea72b..fd0013bee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,6 +29,12 @@ Service release addressing all zero-day issues reported so far... - update `openvino` (thanks @disty0) - update `typing-extensions` +### Dev branch + +- Remove external clone of items in `/repositories` +- Implement Lora OFT, thanks @antis0007 and @ai-casanova + + **Themes** - all built-in themes are fully supported: - *black-teal (default), light-teal, black-orange, invoked, amethyst-nightfall, midnight-barbie* diff --git a/extensions-builtin/Lora/networks.py b/extensions-builtin/Lora/networks.py index 2132c8ed5..10addb806 100644 --- a/extensions-builtin/Lora/networks.py +++ b/extensions-builtin/Lora/networks.py @@ -36,6 +36,7 @@ module_types = [ network_full.ModuleTypeFull(), network_norm.ModuleTypeNorm(), ] +convert_diffusers_name_to_compvis = lora_convert.convert_diffusers_name_to_compvis # supermerger compatibility item def assign_network_names_to_compvis_modules(sd_model): diff --git a/modules/images.py b/modules/images.py index 937a7c6a7..158c613ac 100644 --- a/modules/images.py +++ b/modules/images.py @@ -587,11 +587,11 @@ def save_image(image, path, basename = '', seed=None, prompt=None, extension=sha pnginfo[pnginfo_section_name] = info params = script_callbacks.ImageSaveParams(image, p, filename, pnginfo) params.filename = namegen.sanitize(filename) + dirname = os.path.dirname(params.filename) + os.makedirs(dirname, exist_ok=True) script_callbacks.before_image_saved_callback(params) exifinfo = params.pnginfo.get('UserComment', '') exifinfo = (exifinfo + ', ' if len(exifinfo) > 0 else '') + params.pnginfo.get(pnginfo_section_name, '') - dirname = os.path.dirname(params.filename) - os.makedirs(dirname, exist_ok=True) filename, extension = os.path.splitext(params.filename) filename_txt = f"{filename}.txt" if shared.opts.save_txt and len(exifinfo) > 0 else None save_queue.put((params.image, filename, extension, params, exifinfo, filename_txt)) # actual save is executed in a thread that polls data from queue