Merge branch 'v2.3' into bugfix/lora-incompatibility-handling

Author: lstein

installer/lib/installer.py

@@ -132,13 +132,12 @@ def app_venv(self, path: str = None):
 
         # Prefer to copy python executables
         # so that updates to system python don't break InvokeAI
-        if not venv_dir.exists():
-            try:
-                venv.create(venv_dir, with_pip=True)
-            # If installing over an existing environment previously created with symlinks,
-            # the executables will fail to copy. Keep symlinks in that case
-            except shutil.SameFileError:
-                venv.create(venv_dir, with_pip=True, symlinks=True)
+        try:
+            venv.create(venv_dir, with_pip=True)
+        # If installing over an existing environment previously created with symlinks,
+        # the executables will fail to copy. Keep symlinks in that case
+        except shutil.SameFileError:
+            venv.create(venv_dir, with_pip=True, symlinks=True)
 
         # upgrade pip in Python 3.9 environments
         if int(platform.python_version_tuple()[1]) == 9:

ldm/invoke/CLI.py

@@ -4,6 +4,7 @@
 import sys
 import traceback
 from argparse import Namespace
+from packaging import version
 from pathlib import Path
 from typing import Union
 
@@ -25,6 +26,7 @@
 from .globals import Globals, global_config_dir
 from .image_util import make_grid
 from .log import write_log
+from .model_manager import ModelManager
 from .pngwriter import PngWriter, retrieve_metadata, write_metadata
 from .readline import Completer, get_completer
 from ..util import url_attachment_name
@@ -64,6 +66,9 @@ def main():
     Globals.sequential_guidance = args.sequential_guidance
     Globals.ckpt_convert = True  # always true as of 2.3.4 for LoRA support
 
+    # run any post-install patches needed
+    run_patches()
+
     print(f">> Internet connectivity is {Globals.internet_available}")
 
     if not args.conf:
@@ -108,6 +113,9 @@ def main():
     if opt.lora_path:
         Globals.lora_models_dir = opt.lora_path
 
+    # migrate legacy models
+    ModelManager.migrate_models()
+
     # load the infile as a list of lines
     if opt.infile:
         try:
@@ -1291,6 +1299,62 @@ def retrieve_last_used_model()->str:
     with open(model_file_path,'r') as f:
         return f.readline()
 
+# This routine performs any patch-ups needed after installation
+def run_patches():
+    install_missing_config_files()
+    version_file = Path(Globals.root,'.version')
+    if version_file.exists():
+        with open(version_file,'r') as f:
+            root_version = version.parse(f.readline() or 'v2.3.2')
+    else:
+        root_version = version.parse('v2.3.2')
+    app_version = version.parse(ldm.invoke.__version__)
+    if root_version < app_version:
+        try:
+            do_version_update(root_version, ldm.invoke.__version__)
+            with open(version_file,'w') as f:
+                f.write(ldm.invoke.__version__)
+        except:
+            print("** Update failed. Will try again on next launch")
+
+def install_missing_config_files():
+    """
+    install ckpt configuration files that may have been added to the
+    distro after original root directory configuration
+    """
+    import invokeai.configs as conf
+    from shutil import copyfile
+    
+    root_configs = Path(global_config_dir(), 'stable-diffusion')
+    repo_configs = Path(conf.__path__[0], 'stable-diffusion')
+    for src in repo_configs.iterdir():
+        dest = root_configs / src.name
+        if not dest.exists():
+            copyfile(src,dest)
+    
+def do_version_update(root_version: version.Version, app_version: Union[str, version.Version]):
+    """
+    Make any updates to the launcher .sh and .bat scripts that may be needed
+    from release to release. This is not an elegant solution. Instead, the 
+    launcher should be moved into the source tree and installed using pip.
+    """
+    if root_version < version.Version('v2.3.4'):
+        dest = Path(Globals.root,'loras')
+        dest.mkdir(exist_ok=True)
+    if root_version < version.Version('v2.3.3'):
+        if sys.platform == "linux":
+            print('>> Downloading new version of launcher script and its config file')
+            from ldm.util import download_with_progress_bar
+            url_base = f'https://raw.githubusercontent.com/invoke-ai/InvokeAI/v{str(app_version)}/installer/templates/'
+
+            dest = Path(Globals.root,'invoke.sh.in')
+            assert download_with_progress_bar(url_base+'invoke.sh.in',dest)
+            dest.replace(Path(Globals.root,'invoke.sh'))
+            os.chmod(Path(Globals.root,'invoke.sh'), 0o0755)
+
+            dest = Path(Globals.root,'dialogrc')
+            assert download_with_progress_bar(url_base+'dialogrc',dest)
+            dest.replace(Path(Globals.root,'.dialogrc'))
 
 if __name__ == '__main__':
     main()

ldm/invoke/config/invokeai_configure.py

@@ -21,6 +21,7 @@
 from shutil import get_terminal_size
 
 import npyscreen
+import torch
 import transformers
 from diffusers import AutoencoderKL
 from huggingface_hub import HfFolder
@@ -663,19 +664,8 @@ def initialize_rootdir(root: str, yes_to_all: bool = False):
     configs_src = Path(configs.__path__[0])
     configs_dest = Path(root) / "configs"
     if not os.path.samefile(configs_src, configs_dest):
-        shutil.copytree(configs_src,
-                        configs_dest,
-                        dirs_exist_ok=True,
-                        copy_function=shutil.copyfile,
-                        )
-    # Fix up directory permissions so that they are writable
-    # This can happen when running under Nix environment which
-    # makes the runtime directory template immutable.
-    for root,dirs,files in os.walk(os.path.join(root,name)):
-        for d in dirs:
-            Path(root,d).chmod(0o775)
-        for f in files:
-            Path(root,d).chmod(0o644)
+        shutil.copytree(configs_src, configs_dest, dirs_exist_ok=True)
+
 
 # -------------------------------------
 def run_console_ui(

ldm/invoke/config/invokeai_update.py

@@ -42,18 +42,8 @@ def invokeai_is_running()->bool:
         except psutil.AccessDenied:
             continue
     return False
-
-def do_post_install():
-    '''
-    Run postinstallation script.
-    '''
-    print("Looking for postinstallation script to run on this version...")
-    try:
-        from ldm.invoke.config.post_install.py import post_install
-        post_install()
-    except:
-        print("Postinstallation script not available for this version of InvokeAI")
 
+    
 def welcome(versions: dict):
 
     @group()
@@ -117,7 +107,6 @@ def main():
         print(f':heavy_check_mark: Upgrade successful')
     else:
         print(f':exclamation: [bold red]Upgrade failed[/red bold]')
-    do_post_install()
 
 if __name__ == "__main__":
     try:

ldm/invoke/config/model_install_backend.py

@@ -398,19 +398,7 @@ def update_config_file(successfully_downloaded: dict, config_file: Path):
     if config_file is default_config_file() and not config_file.parent.exists():
         configs_src = Dataset_path.parent
         configs_dest = default_config_file().parent
-        shutil.copytree(configs_src,
-                        configs_dest,
-                        dirs_exist_ok=True,
-                        copy_function=shutil.copyfile,
-                        )
-    # Fix up directory permissions so that they are writable
-    # This can happen when running under Nix environment which
-    # makes the runtime directory template immutable.
-    for root,dirs,files in os.walk(default_config_file().parent):
-        for d in dirs:
-            Path(root,d).chmod(0o775)
-        for f in files:
-            Path(root,d).chmod(0o644)
+        shutil.copytree(configs_src, configs_dest, dirs_exist_ok=True)
 
     yaml = new_config_file_contents(successfully_downloaded, config_file)