further improvements to model loading

- code for committing config changes to models.yaml now in module
  rather than in invoke script
- model marked "default" is now loaded if model not specified on
  command line
- uncache changed models when edited, so that they reload properly
- removed liaon from models.yaml and added stable-diffusion-1.5

scripts/invoke.py

@@ -341,6 +341,7 @@ def main_loop(gen, opt, infile):
 
     print('goodbye!')
 
+    # to do: this is ugly, fix
 def do_command(command:str, gen, opt:Args, completer) -> tuple:
     operation = 'generate'   # default operation, alternative is 'postprocess'
 
@@ -455,7 +456,10 @@ def add_weights_to_config(model_path:str, gen, opt, completer):
                 done = True
             except:
                 print('** Please enter a valid integer between 64 and 2048')
-    if write_config_file(opt.conf, gen, model_name, new_config):
+
+    make_default = input('Make this the default model? [n] ') in ('y','Y')
+    
+    if write_config_file(opt.conf, gen, model_name, new_config, make_default=make_default):
         completer.add_model(model_name)
 
 def del_config(model_name:str, gen, opt, completer):
@@ -488,14 +492,17 @@ def edit_config(model_name:str, gen, opt, completer):
         completer.linebuffer = str(conf[field]) if field in conf else ''
         new_value = input(f'{field}: ')
         new_config[field] = int(new_value) if field in ('width','height') else new_value
+    make_default = input('Make this the default model? [n] ') in ('y','Y')
     completer.complete_extensions(None)
-    write_config_file(opt.conf, gen, model_name, new_config, clobber=True)
+    write_config_file(opt.conf, gen, model_name, new_config, clobber=True, make_default=make_default)
     
-def write_config_file(conf_path, gen, model_name, new_config, clobber=False):
+def write_config_file(conf_path, gen, model_name, new_config, clobber=False, make_default=False):
     current_model = gen.model_name
     
     op = 'modify' if clobber else 'import'
     print('\n>> New configuration:')
+    if make_default:
+        new_config['default'] = True
     print(yaml.dump({model_name:new_config}))
     if input(f'OK to {op} [n]? ') not in ('y','Y'):
         return False
@@ -508,12 +515,13 @@ def write_config_file(conf_path, gen, model_name, new_config, clobber=False):
         print(f'** aborting **')
         gen.model_cache.del_model(model_name)
         return False
-    
-    tmpfile = os.path.join(os.path.dirname(conf_path),'new_config.tmp')
-    with open(tmpfile, 'w') as outfile:
-        outfile.write(yaml_str)
-    os.rename(tmpfile,conf_path)
 
+    if make_default:
+        print('making this default')
+        gen.model_cache.set_default_model(model_name)
+
+    gen.model_cache.commit(conf_path)
+    
     do_switch = input(f'Keep model loaded? [y]')
     if len(do_switch)==0 or do_switch[0] in ('y','Y'):
         pass