rename vae none to default

Signed-off-by: Vladimir Mandic <mandic00@live.com>

CHANGELOG.md

@@ -37,6 +37,7 @@
   - add quantization support to **CogView-3Plus**
   - update `diffusers` and other requirements   
   - remote vae use `scaling_factor` and `shift_factor`  
+  - rename vae *None* to *Default* to avoid confusion  
 - **Fixes**
   - fix installer not starting when older version of `rich` is installed  
   - fix circular imports when debug flags are enabled  

modules/model_flux.py

@@ -265,7 +265,7 @@ def load_flux(checkpoint_info, diffusers_load_config): # triggered by opts.sd_ch
             if debug:
                 from modules import errors
                 errors.display(e, 'FLUX T5:')
-    if shared.opts.sd_vae != 'None' and shared.opts.sd_vae != 'Automatic':
+    if shared.opts.sd_vae != 'Default' and shared.opts.sd_vae != 'Automatic':
         try:
             debug(f'Load model: type=FLUX vae="{shared.opts.sd_vae}"')
             from modules import sd_vae
@@ -276,7 +276,7 @@ def load_flux(checkpoint_info, diffusers_load_config): # triggered by opts.sd_ch
                 vae = diffusers.AutoencoderKL.from_single_file(vae_file, config=vae_config, **diffusers_load_config)
         except Exception as e:
             shared.log.error(f"Load model: type=FLUX failed to load VAE: {e}")
-            shared.opts.sd_vae = 'None'
+            shared.opts.sd_vae = 'Default'
             if debug:
                 from modules import errors
                 errors.display(e, 'FLUX VAE:')

modules/model_sd3.py

@@ -37,7 +37,7 @@ def load_overrides(kwargs, cache_dir):
         except Exception as e:
             shared.log.error(f"Load model: type=SD3 failed to load T5: {e}")
             shared.opts.sd_text_encoder = 'None'
-    if shared.opts.sd_vae != 'None' and shared.opts.sd_vae != 'Automatic':
+    if shared.opts.sd_vae != 'Default' and shared.opts.sd_vae != 'Automatic':
         try:
             from modules import sd_vae
             vae_file = sd_vae.vae_dict[shared.opts.sd_vae]
@@ -47,7 +47,7 @@ def load_overrides(kwargs, cache_dir):
                 shared.log.debug(f'Load model: type=SD3 vae="{shared.opts.sd_vae}"')
         except Exception as e:
             shared.log.error(f"Load model: type=SD3 failed to load VAE: {e}")
-            shared.opts.sd_vae = 'None'
+            shared.opts.sd_vae = 'Default'
     return kwargs
 
 

modules/sd_vae.py

@@ -117,7 +117,7 @@ def resolve_vae(checkpoint_file):
         return None, None
     if shared.cmd_opts.vae is not None: # 1st
         return shared.cmd_opts.vae, 'forced'
-    if shared.opts.sd_vae == "None": # 2nd
+    if shared.opts.sd_vae == "Default": # 2nd
         return None, None
     vae_near_checkpoint = find_vae_near_checkpoint(checkpoint_file)
     if vae_near_checkpoint is not None: # 3rd

modules/shared_items.py

@@ -5,7 +5,7 @@ def postprocessing_scripts():
 
 def sd_vae_items():
     import modules.sd_vae
-    return ["Automatic", "None"] + list(modules.sd_vae.vae_dict)
+    return ["Automatic", "Default"] + list(modules.sd_vae.vae_dict)
 
 
 def sd_taesd_items():