diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e2579884..e0836997e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Change Log for SD.Next -## Update for 2024-02-21 +## Update for 2024-02-22 - **Improvements**: - **IP Adapter** major refactor @@ -104,6 +104,7 @@ - fix taesd with bfloat16 - fix model merge manual merge settings, thanks @AI-Casanova - fix gradio instant update issues for textboxes in quicksettings + - fix rembg missing dependency - bind controlnet extension to last known working commit, thanks @Aptronymist - prompts-from-file fix resizable prompt area diff --git a/extensions-builtin/Lora/networks.py b/extensions-builtin/Lora/networks.py index d4cb5a19d..a3113f54b 100644 --- a/extensions-builtin/Lora/networks.py +++ b/extensions-builtin/Lora/networks.py @@ -442,7 +442,7 @@ def list_available_networks(): if os.path.exists(shared.cmd_opts.lora_dir): directories.append(shared.cmd_opts.lora_dir) else: - shared.log.warning('LoRA directory not found: path="{shared.cmd_opts.lora_dir}"') + shared.log.warning(f'LoRA directory not found: path="{shared.cmd_opts.lora_dir}"') if os.path.exists(shared.cmd_opts.lyco_dir) and shared.cmd_opts.lyco_dir != shared.cmd_opts.lora_dir: directories.append(shared.cmd_opts.lyco_dir) diff --git a/extensions-builtin/stable-diffusion-webui-rembg b/extensions-builtin/stable-diffusion-webui-rembg index 7fd9904d9..8985722e3 160000 --- a/extensions-builtin/stable-diffusion-webui-rembg +++ b/extensions-builtin/stable-diffusion-webui-rembg @@ -1 +1 @@ -Subproject commit 7fd9904d9b01bdc8e2029f908ca5005aff184f61 +Subproject commit 8985722e34377a7c966fd3b5e02751922e777e44 diff --git a/modules/images.py b/modules/images.py index d91f06b94..a9060da06 100644 --- a/modules/images.py +++ b/modules/images.py @@ -343,7 +343,7 @@ class FilenameGenerator: else: debug(f'Filename generator init: {seed} {prompt}') self.p = p - if seed is not None and seed > 0: + if seed is not None and int(seed) > 0: self.seed = seed elif hasattr(p, 'all_seeds'): self.seed = p.all_seeds[0] diff --git a/modules/modeldata.py b/modules/modeldata.py index dc32fdea1..bfb011115 100644 --- a/modules/modeldata.py +++ b/modules/modeldata.py @@ -90,6 +90,8 @@ class Shared(sys.modules[__name__].__class__): model_type = 'sd' # sd is compatible with sd elif "Kandinsky" in self.sd_model.__class__.__name__: model_type = 'kandinsky' + elif "Cascade" in self.sd_model.__class__.__name__: + model_type = 'sc' else: model_type = self.sd_model.__class__.__name__ except Exception: diff --git a/modules/styles.py b/modules/styles.py index 90c7e339a..59047b565 100644 --- a/modules/styles.py +++ b/modules/styles.py @@ -78,14 +78,20 @@ class StyleDatabase: self.load_csv(legacy_file) opts.styles_dir = os.path.join(paths.models_path, "styles") self.path = opts.styles_dir - os.makedirs(opts.styles_dir, exist_ok=True) - self.save_styles(opts.styles_dir, verbose=True) - log.debug(f'Migrated styles: file={legacy_file} folder={opts.styles_dir}') - self.reload() + try: + os.makedirs(opts.styles_dir, exist_ok=True) + self.save_styles(opts.styles_dir, verbose=True) + log.debug(f'Migrated styles: file={legacy_file} folder={opts.styles_dir}') + self.reload() + except Exception as e: + log.error(f'styles failed to migrate: file={legacy_file} error={e}') if not os.path.isdir(opts.styles_dir): opts.styles_dir = os.path.join(paths.models_path, "styles") self.path = opts.styles_dir - os.makedirs(opts.styles_dir, exist_ok=True) + try: + os.makedirs(opts.styles_dir, exist_ok=True) + except Exception: + pass def load_style(self, fn, prefix=None): with open(fn, 'r', encoding='utf-8') as f: diff --git a/wiki b/wiki index acb20bf73..406df0d4f 160000 --- a/wiki +++ b/wiki @@ -1 +1 @@ -Subproject commit acb20bf7379325e9fabb914118b37515ecc76e8f +Subproject commit 406df0d4f32257a96f551040d4b1033928dd6ead