bump version number to rc4

`torch` wasn't seeing the environment variable. I suspect this is
because it was imported before the variable was set, so was running with
a different environment.

Many `torch` ops are supported on MPS so this wasn't noticed
immediately, but some samplers like k_dpm_2 still use unsupported
operations and need this fallback.

.dockerignore

@@ -1,19 +1,20 @@
+# use this file as a whitelist
 *
 !backend
-!environments-and-requirements
-!frontend
+!invokeai
 !ldm
-!main.py
+!pyproject.toml
+!README.md
 !scripts
-!server
-!static
-!setup.py
 
 # Guard against pulling in any models that might exist in the directory tree
 **/*.pt*
+**/*.ckpt
 
-# unignore configs, but only ignore the custom models.yaml, in case it exists
-!configs
-configs/models.yaml
+# whitelist frontend, but ignore node_modules
+invokeai/frontend/node_modules
 
+# ignore python cache
 **/__pycache__
+**/*.py[cod]
+**/*.egg-info

.github/CODEOWNERS

@@ -2,6 +2,6 @@ ldm/invoke/pngwriter.py @CapableWeb
 ldm/invoke/server_legacy.py @CapableWeb
 scripts/legacy_api.py @CapableWeb
 tests/legacy_tests.sh @CapableWeb
-installer/ @tildebyte
+installer/ @ebr
 .github/workflows/ @mauwii
-docker_build/ @mauwii
+docker/ @mauwii

.github/workflows/build-cloud-img.yml

@@ -1,87 +0,0 @@
-name: Build and push cloud image
-on:
-  workflow_dispatch:
-  # push:
-  #   branches:
-  #   - main
-  #   tags:
-  #     - v*
-  # # we will NOT push the image on pull requests, only test buildability.
-  # pull_request:
-  #   branches:
-  #   - main
-
-permissions:
-  contents: read
-  packages: write
-
-env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME: ${{ github.repository }}
-
-jobs:
-  docker:
-    strategy:
-      fail-fast: false
-      matrix:
-        arch:
-        - x86_64
-        # requires resolving a patchmatch issue
-        # - aarch64
-    runs-on: ubuntu-latest
-    name: ${{ matrix.arch }}
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v3
-
-    - name: Set up QEMU
-      uses: docker/setup-qemu-action@v2
-      if: matrix.arch == 'aarch64'
-
-    - name: Docker meta
-      id: meta
-      uses: docker/metadata-action@v4
-      with:
-        images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-        # see https://github.com/docker/metadata-action
-        # will push the following tags:
-        # :edge
-        # :main (+ any other branches enabled in the workflow)
-        # :<tag>
-        # :1.2.3 (for semver tags)
-        # :1.2 (for semver tags)
-        # :<sha>
-        tags: |
-          type=edge,branch=main
-          type=ref,event=branch
-          type=ref,event=tag
-          type=semver,pattern={{version}}
-          type=semver,pattern={{major}}.{{minor}}
-          type=sha
-        # suffix image tags with architecture
-        flavor: |
-          latest=auto
-          suffix=-${{ matrix.arch }},latest=true
-
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v2
-
-    # do not login to container registry on PRs
-    - if: github.event_name != 'pull_request'
-      name: Docker login
-      uses: docker/login-action@v2
-      with:
-        registry: ghcr.io
-        username: ${{ github.actor }}
-        password: ${{ secrets.GITHUB_TOKEN }}
-
-    - name: Build and push cloud image
-      uses: docker/build-push-action@v3
-      with:
-        context: .
-        file: docker-build/Dockerfile.cloud
-        platforms: Linux/${{ matrix.arch }}
-        # do not push the image on PRs
-        push: false
-        tags: ${{ steps.meta.outputs.tags }}
-        labels: ${{ steps.meta.outputs.labels }}

.github/workflows/build-container.yml

@@ -3,63 +3,67 @@ on:
   push:
     branches:
       - 'main'
+    tags:
+      - 'v*.*.*'
 
 jobs:
   docker:
+    if: github.event.pull_request.draft == false
     strategy:
       fail-fast: false
       matrix:
-        registry:
-          - ghcr.io
         flavor:
           - amd
           - cuda
-          # - cloud
+          - cpu
         include:
           - flavor: amd
-            pip-requirements: requirements-lin-amd.txt
-            dockerfile: docker-build/Dockerfile
+            pip-extra-index-url: 'https://download.pytorch.org/whl/rocm5.2'
+            dockerfile: docker/Dockerfile
             platforms: linux/amd64,linux/arm64
           - flavor: cuda
-            pip-requirements: requirements-lin-cuda.txt
-            dockerfile: docker-build/Dockerfile
+            pip-extra-index-url: ''
+            dockerfile: docker/Dockerfile
+            platforms: linux/amd64,linux/arm64
+          - flavor: cpu
+            pip-extra-index-url: 'https://download.pytorch.org/whl/cpu'
+            dockerfile: docker/Dockerfile
             platforms: linux/amd64,linux/arm64
-          # - flavor: cloud
-          #   pip-requirements: requirements-lin-cuda.txt
-          #   dockerfile: docker-build/Dockerfile.cloud
-          #   platforms: linux/amd64
     runs-on: ubuntu-latest
     name: ${{ matrix.flavor }}
     steps:
       - name: Checkout
         uses: actions/checkout@v3
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
       - name: Docker meta
         id: meta
         uses: docker/metadata-action@v4
         with:
-          images: ${{ matrix.registry }}/${{ github.repository }}-${{ matrix.flavor }}
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          images: ghcr.io/${{ github.repository }}
           tags: |
             type=ref,event=branch
             type=ref,event=tag
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
             type=sha
           flavor: |
-            latest=true
+            latest=${{ matrix.flavor == 'cuda' && github.ref == 'refs/heads/main' }}
+            suffix=${{ matrix.flavor }},onlatest=false
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
-      - if: github.event_name != 'pull_request'
-        name: Docker login
+      - name: Login to GitHub Container Registry
+        if: github.event_name != 'pull_request'
         uses: docker/login-action@v2
         with:
-          registry: ${{ matrix.registry }}
-          username: ${{ github.actor }}
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build container
@@ -71,4 +75,16 @@ jobs:
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          build-args: pip_requirements=${{ matrix.pip-requirements }}
+          build-args: PIP_EXTRA_INDEX_URL=${{ matrix.pip-extra-index-url }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
+      - name: Output image, digest and metadata to summary
+        run: |
+          {
+          echo imageid: "${{ steps.docker_build.outputs.imageid }}"
+          echo digest: "${{ steps.docker_build.outputs.digest }}"
+          echo labels: "${{ steps.meta.outputs.labels }}"
+          echo tags: "${{ steps.meta.outputs.tags }}"
+          echo version: "${{ steps.meta.outputs.version }}"
+          } >> "$GITHUB_STEP_SUMMARY"

.github/workflows/clean-caches.yml

@@ -0,0 +1,34 @@
+name: cleanup caches by a branch
+on:
+  pull_request:
+    types:
+      - closed
+  workflow_dispatch:
+
+jobs:
+  cleanup:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v3
+
+      - name: Cleanup
+        run: |
+          gh extension install actions/gh-actions-cache
+
+          REPO=${{ github.repository }}
+          BRANCH=${{ github.ref }}
+
+          echo "Fetching list of cache key"
+          cacheKeysForPR=$(gh actions-cache list -R $REPO -B $BRANCH | cut -f 1 )
+
+          ## Setting this to not fail the workflow while deleting cache keys.
+          set +e
+          echo "Deleting caches..."
+          for cacheKey in $cacheKeysForPR
+          do
+              gh actions-cache delete $cacheKey -R $REPO -B $BRANCH --confirm
+          done
+          echo "Done"
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/lint-frontend.yml

@@ -3,17 +3,18 @@ name: Lint frontend
 on:
   pull_request:
     paths:
-      - 'frontend/**'
+      - 'invokeai/frontend/**'
   push:
     paths:
-      - 'frontend/**'
+      - 'invokeai/frontend/**'
 
 defaults:
   run:
-    working-directory: frontend
+    working-directory: invokeai/frontend
 
 jobs:
   lint-frontend:
+    if: github.event.pull_request.draft == false
     runs-on: ubuntu-22.04
     steps:
       - name: Setup Node 18

.github/workflows/mkdocs-material.yml

@@ -7,6 +7,7 @@ on:
 
 jobs:
   mkdocs-material:
+    if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     steps:
       - name: checkout sources

.github/workflows/pyflakes.yml

@@ -9,6 +9,7 @@ on:
 jobs:
   pyflakes:
     name: runner / pyflakes
+    if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2

.github/workflows/test-invoke-conda.yml

@@ -1,161 +0,0 @@
-name: Test invoke.py
-on:
-  push:
-    branches:
-      - 'main'
-  pull_request:
-    branches:
-      - 'main'
-    types:
-      - 'ready_for_review'
-      - 'opened'
-      - 'synchronize'
-      - 'converted_to_draft'
-
-concurrency:
-   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
-   cancel-in-progress: true
-
-jobs:
-  fail_if_pull_request_is_draft:
-    if: github.event.pull_request.draft == true
-    runs-on: ubuntu-22.04
-    steps:
-    - name: Fails in order to indicate that pull request needs to be marked as ready to review and unit tests workflow needs to pass.
-      run: exit 1
-
-  matrix:
-    if: github.event.pull_request.draft == false
-    strategy:
-      matrix:
-        stable-diffusion-model:
-          - 'stable-diffusion-1.5'
-        environment-yaml:
-          - environment-lin-amd.yml
-          - environment-lin-cuda.yml
-          - environment-mac.yml
-          - environment-win-cuda.yml
-        include:
-          - environment-yaml: environment-lin-amd.yml
-            os: ubuntu-22.04
-            curl-command: curl
-            github-env: $GITHUB_ENV
-            default-shell: bash -l {0}
-          - environment-yaml: environment-lin-cuda.yml
-            os: ubuntu-22.04
-            curl-command: curl
-            github-env: $GITHUB_ENV
-            default-shell: bash -l {0}
-          - environment-yaml: environment-mac.yml
-            os: macos-12
-            curl-command: curl
-            github-env: $GITHUB_ENV
-            default-shell: bash -l {0}
-          - environment-yaml: environment-win-cuda.yml
-            os: windows-2022
-            curl-command: curl.exe
-            github-env: $env:GITHUB_ENV
-            default-shell: pwsh
-          - stable-diffusion-model: stable-diffusion-1.5
-            stable-diffusion-model-url: https://huggingface.co/runwayml/stable-diffusion-v1-5/resolve/main/v1-5-pruned-emaonly.ckpt
-            stable-diffusion-model-dl-path: models/ldm/stable-diffusion-v1
-            stable-diffusion-model-dl-name: v1-5-pruned-emaonly.ckpt
-    name: ${{ matrix.environment-yaml }} on ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    env:
-      CONDA_ENV_NAME: invokeai
-      INVOKEAI_ROOT: '${{ github.workspace }}/invokeai'
-    defaults:
-      run:
-        shell: ${{ matrix.default-shell }}
-    steps:
-      - name: Checkout sources
-        id: checkout-sources
-        uses: actions/checkout@v3
-
-      - name: create models.yaml from example
-        run: |
-          mkdir -p ${{ env.INVOKEAI_ROOT }}/configs
-          cp configs/models.yaml.example ${{ env.INVOKEAI_ROOT }}/configs/models.yaml
-
-      - name: create environment.yml
-        run: cp "environments-and-requirements/${{ matrix.environment-yaml }}" environment.yml
-
-      - name: Use cached conda packages
-        id: use-cached-conda-packages
-        uses: actions/cache@v3
-        with:
-          path: ~/conda_pkgs_dir
-          key: conda-pkgs-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles(matrix.environment-yaml) }}
-
-      - name: Activate Conda Env
-        id: activate-conda-env
-        uses: conda-incubator/setup-miniconda@v2
-        with:
-          activate-environment: ${{ env.CONDA_ENV_NAME }}
-          environment-file: environment.yml
-          miniconda-version: latest
-
-      - name: set test prompt to main branch validation
-        if: ${{ github.ref == 'refs/heads/main' }}
-        run: echo "TEST_PROMPTS=tests/preflight_prompts.txt" >> ${{ matrix.github-env }}
-
-      - name: set test prompt to development branch validation
-        if: ${{ github.ref == 'refs/heads/development' }}
-        run: echo "TEST_PROMPTS=tests/dev_prompts.txt" >> ${{ matrix.github-env }}
-
-      - name: set test prompt to Pull Request validation
-        if: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/development' }}
-        run: echo "TEST_PROMPTS=tests/validate_pr_prompt.txt" >> ${{ matrix.github-env }}
-
-      - name: Use Cached Stable Diffusion Model
-        id: cache-sd-model
-        uses: actions/cache@v3
-        env:
-          cache-name: cache-${{ matrix.stable-diffusion-model }}
-        with:
-          path: ${{ env.INVOKEAI_ROOT }}/${{ matrix.stable-diffusion-model-dl-path }}
-          key: ${{ env.cache-name }}
-
-      - name: Download ${{ matrix.stable-diffusion-model }}
-        id: download-stable-diffusion-model
-        if: ${{ steps.cache-sd-model.outputs.cache-hit != 'true' }}
-        run: |
-          mkdir -p "${{ env.INVOKEAI_ROOT }}/${{ matrix.stable-diffusion-model-dl-path }}"
-          ${{ matrix.curl-command }} -H "Authorization: Bearer ${{ secrets.HUGGINGFACE_TOKEN }}" -o "${{ env.INVOKEAI_ROOT }}/${{ matrix.stable-diffusion-model-dl-path }}/${{ matrix.stable-diffusion-model-dl-name }}" -L ${{ matrix.stable-diffusion-model-url }}
-
-      - name: run configure_invokeai.py
-        id: run-preload-models
-        run: |
-          python scripts/configure_invokeai.py --skip-sd-weights --yes
-
-      - name: cat invokeai.init
-        id: cat-invokeai
-        run: cat ${{ env.INVOKEAI_ROOT }}/invokeai.init
-
-      - name: Run the tests
-        id: run-tests
-        if: matrix.os != 'windows-2022'
-        run: |
-          time python scripts/invoke.py \
-            --no-patchmatch \
-            --no-nsfw_checker \
-            --model ${{ matrix.stable-diffusion-model }} \
-            --from_file ${{ env.TEST_PROMPTS }} \
-            --root="${{ env.INVOKEAI_ROOT }}" \
-            --outdir="${{ env.INVOKEAI_ROOT }}/outputs"
-
-      - name: export conda env
-        id: export-conda-env
-        if: matrix.os != 'windows-2022'
-        run: |
-          mkdir -p outputs/img-samples
-          conda env export --name ${{ env.CONDA_ENV_NAME }} > ${{ env.INVOKEAI_ROOT }}/outputs/environment-${{ runner.os }}-${{ runner.arch }}.yml
-
-      - name: Archive results
-        if: matrix.os != 'windows-2022'
-        id: archive-results
-        uses: actions/upload-artifact@v3
-        with:
-          name: results_${{ matrix.requirements-file }}_${{ matrix.python-version }}
-          path: ${{ env.INVOKEAI_ROOT }}/outputs

.github/workflows/test-invoke-pip.yml

@@ -4,141 +4,143 @@ on:
     branches:
       - 'main'
   pull_request:
-    branches:
-      - 'main'
     types:
       - 'ready_for_review'
       - 'opened'
       - 'synchronize'
-      - 'converted_to_draft'
 
 concurrency:
    group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
    cancel-in-progress: true
 
 jobs:
-  fail_if_pull_request_is_draft:
-    if: github.event.pull_request.draft == true
-    runs-on: ubuntu-18.04
-    steps:
-    - name: Fails in order to indicate that pull request needs to be marked as ready to review and unit tests workflow needs to pass.
-      run: exit 1
   matrix:
     if: github.event.pull_request.draft == false
     strategy:
       matrix:
-        stable-diffusion-model:
-          - stable-diffusion-1.5
-        requirements-file:
-          - requirements-lin-cuda.txt
-          - requirements-lin-amd.txt
-          - requirements-mac-mps-cpu.txt
-          - requirements-win-colab-cuda.txt
         python-version:
           # - '3.9'
           - '3.10'
+        pytorch:
+          # - linux-cuda-11_6
+          - linux-cuda-11_7
+          - linux-rocm-5_2
+          - linux-cpu
+          - macos-default
+          - windows-cpu
+          # - windows-cuda-11_6
+          # - windows-cuda-11_7
         include:
-          - requirements-file: requirements-lin-cuda.txt
+          # - pytorch: linux-cuda-11_6
+          #   os: ubuntu-22.04
+          #   extra-index-url: 'https://download.pytorch.org/whl/cu116'
+          #   github-env: $GITHUB_ENV
+          - pytorch: linux-cuda-11_7
             os: ubuntu-22.04
-            curl-command: curl
             github-env: $GITHUB_ENV
-          - requirements-file: requirements-lin-amd.txt
+          - pytorch: linux-rocm-5_2
             os: ubuntu-22.04
-            curl-command: curl
+            extra-index-url: 'https://download.pytorch.org/whl/rocm5.2'
             github-env: $GITHUB_ENV
-          - requirements-file: requirements-mac-mps-cpu.txt
+          - pytorch: linux-cpu
+            os: ubuntu-22.04
+            extra-index-url: 'https://download.pytorch.org/whl/cpu'
+            github-env: $GITHUB_ENV
+          - pytorch: macos-default
             os: macOS-12
-            curl-command: curl
             github-env: $GITHUB_ENV
-          - requirements-file: requirements-win-colab-cuda.txt
+          - pytorch: windows-cpu
             os: windows-2022
-            curl-command: curl.exe
             github-env: $env:GITHUB_ENV
-          - stable-diffusion-model: stable-diffusion-1.5
-            stable-diffusion-model-url: https://huggingface.co/runwayml/stable-diffusion-v1-5/resolve/main/v1-5-pruned-emaonly.ckpt
-            stable-diffusion-model-dl-path: models/ldm/stable-diffusion-v1
-            stable-diffusion-model-dl-name: v1-5-pruned-emaonly.ckpt
-    name: ${{ matrix.requirements-file }} on ${{ matrix.python-version }}
+          # - pytorch: windows-cuda-11_6
+          #   os: windows-2022
+          #   extra-index-url: 'https://download.pytorch.org/whl/cu116'
+          #   github-env: $env:GITHUB_ENV
+          # - pytorch: windows-cuda-11_7
+          #   os: windows-2022
+          #   extra-index-url: 'https://download.pytorch.org/whl/cu117'
+          #   github-env: $env:GITHUB_ENV
+    name: ${{ matrix.pytorch }} on ${{ matrix.python-version }}
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout sources
         id: checkout-sources
         uses: actions/checkout@v3
 
-      - name: set INVOKEAI_ROOT Windows
-        if: matrix.os == 'windows-2022'
-        run: |
-          echo "INVOKEAI_ROOT=${{ github.workspace }}\invokeai" >> ${{ matrix.github-env }}
-          echo "INVOKEAI_OUTDIR=${{ github.workspace }}\invokeai\outputs" >> ${{ matrix.github-env }}
+      - name: setup python
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
 
-      - name: set INVOKEAI_ROOT others
-        if: matrix.os != 'windows-2022'
+      - name: Set Cache-Directory Windows
+        if: runner.os == 'Windows'
+        id: set-cache-dir-windows
         run: |
-          echo "INVOKEAI_ROOT=${{ github.workspace }}/invokeai" >> ${{ matrix.github-env }}
-          echo "INVOKEAI_OUTDIR=${{ github.workspace }}/invokeai/outputs" >> ${{ matrix.github-env }}
+          echo "CACHE_DIR=$HOME\invokeai\models" >> ${{ matrix.github-env }}
+          echo "PIP_NO_CACHE_DIR=1" >> ${{ matrix.github-env }}
 
-      - name: create models.yaml from example
-        run: |
-          mkdir -p ${{ env.INVOKEAI_ROOT }}/configs
-          cp configs/models.yaml.example ${{ env.INVOKEAI_ROOT }}/configs/models.yaml
+      - name: Set Cache-Directory others
+        if: runner.os != 'Windows'
+        id: set-cache-dir-others
+        run: echo "CACHE_DIR=$HOME/invokeai/models" >> ${{ matrix.github-env }}
 
       - name: set test prompt to main branch validation
         if: ${{ github.ref == 'refs/heads/main' }}
         run: echo "TEST_PROMPTS=tests/preflight_prompts.txt" >> ${{ matrix.github-env }}
 
-      - name: set test prompt to development branch validation
-        if: ${{ github.ref == 'refs/heads/development' }}
-        run: echo "TEST_PROMPTS=tests/dev_prompts.txt" >> ${{ matrix.github-env }}
-
       - name: set test prompt to Pull Request validation
-        if: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/development' }}
+        if: ${{ github.ref != 'refs/heads/main' }}
         run: echo "TEST_PROMPTS=tests/validate_pr_prompt.txt" >> ${{ matrix.github-env }}
 
-      - name: create requirements.txt
-        run: cp 'environments-and-requirements/${{ matrix.requirements-file }}' '${{ matrix.requirements-file }}'
+      - name: install invokeai
+        env:
+          PIP_EXTRA_INDEX_URL: ${{ matrix.extra-index-url }}
+        run: >
+          pip3 install
+          --use-pep517
+          --editable=".[test]"
 
-      - name: setup python
-        uses: actions/setup-python@v4
-        with:
-          python-version: ${{ matrix.python-version }}
-          # cache: 'pip'
-          # cache-dependency-path: ${{ matrix.requirements-file }}
+      - name: run pytest
+        run: pytest
 
-      - name: install dependencies
-        run: pip3 install --upgrade pip setuptools wheel
-
-      - name: install requirements
-        run: pip3 install -r '${{ matrix.requirements-file }}'
-
-      - name: Use Cached Stable Diffusion Model
+      - name: Use Cached models
         id: cache-sd-model
         uses: actions/cache@v3
         env:
-          cache-name: cache-${{ matrix.stable-diffusion-model }}
+          cache-name: huggingface-models
         with:
-          path: ${{ env.INVOKEAI_ROOT }}/${{ matrix.stable-diffusion-model-dl-path }}
+          path: ${{ env.CACHE_DIR }}
           key: ${{ env.cache-name }}
+          enableCrossOsArchive: true
 
-      - name: Download ${{ matrix.stable-diffusion-model }}
-        id: download-stable-diffusion-model
-        if: ${{ steps.cache-sd-model.outputs.cache-hit != 'true' }}
-        run: |
-          mkdir -p "${{ env.INVOKEAI_ROOT }}/${{ matrix.stable-diffusion-model-dl-path }}"
-          ${{ matrix.curl-command }} -H "Authorization: Bearer ${{ secrets.HUGGINGFACE_TOKEN }}" -o "${{ env.INVOKEAI_ROOT }}/${{ matrix.stable-diffusion-model-dl-path }}/${{ matrix.stable-diffusion-model-dl-name }}" -L ${{ matrix.stable-diffusion-model-url }}
-
-      - name: run configure_invokeai.py
+      - name: run invokeai-configure
         id: run-preload-models
-        run: python3 scripts/configure_invokeai.py --skip-sd-weights --yes
+        env:
+          HUGGING_FACE_HUB_TOKEN: ${{ secrets.HUGGINGFACE_TOKEN }}
+        run: >
+          invokeai-configure
+          --yes
+          --default_only
+          --full-precision
+        # can't use fp16 weights without a GPU
 
       - name: Run the tests
+        if: runner.os != 'Windows'
         id: run-tests
-        if: matrix.os != 'windows-2022'
-        run: python3 scripts/invoke.py --no-patchmatch --no-nsfw_checker --model ${{ matrix.stable-diffusion-model }} --from_file ${{ env.TEST_PROMPTS }} --root="${{ env.INVOKEAI_ROOT }}" --outdir="${{ env.INVOKEAI_OUTDIR }}"
+        env:
+          # Set offline mode to make sure configure preloaded successfully.
+          HF_HUB_OFFLINE: 1
+          HF_DATASETS_OFFLINE: 1
+          TRANSFORMERS_OFFLINE: 1
+        run: >
+          invokeai
+          --no-patchmatch
+          --no-nsfw_checker
+          --from_file ${{ env.TEST_PROMPTS }}
 
       - name: Archive results
         id: archive-results
-        if: matrix.os != 'windows-2022'
         uses: actions/upload-artifact@v3
         with:
-          name: results_${{ matrix.requirements-file }}_${{ matrix.python-version }}
+          name: results_${{ matrix.pytorch }}_${{ matrix.python-version }}
           path: ${{ env.INVOKEAI_ROOT }}/outputs

.gitignore

@@ -1,4 +1,5 @@
 # ignore default image save location and model symbolic link
+embeddings/
 outputs/
 models/ldm/stable-diffusion-v1/model.ckpt
 **/restoration/codeformer/weights
@@ -71,6 +72,7 @@ coverage.xml
 .hypothesis/
 .pytest_cache/
 cover/
+junit/
 
 # Translations
 *.mo
@@ -194,7 +196,7 @@ checkpoints
 .DS_Store
 
 # Let the frontend manage its own gitignore
-!frontend/*
+!invokeai/frontend/*
 
 # Scratch folder
 .scratch/
@@ -229,8 +231,5 @@ installer/install.sh
 installer/update.bat
 installer/update.sh
 
-# this may be present if the user created a venv
-invokeai
-
 # no longer stored in source directory
 models

README.md

@@ -1,6 +1,6 @@
 <div align="center">
 
-![project logo](docs/assets/invoke_ai_banner.png)
+![project logo](https://github.com/mauwii/InvokeAI/raw/main/docs/assets/invoke_ai_banner.png)
 
 # InvokeAI: A Stable Diffusion Toolkit
 
@@ -8,12 +8,10 @@
 
 [![latest release badge]][latest release link] [![github stars badge]][github stars link] [![github forks badge]][github forks link]
 
-[![CI checks on main badge]][CI checks on main link] [![CI checks on dev badge]][CI checks on dev link] [![latest commit to dev badge]][latest commit to dev link]
+[![CI checks on main badge]][CI checks on main link] [![latest commit to main badge]][latest commit to main link]
 
 [![github open issues badge]][github open issues link] [![github open prs badge]][github open prs link]
 
-[CI checks on dev badge]: https://flat.badgen.net/github/checks/invoke-ai/InvokeAI/development?label=CI%20status%20on%20dev&cache=900&icon=github
-[CI checks on dev link]: https://github.com/invoke-ai/InvokeAI/actions?query=branch%3Adevelopment
 [CI checks on main badge]: https://flat.badgen.net/github/checks/invoke-ai/InvokeAI/main?label=CI%20status%20on%20main&cache=900&icon=github
 [CI checks on main link]: https://github.com/invoke-ai/InvokeAI/actions/workflows/test-invoke-conda.yml
 [discord badge]: https://flat.badgen.net/discord/members/ZmtBAhwWhy?icon=discord
@@ -26,19 +24,14 @@
 [github open prs link]: https://github.com/invoke-ai/InvokeAI/pulls?q=is%3Apr+is%3Aopen
 [github stars badge]: https://flat.badgen.net/github/stars/invoke-ai/InvokeAI?icon=github
 [github stars link]: https://github.com/invoke-ai/InvokeAI/stargazers
-[latest commit to dev badge]: https://flat.badgen.net/github/last-commit/invoke-ai/InvokeAI/development?icon=github&color=yellow&label=last%20dev%20commit&cache=900
-[latest commit to dev link]: https://github.com/invoke-ai/InvokeAI/commits/development
+[latest commit to main badge]: https://flat.badgen.net/github/last-commit/invoke-ai/InvokeAI/main?icon=github&color=yellow&label=last%20dev%20commit&cache=900
+[latest commit to main link]: https://github.com/invoke-ai/InvokeAI/commits/main
 [latest release badge]: https://flat.badgen.net/github/release/invoke-ai/InvokeAI/development?icon=github
 [latest release link]: https://github.com/invoke-ai/InvokeAI/releases
+
 </div>
 
-This is a fork of
-[CompVis/stable-diffusion](https://github.com/CompVis/stable-diffusion),
-the open source text-to-image generator. It provides a streamlined
-process with various new features and options to aid the image
-generation process. It runs on Windows, macOS and Linux machines, with
-GPU cards with as little as 4 GB of RAM. It provides both a polished
-Web interface (see below), and an easy-to-use command-line interface.
+InvokeAI is a leading creative engine built to empower professionals and enthusiasts alike. Generate and create stunning visual media using the latest AI-driven technologies. InvokeAI offers an industry leading Web Interface, interactive Command Line Interface, and also serves as the foundation for multiple commercial products.
 
 **Quick links**: [[How to Install](#installation)] [<a href="https://discord.gg/ZmtBAhwWhy">Discord Server</a>] [<a href="https://invoke-ai.github.io/InvokeAI/">Documentation and Tutorials</a>] [<a href="https://github.com/invoke-ai/InvokeAI/">Code and Downloads</a>] [<a href="https://github.com/invoke-ai/InvokeAI/issues">Bug Reports</a>] [<a href="https://github.com/invoke-ai/InvokeAI/discussions">Discussion, Ideas & Q&A</a>]
 
@@ -46,6 +39,12 @@ _Note: InvokeAI is rapidly evolving. Please use the
 [Issues](https://github.com/invoke-ai/InvokeAI/issues) tab to report bugs and make feature
 requests. Be sure to use the provided templates. They will help us diagnose issues faster._
 
+<div align="center">
+
+![canvas preview](https://github.com/mauwii/InvokeAI/raw/main/docs/assets/canvas_preview.png)
+
+</div>
+
 # Getting Started with InvokeAI
 
 For full installation and upgrade instructions, please see:
@@ -58,10 +57,7 @@ For full installation and upgrade instructions, please see:
 5. Wait a while, until it is done.
 6. The folder where you ran the installer from will now be filled with lots of files. If you are on Windows, double-click on the `invoke.bat` file. On macOS, open a Terminal window, drag `invoke.sh` from the folder into the Terminal, and press return. On Linux, run `invoke.sh`
 7. Press 2 to open the "browser-based UI", press enter/return, wait a minute or two for Stable Diffusion to start up, then open your browser and go to http://localhost:9090.
-8. Type `banana sushi` in the box on the top left and click `Invoke`:
-
-<div align="center"><img src="docs/assets/invoke-web-server-1.png" width=640></div>
-
+8. Type `banana sushi` in the box on the top left and click `Invoke`
 
 
 ## Table of Contents
@@ -76,7 +72,7 @@ For full installation and upgrade instructions, please see:
 8. [Support](#support)
 9. [Further Reading](#further-reading)
 
-### Installation
+## Installation
 
 This fork is supported across Linux, Windows and Macintosh. Linux
 users can use either an Nvidia-based card (with CUDA support) or an
@@ -89,9 +85,10 @@ instructions, please see:
 InvokeAI is supported across Linux, Windows and macOS. Linux
 users can use either an Nvidia-based card (with CUDA support) or an
 AMD card (using the ROCm driver).
+
 #### System
 
-You wil need one of the following:
+You will need one of the following:
 
 - An NVIDIA-based graphics card with 4 GB or more VRAM memory.
 - An Apple computer with an M1 chip.
@@ -108,52 +105,48 @@ to render 512x512 images.
 
 - At least 12 GB of free disk space for the machine learning model, Python, and all its dependencies.
 
-**Note**
+## Features
 
-If you have a Nvidia 10xx series card (e.g. the 1080ti), please
-run the dream script in full-precision mode as shown below.
+Feature documentation can be reviewed by navigating to [the InvokeAI Documentation page](https://invoke-ai.github.io/InvokeAI/features/)
 
-Similarly, specify full-precision mode on Apple M1 hardware.
+### *Web Server & UI*
 
-Precision is auto configured based on the device. If however you encounter
-errors like 'expected type Float but found Half' or 'not implemented for Half'
-you can try starting `invoke.py` with the `--precision=float32` flag to your initialization command
+InvokeAI offers a locally hosted Web Server & React Frontend, with an industry leading user experience. The Web-based UI allows for simple and intuitive workflows, and is responsive for use on mobile devices and tablets accessing the web server.
 
-```bash
-(invokeai) ~/InvokeAI$ python scripts/invoke.py --precision=float32
-```
-Or by updating your InvokeAI configuration file with this argument.
+### *Unified Canvas*
 
-### Features
+The Unified Canvas is a fully integrated canvas implementation with support for all core generation capabilities, in/outpainting, brush tools, and more. This creative tool unlocks the capability for artists to create with AI as a creative collaborator, and can be used to augment AI-generated imagery, sketches, photography, renders, and more.
 
-#### Major Features
+### *Advanced Prompt Syntax*
 
-- [Web Server](https://invoke-ai.github.io/InvokeAI/features/WEB/)
-- [Interactive Command Line Interface](https://invoke-ai.github.io/InvokeAI/features/CLI/)
-- [Image To Image](https://invoke-ai.github.io/InvokeAI/features/IMG2IMG/)
-- [Inpainting Support](https://invoke-ai.github.io/InvokeAI/features/INPAINTING/)
-- [Outpainting Support](https://invoke-ai.github.io/InvokeAI/features/OUTPAINTING/)
-- [Upscaling, face-restoration and outpainting](https://invoke-ai.github.io/InvokeAI/features/POSTPROCESS/)
-- [Reading Prompts From File](https://invoke-ai.github.io/InvokeAI/features/PROMPTS/#reading-prompts-from-a-file)
-- [Prompt Blending](https://invoke-ai.github.io/InvokeAI/features/PROMPTS/#prompt-blending)
-- [Thresholding and Perlin Noise Initialization Options](https://invoke-ai.github.io/InvokeAI/features/OTHER/#thresholding-and-perlin-noise-initialization-options)
-- [Negative/Unconditioned Prompts](https://invoke-ai.github.io/InvokeAI/features/PROMPTS/#negative-and-unconditioned-prompts)
-- [Variations](https://invoke-ai.github.io/InvokeAI/features/VARIATIONS/)
-- [Personalizing Text-to-Image Generation](https://invoke-ai.github.io/InvokeAI/features/TEXTUAL_INVERSION/)
-- [Simplified API for text to image generation](https://invoke-ai.github.io/InvokeAI/features/OTHER/#simplified-api)
+InvokeAI's advanced prompt syntax allows for token weighting, cross-attention control, and prompt blending, allowing for fine-tuned tweaking of your invocations and exploration of the latent space.
 
-#### Other Features
+### *Command Line Interface*
 
-- [Google Colab](https://invoke-ai.github.io/InvokeAI/features/OTHER/#google-colab)
-- [Seamless Tiling](https://invoke-ai.github.io/InvokeAI/features/OTHER/#seamless-tiling)
-- [Shortcut: Reusing Seeds](https://invoke-ai.github.io/InvokeAI/features/OTHER/#shortcuts-reusing-seeds)
-- [Preload Models](https://invoke-ai.github.io/InvokeAI/features/OTHER/#preload-models)
+For users utilizing a terminal-based environment, or who want to take advantage of CLI features, InvokeAI offers an extensive and actively supported command-line interface that provides the full suite of generation functionality available in the tool.
+
+### Other features
+
+- *Support for both ckpt and diffusers models*
+- *SD 2.0, 2.1 support*
+- *Noise Control & Tresholding*
+- *Popular Sampler Support*
+- *Upscaling & Face Restoration Tools*
+- *Embedding Manager & Support*
+- *Model Manager & Support*
+
+### Coming Soon
+
+- *Node-Based Architecture & UI*
+- And more...
 
 ### Latest Changes
 
-For our latest changes, view our [Release Notes](https://github.com/invoke-ai/InvokeAI/releases)
+For our latest changes, view our [Release
+Notes](https://github.com/invoke-ai/InvokeAI/releases) and the
+[CHANGELOG](docs/CHANGELOG.md).
 
-### Troubleshooting
+## Troubleshooting
 
 Please check out our **[Q&A](https://invoke-ai.github.io/InvokeAI/help/TROUBLESHOOT/#faq)** to get solutions for common installation
 problems and other issues.
@@ -167,7 +160,7 @@ To join, just raise your hand on the InvokeAI Discord server (#dev-chat) or the
 
 If you are unfamiliar with how
 to contribute to GitHub projects, here is a
-[Getting Started Guide](https://opensource.com/article/19/7/create-pull-request-github). A full set of contribution guidelines, along with templates, are in progress. You can **make your pull request against the "main" branch**. 
+[Getting Started Guide](https://opensource.com/article/19/7/create-pull-request-github). A full set of contribution guidelines, along with templates, are in progress. You can **make your pull request against the "main" branch**.
 
 We hope you enjoy using our software as much as we enjoy creating it,
 and we hope that some of those of you who are reading this will elect
@@ -183,13 +176,7 @@ their time, hard work and effort.
 
 ### Support
 
-For support, please use this repository's GitHub Issues tracking service. Feel free to send me an
-email if you use and like the script.
+For support, please use this repository's GitHub Issues tracking service, or join the Discord.
 
-Original portions of the software are Copyright (c) 2022
-[Lincoln D. Stein](https://github.com/lstein)
+Original portions of the software are Copyright (c) 2023 by respective contributors.
 
-### Further Reading
-
-Please see the original README for more information on this software and underlying algorithm,
-located in the file [README-CompViz.md](https://invoke-ai.github.io/InvokeAI/other/README-CompViz/).

binary_installer/requirements.in

@@ -2,9 +2,10 @@
 --extra-index-url https://download.pytorch.org/whl/torch_stable.html
 --extra-index-url https://download.pytorch.org/whl/cu116
 --trusted-host https://download.pytorch.org
-accelerate~=0.14
+accelerate~=0.15
 albumentations
-diffusers
+diffusers[torch]~=0.11
+einops
 eventlet
 flask_cors
 flask_socketio

configs/INITIAL_MODELS.yaml

@@ -1,80 +0,0 @@
-stable-diffusion-1.5:
-   description: The newest Stable Diffusion version 1.5 weight file (4.27 GB)
-   repo_id: runwayml/stable-diffusion-v1-5
-   config: v1-inference.yaml
-   file: v1-5-pruned-emaonly.ckpt
-   recommended: true
-   width: 512
-   height: 512
-inpainting-1.5:
-   description: RunwayML SD 1.5 model optimized for inpainting (4.27 GB)
-   repo_id: runwayml/stable-diffusion-inpainting
-   config: v1-inpainting-inference.yaml
-   file: sd-v1-5-inpainting.ckpt
-   recommended: True
-   width: 512
-   height: 512
-ft-mse-improved-autoencoder-840000:
-   description: StabilityAI improved autoencoder fine-tuned for human faces (recommended; 335 MB)
-   repo_id: stabilityai/sd-vae-ft-mse-original
-   config: VAE/default
-   file: vae-ft-mse-840000-ema-pruned.ckpt
-   recommended: True
-   width: 512
-   height: 512
-stable-diffusion-1.4:
-   description: The original Stable Diffusion version 1.4 weight file (4.27 GB)
-   repo_id: CompVis/stable-diffusion-v-1-4-original
-   config: v1-inference.yaml
-   file: sd-v1-4.ckpt
-   recommended: False
-   width: 512
-   height: 512
-waifu-diffusion-1.3:
-   description: Stable Diffusion 1.4 fine tuned on anime-styled images (4.27 GB)
-   repo_id: hakurei/waifu-diffusion-v1-3
-   config: v1-inference.yaml
-   file: model-epoch09-float32.ckpt
-   recommended: False
-   width: 512
-   height: 512
-trinart-2.0:
-   description: An SD model finetuned with ~40,000 assorted high resolution manga/anime-style pictures (2.13 GB)
-   repo_id: naclbit/trinart_stable_diffusion_v2
-   config: v1-inference.yaml
-   file: trinart2_step95000.ckpt
-   recommended: False
-   width: 512
-   height: 512
-trinart_characters-1.0:
-   description: An SD model finetuned with 19.2M anime/manga style images (2.13 GB)
-   repo_id: naclbit/trinart_characters_19.2m_stable_diffusion_v1
-   config: v1-inference.yaml
-   file: trinart_characters_it4_v1.ckpt
-   recommended: False
-   width: 512
-   height: 512
-trinart_vae:
-   description: Custom autoencoder for trinart_characters
-   repo_id: naclbit/trinart_characters_19.2m_stable_diffusion_v1
-   config: VAE/trinart
-   file: autoencoder_fix_kl-f8-trinart_characters.ckpt
-   recommended: False
-   width: 512
-   height: 512
-papercut-1.0:
-   description: SD 1.5 fine-tuned for papercut art (use "PaperCut" in your prompts) (2.13 GB)
-   repo_id: Fictiverse/Stable_Diffusion_PaperCut_Model
-   config: v1-inference.yaml
-   file: PaperCut_v1.ckpt
-   recommended: False
-   width: 512
-   height: 512
-voxel_art-1.0:
-   description: Stable Diffusion trained on voxel art (use "VoxelArt" in your prompts) (4.27 GB)
-   repo_id: Fictiverse/Stable_Diffusion_VoxelArt_Model
-   config: v1-inference.yaml
-   file: VoxelArt_v1.ckpt
-   recommended: False
-   width: 512
-   height: 512

configs/sd-concepts.txt

@@ -1,803 +0,0 @@
-sd-concepts-library/001glitch-core
-sd-concepts-library/2814-roth
-sd-concepts-library/3d-female-cyborgs
-sd-concepts-library/4tnght
-sd-concepts-library/80s-anime-ai
-sd-concepts-library/80s-anime-ai-being
-sd-concepts-library/852style-girl
-sd-concepts-library/8bit
-sd-concepts-library/8sconception
-sd-concepts-library/Aflac-duck
-sd-concepts-library/Akitsuki
-sd-concepts-library/Atako
-sd-concepts-library/Exodus-Styling
-sd-concepts-library/RINGAO
-sd-concepts-library/a-female-hero-from-the-legend-of-mir
-sd-concepts-library/a-hat-kid
-sd-concepts-library/a-tale-of-two-empires
-sd-concepts-library/aadhav-face
-sd-concepts-library/aavegotchi
-sd-concepts-library/abby-face
-sd-concepts-library/abstract-concepts
-sd-concepts-library/accurate-angel
-sd-concepts-library/agm-style-nao
-sd-concepts-library/aj-fosik
-sd-concepts-library/alberto-mielgo
-sd-concepts-library/alex-portugal
-sd-concepts-library/alex-thumbnail-object-2000-steps
-sd-concepts-library/aleyna-tilki
-sd-concepts-library/alf
-sd-concepts-library/alicebeta
-sd-concepts-library/alien-avatar
-sd-concepts-library/alisa
-sd-concepts-library/all-rings-albuns
-sd-concepts-library/altvent
-sd-concepts-library/altyn-helmet
-sd-concepts-library/amine
-sd-concepts-library/amogus
-sd-concepts-library/anders-zorn
-sd-concepts-library/angus-mcbride-style
-sd-concepts-library/animalve3-1500seq
-sd-concepts-library/anime-background-style
-sd-concepts-library/anime-background-style-v2
-sd-concepts-library/anime-boy
-sd-concepts-library/anime-girl
-sd-concepts-library/anyXtronXredshift
-sd-concepts-library/anya-forger
-sd-concepts-library/apex-wingman
-sd-concepts-library/apulian-rooster-v0-1
-sd-concepts-library/arcane-face
-sd-concepts-library/arcane-style-jv
-sd-concepts-library/arcimboldo-style
-sd-concepts-library/armando-reveron-style
-sd-concepts-library/armor-concept
-sd-concepts-library/arq-render
-sd-concepts-library/art-brut
-sd-concepts-library/arthur1
-sd-concepts-library/artist-yukiko-kanagai
-sd-concepts-library/arwijn
-sd-concepts-library/ashiok
-sd-concepts-library/at-wolf-boy-object
-sd-concepts-library/atm-ant
-sd-concepts-library/atm-ant-2
-sd-concepts-library/axe-tattoo
-sd-concepts-library/ayush-spider-spr
-sd-concepts-library/azura-from-vibrant-venture
-sd-concepts-library/ba-shiroko
-sd-concepts-library/babau
-sd-concepts-library/babs-bunny
-sd-concepts-library/babushork
-sd-concepts-library/backrooms
-sd-concepts-library/bad_Hub_Hugh
-sd-concepts-library/bada-club
-sd-concepts-library/baldi
-sd-concepts-library/baluchitherian
-sd-concepts-library/bamse
-sd-concepts-library/bamse-og-kylling
-sd-concepts-library/bee
-sd-concepts-library/beholder
-sd-concepts-library/beldam
-sd-concepts-library/belen
-sd-concepts-library/bella-goth
-sd-concepts-library/belle-delphine
-sd-concepts-library/bert-muppet
-sd-concepts-library/better-collage3
-sd-concepts-library/between2-mt-fade
-sd-concepts-library/birb-style
-sd-concepts-library/black-and-white-design
-sd-concepts-library/black-waifu
-sd-concepts-library/bloo
-sd-concepts-library/blue-haired-boy
-sd-concepts-library/blue-zombie
-sd-concepts-library/blue-zombiee
-sd-concepts-library/bluebey
-sd-concepts-library/bluebey-2
-sd-concepts-library/bobs-burgers
-sd-concepts-library/boissonnard
-sd-concepts-library/bonzi-monkey
-sd-concepts-library/borderlands
-sd-concepts-library/bored-ape-textual-inversion
-sd-concepts-library/boris-anderson
-sd-concepts-library/bozo-22
-sd-concepts-library/breakcore
-sd-concepts-library/brittney-williams-art
-sd-concepts-library/bruma
-sd-concepts-library/brunnya
-sd-concepts-library/buddha-statue
-sd-concepts-library/bullvbear
-sd-concepts-library/button-eyes
-sd-concepts-library/canadian-goose
-sd-concepts-library/canary-cap
-sd-concepts-library/cancer_style
-sd-concepts-library/captain-haddock
-sd-concepts-library/captainkirb
-sd-concepts-library/car-toy-rk
-sd-concepts-library/carasibana
-sd-concepts-library/carlitos-el-mago
-sd-concepts-library/carrascharacter
-sd-concepts-library/cartoona-animals
-sd-concepts-library/cat-toy
-sd-concepts-library/centaur
-sd-concepts-library/cgdonny1
-sd-concepts-library/cham
-sd-concepts-library/chandra-nalaar
-sd-concepts-library/char-con
-sd-concepts-library/character-pingu
-sd-concepts-library/cheburashka
-sd-concepts-library/chen-1
-sd-concepts-library/child-zombie
-sd-concepts-library/chillpill
-sd-concepts-library/chonkfrog
-sd-concepts-library/chop
-sd-concepts-library/christo-person
-sd-concepts-library/chuck-walton
-sd-concepts-library/chucky
-sd-concepts-library/chungus-poodl-pet
-sd-concepts-library/cindlop
-sd-concepts-library/collage-cutouts
-sd-concepts-library/collage14
-sd-concepts-library/collage3
-sd-concepts-library/collage3-hubcity
-sd-concepts-library/cologne
-sd-concepts-library/color-page
-sd-concepts-library/colossus
-sd-concepts-library/command-and-conquer-remastered-cameos
-sd-concepts-library/concept-art
-sd-concepts-library/conner-fawcett-style
-sd-concepts-library/conway-pirate
-sd-concepts-library/coop-himmelblau
-sd-concepts-library/coraline
-sd-concepts-library/cornell-box
-sd-concepts-library/cortana
-sd-concepts-library/covid-19-rapid-test
-sd-concepts-library/cow-uwu
-sd-concepts-library/cowboy
-sd-concepts-library/crazy-1
-sd-concepts-library/crazy-2
-sd-concepts-library/crb-portraits
-sd-concepts-library/crb-surrealz
-sd-concepts-library/crbart
-sd-concepts-library/crested-gecko
-sd-concepts-library/crinos-form-garou
-sd-concepts-library/cry-baby-style
-sd-concepts-library/crybaby-style-2-0
-sd-concepts-library/csgo-awp-object
-sd-concepts-library/csgo-awp-texture-map
-sd-concepts-library/cubex
-sd-concepts-library/cumbia-peruana
-sd-concepts-library/cute-bear
-sd-concepts-library/cute-cat
-sd-concepts-library/cute-game-style
-sd-concepts-library/cyberpunk-lucy
-sd-concepts-library/dabotap
-sd-concepts-library/dan-mumford
-sd-concepts-library/dan-seagrave-art-style
-sd-concepts-library/dark-penguin-pinguinanimations
-sd-concepts-library/darkpenguinanimatronic
-sd-concepts-library/darkplane
-sd-concepts-library/david-firth-artstyle
-sd-concepts-library/david-martinez-cyberpunk
-sd-concepts-library/david-martinez-edgerunners
-sd-concepts-library/david-moreno-architecture
-sd-concepts-library/daycare-attendant-sun-fnaf
-sd-concepts-library/ddattender
-sd-concepts-library/degods
-sd-concepts-library/degodsheavy
-sd-concepts-library/depthmap
-sd-concepts-library/depthmap-style
-sd-concepts-library/design
-sd-concepts-library/detectivedinosaur1
-sd-concepts-library/diaosu-toy
-sd-concepts-library/dicoo
-sd-concepts-library/dicoo2
-sd-concepts-library/dishonored-portrait-styles
-sd-concepts-library/disquieting-muses
-sd-concepts-library/ditko
-sd-concepts-library/dlooak
-sd-concepts-library/doc
-sd-concepts-library/doener-red-line-art
-sd-concepts-library/dog
-sd-concepts-library/dog-django
-sd-concepts-library/doge-pound
-sd-concepts-library/dong-ho
-sd-concepts-library/dong-ho2
-sd-concepts-library/doose-s-realistic-art-style
-sd-concepts-library/dq10-anrushia
-sd-concepts-library/dr-livesey
-sd-concepts-library/dr-strange
-sd-concepts-library/dragonborn
-sd-concepts-library/dreamcore
-sd-concepts-library/dreamy-painting
-sd-concepts-library/drive-scorpion-jacket
-sd-concepts-library/dsmuses
-sd-concepts-library/dtv-pkmn
-sd-concepts-library/dullboy-caricature
-sd-concepts-library/duranduran
-sd-concepts-library/durer-style
-sd-concepts-library/dyoudim-style
-sd-concepts-library/early-mishima-kurone
-sd-concepts-library/eastward
-sd-concepts-library/eddie
-sd-concepts-library/edgerunners-style
-sd-concepts-library/edgerunners-style-v2
-sd-concepts-library/el-salvador-style-style
-sd-concepts-library/elegant-flower
-sd-concepts-library/elspeth-tirel
-sd-concepts-library/eru-chitanda-casual
-sd-concepts-library/erwin-olaf-style
-sd-concepts-library/ettblackteapot
-sd-concepts-library/explosions-cat
-sd-concepts-library/eye-of-agamotto
-sd-concepts-library/f-22
-sd-concepts-library/facadeplace
-sd-concepts-library/fairy-tale-painting-style
-sd-concepts-library/fairytale
-sd-concepts-library/fang-yuan-001
-sd-concepts-library/faraon-love-shady
-sd-concepts-library/fasina
-sd-concepts-library/felps
-sd-concepts-library/female-kpop-singer
-sd-concepts-library/fergal-cat
-sd-concepts-library/filename-2
-sd-concepts-library/fileteado-porteno
-sd-concepts-library/final-fantasy-logo
-sd-concepts-library/fireworks-over-water
-sd-concepts-library/fish
-sd-concepts-library/flag-ussr
-sd-concepts-library/flatic
-sd-concepts-library/floral
-sd-concepts-library/fluid-acrylic-jellyfish-creatures-style-of-carl-ingram-art
-sd-concepts-library/fnf-boyfriend
-sd-concepts-library/fold-structure
-sd-concepts-library/fox-purple
-sd-concepts-library/fractal
-sd-concepts-library/fractal-flame
-sd-concepts-library/fractal-temple-style
-sd-concepts-library/frank-frazetta
-sd-concepts-library/franz-unterberger
-sd-concepts-library/freddy-fazbear
-sd-concepts-library/freefonix-style
-sd-concepts-library/furrpopasthetic
-sd-concepts-library/fursona
-sd-concepts-library/fzk
-sd-concepts-library/galaxy-explorer
-sd-concepts-library/ganyu-genshin-impact
-sd-concepts-library/garcon-the-cat
-sd-concepts-library/garfield-pizza-plush
-sd-concepts-library/garfield-pizza-plush-v2
-sd-concepts-library/gba-fe-class-cards
-sd-concepts-library/gba-pokemon-sprites
-sd-concepts-library/geggin
-sd-concepts-library/ggplot2
-sd-concepts-library/ghost-style
-sd-concepts-library/ghostproject-men
-sd-concepts-library/gibasachan-v0
-sd-concepts-library/gim
-sd-concepts-library/gio
-sd-concepts-library/giygas
-sd-concepts-library/glass-pipe
-sd-concepts-library/glass-prism-cube
-sd-concepts-library/glow-forest
-sd-concepts-library/goku
-sd-concepts-library/gram-tops
-sd-concepts-library/green-blue-shanshui
-sd-concepts-library/green-tent
-sd-concepts-library/grifter
-sd-concepts-library/grisstyle
-sd-concepts-library/grit-toy
-sd-concepts-library/gt-color-paint-2
-sd-concepts-library/gta5-artwork
-sd-concepts-library/guttestreker
-sd-concepts-library/gymnastics-leotard-v2
-sd-concepts-library/half-life-2-dog
-sd-concepts-library/handstand
-sd-concepts-library/hanfu-anime-style
-sd-concepts-library/happy-chaos
-sd-concepts-library/happy-person12345
-sd-concepts-library/happy-person12345-assets
-sd-concepts-library/harley-quinn
-sd-concepts-library/harmless-ai-1
-sd-concepts-library/harmless-ai-house-style-1
-sd-concepts-library/hd-emoji
-sd-concepts-library/heather
-sd-concepts-library/henjo-techno-show
-sd-concepts-library/herge-style
-sd-concepts-library/hiten-style-nao
-sd-concepts-library/hitokomoru-style-nao
-sd-concepts-library/hiyuki-chan
-sd-concepts-library/hk-bamboo
-sd-concepts-library/hk-betweenislands
-sd-concepts-library/hk-bicycle
-sd-concepts-library/hk-blackandwhite
-sd-concepts-library/hk-breakfast
-sd-concepts-library/hk-buses
-sd-concepts-library/hk-clouds
-sd-concepts-library/hk-goldbuddha
-sd-concepts-library/hk-goldenlantern
-sd-concepts-library/hk-hkisland
-sd-concepts-library/hk-leaves
-sd-concepts-library/hk-market
-sd-concepts-library/hk-oldcamera
-sd-concepts-library/hk-opencamera
-sd-concepts-library/hk-peach
-sd-concepts-library/hk-phonevax
-sd-concepts-library/hk-streetpeople
-sd-concepts-library/hk-vintage
-sd-concepts-library/hoi4
-sd-concepts-library/hoi4-leaders
-sd-concepts-library/homestuck-sprite
-sd-concepts-library/homestuck-troll
-sd-concepts-library/hours-sentry-fade
-sd-concepts-library/hours-style
-sd-concepts-library/hrgiger-drmacabre
-sd-concepts-library/huang-guang-jian
-sd-concepts-library/huatli
-sd-concepts-library/huayecai820-greyscale
-sd-concepts-library/hub-city
-sd-concepts-library/hubris-oshri
-sd-concepts-library/huckleberry
-sd-concepts-library/hydrasuit
-sd-concepts-library/i-love-chaos
-sd-concepts-library/ibere-thenorio
-sd-concepts-library/ic0n
-sd-concepts-library/ie-gravestone
-sd-concepts-library/ikea-fabler
-sd-concepts-library/illustration-style
-sd-concepts-library/ilo-kunst
-sd-concepts-library/ilya-shkipin
-sd-concepts-library/im-poppy
-sd-concepts-library/ina-art
-sd-concepts-library/indian-watercolor-portraits
-sd-concepts-library/indiana
-sd-concepts-library/ingmar-bergman
-sd-concepts-library/insidewhale
-sd-concepts-library/interchanges
-sd-concepts-library/inuyama-muneto-style-nao
-sd-concepts-library/irasutoya
-sd-concepts-library/iridescent-illustration-style
-sd-concepts-library/iridescent-photo-style
-sd-concepts-library/isabell-schulte-pv-pvii-3000steps
-sd-concepts-library/isabell-schulte-pviii-1-image-style
-sd-concepts-library/isabell-schulte-pviii-1024px-1500-steps-style
-sd-concepts-library/isabell-schulte-pviii-12tiles-3000steps-style
-sd-concepts-library/isabell-schulte-pviii-4-tiles-1-lr-3000-steps-style
-sd-concepts-library/isabell-schulte-pviii-4-tiles-3-lr-5000-steps-style
-sd-concepts-library/isabell-schulte-pviii-4tiles-500steps
-sd-concepts-library/isabell-schulte-pviii-4tiles-6000steps
-sd-concepts-library/isabell-schulte-pviii-style
-sd-concepts-library/isometric-tile-test
-sd-concepts-library/jacqueline-the-unicorn
-sd-concepts-library/james-web-space-telescope
-sd-concepts-library/jamie-hewlett-style
-sd-concepts-library/jamiels
-sd-concepts-library/jang-sung-rak-style
-sd-concepts-library/jetsetdreamcastcovers
-sd-concepts-library/jin-kisaragi
-sd-concepts-library/jinjoon-lee-they
-sd-concepts-library/jm-bergling-monogram
-sd-concepts-library/joe-mad
-sd-concepts-library/joe-whiteford-art-style
-sd-concepts-library/joemad
-sd-concepts-library/john-blanche
-sd-concepts-library/johnny-silverhand
-sd-concepts-library/jojo-bizzare-adventure-manga-lineart
-sd-concepts-library/jos-de-kat
-sd-concepts-library/junji-ito-artstyle
-sd-concepts-library/kaleido
-sd-concepts-library/kaneoya-sachiko
-sd-concepts-library/kanovt
-sd-concepts-library/kanv1
-sd-concepts-library/karan-gloomy
-sd-concepts-library/karl-s-lzx-1
-sd-concepts-library/kasumin
-sd-concepts-library/kawaii-colors
-sd-concepts-library/kawaii-girl-plus-object
-sd-concepts-library/kawaii-girl-plus-style
-sd-concepts-library/kawaii-girl-plus-style-v1-1
-sd-concepts-library/kay
-sd-concepts-library/kaya-ghost-assasin
-sd-concepts-library/ki
-sd-concepts-library/kinda-sus
-sd-concepts-library/kings-quest-agd
-sd-concepts-library/kiora
-sd-concepts-library/kira-sensei
-sd-concepts-library/kirby
-sd-concepts-library/klance
-sd-concepts-library/kodakvision500t
-sd-concepts-library/kogatan-shiny
-sd-concepts-library/kogecha
-sd-concepts-library/kojima-ayami
-sd-concepts-library/koko-dog
-sd-concepts-library/kuvshinov
-sd-concepts-library/kysa-v-style
-sd-concepts-library/laala-character
-sd-concepts-library/larrette
-sd-concepts-library/lavko
-sd-concepts-library/lazytown-stephanie
-sd-concepts-library/ldr
-sd-concepts-library/ldrs
-sd-concepts-library/led-toy
-sd-concepts-library/lego-astronaut
-sd-concepts-library/leica
-sd-concepts-library/leif-jones
-sd-concepts-library/lex
-sd-concepts-library/liliana
-sd-concepts-library/liliana-vess
-sd-concepts-library/liminal-spaces-2-0
-sd-concepts-library/liminalspaces
-sd-concepts-library/line-art
-sd-concepts-library/line-style
-sd-concepts-library/linnopoke
-sd-concepts-library/liquid-light
-sd-concepts-library/liqwid-aquafarmer
-sd-concepts-library/lizardman
-sd-concepts-library/loab-character
-sd-concepts-library/loab-style
-sd-concepts-library/lofa
-sd-concepts-library/logo-with-face-on-shield
-sd-concepts-library/lolo
-sd-concepts-library/looney-anime
-sd-concepts-library/lost-rapper
-sd-concepts-library/lphr-style
-sd-concepts-library/lucario
-sd-concepts-library/lucky-luke
-sd-concepts-library/lugal-ki-en
-sd-concepts-library/luinv2
-sd-concepts-library/lula-13
-sd-concepts-library/lumio
-sd-concepts-library/lxj-o4
-sd-concepts-library/m-geo
-sd-concepts-library/m-geoo
-sd-concepts-library/madhubani-art
-sd-concepts-library/mafalda-character
-sd-concepts-library/magic-pengel
-sd-concepts-library/malika-favre-art-style
-sd-concepts-library/manga-style
-sd-concepts-library/marbling-art
-sd-concepts-library/margo
-sd-concepts-library/marty
-sd-concepts-library/marty6
-sd-concepts-library/mass
-sd-concepts-library/masyanya
-sd-concepts-library/masyunya
-sd-concepts-library/mate
-sd-concepts-library/matthew-stone
-sd-concepts-library/mattvidpro
-sd-concepts-library/maurice-quentin-de-la-tour-style
-sd-concepts-library/maus
-sd-concepts-library/max-foley
-sd-concepts-library/mayor-richard-irvin
-sd-concepts-library/mechasoulall
-sd-concepts-library/medazzaland
-sd-concepts-library/memnarch-mtg
-sd-concepts-library/metagabe
-sd-concepts-library/meyoco
-sd-concepts-library/meze-audio-elite-headphones
-sd-concepts-library/midjourney-style
-sd-concepts-library/mikako-method
-sd-concepts-library/mikako-methodi2i
-sd-concepts-library/miko-3-robot
-sd-concepts-library/milady
-sd-concepts-library/mildemelwe-style
-sd-concepts-library/million-live-akane-15k
-sd-concepts-library/million-live-akane-3k
-sd-concepts-library/million-live-akane-shifuku-3k
-sd-concepts-library/million-live-spade-q-object-3k
-sd-concepts-library/million-live-spade-q-style-3k
-sd-concepts-library/minecraft-concept-art
-sd-concepts-library/mishima-kurone
-sd-concepts-library/mizkif
-sd-concepts-library/moeb-style
-sd-concepts-library/moebius
-sd-concepts-library/mokoko
-sd-concepts-library/mokoko-seed
-sd-concepts-library/monster-girl
-sd-concepts-library/monster-toy
-sd-concepts-library/monte-novo
-sd-concepts-library/moo-moo
-sd-concepts-library/morino-hon-style
-sd-concepts-library/moxxi
-sd-concepts-library/msg
-sd-concepts-library/mtg-card
-sd-concepts-library/mtl-longsky
-sd-concepts-library/mu-sadr
-sd-concepts-library/munch-leaks-style
-sd-concepts-library/museum-by-coop-himmelblau
-sd-concepts-library/muxoyara
-sd-concepts-library/my-hero-academia-style
-sd-concepts-library/my-mug
-sd-concepts-library/mycat
-sd-concepts-library/mystical-nature
-sd-concepts-library/naf
-sd-concepts-library/nahiri
-sd-concepts-library/namine-ritsu
-sd-concepts-library/naoki-saito
-sd-concepts-library/nard-style
-sd-concepts-library/naruto
-sd-concepts-library/natasha-johnston
-sd-concepts-library/nathan-wyatt
-sd-concepts-library/naval-portrait
-sd-concepts-library/nazuna
-sd-concepts-library/nebula
-sd-concepts-library/ned-flanders
-sd-concepts-library/neon-pastel
-sd-concepts-library/new-priests
-sd-concepts-library/nic-papercuts
-sd-concepts-library/nikodim
-sd-concepts-library/nissa-revane
-sd-concepts-library/nixeu
-sd-concepts-library/noggles
-sd-concepts-library/nomad
-sd-concepts-library/nouns-glasses
-sd-concepts-library/obama-based-on-xi
-sd-concepts-library/obama-self-2
-sd-concepts-library/og-mox-style
-sd-concepts-library/ohisashiburi-style
-sd-concepts-library/oleg-kuvaev
-sd-concepts-library/olli-olli
-sd-concepts-library/on-kawara
-sd-concepts-library/one-line-drawing
-sd-concepts-library/onepunchman
-sd-concepts-library/onzpo
-sd-concepts-library/orangejacket
-sd-concepts-library/ori
-sd-concepts-library/ori-toor
-sd-concepts-library/orientalist-art
-sd-concepts-library/osaka-jyo
-sd-concepts-library/osaka-jyo2
-sd-concepts-library/osrsmini2
-sd-concepts-library/osrstiny
-sd-concepts-library/other-mother
-sd-concepts-library/ouroboros
-sd-concepts-library/outfit-items
-sd-concepts-library/overprettified
-sd-concepts-library/owl-house
-sd-concepts-library/painted-by-silver-of-999
-sd-concepts-library/painted-by-silver-of-999-2
-sd-concepts-library/painted-student
-sd-concepts-library/painting
-sd-concepts-library/pantone-milk
-sd-concepts-library/paolo-bonolis
-sd-concepts-library/party-girl
-sd-concepts-library/pascalsibertin
-sd-concepts-library/pastelartstyle
-sd-concepts-library/paul-noir
-sd-concepts-library/pen-ink-portraits-bennorthen
-sd-concepts-library/phan
-sd-concepts-library/phan-s-collage
-sd-concepts-library/phc
-sd-concepts-library/phoenix-01
-sd-concepts-library/pineda-david
-sd-concepts-library/pink-beast-pastelae-style
-sd-concepts-library/pintu
-sd-concepts-library/pion-by-august-semionov
-sd-concepts-library/piotr-jablonski
-sd-concepts-library/pixel-mania
-sd-concepts-library/pixel-toy
-sd-concepts-library/pjablonski-style
-sd-concepts-library/plant-style
-sd-concepts-library/plen-ki-mun
-sd-concepts-library/pokemon-conquest-sprites
-sd-concepts-library/pool-test
-sd-concepts-library/poolrooms
-sd-concepts-library/poring-ragnarok-online
-sd-concepts-library/poutine-dish
-sd-concepts-library/princess-knight-art
-sd-concepts-library/progress-chip
-sd-concepts-library/puerquis-toy
-sd-concepts-library/purplefishli
-sd-concepts-library/pyramidheadcosplay
-sd-concepts-library/qpt-atrium
-sd-concepts-library/quiesel
-sd-concepts-library/r-crumb-style
-sd-concepts-library/rahkshi-bionicle
-sd-concepts-library/raichu
-sd-concepts-library/rail-scene
-sd-concepts-library/rail-scene-style
-sd-concepts-library/ralph-mcquarrie
-sd-concepts-library/ransom
-sd-concepts-library/rayne-weynolds
-sd-concepts-library/rcrumb-portraits-style
-sd-concepts-library/rd-chaos
-sd-concepts-library/rd-paintings
-sd-concepts-library/red-glasses
-sd-concepts-library/reeducation-camp
-sd-concepts-library/reksio-dog
-sd-concepts-library/rektguy
-sd-concepts-library/remert
-sd-concepts-library/renalla
-sd-concepts-library/repeat
-sd-concepts-library/retro-girl
-sd-concepts-library/retro-mecha-rangers
-sd-concepts-library/retropixelart-pinguin
-sd-concepts-library/rex-deno
-sd-concepts-library/rhizomuse-machine-bionic-sculpture
-sd-concepts-library/ricar
-sd-concepts-library/rickyart
-sd-concepts-library/rico-face
-sd-concepts-library/riker-doll
-sd-concepts-library/rikiart
-sd-concepts-library/rikiboy-art
-sd-concepts-library/rilakkuma
-sd-concepts-library/rishusei-style
-sd-concepts-library/rj-palmer
-sd-concepts-library/rl-pkmn-test
-sd-concepts-library/road-to-ruin
-sd-concepts-library/robertnava
-sd-concepts-library/roblox-avatar
-sd-concepts-library/roy-lichtenstein
-sd-concepts-library/ruan-jia
-sd-concepts-library/russian
-sd-concepts-library/s1m-naoto-ohshima
-sd-concepts-library/saheeli-rai
-sd-concepts-library/sakimi-style
-sd-concepts-library/salmonid
-sd-concepts-library/sam-yang
-sd-concepts-library/sanguo-guanyu
-sd-concepts-library/sas-style
-sd-concepts-library/scarlet-witch
-sd-concepts-library/schloss-mosigkau
-sd-concepts-library/scrap-style
-sd-concepts-library/scratch-project
-sd-concepts-library/sculptural-style
-sd-concepts-library/sd-concepts-library-uma-meme
-sd-concepts-library/seamless-ground
-sd-concepts-library/selezneva-alisa
-sd-concepts-library/sem-mac2n
-sd-concepts-library/senneca
-sd-concepts-library/seraphimmoonshadow-art
-sd-concepts-library/sewerslvt
-sd-concepts-library/she-hulk-law-art
-sd-concepts-library/she-mask
-sd-concepts-library/sherhook-painting
-sd-concepts-library/sherhook-painting-v2
-sd-concepts-library/shev-linocut
-sd-concepts-library/shigure-ui-style
-sd-concepts-library/shiny-polyman
-sd-concepts-library/shrunken-head
-sd-concepts-library/shu-doll
-sd-concepts-library/shvoren-style
-sd-concepts-library/sims-2-portrait
-sd-concepts-library/singsing
-sd-concepts-library/singsing-doll
-sd-concepts-library/sintez-ico
-sd-concepts-library/skyfalls
-sd-concepts-library/slm
-sd-concepts-library/smarties
-sd-concepts-library/smiling-friend-style
-sd-concepts-library/smooth-pencils
-sd-concepts-library/smurf-style
-sd-concepts-library/smw-map
-sd-concepts-library/society-finch
-sd-concepts-library/sorami-style
-sd-concepts-library/spider-gwen
-sd-concepts-library/spritual-monsters
-sd-concepts-library/stable-diffusion-conceptualizer
-sd-concepts-library/star-tours-posters
-sd-concepts-library/stardew-valley-pixel-art
-sd-concepts-library/starhavenmachinegods
-sd-concepts-library/sterling-archer
-sd-concepts-library/stretch-re1-robot
-sd-concepts-library/stuffed-penguin-toy
-sd-concepts-library/style-of-marc-allante
-sd-concepts-library/summie-style
-sd-concepts-library/sunfish
-sd-concepts-library/super-nintendo-cartridge
-sd-concepts-library/supitcha-mask
-sd-concepts-library/sushi-pixel
-sd-concepts-library/swamp-choe-2
-sd-concepts-library/t-skrang
-sd-concepts-library/takuji-kawano
-sd-concepts-library/tamiyo
-sd-concepts-library/tangles
-sd-concepts-library/tb303
-sd-concepts-library/tcirle
-sd-concepts-library/teelip-ir-landscape
-sd-concepts-library/teferi
-sd-concepts-library/tela-lenca
-sd-concepts-library/tela-lenca2
-sd-concepts-library/terraria-style
-sd-concepts-library/tesla-bot
-sd-concepts-library/test
-sd-concepts-library/test-epson
-sd-concepts-library/test2
-sd-concepts-library/testing
-sd-concepts-library/thalasin
-sd-concepts-library/thegeneral
-sd-concepts-library/thorneworks
-sd-concepts-library/threestooges
-sd-concepts-library/thunderdome-cover
-sd-concepts-library/thunderdome-covers
-sd-concepts-library/ti-junglepunk-v0
-sd-concepts-library/tili-concept
-sd-concepts-library/titan-robot
-sd-concepts-library/tnj
-sd-concepts-library/toho-pixel
-sd-concepts-library/tomcat
-sd-concepts-library/tonal1
-sd-concepts-library/tony-diterlizzi-s-planescape-art
-sd-concepts-library/towerplace
-sd-concepts-library/toy
-sd-concepts-library/toy-bonnie-plush
-sd-concepts-library/toyota-sera
-sd-concepts-library/transmutation-circles
-sd-concepts-library/trash-polka-artstyle
-sd-concepts-library/travis-bedel
-sd-concepts-library/trigger-studio
-sd-concepts-library/trust-support
-sd-concepts-library/trypophobia
-sd-concepts-library/ttte
-sd-concepts-library/tubby
-sd-concepts-library/tubby-cats
-sd-concepts-library/tudisco
-sd-concepts-library/turtlepics
-sd-concepts-library/type
-sd-concepts-library/ugly-sonic
-sd-concepts-library/uliana-kudinova
-sd-concepts-library/uma
-sd-concepts-library/uma-clean-object
-sd-concepts-library/uma-meme
-sd-concepts-library/uma-meme-style
-sd-concepts-library/uma-style-classic
-sd-concepts-library/unfinished-building
-sd-concepts-library/urivoldemort
-sd-concepts-library/uzumaki
-sd-concepts-library/valorantstyle
-sd-concepts-library/vb-mox
-sd-concepts-library/vcr-classique
-sd-concepts-library/venice
-sd-concepts-library/vespertine
-sd-concepts-library/victor-narm
-sd-concepts-library/vietstoneking
-sd-concepts-library/vivien-reid
-sd-concepts-library/vkuoo1
-sd-concepts-library/vraska
-sd-concepts-library/w3u
-sd-concepts-library/walter-wick-photography
-sd-concepts-library/warhammer-40k-drawing-style
-sd-concepts-library/waterfallshadow
-sd-concepts-library/wayne-reynolds-character
-sd-concepts-library/wedding
-sd-concepts-library/wedding-HandPainted
-sd-concepts-library/werebloops
-sd-concepts-library/wheatland
-sd-concepts-library/wheatland-arknight
-sd-concepts-library/wheelchair
-sd-concepts-library/wildkat
-sd-concepts-library/willy-hd
-sd-concepts-library/wire-angels
-sd-concepts-library/wish-artist-stile
-sd-concepts-library/wlop-style
-sd-concepts-library/wojak
-sd-concepts-library/wojaks-now
-sd-concepts-library/wojaks-now-now-now
-sd-concepts-library/xatu
-sd-concepts-library/xatu2
-sd-concepts-library/xbh
-sd-concepts-library/xi
-sd-concepts-library/xidiversity
-sd-concepts-library/xioboma
-sd-concepts-library/xuna
-sd-concepts-library/xyz
-sd-concepts-library/yb-anime
-sd-concepts-library/yerba-mate
-sd-concepts-library/yesdelete
-sd-concepts-library/yf21
-sd-concepts-library/yilanov2
-sd-concepts-library/yinit
-sd-concepts-library/yoji-shinkawa-style
-sd-concepts-library/yolandi-visser
-sd-concepts-library/yoshi
-sd-concepts-library/youpi2
-sd-concepts-library/youtooz-candy
-sd-concepts-library/yuji-himukai-style
-sd-concepts-library/zaney
-sd-concepts-library/zaneypixelz
-sd-concepts-library/zdenek-art
-sd-concepts-library/zero
-sd-concepts-library/zero-bottle
-sd-concepts-library/zero-suit-samus
-sd-concepts-library/zillertal-can
-sd-concepts-library/zizigooloo
-sd-concepts-library/zk
-sd-concepts-library/zoroark

docker-build/Dockerfile

@@ -1,65 +0,0 @@
-FROM python:3.10-slim AS builder
-
-# use bash
-SHELL [ "/bin/bash", "-c" ]
-
-# Install necesarry packages
-RUN apt-get update \
-  && apt-get install -y \
-    --no-install-recommends \
-    gcc=4:10.2.* \
-    libgl1-mesa-glx=20.3.* \
-    libglib2.0-0=2.66.* \
-    python3-dev=3.9.* \
-  && apt-get clean \
-  && rm -rf /var/lib/apt/lists/*
-
-# set WORKDIR, PATH and copy sources
-ARG APPDIR=/usr/src/app
-WORKDIR ${APPDIR}
-ENV PATH ${APPDIR}/.venv/bin:$PATH
-ARG PIP_REQUIREMENTS=requirements-lin-cuda.txt
-COPY . ./environments-and-requirements/${PIP_REQUIREMENTS} ./
-
-# install requirements
-RUN python3 -m venv .venv \
-  && pip install \
-    --upgrade \
-    --no-cache-dir \
-    'wheel>=0.38.4' \
-  && pip install \
-    --no-cache-dir \
-    -r ${PIP_REQUIREMENTS}
-
-FROM python:3.10-slim AS runtime
-
-# setup environment
-ARG APPDIR=/usr/src/app
-WORKDIR ${APPDIR}
-COPY --from=builder ${APPDIR} .
-ENV \
-  PATH=${APPDIR}/.venv/bin:$PATH \
-  INVOKEAI_ROOT=/data \
-  INVOKE_MODEL_RECONFIGURE=--yes
-
-# Install necesarry packages
-RUN apt-get update \
-  && apt-get install -y \
-    --no-install-recommends \
-    build-essential=12.9 \
-    libgl1-mesa-glx=20.3.* \
-    libglib2.0-0=2.66.* \
-    libopencv-dev=4.5.* \
-  && ln -sf \
-    /usr/lib/"$(arch)"-linux-gnu/pkgconfig/opencv4.pc \
-    /usr/lib/"$(arch)"-linux-gnu/pkgconfig/opencv.pc \
-  && python3 -c "from patchmatch import patch_match" \
-  && apt-get remove -y \
-    --autoremove \
-    build-essential \
-  && apt-get autoclean \
-  && rm -rf /var/lib/apt/lists/*
-
-# set Entrypoint and default CMD
-ENTRYPOINT [ "python3", "scripts/invoke.py" ]
-CMD [ "--web", "--host=0.0.0.0" ]

docker-build/Dockerfile.cloud

@@ -1,86 +0,0 @@
-#######################
-#### Builder stage ####
-
-FROM library/ubuntu:22.04 AS builder
-
-ARG DEBIAN_FRONTEND=noninteractive
-RUN rm -f /etc/apt/apt.conf.d/docker-clean; echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache
-RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
-    --mount=type=cache,target=/var/lib/apt,sharing=locked \
-    apt update && apt-get install -y \
-        git \
-        libglib2.0-0 \
-        libgl1-mesa-glx \
-        python3-venv \
-        python3-pip \
-        build-essential \
-        python3-opencv \
-        libopencv-dev
-
-# This is needed for patchmatch support
-RUN cd /usr/lib/x86_64-linux-gnu/pkgconfig/ &&\
-   ln -sf opencv4.pc opencv.pc
-
-ARG WORKDIR=/invokeai
-WORKDIR ${WORKDIR}
-
-ENV VIRTUAL_ENV=${WORKDIR}/.venv
-ENV PATH="$VIRTUAL_ENV/bin:$PATH"
-
-RUN --mount=type=cache,target=/root/.cache/pip \
-    python3 -m venv ${VIRTUAL_ENV} &&\
-    pip install --extra-index-url https://download.pytorch.org/whl/cu116 \
-        torch==1.12.0+cu116 \
-        torchvision==0.13.0+cu116 &&\
-    pip install -e git+https://github.com/invoke-ai/PyPatchMatch@0.1.3#egg=pypatchmatch
-
-COPY . .
-RUN --mount=type=cache,target=/root/.cache/pip \
-    cp environments-and-requirements/requirements-lin-cuda.txt requirements.txt && \
-    pip install -r requirements.txt &&\
-    pip install -e .
-
-
-#######################
-#### Runtime stage ####
-
-FROM library/ubuntu:22.04 as runtime
-
-ARG DEBIAN_FRONTEND=noninteractive
-ENV PYTHONUNBUFFERED=1
-RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
-    --mount=type=cache,target=/var/lib/apt,sharing=locked \
-    apt update && apt install -y --no-install-recommends \
-        git \
-        curl \
-        ncdu \
-        iotop \
-        bzip2 \
-        libglib2.0-0 \
-        libgl1-mesa-glx \
-        python3-venv \
-        python3-pip \
-        build-essential \
-        python3-opencv \
-        libopencv-dev &&\
-    apt-get clean && apt-get autoclean
-
-ARG WORKDIR=/invokeai
-WORKDIR ${WORKDIR}
-
-ENV INVOKEAI_ROOT=/mnt/invokeai
-ENV VIRTUAL_ENV=${WORKDIR}/.venv
-ENV PATH="$VIRTUAL_ENV/bin:$PATH"
-
-COPY --from=builder ${WORKDIR} ${WORKDIR}
-COPY --from=builder /usr/lib/x86_64-linux-gnu/pkgconfig /usr/lib/x86_64-linux-gnu/pkgconfig
-
-# build patchmatch
-RUN python -c "from patchmatch import patch_match"
-
-## workaround for non-existent initfile when runtime directory is mounted; see #1613
-RUN touch /root/.invokeai
-
-ENTRYPOINT ["bash"]
-
-CMD ["-c", "python3 scripts/invoke.py --web --host 0.0.0.0"]

docker-build/Makefile

@@ -1,44 +0,0 @@
-# Directory in the container where the INVOKEAI_ROOT (runtime dir) will be mounted
-INVOKEAI_ROOT=/mnt/invokeai
-# Host directory to contain the runtime dir. Will be mounted at INVOKEAI_ROOT path in the container
-HOST_MOUNT_PATH=${HOME}/invokeai
-
-IMAGE=local/invokeai:latest
-
-USER=$(shell id -u)
-GROUP=$(shell id -g)
-
-# All downloaded models, config, etc will end up in ${HOST_MOUNT_PATH} on the host.
-# This is consistent with the expected non-Docker behaviour.
-# Contents can be moved to a persistent storage and used to prime the cache on another host.
-
-build:
-	DOCKER_BUILDKIT=1 docker build -t local/invokeai:latest -f Dockerfile.cloud ..
-
-configure:
-	docker run --rm -it --runtime=nvidia --gpus=all \
-		-v ${HOST_MOUNT_PATH}:${INVOKEAI_ROOT} \
-		-e INVOKEAI_ROOT=${INVOKEAI_ROOT} \
-		${IMAGE} -c "python scripts/configure_invokeai.py"
-
-# Run the container with the runtime dir mounted and the web server exposed on port 9090
-web:
-	docker run --rm -it --runtime=nvidia --gpus=all \
-		-v ${HOST_MOUNT_PATH}:${INVOKEAI_ROOT} \
-		-e INVOKEAI_ROOT=${INVOKEAI_ROOT} \
-		-p 9090:9090 \
-		${IMAGE} -c "python scripts/invoke.py --web --host 0.0.0.0"
-
-# Run the cli with the runtime dir mounted
-cli:
-	docker run --rm -it --runtime=nvidia --gpus=all \
-		-v ${HOST_MOUNT_PATH}:${INVOKEAI_ROOT} \
-		-e INVOKEAI_ROOT=${INVOKEAI_ROOT} \
-		${IMAGE} -c "python scripts/invoke.py"
-
-# Run the container with the runtime dir mounted and open a bash shell
-shell:
-	docker run --rm -it --runtime=nvidia --gpus=all \
-		-v ${HOST_MOUNT_PATH}:${INVOKEAI_ROOT} ${IMAGE} --
-
-.PHONY: build configure web cli shell

docker-build/build.sh

@@ -1,35 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-# How to use: https://invoke-ai.github.io/InvokeAI/installation/INSTALL_DOCKER/#setup
-
-source ./docker-build/env.sh \
-  || echo "please execute docker-build/build.sh from repository root" \
-  || exit 1
-
-PIP_REQUIREMENTS=${PIP_REQUIREMENTS:-requirements-lin-cuda.txt}
-DOCKERFILE=${INVOKE_DOCKERFILE:-docker-build/Dockerfile}
-
-# print the settings
-echo -e "You are using these values:\n"
-echo -e "Dockerfile:\t ${DOCKERFILE}"
-echo -e "Requirements:\t ${PIP_REQUIREMENTS}"
-echo -e "Volumename:\t ${VOLUMENAME}"
-echo -e "arch:\t\t ${ARCH}"
-echo -e "Platform:\t ${PLATFORM}"
-echo -e "Invokeai_tag:\t ${INVOKEAI_TAG}\n"
-
-if [[ -n "$(docker volume ls -f name="${VOLUMENAME}" -q)" ]]; then
-  echo -e "Volume already exists\n"
-else
-  echo -n "createing docker volume "
-  docker volume create "${VOLUMENAME}"
-fi
-
-# Build Container
-docker build \
-  --platform="${PLATFORM}" \
-  --tag="${INVOKEAI_TAG}" \
-  --build-arg="PIP_REQUIREMENTS=${PIP_REQUIREMENTS}" \
-  --file="${DOCKERFILE}" \
-  .

docker-build/env.sh

@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-
-# Variables shared by build.sh and run.sh
-REPOSITORY_NAME=${REPOSITORY_NAME:-$(basename "$(git rev-parse --show-toplevel)")}
-VOLUMENAME=${VOLUMENAME:-${REPOSITORY_NAME,,}_data}
-ARCH=${ARCH:-$(uname -m)}
-PLATFORM=${PLATFORM:-Linux/${ARCH}}
-CONTAINER_FLAVOR=${CONTAINER_FLAVOR:-cuda}
-INVOKEAI_BRANCH=$(git branch --show)
-INVOKEAI_TAG=${REPOSITORY_NAME,,}-${CONTAINER_FLAVOR}:${INVOKEAI_TAG:-${INVOKEAI_BRANCH/\//-}}

docker-build/run.sh

@@ -1,31 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-# How to use: https://invoke-ai.github.io/InvokeAI/installation/INSTALL_DOCKER/#run-the-container
-# IMPORTANT: You need to have a token on huggingface.co to be able to download the checkpoints!!!
-
-source ./docker-build/env.sh \
-  || echo "please run from repository root" \
-  || exit 1
-
-# check if HUGGINGFACE_TOKEN is available
-# You must have accepted the terms of use for required models
-HUGGINGFACE_TOKEN=${HUGGINGFACE_TOKEN:?Please set your token for Huggingface as HUGGINGFACE_TOKEN}
-
-echo -e "You are using these values:\n"
-echo -e "Volumename:\t ${VOLUMENAME}"
-echo -e "Invokeai_tag:\t ${INVOKEAI_TAG}\n"
-
-docker run \
-  --interactive \
-  --tty \
-  --rm \
-  --platform="$PLATFORM" \
-  --name="${REPOSITORY_NAME,,}" \
-  --hostname="${REPOSITORY_NAME,,}" \
-  --mount="source=$VOLUMENAME,target=/data" \
-  --env="HUGGINGFACE_TOKEN=${HUGGINGFACE_TOKEN}" \
-  --publish=9090:9090 \
-  --cap-add=sys_nice \
-  ${GPU_FLAGS:+--gpus=${GPU_FLAGS}} \
-  "$INVOKEAI_TAG" ${1:+$@}

docker/Dockerfile

@@ -0,0 +1,112 @@
+# syntax=docker/dockerfile:1
+
+# Maintained by Matthias Wild <mauwii@outlook.de>
+
+ARG PYTHON_VERSION=3.9
+##################
+### base image ###
+##################
+FROM python:${PYTHON_VERSION}-slim AS python-base
+
+# Install necesarry packages
+RUN \
+  --mount=type=cache,target=/var/cache/apt,sharing=locked \
+  --mount=type=cache,target=/var/lib/apt,sharing=locked \
+  apt-get update \
+  && apt-get install -y \
+    --no-install-recommends \
+    libgl1-mesa-glx=20.3.* \
+    libglib2.0-0=2.66.* \
+    libopencv-dev=4.5.* \
+  && apt-get clean \
+  && rm -rf /var/lib/apt/lists/*
+
+# set working directory and path
+ARG APPDIR=/usr/src
+ARG APPNAME=InvokeAI
+WORKDIR ${APPDIR}
+ENV PATH=${APPDIR}/${APPNAME}/bin:$PATH
+
+######################
+### build frontend ###
+######################
+FROM node:lts as frontend-builder
+
+# Copy Sources
+ARG APPDIR=/usr/src
+WORKDIR ${APPDIR}
+COPY --link . .
+
+# install dependencies and build frontend
+WORKDIR ${APPDIR}/invokeai/frontend
+RUN \
+  --mount=type=cache,target=/usr/local/share/.cache/yarn/v6 \
+  yarn install \
+  --prefer-offline \
+  --frozen-lockfile \
+  --non-interactive \
+  --production=false \
+  && yarn build
+
+###################################
+### install python dependencies ###
+###################################
+FROM python-base AS pyproject-builder
+
+# Install dependencies
+RUN \
+  --mount=type=cache,target=/var/cache/apt,sharing=locked \
+  --mount=type=cache,target=/var/lib/apt,sharing=locked \
+  apt-get update \
+  && apt-get install -y \
+    --no-install-recommends \
+    gcc=4:10.2.* \
+    python3-dev=3.9.* \
+  && apt-get clean \
+  && rm -rf /var/lib/apt/lists/*
+
+# create virtual environment
+RUN python3 -m venv "${APPNAME}" \
+  --upgrade-deps
+
+# copy sources
+COPY --from=frontend-builder ${APPDIR} .
+
+# install pyproject.toml
+ARG PIP_EXTRA_INDEX_URL
+ENV PIP_EXTRA_INDEX_URL ${PIP_EXTRA_INDEX_URL}
+RUN --mount=type=cache,target=/root/.cache/pip,sharing=locked \
+  "${APPDIR}/${APPNAME}/bin/pip" install \
+  --use-pep517 \
+  .
+
+#####################
+### runtime image ###
+#####################
+FROM python-base AS runtime
+
+# setup environment
+COPY --from=pyproject-builder ${APPDIR}/${APPNAME} ${APPDIR}/${APPNAME}
+ENV INVOKEAI_ROOT=/data
+ENV INVOKE_MODEL_RECONFIGURE="--yes --default_only"
+
+# build patchmatch
+RUN \
+  --mount=type=cache,target=/var/cache/apt,sharing=locked \
+  --mount=type=cache,target=/var/lib/apt,sharing=locked \
+  apt-get update \
+  && apt-get install -y \
+    --no-install-recommends \
+    build-essential=12.9 \
+  && PYTHONDONTWRITEBYTECODE=1 \
+    python3 -c "from patchmatch import patch_match" \
+  && apt-get remove -y \
+    --autoremove \
+    build-essential \
+  && apt-get autoclean \
+  && rm -rf /var/lib/apt/lists/*
+
+# set Entrypoint and default CMD
+ENTRYPOINT [ "invokeai" ]
+CMD [ "--web", "--host=0.0.0.0" ]
+VOLUME [ "/data" ]

docker/build.sh

@@ -0,0 +1,43 @@
+#!/usr/bin/env bash
+set -e
+
+# How to use: https://invoke-ai.github.io/InvokeAI/installation/INSTALL_DOCKER/#setup
+# Some possible pip extra-index urls (cuda 11.7 is available without extra url):
+#   CUDA 11.6:  https://download.pytorch.org/whl/cu116
+#   ROCm 5.2:   https://download.pytorch.org/whl/rocm5.2
+#   CPU:        https://download.pytorch.org/whl/cpu
+#   as found on https://pytorch.org/get-started/locally/
+
+SCRIPTDIR=$(dirname "$0")
+cd "$SCRIPTDIR" || exit 1
+
+source ./env.sh
+
+DOCKERFILE=${INVOKE_DOCKERFILE:-Dockerfile}
+
+# print the settings
+echo -e "You are using these values:\n"
+echo -e "Dockerfile: \t${DOCKERFILE}"
+echo -e "index-url: \t${PIP_EXTRA_INDEX_URL:-none}"
+echo -e "Volumename: \t${VOLUMENAME}"
+echo -e "Platform: \t${PLATFORM}"
+echo -e "Registry: \t${CONTAINER_REGISTRY}"
+echo -e "Repository: \t${CONTAINER_REPOSITORY}"
+echo -e "Container Tag: \t${CONTAINER_TAG}"
+echo -e "Container Image: ${CONTAINER_IMAGE}\n"
+
+# Create docker volume
+if [[ -n "$(docker volume ls -f name="${VOLUMENAME}" -q)" ]]; then
+    echo -e "Volume already exists\n"
+else
+    echo -n "createing docker volume "
+    docker volume create "${VOLUMENAME}"
+fi
+
+# Build Container
+docker build \
+    --platform="${PLATFORM}" \
+    --tag="${CONTAINER_IMAGE}" \
+    ${PIP_EXTRA_INDEX_URL:+--build-arg="PIP_EXTRA_INDEX_URL=${PIP_EXTRA_INDEX_URL}"} \
+    --file="${DOCKERFILE}" \
+    ..

docker/env.sh

@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+
+if [[ -z "$PIP_EXTRA_INDEX_URL" ]]; then
+  # Decide which container flavor to build if not specified
+  if [[ -z "$CONTAINER_FLAVOR" ]]; then
+    # Check for CUDA and ROCm
+    CUDA_AVAILABLE=$(python -c "import torch;print(torch.cuda.is_available())")
+    ROCM_AVAILABLE=$(python -c "import torch;print(torch.version.hip is not None)")
+    if  [[ "$(uname -s)" != "Darwin" && "${CUDA_AVAILABLE}" == "True" ]]; then
+      CONTAINER_FLAVOR=cuda
+    elif [[ "$(uname -s)" != "Darwin" && "${ROCM_AVAILABLE}" == "True" ]]; then
+      CONTAINER_FLAVOR="rocm"
+    else
+      CONTAINER_FLAVOR="cpu"
+    fi
+  fi
+  # Set PIP_EXTRA_INDEX_URL based on container flavor
+  if [[ "$CONTAINER_FLAVOR" == "rocm" ]]; then
+    PIP_EXTRA_INDEX_URL="${PIP_EXTRA_INDEX_URL-"https://download.pytorch.org/whl/rocm"}"
+  elif CONTAINER_FLAVOR=cpu; then
+    PIP_EXTRA_INDEX_URL="${PIP_EXTRA_INDEX_URL-"https://download.pytorch.org/whl/cpu"}"
+  fi
+fi
+
+# Variables shared by build.sh and run.sh
+REPOSITORY_NAME="${REPOSITORY_NAME-$(basename "$(git rev-parse --show-toplevel)")}"
+VOLUMENAME="${VOLUMENAME-"${REPOSITORY_NAME,,}_data"}"
+ARCH="${ARCH-$(uname -m)}"
+PLATFORM="${PLATFORM-Linux/${ARCH}}"
+INVOKEAI_BRANCH="${INVOKEAI_BRANCH-$(git branch --show)}"
+CONTAINER_REGISTRY="${CONTAINER_REGISTRY-"ghcr.io"}"
+CONTAINER_REPOSITORY="${CONTAINER_REPOSITORY-"$(whoami)/${REPOSITORY_NAME}"}"
+CONTAINER_TAG="${CONTAINER_TAG-"${INVOKEAI_BRANCH##*/}-${CONTAINER_FLAVOR}"}"
+CONTAINER_IMAGE="${CONTAINER_REGISTRY}/${CONTAINER_REPOSITORY}:${CONTAINER_TAG}"
+CONTAINER_IMAGE="${CONTAINER_IMAGE,,}"

docker/run.sh

@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+set -e
+
+# How to use: https://invoke-ai.github.io/InvokeAI/installation/INSTALL_DOCKER/#run-the-container
+# IMPORTANT: You need to have a token on huggingface.co to be able to download the checkpoints!!!
+
+SCRIPTDIR=$(dirname "$0")
+cd "$SCRIPTDIR" || exit 1
+
+source ./env.sh
+
+echo -e "You are using these values:\n"
+echo -e "Volumename:\t${VOLUMENAME}"
+echo -e "Invokeai_tag:\t${CONTAINER_IMAGE}"
+echo -e "local Models:\t${MODELSPATH:-unset}\n"
+
+docker run \
+  --interactive \
+  --tty \
+  --rm \
+  --platform="${PLATFORM}" \
+  --name="${REPOSITORY_NAME,,}" \
+  --hostname="${REPOSITORY_NAME,,}" \
+  --mount=source="${VOLUMENAME}",target=/data \
+  ${MODELSPATH:+-u "$(id -u):$(id -g)"} \
+  ${MODELSPATH:+--mount="type=bind,source=${MODELSPATH},target=/data/models"} \
+  ${HUGGING_FACE_HUB_TOKEN:+--env="HUGGING_FACE_HUB_TOKEN=${HUGGING_FACE_HUB_TOKEN}"} \
+  --publish=9090:9090 \
+  --cap-add=sys_nice \
+  ${GPU_FLAGS:+--gpus="${GPU_FLAGS}"} \
+  "${CONTAINER_IMAGE}" ${1:+$@}

docs/CHANGELOG.md

@@ -4,6 +4,108 @@ title: Changelog
 
 # :octicons-log-16: **Changelog**
 
+## v2.3.0 <small>(15 January 2023)</small>	
+
+**Transition to diffusers
+
+Version 2.3 provides support for both the traditional `.ckpt` weight
+checkpoint files as well as the HuggingFace `diffusers` format. This
+introduces several changes you should know about.
+
+1. The models.yaml format has been updated. There are now two
+   different type of configuration stanza. The traditional ckpt
+   one will look like this, with a `format` of `ckpt` and a
+   `weights` field that points to the absolute or ROOTDIR-relative
+   location of the ckpt file.
+
+   ```
+   inpainting-1.5:
+      description: RunwayML SD 1.5 model optimized for inpainting (4.27 GB)
+      repo_id: runwayml/stable-diffusion-inpainting
+      format: ckpt
+      width: 512
+      height: 512
+      weights: models/ldm/stable-diffusion-v1/sd-v1-5-inpainting.ckpt
+      config: configs/stable-diffusion/v1-inpainting-inference.yaml
+      vae: models/ldm/stable-diffusion-v1/vae-ft-mse-840000-ema-pruned.ckpt
+   ```
+
+  A configuration stanza for a diffusers model hosted at HuggingFace will look like this,
+  with a `format` of `diffusers` and a `repo_id` that points to the
+  repository ID of the model on HuggingFace:
+
+  ```
+  stable-diffusion-2.1:
+  description: Stable Diffusion version 2.1 diffusers model (5.21 GB)
+  repo_id: stabilityai/stable-diffusion-2-1
+  format: diffusers
+  ```
+
+  A configuration stanza for a diffuers model stored locally should
+  look like this, with a `format` of `diffusers`, but a `path` field
+  that points at the directory that contains `model_index.json`:
+  
+  ```
+  waifu-diffusion:
+  description: Latest waifu diffusion 1.4
+  format: diffusers
+  path: models/diffusers/hakurei-haifu-diffusion-1.4
+  ```
+
+2. In order of precedence, InvokeAI will now use HF_HOME, then
+   XDG_CACHE_HOME, then finally default to `ROOTDIR/models` to
+   store HuggingFace diffusers models.
+
+   Consequently, the format of the models directory has changed to
+   mimic the HuggingFace cache directory. When HF_HOME and XDG_HOME
+   are not set, diffusers models are now automatically downloaded
+   and retrieved from the directory `ROOTDIR/models/diffusers`,
+   while other models are stored in the directory
+   `ROOTDIR/models/hub`. This organization is the same as that used
+   by HuggingFace for its cache management.
+
+   This allows you to share diffusers and ckpt model files easily with
+   other machine learning applications that use the HuggingFace
+   libraries. To do this, set the environment variable HF_HOME
+   before starting up InvokeAI to tell it what directory to
+   cache models in. To tell InvokeAI to use the standard HuggingFace
+   cache directory, you would set HF_HOME like this (Linux/Mac):
+
+   `export HF_HOME=~/.cache/huggingface`
+
+   Both HuggingFace and InvokeAI will fall back to the XDG_CACHE_HOME
+   environment variable if HF_HOME is not set; this path
+   takes precedence over `ROOTDIR/models` to allow for the same sharing
+   with other machine learning applications that use HuggingFace
+   libraries.
+
+3. If you upgrade to InvokeAI 2.3.* from an earlier version, there
+   will be a one-time migration from the old models directory format
+   to the new one. You will see a message about this the first time
+   you start `invoke.py`.
+
+4. Both the front end back ends of the model manager have been
+   rewritten to accommodate diffusers. You can import models using
+   their local file path, using their URLs, or their HuggingFace
+   repo_ids. On the command line, all these syntaxes work:
+
+   ```
+   !import_model stabilityai/stable-diffusion-2-1-base
+   !import_model /opt/sd-models/sd-1.4.ckpt
+   !import_model https://huggingface.co/Fictiverse/Stable_Diffusion_PaperCut_Model/blob/main/PaperCut_v1.ckpt
+   ```
+   
+**KNOWN BUGS (15 January 2023)
+
+1. On CUDA systems, the 768 pixel stable-diffusion-2.0 and
+   stable-diffusion-2.1 models can only be run as `diffusers` models
+   when the `xformer` library is installed and configured. Without
+   `xformers`, InvokeAI returns black images.
+
+2. Inpainting and outpainting have regressed in quality.
+
+Both these issues are being actively worked on.
+
 ## v2.2.4 <small>(11 December 2022)</small>
 
 **the `invokeai` directory**
@@ -94,7 +196,7 @@ the desired release's zip file, which you can find by clicking on the green
     This point release removes references to the binary installer from the
     installation guide. The binary installer is not stable at the current
     time. First time users are encouraged to use the "source" installer as
-    described in [Installing InvokeAI with the Source Installer](installation/INSTALL_SOURCE.md)
+    described in [Installing InvokeAI with the Source Installer](installation/deprecated_documentation/INSTALL_SOURCE.md)
 
 With InvokeAI 2.2, this project now provides enthusiasts and professionals a
 robust workflow solution for creating AI-generated and human facilitated

docs/features/CLI.md

@@ -136,7 +136,7 @@ mixture of both using any of the accepted command switch formats:
     # InvokeAI initialization file
     # This is the InvokeAI initialization file, which contains command-line default values.
     # Feel free to edit. If anything goes wrong, you can re-initialize this file by deleting
-    # or renaming it and then running configure_invokeai.py again.
+    # or renaming it and then running invokeai-configure again.
 
     # The --root option below points to the folder in which InvokeAI stores its models, configs and outputs.
     --root="/Users/mauwii/invokeai"

docs/features/CONCEPTS.md

@@ -51,7 +51,7 @@ You can also combine styles and concepts:
     If you used an installer to install InvokeAI, you may have already set a HuggingFace token.
     If you skipped this step, you can:
 
-    - run the InvokeAI configuration script again (if you used a manual installer): `scripts/configure_invokeai.py`
+    - run the InvokeAI configuration script again (if you used a manual installer): `invokeai-configure`
     - set one of the `HUGGINGFACE_TOKEN` or `HUGGING_FACE_HUB_TOKEN` environment variables to contain your token
 
     Finally, if you already used any HuggingFace library on your computer, you might already have a token

docs/features/MODEL_MERGING.md

@@ -0,0 +1,76 @@
+---
+title: Model Merging
+---
+
+# :material-image-off: Model Merging
+
+## How to Merge Models
+
+As of version 2.3, InvokeAI comes with a script that allows you to
+merge two or three diffusers-type models into a new merged model. The
+resulting model will combine characteristics of the original, and can
+be used to teach an old model new tricks.
+
+You may run the merge script by starting the invoke launcher
+(`invoke.sh` or `invoke.bat`) and choosing the option for _merge
+models_. This will launch a text-based interactive user interface that
+prompts you to select the models to merge, how to merge them, and the
+merged model name.
+
+Alternatively you may activate InvokeAI's virtual environment from the
+command line, and call the script via `merge_models --gui` to open up
+a version that has a nice graphical front end. To get the commandline-
+only version, omit `--gui`.
+
+The user interface for the text-based interactive script is
+straightforward. It shows you a series of setting fields. Use control-N (^N)
+to move to the next field, and control-P (^P) to move to the previous
+one. You can also use TAB and shift-TAB to move forward and
+backward. Once you are in a multiple choice field, use the up and down
+cursor arrows to move to your desired selection, and press <SPACE> or
+<ENTER> to select it. Change text fields by typing in them, and adjust
+scrollbars using the left and right arrow keys.
+
+Once you are happy with your settings, press the OK button. Note that
+there may be two pages of settings, depending on the height of your
+screen, and the OK button may be on the second page. Advance past the
+last field of the first page to get to the second page, and reverse
+this to get back.
+
+If the merge runs successfully, it will create a new diffusers model
+under the selected name and register it with InvokeAI.
+
+## The Settings
+
+* Model Selection -- there are three multiple choice fields that
+  display all the diffusers-style models that InvokeAI knows about.
+  If you do not see the model you are looking for, then it is probably
+  a legacy checkpoint model and needs to be converted using the
+  `invoke` command-line client and its `!optimize` command. You
+  must select at least two models to merge. The third can be left at
+  "None" if you desire.
+
+* Alpha -- This is the ratio to use when combining models. It ranges
+  from 0 to 1. The higher the value, the more weight is given to the
+  2d and (optionally) 3d models. So if you have two models named "A"
+  and "B", an alpha value of 0.25 will give you a merged model that is
+  25% A and 75% B.
+
+* Interpolation Method -- This is the method used to combine
+  weights. The options are "weighted_sum" (the default), "sigmoid",
+  "inv_sigmoid" and "add_difference". Each produces slightly different
+  results. When three models are in use, only "add_difference" is
+  available. (TODO: cite a reference that describes what these
+  interpolation methods actually do and how to decide among them).
+
+* Force -- Not all models are compatible with each other. The merge
+  script will check for compatibility and refuse to merge ones that
+  are incompatible. Set this checkbox to try merging anyway.
+
+* Name for merged model - This is the name for the new model. Please
+  use InvokeAI conventions - only alphanumeric letters and the
+  characters ".+-".
+
+## Caveats
+
+This is a new script and may contain bugs.

docs/features/OUTPAINTING.md

@@ -120,7 +120,7 @@ A number of caveats:
    (`--iterations`) argument.
 
 3. Your results will be _much_ better if you use the `inpaint-1.5` model
-   released by runwayML and installed by default by `scripts/configure_invokeai.py`.
+   released by runwayML and installed by default by `invokeai-configure`.
    This model was trained specifically to harmoniously fill in image gaps. The
    standard model will work as well, but you may notice color discontinuities at
    the border.

docs/features/POSTPROCESS.md

@@ -28,11 +28,11 @@ should "just work" without further intervention. Simply pass the `--upscale`
 the popup in the Web GUI.
 
 **GFPGAN** requires a series of downloadable model files to work. These are
-loaded when you run `scripts/configure_invokeai.py`. If GFPAN is failing with an
+loaded when you run `invokeai-configure`. If GFPAN is failing with an
 error, please run the following from the InvokeAI directory:
 
 ```bash
-python scripts/configure_invokeai.py
+invokeai-configure
 ```
 
 If you do not run this script in advance, the GFPGAN module will attempt to
@@ -106,7 +106,7 @@ This repo also allows you to perform face restoration using
 [CodeFormer](https://github.com/sczhou/CodeFormer).
 
 In order to setup CodeFormer to work, you need to download the models like with
-GFPGAN. You can do this either by running `configure_invokeai.py` or by manually
+GFPGAN. You can do this either by running `invokeai-configure` or by manually
 downloading the
 [model file](https://github.com/sczhou/CodeFormer/releases/download/v0.1.0/codeformer.pth)
 and saving it to `ldm/invoke/restoration/codeformer/weights` folder.

docs/features/PROMPTS.md

@@ -239,28 +239,24 @@ Generate an image with a given prompt, record the seed of the image, and then
 use the `prompt2prompt` syntax to substitute words in the original prompt for
 words in a new prompt. This works for `img2img` as well.
 
-- `a ("fluffy cat").swap("smiling dog") eating a hotdog`.
-    - quotes optional: `a (fluffy cat).swap(smiling dog) eating a hotdog`.
-    - for single word substitutions parentheses are also optional:
-      `a cat.swap(dog) eating a hotdog`.
-- Supports options `s_start`, `s_end`, `t_start`, `t_end` (each 0-1) loosely
-  corresponding to bloc97's `prompt_edit_spatial_start/_end` and
-  `prompt_edit_tokens_start/_end` but with the math swapped to make it easier to
-  intuitively understand.
-    - Example usage:`a (cat).swap(dog, s_end=0.3) eating a hotdog` - the `s_end`
-      argument means that the "spatial" (self-attention) edit will stop having any
-      effect after 30% (=0.3) of the steps have been done, leaving Stable
-      Diffusion with 70% of the steps where it is free to decide for itself how to
-      reshape the cat-form into a dog form.
-    - The numbers represent a percentage through the step sequence where the edits
-      should happen. 0 means the start (noisy starting image), 1 is the end (final
-      image).
-        - For img2img, the step sequence does not start at 0 but instead at
-          (1-strength) - so if strength is 0.7, s_start and s_end must both be
-          greater than 0.3 (1-0.7) to have any effect.
-- Convenience option `shape_freedom` (0-1) to specify how much "freedom" Stable
-  Diffusion should have to change the shape of the subject being swapped.
-    - `a (cat).swap(dog, shape_freedom=0.5) eating a hotdog`.
+For example, consider the prompt `a cat.swap(dog) playing with a ball in the forest`. Normally, because of the word words interact with each other when doing a stable diffusion image generation, these two prompts would generate different compositions:
+  - `a cat playing with a ball in the forest`
+  - `a dog playing with a ball in the forest`
+
+| `a cat playing with a ball in the forest` | `a dog playing with a ball in the forest` |
+| --- | --- |
+| img | img |
+
+
+      - For multiple word swaps, use parentheses: `a (fluffy cat).swap(barking dog) playing with a ball in the forest`.
+      - To swap a comma, use quotes: `a ("fluffy, grey cat").swap("big, barking dog") playing with a ball in the forest`.
+- Supports options `t_start` and `t_end` (each 0-1) loosely corresponding to bloc97's `prompt_edit_tokens_start/_end` but with the math swapped to make it easier to
+  intuitively understand. `t_start` and `t_end` are used to control on which steps cross-attention control should run. With the default values `t_start=0` and `t_end=1`, cross-attention control is active on every step of image generation. Other values can be used to turn cross-attention control off for part of the image generation process.
+    - For example, if doing a diffusion with 10 steps for the prompt is `a cat.swap(dog, t_start=0.3, t_end=1.0) playing with a ball in the forest`, the first 3 steps will be run as `a cat playing with a ball in the forest`, while the last 7 steps will run as `a dog playing with a ball in the forest`, but the pixels that represent `dog` will be locked to the pixels that would have represented `cat` if the `cat` prompt had been used instead.
+    - Conversely, for `a cat.swap(dog, t_start=0, t_end=0.7) playing with a ball in the forest`, the first 7 steps will run as `a dog playing with a ball in the forest` with the pixels that represent `dog` locked to the same pixels that would have represented `cat` if the `cat` prompt was being used instead. The final 3 steps will just run `a cat playing with a ball in the forest`.
+    > For img2img, the step sequence does not start at 0 but instead at `(1.0-strength)` - so if the img2img `strength` is `0.7`, `t_start` and `t_end` must both be greater than `0.3` (`1.0-0.7`) to have any effect.
+
+Prompt2prompt `.swap()` is not compatible with xformers, which will be temporarily disabled when doing a `.swap()` - so you should expect to use more VRAM and run slower that with xformers enabled.
 
 The `prompt2prompt` code is based off
 [bloc97's colab](https://github.com/bloc97/CrossAttentionControl).

docs/features/TEXTUAL_INVERSION.md

@@ -10,83 +10,261 @@ You may personalize the generated images to provide your own styles or objects
 by training a new LDM checkpoint and introducing a new vocabulary to the fixed
 model as a (.pt) embeddings file. Alternatively, you may use or train
 HuggingFace Concepts embeddings files (.bin) from
-<https://huggingface.co/sd-concepts-library> and its associated notebooks.
+<https://huggingface.co/sd-concepts-library> and its associated
+notebooks.
 
-## **Training**
+## **Hardware and Software Requirements**
 
-To train, prepare a folder that contains images sized at 512x512 and execute the
-following:
+You will need a GPU to perform training in a reasonable length of
+time, and at least 12 GB of VRAM. We recommend using the [`xformers`
+library](../installation/070_INSTALL_XFORMERS) to accelerate the
+training process further. During training, about ~8 GB is temporarily
+needed in order to store intermediate models, checkpoints and logs.
 
-### WINDOWS
+## **Preparing for Training**
 
-As the default backend is not available on Windows, if you're using that
-platform, set the environment variable `PL_TORCH_DISTRIBUTED_BACKEND` to `gloo`
+To train, prepare a folder that contains 3-5 images that illustrate
+the object or concept. It is good to provide a variety of examples or
+poses to avoid overtraining the system. Format these images as PNG
+(preferred) or JPG. You do not need to resize or crop the images in
+advance, but for more control you may wish to do so.
 
-```bash
-python3 ./main.py -t \
-    --base ./configs/stable-diffusion/v1-finetune.yaml \
-    --actual_resume ./models/ldm/stable-diffusion-v1/model.ckpt \
-    -n my_cat \
-    --gpus 0 \
-    --data_root D:/textual-inversion/my_cat \
-    --init_word 'cat'
+Place the training images in a directory on the machine InvokeAI runs
+on. We recommend placing them in a subdirectory of the
+`text-inversion-training-data` folder located in the InvokeAI root
+directory, ordinarily `~/invokeai` (Linux/Mac), or
+`C:\Users\your_name\invokeai` (Windows). For example, to create an
+embedding for the "psychedelic" style, you'd place the training images
+into the directory
+`~invokeai/text-inversion-training-data/psychedelic`.
+
+## **Launching Training Using the Console Front End**
+
+InvokeAI 2.3 and higher comes with a text console-based training front
+end. From within the `invoke.sh`/`invoke.bat` Invoke launcher script,
+start the front end by selecting choice (3):
+
+```sh
+Do you want to generate images using the
+1. command-line
+2. browser-based UI
+3. textual inversion training
+4. open the developer console
+Please enter 1, 2, 3, or 4: [1] 3
 ```
 
-During the training process, files will be created in
-`/logs/[project][time][project]/` where you can see the process.
+From the command line, with the InvokeAI virtual environment active,
+you can launch the front end with the command `textual_inversion
+--gui`.
 
-Conditioning contains the training prompts inputs, reconstruction the input
-images for the training epoch samples, samples scaled for a sample of the prompt
-and one with the init word provided.
+This will launch a text-based front end that will look like this:
 
-On a RTX3090, the process for SD will take ~1h @1.6 iterations/sec.
+<figure markdown>
+![ti-frontend](../assets/textual-inversion/ti-frontend.png)
+</figure>
 
-!!! note
+The interface is keyboard-based. Move from field to field using
+control-N (^N) to move to the next field and control-P (^P) to the
+previous one. <Tab> and <shift-TAB> work as well. Once a field is
+active, use the cursor keys. In a checkbox group, use the up and down
+cursor keys to move from choice to choice, and <space> to select a
+choice. In a scrollbar, use the left and right cursor keys to increase
+and decrease the value of the scroll. In textfields, type the desired
+values.
 
-    According to the associated paper, the optimal number of
-    images is 3-5. Your model may not converge if you use more images than
-    that.
+The number of parameters may look intimidating, but in most cases the
+predefined defaults work fine. The red circled fields in the above
+illustration are the ones you will adjust most frequently.
 
-Training will run indefinitely, but you may wish to stop it (with ctrl-c) before
-the heat death of the universe, when you find a low loss epoch or around ~5000
-iterations. Note that you can set a fixed limit on the number of training steps
-by decreasing the "max_steps" option in
-configs/stable_diffusion/v1-finetune.yaml (currently set to 4000000)
+### Model Name
 
-## **Run the Model**
+This will list all the diffusers models that are currently
+installed. Select the one you wish to use as the basis for your
+embedding. Be aware that if you use a SD-1.X-based model for your
+training, you will only be able to use this embedding with other
+SD-1.X-based models. Similarly, if you train on SD-2.X, you will only
+be able to use the embeddings with models based on SD-2.X.
 
-Once the model is trained, specify the trained .pt or .bin file when starting
-invoke using
+### Trigger Term
 
-```bash
-python3 ./scripts/invoke.py \
-    --embedding_path /path/to/embedding.pt
+This is the prompt term you will use to trigger the embedding. Type a
+single word or phrase you wish to use as the trigger, example
+"psychedelic" (without angle brackets). Within InvokeAI, you will then
+be able to activate the trigger using the syntax `<psychedelic>`.
+
+### Initializer
+
+This is a single character that is used internally during the training
+process as a placeholder for the trigger term. It defaults to "*" and
+can usually be left alone.
+
+### Resume from last saved checkpoint
+
+As training proceeds, textual inversion will write a series of
+intermediate files that can be used to resume training from where it
+was left off in the case of an interruption. This checkbox will be
+automatically selected if you provide a previously used trigger term
+and at least one checkpoint file is found on disk.
+
+Note that as of 20 January 2023, resume does not seem to be working
+properly due to an issue with the upstream code.
+
+### Data Training Directory
+
+This is the location of the images to be used for training. When you
+select a trigger term like "my-trigger", the frontend will prepopulate
+this field with `~/invokeai/text-inversion-training-data/my-trigger`,
+but you can change the path to wherever you want.
+
+### Output Destination Directory
+
+This is the location of the logs, checkpoint files, and embedding
+files created during training. When you select a trigger term like
+"my-trigger", the frontend will prepopulate this field with
+`~/invokeai/text-inversion-output/my-trigger`, but you can change the
+path to wherever you want.
+
+### Image resolution
+
+The images in the training directory will be automatically scaled to
+the value you use here. For best results, you will want to use the
+same default resolution of the underlying model (512 pixels for
+SD-1.5, 768 for the larger version of SD-2.1).
+
+### Center crop images
+
+If this is selected, your images will be center cropped to make them
+square before resizing them to the desired resolution. Center cropping
+can indiscriminately cut off the top of subjects' heads for portrait
+aspect images, so if you have images like this, you may wish to use a
+photoeditor to manually crop them to a square aspect ratio.
+
+### Mixed precision
+
+Select the floating point precision for the embedding. "no" will
+result in a full 32-bit precision, "fp16" will provide 16-bit
+precision, and "bf16" will provide mixed precision (only available
+when XFormers is used).
+
+### Max training steps
+
+How many steps the training will take before the model converges. Most
+training sets will converge with 2000-3000 steps.
+
+### Batch size
+
+This adjusts how many training images are processed simultaneously in
+each step. Higher values will cause the training process to run more
+quickly, but use more memory. The default size will run with GPUs with
+as little as 12 GB.
+
+### Learning rate
+
+The rate at which the system adjusts its internal weights during
+training. Higher values risk overtraining (getting the same image each
+time), and lower values will take more steps to train a good
+model. The default of 0.0005 is conservative; you may wish to increase
+it to 0.005 to speed up training.
+
+### Scale learning rate by number of GPUs, steps and batch size
+
+If this is selected (the default) the system will adjust the provided
+learning rate to improve performance.
+
+### Use xformers acceleration
+
+This will activate XFormers memory-efficient attention. You need to
+have XFormers installed for this to have an effect.
+
+### Learning rate scheduler
+
+This adjusts how the learning rate changes over the course of
+training. The default "constant" means to use a constant learning rate
+for the entire training session. The other values scale the learning
+rate according to various formulas.
+
+Only "constant" is supported by the XFormers library.
+
+### Gradient accumulation steps
+
+This is a parameter that allows you to use bigger batch sizes than
+your GPU's VRAM would ordinarily accommodate, at the cost of some
+performance.
+
+### Warmup steps
+
+If "constant_with_warmup" is selected in the learning rate scheduler,
+then this provides the number of warmup steps. Warmup steps have a
+very low learning rate, and are one way of preventing early
+overtraining.
+
+## The training run
+
+Start the training run by advancing to the OK button (bottom right)
+and pressing <enter>. A series of progress messages will be displayed
+as the training process proceeds. This may take an hour or two,
+depending on settings and the speed of your system. Various log and
+checkpoint files will be written into the output directory (ordinarily
+`~/invokeai/text-inversion-output/my-model/`)
+
+At the end of successful training, the system will copy the file
+`learned_embeds.bin` into the InvokeAI root directory's `embeddings`
+directory, using a subdirectory named after the trigger token. For
+example, if the trigger token was `psychedelic`, then look for the
+embeddings file in
+`~/invokeai/embeddings/psychedelic/learned_embeds.bin`
+
+You may now launch InvokeAI and try out a prompt that uses the trigger
+term. For example `a plate of banana sushi in <psychedelic> style`.
+
+## **Training with the Command-Line Script**
+
+Training can also be done using a traditional command-line script. It
+can be launched from within the "developer's console", or from the
+command line after activating InvokeAI's virtual environment.
+
+It accepts a large number of arguments, which can be summarized by
+passing the `--help` argument:
+
+```sh
+textual_inversion --help
 ```
 
-Then, to utilize your subject at the invoke prompt
-
-```bash
-invoke> "a photo of *"
+Typical usage is shown here:
+```sh
+textual_inversion \
+       --model=stable-diffusion-1.5 \
+       --resolution=512 \
+       --learnable_property=style \
+       --initializer_token='*' \
+       --placeholder_token='<psychedelic>' \
+       --train_data_dir=/home/lstein/invokeai/training-data/psychedelic \
+       --output_dir=/home/lstein/invokeai/text-inversion-training/psychedelic \
+       --scale_lr \
+       --train_batch_size=8 \
+       --gradient_accumulation_steps=4 \
+       --max_train_steps=3000 \
+       --learning_rate=0.0005 \
+       --resume_from_checkpoint=latest \
+       --lr_scheduler=constant \
+       --mixed_precision=fp16 \
+       --only_save_embeds
 ```
 
-This also works with image2image
+## Reading
 
-```bash
-invoke> "waterfall and rainbow in the style of *" --init_img=./init-images/crude_drawing.png --strength=0.5 -s100 -n4
-```
+For more information on textual inversion, please see the following
+resources:
 
-For .pt files it's also possible to train multiple tokens (modify the
-placeholder string in `configs/stable-diffusion/v1-finetune.yaml`) and combine
-LDM checkpoints using:
+* The [textual inversion repository](https://github.com/rinongal/textual_inversion) and
+  associated paper for details and limitations.
+* [HuggingFace's textual inversion training
+  page](https://huggingface.co/docs/diffusers/training/text_inversion)
+* [HuggingFace example script
+  documentation](https://github.com/huggingface/diffusers/tree/main/examples/textual_inversion)
+  (Note that this script is similar to, but not identical, to
+  `textual_inversion`, but produces embed files that are completely compatible.
 
-```bash
-python3 ./scripts/merge_embeddings.py \
-    --manager_ckpts /path/to/first/embedding.pt \
-    [</path/to/second/embedding.pt>,[...]] \
-    --output_path /path/to/output/embedding.pt
-```
+---
 
-Credit goes to rinongal and the repository
-
-Please see [the repository](https://github.com/rinongal/textual_inversion) and
-associated paper for details and limitations.
+copyright (c) 2023, Lincoln Stein and the InvokeAI Development Team

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   |

docs/index.md

@@ -93,9 +93,15 @@ getting InvokeAI up and running on your system. For alternative installation and
 upgrade instructions, please see:
 [InvokeAI Installation Overview](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/060_INSTALL_PATCHMATCH.md).
+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/060_INSTALL_PATCHMATCH.md).
+
+If you have an NVIDIA card, you can benefit from the significant
+memory savings and performance benefits provided by Facebook Lab's
+**xFormers** module. Instructions for Linux and Windows users can be found
+at [Installing xFormers](installation/070_INSTALL_XFORMERS.md).
 
 ## :fontawesome-solid-computer: Hardware Requirements
 
@@ -151,6 +157,8 @@ images in full-precision mode:
 <!-- seperator -->
 - [Prompt Engineering](features/PROMPTS.md)
 <!-- seperator -->
+- [Model Merging](features/MODEL_MERGING.md)
+<!-- seperator -->
 - Miscellaneous
   - [NSFW Checker](features/NSFW.md)
   - [Embiggen upscaling](features/EMBIGGEN.md)

docs/installation/010_INSTALL_AUTOMATED.md

@@ -29,8 +29,9 @@ version of InvokeAI with the option to upgrade to experimental versions later.
 2.  Check that your system has an up-to-date Python installed. To do this, open
     up a command-line window ("Terminal" on Linux and Macintosh, "Command" or
     "Powershell" on Windows) and type `python --version`. If Python is
-    installed, it will print out the version number. If it is version `3.9.1` or
-    higher, you meet requirements.
+    installed, it will print out the version number. If it is version `3.9.1` or `3.10.x`, you meet requirements.
+
+    !!! warning "At this time we do not recommend Python 3.11"
 
     !!! warning "If you see an older version, or get a command not found error"
 
@@ -39,7 +40,6 @@ version of InvokeAI with the option to upgrade to experimental versions later.
         [Version 3.10.9](https://www.python.org/downloads/release/python-3109/),
         which has been extensively tested with InvokeAI.
 
-    !!! warning "At this time we do not recommend Python 3.11"
 
     _Please select your platform in the section below for platform-specific
     setup requirements._
@@ -52,7 +52,7 @@ version of InvokeAI with the option to upgrade to experimental versions later.
         find python, then open the Python installer again and choose
         "Modify" existing installation.
 
-        - Installation requires an up to date version of the Microsoft Visual C libraries. Please install the 2015-2022 libraries available here: https://learn.microsoft.com/en-us/cpp/windows/deploying-native-desktop-applications-visual-cpp?view=msvc-170
+        - Installation requires an up to date version of the Microsoft Visual C libraries. Please install the 2015-2022 libraries available here: https://learn.microsoft.com/en-US/cpp/windows/latest-supported-vc-redist?view=msvc-170
 
     === "Mac users"
 
@@ -108,11 +108,11 @@ version of InvokeAI with the option to upgrade to experimental versions later.
     [latest release](https://github.com/invoke-ai/InvokeAI/releases/latest), and
     look for a series of files named:
 
-    - [InvokeAI-installer-2.2.4-p5-mac.zip](https://github.com/invoke-ai/InvokeAI/files/10254728/InvokeAI-installer-2.2.4-p5-mac.zip)
-    - [InvokeAI-installer-2.2.4-p5-windows.zip](https://github.com/invoke-ai/InvokeAI/files/10254729/InvokeAI-installer-2.2.4-p5-windows.zip)
-    - [InvokeAI-installer-2.2.4-p5-linux.zip](https://github.com/invoke-ai/InvokeAI/files/10254727/InvokeAI-installer-2.2.4-p5-linux.zip)
+    - InvokeAI-installer-2.X.X.zip
 
-    Download the one that is appropriate for your operating system.
+    (Where 2.X.X is the current release number).
+
+    Download the latest release.
 
 4.  Unpack the zip file into a convenient directory. This will create a new
     directory named "InvokeAI-Installer". This example shows how this would look
@@ -120,8 +120,8 @@ version of InvokeAI with the option to upgrade to experimental versions later.
     command-line Zip extractor:
 
     ```cmd
-    C:\Documents\Linco> unzip InvokeAI-installer-2.2.4-windows.zip
-    Archive:  C: \Linco\Downloads\InvokeAI-installer-2.2.4-windows.zip
+    C:\Documents\Linco> unzip InvokeAI-installer-2.X.X-windows.zip
+    Archive:  C: \Linco\Downloads\InvokeAI-installer-2.X.X-windows.zip
     creating: InvokeAI-Installer\
     inflating: InvokeAI-Installer\install.bat
     inflating: InvokeAI-Installer\readme.txt
@@ -176,8 +176,7 @@ version of InvokeAI with the option to upgrade to experimental versions later.
     minutes and nothing is happening, you can interrupt the script with ^C. You
     may restart it and it will pick up where it left off.
 
-10. After installation completes, the installer will launch a script called
-    `configure_invokeai.py`, which will guide you through the first-time process
+10. After installation completes, the installer will launch the configuration script, which will guide you through the first-time process
     of selecting one or more Stable Diffusion model weights files, downloading
     and configuring them. We provide a list of popular models that InvokeAI
     performs well with. However, you can add more weight files later on using
@@ -226,7 +225,7 @@ version of InvokeAI with the option to upgrade to experimental versions later.
         `invokeai\invokeai.init`. It contains a variety of examples that you can
         follow to add and modify launch options.
 
-!!! warning "The `invokeai` directory contains the `invoke` application, its
+!!! warning "The `invokeai` directory contains the `invokeai` application, its
 configuration files, the model weight files, and outputs of image generation.
 Once InvokeAI is installed, do not move or remove this directory."
 
@@ -252,18 +251,18 @@ will bring InvokeAI up to date with the latest libraries.
 
 ### Corrupted configuration file
 
-Everything seems to install ok, but `invoke` complains of a corrupted
+Everything seems to install ok, but `invokeai` complains of a corrupted
 configuration file and goes back into the configuration process (asking you to
 download models, etc), but this doesn't fix the problem.
 
 This issue is often caused by a misconfigured configuration directive in the
 `invokeai\invokeai.init` initialization file that contains startup settings. The
 easiest way to fix the problem is to move the file out of the way and re-run
-`configure_invokeai.py`. Enter the developer's console (option 3 of the launcher
+`invokeai-configure`. Enter the developer's console (option 3 of the launcher
 script) and run this command:
 
 ```cmd
-configure_invokeai.py --root=.
+invokeai-configure --root=.
 ```
 
 Note the dot (.) after `--root`. It is part of the command.
@@ -288,15 +287,15 @@ hours, and often much sooner.
 This distribution is changing rapidly, and we add new features on a daily basis.
 To update to the latest released version (recommended), run the `update.sh`
 (Linux/Mac) or `update.bat` (Windows) scripts. This will fetch the latest
-release and re-run the `configure_invokeai` script to download any updated
+release and re-run the `invokeai-configure` script to download any updated
 models files that may be needed. You can also use this to add additional models
 that you did not select at installation time.
 
 You can now close the developer console and run `invoke` as before. If you get
 complaints about missing models, then you may need to do the additional step of
-running `configure_invokeai.py`. This happens relatively infrequently. To do
+running `invokeai-configure`. This happens relatively infrequently. To do
 this, simply open up the developer's console again and type
-`python scripts/configure_invokeai.py`.
+`invokeai-configure`.
 
 You may also use the `update` script to install any selected version of
 InvokeAI. From https://github.com/invoke-ai/InvokeAI, navigate to the zip file
@@ -307,9 +306,14 @@ big code directory on the InvokeAI welcome page. When you find the version you
 want to install, go to the green "<> Code" button at the top, and copy the
 "Download ZIP" link.
 
-Now run `update.sh` (or `update.bat`) with the URL of the desired InvokeAI
+Now run `update.sh` (or `update.bat`) with the version number of the desired InvokeAI
 version as its argument. For example, this will install the old 2.2.0 release.
 
 ```cmd
-update.sh https://github.com/invoke-ai/InvokeAI/archive/refs/tags/v2.2.0.zip
+update.sh v2.2.0
 ```
+
+You can get the list of version numbers by going to the [releases
+page](https://github.com/invoke-ai/InvokeAI/releases) or by browsing
+the (Tags)[https://github.com/invoke-ai/InvokeAI/tags] list from the
+Code section of the main github page.

docs/installation/020_INSTALL_MANUAL.md

@@ -3,41 +3,36 @@ title: Installing Manually
 ---
 
 <figure markdown>
+
 # :fontawesome-brands-linux: Linux | :fontawesome-brands-apple: macOS | :fontawesome-brands-windows: Windows
+
 </figure>
 
 !!! warning "This is for advanced Users"
 
-    who are already experienced with using conda or pip
+    **python experience is mandatory**
 
 ## Introduction
 
-You have two choices for manual installation, the [first
-one](#PIP_method) uses basic Python virtual environment (`venv`)
-commands and the PIP package manager. The [second one](#Conda_method)
-based on the Anaconda3 package manager (`conda`). Both methods require
-you to enter commands on the terminal, also known as the "console".
+!!! tip As of InvokeAI v2.3.0 installation using the `conda` package manager
+is no longer being supported. It will likely still work, but we are not testing
+this installation method.
 
-Note that the conda install method is currently deprecated and will not
-be supported at some point in the future.
+On Windows systems, you are encouraged to install and use the
+[PowerShell](https://learn.microsoft.com/en-us/powershell/scripting/install/installing-powershell-on-windows?view=powershell-7.3),
+which provides compatibility with Linux and Mac shells and nice features such as
+command-line completion.
 
-On Windows systems you are encouraged to install and use the
-[Powershell](https://learn.microsoft.com/en-us/powershell/scripting/install/installing-powershell-on-windows?view=powershell-7.3),
-which provides compatibility with Linux and Mac shells and nice
-features such as command-line completion.
+To install InvokeAI with virtual environments and the PIP package manager,
+please follow these steps:
 
-## pip Install
-
-To install InvokeAI with virtual environments and the PIP package
-manager, please follow these steps:
-
-1.  Make sure you are using Python 3.9 or 3.10. The rest of the install
-    procedure depends on this:
+1.  Please make sure you are using Python 3.9 or 3.10. The rest of the install
+    procedure depends on this and will not work with other versions:
 
     ```bash
     python -V
     ```
-    
+
 2.  Clone the [InvokeAI](https://github.com/invoke-ai/InvokeAI) source code from
     GitHub:
 
@@ -48,98 +43,67 @@ manager, please follow these steps:
     This will create InvokeAI folder where you will follow the rest of the
     steps.
 
-3.  From within the InvokeAI top-level directory, create and activate a virtual
-    environment named `invokeai`:
+3.  Create a directory of to contain your InvokeAI installation (known as the "runtime"
+    or "root" directory). This is where your models, configs, and outputs will live
+    by default. Please keep in mind the disk space requirements - you will need at
+    least 18GB (as of this writing) for the models and the virtual environment.
+    From now on we will refer to this directory as `INVOKEAI_ROOT`. This keeps the
+    runtime directory separate from the source code and aids in updating.
 
     ```bash
-    python -mvenv invokeai
-    source invokeai/bin/activate
+    export INVOKEAI_ROOT="~/invokeai"
+    mkdir ${INVOKEAI_ROOT}
     ```
 
-4. Make sure that pip is installed in your virtual environment an up to date:
+4.  From within the InvokeAI top-level directory, create and activate a virtual
+    environment named `.venv` and prompt displaying `InvokeAI`:
 
     ```bash
-    python -mensurepip --upgrade
-    python -mpip install --upgrade pip
+    python -m venv ${INVOKEAI_ROOT}/.venv \
+        --prompt invokeai \
+        --upgrade-deps \
+        --copies
+    source ${INVOKEAI_ROOT}/.venv/bin/activate
     ```
 
-5.  Pick the correct `requirements*.txt` file for your hardware and operating
-    system.
+    !!! warning
 
-    We have created a series of environment files suited for different operating
-    systems and GPU hardware. They are located in the
-    `environments-and-requirements` directory:
+        You **may** create your virtual environment anywhere on the filesystem.
+        But IF you choose a location that is *not* inside the `$INVOKEAI_ROOT` directory,
+        then you must set the `INVOKEAI_ROOT` environment variable in your shell environment,
+        for example, by editing `~/.bashrc` or `~/.zshrc` files, or setting the Windows environment
+        variable. Refer to your operating system / shell documentation for the correct way of doing so.
 
-    <figure markdown>
-
-    |              filename               |                               OS                                |
-    | :---------------------------------: | :-------------------------------------------------------------: |
-    |      requirements-lin-amd.txt       |                  Linux with an AMD (ROCm) GPU                   |
-    |     requirements-lin-arm64.txt      |                 Linux running on arm64 systems                  |
-    |      requirements-lin-cuda.txt      |                 Linux with an NVIDIA (CUDA) GPU                 |
-    |    requirements-mac-mps-cpu.txt     |                Macintoshes with MPS acceleration                |
-    | requirements-lin-win-colab-cuda.txt | Windows with an NVIDA (CUDA) GPU<br>(supports Google Colab too) |
-
-    </figure>
-
-    Select the appropriate requirements file, and make a link to it from
-    `requirements.txt` in the top-level InvokeAI directory. The command to do
-    this from the top-level directory is:
-
-    !!! example ""
-
-        === "Macintosh and Linux"
-
-            !!! info "Replace `xxx` and `yyy` with the appropriate OS and GPU codes."
-
-            ```bash
-            ln -sf environments-and-requirements/requirements-xxx-yyy.txt requirements.txt
-            ```
-
-        === "Windows"
-
-            !!! info "on Windows, admin privileges are required to make links, so we use the copy command instead"
-
-            ```cmd
-            copy environments-and-requirements\requirements-lin-win-colab-cuda.txt requirements.txt
-            ```
-
-        !!! warning
-
-            Please do not link or copy `environments-and-requirements/requirements-base.txt`.
-            This is a base requirements file that does not have the platform-specific
-            libraries. Also, be sure to link or copy the platform-specific file to
-            a top-level file named `requirements.txt` as shown here. Running pip on
-            a requirements file in a subdirectory will not work as expected.
-
-    When this is done, confirm that a file named `requirements.txt` has been
-    created in the InvokeAI root directory and that it points to the correct
-    file in `environments-and-requirements`.
-
-6.  Run PIP
-
-    Be sure that the `invokeai` environment is active before doing this:
+5.  Make sure that pip is installed in your virtual environment an up to date:
 
     ```bash
-    pip install --prefer-binary -r requirements.txt
+    python -m pip install --upgrade pip
+    ```
+
+6.  Install Package
+
+    ```bash
+    pip install --use-pep517 .
+    ```
+
+    Deactivate and reactivate your runtime directory so that the invokeai-specific commands
+    become available in the environment
+
+    ```
+    deactivate && source ${INVOKEAI_ROOT}/.venv/bin/activate
     ```
 
 7.  Set up the runtime directory
 
-    In this step you will initialize a runtime directory that will
-    contain the models, model config files, directory for textual
-    inversion embeddings, and your outputs. This keeps the runtime
-    directory separate from the source code and aids in updating.
-
-    You may pick any location for this directory using the `--root_dir`
-    option (abbreviated --root). If you don't pass this option, it will
-    default to `invokeai` in your home directory.
+    In this step you will initialize your runtime directory with the downloaded
+    models, model config files, directory for textual inversion embeddings, and
+    your outputs.
 
     ```bash
-    configure_invokeai.py --root_dir ~/Programs/invokeai
+    invokeai-configure --root ${INVOKEAI_ROOT}
     ```
 
-    The script `configure_invokeai.py` will interactively guide you through the
+    The script `invokeai-configure` will interactively guide you through the
     process of downloading and installing the weights files needed for InvokeAI.
     Note that the main Stable Diffusion weights file is protected by a license
     agreement that you have to agree to. The script will list the steps you need
@@ -150,12 +114,6 @@ manager, please follow these steps:
     If you get an error message about a module not being installed, check that
     the `invokeai` environment is active and if not, repeat step 5.
 
-    Note that `configure_invokeai.py` and `invoke.py` should be installed
-    under your virtual environment directory and the system should find them
-    on the PATH. If this isn't working on your system, you can call the
-    scripts directory using `python scripts/configure_invokeai.py` and
-    `python scripts/invoke.py`.
-
     !!! tip
 
         If you have already downloaded the weights file(s) for another Stable
@@ -163,12 +121,12 @@ manager, please follow these steps:
         prompted) and configure InvokeAI to use the previously-downloaded files. The
         process for this is described in [here](050_INSTALLING_MODELS.md).
 
-8.  Run the command-line- or the web- interface:
+7.  Run the command-line- or the web- interface:
 
-    Activate the environment (with `source invokeai/bin/activate`), and then
-    run the script `invoke.py`. If you selected a non-default location
-    for the runtime directory, please specify the path with the `--root_dir`
-    option (abbreviated below as `--root`):
+    Activate the environment (with `source .venv/bin/activate`), and then run
+    the script `invokeai`. If you selected a non-default location for the
+    runtime directory, please specify the path with the `--root_dir` option
+    (abbreviated below as `--root`):
 
     !!! example ""
 
@@ -177,19 +135,19 @@ manager, please follow these steps:
         === "CLI"
 
             ```bash
-            invoke.py --root ~/Programs/invokeai
+            invokeai --root ~/invokeai
             ```
 
         === "local Webserver"
 
             ```bash
-            invoke.py --web --root ~/Programs/invokeai
+            invokeai --web --root ~/invokeai
             ```
 
         === "Public Webserver"
 
             ```bash
-            invoke.py --web --host 0.0.0.0 --root ~/Programs/invokeai
+            invokeai --web --host 0.0.0.0 --root ~/invokeai
             ```
 
         If you choose the run the web interface, point your browser at
@@ -197,393 +155,23 @@ manager, please follow these steps:
 
     !!! tip
 
-        You can permanently set the location of the runtime directory by setting the environment variable INVOKEAI_ROOT to the path of the directory.
+        You can permanently set the location of the runtime directory by setting the environment variable `INVOKEAI_ROOT` to the path of the directory. As mentioned previously, this is
+        **required** if your virtual environment is located outside of your runtime directory.
 
-9. Render away!
+8.  Render away!
 
-    Browse the [features](../features/CLI.md) section to learn about all the things you
-    can do with InvokeAI.
+    Browse the [features](../features/CLI.md) section to learn about all the
+    things you can do with InvokeAI.
 
     Note that some GPUs are slow to warm up. In particular, when using an AMD
     card with the ROCm driver, you may have to wait for over a minute the first
-    time you try to generate an image. Fortunately, after the warm up period
+    time you try to generate an image. Fortunately, after the warm-up period
     rendering will be fast.
 
-10. Subsequently, to relaunch the script, be sure to run "conda activate
-    invokeai", enter the `InvokeAI` directory, and then launch the invoke
-    script. If you forget to activate the 'invokeai' environment, the script
-    will fail with multiple `ModuleNotFound` errors.
+9.  Subsequently, to relaunch the script, activate the virtual environment, and
+    then launch `invokeai` command. If you forget to activate the virtual
+    environment you will most likeley receive a `command not found` error.
 
-    !!! tip
+    !!! warning
 
-    Do not move the source code repository after installation. The virtual environment directory has absolute paths in it that get confused if the directory is moved.
-
----
-
-### Conda method
-
-1.  Check that your system meets the
-    [hardware requirements](index.md#Hardware_Requirements) and has the
-    appropriate GPU drivers installed. In particular, if you are a Linux user
-    with an AMD GPU installed, you may need to install the
-    [ROCm driver](https://rocmdocs.amd.com/en/latest/Installation_Guide/Installation-Guide.html).
-
-    InvokeAI does not yet support Windows machines with AMD GPUs due to the lack
-    of ROCm driver support on this platform.
-
-    To confirm that the appropriate drivers are installed, run `nvidia-smi` on
-    NVIDIA/CUDA systems, and `rocm-smi` on AMD systems. These should return
-    information about the installed video card.
-
-    Macintosh users with MPS acceleration, or anybody with a CPU-only system,
-    can skip this step.
-
-2.  You will need to install Anaconda3 and Git if they are not already
-    available. Use your operating system's preferred package manager, or
-    download the installers manually. You can find them here:
-
-    - [Anaconda3](https://www.anaconda.com/)
-    - [git](https://git-scm.com/downloads)
-
-3.  Clone the [InvokeAI](https://github.com/invoke-ai/InvokeAI) source code from
-    GitHub:
-
-    ```bash
-    git clone https://github.com/invoke-ai/InvokeAI.git
-    ```
-
-    This will create InvokeAI folder where you will follow the rest of the
-    steps.
-
-4.  Enter the newly-created InvokeAI folder:
-
-    ```bash
-    cd InvokeAI
-    ```
-
-    From this step forward make sure that you are working in the InvokeAI
-    directory!
-
-5.  Select the appropriate environment file:
-
-    We have created a series of environment files suited for different operating
-    systems and GPU hardware. They are located in the
-    `environments-and-requirements` directory:
-
-    <figure markdown>
-
-    |         filename         |               OS               |
-    | :----------------------: | :----------------------------: |
-    | environment-lin-amd.yml  |  Linux with an AMD (ROCm) GPU  |
-    | environment-lin-cuda.yml | Linux with an NVIDIA CUDA GPU  |
-    | environment-mac.yml    |   Macintosh            |
-    | environment-win-cuda.yml | Windows with an NVIDA CUDA GPU |
-
-    </figure>
-
-    Choose the appropriate environment file for your system and link or copy it
-    to `environment.yml` in InvokeAI's top-level directory. To do so, run
-    following command from the repository-root:
-
-    !!! Example ""
-
-        === "Macintosh and Linux"
-
-            !!! todo "Replace `xxx` and `yyy` with the appropriate OS and GPU codes as seen in the table above"
-
-            ```bash
-            ln -sf environments-and-requirements/environment-xxx-yyy.yml environment.yml
-            ```
-
-            When this is done, confirm that a file `environment.yml` has been linked in
-            the InvokeAI root directory and that it points to the correct file in the
-            `environments-and-requirements`.
-
-            ```bash
-            ls -la
-            ```
-
-        === "Windows"
-
-            !!! todo " Since it requires admin privileges to create links, we will use the copy command to create your `environment.yml`"
-
-            ```cmd
-            copy environments-and-requirements\environment-win-cuda.yml environment.yml
-            ```
-
-            Afterwards verify that the file `environment.yml` has been created, either via the
-            explorer or by using the command `dir` from the terminal
-
-            ```cmd
-            dir
-            ```
-
-    !!! warning "Do not try to run conda on directly on the subdirectory environments file. This won't work. Instead, copy or link it to the top-level directory as shown."
-
-6.  Create the conda environment:
-
-    ```bash
-    conda env update
-    ```
-
-    This will create a new environment named `invokeai` and install all InvokeAI
-    dependencies into it. If something goes wrong you should take a look at
-    [troubleshooting](#troubleshooting).
-
-7.  Activate the `invokeai` environment:
-
-    In order to use the newly created environment you will first need to
-    activate it
-
-    ```bash
-    conda activate invokeai
-    ```
-
-    Your command-line prompt should change to indicate that `invokeai` is active
-    by prepending `(invokeai)`.
-
-8.  Set up the runtime directory
-
-    In this step you will initialize a runtime directory that will
-    contain the models, model config files, directory for textual
-    inversion embeddings, and your outputs. This keeps the runtime
-    directory separate from the source code and aids in updating.
-
-    You may pick any location for this directory using the `--root_dir`
-    option (abbreviated --root). If you don't pass this option, it will
-    default to `invokeai` in your home directory.
-
-    ```bash
-    python scripts/configure_invokeai.py --root_dir ~/Programs/invokeai
-    ```
-
-    The script `configure_invokeai.py` will interactively guide you through the
-    process of downloading and installing the weights files needed for InvokeAI.
-    Note that the main Stable Diffusion weights file is protected by a license
-    agreement that you have to agree to. The script will list the steps you need
-    to take to create an account on the site that hosts the weights files,
-    accept the agreement, and provide an access token that allows InvokeAI to
-    legally download and install the weights files.
-
-    If you get an error message about a module not being installed, check that
-    the `invokeai` environment is active and if not, repeat step 5.
-
-    Note that `configure_invokeai.py` and `invoke.py` should be
-    installed under your conda directory and the system should find
-    them automatically on the PATH. If this isn't working on your
-    system, you can call the scripts directory using `python
-    scripts/configure_invoke.py` and `python scripts/invoke.py`.
-
-    !!! tip
-
-        If you have already downloaded the weights file(s) for another Stable
-        Diffusion distribution, you may skip this step (by selecting "skip" when
-        prompted) and configure InvokeAI to use the previously-downloaded files. The
-        process for this is described in [here](050_INSTALLING_MODELS.md).
-
-9.  Run the command-line- or the web- interface:
-
-    Activate the environment (with `source invokeai/bin/activate`), and then
-    run the script `invoke.py`. If you selected a non-default location
-    for the runtime directory, please specify the path with the `--root_dir`
-    option (abbreviated below as `--root`):
-
-    !!! example ""
-
-        !!! warning "Make sure that the conda environment is activated, which should create `(invokeai)` in front of your prompt!"
-
-        === "CLI"
-
-            ```bash
-            invoke.py --root ~/Programs/invokeai
-            ```
-
-        === "local Webserver"
-
-            ```bash
-            invoke.py --web --root ~/Programs/invokeai
-            ```
-
-        === "Public Webserver"
-
-            ```bash
-            invoke.py --web --host 0.0.0.0 --root ~/Programs/invokeai
-            ```
-
-        If you choose the run the web interface, point your browser at
-        http://localhost:9090 in order to load the GUI.
-
-    !!! tip
-
-        You can permanently set the location of the runtime directory by setting the environment variable INVOKEAI_ROOT to the path of your choice.
-
-10. Render away!
-
-    Browse the [features](../features/CLI.md) section to learn about all the things you
-    can do with InvokeAI.
-
-    Note that some GPUs are slow to warm up. In particular, when using an AMD
-    card with the ROCm driver, you may have to wait for over a minute the first
-    time you try to generate an image. Fortunately, after the warm up period
-    rendering will be fast.
-
-11. Subsequently, to relaunch the script, be sure to run "conda activate
-    invokeai", enter the `InvokeAI` directory, and then launch the invoke
-    script. If you forget to activate the 'invokeai' environment, the script
-    will fail with multiple `ModuleNotFound` errors.
-
-## Creating an "install" version of InvokeAI
-
-If you wish you can install InvokeAI and all its dependencies in the
-runtime directory. This allows you to delete the source code
-repository and eliminates the need to provide `--root_dir` at startup
-time. Note that this method only works with the PIP method.
-
-1. Follow the instructions for the PIP install, but in step #2 put the
-   virtual environment into the runtime directory. For example, assuming the
-   runtime directory lives in `~/Programs/invokeai`, you'd run:
-
-   ```bash
-   python -menv ~/Programs/invokeai
-   ```
-
-2. Now follow steps 3 to 5 in the PIP recipe, ending with the `pip install`
-   step.
-
-3. Run one additional step while you are in the source code repository
-   directory `pip install .` (note the dot at the end).
-
-4. That's all! Now, whenever you activate the virtual environment,
-   `invoke.py` will know where to look for the runtime directory without
-   needing a `--root_dir` argument. In addition, you can now move or
-   delete the source code repository entirely.
-
-   (Don't move the runtime directory!)
-
-## Updating to newer versions of the script
-
-This distribution is changing rapidly. If you used the `git clone` method
-(step 5) to download the InvokeAI directory, then to update to the latest and
-greatest version, launch the Anaconda window, enter `InvokeAI` and type:
-
-```bash
-git pull
-conda env update
-python scripts/configure_invokeai.py --skip-sd-weights #optional
-```
-
-This will bring your local copy into sync with the remote one. The last step may
-be needed to take advantage of new features or released models. The
-`--skip-sd-weights` flag will prevent the script from prompting you to download
-the big Stable Diffusion weights files.
-
-## Troubleshooting
-
-Here are some common issues and their suggested solutions.
-
-### Conda
-
-#### Conda fails before completing `conda update`
-
-The usual source of these errors is a package incompatibility. While we have
-tried to minimize these, over time packages get updated and sometimes introduce
-incompatibilities.
-
-We suggest that you search
-[Issues](https://github.com/invoke-ai/InvokeAI/issues) or the "bugs-and-support"
-channel of the [InvokeAI Discord](https://discord.gg/ZmtBAhwWhy).
-
-You may also try to install the broken packages manually using PIP. To do this,
-activate the `invokeai` environment, and run `pip install` with the name and
-version of the package that is causing the incompatibility. For example:
-
-```bash
-pip install test-tube==0.7.5
-```
-
-You can keep doing this until all requirements are satisfied and the `invoke.py`
-script runs without errors. Please report to
-[Issues](https://github.com/invoke-ai/InvokeAI/issues) what you were able to do
-to work around the problem so that others can benefit from your investigation.
-
-### Create Conda Environment fails on MacOS
-
-If conda create environment fails with lmdb error, this is most likely caused by Clang.
-Run brew config to see which Clang is installed on your Mac. If Clang isn't installed, that's causing the error.
-Start by installing additional XCode command line tools, followed by brew install llvm.
-
-```bash
-xcode-select --install
-brew install llvm
-```
-
-If brew config has Clang installed, update to the latest llvm and try creating the environment again.
-
-#### `configure_invokeai.py` or `invoke.py` crashes at an early stage
-
-This is usually due to an incomplete or corrupted Conda install. Make sure you
-have linked to the correct environment file and run `conda update` again.
-
-If the problem persists, a more extreme measure is to clear Conda's caches and
-remove the `invokeai` environment:
-
-```bash
-conda deactivate
-conda env remove -n invokeai
-conda clean -a
-conda update
-```
-
-This removes all cached library files, including ones that may have been
-corrupted somehow. (This is not supposed to happen, but does anyway).
-
-#### `invoke.py` crashes at a later stage
-
-If the CLI or web site had been working ok, but something unexpected happens
-later on during the session, you've encountered a code bug that is probably
-unrelated to an install issue. Please search
-[Issues](https://github.com/invoke-ai/InvokeAI/issues), file a bug report, or
-ask for help on [Discord](https://discord.gg/ZmtBAhwWhy)
-
-#### My renders are running very slowly
-
-You may have installed the wrong torch (machine learning) package, and the
-system is running on CPU rather than the GPU. To check, look at the log messages
-that appear when `invoke.py` is first starting up. One of the earlier lines
-should say `Using device type cuda`. On AMD systems, it will also say "cuda",
-and on Macintoshes, it should say "mps". If instead the message says it is
-running on "cpu", then you may need to install the correct torch library.
-
-You may be able to fix this by installing a different torch library. Here are
-the magic incantations for Conda and PIP.
-
-!!! todo "For CUDA systems"
-
-    - conda
-
-      ```bash
-      conda install pytorch torchvision torchaudio pytorch-cuda=11.6 -c pytorch -c nvidia
-      ```
-
-    - pip
-
-      ```bash
-      pip3 install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cu116
-      ```
-
-!!! todo "For AMD systems"
-
-    - conda
-
-      ```bash
-      conda activate invokeai
-      pip3 install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/rocm5.2/
-      ```
-
-    - pip
-
-      ```bash
-      pip3 install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/rocm5.2/
-      ```
-
-More information and troubleshooting tips can be found at https://pytorch.org.
+        Do not move the runtime directory after installation. The virtual environment has absolute paths in it that get confused if the directory is moved.

docs/installation/050_INSTALLING_MODELS.md

@@ -56,7 +56,7 @@ unofficial Stable Diffusion models and where they can be obtained.
 
 There are three ways to install weights files:
 
-1. During InvokeAI installation, the `configure_invokeai.py` script can download
+1. During InvokeAI installation, the `invokeai-configure` script can download
    them for you.
 
 2. You can use the command-line interface (CLI) to import, configure and modify
@@ -65,13 +65,13 @@ There are three ways to install weights files:
 3. You can download the files manually and add the appropriate entries to
    `models.yaml`.
 
-### Installation via `configure_invokeai.py`
+### Installation via `invokeai-configure`
 
-This is the most automatic way. Run `scripts/configure_invokeai.py` from the
+This is the most automatic way. Run `invokeai-configure` from the
 console. It will ask you to select which models to download and lead you through
 the steps of setting up a Hugging Face account if you haven't done so already.
 
-To start, run `python scripts/configure_invokeai.py` from within the InvokeAI:
+To start, run `invokeai-configure` from within the InvokeAI:
 directory
 
 !!! example ""
@@ -244,7 +244,7 @@ arabian-nights-1.0:
 | arabian-nights-1.0 | This is the name of the model that you will refer to from within the CLI and the WebGUI when you need to load and use the model.                                                                                                                                                                                                                                                                                                                                                                                                  |
 | description        | Any description that you want to add to the model to remind you what it is.                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
 | weights            | Relative path to the .ckpt weights file for this model.                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |
-| config             | This is the confusingly-named configuration file for the model itself. Use `./configs/stable-diffusion/v1-inference.yaml` unless the model happens to need a custom configuration, in which case the place you downloaded it from will tell you what to use instead. For example, the runwayML custom inpainting model requires the file `configs/stable-diffusion/v1-inpainting-inference.yaml`. This is already inclued in the InvokeAI distribution and is configured automatically for you by the `configure_invokeai.py` script. |
+| config             | This is the confusingly-named configuration file for the model itself. Use `./configs/stable-diffusion/v1-inference.yaml` unless the model happens to need a custom configuration, in which case the place you downloaded it from will tell you what to use instead. For example, the runwayML custom inpainting model requires the file `configs/stable-diffusion/v1-inpainting-inference.yaml`. This is already inclued in the InvokeAI distribution and is configured automatically for you by the `invokeai-configure` script. |
 | vae                | If you want to add a VAE file to the model, then enter its path here.                                                                                                                                                                                                                                                                                                                                                                                                                                                             |
 | width, height      | This is the width and height of the images used to train the model. Currently they are always 512 and 512.                                                                                                                                                                                                                                                                                                                                                                                                                        |
 

docs/installation/060_INSTALL_PATCHMATCH.md

@@ -2,114 +2,110 @@
 title: Installing PyPatchMatch
 ---
 
-# :octicons-paintbrush-16: Installing PyPatchMatch
+# :material-image-size-select-large: 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.
+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.
+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.
+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.
+You need to have opencv installed so that pypatchmatch can be built:
+
+```bash
+brew install opencv
+```
+
+The next time you start `invoke`, after sucesfully installing opencv, pypatchmatch will be built.
 
 ## Linux
 
-Prior to installing PyPatchMatch, you need to take the following
-steps:
+Prior to installing PyPatchMatch, you need to take the following steps:
 
 ### Debian Based Distros
 
-
 1. Install the `build-essential` tools:
 
-   ```
-   sudo apt update
-   sudo apt install build-essential
-   ```
+    ```sh
+    sudo apt update
+    sudo apt install build-essential
+    ```
 
 2. Install `opencv`:
 
-   ```
-   sudo apt install python3-opencv libopencv-dev
-   ```
+    ```sh
+    sudo apt install python3-opencv libopencv-dev
+    ```
 
-3. Fix the naming of the `opencv` package configuration file:
+3. Activate the environment you use for invokeai, either with `conda` or with a
+   virtual environment.
 
-   ```
-   cd /usr/lib/x86_64-linux-gnu/pkgconfig/
-   ln -sf opencv4.pc opencv.pc
-   ```
+4. Install pypatchmatch:
 
-4. Activate the environment you use for invokeai, either with
-`conda` or with a virtual environment.
+    ```sh
+    pip install pypatchmatch
+    ```
 
-5. Do a "develop" install of pypatchmatch:
-
-   ```
-   pip install "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 ...
-   ```
+5. 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:
 
+    ```py
+    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 ...
+    ```
 
 ### Arch Based Distros
 
 1. Install the `base-devel` package:
-   ```
-   sudo pacman -Syu
-   sudo pacman -S --needed base-devel
-   ```
+
+    ```sh
+    sudo pacman -Syu
+    sudo pacman -S --needed base-devel
+    ```
 
 2. Install `opencv`:
-   ```
-   sudo pacman -S opencv
-   ```
-   or for CUDA support
-   ```
-   sudo pacman -S opencv-cuda
-   ```
+
+    ```sh
+    sudo pacman -S opencv
+    ```
+
+    or for CUDA support
+
+    ```sh
+    sudo pacman -S opencv-cuda
+    ```
 
 3. Fix the naming of the `opencv` package configuration file:
-   ```
-   cd /usr/lib/pkgconfig/
-   ln -sf opencv4.pc opencv.pc
-   ```
 
-**Next, Follow Steps 4-6 from the Debian Section above**
+    ```sh
+    cd /usr/lib/pkgconfig/
+    ln -sf opencv4.pc opencv.pc
+    ```
 
+[**Next, Follow Steps 4-6 from the Debian Section above**](#linux)
 
 If you see no errors, then you're ready to go!
-
-

docs/installation/070_INSTALL_XFORMERS.md

@@ -0,0 +1,206 @@
+---
+title: Installing xFormers
+---
+
+# :material-image-size-select-large: Installing xformers
+
+xFormers is toolbox that integrates with the pyTorch and CUDA
+libraries to provide accelerated performance and reduced memory
+consumption for applications using the transformers machine learning
+architecture. After installing xFormers, InvokeAI users who have
+CUDA GPUs will see a noticeable decrease in GPU memory consumption and
+an increase in speed.
+
+xFormers can be installed into a working InvokeAI installation without
+any code changes or other updates. This document explains how to
+install xFormers.
+
+## Pip Install
+
+For both Windows and Linux, you can install `xformers` in just a
+couple of steps from the command line.
+
+If you are used to launching `invoke.sh` or `invoke.bat` to start
+InvokeAI, then run the launcher and select the "developer's console"
+to get to the command line. If you run invoke.py directly from the
+command line, then just be sure to activate it's virtual environment.
+
+Then run the following three commands:
+
+```sh
+pip install xformers==0.0.16rc425
+pip install triton
+python -m xformers.info output
+```
+
+The first command installs `xformers`, the second installs the
+`triton` training accelerator, and the third prints out the `xformers`
+installation status. If all goes well, you'll see a report like the
+following:
+
+```sh
+xFormers 0.0.16rc425
+memory_efficient_attention.cutlassF:               available
+memory_efficient_attention.cutlassB:               available
+memory_efficient_attention.flshattF:               available
+memory_efficient_attention.flshattB:               available
+memory_efficient_attention.smallkF:                available
+memory_efficient_attention.smallkB:                available
+memory_efficient_attention.tritonflashattF:        available
+memory_efficient_attention.tritonflashattB:        available
+swiglu.fused.p.cpp:                                available
+is_triton_available:                               True
+is_functorch_available:                            False
+pytorch.version:                                   1.13.1+cu117
+pytorch.cuda:                                      available
+gpu.compute_capability:                            8.6
+gpu.name:                                          NVIDIA RTX A2000 12GB
+build.info:                                        available
+build.cuda_version:                                1107
+build.python_version:                              3.10.9
+build.torch_version:                               1.13.1+cu117
+build.env.TORCH_CUDA_ARCH_LIST:                    5.0+PTX 6.0 6.1 7.0 7.5 8.0 8.6
+build.env.XFORMERS_BUILD_TYPE:                     Release
+build.env.XFORMERS_ENABLE_DEBUG_ASSERTIONS:        None
+build.env.NVCC_FLAGS:                              None
+build.env.XFORMERS_PACKAGE_FROM:                   wheel-v0.0.16rc425
+source.privacy:                                    open source
+```
+
+## Source Builds
+
+`xformers` is currently under active development and at some point you
+may wish to build it from sourcce to get the latest features and
+bugfixes.
+
+### Source Build on Linux
+
+Note that xFormers only works with true NVIDIA GPUs and will not work
+properly with the ROCm driver for AMD acceleration.
+
+xFormers is not currently available as a pip binary wheel and must be
+installed from source. These instructions were written for a system
+running Ubuntu 22.04, but other Linux distributions should be able to
+adapt this recipe.
+
+#### 1. Install CUDA Toolkit 11.7
+
+You will need the CUDA developer's toolkit in order to compile and
+install xFormers. **Do not try to install Ubuntu's nvidia-cuda-toolkit
+package.** It is out of date and will cause conflicts among the NVIDIA
+driver and binaries. Instead install the CUDA Toolkit package provided
+by NVIDIA itself. Go to [CUDA Toolkit 11.7
+Downloads](https://developer.nvidia.com/cuda-11-7-0-download-archive)
+and use the target selection wizard to choose your platform and Linux
+distribution. Select an installer type of "runfile (local)" at the
+last step.
+
+This will provide you with a recipe for downloading and running a
+install shell script that will install the toolkit and drivers. For
+example, the install script recipe for Ubuntu 22.04 running on a
+x86_64 system is:
+
+```
+wget https://developer.download.nvidia.com/compute/cuda/11.7.0/local_installers/cuda_11.7.0_515.43.04_linux.run
+sudo sh cuda_11.7.0_515.43.04_linux.run
+```
+
+Rather than cut-and-paste this example, We recommend that you walk
+through the toolkit wizard in order to get the most up to date
+installer for your system.
+
+#### 2. Confirm/Install pyTorch 1.13 with CUDA 11.7 support
+
+If you are using InvokeAI 2.3 or higher, these will already be
+installed. If not, you can check whether you have the needed libraries
+using a quick command. Activate the invokeai virtual environment,
+either by entering the "developer's console", or manually with a
+command similar to `source ~/invokeai/.venv/bin/activate` (depending
+on where your `invokeai` directory is.
+
+Then run the command:
+
+```sh
+python -c 'exec("import torch\nprint(torch.__version__)")'
+```
+
+If it prints __1.13.1+cu117__ you're good. If not, you can install the
+most up to date libraries with this command:
+
+```sh
+pip install --upgrade --force-reinstall torch torchvision
+```
+
+#### 3. Install the triton module
+
+This module isn't necessary for xFormers image inference optimization,
+but avoids a startup warning.
+
+```sh
+pip install triton
+```
+
+#### 4. Install source code build prerequisites
+
+To build xFormers from source, you will need the `build-essentials`
+package. If you don't have it installed already, run:
+
+```sh
+sudo apt install build-essential
+```
+
+#### 5. Build xFormers
+
+There is no pip wheel package for xFormers at this time (January
+2023). Although there is a conda package, InvokeAI no longer
+officially supports conda installations and you're on your own if you
+wish to try this route.
+
+Following the recipe provided at the [xFormers GitHub
+page](https://github.com/facebookresearch/xformers), and with the
+InvokeAI virtual environment active (see step 1) run the following
+commands:
+
+```sh
+pip install ninja
+export TORCH_CUDA_ARCH_LIST="6.0;6.1;6.2;7.0;7.2;7.5;8.0;8.6"
+pip install -v -U git+https://github.com/facebookresearch/xformers.git@main#egg=xformers
+```
+
+The TORCH_CUDA_ARCH_LIST is a list of GPU architectures to compile
+xFormer support for. You can speed up compilation by selecting
+the architecture specific for your system. You'll find the list of
+GPUs and their architectures at NVIDIA's [GPU Compute
+Capability](https://developer.nvidia.com/cuda-gpus) table.
+
+If the compile and install completes successfully, you can check that
+xFormers is installed with this command:
+
+```sh
+python -m xformers.info
+```
+
+If suiccessful, the top of the listing should indicate "available" for
+each of the `memory_efficient_attention` modules, as shown here:
+
+```sh
+memory_efficient_attention.cutlassF:               available
+memory_efficient_attention.cutlassB:               available
+memory_efficient_attention.flshattF:               available
+memory_efficient_attention.flshattB:               available
+memory_efficient_attention.smallkF:                available
+memory_efficient_attention.smallkB:                available
+memory_efficient_attention.tritonflashattF:        available
+memory_efficient_attention.tritonflashattB:        available
+[...]
+```
+
+You can now launch InvokeAI and enjoy the benefits of xFormers.
+
+### Windows
+
+To come
+
+
+---
+(c) Copyright 2023 Lincoln Stein and the InvokeAI Development Team

docs/installation/INSTALL_AUTOMATED.md

@@ -1 +0,0 @@
-010_INSTALL_AUTOMATED.md

docs/installation/INSTALL_MANUAL.md

@@ -1,429 +0,0 @@
----
-title: Manual Installation
----
-
-<figure markdown>
-# :fontawesome-brands-linux: Linux | :fontawesome-brands-apple: macOS | :fontawesome-brands-windows: Windows
-</figure>
-
-!!! warning "This is for advanced Users"
-
-    who are already experienced with using conda or pip
-
-## Introduction
-
-You have two choices for manual installation, the [first one](#Conda_method)
-based on the Anaconda3 package manager (`conda`), and
-[a second one](#PIP_method) which uses basic Python virtual environment (`venv`)
-commands and the PIP package manager. Both methods require you to enter commands
-on the terminal, also known as the "console".
-
-On Windows systems you are encouraged to install and use the
-[Powershell](https://learn.microsoft.com/en-us/powershell/scripting/install/installing-powershell-on-windows?view=powershell-7.3),
-which provides compatibility with Linux and Mac shells and nice features such as
-command-line completion.
-
-### Conda method
-
-1.  Check that your system meets the
-    [hardware requirements](index.md#Hardware_Requirements) and has the
-    appropriate GPU drivers installed. In particular, if you are a Linux user
-    with an AMD GPU installed, you may need to install the
-    [ROCm driver](https://rocmdocs.amd.com/en/latest/Installation_Guide/Installation-Guide.html).
-
-    InvokeAI does not yet support Windows machines with AMD GPUs due to the lack
-    of ROCm driver support on this platform.
-
-    To confirm that the appropriate drivers are installed, run `nvidia-smi` on
-    NVIDIA/CUDA systems, and `rocm-smi` on AMD systems. These should return
-    information about the installed video card.
-
-    Macintosh users with MPS acceleration, or anybody with a CPU-only system,
-    can skip this step.
-
-2.  You will need to install Anaconda3 and Git if they are not already
-    available. Use your operating system's preferred package manager, or
-    download the installers manually. You can find them here:
-
-    - [Anaconda3](https://www.anaconda.com/)
-    - [git](https://git-scm.com/downloads)
-
-3.  Clone the [InvokeAI](https://github.com/invoke-ai/InvokeAI) source code from
-    GitHub:
-
-    ```bash
-    git clone https://github.com/invoke-ai/InvokeAI.git
-    ```
-
-    This will create InvokeAI folder where you will follow the rest of the
-    steps.
-
-4.  Enter the newly-created InvokeAI folder:
-
-    ```bash
-    cd InvokeAI
-    ```
-
-    From this step forward make sure that you are working in the InvokeAI
-    directory!
-
-5.  Select the appropriate environment file:
-
-    We have created a series of environment files suited for different operating
-    systems and GPU hardware. They are located in the
-    `environments-and-requirements` directory:
-
-    <figure markdown>
-
-    |         filename         |               OS               |
-    | :----------------------: | :----------------------------: |
-    | environment-lin-amd.yml  |  Linux with an AMD (ROCm) GPU  |
-    | environment-lin-cuda.yml | Linux with an NVIDIA CUDA GPU  |
-    | environment-mac.yml    |   Macintosh            |
-    | environment-win-cuda.yml | Windows with an NVIDA CUDA GPU |
-
-    </figure>
-
-    Choose the appropriate environment file for your system and link or copy it
-    to `environment.yml` in InvokeAI's top-level directory. To do so, run
-    following command from the repository-root:
-
-    !!! Example ""
-
-        === "Macintosh and Linux"
-
-            !!! todo "Replace `xxx` and `yyy` with the appropriate OS and GPU codes as seen in the table above"
-
-            ```bash
-            ln -sf environments-and-requirements/environment-xxx-yyy.yml environment.yml
-            ```
-
-            When this is done, confirm that a file `environment.yml` has been linked in
-            the InvokeAI root directory and that it points to the correct file in the
-            `environments-and-requirements`.
-
-            ```bash
-            ls -la
-            ```
-
-        === "Windows"
-
-            !!! todo " Since it requires admin privileges to create links, we will use the copy command to create your `environment.yml`"
-
-            ```cmd
-            copy environments-and-requirements\environment-win-cuda.yml environment.yml
-            ```
-
-            Afterwards verify that the file `environment.yml` has been created, either via the
-            explorer or by using the command `dir` from the terminal
-
-            ```cmd
-            dir
-            ```
-
-    !!! warning "Do not try to run conda on directly on the subdirectory environments file. This won't work. Instead, copy or link it to the top-level directory as shown."
-
-6.  Create the conda environment:
-
-    ```bash
-    conda env update
-    ```
-
-    This will create a new environment named `invokeai` and install all InvokeAI
-    dependencies into it. If something goes wrong you should take a look at
-    [troubleshooting](#troubleshooting).
-
-7.  Activate the `invokeai` environment:
-
-    In order to use the newly created environment you will first need to
-    activate it
-
-    ```bash
-    conda activate invokeai
-    ```
-
-    Your command-line prompt should change to indicate that `invokeai` is active
-    by prepending `(invokeai)`.
-
-8.  Pre-Load the model weights files:
-
-    !!! tip
-
-        If you have already downloaded the weights file(s) for another Stable
-        Diffusion distribution, you may skip this step (by selecting "skip" when
-        prompted) and configure InvokeAI to use the previously-downloaded files. The
-        process for this is described in [here](INSTALLING_MODELS.md).
-
-    ```bash
-    python scripts/configure_invokeai.py
-    ```
-
-    The script `configure_invokeai.py` will interactively guide you through the
-    process of downloading and installing the weights files needed for InvokeAI.
-    Note that the main Stable Diffusion weights file is protected by a license
-    agreement that you have to agree to. The script will list the steps you need
-    to take to create an account on the site that hosts the weights files,
-    accept the agreement, and provide an access token that allows InvokeAI to
-    legally download and install the weights files.
-
-    If you get an error message about a module not being installed, check that
-    the `invokeai` environment is active and if not, repeat step 5.
-
-9.  Run the command-line- or the web- interface:
-
-    !!! example ""
-
-        !!! warning "Make sure that the conda environment is activated, which should create `(invokeai)` in front of your prompt!"
-
-        === "CLI"
-
-            ```bash
-            python scripts/invoke.py
-            ```
-
-        === "local Webserver"
-
-            ```bash
-            python scripts/invoke.py --web
-            ```
-
-        === "Public Webserver"
-
-            ```bash
-            python scripts/invoke.py --web --host 0.0.0.0
-            ```
-
-        If you choose the run the web interface, point your browser at
-        http://localhost:9090 in order to load the GUI.
-
-10. Render away!
-
-    Browse the [features](../features/CLI.md) section to learn about all the things you
-    can do with InvokeAI.
-
-    Note that some GPUs are slow to warm up. In particular, when using an AMD
-    card with the ROCm driver, you may have to wait for over a minute the first
-    time you try to generate an image. Fortunately, after the warm up period
-    rendering will be fast.
-
-11. Subsequently, to relaunch the script, be sure to run "conda activate
-    invokeai", enter the `InvokeAI` directory, and then launch the invoke
-    script. If you forget to activate the 'invokeai' environment, the script
-    will fail with multiple `ModuleNotFound` errors.
-
-## Updating to newer versions of the script
-
-This distribution is changing rapidly. If you used the `git clone` method
-(step 5) to download the InvokeAI directory, then to update to the latest and
-greatest version, launch the Anaconda window, enter `InvokeAI` and type:
-
-```bash
-git pull
-conda env update
-python scripts/configure_invokeai.py --no-interactive  #optional
-```
-
-This will bring your local copy into sync with the remote one. The last step may
-be needed to take advantage of new features or released models. The
-`--no-interactive` flag will prevent the script from prompting you to download
-the big Stable Diffusion weights files.
-
-## pip Install
-
-To install InvokeAI with only the PIP package manager, please follow these
-steps:
-
-1.  Make sure you are using Python 3.9 or higher. The rest of the install
-    procedure depends on this:
-
-    ```bash
-    python -V
-    ```
-
-2.  Install the `virtualenv` tool if you don't have it already:
-
-    ```bash
-    pip install virtualenv
-    ```
-
-3.  From within the InvokeAI top-level directory, create and activate a virtual
-    environment named `invokeai`:
-
-    ```bash
-    virtualenv invokeai
-    source invokeai/bin/activate
-    ```
-
-4.  Pick the correct `requirements*.txt` file for your hardware and operating
-    system.
-
-    We have created a series of environment files suited for different operating
-    systems and GPU hardware. They are located in the
-    `environments-and-requirements` directory:
-
-    <figure markdown>
-
-    |              filename               |                               OS                                |
-    | :---------------------------------: | :-------------------------------------------------------------: |
-    |      requirements-lin-amd.txt       |                  Linux with an AMD (ROCm) GPU                   |
-    |     requirements-lin-arm64.txt      |                 Linux running on arm64 systems                  |
-    |      requirements-lin-cuda.txt      |                 Linux with an NVIDIA (CUDA) GPU                 |
-    |    requirements-mac-mps-cpu.txt     |                Macintoshes with MPS acceleration                |
-    | requirements-lin-win-colab-cuda.txt | Windows with an NVIDA (CUDA) GPU<br>(supports Google Colab too) |
-
-    </figure>
-
-    Select the appropriate requirements file, and make a link to it from
-    `requirements.txt` in the top-level InvokeAI directory. The command to do
-    this from the top-level directory is:
-
-    !!! example ""
-
-        === "Macintosh and Linux"
-
-            !!! info "Replace `xxx` and `yyy` with the appropriate OS and GPU codes."
-
-            ```bash
-            ln -sf environments-and-requirements/requirements-xxx-yyy.txt requirements.txt
-            ```
-
-        === "Windows"
-
-            !!! info "on Windows, admin privileges are required to make links, so we use the copy command instead"
-
-            ```cmd
-            copy environments-and-requirements\requirements-lin-win-colab-cuda.txt requirements.txt
-            ```
-
-        !!! warning
-
-            Please do not link or copy `environments-and-requirements/requirements-base.txt`.
-            This is a base requirements file that does not have the platform-specific
-            libraries. Also, be sure to link or copy the platform-specific file to
-	    a top-level file named `requirements.txt` as shown here. Running pip on
-	    a requirements file in a subdirectory will not work as expected.
-
-    When this is done, confirm that a file named `requirements.txt` has been
-    created in the InvokeAI root directory and that it points to the correct
-    file in `environments-and-requirements`.
-
-5.  Run PIP
-
-    Be sure that the `invokeai` environment is active before doing this:
-
-    ```bash
-    pip install --prefer-binary -r requirements.txt
-    ```
-
----
-
-## Troubleshooting
-
-Here are some common issues and their suggested solutions.
-
-### Conda
-
-#### Conda fails before completing `conda update`
-
-The usual source of these errors is a package incompatibility. While we have
-tried to minimize these, over time packages get updated and sometimes introduce
-incompatibilities.
-
-We suggest that you search
-[Issues](https://github.com/invoke-ai/InvokeAI/issues) or the "bugs-and-support"
-channel of the [InvokeAI Discord](https://discord.gg/ZmtBAhwWhy).
-
-You may also try to install the broken packages manually using PIP. To do this,
-activate the `invokeai` environment, and run `pip install` with the name and
-version of the package that is causing the incompatibility. For example:
-
-```bash
-pip install test-tube==0.7.5
-```
-
-You can keep doing this until all requirements are satisfied and the `invoke.py`
-script runs without errors. Please report to
-[Issues](https://github.com/invoke-ai/InvokeAI/issues) what you were able to do
-to work around the problem so that others can benefit from your investigation.
-
-### Create Conda Environment fails on MacOS
-
-If conda create environment fails with lmdb error, this is most likely caused by Clang.
-Run brew config to see which Clang is installed on your Mac. If Clang isn't installed, that's causing the error.
-Start by installing additional XCode command line tools, followed by brew install llvm.
-
-```bash
-xcode-select --install
-brew install llvm
-```
-
-If brew config has Clang installed, update to the latest llvm and try creating the environment again.
-
-#### `configure_invokeai.py` or `invoke.py` crashes at an early stage
-
-This is usually due to an incomplete or corrupted Conda install. Make sure you
-have linked to the correct environment file and run `conda update` again.
-
-If the problem persists, a more extreme measure is to clear Conda's caches and
-remove the `invokeai` environment:
-
-```bash
-conda deactivate
-conda env remove -n invokeai
-conda clean -a
-conda update
-```
-
-This removes all cached library files, including ones that may have been
-corrupted somehow. (This is not supposed to happen, but does anyway).
-
-#### `invoke.py` crashes at a later stage
-
-If the CLI or web site had been working ok, but something unexpected happens
-later on during the session, you've encountered a code bug that is probably
-unrelated to an install issue. Please search
-[Issues](https://github.com/invoke-ai/InvokeAI/issues), file a bug report, or
-ask for help on [Discord](https://discord.gg/ZmtBAhwWhy)
-
-#### My renders are running very slowly
-
-You may have installed the wrong torch (machine learning) package, and the
-system is running on CPU rather than the GPU. To check, look at the log messages
-that appear when `invoke.py` is first starting up. One of the earlier lines
-should say `Using device type cuda`. On AMD systems, it will also say "cuda",
-and on Macintoshes, it should say "mps". If instead the message says it is
-running on "cpu", then you may need to install the correct torch library.
-
-You may be able to fix this by installing a different torch library. Here are
-the magic incantations for Conda and PIP.
-
-!!! todo "For CUDA systems"
-
-    - conda
-
-      ```bash
-      conda install pytorch torchvision torchaudio pytorch-cuda=11.6 -c pytorch -c nvidia
-      ```
-
-    - pip
-
-      ```bash
-      pip3 install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cu116
-      ```
-
-!!! todo "For AMD systems"
-
-    - conda
-
-      ```bash
-      conda activate invokeai
-      pip3 install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/rocm5.2/
-      ```
-
-    - pip
-
-      ```bash
-      pip3 install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/rocm5.2/
-      ```
-
-More information and troubleshooting tips can be found at https://pytorch.org.

docs/installation/index.md

@@ -18,7 +18,9 @@ experience and preferences.
     InvokeAI and its dependencies. We offer two recipes: one suited to
     those who prefer the `conda` tool, and one suited to those who prefer
     `pip` and Python virtual environments. In our hands the pip install
-    is faster and more reliable, but your mileage may vary.
+    is faster and more reliable, but your mileage may vary. 
+    Note that the conda installation method is currently deprecated and 
+    will not be supported at some point in the future.
 
     This method is recommended for users who have previously used `conda`
     or `pip` in the past, developers, and anyone who wishes to remain on

environments-and-requirements/environment-lin-aarch64.yml

@@ -1,45 +0,0 @@
-name: invokeai
-channels:
-  - pytorch
-  - conda-forge
-  - defaults
-dependencies:
-  - albumentations=0.4.3
-  - cudatoolkit
-  - einops=0.3.0
-  - eventlet
-  - flask-socketio=5.3.0
-  - flask=2.1.*
-  - flask_cors=3.0.10
-  - imageio-ffmpeg=0.4.2
-  - imageio=2.9.0
-  - kornia=0.6
-  - numpy=1.19
-  - opencv=4.6.0
-  - pillow=8.*
-  - pip>=22.2.2
-  - pudb=2019.2
-  - python=3.9.*
-  - pytorch
-  - pytorch-lightning=1.7.7
-  - send2trash=1.8.0
-  - streamlit
-  - tokenizers>=0.11.1,!=0.11.3,<0.13
-  - torch-fidelity=0.3.0
-  - torchmetrics=0.7.0
-  - torchvision
-  - transformers=4.21.3
-  - pip:
-      - getpass_asterisk
-      - omegaconf==2.1.1
-      - picklescan
-      - pyreadline3
-      - realesrgan
-      - taming-transformers-rom1504
-      - test-tube>=0.7.5
-      - git+https://github.com/openai/CLIP.git@main#egg=clip
-      - git+https://github.com/Birch-san/k-diffusion.git@mps#egg=k_diffusion
-      - git+https://github.com/invoke-ai/clipseg.git@relaxed-python-requirement#egg=clipseg
-      - git+https://github.com/invoke-ai/GFPGAN@basicsr-1.4.2#egg=gfpgan
-      - git+https://github.com/invoke-ai/PyPatchMatch@0.1.5#egg=pypatchmatch
-      - -e .

environments-and-requirements/environment-lin-amd.yml

@@ -1,47 +0,0 @@
-name: invokeai
-channels:
-  - pytorch
-  - conda-forge
-  - defaults
-dependencies:
-  - python=3.9.*
-  - pip=22.2.2
-  - numpy=1.23.3
-  - pip:
-    - --extra-index-url  https://download.pytorch.org/whl/rocm5.2/
-    - albumentations==0.4.3
-    - diffusers==0.6.0
-    - einops==0.3.0
-    - eventlet
-    - flask==2.1.3
-    - flask_cors==3.0.10
-    - flask_socketio==5.3.0
-    - getpass_asterisk
-    - imageio-ffmpeg==0.4.2
-    - imageio==2.9.0
-    - kornia==0.6.0
-    - omegaconf==2.2.3
-    - opencv-python==4.5.5.64
-    - picklescan
-    - pillow==9.2.0
-    - pudb==2019.2
-    - pyreadline3
-    - pytorch-lightning==1.7.7
-    - realesrgan
-    - send2trash==1.8.0
-    - streamlit==1.12.0
-    - taming-transformers-rom1504
-    - test-tube>=0.7.5
-    - tqdm
-    - torch
-    - torch-fidelity==0.3.0
-    - torchaudio
-    - torchmetrics==0.7.0
-    - torchvision
-    - transformers==4.21.3
-    - git+https://github.com/openai/CLIP.git@main#egg=clip
-    - git+https://github.com/Birch-san/k-diffusion.git@mps#egg=k-diffusion
-    - git+https://github.com/invoke-ai/clipseg.git@relaxed-python-requirement#egg=clipseg
-    - git+https://github.com/invoke-ai/GFPGAN@basicsr-1.4.2#egg=gfpgan
-    - git+https://github.com/invoke-ai/PyPatchMatch@0.1.5#egg=pypatchmatch
-    - -e .

environments-and-requirements/environment-lin-cuda.yml

@@ -1,46 +0,0 @@
-name: invokeai
-channels:
-  - pytorch
-  - conda-forge
-  - defaults
-dependencies:
-  - python=3.9.*
-  - pip=22.2.2
-  - numpy=1.23.3
-  - torchvision=0.13.1
-  - torchaudio=0.12.1
-  - pytorch=1.12.1
-  - cudatoolkit=11.6
-  - pip:
-    - albumentations==0.4.3
-    - diffusers==0.6.0
-    - einops==0.3.0
-    - eventlet
-    - flask==2.1.3
-    - flask_cors==3.0.10
-    - flask_socketio==5.3.0
-    - getpass_asterisk
-    - imageio-ffmpeg==0.4.2
-    - imageio==2.9.0
-    - kornia==0.6.0
-    - omegaconf==2.2.3
-    - opencv-python==4.5.5.64
-    - picklescan
-    - pillow==9.2.0
-    - pudb==2019.2
-    - pyreadline3
-    - pytorch-lightning==1.7.7
-    - realesrgan
-    - send2trash==1.8.0
-    - streamlit==1.12.0
-    - taming-transformers-rom1504
-    - test-tube>=0.7.5
-    - torch-fidelity==0.3.0
-    - torchmetrics==0.7.0
-    - transformers==4.21.3
-    - git+https://github.com/openai/CLIP.git@main#egg=clip
-    - git+https://github.com/Birch-san/k-diffusion.git@mps#egg=k-diffusion
-    - git+https://github.com/invoke-ai/clipseg.git@relaxed-python-requirement#egg=clipseg
-    - git+https://github.com/invoke-ai/GFPGAN@basicsr-1.4.2#egg=gfpgan
-    - git+https://github.com/invoke-ai/PyPatchMatch@0.1.5#egg=pypatchmatch
-    - -e .

environments-and-requirements/environment-mac.yml

@@ -1,65 +0,0 @@
-name: invokeai
-channels:
-  - pytorch
-  - conda-forge
-  - defaults
-dependencies:
-  - python=3.10
-  - pip>=22.2
-  - pytorch=1.12
-  - pytorch-lightning=1.7
-  - torchvision=0.13
-  - torchmetrics=0.10
-  - torch-fidelity=0.3
-
-  # I suggest to keep the other deps sorted for convenience.
-  # To determine what the latest versions should be, run:
-  #
-  # ```shell
-  # sed -E 's/invokeai/invokeai-updated/;20,99s/- ([^=]+)==.+/- \1/' environment-mac.yml > environment-mac-updated.yml
-  # CONDA_SUBDIR=osx-arm64 conda env create -f environment-mac-updated.yml && conda list -n invokeai-updated | awk ' {print "  - " $1 "==" $2;} '
-  # ```
-
-  - albumentations=1.2
-  - coloredlogs=15.0
-  - diffusers=0.6
-  - einops=0.3
-  - eventlet
-  - grpcio=1.46
-  - flask=2.1
-  - flask-socketio=5.3
-  - flask-cors=3.0
-  - humanfriendly=10.0
-  - imageio=2.21
-  - imageio-ffmpeg=0.4
-  - imgaug=0.4
-  - kornia=0.6
-  - mpmath=1.2
-  - nomkl=3
-  - numpy=1.23
-  - omegaconf=2.1
-  - openh264=2.3
-  - onnx=1.12
-  - onnxruntime=1.12
-  - pudb=2019.2
-  - protobuf=3.20
-  - py-opencv=4.6
-  - scipy=1.9
-  - streamlit=1.12
-  - sympy=1.10
-  - send2trash=1.8
-  - tensorboard=2.10
-  - transformers=4.23
-  - pip:
-      - getpass_asterisk
-      - picklescan
-      - taming-transformers-rom1504
-      - test-tube==0.7.5
-      - git+https://github.com/openai/CLIP.git@main#egg=clip
-      - git+https://github.com/Birch-san/k-diffusion.git@mps#egg=k-diffusion
-      - git+https://github.com/invoke-ai/clipseg.git@relaxed-python-requirement#egg=clipseg
-      - git+https://github.com/invoke-ai/GFPGAN@basicsr-1.4.2#egg=gfpgan
-      - git+https://github.com/invoke-ai/PyPatchMatch@0.1.5#egg=pypatchmatch
-      - -e .
-variables:
-  PYTORCH_ENABLE_MPS_FALLBACK: 1

environments-and-requirements/environment-win-cuda.yml

@@ -1,46 +0,0 @@
-name: invokeai
-channels:
-  - pytorch
-  - conda-forge
-  - defaults
-dependencies:
-  - python=3.10.*
-  - pip=22.2.2
-  - numpy=1.23.3
-  - torchvision=0.13.1
-  - torchaudio=0.12.1
-  - pytorch=1.12.1
-  - cudatoolkit=11.6
-  - pip:
-    - albumentations==0.4.3
-    - diffusers==0.6.0
-    - einops==0.3.0
-    - eventlet
-    - flask==2.1.3
-    - flask_cors==3.0.10
-    - flask_socketio==5.3.0
-    - getpass_asterisk
-    - imageio-ffmpeg==0.4.2
-    - imageio==2.9.0
-    - kornia==0.6.0
-    - omegaconf==2.2.3
-    - opencv-python==4.5.5.64
-    - picklescan
-    - pillow==9.2.0
-    - pudb==2019.2
-    - pyreadline3
-    - pytorch-lightning==1.7.7
-    - realesrgan
-    - send2trash==1.8.0
-    - streamlit==1.12.0
-    - taming-transformers-rom1504
-    - test-tube>=0.7.5
-    - torch-fidelity==0.3.0
-    - torchmetrics==0.7.0
-    - transformers==4.21.3
-    - git+https://github.com/openai/CLIP.git@main#egg=clip
-    - git+https://github.com/Birch-san/k-diffusion.git@mps#egg=k_diffusion
-    - git+https://github.com/invoke-ai/clipseg.git@relaxed-python-requirement#egg=clipseg
-    - git+https://github.com/invoke-ai/GFPGAN@basicsr-1.4.1#egg=gfpgan
-    - git+https://github.com/invoke-ai/PyPatchMatch@0.1.5#egg=pypatchmatch
-    - -e .

environments-and-requirements/requirements-base.txt

@@ -1,39 +0,0 @@
-# pip will resolve the version which matches torch
-albumentations
-diffusers==0.10.*
-einops
-eventlet
-facexlib
-flask==2.1.3
-flask_cors==3.0.10
-flask_socketio==5.3.0
-flaskwebgui==1.0.3
-getpass_asterisk
-gfpgan==1.3.8
-huggingface-hub
-imageio
-imageio-ffmpeg
-kornia
-numpy
-omegaconf
-opencv-python
-picklescan
-pillow
-pip>=22
-pudb
-pyreadline3
-pytorch-lightning==1.7.7
-realesrgan
-requests==2.25.1
-scikit-image>=0.19
-send2trash
-streamlit
-taming-transformers-rom1504
-test-tube>=0.7.5
-torch-fidelity
-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/openai/CLIP/archive/eaa22acb90a5876642d0507623e859909230a52d.zip#egg=clip
-https://github.com/invoke-ai/clipseg/archive/relaxed-python-requirement.zip#egg=clipseg

environments-and-requirements/requirements-lin-amd.txt

@@ -1,6 +0,0 @@
--r environments-and-requirements/requirements-base.txt
-# Get hardware-appropriate torch/torchvision
---extra-index-url https://download.pytorch.org/whl/rocm5.1.1 --trusted-host https://download.pytorch.org
-torch
-torchvision
--e .

environments-and-requirements/requirements-lin-arm64.txt

@@ -1,3 +0,0 @@
---pre torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/nightly/cpu
--r environments-and-requirements/requirements-base.txt
--e .

environments-and-requirements/requirements-lin-cuda.txt

@@ -1,5 +0,0 @@
---extra-index-url https://download.pytorch.org/whl/cu116 --trusted-host https://download.pytorch.org
--r environments-and-requirements/requirements-base.txt
-torch
-torchvision
--e .

environments-and-requirements/requirements-mac-mps-cpu.txt

@@ -1,6 +0,0 @@
--r environments-and-requirements/requirements-base.txt
-grpcio<1.51.0
-protobuf==3.19.6
-torch<1.13.0
-torchvision<0.14.0
--e .

environments-and-requirements/requirements-win-colab-cuda.txt

@@ -1,6 +0,0 @@
--r environments-and-requirements/requirements-base.txt
-# Get hardware-appropriate torch/torchvision
---extra-index-url https://download.pytorch.org/whl/cu116 --trusted-host https://download.pytorch.org
-torch==1.12.1
-torchvision==0.13.1
--e .

frontend/dist/locales/common/en-US.json

@@ -1,3 +0,0 @@
-{
-  "hotkeysLabel": "Hotkeys"
-}

frontend/dist/locales/hotkeys/fr.json

@@ -1 +0,0 @@
-{}

frontend/dist/locales/options/en-US.json

@@ -1 +0,0 @@
-{}

frontend/dist/locales/options/fr.json

@@ -1 +0,0 @@
-{}

frontend/dist/locales/settings/en-US.json

@@ -1 +0,0 @@
-{}

frontend/dist/locales/settings/fr.json

@@ -1 +0,0 @@
-{}

frontend/dist/locales/toast/en-US.json

@@ -1 +0,0 @@
-{}

frontend/dist/locales/toast/fr.json

@@ -1 +0,0 @@
-{}

frontend/dist/locales/unifiedcanvas/en-US.json

@@ -1 +0,0 @@
-{}

frontend/dist/locales/unifiedcanvas/fr.json

@@ -1 +0,0 @@
-{}

frontend/public/locales/common/en-US.json

@@ -1,3 +0,0 @@
-{
-  "hotkeysLabel": "Hotkeys"
-}

frontend/public/locales/common/fr.json

@@ -1 +0,0 @@
-{}

frontend/public/locales/gallery/en-US.json

@@ -1 +0,0 @@
-{}

frontend/public/locales/gallery/fr.json

@@ -1 +0,0 @@
-{}

frontend/public/locales/hotkeys/en-US.json

@@ -1 +0,0 @@
-{}

frontend/public/locales/hotkeys/fr.json

@@ -1 +0,0 @@
-{}

frontend/public/locales/options/en-US.json

@@ -1 +0,0 @@
-{}

frontend/public/locales/options/fr.json

@@ -1 +0,0 @@
-{}

frontend/public/locales/settings/en-US.json

@@ -1 +0,0 @@
-{}

frontend/public/locales/settings/fr.json

@@ -1 +0,0 @@
-{}

frontend/public/locales/toast/en-US.json

@@ -1 +0,0 @@
-{}

frontend/public/locales/toast/fr.json

@@ -1 +0,0 @@
-{}

frontend/public/locales/unifiedcanvas/en-US.json

@@ -1 +0,0 @@
-{}

frontend/public/locales/unifiedcanvas/fr.json

@@ -1 +0,0 @@
-{}

frontend/src/app/features.ts

@@ -1,80 +0,0 @@
-type FeatureHelpInfo = {
-  text: string;
-  href: string;
-  guideImage: string;
-};
-
-export enum Feature {
-  PROMPT,
-  GALLERY,
-  OTHER,
-  SEED,
-  VARIATIONS,
-  UPSCALE,
-  FACE_CORRECTION,
-  IMAGE_TO_IMAGE,
-  BOUNDING_BOX,
-  SEAM_CORRECTION,
-  INFILL_AND_SCALING,
-}
-/** For each tooltip in the UI, the below feature definitions & props will pull relevant information into the tooltip.
- *
- * To-do: href & GuideImages are placeholders, and are not currently utilized, but will be updated (along with the tooltip UI) as feature and UI develop and we get a better idea on where things "forever homes" will be .
- */
-export const FEATURES: Record<Feature, FeatureHelpInfo> = {
-  [Feature.PROMPT]: {
-    text: 'This field will take all prompt text, including both content and stylistic terms. While weights can be included in the prompt, standard CLI Commands/parameters will not work.',
-    href: 'link/to/docs/feature3.html',
-    guideImage: 'asset/path.gif',
-  },
-  [Feature.GALLERY]: {
-    text: 'As new invocations are generated, files from the output directory will be displayed here. Generations have additional options to configure new generations.',
-    href: 'link/to/docs/feature3.html',
-    guideImage: 'asset/path.gif',
-  },
-  [Feature.OTHER]: {
-    text: 'These options will enable alternative processing modes for Invoke. Seamless tiling will work to generate repeating patterns in the output. High Resolution Optimization performs a two-step generation cycle, and should be used at higher resolutions when you desire a more coherent image/composition. ',
-    href: 'link/to/docs/feature3.html',
-    guideImage: 'asset/path.gif',
-  },
-  [Feature.SEED]: {
-    text: 'Seed values provide an initial set of noise which guide the denoising process, and can be randomized or populated with a seed from a previous invocation. The Threshold feature can be used to mitigate undesirable outcomes at higher CFG values (try between 0-10), and Perlin can be used to add Perlin noise into the denoising process - Both serve to add variation to your outputs. ',
-    href: 'link/to/docs/feature3.html',
-    guideImage: 'asset/path.gif',
-  },
-  [Feature.VARIATIONS]: {
-    text: 'Try a variation with an amount of between 0 and 1 to change the output image for the set seed - Interesting variations on the seed are found between 0.1 and 0.3.',
-    href: 'link/to/docs/feature3.html',
-    guideImage: 'asset/path.gif',
-  },
-  [Feature.UPSCALE]: {
-    text: 'Using ESRGAN you can increase the output resolution without requiring a higher width/height in the initial generation.',
-    href: 'link/to/docs/feature1.html',
-    guideImage: 'asset/path.gif',
-  },
-  [Feature.FACE_CORRECTION]: {
-    text: 'Using GFPGAN or Codeformer, Face Correction will attempt to identify faces in outputs, and correct any defects/abnormalities. Higher strength values will apply a stronger corrective pressure on outputs, resulting in more appealing faces. With Codeformer, a higher fidelity will attempt to preserve the original image, at the expense of face correction strength.',
-    href: 'link/to/docs/feature3.html',
-    guideImage: 'asset/path.gif',
-  },
-  [Feature.IMAGE_TO_IMAGE]: {
-    text: 'Image to Image allows the upload of an initial image, which InvokeAI will use to guide the generation process, along with a prompt. A lower value for this setting will more closely resemble the original image. Values between 0-1 are accepted, and a range of .25-.75 is recommended ',
-    href: 'link/to/docs/feature3.html',
-    guideImage: 'asset/path.gif',
-  },
-  [Feature.BOUNDING_BOX]: {
-    text: 'The bounding box is analogous to the Width and Height settings for Text to Image or Image to Image. Only the area in the box will be processed.',
-    href: 'link/to/docs/feature3.html',
-    guideImage: 'asset/path.gif',
-  },
-  [Feature.SEAM_CORRECTION]: {
-    text: 'Control the handling of visible seams which may occur when a generated image is pasted back onto the canvas.',
-    href: 'link/to/docs/feature3.html',
-    guideImage: 'asset/path.gif',
-  },
-  [Feature.INFILL_AND_SCALING]: {
-    text: 'Manage infill methods (used on masked or erased areas of the canvas) and scaling (useful for small bounding box sizes).',
-    href: 'link/to/docs/feature3.html',
-    guideImage: 'asset/path.gif',
-  },
-};

frontend/src/features/options/components/AdvancedOptions/Canvas/InpaintReplace.tsx

@@ -1,66 +0,0 @@
-import React, { ChangeEvent } from 'react';
-import { useAppDispatch, useAppSelector } from '../../../../../app/storeHooks';
-import _ from 'lodash';
-import { createSelector } from '@reduxjs/toolkit';
-import IAISwitch from '../../../../../common/components/IAISwitch';
-import IAISlider from '../../../../../common/components/IAISlider';
-import { Flex } from '@chakra-ui/react';
-import {
-  setInpaintReplace,
-  setShouldUseInpaintReplace,
-} from 'features/canvas/store/canvasSlice';
-import { canvasSelector } from 'features/canvas/store/canvasSelectors';
-import { useTranslation } from 'react-i18next';
-
-const selector = createSelector(
-  canvasSelector,
-  (canvas) => {
-    const { inpaintReplace, shouldUseInpaintReplace } = canvas;
-    return {
-      inpaintReplace,
-      shouldUseInpaintReplace,
-    };
-  },
-  {
-    memoizeOptions: {
-      resultEqualityCheck: _.isEqual,
-    },
-  }
-);
-
-export default function InpaintReplace() {
-  const { inpaintReplace, shouldUseInpaintReplace } = useAppSelector(selector);
-
-  const dispatch = useAppDispatch();
-
-  const { t } = useTranslation();
-
-  return (
-    <Flex alignItems={'center'} columnGap={'1rem'}>
-      <IAISlider
-        label={t('options:inpaintReplace')}
-        value={inpaintReplace}
-        onChange={(v: number) => {
-          dispatch(setInpaintReplace(v));
-        }}
-        min={0}
-        max={1.0}
-        step={0.05}
-        isInteger={false}
-        isSliderDisabled={!shouldUseInpaintReplace}
-        withSliderMarks
-        sliderMarkRightOffset={-2}
-        withReset
-        handleReset={() => dispatch(setInpaintReplace(1))}
-        isResetDisabled={!shouldUseInpaintReplace}
-      />
-      <IAISwitch
-        isChecked={shouldUseInpaintReplace}
-        onChange={(e: ChangeEvent<HTMLInputElement>) =>
-          dispatch(setShouldUseInpaintReplace(e.target.checked))
-        }
-        marginTop="1.25rem"
-      />
-    </Flex>
-  );
-}

frontend/src/features/options/components/AdvancedOptions/Canvas/SeamCorrectionOptions.tsx

@@ -1,113 +0,0 @@
-import { Flex } from '@chakra-ui/react';
-import { createSelector } from '@reduxjs/toolkit';
-import { useAppDispatch, useAppSelector } from 'app/storeHooks';
-import IAISlider from 'common/components/IAISlider';
-import { optionsSelector } from 'features/options/store/optionsSelectors';
-import {
-  setSeamBlur,
-  setSeamSize,
-  setSeamSteps,
-  setSeamStrength,
-} from 'features/options/store/optionsSlice';
-import _ from 'lodash';
-import { useTranslation } from 'react-i18next';
-
-const selector = createSelector(
-  [optionsSelector],
-  (options) => {
-    const { seamSize, seamBlur, seamStrength, seamSteps } = options;
-
-    return {
-      seamSize,
-      seamBlur,
-      seamStrength,
-      seamSteps,
-    };
-  },
-  {
-    memoizeOptions: {
-      resultEqualityCheck: _.isEqual,
-    },
-  }
-);
-
-const SeamCorrectionOptions = () => {
-  const dispatch = useAppDispatch();
-  const { seamSize, seamBlur, seamStrength, seamSteps } =
-    useAppSelector(selector);
-
-  const { t } = useTranslation();
-
-  return (
-    <Flex direction="column" gap="1rem">
-      <IAISlider
-        sliderMarkRightOffset={-6}
-        label={t('options:seamSize')}
-        min={1}
-        max={256}
-        sliderNumberInputProps={{ max: 512 }}
-        value={seamSize}
-        onChange={(v) => {
-          dispatch(setSeamSize(v));
-        }}
-        handleReset={() => dispatch(setSeamSize(96))}
-        withInput
-        withSliderMarks
-        withReset
-      />
-      <IAISlider
-        sliderMarkRightOffset={-4}
-        label={t('options:seamBlur')}
-        min={0}
-        max={64}
-        sliderNumberInputProps={{ max: 512 }}
-        value={seamBlur}
-        onChange={(v) => {
-          dispatch(setSeamBlur(v));
-        }}
-        handleReset={() => {
-          dispatch(setSeamBlur(16));
-        }}
-        withInput
-        withSliderMarks
-        withReset
-      />
-      <IAISlider
-        sliderMarkRightOffset={-7}
-        label={t('options:seamStrength')}
-        min={0.01}
-        max={0.99}
-        step={0.01}
-        value={seamStrength}
-        onChange={(v) => {
-          dispatch(setSeamStrength(v));
-        }}
-        handleReset={() => {
-          dispatch(setSeamStrength(0.7));
-        }}
-        withInput
-        withSliderMarks
-        withReset
-      />
-      <IAISlider
-        sliderMarkRightOffset={-4}
-        label={t('options:seamSteps')}
-        min={1}
-        max={32}
-        sliderNumberInputProps={{ max: 100 }}
-        value={seamSteps}
-        onChange={(v) => {
-          dispatch(setSeamSteps(v));
-        }}
-        handleReset={() => {
-          dispatch(setSeamSteps(10));
-        }}
-        withInput
-        withSliderMarks
-        withReset
-      />
-    </Flex>
-  );
-};
-
-export default SeamCorrectionOptions;

frontend/src/features/system/components/SettingsModal/ModelList.scss

@@ -1,93 +0,0 @@
-// .chakra-accordion {
-//   display: grid;
-//   row-gap: 0.5rem;
-// }
-
-// .chakra-accordion__item {
-//   border: none;
-// }
-
-// button {
-//   border-radius: 0.3rem;
-
-//   &[aria-expanded='true'] {
-//     // background-color: var(--tab-hover-color);
-//     border-radius: 0.3rem;
-//   }
-// }
-
-.model-list-accordion {
-  outline: none;
-  padding: 0.25rem;
-
-  button {
-    padding: 0;
-    margin: 0;
-    &:hover {
-      background-color: unset;
-    }
-  }
-
-  div {
-    border: none;
-  }
-
-  .model-list-button {
-    display: flex;
-    flex-direction: row;
-    row-gap: 0.5rem;
-    justify-content: space-between;
-    align-items: center;
-    width: 100%;
-  }
-
-  .model-list-header-hint {
-    color: var(--text-color-secondary);
-    font-weight: normal;
-  }
-
-  .model-list-list {
-    display: flex;
-    flex-direction: column;
-    row-gap: 0.5rem;
-
-    .model-list-item {
-      display: flex;
-      column-gap: 0.5rem;
-      width: 100%;
-      justify-content: space-between;
-      align-items: center;
-
-      .model-list-item-name {
-      }
-      .model-list-item-description {
-        font-size: 0.9rem;
-      }
-      .model-list-item-status {
-        &.active {
-          color: var(--status-good-color);
-        }
-
-        &.cached {
-          color: var(--status-working-color);
-        }
-
-        &.not-loaded {
-          color: var(--text-color-secondary);
-        }
-      }
-      .model-list-item-load-btn {
-        button {
-          padding: 0.5rem;
-          background-color: var(--btn-base-color);
-          color: var(--text-color);
-          border-radius: 0.2rem;
-
-          &:hover {
-            background-color: var(--btn-base-color-hover);
-          }
-        }
-      }
-    }
-  }
-}

frontend/src/features/system/components/SettingsModal/ModelList.tsx

@@ -1,117 +0,0 @@
-import {
-  Button,
-  Tooltip,
-  Spacer,
-  Accordion,
-  AccordionItem,
-  AccordionButton,
-  AccordionPanel,
-  AccordionIcon,
-  Text,
-} from '@chakra-ui/react';
-import { createSelector } from '@reduxjs/toolkit';
-import _ from 'lodash';
-import { ModelStatus } from 'app/invokeai';
-import { requestModelChange } from 'app/socketio/actions';
-import { RootState } from 'app/store';
-import { useAppDispatch, useAppSelector } from 'app/storeHooks';
-import { SystemState } from 'features/system/store/systemSlice';
-import { useTranslation } from 'react-i18next';
-
-type ModelListItemProps = {
-  name: string;
-  status: ModelStatus;
-  description: string;
-};
-
-const ModelListItem = (props: ModelListItemProps) => {
-  const { isProcessing, isConnected } = useAppSelector(
-    (state: RootState) => state.system
-  );
-
-  const dispatch = useAppDispatch();
-  const { name, status, description } = props;
-  const handleChangeModel = () => {
-    dispatch(requestModelChange(name));
-  };
-  const { t } = useTranslation();
-  return (
-    <div className="model-list-item">
-      <Tooltip label={description} hasArrow placement="bottom">
-        <div className="model-list-item-name">{name}</div>
-      </Tooltip>
-      <Spacer />
-      <div className={`model-list-item-status ${status.split(' ').join('-')}`}>
-        {status}
-      </div>
-      <div className="model-list-item-load-btn">
-        <Button
-          size={'sm'}
-          onClick={handleChangeModel}
-          isDisabled={status === 'active' || isProcessing || !isConnected}
-        >
-          {t('common:load')}
-        </Button>
-      </div>
-    </div>
-  );
-};
-
-const modelListSelector = createSelector(
-  (state: RootState) => state.system,
-  (system: SystemState) => {
-    const models = _.map(system.model_list, (model, key) => {
-      return { name: key, ...model };
-    });
-
-    const activeModel = models.find((model) => model.status === 'active');
-
-    return {
-      models,
-      activeModel: activeModel,
-    };
-  }
-);
-
-const ModelList = () => {
-  const { models } = useAppSelector(modelListSelector);
-  const { t } = useTranslation();
-
-  return (
-    <Accordion
-      allowToggle
-      className="model-list-accordion"
-      variant={'unstyled'}
-    >
-      <AccordionItem>
-        <AccordionButton>
-          <div className="model-list-button">
-            <Text
-              fontSize="sm"
-              fontWeight="bold"
-              color="var(--text-color-secondary)"
-            >
-              {t('settings:models')}
-            </Text>
-            <AccordionIcon />
-          </div>
-        </AccordionButton>
-
-        <AccordionPanel>
-          <div className="model-list-list">
-            {models.map((model, i) => (
-              <ModelListItem
-                key={i}
-                name={model.name}
-                status={model.status}
-                description={model.description}
-              />
-            ))}
-          </div>
-        </AccordionPanel>
-      </AccordionItem>
-    </Accordion>
-  );
-};
-
-export default ModelList;

frontend/src/styles/_Misc.scss

@@ -1,16 +0,0 @@
-// .checkerboard {
-//   background-position: 0px 0px, 10px 10px;
-//   // background-size: 20px 20px;
-//   // background-image: linear-gradient(
-//   //     45deg,
-//   //     #eee 25%,
-//   //     transparent 25%,
-//   //     transparent 75%,
-//   //     #eee 75%,
-//   //     #eee 100%
-//   //   ),
-//   //   linear-gradient(45deg, #eee 25%, white 25%, white 75%, #eee 75%, #eee 100%);
-//   background: radial-gradient(var(--checkboard-dots-color) 3px, transparent 1px),
-//     var(--background-color-secondary);
-//   background-size: 64px 64px;
-// }

installer/create_installer.sh

@@ -1,49 +1,90 @@
 #!/bin/bash
 
+set -e
+
 cd "$(dirname "$0")"
 
-VERSION=$(grep ^VERSION ../setup.py | awk '{ print $3 }' | sed "s/'//g" )
-VERSION="$VERSION-p5"
+if [[ -v "VIRTUAL_ENV" ]]; then
+    # we can't just call 'deactivate' because this function is not exported
+    # to the environment of this script from the bash process that runs the script
+    echo "A virtual environment is activated. Please deactivate it before proceeding".
+    exit -1
+fi
 
+VERSION=$(cd ..; python -c "from ldm.invoke import __version__ as version; print(version)")
+PATCH=""
+VERSION="v${VERSION}${PATCH}"
+
+echo Building installer for version $VERSION
 echo "Be certain that you're in the 'installer' directory before continuing."
 read -p "Press any key to continue, or CTRL-C to exit..."
 
-echo Building installer zip fles for InvokeAI v$VERSION
+read -e -p "Commit and tag this repo with ${VERSION} and 'v2.3-latest'? [n]: " input
+RESPONSE=${input:='n'}
+if [ "$RESPONSE" == 'y' ]; then
+    git commit -a
+
+    if ! git tag $VERSION ; then
+	    echo "Existing/invalid tag"
+	    exit -1
+    fi
+    git push origin :refs/tags/v2.3-latest
+    git tag -fa latest
+fi
+
+# ----------------------
+
+echo Building the wheel
+
+# install the 'build' package in the user site packages, if needed
+# could be improved by using a temporary venv, but it's tiny and harmless
+if [[ $(python -c 'from importlib.util import find_spec; print(find_spec("build") is None)') == "True" ]]; then
+    pip install --user build
+fi
+
+python -m build --wheel --outdir dist/ ../.
+
+# ----------------------
+
+echo Building installer zip fles for InvokeAI $VERSION
 
 # get rid of any old ones
-rm *.zip
-
+rm -f *.zip
 rm -rf InvokeAI-Installer
+
+# copy content
 mkdir InvokeAI-Installer
+for f in templates *.py *.txt *.reg; do
+    cp -r ${f} InvokeAI-Installer/
+done
 
-cp -pr ../environments-and-requirements templates readme.txt InvokeAI-Installer/
-mkdir InvokeAI-Installer/templates/rootdir
-
-cp -pr ../configs InvokeAI-Installer/templates/rootdir/
-
-mkdir InvokeAI-Installer/templates/rootdir/{outputs,embeddings,models}
+# Move the wheel
+mv dist/*.whl InvokeAI-Installer/
 
+# Install scripts
+# Mac/Linux
 cp install.sh.in InvokeAI-Installer/install.sh
-chmod a+rx InvokeAI-Installer/install.sh
+chmod a+x InvokeAI-Installer/install.sh
 
-zip -r InvokeAI-installer-$VERSION-linux.zip InvokeAI-Installer
-zip -r InvokeAI-installer-$VERSION-mac.zip InvokeAI-Installer
-
-# now do the windows installer
-rm InvokeAI-Installer/install.sh
-cp install.bat.in InvokeAI-Installer/install.bat
+# Windows
+perl -p -e "s/^set INVOKEAI_VERSION=.*/set INVOKEAI_VERSION=$VERSION/" install.bat.in > InvokeAI-Installer/install.bat
 cp WinLongPathsEnabled.reg InvokeAI-Installer/
 
-# this gets rid of the "-e ." at the end of the windows requirements file
-# because it is easier to do it now than in the .bat install script
-egrep -v '^-e .' InvokeAI-Installer/environments-and-requirements/requirements-win-colab-cuda.txt > InvokeAI-Installer/requirements.txt
-cp InvokeAI-Installer/requirements.txt InvokeAI-Installer/environments-and-requirements/requirements-win-colab-cuda.txt
-zip -r InvokeAI-installer-$VERSION-windows.zip InvokeAI-Installer
+# Zip everything up
+zip -r InvokeAI-installer-$VERSION.zip InvokeAI-Installer
+
+# Updater
+mkdir tmp
+cp templates/update.sh.in tmp/update.sh
+cp templates/update.bat.in tmp/update.bat
+chmod +x tmp/update.sh
+chmod +x tmp/update.bat
+cd tmp
+zip InvokeAI-updater-$VERSION.zip update.sh update.bat
+cd ..
+mv tmp/InvokeAI-updater-$VERSION.zip .
 
 # clean up
-rm -rf InvokeAI-Installer
-
+rm -rf InvokeAI-Installer tmp dist
 
 exit 0
-
-

installer/install.bat.in

@@ -13,9 +13,9 @@ if "%1" == "use-cache" (
 )
 
 @rem Config
-@rem this should be changed to the tagged release!
-@rem set INVOKE_AI_SRC=https://github.com/invoke-ai/InvokeAI/archive/main.zip
-set INVOKE_AI_SRC=https://github.com/invoke-ai/InvokeAI/archive/refs/tags/v2.2.4.zip
+@rem The version in the next line is replaced by an up to date release number
+@rem when create_installer.sh is run. Change the release number there.
+set INVOKEAI_VERSION=latest
 set INSTRUCTIONS=https://invoke-ai.github.io/InvokeAI/installation/INSTALL_AUTOMATED/
 set TROUBLESHOOTING=https://invoke-ai.github.io/InvokeAI/installation/INSTALL_AUTOMATED/#troubleshooting
 set PYTHON_URL=https://www.python.org/downloads/windows/
@@ -28,15 +28,16 @@ set err_msg=An error has occurred and the script could not continue.
 echo This script will install InvokeAI and its dependencies.
 echo.
 echo BEFORE YOU START PLEASE MAKE SURE TO DO THE FOLLOWING
-echo 1. Install python 3.9 or higher.
+echo 1. Install python 3.9 or 3.10. Python version 3.11 and above are
+echo    not supported at the moment.
 echo 2. Double-click on the file WinLongPathsEnabled.reg in order to
 echo    enable long path support on your system.
 echo 3. Install the Visual C++ core libraries.
-echo    Pleaase download and install the libraries from:
+echo    Please download and install the libraries from:
 echo    https://learn.microsoft.com/en-US/cpp/windows/latest-supported-vc-redist?view=msvc-170
 echo.
 echo See %INSTRUCTIONS% for more details.
-echo. 
+echo.
 pause
 
 @rem ---------------------------- check Python version ---------------
@@ -44,7 +45,7 @@ echo ***** Checking and Updating Python *****
 
 call python --version >.tmp1 2>.tmp2
 if %errorlevel% == 1 (
-   set err_msg=Please install Python 3.9 or higher. See %INSTRUCTIONS% for details.
+   set err_msg=Please install Python 3.10. See %INSTRUCTIONS% for details.
    goto err_exit
 )
 
@@ -63,107 +64,10 @@ if %errorlevel% == 1 (
 @rem Cleanup
 del /q .tmp1 .tmp2
 
-@rem --------------------- Get the requirements file ------------
-echo.
-echo Setting up requirements file for your system.
-copy /y environments-and-requirements\requirements-win-colab-cuda.txt .\requirements.txt
+@rem -------------- Install and Configure ---------------
 
-@rem --------------------- Get the root directory for installation ------------
-set "rootdir="
-set "response="
-set "selection="
-:pick_rootdir
-	if defined rootdir goto :done
-	set /p selection=Select the path to install InvokeAI's directory into [%UserProfile%]: 
-	if not defined selection set selection=%UserProfile%
-	set selection=%selection:"=%
-	set dest="%selection%\invokeai"
-	if exist %dest% (
-	   set response=y
-	   set /p response=The directory %dest% exists. Do you wish to resume install from a previous attempt? [Y/n]: 
-	   if !response! == "" set response=y
-	   if /I !response! == y (set rootdir=%dest%) else (goto :pick_rootdir)
-	) else (
-	   set rootdir=!dest!
-	)
-	set response=y
-	set /p response="You have chosen to install InvokeAI into %rootdir%. OK? [Y/n]: "
-	if !response! == "" set response=y
-	if /I !response! neq y set "rootdir="
-goto :pick_rootdir
-:done
+call python main.py
 
-set rootdir=%rootdir:"=%
-
-@rem ---------------------- Initialize the runtime directory ---------------------
-echo.
-echo *** Creating Runtime Directory %rootdir% ***
-if not exist "%rootdir%" mkdir "%rootdir%"
-@rem for unknown reasons the mkdir works but returns an error code
-if not exist "%rootdir%" (
-	set err_msg=Could not create the directory %rootdir%. Please check the directory's permissions and try again.
-	goto :err_exit
-)
-echo Successful.
-
-@rem --------------------------- Create and populate .venv ---------------------------
-echo.
-echo ** Creating Virtual Environment for InvokeAI **
-call python -mvenv "%rootdir%\.venv"
-if %errorlevel% neq 0 (
-   set err_msg=Could not create virtual environment %rootdir%\.venv. Please check the directory's permissions and try again.
-   goto :err_exit
-)
-echo Successful.
-
-echo.
-echo *** Installing InvokeAI Requirements ***
-echo Activating environment
-call "%rootdir%\.venv\Scripts\activate.bat"
-
-set PYTHON=%rootdir%\.venv\Scripts\python
-echo updating pip with "%PYTHON%"
-call "%PYTHON%" -mensurepip --upgrade
-call "%PYTHON%" -mpip install --prefer-binary -r requirements.txt
-if %errorlevel% neq 0 (
-   set err_msg=Requirements installation failed. See above for errors and check %TROUBLESHOOTING% for potential solutions.
-   goto :err_exit
-)
-echo Installation successful.
-
-echo.
-echo *** Installing InvokeAI Modules and Executables ***
-call "%PYTHON%" -mpip install %INVOKE_AI_SRC%
-if %errorlevel% neq 0 (
-   set err_msg=Installation of InvokeAI failed. See above for errors and check %TROUBLESHOOTING% for potential solutions.
-   goto :err_exit
-)
-echo Installation successful.
-
-@rem --------------------------- Set up the root directory ---------------------------
-xcopy /E /Y .\templates\rootdir "%rootdir%"
-PUSHD "%rootdir%"
-call "%PYTHON%" .venv\Scripts\configure_invokeai.py "--root=%rootdir%"
-if %errorlevel% neq 0 (
-   set err_msg=Configuration failed. See above for error messages and check %TROUBLESHOOTING% for potential solutions.
-   goto :err_exit
-)
-POPD
-copy .\templates\invoke.bat.in "%rootdir%\invoke.bat"
-copy .\templates\update.bat.in "%rootdir%\update.bat"
-
-@rem so that update.bat works
-mkdir "%rootdir%\environments-and-requirements"
-xcopy /I /Y .\environments-and-requirements "%rootdir%\environments-and-requirements"
-copy .\requirements.txt "%rootdir%\requirements.txt"
-
-
-echo.
-echo ***** Finished configuration *****
-echo All done. Execute the file %rootdir%\invoke.bat to start InvokeAI.
-pause
-deactivate
-exit
 
 @rem ------------------------ Subroutines ---------------
 @rem routine to do comparison of semantic version numbers
@@ -216,3 +120,9 @@ pause
 exit /b
 
 pause
+
+:Trim
+SetLocal EnableDelayedExpansion
+set Params=%*
+for /f "tokens=1*" %%a in ("!Params!") do EndLocal & set %1=%%b
+exit /b

installer/install.sh.in

@@ -1,105 +1,22 @@
-#!/usr/bin/env bash
-
-# ensure we're in the correct folder in case user's CWD is somewhere else
-scriptdir=$(dirname "$0")
-cd "$scriptdir"
+#!/bin/bash
 
 # make sure we are not already in a venv
 # (don't need to check status)
 deactivate >/dev/null 2>&1
-
-# this should be changed to the tagged release!
-# INVOKE_AI_SRC=https://github.com/invoke-ai/InvokeAI/archive/main.zip
-INVOKE_AI_SRC=https://github.com/invoke-ai/InvokeAI/archive/refs/tags/v2.2.4.zip
-INSTRUCTIONS=https://invoke-ai.github.io/InvokeAI/installation/INSTALL_AUTOMATED/
-TROUBLESHOOTING=https://invoke-ai.github.io/InvokeAI/installation/INSTALL_AUTOMATED/#troubleshooting
-MINIMUM_PYTHON_VERSION=3.9.0
-
-set -euo pipefail
-IFS=$'\n\t'
-
-function _err_exit {
-    if test "$1" -ne 0
-    then
-        echo -e "Error code $1; Error caught was '$2'"
-	if [ "$OS_NAME" == "osx" ]; then
-	    echo "Something went wrong while installing InvokeAI and/or its requirements."
-	    echo "You may need to use the Xcode command line tools to proceed. See step number 3 of"
-	    echo "https://invoke-ai.github.io/InvokeAI/INSTALL_SOURCE#walk_through for"
-	    echo "installation instructions and then run this script again."
-	else
-	    echo "Something went wrong while installing InvokeAI and/or its requirements."
-	    echo "See https://invoke-ai.github.io/InvokeAI/INSTALL_SOURCE#troubleshooting for troubleshooting"
-	    echo "tips, or visit https://invoke-ai.github.io/InvokeAI/#installation for alternative"
-	    echo "installation methods"
-	fi
-        read -p "Press any key to exit..."
-        exit
-    fi
-}
-
-function readinput() {
-  local CLEAN_ARGS=""
-  while [[ $# -gt 0 ]]; do
-    local i="$1"
-    case "$i" in
-      "-i")
-        if read -i "default" 2>/dev/null <<< "test"; then 
-          CLEAN_ARGS="$CLEAN_ARGS -i \"$2\""
-        fi
-        shift
-        shift
-        ;;
-      "-p")
-        CLEAN_ARGS="$CLEAN_ARGS -p \"$2\""
-        shift
-        shift
-        ;;
-      *)
-        CLEAN_ARGS="$CLEAN_ARGS $1"
-        shift
-        ;;
-    esac
-  done
-  eval read $CLEAN_ARGS
-}
-
+scriptdir=$(dirname "$0")
+cd $scriptdir
 
 function version { echo "$@" | awk -F. '{ printf("%d%03d%03d%03d\n", $1,$2,$3,$4); }'; }
 
-echo "InvokeAI simple installer..."
-echo ""
-echo "Some of the installation steps take a long time to run. Please be patient."
-echo "If the script appears to hang for more than 10 minutes, please interrupt with control-C and retry."
-read -n 1 -s -r -p "<Press any key to start the install>"
-echo ""
-
-OS_NAME=$(uname -s)
-case "${OS_NAME}" in
-    Linux*)     OS_NAME="linux";;
-    Darwin*)    OS_NAME="osx";;
-    *)          echo "Unknown OS: $OS_NAME! This script runs only on Linux or Mac" && exit
-esac
-
-OS_ARCH=$(uname -m)
-case "${OS_ARCH}" in
-    x86_64*)    OS_ARCH="64";;
-    arm64*)     OS_ARCH="arm64";;
-    *)          echo "Unknown system architecture: $OS_ARCH! This script runs only on x86_64 or arm64" && exit
-esac
-
-echo "Installing for $OS_NAME-$OS_ARCH"
-# confirm that python is installed and is up to date
-
+MINIMUM_PYTHON_VERSION=3.9.0
 PYTHON=""
 for candidate in python3.10 python3.9 python3 python python3.11 ; do
     if ppath=`which $candidate`; then
-	python_version=$($ppath -V | awk '{ print $2 }')    
-	if [ $(version $python_version) -ge $(version "$MINIMUM_PYTHON_VERSION") ]; then
-	    PYTHON=$ppath
-	    echo Python $python_version found at $PYTHON
-	    break
-	fi
+        python_version=$($ppath -V | awk '{ print $2 }')
+        if [ $(version $python_version) -ge $(version "$MINIMUM_PYTHON_VERSION") ]; then
+            PYTHON=$ppath
+            break
+        fi
     fi
 done
 
@@ -110,103 +27,4 @@ if [ -z "$PYTHON" ]; then
     exit -1
 fi
 
-
-ROOTDIR=""
-while [ "$ROOTDIR" == "" ]
-do
-    echo
-    readinput -e -p "Select your preferred location for the 'invokeai' directory [$HOME]: " -i $HOME input
-    ROOTDIR=${input:=$HOME}/invokeai
-    read -e -p "InvokeAI will be installed into $ROOTDIR. OK? [y]: " input
-    RESPONSE=${input:='y'}
-    if [ "$RESPONSE" == 'y' ]; then
-	if [ -e "$ROOTDIR" ]; then
-	    echo
-	    read -e -p "Directory "$ROOTDIR" already exists. Do you want to resume an interrupted install? [y]: " input
-            RESPONSE=${input:='y'}
-	    if [ "$RESPONSE" != 'y' ]; then
-	        ROOTDIR=""
-	    fi	       
-	else
-	    mkdir -p "$ROOTDIR"
-	    if [ $? -ne 0 ]; then
-		echo "Could not create "$ROOTDIR". Try again with a different install location."
-		ROOTDIR=""
-	    fi
-	fi
-    else
-	ROOTDIR=""
-    fi
-done
-
-#--------------------------------------------------------------------------------
-echo
-echo "** Creating Virtual Environment for InvokeAI **"
-
-$PYTHON -mvenv "$ROOTDIR"/.venv
-_err_exit $? "Python failed to create virtual environment "$ROOTDIR"/.venv. Please see $TROUBLESHOOTING for help."
-
-#--------------------------------------------------------------------------------
-echo
-echo "** Activating Virtual Environment for InvokeAI **"
-
-source "$ROOTDIR"/.venv/bin/activate
-_err_exit $? "Failed to activate virtual evironment "$ROOTDIR"/.venv. Please see $TROUBLESHOOTING for help."
-
-PYTHON="$ROOTDIR"/.venv/bin/python
-$PYTHON -mensurepip --upgrade
-$PYTHON -mpip install --upgrade pip
-
-#--------------------------------------------------------------------------------
-echo
-echo "*** Installing InvokeAI Dependencies ***"
-
-if [ "$OS_NAME" == "osx" ]; then
-    echo "macOS detected. Installing MPS and CPU support."
-    egrep -v '^-e .' environments-and-requirements/requirements-mac-mps-cpu.txt >requirements.txt
-else
-    if (lsmod | grep amdgpu) &>/dev/null ; then
-	echo "Linux system with AMD GPU driver detected. Installing ROCm and CPU support"
-	egrep -v '^-e .' environments-and-requirements/requirements-lin-amd.txt >requirements.txt
-    else
-	echo "Linux system detected. Installing CUDA and CPU support."
-	egrep -v '^-e .' environments-and-requirements/requirements-lin-cuda.txt >requirements.txt
-    fi
-fi
-
-$PYTHON -mpip install --prefer-binary -r requirements.txt
-_err_exit $? "Failed to install InvokeAI's dependencies."
-
-#--------------------------------------------------------------------------------
-echo
-echo "*** Installing InvokeAI Modules and Executables ***"
-$PYTHON -mpip install $INVOKE_AI_SRC
-_err_exit $? "Installation of InvokeAI failed."
-
-#--------------------------------------------------------------------------------
-echo " *** Setting Up Root Directory "$ROOTDIR" *** "
-cp -pr templates/rootdir/* "$ROOTDIR"/
-cp templates/invoke.sh.in "$ROOTDIR"/invoke.sh
-chmod a+rx "$ROOTDIR"/invoke.sh
-cp templates/update.sh.in "$ROOTDIR"/update.sh
-chmod a+rx "$ROOTDIR"/update.sh
-
-# This allows the updater to work!
-cp -pr environments-and-requirements requirements.txt "$ROOTDIR/"
-
-#--------------------------------------------------------------------------------
-echo
-echo "*** Confguring InvokeAI ***"
-pushd "$ROOTDIR" >/dev/null
-$PYTHON ./.venv/bin/configure_invokeai.py --root="$ROOTDIR"
-_err_exit $? "Initial configuration failed. Please see above error messages and $TROUBLESHOOTING for help."
-
-#--------------------------------------------------------------------------------
-popd
-cp templates/invoke.sh.in "$ROOTDIR"/invoke.sh
-chmod a+rx "$ROOTDIR"/invoke.sh
-
-cp templates/update.sh.in "$ROOTDIR"/update.sh
-chmod a+rx "$ROOTDIR"/update.sh
-
-echo "You may now run InvokeAI by entering the directory $ROOTDIR and running invoke.sh"
+exec $PYTHON ./main.py ${@}

installer/installer.py

@@ -0,0 +1,455 @@
+# Copyright (c) 2023 Eugene Brodsky (https://github.com/ebr)
+"""
+InvokeAI installer script
+"""
+
+import os
+import platform
+import shutil
+import subprocess
+import sys
+import venv
+from pathlib import Path
+from tempfile import TemporaryDirectory
+from typing import Union
+
+SUPPORTED_PYTHON = ">=3.9.0,<3.11"
+INSTALLER_REQS = ["rich", "semver", "requests", "plumbum", "prompt-toolkit"]
+BOOTSTRAP_VENV_PREFIX = "invokeai-installer-tmp"
+
+OS = platform.uname().system
+ARCH = platform.uname().machine
+VERSION = "latest"
+
+### Feature flags
+# Install the virtualenv into the runtime dir
+FF_VENV_IN_RUNTIME = True
+
+# Install the wheel packaged with the installer
+FF_USE_LOCAL_WHEEL = True
+
+
+class Installer:
+    """
+    Deploys an InvokeAI installation into a given path
+    """
+
+    def __init__(self) -> None:
+        self.reqs = INSTALLER_REQS
+        self.preflight()
+        if os.getenv("VIRTUAL_ENV") is not None:
+            print("A virtual environment is already activated. Please 'deactivate' before installation.")
+            sys.exit(-1)
+        self.bootstrap()
+
+    def preflight(self) -> None:
+        """
+        Preflight checks
+        """
+
+        # TODO
+        # verify python version
+        # on macOS verify XCode tools are present
+        # verify libmesa, libglx on linux
+        # check that the system arch is not i386 (?)
+        # check that the system has a GPU, and the type of GPU
+
+        pass
+
+    def mktemp_venv(self) -> TemporaryDirectory:
+        """
+        Creates a temporary virtual environment for the installer itself
+
+        :return: path to the created virtual environment directory
+        :rtype: TemporaryDirectory
+        """
+
+        # Cleaning up temporary directories on Windows results in a race condition
+        # and a stack trace.
+        # `ignore_cleanup_errors` was only added in Python 3.10
+        # users of Python 3.9 will see a gnarly stack trace on installer exit
+        if OS == "Windows" and int(platform.python_version_tuple()[1]) >= 10:
+            venv_dir = TemporaryDirectory(prefix=BOOTSTRAP_VENV_PREFIX, ignore_cleanup_errors=True)
+        else:
+            venv_dir = TemporaryDirectory(prefix=BOOTSTRAP_VENV_PREFIX)
+
+        venv.create(venv_dir.name, with_pip=True)
+        self.venv_dir = venv_dir
+        set_sys_path(Path(venv_dir.name))
+
+        return venv_dir
+
+    def bootstrap(self, verbose: bool = False) -> TemporaryDirectory:
+        """
+        Bootstrap the installer venv with packages required at install time
+
+        :return: path to the virtual environment directory that was bootstrapped
+        :rtype: TemporaryDirectory
+        """
+
+        print("Initializing the installer. This may take a minute - please wait...")
+
+        venv_dir = self.mktemp_venv()
+        pip = get_pip_from_venv(Path(venv_dir.name))
+
+        cmd = [pip, "install", "--require-virtualenv", "--use-pep517"]
+        cmd.extend(self.reqs)
+
+        try:
+            res = subprocess.check_output(cmd).decode()
+            if verbose:
+                print(res)
+            return venv_dir
+        except subprocess.CalledProcessError as e:
+            print(e)
+
+    def app_venv(self, path: str = None):
+        """
+        Create a virtualenv for the InvokeAI installation
+        """
+
+        # explicit venv location
+        # currently unused in normal operation
+        # useful for testing or special cases
+        if path is not None:
+            venv_dir = Path(path)
+
+        # experimental / testing
+        elif not FF_VENV_IN_RUNTIME:
+            if OS == "Windows":
+                venv_dir_parent = os.getenv("APPDATA", "~/AppData/Roaming")
+            elif OS == "Darwin":
+                # there is no environment variable on macOS to find this
+                # TODO: confirm this is working as expected
+                venv_dir_parent = "~/Library/Application Support"
+            elif OS == "Linux":
+                venv_dir_parent = os.getenv("XDG_DATA_DIR", "~/.local/share")
+            venv_dir = Path(venv_dir_parent).expanduser().resolve() / f"InvokeAI/{VERSION}/venv"
+
+        # stable / current
+        else:
+            venv_dir = self.dest / ".venv"
+
+        # Prefer to copy python executables
+        # so that updates to system python don't break InvokeAI
+        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:
+
+            from plumbum import FG, local
+
+            pip = local[get_pip_from_venv(venv_dir)]
+            pip[ "install", "--upgrade", "pip"] & FG
+
+        return venv_dir
+
+    def install(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
+
+        :param root: Destination path for the installation
+        :type root: str
+        :param version: InvokeAI version to install
+        :type version: str
+        :param yes: Accept defaults to all questions
+        :type yes: bool
+        :param find_links: A local directory to search for requirement wheels before going to remote indexes
+        :type find_links: Path
+        """
+
+        import messages
+
+        messages.welcome()
+
+        self.dest = Path(root).expanduser().resolve() if yes_to_all else messages.dest_path(root)
+
+        # create the venv for the app
+        self.venv = self.app_venv()
+
+        self.instance = InvokeAiInstance(runtime=self.dest, venv=self.venv, version=version)
+
+        # install dependencies and the InvokeAI application
+        (extra_index_url,optional_modules) = get_torch_source() if not yes_to_all else (None,None)
+        self.instance.install(
+            extra_index_url,
+            optional_modules,
+            find_links,
+        )
+
+        # install the launch/update scripts into the runtime directory
+        self.instance.install_user_scripts()
+
+        # run through the configuration flow
+        self.instance.configure()
+
+class InvokeAiInstance:
+    """
+    Manages an installed instance of InvokeAI, comprising a virtual environment and a runtime directory.
+    The virtual environment *may* reside within the runtime directory.
+    A single runtime directory *may* be shared by multiple virtual environments, though this isn't currently tested or supported.
+    """
+
+    def __init__(self, runtime: Path, venv: Path, version: str) -> None:
+
+        self.runtime = runtime
+        self.venv = venv
+        self.pip = get_pip_from_venv(venv)
+        self.version = version
+
+        set_sys_path(venv)
+        os.environ["INVOKEAI_ROOT"] = str(self.runtime.expanduser().resolve())
+        os.environ["VIRTUAL_ENV"] = str(self.venv.expanduser().resolve())
+
+    def get(self) -> tuple[Path, Path]:
+        """
+        Get the location of the virtualenv directory for this installation
+
+        :return: Paths of the runtime and the venv directory
+        :rtype: tuple[Path, Path]
+        """
+
+        return (self.runtime, self.venv)
+
+    def install(self, extra_index_url=None, optional_modules=None, find_links=None):
+        """
+        Install this instance, including dependencies and the app itself
+
+        :param extra_index_url: the "--extra-index-url ..." line for pip to look in extra indexes.
+        :type extra_index_url: str
+        """
+
+        import messages
+
+        # install torch first to ensure the correct version gets installed.
+        # works with either source or wheel install with negligible impact on installation times.
+        messages.simple_banner("Installing PyTorch :fire:")
+        self.install_torch(extra_index_url, find_links)
+
+        messages.simple_banner("Installing the InvokeAI Application :art:")
+        self.install_app(extra_index_url, optional_modules, find_links)
+
+    def install_torch(self, extra_index_url=None, find_links=None):
+        """
+        Install PyTorch
+        """
+
+        from plumbum import FG, local
+
+        pip = local[self.pip]
+
+        (
+            pip[
+                "install",
+                "--require-virtualenv",
+                "torch",
+                "torchvision",
+                "--find-links" if find_links is not None else None,
+                find_links,
+                "--extra-index-url" if extra_index_url is not None else None,
+                extra_index_url,
+            ]
+            & FG
+        )
+
+    def install_app(self, extra_index_url=None, optional_modules=None, find_links=None):
+        """
+        Install the application with pip.
+        Supports installation from PyPi or from a local source directory.
+
+        :param extra_index_url: the "--extra-index-url ..." line for pip to look in extra indexes.
+        :type extra_index_url: str
+
+        :param optional_modules: optional modules to install using "[module1,module2]" format.
+        :type optional_modules: str
+
+        :param find_links: path to a directory containing wheels to be searched prior to going to the internet
+        :type find_links: Path
+        """
+
+        ## this only applies to pypi installs; TODO actually use this
+        if self.version == "pre":
+            version = None
+            pre = "--pre"
+        else:
+            version = self.version
+            pre = None
+
+        ## TODO: only local wheel will be installed as of now; support for --version arg is TODO
+        if FF_USE_LOCAL_WHEEL:
+            # if no wheel, try to do a source install before giving up
+            try:
+                src = str(next(Path(__file__).parent.glob("InvokeAI-*.whl")))
+            except StopIteration:
+                try:
+                    src = Path(__file__).parents[1].expanduser().resolve()
+                    # if the above directory contains one of these files, we'll do a source install
+                    next(src.glob("pyproject.toml"))
+                    next(src.glob("ldm"))
+                except StopIteration:
+                    print("Unable to find a wheel or perform a source install. Giving up.")
+
+        elif version == "source":
+            # this makes an assumption about the location of the installer package in the source tree
+            src = Path(__file__).parents[1].expanduser().resolve()
+        else:
+            # will install from PyPi
+            src = f"invokeai=={version}" if version is not None else "invokeai"
+
+        from plumbum import FG, local
+
+        pip = local[self.pip]
+
+        (
+            pip[
+                "install",
+                "--require-virtualenv",
+                "--use-pep517",
+                str(src)+(optional_modules if optional_modules else ''),
+                "--find-links" if find_links is not None else None,
+                find_links,
+                "--extra-index-url" if extra_index_url is not None else None,
+                extra_index_url,
+                pre,
+            ]
+            & FG
+        )
+
+    def configure(self):
+        """
+        Configure the InvokeAI runtime directory
+        """
+
+        new_argv = [sys.argv[0]]
+        for i in range(1,len(sys.argv)):
+            el = sys.argv[i]
+            if el in ['-r','--root']:
+                new_argv.append(el)
+                new_argv.append(sys.argv[i+1])
+            elif el in ['-y','--yes','--yes-to-all']:
+                new_argv.append(el)
+        sys.argv = new_argv
+
+        from messages import introduction
+
+        introduction()
+
+        from ldm.invoke.config import configure_invokeai
+
+        # NOTE: currently the config script does its own arg parsing! this means the command-line switches
+        # from the installer will also automatically propagate down to the config script.
+        # this may change in the future with config refactoring!
+
+        # set sys.argv to a consistent state
+
+        configure_invokeai.main()
+
+    def install_user_scripts(self):
+        """
+        Copy the launch and update scripts to the runtime dir
+        """
+
+        ext = "bat" if OS == "Windows" else "sh"
+
+        #scripts = ['invoke', 'update']
+        scripts = ['invoke']
+        
+        for script in scripts:
+            src = Path(__file__).parent / "templates" / f"{script}.{ext}.in"
+            dest = self.runtime / f"{script}.{ext}"
+            shutil.copy(src, dest)
+            os.chmod(dest, 0o0755)
+
+    def update(self):
+        pass
+
+    def remove(self):
+        pass
+
+
+### Utility functions ###
+
+
+def get_pip_from_venv(venv_path: Path) -> str:
+    """
+    Given a path to a virtual environment, get the absolute path to the `pip` executable
+    in a cross-platform fashion. Does not validate that the pip executable
+    actually exists in the virtualenv.
+
+    :param venv_path: Path to the virtual environment
+    :type venv_path: Path
+    :return: Absolute path to the pip executable
+    :rtype: str
+    """
+
+    pip = "Scripts\pip.exe" if OS == "Windows" else "bin/pip"
+    return str(venv_path.expanduser().resolve() / pip)
+
+
+def set_sys_path(venv_path: Path) -> None:
+    """
+    Given a path to a virtual environment, set the sys.path, in a cross-platform fashion,
+    such that packages from the given venv may be imported in the current process.
+    Ensure that the packages from system environment are not visible (emulate
+    the virtual env 'activate' script) - this doesn't work on Windows yet.
+
+    :param venv_path: Path to the virtual environment
+    :type venv_path: Path
+    """
+
+    # filter out any paths in sys.path that may be system- or user-wide
+    # but leave the temporary bootstrap virtualenv as it contains packages we
+    # temporarily need at install time
+    sys.path = list(filter(
+        lambda p: not p.endswith("-packages")
+        or p.find(BOOTSTRAP_VENV_PREFIX) != -1,
+        sys.path
+    ))
+
+    # determine site-packages/lib directory location for the venv
+    lib = "Lib" if OS == "Windows" else f"lib/python{sys.version_info.major}.{sys.version_info.minor}"
+
+    # add the site-packages location to the venv
+    sys.path.append(str(Path(venv_path, lib, "site-packages").expanduser().resolve()))
+
+
+def get_torch_source() -> (Union[str, None],str):
+    """
+    Determine the extra index URL for pip to use for torch installation.
+    This depends on the OS and the graphics accelerator in use.
+    This is only applicable to Windows and Linux, since PyTorch does not
+    offer accelerated builds for macOS.
+
+    Prefer CUDA-enabled wheels if the user wasn't sure of their GPU, as it will fallback to CPU if possible.
+
+    A NoneType return means just go to PyPi.
+
+    :return: tuple consisting of (extra index url or None, optional modules to load or None)
+    :rtype: list
+    """
+
+    from messages import graphical_accelerator
+
+    # device can be one of: "cuda", "rocm", "cpu", "idk"
+    device = graphical_accelerator()
+
+    url = None
+    optional_modules = None
+    if OS == "Linux":
+        if device == "rocm":
+            url = "https://download.pytorch.org/whl/rocm5.2"
+        elif device == "cpu":
+            url = "https://download.pytorch.org/whl/cpu"
+
+    if device == 'cuda':
+        url = 'https://download.pytorch.org/whl/cu117'
+        optional_modules = '[xformers]'
+
+    # in all other cases, Torch wheels should be coming from PyPi as of Torch 1.13
+
+    return (url, optional_modules)

installer/main.py

@@ -0,0 +1,54 @@
+"""
+InvokeAI Installer
+"""
+
+import argparse
+from pathlib import Path
+from installer import Installer
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser()
+
+    parser.add_argument(
+        "-r",
+        "--root",
+        dest="root",
+        type=str,
+        help="Destination path for installation",
+        default="~/invokeai",
+    )
+    parser.add_argument(
+        "-y",
+        "--yes",
+        "--yes-to-all",
+        dest="yes_to_all",
+        action="store_true",
+        help="Assume default answers to all questions",
+        default=False,
+    )
+
+    parser.add_argument(
+        "--version",
+        dest="version",
+        help="Version of InvokeAI to install. Default to the latest stable release. A special 'pre' value will install the latest published pre-release version.",
+        default=None,
+    )
+
+    parser.add_argument(
+        "--find-links",
+        dest="find_links",
+        help="Specifies a directory of local wheel files to be searched prior to searching the online repositories.",
+        type=Path,
+        default=None,
+    )
+    
+    args = parser.parse_args()
+
+    inst = Installer()
+
+    try:
+        inst.install(**args.__dict__)
+    except KeyboardInterrupt as exc:
+        print("\n")
+        print("Ctrl-C pressed. Aborting.")
+        print("Come back soon!")

installer/messages.py

@@ -0,0 +1,296 @@
+# Copyright (c) 2023 Eugene Brodsky (https://github.com/ebr)
+"""
+Installer user interaction
+"""
+
+import os
+import platform
+from pathlib import Path
+
+from prompt_toolkit import prompt
+from prompt_toolkit.completion import PathCompleter
+from prompt_toolkit.shortcuts import CompleteStyle
+from prompt_toolkit.validation import Validator
+from rich import box, print
+from rich.console import Console, Group
+from rich.panel import Panel
+from rich.prompt import Confirm
+from rich.style import Style
+from rich.syntax import Syntax
+from rich.text import Text
+
+"""
+INVOKE_AI_SRC=https://github.com/invoke-ai/InvokeAI/archive/refs/tags/${INVOKEAI_VERSION}.zip
+INSTRUCTIONS=https://invoke-ai.github.io/InvokeAI/installation/INSTALL_AUTOMATED/
+TROUBLESHOOTING=https://invoke-ai.github.io/InvokeAI/installation/INSTALL_AUTOMATED/#troubleshooting
+"""
+
+
+OS = platform.uname().system
+ARCH = platform.uname().machine
+
+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="grey19"))
+
+
+def welcome():
+    console.rule()
+    print(
+        Panel(
+            title="[bold wheat1]Welcome to the InvokeAI Installer",
+            renderable=Text(
+                "Some of the installation steps take a long time to run. Please be patient. If the script appears to hang for more than 10 minutes, please interrupt with control-C and retry.",
+                justify="center",
+            ),
+            box=box.DOUBLE,
+            width=80,
+            expand=False,
+            padding=(1, 2),
+            style=Style(bgcolor="grey23", color="orange1"),
+            subtitle=f"[bold grey39]{OS}-{ARCH}",
+        )
+    )
+    console.line()
+
+def confirm_install(dest: Path) -> bool:
+    if dest.exists():
+        print(f":exclamation: Directory {dest} already exists :exclamation:")
+        dest_confirmed = Confirm.ask(
+            ":stop_sign: Are you sure you want to (re)install in this location?",
+            default=False,
+        )
+    else:
+        print(f"InvokeAI will be installed in {dest}")
+        dest_confirmed = not Confirm.ask(f"Would you like to pick a different location?", default=False)
+    console.line()
+
+    return dest_confirmed
+
+
+def dest_path(dest=None) -> Path:
+    """
+    Prompt the user for the destination path and create the path
+
+    :param dest: a filesystem path, defaults to None
+    :type dest: str, optional
+    :return: absolute path to the created installation directory
+    :rtype: Path
+    """
+
+    if dest is not None:
+        dest = Path(dest).expanduser().resolve()
+    else:
+        dest = Path.cwd().expanduser().resolve()
+    prev_dest = dest.expanduser().resolve()
+
+    dest_confirmed = confirm_install(dest)
+
+    while not dest_confirmed:
+
+        # if the given destination already exists, the starting point for browsing is its parent directory.
+        # the user may have made a typo, or otherwise wants to place the root dir next to an existing one.
+        # if the destination dir does NOT exist, then the user must have changed their mind about the selection.
+        # since we can't read their mind, start browsing at Path.cwd().
+        browse_start = (prev_dest.parent if prev_dest.exists() else Path.cwd()).expanduser().resolve()
+
+        path_completer = PathCompleter(
+            only_directories=True,
+            expanduser=True,
+            get_paths=lambda: [browse_start],
+            # get_paths=lambda: [".."].extend(list(browse_start.iterdir()))
+        )
+
+        console.line()
+        print(f"[orange3]Please select the destination directory for the installation:[/] \[{browse_start}]: ")
+        selected = prompt(
+            f">>> ",
+            complete_in_thread=True,
+            completer=path_completer,
+            default=str(browse_start) + os.sep,
+            vi_mode=True,
+            complete_while_typing=True
+            # Test that this is not needed on Windows
+            # complete_style=CompleteStyle.READLINE_LIKE,
+        )
+        prev_dest = dest
+        dest = Path(selected)
+        console.line()
+
+        dest_confirmed = confirm_install(dest.expanduser().resolve())
+
+        if not dest_confirmed:
+            dest = prev_dest
+
+    dest = dest.expanduser().resolve()
+
+    try:
+        dest.mkdir(exist_ok=True, parents=True)
+        return dest
+    except PermissionError as exc:
+        print(
+            f"Failed to create directory {dest} due to insufficient permissions",
+            style=Style(color="red"),
+            highlight=True,
+        )
+    except OSError as exc:
+        console.print_exception(exc)
+
+    if Confirm.ask("Would you like to try again?"):
+        dest_path(init_path)
+    else:
+        console.rule("Goodbye!")
+
+
+def graphical_accelerator():
+    """
+    Prompt the user to select the graphical accelerator in their system
+    This does not validate user's choices (yet), but only offers choices
+    valid for the platform.
+    CUDA is the fallback.
+    We may be able to detect the GPU driver by shelling out to `modprobe` or `lspci`,
+    but this is not yet supported or reliable. Also, some users may have exotic preferences.
+    """
+
+    if ARCH == "arm64" and OS != "Darwin":
+        print(f"Only CPU acceleration is available on {ARCH} architecture. Proceeding with that.")
+        return "cpu"
+
+    nvidia = (
+        "an [gold1 b]NVIDIA[/] GPU (using CUDA™)",
+        "cuda",
+    )
+    amd = (
+        "an [gold1 b]AMD[/] GPU (using ROCm™)",
+        "rocm",
+    )
+    cpu = (
+        "no compatible GPU, or specifically prefer to use the CPU",
+        "cpu",
+    )
+    idk = (
+        "I'm not sure what to choose",
+        "idk",
+    )
+
+    if OS == "Windows":
+        options = [nvidia, cpu]
+    if OS == "Linux":
+        options = [nvidia, amd, cpu]
+    elif OS == "Darwin":
+        options = [cpu]
+        # future CoreML?
+
+    if len(options) == 1:
+        print(f'Your platform [gold1]{OS}-{ARCH}[/] only supports the "{options[0][1]}" driver. Proceeding with that.')
+        return options[0][1]
+
+    # "I don't know" is always added the last option
+    options.append(idk)
+
+    options = {str(i): opt for i, opt in enumerate(options, 1)}
+
+    console.rule(":space_invader: GPU (Graphics Card) selection :space_invader:")
+    console.print(
+        Panel(
+            Group(
+                "\n".join(
+                    [
+                        f"Detected the [gold1]{OS}-{ARCH}[/] platform",
+                        "",
+                        "See [steel_blue3]https://invoke-ai.github.io/InvokeAI/#system[/] to ensure your system meets the minimum requirements.",
+                        "",
+                        "[red3]🠶[/] [b]Your GPU drivers must be correctly installed before using InvokeAI![/] [red3]🠴[/]",
+                    ]
+                ),
+                "",
+                "Please select the type of GPU installed in your computer.",
+                Panel(
+                    "\n".join([f"[dark_goldenrod b i]{i}[/] [dark_red]🢒[/]{opt[0]}" for (i, opt) in options.items()]),
+                    box=box.MINIMAL,
+                ),
+            ),
+            box=box.MINIMAL,
+            padding=(1, 1),
+        )
+    )
+    choice = prompt(
+        "Please make your selection: ",
+        validator=Validator.from_callable(
+            lambda n: n in options.keys(), error_message="Please select one the above options"
+        ),
+    )
+
+    if options[choice][1] == "idk":
+        console.print(
+            "No problem. We will try to install a version that [i]should[/i] be compatible. :crossed_fingers:"
+        )
+
+    return options[choice][1]
+
+
+def simple_banner(message: str) -> None:
+    """
+    A simple banner with a message, defined here for styling consistency
+
+    :param message: The message to display
+    :type message: str
+    """
+
+    console.rule(message)
+
+
+# TODO this does not yet work correctly
+def windows_long_paths_registry() -> None:
+    """
+    Display a message about applying the Windows long paths registry fix
+    """
+
+    with open(str(Path(__file__).parent / "WinLongPathsEnabled.reg"), "r", encoding="utf-16le") as code:
+        syntax = Syntax(code.read(), line_numbers=True)
+
+    console.print(
+        Panel(
+            Group(
+                "\n".join(
+                    [
+                        "We will now apply a registry fix to enable long paths on Windows. InvokeAI needs this to function correctly. We are asking your permission to modify the Windows Registry on your behalf.",
+                        "",
+                        "This is the change that will be applied:",
+                        syntax,
+                    ]
+                )
+            ),
+            title="Windows Long Paths registry fix",
+            box=box.HORIZONTALS,
+            padding=(1, 1),
+        )
+    )
+
+
+def introduction() -> None:
+    """
+    Display a banner when starting configuration of the InvokeAI application
+    """
+
+    console.rule()
+
+    console.print(
+        Panel(
+            title=":art: Configuring InvokeAI :art:",
+            renderable=Group(
+                "",
+                "[b]This script will:",
+                "",
+                "1. Configure the InvokeAI application directory",
+                "2. Help download the Stable Diffusion weight files",
+                "   and other large models that are needed for text to image generation",
+                "3. Create initial configuration files.",
+                "",
+                "[i]At any point you may interrupt this program and resume later.",
+            ),
+        )
+    )
+    console.line(2)

installer/readme.txt

@@ -8,13 +8,16 @@ Preparations:
   to work. Instructions are given here:
   https://invoke-ai.github.io/InvokeAI/installation/INSTALL_AUTOMATED/
 
+  NOTE: At this time we do not recommend Python 3.11. We recommend 
+  Version 3.10.9, which has been extensively tested with InvokeAI.
+  
   Before you start the installer, please open up your system's command
   line window (Terminal or Command) and type the commands:
 
      python --version
 
   If all is well, it will print "Python 3.X.X", where the version number
-  is at least 3.9.1
+  is at least 3.9.1, and less than 3.11.
 
   If this works, check the version of the Python package manager, pip:
 
@@ -43,8 +46,8 @@ Launching the installer:
   './install.sh' (while keeping it inside the InvokeAI-Installer
   folder).
 
-The installer will create a directory named "invokeai" in the folder
-of your choice. This directory contains everything you need to run
+The installer will create a directory of your choice and install the
+InvokeAI application within it. This directory contains everything you need to run
 invokeai. Once InvokeAI is up and running, you may delete the
 InvokeAI-Installer folder at your convenience.
 

installer/templates/invoke.bat.in

@@ -9,15 +9,28 @@ set INVOKEAI_ROOT=.
 echo Do you want to generate images using the
 echo 1. command-line
 echo 2. browser-based UI
-echo 3. open the developer console
-set /P restore="Please enter 1, 2 or 3: "
+echo 3. run textual inversion training
+echo 4. merge models (diffusers type only)
+echo 5. re-run the configure script to download new models
+echo 6. open the developer console
+set /P restore="Please enter 1, 2, 3, 4 or 5: [2] "
+if not defined restore set restore=2
 IF /I "%restore%" == "1" (
     echo Starting the InvokeAI command-line..
-    python .venv\Scripts\invoke.py %*
+    python .venv\Scripts\invokeai.exe %*
 ) ELSE IF /I "%restore%" == "2" (
     echo Starting the InvokeAI browser-based UI..
-    python .venv\Scripts\invoke.py --web %*
+    python .venv\Scripts\invokeai.exe --web %*
 ) ELSE IF /I "%restore%" == "3" (
+    echo Starting textual inversion training..
+    python .venv\Scripts\invokeai-ti.exe --gui %*
+) ELSE IF /I "%restore%" == "4" (
+    echo Starting model merging script..
+    python .venv\Scripts\invokeai-merge.exe --gui %*
+) ELSE IF /I "%restore%" == "5" (
+    echo Running invokeai-configure...
+    python .venv\Scripts\invokeai-configure.exe %*
+) ELSE IF /I "%restore%" == "6" (
     echo Developer Console
     echo Python command is:
     where python

installer/templates/invoke.sh.in

@@ -1,5 +1,14 @@
 #!/bin/bash
 
+####
+# This launch script assumes that:
+# 1. it is located in the runtime directory,
+# 2. the .venv is also located in the runtime directory and is named exactly that
+#
+# If both of the above are not true, this script will likely not work as intended.
+# Activate the virtual environment and run `invoke.py` directly.
+####
+
 set -eu
 
 # ensure we're in the correct folder in case user's CWD is somewhere else
@@ -11,21 +20,53 @@ cd "$scriptdir"
 export INVOKEAI_ROOT="$scriptdir"
 
 # set required env var for torch on mac MPS
- if [ "$(uname -s)" == "Darwin" ]; then
-     export PYTORCH_ENABLE_MPS_FALLBACK=1
- fi
+if [ "$(uname -s)" == "Darwin" ]; then
+    export PYTORCH_ENABLE_MPS_FALLBACK=1
+fi
 
 if [ "$0" != "bash" ]; then
     echo "Do you want to generate images using the"
     echo "1. command-line"
     echo "2. browser-based UI"
-    echo "3. open the developer console"
-    read -p "Please enter 1, 2, or 3: " yn
-    case $yn in
-        1 ) printf "\nStarting the InvokeAI command-line..\n"; .venv/bin/python .venv/bin/invoke.py  $*;;
-        2 ) printf "\nStarting the InvokeAI browser-based UI..\n"; .venv/bin/python .venv/bin/invoke.py --web $*;;
-        3 ) printf "\nDeveloper Console:\n"; file_name=$(basename "${BASH_SOURCE[0]}"); bash --init-file "$file_name";;
-        * ) echo "Invalid selection"; exit;;
+    echo "3. run textual inversion training"
+    echo "4. merge models (diffusers type only)"
+    echo "5. open the developer console"
+    echo "6. re-run the configure script to download new models"
+    echo "7. command-line help "
+    echo ""
+    read -p "Please enter 1, 2, 3, 4, 5, 6 or 7: [2] " yn
+    choice=${yn:='2'}
+    case $choice in
+        1)
+            echo "Starting the InvokeAI command-line..."
+            exec invokeai $@
+            ;;
+        2)
+            echo "Starting the InvokeAI browser-based UI..."
+            exec invokeai --web $@
+            ;;
+        3)
+            echo "Starting Textual Inversion:"
+            exec invokeai-ti --gui $@
+            ;;
+        4)
+            echo "Merging Models:"
+            exec invokeai-merge --gui $@
+            ;;
+        5)
+            echo "Developer Console:"
+            file_name=$(basename "${BASH_SOURCE[0]}")
+            bash --init-file "$file_name"
+            ;;
+        6)
+            exec invokeai-configure --root ${INVOKEAI_ROOT}
+            ;;
+        7)
+            exec invokeai --help
+            ;;
+        *)
+            echo "Invalid selection"
+            exit;;
     esac
 else # in developer console
     python --version

installer/templates/update.bat.in

@@ -3,50 +3,70 @@ setlocal EnableExtensions EnableDelayedExpansion
 
 PUSHD "%~dp0"
 
-set INVOKE_AI_SRC=https://github.com/invoke-ai/InvokeAI/archive/main.zip
+set INVOKE_AI_VERSION=latest
 set arg=%1
 if "%arg%" neq "" (
-   if "%arg:~0,4%" neq "http" (
-       echo Usage: update.bat ^<release URL^>.zip
+   if "%arg:~0,2%" equ "/?" (
+       echo Usage: update.bat ^<release name or branch^>
        echo Updates InvokeAI to use the indicated version of the code base.
-       echo Find the zip file for the release you want, and pass it as the argument.
-       echo For example update.sh https://github.com/invoke-ai/InvokeAI/archive/refs/tags/v2.2.4.zip
-    echo.
-    echo If no argument provided then will install the most recent development version, equivalent to
-    echo update.bat https://github.com/invoke-ai/InvokeAI/archive/main.zip
-    exit /b
+       echo Find the version or branch for the release you want, and pass it as the argument.
+       echo For example '.\update.bat v2.2.5' for release 2.2.5.
+       echo             '.\update.bat main' for the latest development version
+       echo.
+       echo If no argument provided then will install the most recent release, equivalent to
+       echo '.\update.bat latest'
+       exit /b
    ) else (
-     set INVOKE_AI_SRC=%arg%
+       set INVOKE_AI_VERSION=%arg%
    )
 )
 
+set INVOKE_AI_SRC="https://github.com/invoke-ai/InvokeAI/archive/!INVOKE_AI_VERSION!.zip"
+set INVOKE_AI_DEP=https://raw.githubusercontent.com/invoke-ai/InvokeAI/!INVOKE_AI_VERSION!/environments-and-requirements/requirements-base.txt
+set INVOKE_AI_MODELS=https://raw.githubusercontent.com/invoke-ai/InvokeAI/$INVOKE_AI_VERSION/configs/INITIAL_MODELS.yaml
 
-call .venv\Scripts\activate.bat
+call curl -I "%INVOKE_AI_DEP%" -fs >.tmp.out
+if %errorlevel% neq 0 (
+    echo '!INVOKE_AI_VERSION!' is not a known branch name or tag. Please check the version and try again.
+    echo "Press any key to continue"
+    pause
+    exit /b
+)
+del .tmp.out
 
 echo This script will update InvokeAI and all its dependencies to !INVOKE_AI_SRC!.
 echo If you do not want to do this, press control-C now!
 pause
 
+call curl -L "%INVOKE_AI_DEP%" > environments-and-requirements/requirements-base.txt
+call curl -L "%INVOKE_AI_MODELS%" > configs/INITIAL_MODELS.yaml
+
+
+call .venv\Scripts\activate.bat
 call .venv\Scripts\python -mpip install -r requirements.txt
 if %errorlevel% neq 0 (
    echo Installation of requirements failed. See https://invoke-ai.github.io/InvokeAI/installation/INSTALL_AUTOMATED/#troubleshooting for suggestions.
+   pause
    exit /b
 )
 
 call .venv\Scripts\python -mpip install !INVOKE_AI_SRC!
 if %errorlevel% neq 0 (
    echo Installation of InvokeAI failed. See https://invoke-ai.github.io/InvokeAI/installation/INSTALL_AUTOMATED/#troubleshooting for suggestions.
+   pause
    exit /b
 )
 
-call .venv\Scripts\python .venv\Scripts\configure_invokeai.py --root=.
+@rem call .venv\Scripts\invokeai-configure --root=.
 
-if %errorlevel% neq 0 (
-   echo Configuration InvokeAI failed. See https://invoke-ai.github.io/InvokeAI/installation/INSTALL_AUTOMATED/#troubleshooting for suggestions.
-   exit /b
-)
+@rem if %errorlevel% neq 0 (
+@rem    echo Configuration InvokeAI failed. See https://invoke-ai.github.io/InvokeAI/installation/INSTALL_AUTOMATED/#troubleshooting for suggestions.
+@rem    pause
+@rem    exit /b
+@rem )
+
+echo InvokeAI has been updated to '%INVOKE_AI_VERSION%'
 
 echo "Press any key to continue"
 pause
 endlocal
-