update version number (#2199)

* installer tweaks in preparation for v2.2.5

- pin numpy to 1.23.* to avoid requirements conflict with numba
- update.sh and update.bat now accept a tag or branch string, not a URL
- update scripts download latest requirements-base before updating.

* update.bat.in debugged and working

* update pulls from "latest" now

* bump version number

* fix permissions on create_installer.sh

* give Linux user option of installing ROCm or CUDA

* rc2.2.5 (install.sh) relative path fixes (#2155)

* (installer) fix bug in resolution of relative paths in linux install script

point installer at 2.2.5-rc1

selecting ~/Data/myapps/ as location  would create a ./~/Data/myapps
instead of expanding the ~/ to the value of ${HOME}

also, squash the trailing slash in path, if it was entered by the user

* (installer) add option to automatically start the app after install

also: when exiting, print the command to get back into the app

* remove extraneous whitespace

* model_cache applies rootdir to config path

* bring installers up to date with 2.2.5-rc2

* bump rc version

* create_installer now adds version number

* rebuild frontend

* bump rc#

* add locales to frontend dist package

- bump to patchlevel 6

* bump patchlevel

* use invoke-ai version of GFPGAN

- This version is very slightly modified to allow weights files
  to be pre-downloaded by the configure script.

* fix formatting error during startup

* bump patch level

* workaround #2 for GFPGAN facexlib() weights downloading

* bump patch

* ready for merge and release

* remove extraneous comment

* set PYTORCH_ENABLE_MPS_FALLBACK directly in invoke.py

Co-authored-by: Eugene Brodsky <ebr@users.noreply.github.com>

docs/features/WEBUIHOTKEYS.md

@@ -6,70 +6,70 @@ title: WebUI Hotkey List
 
 ## App Hotkeys
 
-| Setting           | Hotkey             |
-| ----------------- | ------------------ |
-| ++"Ctrl\+Enter"++ | Invoke             |
-| ++"Shift\+X"++    | Cancel             |
-| ++"Alt\+A"++      | Focus Prompt       |
-| ++"O"++           | Toggle Options     |
-| ++"Shift\+O"++    | Pin Options        |
-| ++"Z"++           | Toggle Viewer      |
-| ++"G"++           | Toggle Gallery     |
-| ++"F"++           | Maximize Workspace |
-| ++"1-5"++         | Change Tabs        |
-| ++"`"++           | Toggle Console     |
+| Setting         | Hotkey             |
+| --------------- | ------------------ |
+| ++ctrl+enter++  | Invoke             |
+| ++shift+x++     | Cancel             |
+| ++alt+a++       | Focus Prompt       |
+| ++o++           | Toggle Options     |
+| ++shift+o++     | Pin Options        |
+| ++z++           | Toggle Viewer      |
+| ++g++           | Toggle Gallery     |
+| ++f++           | Maximize Workspace |
+| ++1++ - ++5++   | Change Tabs        |
+| ++"`"++         | Toggle Console     |
 
 ## General Hotkeys
 
-| Setting         | Hotkey                 |
-| --------------- | ---------------------- |
-| ++"P"++         | Set Prompt             |
-| ++"S"++         | Set Seed               |
-| ++"A"++         | Set Parameters         |
-| ++"Shift\+R"++  | Restore Faces          |
-| ++"Shift\+U"++  | Upscale                |
-| ++"I"++         | Show Info              |
-| ++"Shift\+I"++  | Send To Image To Image |
-| ++"Del"++       | Delete Image           |
-| ++"Esc"++       | Close Panels           |
+| Setting        | Hotkey                 |
+| -------------- | ---------------------- |
+| ++p++          | Set Prompt             |
+| ++s++          | Set Seed               |
+| ++a++          | Set Parameters         |
+| ++shift+r++    | Restore Faces          |
+| ++shift+u++    | Upscale                |
+| ++i++          | Show Info              |
+| ++shift+i++    | Send To Image To Image |
+| ++del++        | Delete Image           |
+| ++esc++        | Close Panels           |
 
 ## Gallery Hotkeys
 
-| Setting            | Hotkey                      |
-| ------------------ | --------------------------- |
-| ++"Arrow Left"++   | Previous Image              |
-| ++"Arrow Right"++  | Next Image                  |
-| ++"Shift\+G"++     | Toggle Gallery Pin          |
-| ++"Shift\+Up"++    | Increase Gallery Image Size |
-| ++"Shift\+Down"++  | Decrease Gallery Image Size |
+| Setting               | Hotkey                      |
+| ----------------------| --------------------------- |
+| ++arrow-left++        | Previous Image              |
+| ++arrow-right++       | Next Image                  |
+| ++shift+g++           | Toggle Gallery Pin          |
+| ++shift+arrow-up++    | Increase Gallery Image Size |
+| ++shift+arrow-down++  | Decrease Gallery Image Size |
 
 ## Unified Canvas Hotkeys
 
-| Setting                        | Hotkey                 |
-| ------------------------------ | ---------------------- |
-| ++"B"++                        | Select Brush           |
-| ++"E"++                        | Select Eraser          |
-| ++"["++                        | Decrease Brush Size    |
-| ++"]"++                        | Increase Brush Size    |
-| ++"Shift\+["++                 | Decrease Brush Opacity |
-| ++"Shift\+]"++                 | Increase Brush Opacity |
-| ++"V"++                        | Move Tool              |
-| ++"Shift\+F"++                 | Fill Bounding Box      |
-| ++"Delete/Backspace"++         | Erase Bounding Box     |
-| ++"C"++                        | Select Color Picker    |
-| ++"N"++                        | Toggle Snap            |
-| ++"Hold Space"++               | Quick Toggle Move      |
-| ++"Q"++                        | Toggle Layer           |
-| ++"Shift\+C"++                 | Clear Mask             |
-| ++"H"++                        | Hide Mask              |
-| ++"Shift\+H"++                 | Show/Hide Bounding Box |
-| ++"Shift\+M"++                 | Merge Visible          |
-| ++"Shift\+S"++                 | Save To Gallery        |
-| ++"Ctrl\+C"++                  | Copy To Clipboard      |
-| ++"Shift\+D"++                 | Download Image         |
-| ++"Ctrl\+Z"++                  | Undo                   |
-| ++"Ctrl\+Y / Ctrl\+Shift\+Z"++ | Redo                   |
-| ++"R"++                        | Reset View             |
-| ++"Arrow Left"++               | Previous Staging Image |
-| ++"Arrow Right"++              | Next Staging Image     |
-| ++"Enter"++                    | Accept Staging Image   |
+| Setting                           | Hotkey                 |
+| --------------------------------- | ---------------------- |
+| ++b++                             | Select Brush           |
+| ++e++                             | Select Eraser          |
+| ++bracket-left++                  | Decrease Brush Size    |
+| ++bracket-right++                 | Increase Brush Size    |
+| ++shift+bracket-left++            | Decrease Brush Opacity |
+| ++shift+bracket-right++           | Increase Brush Opacity |
+| ++v++                             | Move Tool              |
+| ++shift+f++                       | Fill Bounding Box      |
+| ++del++ / ++backspace++           | Erase Bounding Box     |
+| ++c++                             | Select Color Picker    |
+| ++n++                             | Toggle Snap            |
+| ++"Hold Space"++                  | Quick Toggle Move      |
+| ++q++                             | Toggle Layer           |
+| ++shift+c++                       | Clear Mask             |
+| ++h++                             | Hide Mask              |
+| ++shift+h++                       | Show/Hide Bounding Box |
+| ++shift+m++                       | Merge Visible          |
+| ++shift+s++                       | Save To Gallery        |
+| ++ctrl+c++                        | Copy To Clipboard      |
+| ++shift+d++                       | Download Image         |
+| ++ctrl+z++                        | Undo                   |
+| ++ctrl+y++ / ++ctrl+shift+z++     | Redo                   |
+| ++r++                             | Reset View             |
+| ++arrow-left++                    | Previous Staging Image |
+| ++arrow-right++                   | Next Staging Image     |
+| ++enter++                         | Accept Staging Image   |

environments-and-requirements/requirements-base.txt

@@ -35,6 +35,5 @@ torchmetrics
 transformers==4.25.*
 https://github.com/Birch-san/k-diffusion/archive/refs/heads/mps.zip#egg=k-diffusion
 https://github.com/invoke-ai/PyPatchMatch/archive/refs/tags/0.1.5.zip#egg=pypatchmatch
-https://github.com/invoke-ai/GFPGAN/archive/refs/heads/master.zip#egg=gfpgan
 https://github.com/openai/CLIP/archive/eaa22acb90a5876642d0507623e859909230a52d.zip#egg=clip
 https://github.com/invoke-ai/clipseg/archive/relaxed-python-requirement.zip#egg=clipseg

installer/create_installer.sh

@@ -3,8 +3,8 @@
 cd "$(dirname "$0")"
 
 VERSION=$(grep ^VERSION ../setup.py | awk '{ print $3 }' | sed "s/'//g" )
-PATCH="-rc8"
-VERSION="${VERSION}${PATCH}"
+PATCH=""
+VERSION="v${VERSION}${PATCH}"
 
 echo "Be certain that you're in the 'installer' directory before continuing."
 read -p "Press any key to continue, or CTRL-C to exit..."
@@ -19,7 +19,7 @@ fi
 git push origin :refs/tags/latest
 git tag -fa latest
 
-echo Building installer zip fles for InvokeAI v$VERSION
+echo Building installer zip fles for InvokeAI $VERSION
 
 # get rid of any old ones
 rm *.zip

ldm/invoke/CLI.py

@@ -20,6 +20,7 @@ from ldm.invoke.concepts_lib import Concepts
 from omegaconf import OmegaConf
 from pathlib import Path
 import pyparsing
+import ldm.invoke
 
 # global used in multiple functions (fix)
 infile = None
@@ -51,6 +52,7 @@ def main():
             print(f'** This script will now exit.')
             sys.exit(-1)
 
+    print(f'>> {ldm.invoke.__app_name__} {ldm.invoke.__version__}')
     print(f'>> InvokeAI runtime directory is "{Globals.root}"')
 
     # loading here to avoid long delays on startup

ldm/invoke/__init__.py

@@ -1,3 +1,3 @@
 __app_id__= 'invoke-ai/InvokeAI'
 __app_name__= 'InvokeAI'
-__version__='2.2.4'
+__version__='2.2.5'

ldm/invoke/restoration/gfpgan.py

@@ -33,6 +33,8 @@ class GFPGAN():
         with warnings.catch_warnings():
             warnings.filterwarnings('ignore', category=DeprecationWarning)
             warnings.filterwarnings('ignore', category=UserWarning)
+            cwd = os.getcwd()
+            os.chdir(os.path.join(Globals.root,'models'))
             try:
                 from gfpgan import GFPGANer
                 self.gfpgan = GFPGANer(
@@ -46,6 +48,7 @@ class GFPGAN():
                 import traceback
                 print('>> Error loading GFPGAN:', file=sys.stderr)
                 print(traceback.format_exc(), file=sys.stderr)
+            os.chdir(cwd)
 
         if self.gfpgan is None:
             print(

scripts/invoke.py

@@ -1,5 +1,10 @@
 #!/usr/bin/env python
 
+import sys
+import os
+if sys.platform == 'Darsin':
+    os.environ["PYTORCH_ENABLE_MPS_FALLBACK"] = "1"
+
 import ldm.invoke.CLI
 ldm.invoke.CLI.main()