change download links to release candidate

This makes a cosmetic change. Instead of calling preload_models.py
(deprecated) it calls configure_invokeai.py. Currently the two do
the same thing.

binary_installer/create_installers.sh

@@ -13,8 +13,8 @@ cp install.sh.in InvokeAI/install.sh
 chmod a+x InvokeAI/install.sh
 cp readme.txt InvokeAI
 
-zip -r InvokeAI-linux.zip InvokeAI
-zip -r InvokeAI-mac.zip InvokeAI
+zip -r InvokeAI-binary-linux.zip InvokeAI
+zip -r InvokeAI-binary-mac.zip InvokeAI
 
 # make the installer zip for windows
 rm -rf InvokeAI
@@ -23,7 +23,7 @@ cp install.bat.in InvokeAI/install.bat
 cp readme.txt InvokeAI
 cp WinLongPathsEnabled.reg InvokeAI
 
-zip -r InvokeAI-windows.zip InvokeAI
+zip -r InvokeAI-binary-windows.zip InvokeAI
 
 rm -rf InvokeAI
 

binary_installer/install.bat.in

@@ -22,9 +22,7 @@ set INSTALL_ENV_DIR=%cd%\installer_files\env
 @rem https://mamba.readthedocs.io/en/latest/installation.html
 set MICROMAMBA_DOWNLOAD_URL=https://github.com/cmdr2/stable-diffusion-ui/releases/download/v1.1/micromamba.exe
 set RELEASE_URL=https://github.com/invoke-ai/InvokeAI
-#set RELEASE_SOURCEBALL=/archive/refs/heads/main.tar.gz
-# RELEASE_SOURCEBALL=/archive/refs/heads/test-installer.tar.gz
-RELEASE_SOURCEBALL=/archive/refs/heads/development.tar.gz
+set RELEASE_SOURCEBALL=/archive/refs/heads/main.tar.gz
 set PYTHON_BUILD_STANDALONE_URL=https://github.com/indygreg/python-build-standalone/releases/download
 set PYTHON_BUILD_STANDALONE=20221002/cpython-3.10.7+20221002-x86_64-pc-windows-msvc-shared-install_only.tar.gz
 

binary_installer/py3.10-linux-x86_64-cuda-reqs.txt

@@ -4,7 +4,7 @@
 #
 #    pip-compile --allow-unsafe --generate-hashes --output-file=installer/py3.10-linux-x86_64-cuda-reqs.txt installer/requirements.in
 #
---extra-index-url https://download.pytorch.org/whl/cu116
+--extra-index-url https://download.pytorch.org/whl/torch_stable.html
 --trusted-host https
 
 absl-py==1.3.0 \

binary_installer/py3.10-windows-x86_64-cuda-reqs.txt

@@ -4,6 +4,7 @@
 #
 #    pip-compile --allow-unsafe --generate-hashes --output-file=installer/py3.10-windows-x86_64-cuda-reqs.txt installer/requirements.in
 #
+--extra-index-url https://download.pytorch.org/whl/torch_stable.html
 --extra-index-url https://download.pytorch.org/whl/cu116
 --trusted-host https
 
@@ -150,6 +151,10 @@ blinker==1.5 \
     --hash=sha256:1eb563df6fdbc39eeddc177d953203f99f097e9bf0e2b8f9f3cf18b6ca425e36 \
     --hash=sha256:923e5e2f69c155f2cc42dafbbd70e16e3fde24d2d4aa2ab72fbe386238892462
     # via streamlit
+boltons==21.0.0 \
+    --hash=sha256:65e70a79a731a7fe6e98592ecfb5ccf2115873d01dbc576079874629e5c90f13 \
+    --hash=sha256:b9bb7b58b2b420bbe11a6025fdef6d3e5edc9f76a42fb467afe7ca212ef9948b
+    # via torchsde
 cachetools==5.2.0 \
     --hash=sha256:6a94c6402995a99c3970cc7e4884bb60b4a8639938157eeed436098bf9831757 \
     --hash=sha256:f9f17d2aec496a9aa6b76f53e3b614c965223c061982d434d160f930c698a9db
@@ -614,8 +619,8 @@ jsonschema==4.17.0 \
     # via
     #   altair
     #   jsonmerge
-k-diffusion @ https://github.com/invoke-ai/k-diffusion/archive/7f16b2c33411f26b3eae78d10648d625cb0c1095.zip \
-    --hash=sha256:c3f2c84036aa98c3abf4552fafab04df5ca472aa639982795e05bb1db43ce5e4
+k-diffusion @ https://github.com/Birch-san/k-diffusion/archive/363386981fee88620709cf8f6f2eea167bd6cd74.zip \
+    --hash=sha256:8eac5cdc08736e6d61908a1b2948f2b2f62691b01dc1aab978bddb3451af0d66
     # via -r installer/requirements.in
 kiwisolver==1.4.4 \
     --hash=sha256:02f79693ec433cb4b5f51694e8477ae83b3205768a6fb48ffba60549080e295b \
@@ -1009,6 +1014,7 @@ numpy==1.23.4 \
     #   tifffile
     #   torch-fidelity
     #   torchmetrics
+    #   torchsde
     #   torchvision
     #   transformers
 oauthlib==3.2.2 \
@@ -1660,6 +1666,7 @@ scipy==1.9.3 \
     #   scikit-learn
     #   torch-fidelity
     #   torchdiffeq
+    #   torchsde
 semver==2.13.0 \
     --hash=sha256:ced8b23dceb22134307c1b8abfa523da14198793d9787ac838e70e29e77458d4 \
     --hash=sha256:fa0fe2722ee1c3f57eac478820c3a5ae2f624af8264cbdf9000c980ff7f75e3f
@@ -1863,6 +1870,7 @@ torch==1.12.0+cu116 ; platform_system == "Linux" or platform_system == "Windows"
     #   torch-fidelity
     #   torchdiffeq
     #   torchmetrics
+    #   torchsde
     #   torchvision
 torch-fidelity==0.3.0 \
     --hash=sha256:3d3e33db98919759cc4f3f24cb27e1e74bdc7c905d90a780630e4e1c18492b66 \
@@ -1876,6 +1884,10 @@ torchmetrics==0.10.2 \
     --hash=sha256:43757d82266969906fc74b6e80766fcb2a0d52d6c3d09e3b7c98cf3b733fd20c \
     --hash=sha256:daa29d96bff5cff04d80eec5b9f5076993d6ac9c2d2163e88b6b31f8d38f7c25
     # via pytorch-lightning
+torchsde==0.2.5 \
+    --hash=sha256:222be9e15610d37a4b5a71cfa0c442178f9fd9ca02f6522a3e11c370b3d0906b \
+    --hash=sha256:4c34373a94a357bdf60bbfee00c850f3563d634491555820b900c9a4f7eff300
+    # via k-diffusion
 torchvision==0.13.0+cu116 ; platform_system == "Linux" or platform_system == "Windows" \
     --hash=sha256:1696feadf1921c8fa1549bad774221293298288ebedaa14e44bc3e57e964a369 \
     --hash=sha256:572544b108eaf12638f3dca0f496a453c4b8d8256bcc8333d5355df641c0380c \
@@ -1925,6 +1937,9 @@ tqdm==4.64.1 \
     #   taming-transformers-rom1504
     #   torch-fidelity
     #   transformers
+trampoline==0.1.2 \
+    --hash=sha256:36cc9a4ff9811843d177fc0e0740efbd7da39eadfe6e50c9e2937cbc06d899d9
+    # via torchsde
 transformers==4.24.0 \
     --hash=sha256:486f353a8e594002e48be0e2aba723d96eda839e63bfe274702a4b5eda85559b \
     --hash=sha256:b7ab50039ef9bf817eff14ab974f306fd20a72350bdc9df3a858fd009419322e

docs/index.md

@@ -86,6 +86,10 @@ AMD card (using the ROCm driver). For full installation and upgrade
 instructions, please see:
 [InvokeAI Installation Overview](https://invoke-ai.github.io/InvokeAI/installation/)
 
+Linux users who wish to make use of the PyPatchMatch inpainting
+functions will need to perform a bit of extra work to enable this
+module. Instructions can be found at [Installing PyPatchMatch](installation/INSTALL_PATCHMATCH.md).
+
 ## :fontawesome-solid-computer: Hardware Requirements
 
 ### :octicons-cpu-24: System

docs/installation/INSTALL_INVOKE.md

@@ -1,8 +1,8 @@
 ---
-title: InvokeAI Installer
+title: InvokeAI Binary Installer
 ---
 
-The InvokeAI installer is a shell script that will install InvokeAI onto a stock
+The InvokeAI binary installer is a shell script that will install InvokeAI onto a stock
 computer running recent versions of Linux, MacOSX or Windows. It will leave you
 with a version that runs a stable version of InvokeAI. When a new version of
 InvokeAI is released, you will download and reinstall the new version.
@@ -35,8 +35,8 @@ recommended model weights files.
 ## Steps to Install
 
 1. Download the
-   [latest release](https://github.com/invoke-ai/InvokeAI/releases/latest) of
-   InvokeAI's installer for your platform
+   [latest release](https://github.com/invoke-ai/InvokeAI/releases/tag/2.2.0-rc4) of
+   InvokeAI's installer for your platform. Look for a file named `InvokeAI-binary-<your platform>.zip`
 
 2. Place the downloaded package someplace where you have plenty of HDD space,
    and have full permissions (i.e. `~/` on Lin/Mac; your home folder on Windows)

docs/installation/INSTALL_PATCHMATCH.md

@@ -0,0 +1,86 @@
+---
+title: Installing PyPatchMatch
+---
+
+# :octicons-paintbrush-16: Installing PyPatchMatch
+
+pypatchmatch is a Python module for inpainting images. It is not
+needed to run InvokeAI, but it greatly improves the quality of
+inpainting and outpainting and is recommended.
+
+Unfortunately, it is a C++ optimized module and installation
+can be somewhat challenging. This guide leads you through the steps.
+
+## Windows
+
+You're in luck! On Windows platforms PyPatchMatch will install
+automatically on Windows systems with no extra intervention.
+
+## Macintosh
+
+PyPatchMatch is not currently supported, but the team is working on
+it.
+
+## Linux
+
+Prior to installing PyPatchMatch, you need to take the following
+steps:
+
+1. Install the `build-essential` tools:
+
+   ```
+   sudo apt update
+   sudo apt install build-essential
+   ```
+
+2. Install `opencv`:
+
+   ```
+   sudo apt install python3-opencv libopencv-dev
+   ```
+
+3. Fix the naming of the `opencv` package configuration file:
+
+   ```
+   cd /usr/lib/x86_64-linux-gnu/pkgconfig/
+   ln -sf opencv4.pc opencv.pc
+
+4. Activate the environment you use for invokeai, either with
+`conda` or with a virtual environment.
+
+5. Do a "develop" install of pypatchmatch:
+
+   ```
+   pip install -e git+https://github.com/invoke-ai/PyPatchMatch@0.1.3#egg=pypatchmatch
+   ```
+
+6. Confirm that pypatchmatch is installed.
+   At the command-line prompt enter `python`, and
+   then at the `>>>` line type `from patchmatch import patch_match`:
+   It should look like the follwing:
+
+   ```
+   Python 3.9.5 (default, Nov 23 2021, 15:27:38) 
+   [GCC 9.3.0] on linux
+   Type "help", "copyright", "credits" or "license" for more information.
+   >>> from patchmatch import patch_match
+   Compiling and loading c extensions from "/home/lstein/Projects/InvokeAI/.invokeai-env/src/pypatchmatch/patchmatch".
+   rm -rf build/obj libpatchmatch.so
+   mkdir: created directory 'build/obj'
+   mkdir: created directory 'build/obj/csrc/'
+   [dep] csrc/masked_image.cpp ...
+   [dep] csrc/nnf.cpp ...
+   [dep] csrc/inpaint.cpp ...
+   [dep] csrc/pyinterface.cpp ...
+   [CC] csrc/pyinterface.cpp ...
+   [CC] csrc/inpaint.cpp ...
+   [CC] csrc/nnf.cpp ...
+   [CC] csrc/masked_image.cpp ...
+   [link] libpatchmatch.so ...
+   ```
+
+If you see no errors, then you're ready to go!
+
+
+
+

docs/installation/INSTALL_SOURCE.md

@@ -27,7 +27,7 @@ Though there are multiple steps, there really is only one click involved to kick
 off the process.
 
 1.  The source installer is distributed in ZIP files. Go to the
-    [latest release](https://github.com/invoke-ai/InvokeAI/releases/latest), and
+    [latest release](https://github.com/invoke-ai/InvokeAI/releases/tag/2.2.0-rc4), and
     look for a series of files named:
 
     - invokeAI-src-installer-mac.zip

frontend/dist/index.html

@@ -6,7 +6,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <title>InvokeAI - A Stable Diffusion Toolkit</title>
   <link rel="shortcut icon" type="icon" href="./assets/favicon.0d253ced.ico" />
-  <script type="module" crossorigin src="./assets/index.bd109a2c.js"></script>
+  <script type="module" crossorigin src="./assets/index.637f12bd.js"></script>
   <link rel="stylesheet" href="./assets/index.c609c0c8.css">
 </head>
 

frontend/src/app/socketio/emitters.ts

@@ -42,7 +42,6 @@ const makeSocketIOEmitters = (
         options: optionsState,
         system: systemState,
         canvas: canvasState,
-        gallery: galleryState,
       } = state;
 
       const frontendToBackendParametersConfig: FrontendToBackendParametersConfig =
@@ -55,13 +54,6 @@ const makeSocketIOEmitters = (
 
       dispatch(generationRequested());
 
-      if (!['txt2img', 'img2img'].includes(generationMode)) {
-        if (!galleryState.currentImage?.url) return;
-
-        frontendToBackendParametersConfig.imageToProcessUrl =
-          galleryState.currentImage.url;
-      }
-
       const { generationParameters, esrganParameters, facetoolParameters } =
         frontendToBackendParameters(frontendToBackendParametersConfig);
 

frontend/src/common/util/parameterTranslation.ts

@@ -30,13 +30,7 @@ export const frontendToBackendParameters = (
 ): { [key: string]: any } => {
   const canvasBaseLayer = getCanvasBaseLayer();
 
-  const {
-    generationMode,
-    optionsState,
-    canvasState,
-    systemState,
-    imageToProcessUrl,
-  } = config;
+  const { generationMode, optionsState, canvasState, systemState } = config;
 
   const {
     cfgScale,
@@ -164,7 +158,6 @@ export const frontendToBackendParameters = (
 
     generationParameters.fit = false;
 
-    generationParameters.init_img = imageToProcessUrl;
     generationParameters.strength = img2imgStrength;
 
     generationParameters.invert_mask = shouldPreserveMaskedArea;

ldm/invoke/readline.py

@@ -102,6 +102,7 @@ class Completer(object):
         self.auto_history_active = True
         self.extensions = None
         self.concepts = None
+        self.embedding_terms = set()
         return
 
     def complete(self, text, state):
@@ -270,17 +271,21 @@ class Completer(object):
         return matches
 
     def add_embedding_terms(self, terms:list[str]):
-        self.concepts = Concepts().list_concepts()
+        self.embedding_terms = set(terms)
         if self.concepts:
-            self.concepts.extend(terms)
+            self.embedding_terms.update(self.concepts)
 
     def _concept_completions(self, text, state):
+        if self.concepts is None:
+            self.concepts = set(Concepts().list_concepts())
+            self.embedding_terms.update(self.concepts)
+
         partial = text[1:]  # this removes the leading '<'
         if len(partial) == 0:
-            return self.concepts  # whole dump - think if user wants this!
+            return list(self.embedding_terms)  # whole dump - think if user wants this!
 
         matches = list()
-        for concept in self.concepts:
+        for concept in self.embedding_terms:
             if concept.startswith(partial):
                 matches.append(f'<{concept}>')
         matches.sort()

scripts/configure_invokeai.py

@@ -226,7 +226,9 @@ This involves a few easy steps.
    (You can enter anything you like in the token creation field marked "Name". 
    "Role" should be "read").
 
-   Now copy the token to your clipboard and paste it here: '''
+   Now copy the token to your clipboard and paste it at the prompt. Windows
+   users can paste with right-click.
+   Token: '''
         )
         access_token = getpass_asterisk.getpass_asterisk()
     return access_token
@@ -582,7 +584,8 @@ def select_root(root:str, yes_to_all:bool=False):
     completer.set_default_dir(default)
     completer.complete_extensions(())
     completer.set_line(default)
-    return input(f"Select a directory in which to install InvokeAI's models and configuration files [{default}]: ") or default
+    directory = input(f"Select a directory in which to install InvokeAI's models and configuration files [{default}]: ").strip(' \\')
+    return directory or default
 
 #-------------------------------------
 def select_outputs(root:str,yes_to_all:bool=False):
@@ -592,7 +595,8 @@ def select_outputs(root:str,yes_to_all:bool=False):
     completer.set_default_dir(os.path.expanduser('~'))
     completer.complete_extensions(())
     completer.set_line(default)
-    return input(f'Select the default directory for image outputs [{default}]: ') or default
+    directory = input(f'Select the default directory for image outputs [{default}]: ').strip(' \\')
+    return directory or default
 
 #-------------------------------------
 def initialize_rootdir(root:str,yes_to_all:bool=False):

source_installer/install.bat.in

@@ -5,7 +5,7 @@
 @rem For users who already have git and conda, this step will be skipped.
 
 @rem Next, it'll checkout the project's git repo, if necessary.
-@rem Finally, it'll create the conda environment and preload the models.
+@rem Finally, it'll create the conda environment and configure InvokeAI.
 
 @rem This enables a user to install this project without manually installing conda and git.
 
@@ -101,11 +101,11 @@ copy source_installer\invoke.bat.in .\invoke.bat
 copy source_installer\update.bat.in .\update.bat
 
 call conda activate invokeai
-@rem preload the models
-call python scripts\preload_models.py
+@rem call configure script
+call python scripts\configure_invokeai.py
 if "%ERRORLEVEL%" NEQ "0" (
    echo ""
-   echo "The preload_models.py script crashed or was cancelled."
+   echo "The configure script crashed or was cancelled."
    echo "InvokeAI is not ready to run. To run preload_models.py again,"
    echo "run the command 'update.bat' in this directory."
    echo "Press any key to continue"

source_installer/install.sh.in

@@ -5,7 +5,7 @@
 # For users who already have git and conda, this step will be skipped.
 
 # Next, it'll checkout the project's git repo, if necessary.
-# Finally, it'll create the conda environment and preload the models.
+# Finally, it'll create the conda environment and configure InvokeAI.
 
 # This enables a user to install this project without manually installing conda and git.
 
@@ -125,8 +125,8 @@ else
     ln -sf ./source_installer/update.sh.in ./update.sh
 
     conda activate invokeai
-    # preload the models
-    echo "Calling the preload_models.py script"
+    # configure
+    echo "Calling the configure_invokeai script"
     python scripts/configure_invokeai.py
     status=$?
     if test $status -ne 0