From 93bf3bb263701ca25f0273c4314753eadaa88a5d Mon Sep 17 00:00:00 2001 From: Vladimir Mandic Date: Mon, 21 Aug 2023 08:31:50 +0000 Subject: [PATCH] set default settings --- CHANGELOG.md | 7 +++++++ modules/sd_models.py | 2 +- modules/sd_vae.py | 20 ++++++++++---------- webui.py | 1 + 4 files changed, 19 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 43a450151..5212f7b5a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Change Log for SD.Next +## Update for 2023-08-21 + +- general: + - all system and image paths are now relative by default + - fix extra networks previews + - add settings validation when performing load/save + ## Update for 2023-08-20 Another release thats been baking in dev branch for a while... diff --git a/modules/sd_models.py b/modules/sd_models.py index f46bb27f7..f1442ae5b 100644 --- a/modules/sd_models.py +++ b/modules/sd_models.py @@ -246,7 +246,7 @@ def select_checkpoint(op='model'): else: shared.log.info("Selecting first available checkpoint") # shared.log.warning(f"Loading fallback checkpoint: {checkpoint_info.title}") - shared.opts.data['sd_checkpoint'] = checkpoint_info.title + shared.opts.data['sd_model_checkpoint'] = checkpoint_info.title shared.log.debug(f'Select checkpoint: {checkpoint_info.title if checkpoint_info is not None else None}') return checkpoint_info diff --git a/modules/sd_vae.py b/modules/sd_vae.py index 07f3a6600..8e845431d 100644 --- a/modules/sd_vae.py +++ b/modules/sd_vae.py @@ -117,18 +117,18 @@ def resolve_vae(checkpoint_file): return None, None vae_near_checkpoint = find_vae_near_checkpoint(checkpoint_file) if vae_near_checkpoint is not None: # 3rd - return vae_near_checkpoint, 'near checkpoint' + return vae_near_checkpoint, 'near-checkpoint' if shared.opts.sd_vae == "Automatic": # 4th basename = os.path.splitext(os.path.basename(checkpoint_file))[0] if vae_dict.get(basename, None) is not None: - return vae_dict[basename], 'in VAE dir' + return vae_dict[basename], 'automatic' else: vae_from_options = vae_dict.get(shared.opts.sd_vae, None) # 5th if vae_from_options is not None: - return vae_from_options, 'specified in settings' + return vae_from_options, 'settings' vae_from_options = vae_dict.get(shared.opts.sd_vae + '.safetensors', None) # 6th if vae_from_options is not None: - return vae_from_options, 'specified in settings' + return vae_from_options, 'settings' shared.log.warning(f"VAE not found: {shared.opts.sd_vae}") return None, None @@ -139,18 +139,18 @@ def load_vae_dict(filename): return vae_dict_1 -def load_vae(model, vae_file=None, vae_source="from unknown source"): +def load_vae(model, vae_file=None, vae_source="unknown-source"): global loaded_vae_file # pylint: disable=global-statement cache_enabled = shared.opts.sd_vae_checkpoint_cache > 0 if vae_file: if cache_enabled and vae_file in checkpoints_loaded: # use vae checkpoint cache - shared.log.info(f"Loading VAE weights: {vae_source}: cached {get_filename(vae_file)}") + shared.log.info(f"Loading VAE weights: {get_filename(vae_file)} source={vae_source} cached=True") store_base_vae(model) _load_vae_dict(model, checkpoints_loaded[vae_file]) else: if not os.path.isfile(vae_file): - shared.log.error(f"VAE {vae_source} doesn't exist: {vae_file}") + shared.log.error(f"VAE doesn't exist: {vae_file} source={vae_source}") return store_base_vae(model) vae_dict_1 = load_vae_dict(vae_file) @@ -172,13 +172,13 @@ def load_vae(model, vae_file=None, vae_source="from unknown source"): loaded_vae_file = vae_file -def load_vae_diffusers(model_file, vae_file=None, vae_source="from unknown source"): +def load_vae_diffusers(model_file, vae_file=None, vae_source="unknown-source"): if vae_file is None: return None if not os.path.exists(vae_file): shared.log.error(f'VAE not found: {vae_file}') return None - shared.log.info(f"Loading diffusers VAE: {vae_source}: {vae_file}") + shared.log.info(f"Loading diffusers VAE: {vae_file} source={vae_source}") diffusers_load_config = { "low_cpu_mem_usage": False, "torch_dtype": devices.dtype_vae, @@ -236,7 +236,7 @@ def reload_vae_weights(sd_model=None, vae_file=unspecified): if vae_file == unspecified: vae_file, vae_source = resolve_vae(checkpoint_file) else: - vae_source = "from function argument" + vae_source = "function-argument" if loaded_vae_file == vae_file: return if not sd_model.has_accelerate: diff --git a/webui.py b/webui.py index d4feb3001..f0aa8b6f1 100644 --- a/webui.py +++ b/webui.py @@ -322,6 +322,7 @@ def webui(restart=False): start_ui() modules.sd_models.write_metadata() load_model() + shared.opts.save(shared.config_filename) log.info(f"Startup time: {startup_timer.summary()}") if not restart: