Merge branch 'main' into bugfix/model-manager-rel-paths

installer/lib/installer.py

@@ -149,7 +149,7 @@ class Installer:
         return venv_dir
 
     def install(
-        self, root: str = "~/invokeai-3", version: str = "latest", yes_to_all=False, find_links: Path = None
+        self, root: str = "~/invokeai", version: str = "latest", yes_to_all=False, find_links: Path = None
     ) -> None:
         """
         Install the InvokeAI application into the given runtime path
@@ -168,7 +168,8 @@ class Installer:
 
         messages.welcome()
 
-        self.dest = Path(root).expanduser().resolve() if yes_to_all else messages.dest_path(root)
+        default_path = os.environ.get("INVOKEAI_ROOT") or Path(root).expanduser().resolve()
+        self.dest = default_path if yes_to_all else messages.dest_path(root)
 
         # create the venv for the app
         self.venv = self.app_venv()

installer/lib/main.py

@@ -3,6 +3,7 @@ InvokeAI Installer
 """
 
 import argparse
+import os
 from pathlib import Path
 from installer import Installer
 
@@ -15,7 +16,7 @@ if __name__ == "__main__":
         dest="root",
         type=str,
         help="Destination path for installation",
-        default="~/invokeai",
+        default=os.environ.get("INVOKEAI_ROOT") or "~/invokeai",
     )
     parser.add_argument(
         "-y",

invokeai/frontend/install/invokeai_update.py

@@ -112,7 +112,7 @@ def main():
 
     extras = get_extras()
 
-    print(f":crossed_fingers: Upgrading to [yellow]{tag if tag else release}[/yellow]")
+    print(f":crossed_fingers: Upgrading to [yellow]{tag or release or branch}[/yellow]")
     if release:
         cmd = f'pip install "invokeai{extras} @ {INVOKE_AI_SRC}/{release}.zip" --use-pep517 --upgrade'
     elif tag:

invokeai/frontend/install/model_install.py

@@ -58,6 +58,9 @@ logger = InvokeAILogger.getLogger()
 # from https://stackoverflow.com/questions/92438/stripping-non-printable-characters-from-a-string-in-python
 NOPRINT_TRANS_TABLE = {i: None for i in range(0, sys.maxunicode + 1) if not chr(i).isprintable()}
 
+# maximum number of installed models we can display before overflowing vertically
+MAX_OTHER_MODELS = 72
+
 
 def make_printable(s: str) -> str:
     """Replace non-printable characters in a string"""
@@ -102,7 +105,7 @@ class addModelsForm(CyclingForm, npyscreen.FormMultiPage):
             SingleSelectColumns,
             values=[
                 "STARTER MODELS",
-                "MORE MODELS",
+                "MAIN MODELS",
                 "CONTROLNETS",
                 "LORA/LYCORIS",
                 "TEXTUAL INVERSION",
@@ -271,6 +274,11 @@ class addModelsForm(CyclingForm, npyscreen.FormMultiPage):
                 )
             )
 
+            truncation = False
+            if len(model_labels) > MAX_OTHER_MODELS:
+                model_labels = model_labels[0:MAX_OTHER_MODELS]
+                truncation = True
+
             widgets.update(
                 models_selected=self.add_widget_intelligent(
                     MultiSelectColumns,
@@ -289,6 +297,16 @@ class addModelsForm(CyclingForm, npyscreen.FormMultiPage):
                 models=model_list,
             )
 
+        if truncation:
+            widgets.update(
+                warning_message=self.add_widget_intelligent(
+                    npyscreen.FixedText,
+                    value=f"Too many models to display (max={MAX_OTHER_MODELS}). Some are not displayed.",
+                    editable=False,
+                    color="CAUTION",
+                )
+            )
+
         self.nextrely += 1
         widgets.update(
             download_ids=self.add_widget_intelligent(
@@ -313,7 +331,7 @@ class addModelsForm(CyclingForm, npyscreen.FormMultiPage):
         widgets = self.add_model_widgets(
             model_type=model_type,
             window_width=window_width,
-            install_prompt=f"Additional {model_type.value.title()} models already installed.",
+            install_prompt=f"Installed {model_type.value.title()} models. Unchecked models in the InvokeAI root directory will be deleted. Enter URLs, paths or repo_ids to import.",
             **kwargs,
         )