Merge branch 'v2.3' into bugfix/v2-model-conversion

.github/workflows/pypi-release.yml

@@ -28,7 +28,7 @@ jobs:
         run: twine check dist/*
 
       - name: check PyPI versions
-        if: github.ref == 'refs/heads/main'
+        if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/v2.3'
         run: |
           pip install --upgrade requests
           python -c "\

ldm/invoke/_version.py

@@ -1 +1 @@
-__version__='2.3.1+rc3'
+__version__='2.3.1-rc4'

ldm/invoke/config/invokeai_update.py

@@ -2,18 +2,16 @@
 Minimalist updater script. Prompts user for the tag or branch to update to and runs
 pip install <path_to_git_source>.
 '''
-
+import os
 import platform
 import requests
-import subprocess
 from rich import box, print
-from rich.console import Console, group
+from rich.console import Console, Group, group
 from rich.panel import Panel
 from rich.prompt import Prompt
 from rich.style import Style
+from rich.syntax import Syntax
 from rich.text import Text
-from rich.live import Live
-from rich.table import Table
 
 from ldm.invoke import __version__
 
@@ -23,19 +21,17 @@ INVOKE_AI_REL="https://api.github.com/repos/invoke-ai/InvokeAI/releases"
 OS = platform.uname().system
 ARCH = platform.uname().machine
 
-ORANGE_ON_DARK_GREY = Style(bgcolor="grey23", color="orange1")
-
 if OS == "Windows":
     # Windows terminals look better without a background colour
     console = Console(style=Style(color="grey74"))
 else:
-    console = Console(style=Style(color="grey74", bgcolor="grey23"))
+    console = Console(style=Style(color="grey74", bgcolor="grey19"))
 
 def get_versions()->dict:
     return requests.get(url=INVOKE_AI_REL).json()
 
 def welcome(versions: dict):
-
+    
     @group()
     def text():
         yield f'InvokeAI Version: [bold yellow]{__version__}'
@@ -48,55 +44,45 @@ def welcome(versions: dict):
 [3] Manually enter the tag or branch name you wish to update'''
 
     console.rule()
-    console.print(
+    print(
         Panel(
             title="[bold wheat1]InvokeAI Updater",
             renderable=text(),
             box=box.DOUBLE,
             expand=True,
             padding=(1, 2),
-            style=ORANGE_ON_DARK_GREY,
+            style=Style(bgcolor="grey23", color="orange1"),
             subtitle=f"[bold grey39]{OS}-{ARCH}",
         )
     )
-    # console.rule is used instead of console.line to maintain dark background
-    # on terminals where light background is the default
-    console.rule(characters=" ")
+    console.line()
 
 def main():
     versions = get_versions()
     welcome(versions)
 
     tag = None
-    choice = Prompt.ask(Text.from_markup(('[grey74 on grey23]Choice:')),choices=['1','2','3'],default='1')
-
+    choice = Prompt.ask('Choice:',choices=['1','2','3'],default='1')
+    
     if choice=='1':
         tag = versions[0]['tag_name']
     elif choice=='2':
         tag = 'main'
     elif choice=='3':
-        tag = Prompt.ask('[grey74 on grey23]Enter an InvokeAI tag or branch name')
-
-    console.print(Panel(f':crossed_fingers: Upgrading to [yellow]{tag}[/yellow]', box=box.MINIMAL, style=ORANGE_ON_DARK_GREY))
+        tag = Prompt.ask('Enter an InvokeAI tag or branch name')
 
+    print(f':crossed_fingers: Upgrading to [yellow]{tag}[/yellow]')
     cmd = f'pip install {INVOKE_AI_SRC}/{tag}.zip --use-pep517'
-
-    progress = Table.grid(expand=True)
-    progress_panel = Panel(progress, box=box.MINIMAL, style=ORANGE_ON_DARK_GREY)
-
-    with subprocess.Popen(['bash', '-c', cmd], stdout=subprocess.PIPE, stderr=subprocess.PIPE) as proc:
-        progress.add_column()
-        with Live(progress_panel, console=console, vertical_overflow='visible'):
-            while proc.poll() is None:
-                for l in iter(proc.stdout.readline, b''):
-                    progress.add_row(l.decode().strip(), style=ORANGE_ON_DARK_GREY)
-        if proc.returncode == 0:
-            console.rule(f':heavy_check_mark: Upgrade successful')
-        else:
-            console.rule(f':exclamation: [bold red]Upgrade failed[/red bold]')
-
+    print('')
+    print('')
+    if os.system(cmd)==0:
+        print(f':heavy_check_mark: Upgrade successful')
+    else:
+        print(f':exclamation: [bold red]Upgrade failed[/red bold]')
+    
 if __name__ == "__main__":
     try:
         main()
     except KeyboardInterrupt:
         pass
+

ldm/invoke/globals.py

@@ -19,15 +19,7 @@ from typing import Union
 
 Globals = Namespace()
 
-# This is usually overwritten by the command line and/or environment variables
-if os.environ.get('INVOKEAI_ROOT'):
-    Globals.root = osp.abspath(os.environ.get('INVOKEAI_ROOT'))
-elif os.environ.get('VIRTUAL_ENV'):
-    Globals.root = osp.abspath(osp.join(os.environ.get('VIRTUAL_ENV'), '..'))
-else:
-    Globals.root = osp.abspath(osp.expanduser('~/invokeai'))
-
-# Where to look for the initialization file
+# Where to look for the initialization file and other key components
 Globals.initfile = 'invokeai.init'
 Globals.models_file = 'models.yaml'
 Globals.models_dir = 'models'
@@ -35,6 +27,20 @@ Globals.config_dir = 'configs'
 Globals.autoscan_dir = 'weights'
 Globals.converted_ckpts_dir = 'converted_ckpts'
 
+# Set the default root directory. This can be overwritten by explicitly
+# passing the `--root <directory>` argument on the command line.
+# logic is:
+# 1) use INVOKEAI_ROOT environment variable (no check for this being a valid directory)
+# 2) use VIRTUAL_ENV environment variable, with a check for initfile being there
+# 3) use ~/invokeai
+
+if os.environ.get('INVOKEAI_ROOT'):
+    Globals.root = osp.abspath(os.environ.get('INVOKEAI_ROOT'))
+elif os.environ.get('VIRTUAL_ENV') and Path(os.environ.get('VIRTUAL_ENV'),'..',Globals.initfile).exists():
+    Globals.root = osp.abspath(osp.join(os.environ.get('VIRTUAL_ENV'), '..'))
+else:
+    Globals.root = osp.abspath(osp.expanduser('~/invokeai'))
+
 # Try loading patchmatch
 Globals.try_patchmatch = True