Configure the NSFW checker at install time with default on (#1624)

* configure the NSFW checker at install time with default on

1. Changes the --safety_checker argument to --nsfw_checker and
--no-nsfw_checker. The original argument is recognized for backward
compatibility.

2. The configure script asks users whether to enable the checker
(default yes). Also offers users ability to select default sampler and
number of generation steps.

3.Enables the pasting of the caution icon on blurred images when
InvokeAI is installed into the package directory.

4. Adds documentation for the NSFW checker, including caveats about
accuracy, memory requirements, and intermediate image dispaly.

* use better fitting icon

* NSFW defaults false for testing

* set default back to nsfw active

Co-authored-by: Matthias Wild <40327258+mauwii@users.noreply.github.com>
Co-authored-by: mauwii <Mauwii@outlook.de>

.dockerignore

@@ -1,3 +1,12 @@
 *
-!environment*.yml
-!docker-build
+!backend
+!configs
+!environments-and-requirements
+!frontend
+!installer
+!ldm
+!main.py
+!scripts
+!server
+!static
+!setup.py

.editorconfig

@@ -0,0 +1,12 @@
+# All files
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 2
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+# Python
+[*.py]
+indent_size = 4

.github/CODEOWNERS

@@ -2,3 +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
+.github/workflows/ @mauwii
+docker_build/ @mauwii

.github/ISSUE_TEMPLATE/BUG_REPORT.yml

@@ -0,0 +1,102 @@
+name: 🐞 Bug Report
+
+description: File a bug report
+
+title: '[bug]: '
+
+labels: ['bug']
+
+# assignees:
+#   - moderator_bot
+#   - lstein
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this Bug Report!
+
+  - type: checkboxes
+    attributes:
+      label: Is there an existing issue for this?
+      description: |
+        Please use the [search function](https://github.com/invoke-ai/InvokeAI/issues?q=is%3Aissue+is%3Aopen+label%3Abug)
+        irst to see if an issue already exists for the bug you encountered.
+      options:
+        - label: I have searched the existing issues
+          required: true
+
+  - type: markdown
+    attributes:
+      value: __Describe your environment__
+
+  - type: dropdown
+    id: os_dropdown
+    attributes:
+      label: OS
+      description: Which operating System did you use when the bug occured
+      multiple: false
+      options:
+        - 'Linux'
+        - 'Windows'
+        - 'macOS'
+    validations:
+      required: true
+
+  - type: dropdown
+    id: gpu_dropdown
+    attributes:
+      label: GPU
+      description: Which kind of Graphic-Adapter is your System using
+      multiple: false
+      options:
+        - 'cuda'
+        - 'amd'
+        - 'mps'
+        - 'cpu'
+    validations:
+      required: true
+
+  - type: input
+    id: vram
+    attributes:
+      label: VRAM
+      description: Size of the VRAM if known
+      placeholder: 8GB
+    validations:
+      required: false
+
+  - type: textarea
+    id: what-happened
+    attributes:
+      label: What happened?
+      description: |
+        Briefly describe what happened, what you expected to happen and how to reproduce this bug.
+      placeholder: When using the webinterface and right-clicking on button X instead of the popup-menu there error Y appears
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Screenshots
+      description: If applicable, add screenshots to help explain your problem
+      placeholder: this is what the result looked like <screenshot>
+    validations:
+      required: false
+
+  - type: textarea
+    attributes:
+      label: Additional context
+      description: Add any other context about the problem here
+      placeholder: Only happens when there is full moon and Friday the 13th on Christmas Eve 🎅🏻
+    validations:
+      required: false
+
+  - type: input
+    id: contact
+    attributes:
+      label: Contact Details
+      description: __OPTIONAL__ How can we get in touch with you if we need more info (besides this issue)?
+      placeholder: ex. email@example.com, discordname, twitter, ...
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/FEATURE_REQUEST.yml

@@ -0,0 +1,56 @@
+name: Feature Request
+description: Commit a idea or Request a new feature
+title: '[enhancement]: '
+labels: ['enhancement']
+# assignees:
+#   - lstein
+#   - tildebyte
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this Feature request!
+
+  - type: checkboxes
+    attributes:
+      label: Is there an existing issue for this?
+      description: |
+        Please make use of the [search function](https://github.com/invoke-ai/InvokeAI/labels/enhancement)
+        to see if a simmilar issue already exists for the feature you want to request
+      options:
+        - label: I have searched the existing issues
+          required: true
+
+  - type: input
+    id: contact
+    attributes:
+      label: Contact Details
+      description: __OPTIONAL__ How could we get in touch with you if we need more info (besides this issue)?
+      placeholder: ex. email@example.com, discordname, twitter, ...
+    validations:
+      required: false
+
+  - type: textarea
+    id: whatisexpected
+    attributes:
+      label: What should this feature add?
+      description: Please try to explain the functionality this feature should add
+      placeholder: |
+        Instead of one huge textfield, it would be nice to have forms for bug-reports, feature-requests, ...
+        Great benefits with automatic labeling, assigning and other functionalitys not available in that form
+        via old-fashioned markdown-templates. I would also love to see the use of a moderator bot 🤖 like
+        https://github.com/marketplace/actions/issue-moderator-with-commands to auto close old issues and other things
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Alternatives
+      description: Describe alternatives you've considered
+      placeholder: A clear and concise description of any alternative solutions or features you've considered.
+
+  - type: textarea
+    attributes:
+      label: Aditional Content
+      description: Add any other context or screenshots about the feature request here.
+      placeholder: This is a Mockup of the design how I imagine it <screenshot>

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,36 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**Describe your environment**
-- GPU: [cuda/amd/mps/cpu]
-- VRAM: [if known]
-- CPU arch: [x86/arm]
-- OS: [Linux/Windows/macOS]
-- Python: [Anaconda/miniconda/miniforge/pyenv/other (explain)]
-- Branch: [if `git status` says anything other than "On branch main" paste it here]
-- Commit: [run `git show` and paste the line that starts with "Merge" here]
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Additional context**
-Add any other context about the problem here.

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,14 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Project-Documentation
+    url: https://invoke-ai.github.io/InvokeAI/
+    about: Should be your first place to go when looking for manuals/FAQs regarding our InvokeAI Toolkit
+  - name: Discord
+    url: https://discord.gg/ZmtBAhwWhy
+    about: Our Discord Community could maybe help you out via live-chat
+  - name: GitHub Community Support
+    url: https://github.com/orgs/community/discussions
+    about: Please ask and answer questions regarding the GitHub Platform here.
+  - name: GitHub Security Bug Bounty
+    url: https://bounty.github.com/
+    about: Please report security vulnerabilities of the GitHub Platform here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,20 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.

.github/workflows/build-container.yml

@@ -6,14 +6,21 @@ on:
     branches:
       - 'main'
       - 'development'
-  pull_request:
-    branches:
-      - 'main'
-      - 'development'
+      - 'update-dockerfile'
 
 jobs:
   docker:
+    strategy:
+      fail-fast: false
+      matrix:
+        arch:
+          - x86_64
+          - aarch64
+        pip-requirements:
+          - requirements-lin-amd.txt
+          - requirements-lin-cuda.txt
     runs-on: ubuntu-latest
+    name: ${{ matrix.pip-requirements }} ${{ matrix.arch }}
     steps:
       - name: prepare docker-tag
         env:
@@ -25,18 +32,12 @@ jobs:
         uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
-      - name: Cache Docker layers
-        uses: actions/cache@v2
-        with:
-          path: /tmp/.buildx-cache
-          key: buildx-${{ hashFiles('docker-build/Dockerfile') }}
       - name: Build container
         uses: docker/build-push-action@v3
         with:
           context: .
           file: docker-build/Dockerfile
-          platforms: linux/amd64
+          platforms: Linux/${{ matrix.arch }}
           push: false
-          tags: ${{ env.dockertag }}:latest
-          cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache
+          tags: ${{ env.dockertag }}:${{ matrix.pip-requirements }}-${{ matrix.arch }}
+          build-args: pip_requirements=${{ matrix.pip-requirements }}

.github/workflows/create-caches.yml

@@ -1,80 +0,0 @@
-name: Create Caches
-
-on: workflow_dispatch
-
-jobs:
-  os_matrix:
-    strategy:
-      matrix:
-        os: [ubuntu-latest, macos-latest]
-        include:
-          - os: ubuntu-latest
-            environment-file: environment.yml
-            default-shell: bash -l {0}
-          - os: macos-latest
-            environment-file: environment-mac.yml
-            default-shell: bash -l {0}
-    name: Test invoke.py on ${{ matrix.os }} with conda
-    runs-on: ${{ matrix.os }}
-    defaults:
-      run:
-        shell: ${{ matrix.default-shell }}
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@v3
-
-      - name: setup miniconda
-        uses: conda-incubator/setup-miniconda@v2
-        with:
-          auto-activate-base: false
-          auto-update-conda: false
-          miniconda-version: latest
-
-      - name: set environment
-        run: |
-          [[ "$GITHUB_REF" == 'refs/heads/main' ]] \
-            && echo "TEST_PROMPTS=tests/preflight_prompts.txt" >> $GITHUB_ENV \
-            || echo "TEST_PROMPTS=tests/dev_prompts.txt" >> $GITHUB_ENV
-          echo "CONDA_ROOT=$CONDA" >> $GITHUB_ENV
-          echo "CONDA_ENV_NAME=invokeai" >> $GITHUB_ENV
-
-      - name: Use Cached Stable Diffusion v1.4 Model
-        id: cache-sd-v1-4
-        uses: actions/cache@v3
-        env:
-          cache-name: cache-sd-v1-4
-        with:
-          path: models/ldm/stable-diffusion-v1/model.ckpt
-          key: ${{ env.cache-name }}
-          restore-keys: ${{ env.cache-name }}
-
-      - name: Download Stable Diffusion v1.4 Model
-        if: ${{ steps.cache-sd-v1-4.outputs.cache-hit != 'true' }}
-        run: |
-          [[ -d models/ldm/stable-diffusion-v1 ]] \
-            || mkdir -p models/ldm/stable-diffusion-v1
-          [[ -r models/ldm/stable-diffusion-v1/model.ckpt ]] \
-            || curl \
-              -H "Authorization: Bearer ${{ secrets.HUGGINGFACE_TOKEN }}" \
-              -o models/ldm/stable-diffusion-v1/model.ckpt \
-              -L https://huggingface.co/CompVis/stable-diffusion-v-1-4-original/resolve/main/sd-v1-4.ckpt
-
-      - name: Activate Conda Env
-        uses: conda-incubator/setup-miniconda@v2
-        with:
-          activate-environment: ${{ env.CONDA_ENV_NAME }}
-          environment-file: ${{ matrix.environment-file }}
-
-      - name: Use Cached Huggingface and Torch models
-        id: cache-hugginface-torch
-        uses: actions/cache@v3
-        env:
-          cache-name: cache-hugginface-torch
-        with:
-          path: ~/.cache
-          key: ${{ env.cache-name }}
-          restore-keys: |
-            ${{ env.cache-name }}-${{ hashFiles('scripts/preload_models.py') }}
-
-      - name: run preload_models.py
-        run: python scripts/preload_models.py

.github/workflows/mkdocs-flow.yml

@@ -1,28 +0,0 @@
-name: Deploy
-on:
-  push:
-    branches:
-      - main
-  # pull_request:
-  #   branches:
-  #     - main
-jobs:
-  build:
-    name: Deploy docs to GitHub Pages
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - name: Build
-        uses: Tiryoh/actions-mkdocs@v0
-        with:
-          mkdocs_version: 'latest' # option
-          requirements: '/requirements-mkdocs.txt' # option
-          configfile: '/mkdocs.yml' # option
-      - name: Deploy
-        uses: peaceiris/actions-gh-pages@v3
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: ./site

.github/workflows/mkdocs-material.yml

@@ -22,7 +22,7 @@ jobs:
       - name: install requirements
         run: |
           python -m \
-            pip install -r requirements-mkdocs.txt
+            pip install -r docs/requirements-mkdocs.txt
 
       - name: confirm buildability
         run: |

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

@@ -4,6 +4,7 @@ on:
     branches:
       - 'main'
       - 'development'
+      - 'fix-gh-actions-fork'
   pull_request:
     branches:
       - 'main'
@@ -12,31 +13,32 @@ on:
 jobs:
   matrix:
     strategy:
-      fail-fast: false
       matrix:
         stable-diffusion-model:
-          - 'https://huggingface.co/CompVis/stable-diffusion-v-1-4-original/resolve/main/sd-v1-4.ckpt'
-          - 'https://huggingface.co/runwayml/stable-diffusion-v1-5/resolve/main/v1-5-pruned-emaonly.ckpt'
-        os:
-          - ubuntu-latest
-          - macOS-12
+          - 'stable-diffusion-1.5'
+        environment-yaml:
+          - environment-lin-amd.yml
+          - environment-lin-cuda.yml
+          - environment-mac.yml
         include:
-          - os: ubuntu-latest
-            environment-file: environment.yml
+          - environment-yaml: environment-lin-amd.yml
+            os: ubuntu-latest
             default-shell: bash -l {0}
-          - os: macOS-12
-            environment-file: environment-mac.yml
+          - environment-yaml: environment-lin-cuda.yml
+            os: ubuntu-latest
             default-shell: bash -l {0}
-          - stable-diffusion-model: https://huggingface.co/CompVis/stable-diffusion-v-1-4-original/resolve/main/sd-v1-4.ckpt
-            stable-diffusion-model-dl-path: models/ldm/stable-diffusion-v1/model.ckpt
-            stable-diffusion-model-switch: stable-diffusion-1.4
-          - stable-diffusion-model: 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/v1-5-pruned-emaonly.ckpt
-            stable-diffusion-model-switch: stable-diffusion-1.5
-    name: ${{ matrix.os }} with ${{ matrix.stable-diffusion-model-switch }}
+          - environment-yaml: environment-mac.yml
+            os: macos-12
+            default-shell: bash -l {0}
+          - 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 }}
@@ -45,19 +47,27 @@ jobs:
         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-file) }}
+          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: ${{ matrix.environment-file }}
+          environment-file: environment.yml
           miniconda-version: latest
 
       - name: set test prompt to main branch validation
@@ -72,28 +82,44 @@ jobs:
         if: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/development' }}
         run: echo "TEST_PROMPTS=tests/validate_pr_prompt.txt" >> $GITHUB_ENV
 
-      - name: Download ${{ matrix.stable-diffusion-model-switch }}
+      - 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: |
-          [[ -d models/ldm/stable-diffusion-v1 ]] \
-            || mkdir -p models/ldm/stable-diffusion-v1
+          mkdir -p "${{ env.INVOKEAI_ROOT }}/${{ matrix.stable-diffusion-model-dl-path }}"
           curl \
             -H "Authorization: Bearer ${{ secrets.HUGGINGFACE_TOKEN }}" \
-            -o ${{ matrix.stable-diffusion-model-dl-path }} \
-            -L ${{ matrix.stable-diffusion-model }}
+            -o "${{ env.INVOKEAI_ROOT }}/${{ matrix.stable-diffusion-model-dl-path }}/${{ matrix.stable-diffusion-model-dl-name }}" \
+            -L ${{ matrix.stable-diffusion-model-url }}
 
-      - name: run preload_models.py
+      - name: run configure_invokeai.py
         id: run-preload-models
         run: |
-          python scripts/preload_models.py \
-            --no-interactive
+          python scripts/configure_invokeai.py --no-interactive --yes
+
+      - name: cat ~/.invokeai
+        id: cat-invokeai
+        run: cat ~/.invokeai
 
       - name: Run the tests
         id: run-tests
         run: |
           time python scripts/invoke.py \
-            --model ${{ matrix.stable-diffusion-model-switch }} \
-            --from_file ${{ env.TEST_PROMPTS }}
+            --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
@@ -105,5 +131,5 @@ jobs:
         id: archive-results
         uses: actions/upload-artifact@v3
         with:
-          name: results_${{ matrix.os }}_${{ matrix.stable-diffusion-model-switch }}
-          path: outputs/img-samples
+          name: results_${{ matrix.requirements-file }}_${{ matrix.python-version }}
+          path: ${{ env.INVOKEAI_ROOT }}/outputs

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

@@ -0,0 +1,128 @@
+name: Test invoke.py pip
+on:
+  push:
+    branches:
+      - 'main'
+      - 'development'
+  pull_request:
+    branches:
+      - 'main'
+      - 'development'
+
+jobs:
+  matrix:
+    strategy:
+      matrix:
+        stable-diffusion-model:
+          - stable-diffusion-1.5
+        requirements-file:
+          - requirements-lin-cuda.txt
+          - requirements-lin-amd.txt
+          - requirements-mac-mps-cpu.txt
+        python-version:
+          # - '3.9'
+          - '3.10'
+        include:
+          - requirements-file: requirements-lin-cuda.txt
+            os: ubuntu-latest
+            default-shell: bash -l {0}
+          - requirements-file: requirements-lin-amd.txt
+            os: ubuntu-latest
+            default-shell: bash -l {0}
+          - requirements-file: requirements-mac-mps-cpu.txt
+            os: macOS-12
+            default-shell: bash -l {0}
+          - 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 }}
+    runs-on: ${{ matrix.os }}
+    defaults:
+      run:
+        shell: ${{ matrix.default-shell }}
+    env:
+      INVOKEAI_ROOT: '${{ github.workspace }}/invokeai'
+    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: set test prompt to main branch validation
+        if: ${{ github.ref == 'refs/heads/main' }}
+        run: echo "TEST_PROMPTS=tests/preflight_prompts.txt" >> $GITHUB_ENV
+
+      - name: set test prompt to development branch validation
+        if: ${{ github.ref == 'refs/heads/development' }}
+        run: echo "TEST_PROMPTS=tests/dev_prompts.txt" >> $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" >> $GITHUB_ENV
+
+      - name: create requirements.txt
+        run: cp 'environments-and-requirements/${{ matrix.requirements-file }}' '${{ matrix.requirements-file }}'
+
+      - name: setup python
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+          cache: 'pip'
+          cache-dependency-path: ${{ matrix.requirements-file }}
+
+      # - name: install dependencies
+      #   run: ${{ env.pythonLocation }}/bin/pip install --upgrade pip setuptools wheel
+
+      - name: install requirements
+        run: ${{ env.pythonLocation }}/bin/pip install -r '${{ matrix.requirements-file }}'
+
+      - 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 }}"
+          curl \
+            -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: |
+          ${{ env.pythonLocation }}/bin/python scripts/configure_invokeai.py --no-interactive --yes
+
+      - name: cat ~/.invokeai
+        id: cat-invokeai
+        run: cat ~/.invokeai
+
+      - name: Run the tests
+        id: run-tests
+        run: |
+          time ${{ env.pythonLocation }}/bin/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: Archive results
+        id: archive-results
+        uses: actions/upload-artifact@v3
+        with:
+          name: results_${{ matrix.requirements-file }}_${{ matrix.python-version }}
+          path: ${{ env.INVOKEAI_ROOT }}/outputs

.gitignore

@@ -1,7 +1,7 @@
 # ignore default image save location and model symbolic link
 outputs/
 models/ldm/stable-diffusion-v1/model.ckpt
-ldm/invoke/restoration/codeformer/weights
+**/restoration/codeformer/weights
 
 # ignore user models config
 configs/models.user.yaml
@@ -184,7 +184,7 @@ src
 **/__pycache__/
 outputs
 
-# Logs and associated folders 
+# Logs and associated folders
 # created from generated embeddings.
 logs
 testtube
@@ -201,6 +201,7 @@ checkpoints
 gfpgan/
 models/ldm/stable-diffusion-v1/*.sha256
 
+
 # GFPGAN model files
 gfpgan/
 
@@ -208,4 +209,28 @@ gfpgan/
 configs/models.yaml
 
 # weights (will be created by installer)
-models/ldm/stable-diffusion-v1/*.ckpt
+models/ldm/stable-diffusion-v1/*.ckpt
+models/clipseg
+models/gfpgan
+
+# ignore initfile
+.invokeai
+
+# ignore environment.yml and requirements.txt
+# these are links to the real files in environments-and-requirements
+environment.yml
+requirements.txt
+
+# source installer files
+source_installer/*zip
+source_installer/invokeAI
+install.bat
+install.sh
+update.bat
+update.sh
+
+# this may be present if the user created a venv
+invokeai
+
+# no longer stored in source directory
+models

CODE_OF_CONDUCT.md

@@ -0,0 +1,128 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior
+may be reported to the community leaders responsible for enforcement
+at https://github.com/invoke-ai/InvokeAI/issues.  All complaints will
+be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.

InvokeAI_Statement_of_Values.md

@@ -0,0 +1,85 @@
+<img src="docs/assets/invoke_ai_banner.png" align="center">
+
+Invoke-AI is a community of software developers, researchers, and user
+interface experts who have come together on a voluntary basis to build
+software tools which support cutting edge AI text-to-image
+applications. This community is open to anyone who wishes to
+contribute to the effort and has the skill and time to do so.
+
+# Our Values
+
+The InvokeAI team is a diverse community which includes individuals
+from various parts of the world and many walks of life. Despite our
+differences, we share a number of core values which we ask prospective
+contributors to understand and respect. We believe:
+
+1. That Open Source Software is a positive force in the world. We
+create software that can be used, reused, and redistributed, without
+restrictions, under a straightforward Open Source license (MIT). We
+believe that Open Source benefits society as a whole by increasing the
+availability of high quality software to all.
+
+2. That those who create software should receive proper attribution
+for their creative work. While we support the exchange and reuse of
+Open Source Software, we feel strongly that the original authors of a
+piece of code should receive credit for their contribution, and we
+endeavor to do so whenever possible.
+
+3. That there is moral ambiguity surrounding AI-assisted art. We are
+aware of the moral and ethical issues surrounding the release of the
+Stable Diffusion model and similar products. We are aware that, due to
+the composition of their training sets, current AI-generated image
+models are biased against certain ethnic groups, cultural concepts of
+beauty, ethnic stereotypes, and gender roles.
+
+      1. We recognize the potential for harm to these groups that these biases
+       represent and trust that future AI models will take steps towards
+       reducing or eliminating the biases noted above, respect and give due
+       credit to the artists whose work is sourced, and call on developers
+       and users to favor these models over the older ones as they become
+       available.
+
+4. We are deeply committed to ensuring that this technology benefits
+everyone, including artists. We see AI art not as a replacement for
+the artist, but rather as a tool to empower them. With that
+in mind, we are constantly debating how to build systems that put
+artists’ needs first: tools which can be readily integrated into an
+artist’s existing workflows and practices, enhancing their work and
+helping them to push it further. Every decision we take as a team,
+which includes several artists, aims to build towards that goal.
+
+5. That artificial intelligence can be a force for good in the world,
+but must be used responsibly. Artificial intelligence technologies
+have the potential to improve society, in everything from cancer care,
+to customer service, to creative writing.
+
+     1. While we do not believe that software should arbitrarily limit what
+     users can do with it, we recognize that when used irresponsibly, AI
+     has the potential to do much harm. Our Discord server is actively
+     moderated in order to minimize the potential of harm from
+     user-contributed images. In addition, we ask users of our software to
+     refrain from using it in any way that would cause mental, emotional or
+     physical harm to individuals and vulnerable populations including (but
+     not limited to) women; minors; ethnic minorities; religious groups;
+     members of LGBTQIA communities; and people with disabilities or
+     impairments.
+
+     2. Note that some of the image generation AI models which the Invoke-AI
+     toolkit supports carry licensing agreements which impose restrictions
+     on how the model is used. We ask that our users read and agree to
+     these terms if they wish to make use of these models. These agreements
+     are distinct from the MIT license which applies to the InvokeAI
+     software and source code.
+
+6. That mutual respect is key to a healthy software development
+community. Members of the InvokeAI community are expected to treat
+each other with respect, beneficence, and empathy. Each of us has a
+different background and a unique set of skills. We strive to help
+each other grow and gain new skills, and we apportion expectations in
+a way that balances the members' time, skillset, and interest
+area. Disputes are resolved by open and honest communication.
+
+## Signature
+
+This document has been collectively crafted and approved by the current InvokeAI team members, as of 28 Nov 2022: **lstein** (Lincoln Stein), **blessedcoolant**, **hipsterusername** (Kent Keirsey), **Kyle0654** (Kyle Schouviller), **damian0815**, **mauwii** (Matthias Wild), **Netsvetaev** (Artur Netsvetaev), **psychedelicious**, **tildebyte**, and **keturn**. Although individuals within the group may hold differing views on particular details and/or their implications, we are all in agreement about its fundamental statements, as well as their significance and importance to this project moving forward.  
+

LICENSE

@@ -1,17 +1,6 @@
 MIT License
 
-Copyright (c) 2022 Lincoln Stein and InvokeAI Organization
-
-This software is derived from a fork of the source code available from
-https://github.com/pesser/stable-diffusion and
-https://github.com/CompViz/stable-diffusion. They carry the following
-copyrights:
-
-Copyright (c) 2022 Machine Vision and Learning Group, LMU Munich
-Copyright (c) 2022 Robin Rombach and Patrick Esser and contributors
-
-Please see individual source code files for copyright and authorship
-attributions.
+Copyright (c) 2022 InvokeAI Team
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -42,7 +42,7 @@ generation process. It runs on Windows, Mac 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.
 
-**Quick links**: [<a href="https://discord.gg/NwVCmKwY">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>]
+**Quick links**: [<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>]
 
 <div align="center"><img src="docs/assets/invoke-web-server-1.png" width=640></div>
 
@@ -65,14 +65,11 @@ requests. Be sure to use the provided templates. They will help aid diagnose iss
 
 ### Installation
 
-This fork is supported across multiple platforms. You can find individual installation instructions
-below.
-
-- #### [Linux](docs/installation/INSTALL_LINUX.md)
-
-- #### [Windows](docs/installation/INSTALL_WINDOWS.md)
-
-- #### [Macintosh](docs/installation/INSTALL_MAC.md)
+This fork is supported across Linux, Windows and Macintosh. Linux
+users can use either an Nvidia-based card (with CUDA support) or an
+AMD card (using the ROCm driver). For full installation and upgrade
+instructions, please see:
+[InvokeAI Installation Overview](https://invoke-ai.github.io/InvokeAI/installation/)
 
 ### Hardware Requirements
 
@@ -103,34 +100,33 @@ errors like 'expected type Float but found Half' or 'not implemented for Half'
 you can try starting `invoke.py` with the `--precision=float32` flag:
 
 ```bash
-(ldm) ~/stable-diffusion$ python scripts/invoke.py --precision=float32
+(invokeai) ~/InvokeAI$ python scripts/invoke.py --precision=float32
 ```
 
 ### Features
 
 #### Major Features
 
-- [Web Server](docs/features/WEB.md)
-- [Interactive Command Line Interface](docs/features/CLI.md)
-- [Image To Image](docs/features/IMG2IMG.md)
-- [Inpainting Support](docs/features/INPAINTING.md)
-- [Outpainting Support](docs/features/OUTPAINTING.md)
-- [Upscaling, face-restoration and outpainting](docs/features/POSTPROCESS.md)
-- [Seamless Tiling](docs/features/OTHER.md#seamless-tiling)
-- [Google Colab](docs/features/OTHER.md#google-colab)
-- [Reading Prompts From File](docs/features/PROMPTS.md#reading-prompts-from-a-file)
-- [Shortcut: Reusing Seeds](docs/features/OTHER.md#shortcuts-reusing-seeds)
-- [Prompt Blending](docs/features/PROMPTS.md#prompt-blending)
-- [Thresholding and Perlin Noise Initialization Options](/docs/features/OTHER.md#thresholding-and-perlin-noise-initialization-options)
-- [Negative/Unconditioned Prompts](docs/features/PROMPTS.md#negative-and-unconditioned-prompts)
-- [Variations](docs/features/VARIATIONS.md)
-- [Personalizing Text-to-Image Generation](docs/features/TEXTUAL_INVERSION.md)
-- [Simplified API for text to image generation](docs/features/OTHER.md#simplified-api)
+- [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)
 
 #### Other Features
 
-- [Creating Transparent Regions for Inpainting](docs/features/INPAINTING.md#creating-transparent-regions-for-inpainting)
-- [Preload Models](docs/features/OTHER.md#preload-models)
+- [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)
 
 ### Latest Changes
 
@@ -144,51 +140,58 @@ you can try starting `invoke.py` with the `--precision=float32` flag:
   - `dream.py` script renamed `invoke.py`. A `dream.py` script wrapper remains
     for backward compatibility.
   - Completely new WebGUI - launch with `python3 scripts/invoke.py --web`
-  - Support for <a href="https://github.com/invoke-ai/InvokeAI/blob/main/docs/features/INPAINTING.md">inpainting</a> and <a href="https://github.com/invoke-ai/InvokeAI/blob/main/docs/features/OUTPAINTING.md">outpainting</a>
+  - Support for <a href="https://invoke-ai.github.io/InvokeAI/features/INPAINTING/">inpainting</a> and <a href="https://invoke-ai.github.io/InvokeAI/features/OUTPAINTING/">outpainting</a>
   - img2img runs on all k* samplers
-  - Support for <a href="https://github.com/invoke-ai/InvokeAI/blob/main/docs/features/PROMPTS.md#negative-and-unconditioned-prompts">negative prompts</a>
+  - Support for <a href="https://invoke-ai.github.io/InvokeAI/features/PROMPTS/#negative-and-unconditioned-prompts">negative prompts</a>
   - Support for CodeFormer face reconstruction
   - Support for Textual Inversion on Macintoshes
-  - Support in both WebGUI and CLI for <a href="https://github.com/invoke-ai/InvokeAI/blob/main/docs/features/POSTPROCESS.md">post-processing of previously-generated images</a>
+  - Support in both WebGUI and CLI for <a href="https://invoke-ai.github.io/InvokeAI/features/POSTPROCESS/">post-processing of previously-generated images</a>
     using facial reconstruction, ESRGAN upscaling, outcropping (similar to DALL-E infinite canvas),
     and "embiggen" upscaling. See the `!fix` command.
-  - New `--hires` option on `invoke>` line allows <a href="https://github.com/invoke-ai/InvokeAI/blob/main/docs/features/CLI.md#this-is-an-example-of-txt2img">larger images to be created without duplicating elements</a>, at the cost of some performance.
+  - New `--hires` option on `invoke>` line allows <a href="https://invoke-ai.github.io/InvokeAI/features/CLI/#txt2img">larger images to be created without duplicating elements</a>, at the cost of some performance.
   - New `--perlin` and `--threshold` options allow you to add and control variation
     during image generation (see <a href="https://github.com/invoke-ai/InvokeAI/blob/main/docs/features/OTHER.md#thresholding-and-perlin-noise-initialization-options">Thresholding and Perlin Noise Initialization</a>
   - Extensive metadata now written into PNG files, allowing reliable regeneration of images
     and tweaking of previous settings.
   - Command-line completion in `invoke.py` now works on Windows, Linux and Mac platforms.
-  - Improved <a href="https://github.com/invoke-ai/InvokeAI/blob/main/docs/features/CLI.md">command-line completion behavior</a>.
+  - Improved <a href="https://invoke-ai.github.io/InvokeAI/features/CLI/">command-line completion behavior</a>.
     New commands added:
-       * List command-line history with `!history`
-       * Search command-line history with `!search`
-       * Clear history with `!clear`
+    - List command-line history with `!history`
+    - Search command-line history with `!search`
+    - Clear history with `!clear`
   - Deprecated `--full_precision` / `-F`. Simply omit it and `invoke.py` will auto
     configure. To switch away from auto use the new flag like `--precision=float32`.
 
-For older changelogs, please visit the **[CHANGELOG](docs/features/CHANGELOG.md)**.
+For older changelogs, please visit the **[CHANGELOG](https://invoke-ai.github.io/InvokeAI/CHANGELOG#v114-11-september-2022)**.
 
 ### Troubleshooting
 
-Please check out our **[Q&A](docs/help/TROUBLESHOOT.md)** to get solutions for common installation
+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.
 
 # Contributing
 
 Anyone who wishes to contribute to this project, whether documentation, features, bug fixes, code
-cleanup, testing, or code reviews, is very much encouraged to do so. 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).
+cleanup, testing, or code reviews, is very much encouraged to do so. To join, just raise your hand on the InvokeAI
+Discord server or discussion board. 
 
-A full set of contribution guidelines, along with templates, are in progress, but for now the most
+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, but for now the most
 important thing is to **make your pull request against the "development" branch**, and not against
 "main". This will help keep public breakage to a minimum and will allow you to propose more radical
 changes.
 
+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
+to become part of our community.
+
+Welcome to InvokeAI!
+
 ### Contributors
 
 This fork is a combined effort of various people from across the world.
-[Check out the list of all these amazing people](docs/other/CONTRIBUTORS.md). We thank them for
+[Check out the list of all these amazing people](https://invoke-ai.github.io/InvokeAI/other/CONTRIBUTORS/). We thank them for
 their time, hard work and effort.
 
 ### Support
@@ -202,4 +205,4 @@ Original portions of the software are Copyright (c) 2020
 ### Further Reading
 
 Please see the original README for more information on this software and underlying algorithm,
-located in the file [README-CompViz.md](docs/other/README-CompViz.md).
+located in the file [README-CompViz.md](https://invoke-ai.github.io/InvokeAI/other/README-CompViz/).

backend/modules/get_canvas_generation_mode.py

@@ -0,0 +1,117 @@
+from PIL import Image, ImageChops
+from PIL.Image import Image as ImageType
+from typing import Union, Literal
+
+# https://stackoverflow.com/questions/43864101/python-pil-check-if-image-is-transparent
+def check_for_any_transparency(img: Union[ImageType, str]) -> bool:
+    if type(img) is str:
+        img = Image.open(str)
+
+    if img.info.get("transparency", None) is not None:
+        return True
+    if img.mode == "P":
+        transparent = img.info.get("transparency", -1)
+        for _, index in img.getcolors():
+            if index == transparent:
+                return True
+    elif img.mode == "RGBA":
+        extrema = img.getextrema()
+        if extrema[3][0] < 255:
+            return True
+    return False
+
+
+def get_canvas_generation_mode(
+    init_img: Union[ImageType, str], init_mask: Union[ImageType, str]
+) -> Literal["txt2img", "outpainting", "inpainting", "img2img",]:
+    if type(init_img) is str:
+        init_img = Image.open(init_img)
+
+    if type(init_mask) is str:
+        init_mask = Image.open(init_mask)
+
+    init_img = init_img.convert("RGBA")
+
+    # Get alpha from init_img
+    init_img_alpha = init_img.split()[-1]
+    init_img_alpha_mask = init_img_alpha.convert("L")
+    init_img_has_transparency = check_for_any_transparency(init_img)
+
+    if init_img_has_transparency:
+        init_img_is_fully_transparent = (
+            True if init_img_alpha_mask.getbbox() is None else False
+        )
+
+    """
+    Mask images are white in areas where no change should be made, black where changes 
+    should be made.
+    """
+
+    # Fit the mask to init_img's size and convert it to greyscale
+    init_mask = init_mask.resize(init_img.size).convert("L")
+
+    """
+    PIL.Image.getbbox() returns the bounding box of non-zero areas of the image, so we first
+    invert the mask image so that masked areas are white and other areas black == zero.
+    getbbox() now tells us if the are any masked areas.
+    """
+    init_mask_bbox = ImageChops.invert(init_mask).getbbox()
+    init_mask_exists = False if init_mask_bbox is None else True
+
+    if init_img_has_transparency:
+        if init_img_is_fully_transparent:
+            return "txt2img"
+        else:
+            return "outpainting"
+    else:
+        if init_mask_exists:
+            return "inpainting"
+        else:
+            return "img2img"
+
+
+def main():
+    # Testing
+    init_img_opaque = "test_images/init-img_opaque.png"
+    init_img_partial_transparency = "test_images/init-img_partial_transparency.png"
+    init_img_full_transparency = "test_images/init-img_full_transparency.png"
+    init_mask_no_mask = "test_images/init-mask_no_mask.png"
+    init_mask_has_mask = "test_images/init-mask_has_mask.png"
+
+    print(
+        "OPAQUE IMAGE, NO MASK, expect img2img, got ",
+        get_canvas_generation_mode(init_img_opaque, init_mask_no_mask),
+    )
+
+    print(
+        "IMAGE WITH TRANSPARENCY, NO MASK, expect outpainting, got ",
+        get_canvas_generation_mode(
+            init_img_partial_transparency, init_mask_no_mask
+        ),
+    )
+
+    print(
+        "FULLY TRANSPARENT IMAGE NO MASK, expect txt2img, got ",
+        get_canvas_generation_mode(init_img_full_transparency, init_mask_no_mask),
+    )
+
+    print(
+        "OPAQUE IMAGE, WITH MASK, expect inpainting, got ",
+        get_canvas_generation_mode(init_img_opaque, init_mask_has_mask),
+    )
+
+    print(
+        "IMAGE WITH TRANSPARENCY, WITH MASK, expect outpainting, got ",
+        get_canvas_generation_mode(
+            init_img_partial_transparency, init_mask_has_mask
+        ),
+    )
+
+    print(
+        "FULLY TRANSPARENT IMAGE WITH MASK, expect txt2img, got ",
+        get_canvas_generation_mode(init_img_full_transparency, init_mask_has_mask),
+    )
+
+
+if __name__ == "__main__":
+    main()

backend/modules/parameters.py

@@ -5,6 +5,8 @@ SAMPLER_CHOICES = [
     "ddim",
     "k_dpm_2_a",
     "k_dpm_2",
+    "k_dpmpp_2_a",
+    "k_dpmpp_2",
     "k_euler_a",
     "k_euler",
     "k_heun",

configs/INITIAL_MODELS.yaml

@@ -0,0 +1,80 @@
+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)
+   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/models.yaml

@@ -1,36 +0,0 @@
-# This file describes the alternative machine learning models
-# available to InvokeAI script.
-#
-# To add a new model, follow the examples below. Each
-# model requires a model config file, a weights file,
-# and the width and height of the images it
-# was trained on.
-stable-diffusion-1.4:
-  config: ./configs/stable-diffusion/v1-inference.yaml
-  weights: ./models/ldm/stable-diffusion-v1/sd-v1-4.ckpt
-  vae: ./models/ldm/stable-diffusion-v1/vae-ft-mse-840000-ema-pruned.ckpt
-  description: The original Stable Diffusion version 1.4 weight file (4.27 GB)
-  width: 512
-  height: 512
-stable-diffusion-1.5:
-  description: The newest Stable Diffusion version 1.5 weight file (4.27 GB)
-  weights: ./models/ldm/stable-diffusion-v1/v1-5-pruned-emaonly.ckpt
-  config: ./configs/stable-diffusion/v1-inference.yaml
-  width: 512
-  height: 512
-  vae: ./models/ldm/stable-diffusion-v1/vae-ft-mse-840000-ema-pruned.ckpt
-  default: true
-inpainting-1.5:
-  description: RunwayML SD 1.5 model optimized for inpainting (4.27 GB)
-  weights: ./models/ldm/stable-diffusion-v1/sd-v1-5-inpainting.ckpt
-  config: ./configs/stable-diffusion/v1-inpainting-inference.yaml
-  width: 512
-  height: 512
-  vae: ./models/ldm/stable-diffusion-v1/vae-ft-mse-840000-ema-pruned.ckpt
-waifu-diffusion-1.3:
-  description: Stable Diffusion 1.4 fine tuned on anime-styled images (4.27)
-  weights: ./models/ldm/stable-diffusion-v1/model-epoch09-float32.ckpt
-  config: ./configs/stable-diffusion/v1-inference.yaml
-  width: 512
-  height: 512
-  vae: ./models/ldm/stable-diffusion-v1/vae-ft-mse-840000-ema-pruned.ckpt

configs/models.yaml.example

@@ -0,0 +1,27 @@
+# This file describes the alternative machine learning models
+# available to InvokeAI script.
+#
+# To add a new model, follow the examples below. Each
+# model requires a model config file, a weights file,
+# and the width and height of the images it
+# was trained on.
+stable-diffusion-1.5:
+  description: The newest Stable Diffusion version 1.5 weight file (4.27 GB)
+  weights: models/ldm/stable-diffusion-v1/v1-5-pruned-emaonly.ckpt
+  config: configs/stable-diffusion/v1-inference.yaml
+  width: 512
+  height: 512
+  vae: ./models/ldm/stable-diffusion-v1/vae-ft-mse-840000-ema-pruned.ckpt
+  default: true
+stable-diffusion-1.4:
+  description: Stable Diffusion inference model version 1.4
+  config: configs/stable-diffusion/v1-inference.yaml
+  weights: models/ldm/stable-diffusion-v1/sd-v1-4.ckpt
+  vae: models/ldm/stable-diffusion-v1/vae-ft-mse-840000-ema-pruned.ckpt
+  width: 512
+  height: 512
+inpainting-1.5:
+  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
+  description: RunwayML SD 1.5 model optimized for inpainting

configs/sd-concepts.txt

@@ -0,0 +1,803 @@
+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

configs/stable-diffusion/v1-inference.yaml

@@ -30,9 +30,9 @@ model:
       target: ldm.modules.embedding_manager.EmbeddingManager
       params:
         placeholder_strings: ["*"]
-        initializer_words: ['face', 'man', 'photo', 'africanmale']
+        initializer_words: ['sculpture']
         per_image_tokens: false
-        num_vectors_per_token: 1
+        num_vectors_per_token: 8
         progressive_words: False
 
     unet_config:

configs/stable-diffusion/v1-inpainting-inference.yaml

@@ -30,9 +30,9 @@ model:
       target: ldm.modules.embedding_manager.EmbeddingManager
       params:
         placeholder_strings: ["*"]
-        initializer_words: ['face', 'man', 'photo', 'africanmale']
+        initializer_words: ['sculpture']
         per_image_tokens: false
-        num_vectors_per_token: 1
+        num_vectors_per_token: 8
         progressive_words: False
 
     unet_config:

configs/stable-diffusion/v1-m1-finetune.yaml

@@ -22,7 +22,7 @@ model:
       target: ldm.modules.embedding_manager.EmbeddingManager
       params:
         placeholder_strings: ["*"]
-        initializer_words: ['face', 'man', 'photo', 'africanmale']
+        initializer_words: ['sculpture']
         per_image_tokens: false
         num_vectors_per_token: 6
         progressive_words: False

docker-build/Dockerfile

@@ -1,34 +1,13 @@
-FROM ubuntu AS get_miniconda
-
-SHELL ["/bin/bash", "-c"]
-
-# install wget
-RUN apt-get update \
-  && apt-get install -y \
-    wget \
-  && apt-get clean \
-  && rm -rf /var/lib/apt/lists/*
-
-# download and install miniconda
-ARG conda_version=py39_4.12.0-Linux-x86_64
-ARG conda_prefix=/opt/conda
-RUN wget --progress=dot:giga -O /miniconda.sh \
-  https://repo.anaconda.com/miniconda/Miniconda3-${conda_version}.sh \
-  && bash /miniconda.sh -b -p ${conda_prefix} \
-  && rm -f /miniconda.sh
-
-FROM ubuntu AS invokeai
+FROM ubuntu:22.10
 
 # use bash
 SHELL [ "/bin/bash", "-c" ]
 
-# clean bashrc
-RUN echo "" > ~/.bashrc
-
 # Install necesarry packages
 RUN apt-get update \
   && apt-get install -y \
     --no-install-recommends \
+    build-essential \
     gcc \
     git \
     libgl1-mesa-glx \
@@ -39,36 +18,17 @@ RUN apt-get update \
   && apt-get clean \
   && rm -rf /var/lib/apt/lists/*
 
-# clone repository and create symlinks
-ARG invokeai_git=https://github.com/invoke-ai/InvokeAI.git
-ARG project_name=invokeai
-RUN git clone ${invokeai_git} /${project_name} \
-  && mkdir /${project_name}/models/ldm/stable-diffusion-v1 \
-  && ln -s /data/models/sd-v1-4.ckpt /${project_name}/models/ldm/stable-diffusion-v1/model.ckpt \
-  && ln -s /data/outputs/ /${project_name}/outputs
+# set workdir and copy sources
+WORKDIR /invokeai
+ARG PIP_REQUIREMENTS=requirements-lin-cuda.txt
+COPY . ./environments-and-requirements/${PIP_REQUIREMENTS} ./
 
-# set workdir
-WORKDIR /${project_name}
+# install requirements and link outputs folder
+RUN pip install \
+  --no-cache-dir \
+  -r ${PIP_REQUIREMENTS}
 
-# install conda env and preload models
-ARG conda_prefix=/opt/conda
-ARG conda_env_file=environment.yml
-COPY --from=get_miniconda ${conda_prefix} ${conda_prefix}
-RUN source ${conda_prefix}/etc/profile.d/conda.sh \
-  && conda init bash \
-  && source ~/.bashrc \
-  && conda env create \
-    --name ${project_name} \
-    --file ${conda_env_file} \
-  && rm -Rf ~/.cache \
-  && conda clean -afy \
-  && echo "conda activate ${project_name}" >> ~/.bashrc \
-  && ln -s /data/models/GFPGANv1.4.pth ./src/gfpgan/experiments/pretrained_models/GFPGANv1.4.pth \
-  && conda activate ${project_name} \
-  && python scripts/preload_models.py
-
-# Copy entrypoint and set env
-ENV CONDA_PREFIX=${conda_prefix}
-ENV PROJECT_NAME=${project_name}
-COPY docker-build/entrypoint.sh /
-ENTRYPOINT [ "/entrypoint.sh" ]
+# set Environment, Entrypoint and default CMD
+ENV INVOKEAI_ROOT /data
+ENTRYPOINT [ "python3", "scripts/invoke.py", "--outdir=/data/outputs" ]
+CMD [ "--web", "--host=0.0.0.0" ]

docker-build/build.sh

@@ -1,81 +1,49 @@
 #!/usr/bin/env bash
 set -e
-# IMPORTANT: You need to have a token on huggingface.co to be able to download the checkpoint!!!
-# configure values by using env when executing build.sh
-# f.e. env ARCH=aarch64 GITHUB_INVOKE_AI=https://github.com/yourname/yourfork.git ./build.sh
 
-source ./docker-build/env.sh || echo "please run from repository root" || exit 1
+# IMPORTANT: You need to have a token on huggingface.co to be able to download the checkpoints!!!
+# configure values by using env when executing build.sh f.e. `env ARCH=aarch64 ./build.sh`
 
-invokeai_conda_version=${INVOKEAI_CONDA_VERSION:-py39_4.12.0-${platform/\//-}}
-invokeai_conda_prefix=${INVOKEAI_CONDA_PREFIX:-\/opt\/conda}
-invokeai_conda_env_file=${INVOKEAI_CONDA_ENV_FILE:-environment.yml}
-invokeai_git=${INVOKEAI_GIT:-https://github.com/invoke-ai/InvokeAI.git}
-huggingface_token=${HUGGINGFACE_TOKEN?}
+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 "You are using these values:"
-echo -e "project_name:\t\t ${project_name}"
+echo -e "Dockerfile:\t\t ${dockerfile}"
+echo -e "requirements:\t\t ${pip_requirements}"
 echo -e "volumename:\t\t ${volumename}"
 echo -e "arch:\t\t\t ${arch}"
 echo -e "platform:\t\t ${platform}"
-echo -e "invokeai_conda_version:\t ${invokeai_conda_version}"
-echo -e "invokeai_conda_prefix:\t ${invokeai_conda_prefix}"
-echo -e "invokeai_conda_env_file: ${invokeai_conda_env_file}"
-echo -e "invokeai_git:\t\t ${invokeai_git}"
 echo -e "invokeai_tag:\t\t ${invokeai_tag}\n"
 
-_runAlpine() {
-  docker run \
-    --rm \
-    --interactive \
-    --tty \
-    --mount source="$volumename",target=/data \
-    --workdir /data \
-    alpine "$@"
-}
-
-_copyCheckpoints() {
-  echo "creating subfolders for models and outputs"
-  _runAlpine mkdir models
-  _runAlpine mkdir outputs
-  echo -n "downloading sd-v1-4.ckpt"
-  _runAlpine wget --header="Authorization: Bearer ${huggingface_token}" -O models/sd-v1-4.ckpt https://huggingface.co/CompVis/stable-diffusion-v-1-4-original/resolve/main/sd-v1-4.ckpt
-  echo "done"
-  echo "downloading GFPGANv1.4.pth"
-  _runAlpine wget -O models/GFPGANv1.4.pth https://github.com/TencentARC/GFPGAN/releases/download/v1.3.0/GFPGANv1.4.pth
-}
-
-_checkVolumeContent() {
-  _runAlpine ls -lhA /data/models
-}
-
-_getModelMd5s() {
-  _runAlpine  \
-    alpine sh -c "md5sum /data/models/*"
-}
-
 if [[ -n "$(docker volume ls -f name="${volumename}" -q)" ]]; then
   echo "Volume already exists"
-  if [[ -z "$(_checkVolumeContent)" ]]; then
-    echo "looks empty, copying checkpoint"
-    _copyCheckpoints
-  fi
-  echo "Models in ${volumename}:"
-  _checkVolumeContent
+  echo
 else
   echo -n "createing docker volume "
   docker volume create "${volumename}"
-  _copyCheckpoints
 fi
 
 # Build Container
 docker build \
   --platform="${platform}" \
-  --tag "${invokeai_tag}" \
-  --build-arg project_name="${project_name}" \
-  --build-arg conda_version="${invokeai_conda_version}" \
-  --build-arg conda_prefix="${invokeai_conda_prefix}" \
-  --build-arg conda_env_file="${invokeai_conda_env_file}" \
-  --build-arg invokeai_git="${invokeai_git}" \
-  --file ./docker-build/Dockerfile \
+  --tag="${invokeai_tag}" \
+  --build-arg="PIP_REQUIREMENTS=${pip_requirements}" \
+  --file="${dockerfile}" \
   .
+
+docker run \
+  --rm \
+  --platform="$platform" \
+  --name="$project_name" \
+  --hostname="$project_name" \
+  --mount="source=$volumename,target=/data" \
+  --mount="type=bind,source=$HOME/.huggingface,target=/root/.huggingface" \
+  --env="HUGGINGFACE_TOKEN=${HUGGINGFACE_TOKEN}" \
+  --entrypoint="python3" \
+  "${invokeai_tag}" \
+  scripts/configure_invokeai.py --yes

docker-build/entrypoint.sh

@@ -1,8 +0,0 @@
-#!/bin/bash
-set -e
-
-source "${CONDA_PREFIX}/etc/profile.d/conda.sh"
-conda activate "${PROJECT_NAME}"
-
-python scripts/invoke.py \
-  ${@:---web --host=0.0.0.0}

docker-build/env.sh

@@ -4,7 +4,7 @@ project_name=${PROJECT_NAME:-invokeai}
 volumename=${VOLUMENAME:-${project_name}_data}
 arch=${ARCH:-x86_64}
 platform=${PLATFORM:-Linux/${arch}}
-invokeai_tag=${INVOKEAI_TAG:-${project_name}-${arch}}
+invokeai_tag=${INVOKEAI_TAG:-${project_name}:${arch}}
 
 export project_name
 export volumename

docker-build/run.sh

@@ -7,9 +7,9 @@ docker run \
   --interactive \
   --tty \
   --rm \
-  --platform "$platform" \
-  --name "$project_name" \
-  --hostname "$project_name" \
-  --mount source="$volumename",target=/data \
-  --publish 9090:9090 \
+  --platform="$platform" \
+  --name="$project_name" \
+  --hostname="$project_name" \
+  --mount="source=$volumename,target=/data" \
+  --publish=9090:9090 \
   "$invokeai_tag" ${1:+$@}

docs/CHANGELOG.md

@@ -4,66 +4,250 @@ title: Changelog
 
 # :octicons-log-16: **Changelog**
 
-## v2.0.1 (13 October 2022)
+## v2.1.0 <small>(2 November 2022)</small>
 
-  - fix noisy images at high step count when using k* samplers
-  - dream.py script now calls invoke.py module directly rather than
-    via a new python process (which could break the environment)
+- update mac instructions to use invokeai for env name by @willwillems in
+  https://github.com/invoke-ai/InvokeAI/pull/1030
+- Update .gitignore by @blessedcoolant in
+  https://github.com/invoke-ai/InvokeAI/pull/1040
+- reintroduce fix for m1 from https://github.com/invoke-ai/InvokeAI/pull/579
+  missing after merge by @skurovec in
+  https://github.com/invoke-ai/InvokeAI/pull/1056
+- Update Stable_Diffusion_AI_Notebook.ipynb (Take 2) by @ChloeL19 in
+  https://github.com/invoke-ai/InvokeAI/pull/1060
+- Print out the device type which is used by @manzke in
+  https://github.com/invoke-ai/InvokeAI/pull/1073
+- Hires Addition by @hipsterusername in
+  https://github.com/invoke-ai/InvokeAI/pull/1063
+- fix for "1 leaked semaphore objects to clean up at shutdown" on M1 by
+  @skurovec in https://github.com/invoke-ai/InvokeAI/pull/1081
+- Forward dream.py to invoke.py using the same interpreter, add deprecation
+  warning by @db3000 in https://github.com/invoke-ai/InvokeAI/pull/1077
+- fix noisy images at high step counts by @lstein in
+  https://github.com/invoke-ai/InvokeAI/pull/1086
+- Generalize facetool strength argument by @db3000 in
+  https://github.com/invoke-ai/InvokeAI/pull/1078
+- Enable fast switching among models at the invoke> command line by @lstein in
+  https://github.com/invoke-ai/InvokeAI/pull/1066
+- Fix Typo, committed changing ldm environment to invokeai by @jdries3 in
+  https://github.com/invoke-ai/InvokeAI/pull/1095
+- Update generate.py by @unreleased in
+  https://github.com/invoke-ai/InvokeAI/pull/1109
+- Update 'ldm' env to 'invokeai' in troubleshooting steps by @19wolf in
+  https://github.com/invoke-ai/InvokeAI/pull/1125
+- Fixed documentation typos and resolved merge conflicts by @rupeshs in
+  https://github.com/invoke-ai/InvokeAI/pull/1123
+- Fix broken doc links, fix malaprop in the project subtitle by @majick in
+  https://github.com/invoke-ai/InvokeAI/pull/1131
+- Only output facetool parameters if enhancing faces by @db3000 in
+  https://github.com/invoke-ai/InvokeAI/pull/1119
+- Update gitignore to ignore codeformer weights at new location by
+  @spezialspezial in https://github.com/invoke-ai/InvokeAI/pull/1136
+- fix links to point to invoke-ai.github.io #1117 by @mauwii in
+  https://github.com/invoke-ai/InvokeAI/pull/1143
+- Rework-mkdocs by @mauwii in https://github.com/invoke-ai/InvokeAI/pull/1144
+- add option to CLI and pngwriter that allows user to set PNG compression level
+  by @lstein in https://github.com/invoke-ai/InvokeAI/pull/1127
+- Fix img2img DDIM index out of bound by @wfng92 in
+  https://github.com/invoke-ai/InvokeAI/pull/1137
+- Fix gh actions by @mauwii in https://github.com/invoke-ai/InvokeAI/pull/1128
+- update mac instructions to use invokeai for env name by @willwillems in
+  https://github.com/invoke-ai/InvokeAI/pull/1030
+- Update .gitignore by @blessedcoolant in
+  https://github.com/invoke-ai/InvokeAI/pull/1040
+- reintroduce fix for m1 from https://github.com/invoke-ai/InvokeAI/pull/579
+  missing after merge by @skurovec in
+  https://github.com/invoke-ai/InvokeAI/pull/1056
+- Update Stable_Diffusion_AI_Notebook.ipynb (Take 2) by @ChloeL19 in
+  https://github.com/invoke-ai/InvokeAI/pull/1060
+- Print out the device type which is used by @manzke in
+  https://github.com/invoke-ai/InvokeAI/pull/1073
+- Hires Addition by @hipsterusername in
+  https://github.com/invoke-ai/InvokeAI/pull/1063
+- fix for "1 leaked semaphore objects to clean up at shutdown" on M1 by
+  @skurovec in https://github.com/invoke-ai/InvokeAI/pull/1081
+- Forward dream.py to invoke.py using the same interpreter, add deprecation
+  warning by @db3000 in https://github.com/invoke-ai/InvokeAI/pull/1077
+- fix noisy images at high step counts by @lstein in
+  https://github.com/invoke-ai/InvokeAI/pull/1086
+- Generalize facetool strength argument by @db3000 in
+  https://github.com/invoke-ai/InvokeAI/pull/1078
+- Enable fast switching among models at the invoke> command line by @lstein in
+  https://github.com/invoke-ai/InvokeAI/pull/1066
+- Fix Typo, committed changing ldm environment to invokeai by @jdries3 in
+  https://github.com/invoke-ai/InvokeAI/pull/1095
+- Fixed documentation typos and resolved merge conflicts by @rupeshs in
+  https://github.com/invoke-ai/InvokeAI/pull/1123
+- Only output facetool parameters if enhancing faces by @db3000 in
+  https://github.com/invoke-ai/InvokeAI/pull/1119
+- add option to CLI and pngwriter that allows user to set PNG compression level
+  by @lstein in https://github.com/invoke-ai/InvokeAI/pull/1127
+- Fix img2img DDIM index out of bound by @wfng92 in
+  https://github.com/invoke-ai/InvokeAI/pull/1137
+- Add text prompt to inpaint mask support by @lstein in
+  https://github.com/invoke-ai/InvokeAI/pull/1133
+- Respect http[s] protocol when making socket.io middleware by @damian0815 in
+  https://github.com/invoke-ai/InvokeAI/pull/976
+- WebUI: Adds Codeformer support by @psychedelicious in
+  https://github.com/invoke-ai/InvokeAI/pull/1151
+- Skips normalizing prompts for web UI metadata by @psychedelicious in
+  https://github.com/invoke-ai/InvokeAI/pull/1165
+- Add Asymmetric Tiling by @carson-katri in
+  https://github.com/invoke-ai/InvokeAI/pull/1132
+- Web UI: Increases max CFG Scale to 200 by @psychedelicious in
+  https://github.com/invoke-ai/InvokeAI/pull/1172
+- Corrects color channels in face restoration; Fixes #1167 by @psychedelicious
+  in https://github.com/invoke-ai/InvokeAI/pull/1175
+- Flips channels using array slicing instead of using OpenCV by @psychedelicious
+  in https://github.com/invoke-ai/InvokeAI/pull/1178
+- Fix typo in docs: s/Formally/Formerly by @noodlebox in
+  https://github.com/invoke-ai/InvokeAI/pull/1176
+- fix clipseg loading problems by @lstein in
+  https://github.com/invoke-ai/InvokeAI/pull/1177
+- Correct color channels in upscale using array slicing by @wfng92 in
+  https://github.com/invoke-ai/InvokeAI/pull/1181
+- Web UI: Filters existing images when adding new images; Fixes #1085 by
+  @psychedelicious in https://github.com/invoke-ai/InvokeAI/pull/1171
+- fix a number of bugs in textual inversion by @lstein in
+  https://github.com/invoke-ai/InvokeAI/pull/1190
+- Improve !fetch, add !replay command by @ArDiouscuros in
+  https://github.com/invoke-ai/InvokeAI/pull/882
+- Fix generation of image with s>1000 by @holstvoogd in
+  https://github.com/invoke-ai/InvokeAI/pull/951
+- Web UI: Gallery improvements by @psychedelicious in
+  https://github.com/invoke-ai/InvokeAI/pull/1198
+- Update CLI.md by @krummrey in https://github.com/invoke-ai/InvokeAI/pull/1211
+- outcropping improvements by @lstein in
+  https://github.com/invoke-ai/InvokeAI/pull/1207
+- add support for loading VAE autoencoders by @lstein in
+  https://github.com/invoke-ai/InvokeAI/pull/1216
+- remove duplicate fix_func for MPS by @wfng92 in
+  https://github.com/invoke-ai/InvokeAI/pull/1210
+- Metadata storage and retrieval fixes by @lstein in
+  https://github.com/invoke-ai/InvokeAI/pull/1204
+- nix: add shell.nix file by @Cloudef in
+  https://github.com/invoke-ai/InvokeAI/pull/1170
+- Web UI: Changes vite dist asset paths to relative by @psychedelicious in
+  https://github.com/invoke-ai/InvokeAI/pull/1185
+- Web UI: Removes isDisabled from PromptInput by @psychedelicious in
+  https://github.com/invoke-ai/InvokeAI/pull/1187
+- Allow user to generate images with initial noise as on M1 / mps system by
+  @ArDiouscuros in https://github.com/invoke-ai/InvokeAI/pull/981
+- feat: adding filename format template by @plucked in
+  https://github.com/invoke-ai/InvokeAI/pull/968
+- Web UI: Fixes broken bundle by @psychedelicious in
+  https://github.com/invoke-ai/InvokeAI/pull/1242
+- Support runwayML custom inpainting model by @lstein in
+  https://github.com/invoke-ai/InvokeAI/pull/1243
+- Update IMG2IMG.md by @talitore in
+  https://github.com/invoke-ai/InvokeAI/pull/1262
+- New dockerfile - including a build- and a run- script as well as a GH-Action
+  by @mauwii in https://github.com/invoke-ai/InvokeAI/pull/1233
+- cut over from karras to model noise schedule for higher steps by @lstein in
+  https://github.com/invoke-ai/InvokeAI/pull/1222
+- Prompt tweaks by @lstein in https://github.com/invoke-ai/InvokeAI/pull/1268
+- Outpainting implementation by @Kyle0654 in
+  https://github.com/invoke-ai/InvokeAI/pull/1251
+- fixing aspect ratio on hires by @tjennings in
+  https://github.com/invoke-ai/InvokeAI/pull/1249
+- Fix-build-container-action by @mauwii in
+  https://github.com/invoke-ai/InvokeAI/pull/1274
+- handle all unicode characters by @damian0815 in
+  https://github.com/invoke-ai/InvokeAI/pull/1276
+- adds models.user.yml to .gitignore by @JakeHL in
+  https://github.com/invoke-ai/InvokeAI/pull/1281
+- remove debug branch, set fail-fast to false by @mauwii in
+  https://github.com/invoke-ai/InvokeAI/pull/1284
+- Protect-secrets-on-pr by @mauwii in
+  https://github.com/invoke-ai/InvokeAI/pull/1285
+- Web UI: Adds initial inpainting implementation by @psychedelicious in
+  https://github.com/invoke-ai/InvokeAI/pull/1225
+- fix environment-mac.yml - tested on x64 and arm64 by @mauwii in
+  https://github.com/invoke-ai/InvokeAI/pull/1289
+- Use proper authentication to download model by @mauwii in
+  https://github.com/invoke-ai/InvokeAI/pull/1287
+- Prevent indexing error for mode RGB by @spezialspezial in
+  https://github.com/invoke-ai/InvokeAI/pull/1294
+- Integrate sd-v1-5 model into test matrix (easily expandable), remove
+  unecesarry caches by @mauwii in
+  https://github.com/invoke-ai/InvokeAI/pull/1293
+- add --no-interactive to preload_models step by @mauwii in
+  https://github.com/invoke-ai/InvokeAI/pull/1302
+- 1-click installer and updater. Uses micromamba to install git and conda into a
+  contained environment (if necessary) before running the normal installation
+  script by @cmdr2 in https://github.com/invoke-ai/InvokeAI/pull/1253
+- preload_models.py script downloads the weight files by @lstein in
+  https://github.com/invoke-ai/InvokeAI/pull/1290
+
+## v2.0.1 <small>(13 October 2022)</small>
+
+- fix noisy images at high step count when using k\* samplers
+- dream.py script now calls invoke.py module directly rather than via a new
+  python process (which could break the environment)
 
 ## v2.0.0 <small>(9 October 2022)</small>
 
-  - `dream.py` script renamed `invoke.py`. A `dream.py` script wrapper remains
-    for backward compatibility.
-  - Completely new WebGUI - launch with `python3 scripts/invoke.py --web`
-  - Support for <a href="https://github.com/invoke-ai/InvokeAI/blob/main/docs/features/INPAINTING.md">inpainting</a> and <a href="https://github.com/invoke-ai/InvokeAI/blob/main/docs/features/OUTPAINTING.md">outpainting</a>
-  - img2img runs on all k* samplers
-  - Support for <a href="https://github.com/invoke-ai/InvokeAI/blob/main/docs/features/PROMPTS.md#negative-and-unconditioned-prompts">negative prompts</a>
-  - Support for CodeFormer face reconstruction
-  - Support for Textual Inversion on Macintoshes
-  - Support in both WebGUI and CLI for <a href="https://github.com/invoke-ai/InvokeAI/blob/main/docs/features/POSTPROCESS.md">post-processing of previously-generated images</a>
-    using facial reconstruction, ESRGAN upscaling, outcropping (similar to DALL-E infinite canvas),
-    and "embiggen" upscaling. See the `!fix` command.
-  - New `--hires` option on `invoke>` line allows <a href="https://github.com/invoke-ai/InvokeAI/blob/main/docs/features/CLI.m#this-is-an-example-of-txt2img">larger images to be created without duplicating elements</a>, at the cost of some performance.
-  - New `--perlin` and `--threshold` options allow you to add and control variation
-    during image generation (see <a href="https://github.com/invoke-ai/InvokeAI/blob/main/docs/features/OTHER.md#thresholding-and-perlin-noise-initialization-options">Thresholding and Perlin Noise Initialization</a>
-  - Extensive metadata now written into PNG files, allowing reliable regeneration of images
-    and tweaking of previous settings.
-  - Command-line completion in `invoke.py` now works on Windows, Linux and Mac platforms.
-  - Improved <a href="https://github.com/invoke-ai/InvokeAI/blob/main/docs/features/CLI.m">command-line completion behavior</a>.
-    New commands added:
-       * List command-line history with `!history`
-       * Search command-line history with `!search`
-       * Clear history with `!clear`
-  - Deprecated `--full_precision` / `-F`. Simply omit it and `invoke.py` will auto
-    configure. To switch away from auto use the new flag like `--precision=float32`.
+- `dream.py` script renamed `invoke.py`. A `dream.py` script wrapper remains for
+  backward compatibility.
+- Completely new WebGUI - launch with `python3 scripts/invoke.py --web`
+- Support for [inpainting](features/INPAINTING.md) and
+  [outpainting](features/OUTPAINTING.md)
+- img2img runs on all k\* samplers
+- Support for
+  [negative prompts](features/PROMPTS.md#negative-and-unconditioned-prompts)
+- Support for CodeFormer face reconstruction
+- Support for Textual Inversion on Macintoshes
+- Support in both WebGUI and CLI for
+  [post-processing of previously-generated images](features/POSTPROCESS.md)
+  using facial reconstruction, ESRGAN upscaling, outcropping (similar to DALL-E
+  infinite canvas), and "embiggen" upscaling. See the `!fix` command.
+- New `--hires` option on `invoke>` line allows
+  [larger images to be created without duplicating elements](features/CLI.md#this-is-an-example-of-txt2img),
+  at the cost of some performance.
+- New `--perlin` and `--threshold` options allow you to add and control
+  variation during image generation (see
+  [Thresholding and Perlin Noise Initialization](features/OTHER.md#thresholding-and-perlin-noise-initialization-options))
+- Extensive metadata now written into PNG files, allowing reliable regeneration
+  of images and tweaking of previous settings.
+- Command-line completion in `invoke.py` now works on Windows, Linux and Mac
+  platforms.
+- Improved [command-line completion behavior](features/CLI.md) New commands
+  added:
+  - List command-line history with `!history`
+  - Search command-line history with `!search`
+  - Clear history with `!clear`
+- Deprecated `--full_precision` / `-F`. Simply omit it and `invoke.py` will auto
+  configure. To switch away from auto use the new flag like
+  `--precision=float32`.
 
 ## v1.14 <small>(11 September 2022)</small>
 
-  - Memory optimizations for small-RAM cards. 512x512 now possible on 4 GB GPUs.
-  - Full support for Apple hardware with M1 or M2 chips.
-  - Add "seamless mode" for circular tiling of image. Generates beautiful effects.
-    ([prixt](https://github.com/prixt)).
-  - Inpainting support.
-  - Improved web server GUI.
-  - Lots of code and documentation cleanups.
+- Memory optimizations for small-RAM cards. 512x512 now possible on 4 GB GPUs.
+- Full support for Apple hardware with M1 or M2 chips.
+- Add "seamless mode" for circular tiling of image. Generates beautiful effects.
+  ([prixt](https://github.com/prixt)).
+- Inpainting support.
+- Improved web server GUI.
+- Lots of code and documentation cleanups.
 
 ## v1.13 <small>(3 September 2022)</small>
 
-  - Support image variations (see [VARIATIONS](features/VARIATIONS.md)
-    ([Kevin Gibbons](https://github.com/bakkot) and many contributors and reviewers)
-  - Supports a Google Colab notebook for a standalone server running on Google hardware
-    [Arturo Mendivil](https://github.com/artmen1516)
-  - WebUI supports GFPGAN/ESRGAN facial reconstruction and upscaling
-    [Kevin Gibbons](https://github.com/bakkot)
-  - WebUI supports incremental display of in-progress images during generation
-    [Kevin Gibbons](https://github.com/bakkot)
-  - A new configuration file scheme that allows new models (including upcoming
-    stable-diffusion-v1.5) to be added without altering the code.
-    ([David Wager](https://github.com/maddavid12))
-  - Can specify --grid on invoke.py command line as the default.
-  - Miscellaneous internal bug and stability fixes.
-  - Works on M1 Apple hardware.
-  - Multiple bug fixes.
+- Support image variations (see [VARIATIONS](features/VARIATIONS.md)
+  ([Kevin Gibbons](https://github.com/bakkot) and many contributors and
+  reviewers)
+- Supports a Google Colab notebook for a standalone server running on Google
+  hardware [Arturo Mendivil](https://github.com/artmen1516)
+- WebUI supports GFPGAN/ESRGAN facial reconstruction and upscaling
+  [Kevin Gibbons](https://github.com/bakkot)
+- WebUI supports incremental display of in-progress images during generation
+  [Kevin Gibbons](https://github.com/bakkot)
+- A new configuration file scheme that allows new models (including upcoming
+  stable-diffusion-v1.5) to be added without altering the code.
+  ([David Wager](https://github.com/maddavid12))
+- Can specify --grid on invoke.py command line as the default.
+- Miscellaneous internal bug and stability fixes.
+- Works on M1 Apple hardware.
+- Multiple bug fixes.
 
 ---
 
@@ -71,49 +255,59 @@ title: Changelog
 
 - Improved file handling, including ability to read prompts from standard input.
   (kudos to [Yunsaki](https://github.com/yunsaki)
-- The web server is now integrated with the invoke.py script. Invoke by adding --web to
-  the invoke.py command arguments.
+- The web server is now integrated with the invoke.py script. Invoke by adding
+  --web to the invoke.py command arguments.
 - Face restoration and upscaling via GFPGAN and Real-ESGAN are now automatically
   enabled if the GFPGAN directory is located as a sibling to Stable Diffusion.
-  VRAM requirements are modestly reduced. Thanks to both [Blessedcoolant](https://github.com/blessedcoolant) and
+  VRAM requirements are modestly reduced. Thanks to both
+  [Blessedcoolant](https://github.com/blessedcoolant) and
   [Oceanswave](https://github.com/oceanswave) for their work on this.
-- You can now swap samplers on the invoke> command line. [Blessedcoolant](https://github.com/blessedcoolant)
+- You can now swap samplers on the invoke> command line.
+  [Blessedcoolant](https://github.com/blessedcoolant)
 
 ---
 
 ## v1.11 <small>(26 August 2022)</small>
 
-- NEW FEATURE: Support upscaling and face enhancement using the GFPGAN module. (kudos to [Oceanswave](https://github.com/Oceanswave)
-- You now can specify a seed of -1 to use the previous image's seed, -2 to use the seed for the image generated before that, etc.
-  Seed memory only extends back to the previous command, but will work on all images generated with the -n# switch.
+- NEW FEATURE: Support upscaling and face enhancement using the GFPGAN module.
+  (kudos to [Oceanswave](https://github.com/Oceanswave)
+- You now can specify a seed of -1 to use the previous image's seed, -2 to use
+  the seed for the image generated before that, etc. Seed memory only extends
+  back to the previous command, but will work on all images generated with the
+  -n# switch.
 - Variant generation support temporarily disabled pending more general solution.
-- Created a feature branch named **yunsaki-morphing-invoke** which adds experimental support for
-  iteratively modifying the prompt and its parameters. Please see[ Pull Request #86](https://github.com/lstein/stable-diffusion/pull/86)
-  for a synopsis of how this works. Note that when this feature is eventually added to the main branch, it will may be modified
-  significantly.
+- Created a feature branch named **yunsaki-morphing-invoke** which adds
+  experimental support for iteratively modifying the prompt and its parameters.
+  Please
+  see[Pull Request #86](https://github.com/lstein/stable-diffusion/pull/86) for
+  a synopsis of how this works. Note that when this feature is eventually added
+  to the main branch, it will may be modified significantly.
 
 ---
 
 ## v1.10 <small>(25 August 2022)</small>
 
-- A barebones but fully functional interactive web server for online generation of txt2img and img2img.
+- A barebones but fully functional interactive web server for online generation
+  of txt2img and img2img.
 
 ---
 
 ## v1.09 <small>(24 August 2022)</small>
 
 - A new -v option allows you to generate multiple variants of an initial image
-  in img2img mode. (kudos to [Oceanswave](https://github.com/Oceanswave). [
-  See this discussion in the PR for examples and details on use](https://github.com/lstein/stable-diffusion/pull/71#issuecomment-1226700810))
-- Added ability to personalize text to image generation (kudos to [Oceanswave](https://github.com/Oceanswave) and [nicolai256](https://github.com/nicolai256))
+  in img2img mode. (kudos to [Oceanswave](https://github.com/Oceanswave).
+  [ See this discussion in the PR for examples and details on use](https://github.com/lstein/stable-diffusion/pull/71#issuecomment-1226700810))
+- Added ability to personalize text to image generation (kudos to
+  [Oceanswave](https://github.com/Oceanswave) and
+  [nicolai256](https://github.com/nicolai256))
 - Enabled all of the samplers from k_diffusion
 
 ---
 
 ## v1.08 <small>(24 August 2022)</small>
 
-- Escape single quotes on the invoke> command before trying to parse. This avoids
-  parse errors.
+- Escape single quotes on the invoke> command before trying to parse. This
+  avoids parse errors.
 - Removed instruction to get Python3.8 as first step in Windows install.
   Anaconda3 does it for you.
 - Added bounds checks for numeric arguments that could cause crashes.
@@ -123,34 +317,36 @@ title: Changelog
 
 ## v1.07 <small>(23 August 2022)</small>
 
-- Image filenames will now never fill gaps in the sequence, but will be assigned the
-  next higher name in the chosen directory. This ensures that the alphabetic and chronological
-  sort orders are the same.
+- Image filenames will now never fill gaps in the sequence, but will be assigned
+  the next higher name in the chosen directory. This ensures that the alphabetic
+  and chronological sort orders are the same.
 
 ---
 
 ## v1.06 <small>(23 August 2022)</small>
 
-- Added weighted prompt support contributed by [xraxra](https://github.com/xraxra)
-- Example of using weighted prompts to tweak a demonic figure contributed by [bmaltais](https://github.com/bmaltais)
+- Added weighted prompt support contributed by
+  [xraxra](https://github.com/xraxra)
+- Example of using weighted prompts to tweak a demonic figure contributed by
+  [bmaltais](https://github.com/bmaltais)
 
 ---
 
 ## v1.05 <small>(22 August 2022 - after the drop)</small>
 
-- Filenames now use the following formats:
-  000010.95183149.png -- Two files produced by the same command (e.g. -n2),
-  000010.26742632.png -- distinguished by a different seed.
+- Filenames now use the following formats: 000010.95183149.png -- Two files
+  produced by the same command (e.g. -n2), 000010.26742632.png -- distinguished
+  by a different seed.
 
   000011.455191342.01.png -- Two files produced by the same command using
   000011.455191342.02.png -- a batch size>1 (e.g. -b2). They have the same seed.
 
-  000011.4160627868.grid#1-4.png -- a grid of four images (-g); the whole grid can
-  be regenerated with the indicated key
+  000011.4160627868.grid#1-4.png -- a grid of four images (-g); the whole grid
+  can be regenerated with the indicated key
 
 - It should no longer be possible for one image to overwrite another
-- You can use the "cd" and "pwd" commands at the invoke> prompt to set and retrieve
-  the path of the output directory.
+- You can use the "cd" and "pwd" commands at the invoke> prompt to set and
+  retrieve the path of the output directory.
 
 ---
 
@@ -164,26 +360,28 @@ title: Changelog
 
 ## v1.03 <small>(22 August 2022)</small>
 
-- The original txt2img and img2img scripts from the CompViz repository have been moved into
-  a subfolder named "orig_scripts", to reduce confusion.
+- The original txt2img and img2img scripts from the CompViz repository have been
+  moved into a subfolder named "orig_scripts", to reduce confusion.
 
 ---
 
 ## v1.02 <small>(21 August 2022)</small>
 
-- A copy of the prompt and all of its switches and options is now stored in the corresponding
-  image in a tEXt metadata field named "Dream". You can read the prompt using scripts/images2prompt.py,
-  or an image editor that allows you to explore the full metadata.
-  **Please run "conda env update" to load the k_lms dependencies!!**
+- A copy of the prompt and all of its switches and options is now stored in the
+  corresponding image in a tEXt metadata field named "Dream". You can read the
+  prompt using scripts/images2prompt.py, or an image editor that allows you to
+  explore the full metadata. **Please run "conda env update" to load the k_lms
+  dependencies!!**
 
 ---
 
 ## v1.01 <small>(21 August 2022)</small>
 
-- added k_lms sampling.
-  **Please run "conda env update" to load the k_lms dependencies!!**
-- use half precision arithmetic by default, resulting in faster execution and lower memory requirements
-  Pass argument --full_precision to invoke.py to get slower but more accurate image generation
+- added k_lms sampling. **Please run "conda env update" to load the k_lms
+  dependencies!!**
+- use half precision arithmetic by default, resulting in faster execution and
+  lower memory requirements Pass argument --full_precision to invoke.py to get
+  slower but more accurate image generation
 
 ---
 

docs/features/CHANGELOG.md

@@ -1,143 +0,0 @@
----
-title: Changelog
----
-
-# :octicons-log-16: Changelog
-
-## v1.13
-
-- Supports a Google Colab notebook for a standalone server running on Google
-  hardware [Arturo Mendivil](https://github.com/artmen1516)
-- WebUI supports GFPGAN/ESRGAN facial reconstruction and upscaling
-  [Kevin Gibbons](https://github.com/bakkot)
-- WebUI supports incremental display of in-progress images during generation
-  [Kevin Gibbons](https://github.com/bakkot)
-- Output directory can be specified on the invoke> command line.
-- The grid was displaying duplicated images when not enough images to fill the
-  final row [Muhammad Usama](https://github.com/SMUsamaShah)
-- Can specify --grid on invoke.py command line as the default.
-- Miscellaneous internal bug and stability fixes.
-
----
-
-## v1.12 <small>(28 August 2022)</small>
-
-- Improved file handling, including ability to read prompts from standard input.
-  (kudos to [Yunsaki](https://github.com/yunsaki)
-- The web server is now integrated with the invoke.py script. Invoke by adding
-  --web to the invoke.py command arguments.
-- Face restoration and upscaling via GFPGAN and Real-ESGAN are now automatically
-  enabled if the GFPGAN directory is located as a sibling to Stable Diffusion.
-  VRAM requirements are modestly reduced. Thanks to both
-  [Blessedcoolant](https://github.com/blessedcoolant) and
-  [Oceanswave](https://github.com/oceanswave) for their work on this.
-- You can now swap samplers on the invoke> command line.
-  [Blessedcoolant](https://github.com/blessedcoolant)
-
----
-
-## v1.11 <small>(26 August 2022)</small>
-
-- NEW FEATURE: Support upscaling and face enhancement using the GFPGAN module.
-  (kudos to [Oceanswave](https://github.com/Oceanswave))
-- You now can specify a seed of -1 to use the previous image's seed, -2 to use
-  the seed for the image generated before that, etc. Seed memory only extends
-  back to the previous command, but will work on all images generated with the
-  -n# switch.
-- Variant generation support temporarily disabled pending more general solution.
-- Created a feature branch named **yunsaki-morphing-invoke** which adds
-  experimental support for iteratively modifying the prompt and its parameters.
-  Please
-  see[ Pull Request #86](https://github.com/lstein/stable-diffusion/pull/86) for
-  a synopsis of how this works. Note that when this feature is eventually added
-  to the main branch, it will may be modified significantly.
-
----
-
-## v1.10 <small>(25 August 2022)</small>
-
-- A barebones but fully functional interactive web server for online generation
-  of txt2img and img2img.
-
----
-
-## v1.09 <small>(24 August 2022)</small>
-
-- A new -v option allows you to generate multiple variants of an initial image
-  in img2img mode. (kudos to [Oceanswave](https://github.com/Oceanswave).
-- [See this discussion in the PR for examples and details on use](https://github.com/lstein/stable-diffusion/pull/71#issuecomment-1226700810))
-- Added ability to personalize text to image generation (kudos to
-  [Oceanswave](https://github.com/Oceanswave) and
-  [nicolai256](https://github.com/nicolai256))
-- Enabled all of the samplers from k_diffusion
-
----
-
-## v1.08 <small>(24 August 2022)</small>
-
-- Escape single quotes on the invoke> command before trying to parse. This avoids
-  parse errors.
-- Removed instruction to get Python3.8 as first step in Windows install.
-  Anaconda3 does it for you.
-- Added bounds checks for numeric arguments that could cause crashes.
-- Cleaned up the copyright and license agreement files.
-
----
-
-## v1.07 <small>(23 August 2022)</small>
-
-- Image filenames will now never fill gaps in the sequence, but will be assigned
-  the next higher name in the chosen directory. This ensures that the alphabetic
-  and chronological sort orders are the same.
-
----
-
-## v1.06 <small>(23 August 2022)</small>
-
-- Added weighted prompt support contributed by
-  [xraxra](https://github.com/xraxra)
-- Example of using weighted prompts to tweak a demonic figure contributed by
-  [bmaltais](https://github.com/bmaltais)
-
----
-
-## v1.05 <small>(22 August 2022 - after the drop)</small>
-
-- Filenames now use the following formats: 000010.95183149.png -- Two files
-  produced by the same command (e.g. -n2), 000010.26742632.png -- distinguished
-  by a different seed.
-    000011.455191342.01.png -- Two files produced by the same command using
-    000011.455191342.02.png -- a batch size>1 (e.g. -b2). They have the same seed.
-    000011.4160627868.grid#1-4.png -- a grid of four images (-g); the whole grid
-  can be regenerated with the indicated key
-
-- It should no longer be possible for one image to overwrite another
-- You can use the "cd" and "pwd" commands at the invoke> prompt to set and
-  retrieve the path of the output directory.
-
-## v1.04 <small>(22 August 2022 - after the drop)</small>
-
-- Updated README to reflect installation of the released weights.
-- Suppressed very noisy and inconsequential warning when loading the frozen CLIP
-  tokenizer.
-
-## v1.03 <small>(22 August 2022)</small>
-
-- The original txt2img and img2img scripts from the CompViz repository have been
-  moved into a subfolder named "orig_scripts", to reduce confusion.
-
-## v1.02 <small>(21 August 2022)</small>
-
-- A copy of the prompt and all of its switches and options is now stored in the
-  corresponding image in a tEXt metadata field named "Dream". You can read the
-  prompt using scripts/images2prompt.py, or an image editor that allows you to
-  explore the full metadata. **Please run "conda env update -f environment.yaml"
-  to load the k_lms dependencies!!**
-
-## v1.01 <small>(21 August 2022)</small>
-
-- added k_lms sampling. **Please run "conda env update -f environment.yaml" to
-  load the k_lms dependencies!!**
-- use half precision arithmetic by default, resulting in faster execution and
-  lower memory requirements Pass argument --full_precision to invoke.py to get
-  slower but more accurate image generation

docs/features/CLI.md

@@ -1,16 +1,14 @@
 ---
 title: CLI
-hide:
-  - toc
 ---
 
 # :material-bash: CLI
 
 ## **Interactive Command Line Interface**
 
-The `invoke.py` script, located in `scripts/`, provides an interactive
-interface to image generation similar to the "invoke mothership" bot that Stable
-AI provided on its Discord server.
+The `invoke.py` script, located in `scripts/`, provides an interactive interface
+to image generation similar to the "invoke mothership" bot that Stable AI
+provided on its Discord server.
 
 Unlike the `txt2img.py` and `img2img.py` scripts provided in the original
 [CompVis/stable-diffusion](https://github.com/CompVis/stable-diffusion) source
@@ -60,9 +58,9 @@ invoke> q
 ![invoke-py-demo](../assets/dream-py-demo.png)
 
 The `invoke>` prompt's arguments are pretty much identical to those used in the
-Discord bot, except you don't need to type `!invoke` (it doesn't hurt if you do).
-A significant change is that creation of individual images is now the default
-unless `--grid` (`-g`) is given. A full list is given in
+Discord bot, except you don't need to type `!invoke` (it doesn't hurt if you
+do). A significant change is that creation of individual images is now the
+default unless `--grid` (`-g`) is given. A full list is given in
 [List of prompt arguments](#list-of-prompt-arguments).
 
 ## Arguments
@@ -75,7 +73,8 @@ the location of the model weight files.
 
 These command-line arguments can be passed to `invoke.py` when you first run it
 from the Windows, Mac or Linux command line. Some set defaults that can be
-overridden on a per-prompt basis (see [List of prompt arguments](#list-of-prompt-arguments). Others
+overridden on a per-prompt basis (see
+[List of prompt arguments](#list-of-prompt-arguments). Others
 
 | Argument <img width="240" align="right"/> | Shortcut <img width="100" align="right"/> | Default <img width="320" align="right"/>       | Description                                                                                          |
 | ----------------------------------------- | ----------------------------------------- | ---------------------------------------------- | ---------------------------------------------------------------------------------------------------- |
@@ -85,31 +84,32 @@ overridden on a per-prompt basis (see [List of prompt arguments](#list-of-prompt
 | `--from_file <path>`                      |                                           | `None`                                         | Read list of prompts from a file. Use `-` to read from standard input                                |
 | `--model <modelname>`                     |                                           | `stable-diffusion-1.4`                         | Loads model specified in configs/models.yaml. Currently one of "stable-diffusion-1.4" or "laion400m" |
 | `--full_precision`                        | `-F`                                      | `False`                                        | Run in slower full-precision mode. Needed for Macintosh M1/M2 hardware and some older video cards.   |
-| `--png_compression <0-9>`                 | `-z<0-9>`                                 |  6                                             | Select level of compression for output files, from 0 (no compression) to 9 (max compression)         |
-| `--safety-checker`                        |                                           |  False                                         | Activate safety checker for NSFW and other potentially disturbing imagery                            |
+| `--png_compression <0-9>`                 | `-z<0-9>`                                 | `6`                                            | Select level of compression for output files, from 0 (no compression) to 9 (max compression)         |
+| `--safety-checker`                        |                                           | `False`                                        | Activate safety checker for NSFW and other potentially disturbing imagery                            |
 | `--web`                                   |                                           | `False`                                        | Start in web server mode                                                                             |
 | `--host <ip addr>`                        |                                           | `localhost`                                    | Which network interface web server should listen on. Set to 0.0.0.0 to listen on any.                |
 | `--port <port>`                           |                                           | `9090`                                         | Which port web server should listen for requests on.                                                 |
 | `--config <path>`                         |                                           | `configs/models.yaml`                          | Configuration file for models and their weights.                                                     |
 | `--iterations <int>`                      | `-n<int>`                                 | `1`                                            | How many images to generate per prompt.                                                              |
+| `--width <int>`                           | `-W<int>`                                 | `512`                                    | Width of generated image                                                                                                                                                                                                                         |
+| `--height <int>`                          | `-H<int>`                                 | `512`                                    | Height of generated image                                                                                                        | `--steps <int>`                           | `-s<int>`                                 | `50`                                     | How many steps of refinement to apply                                                                                                                                                                                                            |
+| `--strength <float>`                      | `-s<float>` | `0.75`  | For img2img: how hard to try to match the prompt to the initial image. Ranges from 0.0-0.99, with higher values replacing the initial image completely. |
+| `--fit`                                   | `-F`        | `False` | For img2img: scale the init image to fit into the specified -H and -W dimensions                                                                             |
 | `--grid`                                  | `-g`                                      | `False`                                        | Save all image series as a grid rather than individually.                                            |
 | `--sampler <sampler>`                     | `-A<sampler>`                             | `k_lms`                                        | Sampler to use. Use `-h` to get list of available samplers.                                          |
 | `--seamless`                              |                                           | `False`                                        | Create interesting effects by tiling elements of the image.                                          |
 | `--embedding_path <path>`                 |                                           | `None`                                         | Path to pre-trained embedding manager checkpoints, for custom models                                 |
-| `--gfpgan_dir`                            |                                           | `src/gfpgan`                                   | Path to where GFPGAN is installed.                                                                   |
-| `--gfpgan_model_path`                     |                                           | `experiments/pretrained_models/GFPGANv1.4.pth` | Path to GFPGAN model file, relative to `--gfpgan_dir`.                                               |
+| `--gfpgan_model_path`                     |                                           | `experiments/pretrained_models/GFPGANv1.4.pth` | Path to GFPGAN model file.                                              |
 | `--free_gpu_mem`                          |                                           | `False`                                        | Free GPU memory after sampling, to allow image decoding and saving in low VRAM conditions            |
 | `--precision`                             |                                           | `auto`                                         | Set model precision, default is selected by device. Options: auto, float32, float16, autocast        |
 
-!!! warning deprecated
-
-    These arguments are deprecated but still work:
+!!! warning "These arguments are deprecated but still work"
 
     <div align="center" markdown>
 
     | Argument           |  Shortcut  |  Default            |  Description |
     |--------------------|------------|---------------------|--------------|
-    | `--weights <path>`   |            | `None`                | Pth to weights file; use `--model stable-diffusion-1.4` instead |
+    | `--weights <path>`   |            | `None`                | Path to weights file; use `--model stable-diffusion-1.4` instead |
     | `--laion400m`        | `-l`         | `False`               | Use older LAION400m weights; use `--model=laion400m` instead |
 
     </div>
@@ -122,17 +122,40 @@ overridden on a per-prompt basis (see [List of prompt arguments](#list-of-prompt
       You can either double your slashes (ick): `C:\\path\\to\\my\\file`, or
       use Linux/Mac style forward slashes (better): `C:/path/to/my/file`.
 
+## The .invokeai initialization file
+
+To start up invoke.py with your preferred settings, place your desired
+startup options in a file in your home directory named `.invokeai` The
+file should contain the startup options as you would type them on the
+command line (`--steps=10 --grid`), one argument per line, or a
+mixture of both using any of the accepted command switch formats:
+
+!!! example ""
+
+    ```bash
+    --web
+    --steps=28
+    --grid
+    -f 0.6 -C 11.0 -A k_euler_a
+    ```
+
+Note that the initialization file only accepts the command line arguments.
+There are additional arguments that you can provide on the `invoke>` command
+line (such as `-n` or `--iterations`) that cannot be entered into this file.
+Also be alert for empty blank lines at the end of the file, which will cause
+an arguments error at startup time.
+
 ## List of prompt arguments
 
-After the invoke.py script initializes, it will present you with a
-`invoke>` prompt. Here you can enter information to generate images
-from text ([txt2img](#txt2img)), to embellish an existing image or sketch
+After the invoke.py script initializes, it will present you with a `invoke>`
+prompt. Here you can enter information to generate images from text
+([txt2img](#txt2img)), to embellish an existing image or sketch
 ([img2img](#img2img)), or to selectively alter chosen regions of the image
 ([inpainting](#inpainting)).
 
 ### txt2img
 
-!!! example
+!!! example ""
 
     ```bash
     invoke> waterfall and rainbow -W640 -H480
@@ -143,64 +166,63 @@ from text ([txt2img](#txt2img)), to embellish an existing image or sketch
 
 Here are the invoke> command that apply to txt2img:
 
-| Argument <img width="680" align="right"/> | Shortcut <img width="420" align="right"/> | Default <img width="480" align="right"/> | Description |
-|--------------------|------------|---------------------|--------------|
-| "my prompt"        |            |                    | Text prompt to use. The quotation marks are optional. |
-| --width <int>      | -W<int>   | 512                 | Width of generated image |
-| --height <int>     | -H<int>   | 512                 | Height of generated image |
-| --iterations <int> | -n<int>   | 1                   | How many images to generate from this prompt |
-| --steps <int>      | -s<int>   | 50                  | How many steps of refinement to apply |
-| --cfg_scale <float>| -C<float> | 7.5                 | How hard to try to match the prompt to the generated image; any number greater than 1.0 works, but the useful range is roughly 5.0 to 20.0 |
-| --seed <int>       | -S<int>   | None                | Set the random seed for the next series of images. This can be used to recreate an image generated previously.|
-| --sampler <sampler>| -A<sampler>| k_lms              | Sampler to use. Use -h to get list of available samplers. |
-| --karras_max <int> |           | 29                  | When using k_* samplers, set the maximum number of steps before shifting from using the Karras noise schedule (good for low step counts) to the LatentDiffusion noise schedule (good for high step counts) This value is sticky. [29] |
-| --hires_fix        |           |                     | Larger images often have duplication artefacts. This option suppresses duplicates by generating the image at low res, and then using img2img to increase the resolution |
-| --png_compression <0-9> | -z<0-9> |  6           | Select level of compression for output files, from 0 (no compression) to 9 (max compression)         |
-| --grid             | -g        | False               | Turn on grid mode to return a single image combining all the images generated by this prompt |
-| --individual       | -i        | True                | Turn off grid mode (deprecated; leave off --grid instead) |
-| --outdir <path>    |  -o<path> | outputs/img_samples  | Temporarily change the location of these images |
-| --seamless         |           | False               | Activate seamless tiling for interesting effects |
-| --seamless_axes    |           | x,y                 | Specify which axes to use circular convolution on. |
-| --log_tokenization | -t        | False               | Display a color-coded list of the parsed tokens derived from the prompt |
-| --skip_normalization| -x       | False               | Weighted subprompts will not be normalized. See [Weighted Prompts](./OTHER.md#weighted-prompts) |
-| --upscale <int> <float> | -U <int> <float> | -U 1 0.75| Upscale image by magnification factor (2, 4), and set strength of upscaling (0.0-1.0). If strength not set, will default to 0.75. |
-| --facetool_strength <float>  | -G <float> | -G0        | Fix faces (defaults to using the GFPGAN algorithm); argument indicates how hard the algorithm should try (0.0-1.0) |
-| --facetool <name> | -ft <name> | -ft gfpgan | Select face restoration algorithm to use: gfpgan, codeformer |
-| --codeformer_fidelity | -cf <float> | 0.75 | Used along with CodeFormer. Takes values between 0 and 1. 0 produces high quality but low accuracy. 1 produces high accuracy but low quality |
-| --save_original    | -save_orig| False               | When upscaling or fixing faces, this will cause the original image to be saved rather than replaced. |
-| --variation <float>  |-v<float>| 0.0                 | Add a bit of noise (0.0=none, 1.0=high) to the image in order to generate a series of variations. Usually used in combination with -S<seed> and -n<int> to generate a series a riffs on a starting image. See [Variations](./VARIATIONS.md). |
-| --with_variations <pattern> |    | None              | Combine two or more variations. See [Variations](./VARIATIONS.md) for now to use this. |
-| --save_intermediates <n>    |    | None              | Save the image from every nth step into an "intermediates" folder inside the output directory |
+| Argument <img width="680" align="right"/> | Shortcut <img width="420" align="right"/> | Default <img width="480" align="right"/> | Description                                                                                                                                                                                                                                      |
+| ----------------------------------------- | ----------------------------------------- | ---------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| "my prompt"                               |                                           |                                          | Text prompt to use. The quotation marks are optional.                                                                                                                                                                                            |
+| `--width <int>`                           | `-W<int>`                                 | `512`                                    | Width of generated image                                                                                                                                                                                                                         |
+| `--height <int>`                          | `-H<int>`                                 | `512`                                    | Height of generated image                                                                                                                                                                                                                        |
+| `--iterations <int>`                      | `-n<int>`                                 | `1`                                      | How many images to generate from this prompt                                                                                                                                                                                                     |
+| `--steps <int>`                           | `-s<int>`                                 | `50`                                     | How many steps of refinement to apply                                                                                                                                                                                                            |
+| `--cfg_scale <float>`                     | `-C<float>`                               | `7.5`                                    | How hard to try to match the prompt to the generated image; any number greater than 1.0 works, but the useful range is roughly 5.0 to 20.0                                                                                                       |
+| `--seed <int>`                            | `-S<int>`                                 | `None`                                   | Set the random seed for the next series of images. This can be used to recreate an image generated previously.                                                                                                                                   |
+| `--sampler <sampler>`                     | `-A<sampler>`                             | `k_lms`                                  | Sampler to use. Use -h to get list of available samplers.                                                                                                                                                                                        |
+| `--karras_max <int>`                      |                                           | `29`                                     | When using k\_\* samplers, set the maximum number of steps before shifting from using the Karras noise schedule (good for low step counts) to the LatentDiffusion noise schedule (good for high step counts) This value is sticky. [29]          |
+| `--hires_fix`                             |                                           |                                          | Larger images often have duplication artefacts. This option suppresses duplicates by generating the image at low res, and then using img2img to increase the resolution                                                                          |
+| `--png_compression <0-9>`                 | `-z<0-9>`                                 | `6`                                      | Select level of compression for output files, from 0 (no compression) to 9 (max compression)                                                                                                                                                     |
+| `--grid`                                  | `-g`                                      | `False`                                  | Turn on grid mode to return a single image combining all the images generated by this prompt                                                                                                                                                     |
+| `--individual`                            | `-i`                                      | `True`                                   | Turn off grid mode (deprecated; leave off --grid instead)                                                                                                                                                                                        |
+| `--outdir <path>`                         | `-o<path>`                                | `outputs/img_samples`                    | Temporarily change the location of these images                                                                                                                                                                                                  |
+| `--seamless`                              |                                           | `False`                                  | Activate seamless tiling for interesting effects                                                                                                                                                                                                 |
+| `--seamless_axes`                         |                                           | `x,y`                                    | Specify which axes to use circular convolution on.                                                                                                                                                                                               |
+| `--log_tokenization`                      | `-t`                                      | `False`                                  | Display a color-coded list of the parsed tokens derived from the prompt                                                                                                                                                                          |
+| `--skip_normalization`                    | `-x`                                      | `False`                                  | Weighted subprompts will not be normalized. See [Weighted Prompts](./OTHER.md#weighted-prompts)                                                                                                                                                  |
+| `--upscale <int> <float>`                 | `-U <int> <float>`                        | `-U 1 0.75`                              | Upscale image by magnification factor (2, 4), and set strength of upscaling (0.0-1.0). If strength not set, will default to 0.75.                                                                                                                |
+| `--facetool_strength <float>`             | `-G <float> `                             | `-G0`                                    | Fix faces (defaults to using the GFPGAN algorithm); argument indicates how hard the algorithm should try (0.0-1.0)                                                                                                                               |
+| `--facetool <name>`                       | `-ft <name>`                              | `-ft gfpgan`                             | Select face restoration algorithm to use: gfpgan, codeformer                                                                                                                                                                                     |
+| `--codeformer_fidelity`                   | `-cf <float>`                             | `0.75`                                   | Used along with CodeFormer. Takes values between 0 and 1. 0 produces high quality but low accuracy. 1 produces high accuracy but low quality                                                                                                     |
+| `--save_original`                         | `-save_orig`                              | `False`                                  | When upscaling or fixing faces, this will cause the original image to be saved rather than replaced.                                                                                                                                             |
+| `--variation <float>`                     | `-v<float>`                               | `0.0`                                    | Add a bit of noise (0.0=none, 1.0=high) to the image in order to generate a series of variations. Usually used in combination with `-S<seed>` and `-n<int>` to generate a series a riffs on a starting image. See [Variations](./VARIATIONS.md). |
+| `--with_variations <pattern>`             |                                           | `None`                                   | Combine two or more variations. See [Variations](./VARIATIONS.md) for now to use this.                                                                                                                                                           |
+| `--save_intermediates <n>`                |                                           | `None`                                   | Save the image from every nth step into an "intermediates" folder inside the output directory                                                                                                                                                    |
 
-Note that the width and height of the image must be multiples of
-64. You can provide different values, but they will be rounded down to
-the nearest multiple of 64.
+Note that the width and height of the image must be multiples of 64. You can
+provide different values, but they will be rounded down to the nearest multiple
+of 64.
 
+### This is an example of img2img:
 
-### This is an example of img2img:	
-
-~~~~
+```
 invoke> waterfall and rainbow -I./vacation-photo.png -W640 -H480 --fit
-~~~~
+```
 
-This will modify the indicated vacation photograph by making it more
-like the prompt. Results will vary greatly depending on what is in the
-image. We also ask to --fit the image into a box no bigger than
-640x480. Otherwise the image size will be identical to the provided
-photo and you may run out of memory if it is large.
+This will modify the indicated vacation photograph by making it more like the
+prompt. Results will vary greatly depending on what is in the image. We also ask
+to --fit the image into a box no bigger than 640x480. Otherwise the image size
+will be identical to the provided photo and you may run out of memory if it is
+large.
 
-In addition to the command-line options recognized by txt2img, img2img
-accepts additional options:
+In addition to the command-line options recognized by txt2img, img2img accepts
+additional options:
 
-| Argument <img width="160" align="right"/> |  Shortcut   |  Default        |  Description |
-|----------------------|-------------|-----------------|--------------|
-| `--init_img <path>`  | `-I<path>`  | `None`          | Path to the initialization image |
-| `--fit`              | `-F`        | `False`         | Scale the image to fit into the specified -H and -W dimensions |
-| `--strength <float>` | `-s<float>` | `0.75`          | How hard to try to match the prompt to the initial image. Ranges from 0.0-0.99, with higher values replacing the initial image completely.|
+| Argument <img width="160" align="right"/> | Shortcut    | Default | Description                                                                                                                                |
+| ----------------------------------------- | ----------- | ------- | ------------------------------------------------------------------------------------------------------------------------------------------ |
+| `--init_img <path>`                       | `-I<path>`  | `None`  | Path to the initialization image                                                                                                           |
+| `--fit`                                   | `-F`        | `False` | Scale the image to fit into the specified -H and -W dimensions                                                                             |
+| `--strength <float>`                      | `-s<float>` | `0.75`  | How hard to try to match the prompt to the initial image. Ranges from 0.0-0.99, with higher values replacing the initial image completely. |
 
 ### inpainting
 
-!!! example
+!!! example ""
 
     ```bash
     invoke> waterfall and rainbow -I./vacation-photo.png -M./vacation-mask.png -W640 -H480 --fit
@@ -213,41 +235,45 @@ accepts additional options:
     the pixels underneath when you create the transparent areas. See
     [Inpainting](./INPAINTING.md) for details.
 
-inpainting accepts all the arguments used for txt2img and img2img, as
-well as the --mask (-M) and --text_mask (-tm) arguments:
+inpainting accepts all the arguments used for txt2img and img2img, as well as
+the --mask (-M) and --text_mask (-tm) arguments:
 
-| Argument <img width="100" align="right"/> |  Shortcut  |  Default            |  Description |
-|--------------------|------------|---------------------|--------------|
-| `--init_mask <path>` | `-M<path>`   | `None`                |Path to an image the same size as the initial_image, with areas for inpainting made transparent.|
-| `--invert_mask   ` |                | False                 |If true, invert the mask so that transparent areas are opaque and vice versa.|
-| `--text_mask <prompt> [<float>]` | `-tm <prompt> [<float>]` | <none>  | Create a mask from a text prompt describing part of the image|
+| Argument <img width="100" align="right"/> | Shortcut                 | Default | Description                                                                                      |
+| ----------------------------------------- | ------------------------ | ------- | ------------------------------------------------------------------------------------------------ |
+| `--init_mask <path>`                      | `-M<path>`               | `None`  | Path to an image the same size as the initial_image, with areas for inpainting made transparent. |
+| `--invert_mask `                          |                          | False   | If true, invert the mask so that transparent areas are opaque and vice versa.                    |
+| `--text_mask <prompt> [<float>]`          | `-tm <prompt> [<float>]` | <none>  | Create a mask from a text prompt describing part of the image                                    |
 
-The mask may either be an image with transparent areas, in which case
-the inpainting will occur in the transparent areas only, or a black
-and white image, in which case all black areas will be painted into.
+The mask may either be an image with transparent areas, in which case the
+inpainting will occur in the transparent areas only, or a black and white image,
+in which case all black areas will be painted into.
 
-`--text_mask` (short form `-tm`) is a way to generate a mask using a
-text description of the part of the image to replace. For example, if
-you have an image of a breakfast plate with a bagel, toast and
-scrambled eggs, you can selectively mask the bagel and replace it with
-a piece of cake this way:
+`--text_mask` (short form `-tm`) is a way to generate a mask using a text
+description of the part of the image to replace. For example, if you have an
+image of a breakfast plate with a bagel, toast and scrambled eggs, you can
+selectively mask the bagel and replace it with a piece of cake this way:
 
-~~~
+```
 invoke> a piece of cake -I /path/to/breakfast.png -tm bagel
-~~~
+```
 
 The algorithm uses <a
-href="https://github.com/timojl/clipseg">clipseg</a> to classify
-different regions of the image. The classifier puts out a confidence
-score for each region it identifies. Generally regions that score
-above 0.5 are reliable, but if you are getting too much or too little
-masking you can adjust the threshold down (to get more mask), or up
-(to get less). In this example, by passing `-tm` a higher value, we
-are insisting on a more stringent classification.
+href="https://github.com/timojl/clipseg">clipseg</a> to classify different
+regions of the image. The classifier puts out a confidence score for each region
+it identifies. Generally regions that score above 0.5 are reliable, but if you
+are getting too much or too little masking you can adjust the threshold down (to
+get more mask), or up (to get less). In this example, by passing `-tm` a higher
+value, we are insisting on a more stringent classification.
 
-~~~
+```
 invoke> a piece of cake -I /path/to/breakfast.png -tm bagel 0.6
-~~~
+```
+
+### Custom Styles and Subjects
+
+You can load and use hundreds of community-contributed Textual
+Inversion models just by typing the appropriate trigger phrase. Please
+see [Concepts Library](CONCEPTS.md) for more details.
 
 # Other Commands
 
@@ -255,31 +281,26 @@ The CLI offers a number of commands that begin with "!".
 
 ## Postprocessing images
 
-To postprocess a file using face restoration or upscaling, use the
-`!fix` command.
+To postprocess a file using face restoration or upscaling, use the `!fix`
+command.
 
 ### `!fix`
 
-This command runs a post-processor on a previously-generated image. It
-takes a PNG filename or path and applies your choice of the `-U`, `-G`, or
-`--embiggen` switches in order to fix faces or upscale. If you provide a
-filename, the script will look for it in the current output
-directory. Otherwise you can provide a full or partial path to the
-desired file.
+This command runs a post-processor on a previously-generated image. It takes a
+PNG filename or path and applies your choice of the `-U`, `-G`, or `--embiggen`
+switches in order to fix faces or upscale. If you provide a filename, the script
+will look for it in the current output directory. Otherwise you can provide a
+full or partial path to the desired file.
 
 Some examples:
 
-!!! example ""
-
-    Upscale to 4X its original size and fix faces using codeformer:
+!!! example "Upscale to 4X its original size and fix faces using codeformer"
 
     ```bash
     invoke> !fix 0000045.4829112.png -G1 -U4 -ft codeformer
     ```
 
-!!! example ""
-
-    Use the GFPGAN algorithm to fix faces, then upscale to 3X using --embiggen:
+!!! example "Use the GFPGAN algorithm to fix faces, then upscale to 3X using --embiggen"
 
     ```bash
     invoke> !fix 0000045.4829112.png -G0.8 -ft gfpgan
@@ -288,26 +309,27 @@ Some examples:
     >> GFPGAN - Restoring Faces for image seed:4829112
     Outputs:
     [1] outputs/img-samples/000017.4829112.gfpgan-00.png: !fix "outputs/img-samples/0000045.4829112.png" -s 50 -S  -W 512 -H 512 -C 7.5 -A k_lms -G 0.8
+    ```
 
 ### !mask
 
-This command takes an image, a text prompt, and uses the `clipseg`
-algorithm to automatically generate a mask of the area that matches
-the text prompt. It is useful for debugging the text masking process
-prior to inpainting with the `--text_mask` argument. See
-[INPAINTING.md] for details.
+This command takes an image, a text prompt, and uses the `clipseg` algorithm to
+automatically generate a mask of the area that matches the text prompt. It is
+useful for debugging the text masking process prior to inpainting with the
+`--text_mask` argument. See [INPAINTING.md] for details.
 
 ## Model selection and importation
 
-The CLI allows you to add new models on the fly, as well as to switch
-among them rapidly without leaving the script.
+The CLI allows you to add new models on the fly, as well as to switch among them
+rapidly without leaving the script.
 
 ### !models
 
-This prints out a list of the models defined in `config/models.yaml'.
-The active model is bold-faced
+This prints out a list of the models defined in `config/models.yaml'. The active
+model is bold-faced
 
 Example:
+
 <pre>
 laion400m                 not loaded  <no description>
 <b>stable-diffusion-1.4          active  Stable Diffusion v1.4</b>
@@ -316,13 +338,12 @@ waifu-diffusion           not loaded  Waifu Diffusion v1.3
 
 ### !switch <model>
 
-This quickly switches from one model to another without leaving the 
-CLI script. `invoke.py` uses a memory caching system; once a model
-has been loaded, switching back and forth is quick. The following
-example shows this in action. Note how the second column of the 
-`!models` table changes to `cached` after a model is first loaded,
-and that the long initialization step is not needed when loading
-a cached model.
+This quickly switches from one model to another without leaving the CLI script.
+`invoke.py` uses a memory caching system; once a model has been loaded,
+switching back and forth is quick. The following example shows this in action.
+Note how the second column of the `!models` table changes to `cached` after a
+model is first loaded, and that the long initialization step is not needed when
+loading a cached model.
 
 <pre>
 invoke> !models
@@ -362,24 +383,22 @@ waifu-diffusion               cached  Waifu Diffusion v1.3
 
 ### !import_model <path/to/model/weights>
 
-This command imports a new model weights file into InvokeAI, makes it
-available for image generation within the script, and writes out the
-configuration for the model into `config/models.yaml` for use in 
-subsequent sessions.
+This command imports a new model weights file into InvokeAI, makes it available
+for image generation within the script, and writes out the configuration for the
+model into `config/models.yaml` for use in subsequent sessions.
 
-Provide `!import_model` with the path to a weights file ending in
-`.ckpt`.  If you type a partial path and press tab, the CLI will
-autocomplete. Although it will also autocomplete to `.vae` files,
-these are not currenty supported (but will be soon).
+Provide `!import_model` with the path to a weights file ending in `.ckpt`. If
+you type a partial path and press tab, the CLI will autocomplete. Although it
+will also autocomplete to `.vae` files, these are not currenty supported (but
+will be soon).
 
-When you hit return, the CLI will prompt you to fill in additional
-information about the model, including the short name you wish to use
-for it with the `!switch` command, a brief description of the model,
-the default image width and height to use with this model, and the
-model's configuration file. The latter three fields are automatically
-filled with reasonable defaults. In the example below, the bold-faced
-text shows what the user typed in with the exception of the width,
-height and configuration file paths, which were filled in
+When you hit return, the CLI will prompt you to fill in additional information
+about the model, including the short name you wish to use for it with the
+`!switch` command, a brief description of the model, the default image width and
+height to use with this model, and the model's configuration file. The latter
+three fields are automatically filled with reasonable defaults. In the example
+below, the bold-faced text shows what the user typed in with the exception of
+the width, height and configuration file paths, which were filled in
 automatically.
 
 Example:
@@ -414,12 +433,13 @@ invoke>
 
 ###!edit_model <name_of_model>
 
-The `!edit_model` command can be used to modify a model that is
-already defined in `config/models.yaml`. Call it with the short
-name of the model you wish to modify, and it will allow you to
-modify the model's `description`, `weights` and other fields.
+The `!edit_model` command can be used to modify a model that is already defined
+in `config/models.yaml`. Call it with the short name of the model you wish to
+modify, and it will allow you to modify the model's `description`, `weights` and
+other fields.
 
 Example:
+
 <pre>
 invoke> <b>!edit_model waifu-diffusion</b>
 >> Editing model waifu-diffusion from configuration file ./configs/models.yaml
@@ -442,28 +462,28 @@ OK to import [n]? y
 >> Loading waifu-diffusion from models/ldm/stable-diffusion-v1/model-epoch10-float16.ckpt
 ...
 </pre>
-=======
-    invoke> !fix 000017.4829112.gfpgan-00.png --embiggen 3
-    ...lots of text...
-    Outputs:
-    [2] outputs/img-samples/000018.2273800735.embiggen-00.png: !fix "outputs/img-samples/000017.243781548.gfpgan-00.png" -s 50 -S 2273800735 -W 512 -H 512 -C 7.5 -A k_lms --embiggen 3.0 0.75 0.25
-    ```
+
+======= invoke> !fix 000017.4829112.gfpgan-00.png --embiggen 3 ...lots of
+text... Outputs: [2] outputs/img-samples/000018.2273800735.embiggen-00.png: !fix
+"outputs/img-samples/000017.243781548.gfpgan-00.png" -s 50 -S 2273800735 -W 512
+-H 512 -C 7.5 -A k_lms --embiggen 3.0 0.75 0.25 ```
+
 ## History processing
 
-The CLI provides a series of convenient commands for reviewing previous
-actions, retrieving them, modifying them, and re-running them.
+The CLI provides a series of convenient commands for reviewing previous actions,
+retrieving them, modifying them, and re-running them.
 
 ### !history
 
-The invoke script keeps track of all the commands you issue during a
-session, allowing you to re-run them. On Mac and Linux systems, it
-also writes the command-line history out to disk, giving you access to
-the most recent 1000 commands issued.
+The invoke script keeps track of all the commands you issue during a session,
+allowing you to re-run them. On Mac and Linux systems, it also writes the
+command-line history out to disk, giving you access to the most recent 1000
+commands issued.
 
-The `!history` command will return a numbered list of all the commands
-issued during the session (Windows), or the most recent 1000 commands
-(Mac|Linux). You can then repeat a command by using the command `!NNN`,
-where "NNN" is the history line number. For example:
+The `!history` command will return a numbered list of all the commands issued
+during the session (Windows), or the most recent 1000 commands (Mac|Linux). You
+can then repeat a command by using the command `!NNN`, where "NNN" is the
+history line number. For example:
 
 ```bash
 invoke> !history
@@ -480,14 +500,13 @@ invoke> watercolor of beautiful woman sitting under tree wearing broad hat and f
 
 ### !fetch
 
-This command retrieves the generation parameters from a previously
-generated image and either loads them into the command line
-(Linux|Mac), or prints them out in a comment for copy-and-paste
-(Windows). You may provide either the name of a file in the current
-output directory, or a full file path.  Specify path to a folder with
-image png files, and wildcard *.png to retrieve the dream command used
-to generate the images, and save them to a file commands.txt for
-further processing.
+This command retrieves the generation parameters from a previously generated
+image and either loads them into the command line (Linux|Mac), or prints them
+out in a comment for copy-and-paste (Windows). You may provide either the name
+of a file in the current output directory, or a full file path. Specify path to
+a folder with image png files, and wildcard \*.png to retrieve the dream command
+used to generate the images, and save them to a file commands.txt for further
+processing.
 
 This example loads the generation command for a single png file:
 
@@ -497,8 +516,8 @@ invoke> !fetch 0000015.8929913.png
 invoke> a fantastic alien landscape -W 576 -H 512 -s 60 -A plms -C 7.5
 ```
 
-This one fetches the generation commands from a batch of files and
-stores them into `selected.txt`:
+This one fetches the generation commands from a batch of files and stores them
+into `selected.txt`:
 
 ```bash
 invoke> !fetch outputs\selected-imgs\*.png selected.txt
@@ -508,12 +527,12 @@ invoke> !fetch outputs\selected-imgs\*.png selected.txt
 
 This command replays a text file generated by !fetch or created manually
 
-~~~
+```
 invoke> !replay outputs\selected-imgs\selected.txt
-~~~
+```
 
-Note that these commands may behave unexpectedly if given a PNG file that
-was not generated by InvokeAI.
+Note that these commands may behave unexpectedly if given a PNG file that was
+not generated by InvokeAI.
 
 ### !search <search string>
 
@@ -527,42 +546,47 @@ invoke> !search surreal
 
 ### `!clear`
 
-This clears the search history from memory and disk. Be advised that
-this operation is irreversible and does not issue any warnings!
+This clears the search history from memory and disk. Be advised that this
+operation is irreversible and does not issue any warnings!
 
 ## Command-line editing and completion
 
-The command-line offers convenient history tracking, editing, and
-command completion.
+The command-line offers convenient history tracking, editing, and command
+completion.
 
-- To scroll through previous commands and potentially edit/reuse them, use the ++up++ and ++down++ keys.
-- To edit the current command, use the ++left++ and ++right++ keys to position the cursor, and then ++backspace++, ++delete++ or insert characters.
-- To move to the very beginning of the command, type ++ctrl+a++ (or ++command+a++ on the Mac)
+- To scroll through previous commands and potentially edit/reuse them, use the
+  ++up++ and ++down++ keys.
+- To edit the current command, use the ++left++ and ++right++ keys to position
+  the cursor, and then ++backspace++, ++delete++ or insert characters.
+- To move to the very beginning of the command, type ++ctrl+a++ (or
+  ++command+a++ on the Mac)
 - To move to the end of the command, type ++ctrl+e++.
-- To cut a section of the command, position the cursor where you want to start cutting and type ++ctrl+k++
-- To paste a cut section back in, position the cursor where you want to paste, and type ++ctrl+y++
+- To cut a section of the command, position the cursor where you want to start
+  cutting and type ++ctrl+k++
+- To paste a cut section back in, position the cursor where you want to paste,
+  and type ++ctrl+y++
 
-Windows users can get similar, but more limited, functionality if they
-launch `invoke.py` with the `winpty` program and have the `pyreadline3`
-library installed:
+Windows users can get similar, but more limited, functionality if they launch
+`invoke.py` with the `winpty` program and have the `pyreadline3` library
+installed:
 
 ```batch
 > winpty python scripts\invoke.py
 ```
 
-On the Mac and Linux platforms, when you exit invoke.py, the last 1000
-lines of your command-line history will be saved. When you restart
-`invoke.py`, you can access the saved history using the ++up++ key.
+On the Mac and Linux platforms, when you exit invoke.py, the last 1000 lines of
+your command-line history will be saved. When you restart `invoke.py`, you can
+access the saved history using the ++up++ key.
 
-In addition, limited command-line completion is installed. In various
-contexts, you can start typing your command and press ++tab++. A list of
-potential completions will be presented to you. You can then type a
-little more, hit ++tab++ again, and eventually autocomplete what you want.
+In addition, limited command-line completion is installed. In various contexts,
+you can start typing your command and press ++tab++. A list of potential
+completions will be presented to you. You can then type a little more, hit
+++tab++ again, and eventually autocomplete what you want.
 
-When specifying file paths using the one-letter shortcuts, the CLI
-will attempt to complete pathnames for you. This is most handy for the
-`-I` (init image) and `-M` (init mask) paths. To initiate completion, start
-the path with a slash (`/`) or `./`. For example:
+When specifying file paths using the one-letter shortcuts, the CLI will attempt
+to complete pathnames for you. This is most handy for the `-I` (init image) and
+`-M` (init mask) paths. To initiate completion, start the path with a slash
+(`/`) or `./`. For example:
 
 ```bash
 invoke> zebra with a mustache -I./test-pictures<TAB>

docs/features/CONCEPTS.md

@@ -0,0 +1,132 @@
+---
+title: The Hugging Face Concepts Library and Importing Textual Inversion files
+---
+
+# :material-file-document: Concepts Library
+
+## Using Textual Inversion Files
+
+Textual inversion (TI) files are small models that customize the output of
+Stable Diffusion image generation. They can augment SD with
+specialized subjects and artistic styles. They are also known as
+"embeds" in the machine learning world.
+
+Each TI file introduces one or more vocabulary terms to the SD
+model. These are known in InvokeAI as "triggers." Triggers are often,
+but not always, denoted using angle brackets as in
+"<trigger-phrase>". The two most common type of TI files that you'll
+encounter are `.pt` and `.bin` files, which are produced by different
+TI training packages. InvokeAI supports both formats, but its [built-in
+TI training system](TEXTUAL_INVERSION.md) produces `.pt`.
+
+The [Hugging Face company](https://huggingface.co/sd-concepts-library)
+has amassed a large ligrary of >800 community-contributed TI files
+covering a broad range of subjects and styles. InvokeAI has built-in
+support for this library which downloads and merges TI files
+automatically upon request. You can also install your own or others'
+TI files by placing them in a designated directory.
+
+### An Example
+
+Here are a few examples to illustrate how it works. All these images
+were generated using the command-line client and the Stable Diffusion
+1.5 model:
+
+Japanese gardener
+<br>
+<img src="../assets/concepts/image1.png">
+
+Japanese gardener &lt;ghibli-face&gt;
+<br>
+<img src="../assets/concepts/image2.png">
+
+Japanese gardener &lt;hoi4-leaders&gt;
+<br>
+<img src="../assets/concepts/image3.png">
+
+Japanese gardener &lt;cartoona-animals&gt;
+<br>
+<img src="../assets/concepts/image4.png">
+
+You can also combine styles and concepts:
+
+A portrait of &lt;alf&gt; in &lt;cartoona-animal&gt; style
+<br>
+<img src="../assets/concepts/image5.png">
+
+## Using a Hugging Face Concept
+
+Hugging Face TI concepts are downloaded and installed automatically as
+you require them. This requires your machine to be connected to the
+Internet. To find out what each concept is for, you can browse the
+[Hugging Face concepts
+library](https://huggingface.co/sd-concepts-library) and look at
+examples of what each concept produces.
+
+When you have an idea of a concept you wish to try, go to the
+command-line client (CLI) and type a "&lt;" character and the beginning
+of the Hugging Face concept name you wish to load.  Press the Tab key,
+and the CLI will show you all matching concepts. You can also type "&lt;"
+and Tab to get a listing of all ~800 concepts, but be prepared to
+scroll up to see them all! If there is more than one match you can
+continue to type and Tab until the concept is completed.
+
+For example if you type "&lt;x" and Tab, you'll be prompted with the completions:
+
+```
+<xatu2>        <xatu>         <xbh>          <xi>           <xidiversity>  <xioboma>      <xuna>         <xyz>          
+```
+
+Now type "id" and press Tab. It will be autocompleted to
+"&lt;xidiversity&gt;" because this is a unique match.
+
+Finish your prompt and generate as usual. You may include multiple
+concept terms in the prompt.
+
+If you have never used this concept before, you will see a message
+that the TI model is being downloaded and installed. After this, the
+concept will be saved locally (in the `models/sd-concepts-library`
+directory) for future use.
+
+Several steps happen during downloading and
+installation, including a scan of the file for malicious code. Should
+any errors occur, you will be warned and the concept will fail to
+load. Generation will then continue treating the trigger term as a
+normal string of characters (e.g. as literal "&lt;ghibli-face&gt;").
+
+Currently auto-installation of concepts is a feature only available on
+the command-line client. Support for the WebUI is a work in progress.
+
+## Installing your Own TI Files
+
+You may install any number of `.pt` and `.bin` files simply by copying
+them into the `embeddings` directory of the InvokeAI runtime directory
+(usually `invokeai` in your home directory). You may create
+subdirectories in order to organize the files in any way you wish. Be
+careful not to overwrite one file with another. For example, TI files
+generated by the Hugging Face toolkit share the named
+`learned_embedding.bin`. You can use subdirectories to keep them
+distinct.
+
+At startup time, InvokeAI will scan the `embeddings` directory and
+load any TI files it finds there. At startup you will see a message
+similar to this one:
+
+```
+>> Current embedding manager terms: *, <HOI4-Leader>, <princess-knight>
+```
+
+Note the "*" trigger term. This is a placeholder term that many early
+TI tutorials taught people to use rather than a more descriptive
+term. Unfortunately, if you have multiple TI files that all use this
+term, only the first one loaded will be triggered by use of the term.
+
+To avoid this problem, you can use the `merge_embeddings.py` script to
+merge two or more TI files together. If it encounters a collision of
+terms, the script will prompt you to select new terms that do not
+collide. See [Textual Inversion](TEXTUAL_INVERSION.md) for details.
+
+## Further Reading
+
+Please see [the repository](https://github.com/rinongal/textual_inversion) and
+associated paper for details and limitations.

docs/features/EMBIGGEN.md

@@ -85,7 +85,7 @@ increasing size, every tile after the first in a row or column
 effectively only covers an extra `1 - overlap_ratio` on each axis. If
 the input/`--init_img` is same size as a tile, the ideal (for time)
 scaling factors with the default overlap (0.25) are 1.75, 2.5, 3.25,
-4.0 etc..
+4.0, etc.
 
 `-embiggen_tiles <spaced list of tiles>`
 
@@ -100,6 +100,15 @@ Tiles are numbered starting with one, and left-to-right,
 top-to-bottom.  So, if you are generating a 3x3 tiled image, the
 middle row would be `4 5 6`.
 
+`-embiggen_strength <strength>`
+
+Another advanced option if you want to experiment with the strength parameter
+that embiggen uses when it calls Img2Img. Values range from 0.0 to 1.0
+and lower values preserve more of the character of the initial image.
+Values that are too high will result in a completely different end image,
+while values that are too low will result in an image not dissimilar to one
+you would get with ESRGAN upscaling alone. The default value is 0.4.
+
 ### Examples
 
 !!! example ""

docs/features/IMG2IMG.md

@@ -6,10 +6,11 @@ title: Image-to-Image
 
 ## `img2img`
 
-This script also provides an `img2img` feature that lets you seed your creations with an initial
-drawing or photo. This is a really cool feature that tells stable diffusion to build the prompt on
-top of the image you provide, preserving the original's basic shape and layout. To use it, provide
-the `--init_img` option as shown here:
+This script also provides an `img2img` feature that lets you seed your creations
+with an initial drawing or photo. This is a really cool feature that tells
+stable diffusion to build the prompt on top of the image you provide, preserving
+the original's basic shape and layout. To use it, provide the `--init_img`
+option as shown here:
 
 ```commandline
 tree on a hill with a river, nature photograph, national geographic -I./test-pictures/tree-and-river-sketch.png -f 0.85
@@ -17,159 +18,219 @@ tree on a hill with a river, nature photograph, national geographic -I./test-pic
 
 This will take the original image shown here:
 
-<div align="center" markdown>
-<img src="https://user-images.githubusercontent.com/50542132/193946000-c42a96d8-5a74-4f8a-b4c3-5213e6cadcce.png" width=350>
-</div>
+<figure markdown>
+![original-image](https://user-images.githubusercontent.com/50542132/193946000-c42a96d8-5a74-4f8a-b4c3-5213e6cadcce.png){ width=320 }
+</figure>
 
 and generate a new image based on it as shown here:
 
-<div align="center" markdown>
-<img src="https://user-images.githubusercontent.com/111189/194135515-53d4c060-e994-4016-8121-7c685e281ac9.png" width=350>
-</div>
+<figure markdown>
+![generated-image](https://user-images.githubusercontent.com/111189/194135515-53d4c060-e994-4016-8121-7c685e281ac9.png){ width=320 }
+</figure>
 
-The `--init_img` (`-I`) option gives the path to the seed picture. `--strength` (`-f`) controls how much
-the original will be modified, ranging from `0.0` (keep the original intact), to `1.0` (ignore the
-original completely). The default is `0.75`, and ranges from `0.25-0.90` give interesting results. 
-Other relevant options include `-C` (classification free guidance scale), and `-s` (steps). Unlike `txt2img`, 
-adding steps will continuously change the resulting image and it will not converge.
+The `--init_img` (`-I`) option gives the path to the seed picture. `--strength`
+(`-f`) controls how much the original will be modified, ranging from `0.0` (keep
+the original intact), to `1.0` (ignore the original completely). The default is
+`0.75`, and ranges from `0.25-0.90` give interesting results. Other relevant
+options include `-C` (classification free guidance scale), and `-s` (steps).
+Unlike `txt2img`, adding steps will continuously change the resulting image and
+it will not converge.
 
-You may also pass a `-v<variation_amount>` option to generate `-n<iterations>` count variants on
-the original image. This is done by passing the first generated image
-back into img2img the requested number of times. It generates
+You may also pass a `-v<variation_amount>` option to generate `-n<iterations>`
+count variants on the original image. This is done by passing the first
+generated image back into img2img the requested number of times. It generates
 interesting variants.
 
-Note that the prompt makes a big difference. For example, this slight variation on the prompt produces
-a very different image:
+Note that the prompt makes a big difference. For example, this slight variation
+on the prompt produces a very different image:
 
-`photograph of a tree on a hill with a river`
-
-<div align="center" markdown>
-<img src="https://user-images.githubusercontent.com/111189/194135220-16b62181-b60c-4248-8989-4834a8fd7fbd.png" width=350>
-</div>
+<figure markdown>
+![](https://user-images.githubusercontent.com/111189/194135220-16b62181-b60c-4248-8989-4834a8fd7fbd.png){ width=320 }
+<caption markdown>photograph of a tree on a hill with a river</caption>
+</figure>
 
 !!! tip
 
-    When designing prompts, think about how the images scraped from the internet were captioned. Very few photographs will
-    be labeled "photograph" or "photorealistic." They will, however, be captioned with the publication, photographer, camera
-    model, or film settings.
+    When designing prompts, think about how the images scraped from the internet were
+    captioned. Very few photographs will be labeled "photograph" or "photorealistic."
+    They will, however, be captioned with the publication, photographer, camera model,
+    or film settings.
 
-If the initial image contains transparent regions, then Stable Diffusion will only draw within the
-transparent regions, a process called [`inpainting`](./INPAINTING.md#creating-transparent-regions-for-inpainting). However, for this to work correctly, the color
-information underneath the transparent needs to be preserved, not erased.
+If the initial image contains transparent regions, then Stable Diffusion will
+only draw within the transparent regions, a process called
+[`inpainting`](./INPAINTING.md#creating-transparent-regions-for-inpainting).
+However, for this to work correctly, the color information underneath the
+transparent needs to be preserved, not erased.
 
-!!! warning
+!!! warning "**IMPORTANT ISSUE** "
 
-**IMPORTANT ISSUE** `img2img` does not work properly on initial images smaller than 512x512. Please scale your
-image to at least 512x512 before using it. Larger images are not a problem, but may run out of VRAM on your
-GPU card. To fix this, use the --fit option, which downscales the initial image to fit within the box specified
-by width x height:
-~~~
-tree on a hill with a river, national geographic -I./test-pictures/big-sketch.png -H512 -W512 --fit
-~~~
+    `img2img` does not work properly on initial images smaller
+    than 512x512. Please scale your image to at least 512x512 before using it.
+    Larger images are not a problem, but may run out of VRAM on your GPU card. To
+    fix this, use the --fit option, which downscales the initial image to fit within
+    the box specified by width x height:
+
+    ```
+    tree on a hill with a river, national geographic -I./test-pictures/big-sketch.png -H512 -W512 --fit
+    ```
 
 ## How does it actually work, though?
 
-The main difference between `img2img` and `prompt2img` is the starting point. While `prompt2img` always starts with pure
-gaussian noise and progressively refines it over the requested number of steps, `img2img` skips some of these earlier steps
-(how many it skips is indirectly controlled by the `--strength` parameter), and uses instead your initial image mixed with gaussian noise as the starting image.
+The main difference between `img2img` and `prompt2img` is the starting point.
+While `prompt2img` always starts with pure gaussian noise and progressively
+refines it over the requested number of steps, `img2img` skips some of these
+earlier steps (how many it skips is indirectly controlled by the `--strength`
+parameter), and uses instead your initial image mixed with gaussian noise as the
+starting image.
 
-**Let's start** by thinking about vanilla `prompt2img`, just generating an image from a prompt. If the step count is 10, then the "latent space" (Stable Diffusion's internal representation of the image) for the prompt "fire" with seed `1592514025` develops something like this:
+**Let's start** by thinking about vanilla `prompt2img`, just generating an image
+from a prompt. If the step count is 10, then the "latent space" (Stable
+Diffusion's internal representation of the image) for the prompt "fire" with
+seed `1592514025` develops something like this:
 
-```commandline
+```bash
 invoke> "fire" -s10 -W384 -H384 -S1592514025
 ```
 
-<div align="center" markdown>
+<figure markdown>
 ![latent steps](../assets/img2img/000019.steps.png)
-</div>
+</figure>
 
-Put simply: starting from a frame of fuzz/static, SD finds details in each frame that it thinks look like "fire" and brings them a little bit more into focus, gradually scrubbing out the fuzz until a clear image remains.
+Put simply: starting from a frame of fuzz/static, SD finds details in each frame
+that it thinks look like "fire" and brings them a little bit more into focus,
+gradually scrubbing out the fuzz until a clear image remains.
 
-**When you use `img2img`** some of the earlier steps are cut, and instead an initial image of your choice is used. But because of how the maths behind Stable Diffusion works, this image needs to be mixed with just the right amount of noise (fuzz/static) for where it is being inserted. This is where the strength parameter comes in. Depending on the set strength, your image will be inserted into the sequence at the appropriate point, with just the right amount of noise.
+**When you use `img2img`** some of the earlier steps are cut, and instead an
+initial image of your choice is used. But because of how the maths behind Stable
+Diffusion works, this image needs to be mixed with just the right amount of
+noise (fuzz/static) for where it is being inserted. This is where the strength
+parameter comes in. Depending on the set strength, your image will be inserted
+into the sequence at the appropriate point, with just the right amount of noise.
 
 ### A concrete example
 
 I want SD to draw a fire based on this hand-drawn image:
 
-<div align="center" markdown>
+<figure markdown>
 ![drawing of a fireplace](../assets/img2img/fire-drawing.png)
-</div>
+</figure>
 
-Let's only do 10 steps, to make it easier to see what's happening. If strength is `0.7`, this is what the internal steps the algorithm has to take will look like:
+Let's only do 10 steps, to make it easier to see what's happening. If strength
+is `0.7`, this is what the internal steps the algorithm has to take will look
+like:
 
-<div align="center" markdown>
+<figure markdown>
 ![gravity32](../assets/img2img/000032.steps.gravity.png)
-</div>
+</figure>
 
 With strength `0.4`, the steps look more like this:
 
-<div align="center" markdown>
+<figure markdown>
 ![gravity30](../assets/img2img/000030.steps.gravity.png)
-</div>
+</figure>
 
-Notice how much more fuzzy the starting image is for strength `0.7` compared to `0.4`, and notice also how much longer the sequence is with `0.7`:
+Notice how much more fuzzy the starting image is for strength `0.7` compared to
+`0.4`, and notice also how much longer the sequence is with `0.7`:
 
-|  | strength = 0.7 | strength = 0.4 |
-| -- | -- | -- |
-| initial image that SD sees | ![](../assets/img2img/000032.step-0.png) | ![](../assets/img2img/000030.step-0.png) |
-| steps argument to `invoke>` | `-S10` | `-S10` |
-| steps actually taken | 7 | 4 |
-| latent space at each step | ![gravity32](../assets/img2img/000032.steps.gravity.png) | ![gravity30](../assets/img2img/000030.steps.gravity.png) |
-| output | ![000032.1592514025](../assets/img2img/000032.1592514025.png) | ![000030.1592514025](../assets/img2img/000030.1592514025.png) |
+|                             | strength = 0.7                                                | strength = 0.4                                                |
+| --------------------------- | ------------------------------------------------------------- | ------------------------------------------------------------- |
+| initial image that SD sees  | ![step-0](../assets/img2img/000032.step-0.png)                | ![step-0](../assets/img2img/000030.step-0.png)                |
+| steps argument to `invoke>` | `-S10`                                                        | `-S10`                                                        |
+| steps actually taken        | `7`                                                           | `4`                                                           |
+| latent space at each step   | ![gravity32](../assets/img2img/000032.steps.gravity.png)      | ![gravity30](../assets/img2img/000030.steps.gravity.png)      |
+| output                      | ![000032.1592514025](../assets/img2img/000032.1592514025.png) | ![000030.1592514025](../assets/img2img/000030.1592514025.png) |
 
-Both of the outputs look kind of like what I was thinking of. With the strength higher, my input becomes more vague, *and* Stable Diffusion has more steps to refine its output. But it's not really making what I want, which is a picture of cheery open fire. With the strength lower, my input is more clear, *but* Stable Diffusion has less chance to refine itself, so the result ends up inheriting all the problems of my bad drawing.
+Both of the outputs look kind of like what I was thinking of. With the strength
+higher, my input becomes more vague, _and_ Stable Diffusion has more steps to
+refine its output. But it's not really making what I want, which is a picture of
+cheery open fire. With the strength lower, my input is more clear, _but_ Stable
+Diffusion has less chance to refine itself, so the result ends up inheriting all
+the problems of my bad drawing.
 
-If you want to try this out yourself, all of these are using a seed of `1592514025` with a width/height of `384`, step count `10`, the default sampler (`k_lms`), and the single-word prompt `"fire"`:
+If you want to try this out yourself, all of these are using a seed of
+`1592514025` with a width/height of `384`, step count `10`, the default sampler
+(`k_lms`), and the single-word prompt `"fire"`:
 
-```commandline
+```bash
 invoke> "fire" -s10 -W384 -H384 -S1592514025 -I /tmp/fire-drawing.png --strength 0.7
 ```
 
-The code for rendering intermediates is on my (damian0815's) branch [document-img2img](https://github.com/damian0815/InvokeAI/tree/document-img2img) - run `invoke.py` and check your `outputs/img-samples/intermediates` folder while generating an image. 
+The code for rendering intermediates is on my (damian0815's) branch
+[document-img2img](https://github.com/damian0815/InvokeAI/tree/document-img2img) -
+run `invoke.py` and check your `outputs/img-samples/intermediates` folder while
+generating an image.
 
 ### Compensating for the reduced step count
 
-After putting this guide together I was curious to see how the difference would be if I increased the step count to compensate, so that SD could have the same amount of steps to develop the image regardless of the strength. So I ran the generation again using the same seed, but this time adapting the step count to give each generation 20 steps.
+After putting this guide together I was curious to see how the difference would
+be if I increased the step count to compensate, so that SD could have the same
+amount of steps to develop the image regardless of the strength. So I ran the
+generation again using the same seed, but this time adapting the step count to
+give each generation 20 steps.
 
-Here's strength `0.4` (note step count `50`, which is `20 ÷ 0.4` to make sure SD does `20` steps from my image):
+Here's strength `0.4` (note step count `50`, which is `20 ÷ 0.4` to make sure SD
+does `20` steps from my image):
 
-```commandline
+```bash
 invoke> "fire" -s50 -W384 -H384 -S1592514025 -I /tmp/fire-drawing.png -f 0.4
 ```
 
-<div align="center" markdown>
+<figure markdown>
 ![000035.1592514025](../assets/img2img/000035.1592514025.png)
-</div>
+</figure>
 
-and here is strength `0.7` (note step count `30`, which is roughly `20 ÷ 0.7` to make sure SD does `20` steps from my image):
+and here is strength `0.7` (note step count `30`, which is roughly `20 ÷ 0.7` to
+make sure SD does `20` steps from my image):
 
 ```commandline
 invoke> "fire" -s30 -W384 -H384 -S1592514025 -I /tmp/fire-drawing.png -f 0.7
 ```
 
-<div align="center" markdown>
+<figure markdown>
 ![000046.1592514025](../assets/img2img/000046.1592514025.png)
-</div>
+</figure>
 
-In both cases the image is nice and clean and "finished", but because at strength `0.7` Stable Diffusion has been give so much more freedom to improve on my badly-drawn flames, they've come out looking much better. You can really see the difference when looking at the latent steps. There's more noise on the first image with strength `0.7`:
+In both cases the image is nice and clean and "finished", but because at
+strength `0.7` Stable Diffusion has been give so much more freedom to improve on
+my badly-drawn flames, they've come out looking much better. You can really see
+the difference when looking at the latent steps. There's more noise on the first
+image with strength `0.7`:
 
+<figure markdown>
 ![gravity46](../assets/img2img/000046.steps.gravity.png)
+</figure>
 
 than there is for strength `0.4`:
 
+<figure markdown>
 ![gravity35](../assets/img2img/000035.steps.gravity.png)
+</figure>
 
-and that extra noise gives the algorithm more choices when it is evaluating how to denoise any particular pixel in the image.
+and that extra noise gives the algorithm more choices when it is evaluating how
+to denoise any particular pixel in the image.
 
-Unfortunately, it seems that `img2img` is very sensitive to the step count. Here's strength `0.7` with a step count of `29` (SD did 19 steps from my image):
+Unfortunately, it seems that `img2img` is very sensitive to the step count.
+Here's strength `0.7` with a step count of `29` (SD did 19 steps from my image):
 
-<div align="center" markdown>
+<figure markdown>
 ![gravity45](../assets/img2img/000045.1592514025.png)
-</div>
+</figure>
 
-By comparing the latents we can sort of see that something got interpreted differently enough on the third or fourth step to lead to a rather different interpretation of the flames.
+By comparing the latents we can sort of see that something got interpreted
+differently enough on the third or fourth step to lead to a rather different
+interpretation of the flames.
 
+<figure markdown>
 ![gravity46](../assets/img2img/000046.steps.gravity.png)
-![gravity45](../assets/img2img/000045.steps.gravity.png)
+</figure>
 
-This is the result of a difference in the de-noising "schedule" - basically the noise has to be cleaned by a certain degree each step or the model won't "converge" on the image properly (see [stable diffusion blog](https://huggingface.co/blog/stable_diffusion) for more about that). A different step count means a different schedule, which means things get interpreted slightly differently at every step.
+<figure markdown>
+![gravity45](../assets/img2img/000045.steps.gravity.png)
+</figure>
+
+This is the result of a difference in the de-noising "schedule" - basically the
+noise has to be cleaned by a certain degree each step or the model won't
+"converge" on the image properly (see
+[stable diffusion blog](https://huggingface.co/blog/stable_diffusion) for more
+about that). A different step count means a different schedule, which means
+things get interpreted slightly differently at every step.

docs/features/INPAINTING.md

@@ -6,29 +6,27 @@ title: Inpainting
 
 ## **Creating Transparent Regions for Inpainting**
 
-Inpainting is really cool. To do it, you start with an initial image
-and use a photoeditor to make one or more regions transparent
-(i.e. they have a "hole" in them). You then provide the path to this
-image at the dream> command line using the `-I` switch. Stable
-Diffusion will only paint within the transparent region.
+Inpainting is really cool. To do it, you start with an initial image and use a
+photoeditor to make one or more regions transparent (i.e. they have a "hole" in
+them). You then provide the path to this image at the dream> command line using
+the `-I` switch. Stable Diffusion will only paint within the transparent region.
 
-There's a catch. In the current implementation, you have to prepare
-the initial image correctly so that the underlying colors are
-preserved under the transparent area. Many imaging editing
-applications will by default erase the color information under the
-transparent pixels and replace them with white or black, which will
-lead to suboptimal inpainting. It often helps to apply incomplete
-transparency, such as any value between 1 and 99%
+There's a catch. In the current implementation, you have to prepare the initial
+image correctly so that the underlying colors are preserved under the
+transparent area. Many imaging editing applications will by default erase the
+color information under the transparent pixels and replace them with white or
+black, which will lead to suboptimal inpainting. It often helps to apply
+incomplete transparency, such as any value between 1 and 99%
 
-You also must take care to export the PNG file in such a way that the
-color information is preserved. There is often an option in the export
-dialog that lets you specify this.
+You also must take care to export the PNG file in such a way that the color
+information is preserved. There is often an option in the export dialog that
+lets you specify this.
 
-If your photoeditor is erasing the underlying color information,
-`dream.py` will give you a big fat warning. If you can't find a way to
-coax your photoeditor to retain color values under transparent areas,
-then you can combine the `-I` and `-M` switches to provide both the
-original unedited image and the masked (partially transparent) image:
+If your photoeditor is erasing the underlying color information, `dream.py` will
+give you a big fat warning. If you can't find a way to coax your photoeditor to
+retain color values under transparent areas, then you can combine the `-I` and
+`-M` switches to provide both the original unedited image and the masked
+(partially transparent) image:
 
 ```bash
 invoke> "man with cat on shoulder" -I./images/man.png -M./images/man-transparent.png
@@ -36,47 +34,47 @@ invoke> "man with cat on shoulder" -I./images/man.png -M./images/man-transparent
 
 ## **Masking using Text**
 
-You can also create a mask using a text prompt to select the part of
-the image you want to alter, using the <a
-href="https://github.com/timojl/clipseg">clipseg</a> algorithm. This
-works on any image, not just ones generated by InvokeAI.
+You can also create a mask using a text prompt to select the part of the image
+you want to alter, using the [clipseg](https://github.com/timojl/clipseg)
+algorithm. This works on any image, not just ones generated by InvokeAI.
 
-The `--text_mask` (short form `-tm`) option takes two arguments. The
-first argument is a text description of the part of the image you wish
-to mask (paint over). If the text description contains a space, you must
-surround it with quotation marks. The optional second argument is the
-minimum threshold for the mask classifier's confidence score, described
-in more detail below.
+The `--text_mask` (short form `-tm`) option takes two arguments. The first
+argument is a text description of the part of the image you wish to mask (paint
+over). If the text description contains a space, you must surround it with
+quotation marks. The optional second argument is the minimum threshold for the
+mask classifier's confidence score, described in more detail below.
 
-To see how this works in practice, here's an image of a still life
-painting that I got off the web.
+To see how this works in practice, here's an image of a still life painting that
+I got off the web.
 
-<img src="../assets/still-life-scaled.jpg">
+<figure markdown>
+![still life scaled](../assets/still-life-scaled.jpg)
+</figure>
 
-You can selectively mask out the
-orange and replace it with a baseball in this way:
+You can selectively mask out the orange and replace it with a baseball in this
+way:
 
-~~~
+```bash
 invoke> a baseball -I /path/to/still_life.png -tm orange
-~~~
+```
 
-<img src="../assets/still-life-inpainted.png">
+<figure markdown>
+![](../assets/still-life-inpainted.png)
+</figure>
 
 The clipseg classifier produces a confidence score for each region it
-identifies. Generally regions that score above 0.5 are reliable, but
-if you are getting too much or too little masking you can adjust the
-threshold down (to get more mask), or up (to get less). In this
-example, by passing `-tm` a higher value, we are insisting on a tigher
-mask. However, if you make it too high, the orange may not be picked
-up at all!
+identifies. Generally regions that score above 0.5 are reliable, but if you are
+getting too much or too little masking you can adjust the threshold down (to get
+more mask), or up (to get less). In this example, by passing `-tm` a higher
+value, we are insisting on a tigher mask. However, if you make it too high, the
+orange may not be picked up at all!
 
-~~~
+```bash
 invoke> a baseball -I /path/to/breakfast.png -tm orange 0.6
-~~~
+```
 
-The `!mask` command may be useful for debugging problems with the
-text2mask feature. The syntax is `!mask /path/to/image.png -tm <text>
-<threshold>`
+The `!mask` command may be useful for debugging problems with the text2mask
+feature. The syntax is `!mask /path/to/image.png -tm <text> <threshold>`
 
 It will generate three files:
 
@@ -84,19 +82,18 @@ It will generate three files:
   - it will be named XXXXX.<imagename>.<prompt>.selected.png
 - The image with the un-selected area highlighted.
   - it will be named XXXXX.<imagename>.<prompt>.deselected.png
-- The image with the selected area converted into a black and white
-  image according to the threshold level
+- The image with the selected area converted into a black and white image
+  according to the threshold level
   - it will be named XXXXX.<imagename>.<prompt>.masked.png
 
-The `.masked.png` file can then be directly passed to the `invoke>`
-prompt in the CLI via the `-M` argument. Do not attempt this with
-the `selected.png` or `deselected.png` files, as they contain some
-transparency throughout the image and will not produce the desired
-results.
+The `.masked.png` file can then be directly passed to the `invoke>` prompt in
+the CLI via the `-M` argument. Do not attempt this with the `selected.png` or
+`deselected.png` files, as they contain some transparency throughout the image
+and will not produce the desired results.
 
 Here is an example of how `!mask` works:
 
-```
+```bash
 invoke> !mask ./test-pictures/curly.png -tm hair 0.5
 >> generating masks from ./test-pictures/curly.png
 >> Initializing clipseg model for text to mask inference
@@ -106,23 +103,30 @@ Outputs:
 [941.3] outputs/img-samples/000019.curly.hair.masked.png: !mask ./test-pictures/curly.png -tm hair 0.5
 ```
 
-**Original image "curly.png"**
-<img src="../assets/outpainting/curly.png">
+<figure markdown>
+![curly](../assets/outpainting/curly.png)
+<figcaption>Original image "curly.png"</figcaption>
+</figure>
 
-**000019.curly.hair.selected.png**
-<img src="../assets/inpainting/000019.curly.hair.selected.png">
+<figure markdown>
+![curly hair selected](../assets/inpainting/000019.curly.hair.selected.png)
+<figcaption>000019.curly.hair.selected.png</figcaption>
+</figure>
 
-**000019.curly.hair.deselected.png**
-<img src="../assets/inpainting/000019.curly.hair.deselected.png">
+<figure markdown>
+![curly hair deselected](../assets/inpainting/000019.curly.hair.deselected.png)
+<figcaption>000019.curly.hair.deselected.png</figcaption>
+</figure>
 
-**000019.curly.hair.masked.png**
-<img src="../assets/inpainting/000019.curly.hair.masked.png">
+<figure markdown>
+![curly hair masked](../assets/inpainting/000019.curly.hair.masked.png)
+<figcaption>000019.curly.hair.masked.png</figcaption>
+</figure>
 
-It looks like we selected the hair pretty well at the 0.5 threshold
-(which is the default, so we didn't actually have to specify it), so
-let's have some fun:
+It looks like we selected the hair pretty well at the 0.5 threshold (which is
+the default, so we didn't actually have to specify it), so let's have some fun:
 
-```
+```bash
 invoke> medusa with cobras -I ./test-pictures/curly.png -M 000019.curly.hair.masked.png -C20
 >> loaded input image of size 512x512 from ./test-pictures/curly.png
 ...
@@ -130,86 +134,83 @@ Outputs:
 [946] outputs/img-samples/000024.801380492.png: "medusa with cobras" -s 50 -S 801380492 -W 512 -H 512 -C 20.0 -I ./test-pictures/curly.png -A k_lms -f 0.75
 ```
 
-<img src="../assets/inpainting/000024.801380492.png">
+<figure markdown>
+![](../assets/inpainting/000024.801380492.png)
+</figure>
 
 You can also skip the `!mask` creation step and just select the masked
 
 region directly:
-```
+
+```bash
 invoke> medusa with cobras -I ./test-pictures/curly.png -tm hair -C20
 ```
 
 ## Using the RunwayML inpainting model
 
-The [RunwayML Inpainting Model
-v1.5](https://huggingface.co/runwayml/stable-diffusion-inpainting) is
-a specialized version of [Stable Diffusion
-v1.5](https://huggingface.co/spaces/runwayml/stable-diffusion-v1-5)
-that contains extra channels specifically designed to enhance
-inpainting and outpainting. While it can do regular `txt2img` and
-`img2img`, it really shines when filling in missing regions. It has an
-almost uncanny ability to blend the new regions with existing ones in
-a semantically coherent way.
+The
+[RunwayML Inpainting Model v1.5](https://huggingface.co/runwayml/stable-diffusion-inpainting)
+is a specialized version of
+[Stable Diffusion v1.5](https://huggingface.co/spaces/runwayml/stable-diffusion-v1-5)
+that contains extra channels specifically designed to enhance inpainting and
+outpainting. While it can do regular `txt2img` and `img2img`, it really shines
+when filling in missing regions. It has an almost uncanny ability to blend the
+new regions with existing ones in a semantically coherent way.
 
 To install the inpainting model, follow the
-[instructions](INSTALLING-MODELS.md) for installing a new model. You
-may use either the CLI (`invoke.py` script) or directly edit the
-`configs/models.yaml` configuration file to do this. The main thing to
-watch out for is that the the model `config` option must be set up to
-use `v1-inpainting-inference.yaml` rather than the `v1-inference.yaml`
-file that is used by Stable Diffusion 1.4 and 1.5.
+[instructions](../installation/INSTALLING_MODELS.md) for installing a new model.
+You may use either the CLI (`invoke.py` script) or directly edit the
+`configs/models.yaml` configuration file to do this. The main thing to watch out
+for is that the the model `config` option must be set up to use
+`v1-inpainting-inference.yaml` rather than the `v1-inference.yaml` file that is
+used by Stable Diffusion 1.4 and 1.5.
 
-After installation, your `models.yaml` should contain an entry that
-looks like this one:
+After installation, your `models.yaml` should contain an entry that looks like
+this one:
 
- inpainting-1.5:
-   weights: models/ldm/stable-diffusion-v1/sd-v1-5-inpainting.ckpt
-   description: SD inpainting v1.5
-   config: configs/stable-diffusion/v1-inpainting-inference.yaml
-   vae: models/ldm/stable-diffusion-v1/vae-ft-mse-840000-ema-pruned.ckpt
-   width: 512
-   height: 512
+inpainting-1.5: weights: models/ldm/stable-diffusion-v1/sd-v1-5-inpainting.ckpt
+description: SD inpainting v1.5 config:
+configs/stable-diffusion/v1-inpainting-inference.yaml vae:
+models/ldm/stable-diffusion-v1/vae-ft-mse-840000-ema-pruned.ckpt width: 512
+height: 512
 
-As shown in the example, you may include a VAE fine-tuning weights
-file as well. This is strongly recommended.
+As shown in the example, you may include a VAE fine-tuning weights file as well.
+This is strongly recommended.
 
-To use the custom inpainting model, launch `invoke.py` with the
-argument `--model inpainting-1.5` or alternatively from within the
-script use the `!switch inpainting-1.5` command to load and switch to
-the inpainting model.
+To use the custom inpainting model, launch `invoke.py` with the argument
+`--model inpainting-1.5` or alternatively from within the script use the
+`!switch inpainting-1.5` command to load and switch to the inpainting model.
 
-You can now do inpainting and outpainting exactly as described above,
-but there will (likely) be a noticeable improvement in
-coherence. Txt2img and Img2img will work as well.
+You can now do inpainting and outpainting exactly as described above, but there
+will (likely) be a noticeable improvement in coherence. Txt2img and Img2img will
+work as well.
 
 There are a few caveats to be aware of:
 
-1. The inpainting model is larger than the standard model, and will
-   use nearly 4 GB of GPU VRAM. This makes it unlikely to run on
-   a 4 GB graphics card.
+1. The inpainting model is larger than the standard model, and will use nearly 4
+   GB of GPU VRAM. This makes it unlikely to run on a 4 GB graphics card.
 
-2. When operating in Img2img mode, the inpainting model is much less
-   steerable than the standard model. It is great for making small
-   changes, such as changing the pattern of a fabric, or slightly
-   changing a subject's expression or hair, but the model will
-   resist making the dramatic alterations that the standard
-   model lets you do.
+2. When operating in Img2img mode, the inpainting model is much less steerable
+   than the standard model. It is great for making small changes, such as
+   changing the pattern of a fabric, or slightly changing a subject's expression
+   or hair, but the model will resist making the dramatic alterations that the
+   standard model lets you do.
 
-3. While the `--hires` option works fine with the inpainting model,
-   some special features, such as `--embiggen` are disabled.
+3. While the `--hires` option works fine with the inpainting model, some special
+   features, such as `--embiggen` are disabled.
 
-4. Prompt weighting (`banana++ sushi`) and merging work well with
-   the inpainting model, but prompt swapping (a ("fluffy cat").swap("smiling dog") eating a hotdog`)
-   will not have any effect due to the way the model is set up.
-   You may use text masking (with `-tm thing-to-mask`) as an
-   effective replacement.
+4. Prompt weighting (`banana++ sushi`) and merging work well with the inpainting
+   model, but prompt swapping
+   (`a ("fluffy cat").swap("smiling dog") eating a hotdog`) will not have any
+   effect due to the way the model is set up. You may use text masking (with
+   `-tm thing-to-mask`) as an effective replacement.
 
-5. The model tends to oversharpen image if you use high step or CFG
-   values. If you need to do large steps, use the standard model.
+5. The model tends to oversharpen image if you use high step or CFG values. If
+   you need to do large steps, use the standard model.
 
-6. The `--strength` (`-f`) option has no effect on the inpainting
-   model due to its fundamental differences with the standard
-   model. It will always take the full number of steps you specify.
+6. The `--strength` (`-f`) option has no effect on the inpainting model due to
+   its fundamental differences with the standard model. It will always take the
+   full number of steps you specify.
 
 ## Troubleshooting
 
@@ -217,23 +218,21 @@ Here are some troubleshooting tips for inpainting and outpainting.
 
 ## Inpainting is not changing the masked region enough!
 
-One of the things to understand about how inpainting works is that it
-is equivalent to running img2img on just the masked (transparent)
-area. img2img builds on top of the existing image data, and therefore
-will attempt to preserve colors, shapes and textures to the best of
-its ability. Unfortunately this means that if you want to make a
-dramatic change in the inpainted region, for example replacing a red
-wall with a blue one, the algorithm will fight you.
+One of the things to understand about how inpainting works is that it is
+equivalent to running img2img on just the masked (transparent) area. img2img
+builds on top of the existing image data, and therefore will attempt to preserve
+colors, shapes and textures to the best of its ability. Unfortunately this means
+that if you want to make a dramatic change in the inpainted region, for example
+replacing a red wall with a blue one, the algorithm will fight you.
 
-You have a couple of options. The first is to increase the values of
-the requested steps (`-sXXX`), strength (`-f0.XX`), and/or
-condition-free guidance (`-CXX.X`). If this is not working for you, a
-more extreme step is to provide the `--inpaint_replace 0.X` (`-r0.X`)
-option. This value ranges from 0.0 to 1.0. The higher it is the less
-attention the algorithm will pay to the data underneath the masked
-region. At high values this will enable you to replace colored regions
-entirely, but beware that the masked region mayl not blend in with the
-surrounding unmasked regions as well.
+You have a couple of options. The first is to increase the values of the
+requested steps (`-sXXX`), strength (`-f0.XX`), and/or condition-free guidance
+(`-CXX.X`). If this is not working for you, a more extreme step is to provide
+the `--inpaint_replace 0.X` (`-r0.X`) option. This value ranges from 0.0 to 1.0.
+The higher it is the less attention the algorithm will pay to the data
+underneath the masked region. At high values this will enable you to replace
+colored regions entirely, but beware that the masked region mayl not blend in
+with the surrounding unmasked regions as well.
 
 ---
 
@@ -248,8 +247,8 @@ surrounding unmasked regions as well.
 5. Open the Layers toolbar (^L) and select "Floating Selection"
 6. Set opacity to a value between 0% and 99%
 7. Export as PNG
-8. In the export dialogue, Make sure the "Save colour values from
-   transparent pixels" checkbox is selected.
+8. In the export dialogue, Make sure the "Save colour values from transparent
+   pixels" checkbox is selected.
 
 ---
 
@@ -257,28 +256,51 @@ surrounding unmasked regions as well.
 
 1. Open image in Photoshop
 
-    <div align="center" markdown>![step1](../assets/step1.png)</div>
+    <figure markdown>
+    ![step1](../assets/step1.png)
+    </figure>
 
-2. Use any of the selection tools (Marquee, Lasso, or Wand) to select the area you desire to inpaint.
+2. Use any of the selection tools (Marquee, Lasso, or Wand) to select the area
+   you desire to inpaint.
 
-    <div align="center" markdown>![step2](../assets/step2.png)</div>
+    <figure markdown>
+    ![step2](../assets/step2.png)
+    </figure>
 
-3. Because we'll be applying a mask over the area we want to preserve, you should now select the inverse by using the ++shift+ctrl+i++ shortcut, or right clicking and using the "Select Inverse" option.
+3. Because we'll be applying a mask over the area we want to preserve, you
+   should now select the inverse by using the ++shift+ctrl+i++ shortcut, or
+   right clicking and using the "Select Inverse" option.
 
-4. You'll now create a mask by selecting the image layer, and Masking the selection. Make sure that you don't delete any of the underlying image, or your inpainting results will be dramatically impacted.
+4. You'll now create a mask by selecting the image layer, and Masking the
+   selection. Make sure that you don't delete any of the underlying image, or
+   your inpainting results will be dramatically impacted.
 
-    <div align="center" markdown>![step4](../assets/step4.png)</div>
+    <figure markdown>
+    ![step4](../assets/step4.png)
+    </figure>
 
-5. Make sure to hide any background layers that are present. You should see the mask applied to your image layer, and the image on your canvas should display the checkered background.
+5. Make sure to hide any background layers that are present. You should see the
+   mask applied to your image layer, and the image on your canvas should display
+   the checkered background.
 
-    <div align="center" markdown>![step5](../assets/step5.png)</div>
+    <figure markdown>
+    ![step5](../assets/step5.png)
+    </figure>
 
-6. Save the image as a transparent PNG by using `File`-->`Save a Copy` from the menu bar, or by using the keyboard shortcut ++alt+ctrl+s++
+6. Save the image as a transparent PNG by using `File`-->`Save a Copy` from the
+   menu bar, or by using the keyboard shortcut ++alt+ctrl+s++
 
-    <div align="center" markdown>![step6](../assets/step6.png)</div>
+    <figure markdown>
+    ![step6](../assets/step6.png)
+    </figure>
 
-7. After following the inpainting instructions above (either through the CLI or the Web UI), marvel at your newfound ability to selectively invoke. Lookin' good!
+7. After following the inpainting instructions above (either through the CLI or
+   the Web UI), marvel at your newfound ability to selectively invoke. Lookin'
+   good!
 
-    <div align="center" markdown>![step7](../assets/step7.png)</div>
+    <figure markdown>
+   ![step7](../assets/step7.png)
+    </figure>
 
-8. In the export dialogue, Make sure the "Save colour values from transparent pixels" checkbox is selected.  
+8. In the export dialogue, Make sure the "Save colour values from transparent
+   pixels" checkbox is selected.

docs/features/NSFW.md

@@ -0,0 +1,89 @@
+---
+title: The NSFW Checker
+---
+
+# :material-image-off: NSFW Checker
+
+## The NSFW ("Safety") Checker
+
+The Stable Diffusion image generation models will produce sexual
+imagery if deliberately prompted, and will occasionally produce such
+images when this is not intended. Such images are colloquially known
+as "Not Safe for Work" (NSFW). This behavior is due to the nature of
+the training set that Stable Diffusion was trained on, which culled
+millions of "aesthetic" images from the Internet.
+
+You may not wish to be exposed to these images, and in some
+jurisdictions it may be illegal to publicly distribute such imagery,
+including mounting a publicly-available server that provides
+unfiltered images to the public. Furthermore, the [Stable Diffusion
+weights
+License](https://github.com/invoke-ai/InvokeAI/blob/main/LICENSE-ModelWeights.txt)
+forbids the model from being used to "exploit any of the
+vulnerabilities of a specific group of persons."
+
+For these reasons Stable Diffusion offers a "safety checker," a
+machine learning model trained to recognize potentially disturbing
+imagery. When a potentially NSFW image is detected, the checker will
+blur the image and paste a warning icon on top. The checker can be
+turned on and off on the command line using `--nsfw_checker` and
+`--no-nsfw_checker`.
+
+At installation time, InvokeAI will ask whether the checker should be
+activated by default (neither argument given on the command line). The
+response is stored in the InvokeAI initialization file (usually
+`.invokeai` in your home directory). You can change the default at any
+time by opening this file in a text editor and commenting or
+uncommenting the line `--nsfw_checker`.
+
+## Caveats
+
+There are a number of caveats that you need to be aware of.
+
+### Accuracy
+
+The checker is [not perfect](https://arxiv.org/abs/2210.04610).It will
+occasionally flag innocuous images (false positives), and will
+frequently miss violent and gory imagery (false negatives). It rarely
+fails to flag sexual imagery, but this has been known to happen. For
+these reasons, the InvokeAI team prefers to refer to the software as a
+"NSFW Checker" rather than "safety checker."
+
+### Memory Usage and Performance
+
+The NSFW checker consumes an additional 1.2G of GPU VRAM on top of the
+3.4G of VRAM used by Stable Diffusion v1.5 (this is with
+half-precision arithmetic). This means that the checker will not run
+successfully on GPU cards with less than 6GB VRAM, and will reduce the
+size of the images that you can produce.
+
+The checker also introduces a slight performance penalty. Images will
+take ~1 second longer to generate when the checker is
+activated. Generally this is not noticeable.
+
+### Intermediate Images in the Web UI
+
+The checker only operates on the final image produced by the Stable
+Diffusion algorithm. If you are using the Web UI and have enabled the
+display of intermediate images, you will briefly be exposed to a
+low-resolution (mosaicized) version of the final image before it is
+flagged by the checker and replaced by a fully blurred version. You
+are encouraged to turn **off** intermediate image rendering when you
+are using the checker. Future versions of InvokeAI will apply
+additional blurring to intermediate images when the checker is active.
+
+### Watermarking
+
+InvokeAI does not apply any sort of watermark to images it
+generates. However, it does write metadata into the PNG data area,
+including the prompt used to generate the image and relevant parameter
+settings. These fields can be examined using the `sd-metadata.py`
+script that comes with the InvokeAI package.
+
+Note that several other Stable Diffusion distributions offer
+wavelet-based "invisible" watermarking. We have experimented with the
+library used to generate these watermarks and have reached the
+conclusion that while the watermarking library may be adding
+watermarks to PNG images, the currently available version is unable to
+retrieve them successfully. If and when a functioning version of the
+library becomes available, we will offer this feature as well.

docs/features/OTHER.md

@@ -133,29 +133,6 @@ outputs = g.txt2img("a unicorn in manhattan")
 
 Outputs is a list of lists in the format [filename1,seed1],[filename2,seed2]...].
 
-Please see ldm/generate.py for more information. A set of example scripts is coming RSN.
+Please see the documentation in ldm/generate.py for more information.
 
 ---
-
-## **Preload Models**
-
-In situations where you have limited internet connectivity or are blocked behind a firewall, you can
-use the preload script to preload the required files for Stable Diffusion to run.
-
-The preload script `scripts/preload_models.py` needs to be run once at least while connected to the
-internet. In the following runs, it will load up the cached versions of the required files from the
-`.cache` directory of the system.
-
-```bash
-(invokeai) ~/stable-diffusion$ python3 ./scripts/preload_models.py
-preloading bert tokenizer...
-Downloading: 100%|██████████████████████████████████| 28.0/28.0 [00:00<00:00, 49.3kB/s]
-Downloading: 100%|██████████████████████████████████| 226k/226k [00:00<00:00, 2.79MB/s]
-Downloading: 100%|██████████████████████████████████| 455k/455k [00:00<00:00, 4.36MB/s]
-Downloading: 100%|██████████████████████████████████| 570/570 [00:00<00:00, 477kB/s]
-...success
-preloading kornia requirements...
-Downloading: "https://github.com/DagnyT/hardnet/raw/master/pretrained/train_liberty_with_aug/checkpoint_liberty_with_aug.pth" to /u/lstein/.cache/torch/hub/checkpoints/checkpoint_liberty_with_aug.pth
-100%|███████████████████████████████████████████████| 5.10M/5.10M [00:00<00:00, 101MB/s]
-...success
-```

docs/features/OUTPAINTING.md

@@ -6,100 +6,166 @@ title: Outpainting
 
 ## Outpainting and outcropping
 
-Outpainting is a process by which the AI generates parts of the image
-that are outside its original frame. It can be used to fix up images
-in which the subject is off center, or when some detail (often the top
-of someone's head!) is cut off.
+Outpainting is a process by which the AI generates parts of the image that are
+outside its original frame. It can be used to fix up images in which the subject
+is off center, or when some detail (often the top of someone's head!) is cut
+off.
 
-InvokeAI supports two versions of outpainting, one called "outpaint"
-and the other "outcrop." They work slightly differently and each has
-its advantages and drawbacks.
+InvokeAI supports two versions of outpainting, one called "outpaint" and the
+other "outcrop." They work slightly differently and each has its advantages and
+drawbacks.
 
 ### Outpainting
 
-Outpainting is the same as inpainting, except that the painting occurs
-in the regions outside of the original image. To outpaint using the
-`invoke.py` command line script, prepare an image in which the borders
-to be extended are pure black. Add an alpha channel (if there isn't one
-already), and make the borders completely transparent and the interior
-completely opaque. If you wish to modify the interior as well, you may
-create transparent holes in the transparency layer, which `img2img` will
-paint into as usual.
+Outpainting is the same as inpainting, except that the painting occurs in the
+regions outside of the original image. To outpaint using the `invoke.py` command
+line script, prepare an image in which the borders to be extended are pure
+black. Add an alpha channel (if there isn't one already), and make the borders
+completely transparent and the interior completely opaque. If you wish to modify
+the interior as well, you may create transparent holes in the transparency
+layer, which `img2img` will paint into as usual.
 
-Pass the image as the argument to the `-I` switch as you would for
-regular inpainting:
+Pass the image as the argument to the `-I` switch as you would for regular
+inpainting:
 
- invoke> a stream by a river -I /path/to/transparent_img.png
+```bash
+invoke> a stream by a river -I /path/to/transparent_img.png
+```
 
 You'll likely be delighted by the results.
 
 ### Tips
 
-1. Do not try to expand the image too much at once. Generally it is best
-   to expand the margins in 64-pixel increments. 128 pixels often works,
-   but your mileage may vary depending on the nature of the image you are
-   trying to outpaint into.
+1. Do not try to expand the image too much at once. Generally it is best to
+   expand the margins in 64-pixel increments. 128 pixels often works, but your
+   mileage may vary depending on the nature of the image you are trying to
+   outpaint into.
 
-2. There are a series of switches that can be used to adjust how the
-   inpainting algorithm operates. In particular, you can use these to
-   minimize the seam that sometimes appears between the original image
-   and the extended part. These switches are:
+2. There are a series of switches that can be used to adjust how the inpainting
+   algorithm operates. In particular, you can use these to minimize the seam
+   that sometimes appears between the original image and the extended part.
+   These switches are:
 
-  --seam_size SEAM_SIZE    Size of the mask around the seam between original and outpainted image (0)
-  --seam_blur SEAM_BLUR    The amount to blur the seam inwards (0)
-  --seam_strength STRENGTH The img2img strength to use when filling the seam (0.7)
-  --seam_steps SEAM_STEPS  The number of steps to use to fill the seam. (10)
-  --tile_size TILE_SIZE    The tile size to use for filling outpaint areas (32)
+| switch                     | default | description                                                            |
+| -------------------------- | ------- | ---------------------------------------------------------------------- |
+| `--seam_size SEAM_SIZE `   | `0`     | Size of the mask around the seam between original and outpainted image |
+| `--seam_blur SEAM_BLUR`    | `0`     | The amount to blur the seam inwards                                    |
+| `--seam_strength STRENGTH` | `0.7`   | The img2img strength to use when filling the seam                      |
+| `--seam_steps SEAM_STEPS`  | `10`    | The number of steps to use to fill the seam.                           |
+| `--tile_size TILE_SIZE`    | `32`    | The tile size to use for filling outpaint areas                        |
 
 ### Outcrop
 
-The `outcrop` extension gives you a convenient `!fix` postprocessing
-command that allows you to extend a previously-generated image in 64
-pixel increments in any direction. You can apply the module to any
-image previously-generated by InvokeAI. Note that it works with
-arbitrary PNG photographs, but not currently with JPG or other
-formats. Outcropping is particularly effective when combined with the
-[runwayML custom inpainting
-model](INPAINTING.md#using-the-runwayml-inpainting-model).
+The `outcrop` extension gives you a convenient `!fix` postprocessing command
+that allows you to extend a previously-generated image in 64 pixel increments in
+any direction. You can apply the module to any image previously-generated by
+InvokeAI. Note that it works with arbitrary PNG photographs, but not currently
+with JPG or other formats. Outcropping is particularly effective when combined
+with the
+[runwayML custom inpainting model](INPAINTING.md#using-the-runwayml-inpainting-model).
 
 Consider this image:
 
-<div align="center" markdown>
+<figure markdown>
 ![curly_woman](../assets/outpainting/curly.png)
-</div>
+</figure>
 
-Pretty nice, but it's annoying that the top of her head is cut
-off. She's also a bit off center. Let's fix that!
+Pretty nice, but it's annoying that the top of her head is cut off. She's also a
+bit off center. Let's fix that!
 
 ```bash
-invoke> !fix images/curly.png --outcrop top 64 right 64
+invoke> !fix images/curly.png --outcrop top 128 right 64 bottom 64
 ```
 
-This is saying to apply the `outcrop` extension by extending the top
-of the image by 64 pixels, and the right of the image by the same
-amount. You can use any combination of top|left|right|bottom, and
-specify any number of pixels to extend. You can also abbreviate
-`--outcrop` to `-c`.
+This is saying to apply the `outcrop` extension by extending the top of the
+image by 128 pixels, and the right and bottom of the image by 64 pixels. You can
+use any combination of top|left|right|bottom, and specify any number of pixels
+to extend. You can also abbreviate `--outcrop` to `-c`.
 
 The result looks like this:
 
-<div align="center" markdown>
-![curly_woman_outcrop](../assets/outpainting/curly-outcrop.png)
-</div>
+<figure markdown>
+![curly_woman_outcrop](../assets/outpainting/curly-outcrop-2.png)
+</figure>
 
-The new image is actually slightly larger than the original (576x576,
-because 64 pixels were added to the top and right sides.)
+The new image is larger than the original (576x704) because 64 pixels were added
+to the top and right sides. You will need enough VRAM to process an image of
+this size.
+
+#### Outcropping non-InvokeAI images
+
+You can outcrop an arbitrary image that was not generated by InvokeAI,
+but your results will vary. The `inpainting-1.5` model is highly
+recommended, but if not feasible, then you may be able to improve the
+output by conditioning the outcropping with a text prompt that
+describes the scene using the `--new_prompt` argument:
+
+```bash
+invoke> !fix images/vacation.png --outcrop top 128 --new_prompt "family vacation"
+```
+
+You may also provide a different seed for outcropping to use by passing
+`-S<seed>`. A negative seed will generate a new random seed.
 
 A number of caveats:
 
-1. Although you can specify any pixel values, they will be rounded up
-to the nearest multiple of 64. Smaller values are better. Larger
-extensions are more likely to generate artefacts. However, if you wish
-you can run the !fix command repeatedly to cautiously expand the
-image.
+1. Although you can specify any pixel values, they will be rounded up to the
+   nearest multiple of 64. Smaller values are better. Larger extensions are more
+   likely to generate artefacts. However, if you wish you can run the !fix
+   command repeatedly to cautiously expand the image.
 
-2. The extension is stochastic, meaning that each time you run it
-you'll get a slightly different result. You can run it repeatedly
-until you get an image you like. Unfortunately `!fix` does not
-currently respect the `-n` (`--iterations`) argument.
+2. The extension is stochastic, meaning that each time you run it you'll get a
+   slightly different result. You can run it repeatedly until you get an image
+   you like. Unfortunately `!fix` does not currently respect the `-n`
+   (`--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/preload_models.py`.
+   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.
+
+4. When using the `inpaint-1.5` model, you may notice subtle changes to the area
+   outside the masked region. This is because the model performs an
+   encoding/decoding on the image as a whole. This does not occur with the
+   standard model.
+
+## Outpaint
+
+The `outpaint` extension does the same thing, but with subtle differences.
+Starting with the same image, here is how we would add an additional 64 pixels
+to the top of the image:
+
+```bash
+invoke> !fix images/curly.png --out_direction top 64
+```
+
+(you can abbreviate `--out_direction` as `-D`.
+
+The result is shown here:
+
+<figure markdown>
+![curly_woman_outpaint](../assets/outpainting/curly-outpaint.png)
+</figure>
+
+Although the effect is similar, there are significant differences from
+outcropping:
+
+- You can only specify one direction to extend at a time.
+- The image is **not** resized. Instead, the image is shifted by the specified
+  number of pixels. If you look carefully, you'll see that less of the lady's
+  torso is visible in the image.
+- Because the image dimensions remain the same, there's no rounding to multiples
+  of 64.
+- Attempting to outpaint larger areas will frequently give rise to ugly ghosting
+  effects.
+- For best results, try increasing the step number.
+- If you don't specify a pixel value in `-D`, it will default to half of the
+  whole image, which is likely not what you want.
+
+!!! tip
+
+    Neither `outpaint` nor `outcrop` are perfect, but we continue to tune
+    and improve them. If one doesn't work, try the other. You may also
+    wish to experiment with other `img2img` arguments, such as `-C`, `-f`
+    and `-s`.

docs/features/POSTPROCESS.md

@@ -6,49 +6,39 @@ title: Postprocessing
 
 ## Intro
 
-This extension provides the ability to restore faces and upscale
-images.
+This extension provides the ability to restore faces and upscale images.
 
-Face restoration and upscaling can be applied at the time you generate
-the images, or at any later time against a previously-generated PNG
-file, using the [!fix](#fixing-previously-generated-images)
-command. [Outpainting and outcropping](OUTPAINTING.md) can only be
-applied after the fact.
+Face restoration and upscaling can be applied at the time you generate the
+images, or at any later time against a previously-generated PNG file, using the
+[!fix](#fixing-previously-generated-images) command.
+[Outpainting and outcropping](OUTPAINTING.md) can only be applied after the
+fact.
 
 ## Face Fixing
 
 The default face restoration module is GFPGAN. The default upscale is
-Real-ESRGAN. For an alternative face restoration module, see [CodeFormer
-Support] below.
+Real-ESRGAN. For an alternative face restoration module, see
+[CodeFormer Support](#codeformer-support) below.
 
-As of version 1.14, environment.yaml will install the Real-ESRGAN
-package into the standard install location for python packages, and
-will put GFPGAN into a subdirectory of "src" in the InvokeAI
-directory. Upscaling with Real-ESRGAN should "just work" without
-further intervention. Simply pass the --upscale (-U) option on the
-invoke> command line, or indicate the desired scale on the popup in
-the Web GUI.
+As of version 1.14, environment.yaml will install the Real-ESRGAN package into
+the standard install location for python packages, and will put GFPGAN into a
+subdirectory of "src" in the InvokeAI directory. Upscaling with Real-ESRGAN
+should "just work" without further intervention. Simply pass the `--upscale`
+(`-U`) option on the `invoke>` command line, or indicate the desired scale on
+the popup in the Web GUI.
 
-**GFPGAN** requires a series of downloadable model files to
-work. These are loaded when you run `scripts/preload_models.py`. If
-GFPAN is failing with an error, please run the following from the
-InvokeAI directory:
+**GFPGAN** requires a series of downloadable model files to work. These are
+loaded when you run `scripts/preload_models.py`. If GFPAN is failing with an
+error, please run the following from the InvokeAI directory:
 
 ```bash
 python scripts/preload_models.py
 ```
 
-If you do not run this script in advance, the GFPGAN module will attempt
-to download the models files the first time you try to perform facial
+If you do not run this script in advance, the GFPGAN module will attempt to
+download the models files the first time you try to perform facial
 reconstruction.
 
-Alternatively, if you have GFPGAN installed elsewhere, or if you are
-using an earlier version of this package which asked you to install
-GFPGAN in a sibling directory, you may use the `--gfpgan_dir` argument
-with `invoke.py` to set a custom path to your GFPGAN directory. _There
-are other GFPGAN related boot arguments if you wish to customize
-further._
-
 ## Usage
 
 You will now have access to two new prompt arguments.
@@ -119,15 +109,15 @@ actions.
 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
-`preload_models.py` or by manually downloading the [model
-file](https://github.com/sczhou/CodeFormer/releases/download/v0.1.0/codeformer.pth)
+In order to setup CodeFormer to work, you need to download the models like with
+GFPGAN. You can do this either by running `preload_models.py` 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.
 
-You can use `-ft` prompt argument to swap between CodeFormer and the
-default GFPGAN. The above mentioned `-G` prompt argument will allow
-you to control the strength of the restoration effect.
+You can use `-ft` prompt argument to swap between CodeFormer and the default
+GFPGAN. The above mentioned `-G` prompt argument will allow you to control the
+strength of the restoration effect.
 
 ### Usage
 
@@ -157,9 +147,9 @@ situations when there is very little facial data to work with.
 ## Fixing Previously-Generated Images
 
 It is easy to apply face restoration and/or upscaling to any
-previously-generated file. Just use the syntax `!fix path/to/file.png
-<options>`. For example, to apply GFPGAN at strength 0.8 and upscale
-2X for a file named `./outputs/img-samples/000044.2945021133.png`,
+previously-generated file. Just use the syntax
+`!fix path/to/file.png <options>`. For example, to apply GFPGAN at strength 0.8
+and upscale 2X for a file named `./outputs/img-samples/000044.2945021133.png`,
 just run:
 
 ```bash

docs/features/PROMPTS.md

@@ -6,14 +6,15 @@ title: Prompting-Features
 
 ## **Reading Prompts from a File**
 
-You can automate `invoke.py` by providing a text file with the prompts you want to run, one line per
-prompt. The text file must be composed with a text editor (e.g. Notepad) and not a word processor.
-Each line should look like what you would type at the invoke> prompt:
+You can automate `invoke.py` by providing a text file with the prompts you want
+to run, one line per prompt. The text file must be composed with a text editor
+(e.g. Notepad) and not a word processor. Each line should look like what you
+would type at the invoke> prompt:
 
 ```bash
-a beautiful sunny day in the park, children playing -n4 -C10
-stormy weather on a mountain top, goats grazing     -s100
-innovative packaging for a squid's dinner           -S137038382
+"a beautiful sunny day in the park, children playing" -n4 -C10
+"stormy weather on a mountain top, goats grazing" -s100
+"innovative packaging for a squid's dinner" -S137038382
 ```
 
 Then pass this file's name to `invoke.py` when you invoke it:
@@ -22,7 +23,8 @@ Then pass this file's name to `invoke.py` when you invoke it:
 (invokeai) ~/stable-diffusion$ python3 scripts/invoke.py --from_file "path/to/prompts.txt"
 ```
 
-You may read a series of prompts from standard input by providing a filename of `-`:
+You may read a series of prompts from standard input by providing a filename of
+`-`:
 
 ```bash
 (invokeai) ~/stable-diffusion$ echo "a beautiful day" | python3 scripts/invoke.py --from_file -
@@ -32,14 +34,15 @@ You may read a series of prompts from standard input by providing a filename of
 
 ## **Negative and Unconditioned Prompts**
 
-Any words between a pair of square brackets will instruct Stable
-Diffusion to attempt to ban the concept from the generated image.
+Any words between a pair of square brackets will instruct Stable Diffusion to
+attempt to ban the concept from the generated image.
 
 ```text
 this is a test prompt [not really] to make you understand [cool] how this works.
 ```
 
-In the above statement, the words 'not really cool` will be ignored by Stable Diffusion.
+In the above statement, the words 'not really cool` will be ignored by Stable
+Diffusion.
 
 Here's a prompt that depicts what it does.
 
@@ -47,33 +50,37 @@ original prompt:
 
 `#!bash "A fantastical translucent pony made of water and foam, ethereal, radiant, hyperalism, scottish folklore, digital painting, artstation, concept art, smooth, 8 k frostbite 3 engine, ultra detailed, art by artgerm and greg rutkowski and magali villeneuve" -s 20 -W 512 -H 768 -C 7.5 -A k_euler_a -S 1654590180`
 
-<div align="center" markdown>
+<figure markdown>
 ![step1](../assets/negative_prompt_walkthru/step1.png)
-</div>
+</figure>
 
-That image has a woman, so if we want the horse without a rider, we can influence the image not to have a woman by putting [woman] in the prompt, like this:
+That image has a woman, so if we want the horse without a rider, we can
+influence the image not to have a woman by putting [woman] in the prompt, like
+this:
 
 `#!bash "A fantastical translucent poney made of water and foam, ethereal, radiant, hyperalism, scottish folklore, digital painting, artstation, concept art, smooth, 8 k frostbite 3 engine, ultra detailed, art by artgerm and greg rutkowski and magali villeneuve [woman]" -s 20 -W 512 -H 768 -C 7.5 -A k_euler_a -S 1654590180`
 
-<div align="center" markdown>
+<figure markdown>
 ![step2](../assets/negative_prompt_walkthru/step2.png)
-</div>
+</figure>
 
-That's nice - but say we also don't want the image to be quite so blue. We can add "blue" to the list of negative prompts, so it's now [woman blue]:
+That's nice - but say we also don't want the image to be quite so blue. We can
+add "blue" to the list of negative prompts, so it's now [woman blue]:
 
 `#!bash "A fantastical translucent poney made of water and foam, ethereal, radiant, hyperalism, scottish folklore, digital painting, artstation, concept art, smooth, 8 k frostbite 3 engine, ultra detailed, art by artgerm and greg rutkowski and magali villeneuve [woman blue]" -s 20 -W 512 -H 768 -C 7.5 -A k_euler_a -S 1654590180`
 
-<div align="center" markdown>
+<figure markdown>
 ![step3](../assets/negative_prompt_walkthru/step3.png)
-</div>
+</figure>
 
-Getting close - but there's no sense in having a saddle when our horse doesn't have a rider, so we'll add one more negative prompt: [woman blue saddle].
+Getting close - but there's no sense in having a saddle when our horse doesn't
+have a rider, so we'll add one more negative prompt: [woman blue saddle].
 
 `#!bash "A fantastical translucent poney made of water and foam, ethereal, radiant, hyperalism, scottish folklore, digital painting, artstation, concept art, smooth, 8 k frostbite 3 engine, ultra detailed, art by artgerm and greg rutkowski and magali villeneuve [woman blue saddle]" -s 20 -W 512 -H 768 -C 7.5 -A k_euler_a -S 1654590180`
 
-<div align="center" markdown>
+<figure markdown>
 ![step4](../assets/negative_prompt_walkthru/step4.png)
-</div>
+</figure>
 
 !!! notes "Notes about this feature:"
 
@@ -88,91 +95,128 @@ Getting close - but there's no sense in having a saddle when our horse doesn't h
 
 The InvokeAI prompting language has the following features:
 
-### Attention weighting 
-Append a word or phrase with `-` or `+`, or a weight between `0` and `2` (`1`=default), to decrease or increase "attention" (= a mix of per-token CFG weighting multiplier and, for `-`, a weighted blend with the prompt without the term).
+### Attention weighting
+
+Append a word or phrase with `-` or `+`, or a weight between `0` and `2`
+(`1`=default), to decrease or increase "attention" (= a mix of per-token CFG
+weighting multiplier and, for `-`, a weighted blend with the prompt without the
+term).
 
 The following syntax is recognised:
-  * single words without parentheses: `a tall thin man picking apricots+`
-  * single or multiple words with parentheses: `a tall thin man picking (apricots)+` `a tall thin man picking (apricots)-` `a tall thin man (picking apricots)+` `a tall thin man (picking apricots)-` 
-  * more effect with more symbols `a tall thin man (picking apricots)++`
-  * nesting `a tall thin man (picking apricots+)++` (`apricots` effectively gets `+++`)
-  * all of the above with explicit numbers `a tall thin man picking (apricots)1.1` `a tall thin man (picking (apricots)1.3)1.1`. (`+` is equivalent to 1.1, `++` is pow(1.1,2), `+++` is pow(1.1,3), etc; `-` means 0.9, `--` means pow(0.9,2), etc.)
-  * attention also applies to `[unconditioning]` so `a tall thin man picking apricots [(ladder)0.01]` will *very gently* nudge SD away from trying to draw the man on a ladder
 
-You can use this to increase or decrease the amount of something. Starting from this prompt of `a man picking apricots from a tree`, let's see what happens if we increase and decrease how much attention we want Stable Diffusion to pay to the word `apricots`:
+- single words without parentheses: `a tall thin man picking apricots+`
+- single or multiple words with parentheses:
+  `a tall thin man picking (apricots)+` `a tall thin man picking (apricots)-`
+  `a tall thin man (picking apricots)+` `a tall thin man (picking apricots)-`
+- more effect with more symbols `a tall thin man (picking apricots)++`
+- nesting `a tall thin man (picking apricots+)++` (`apricots` effectively gets
+  `+++`)
+- all of the above with explicit numbers `a tall thin man picking (apricots)1.1`
+  `a tall thin man (picking (apricots)1.3)1.1`. (`+` is equivalent to 1.1, `++`
+  is pow(1.1,2), `+++` is pow(1.1,3), etc; `-` means 0.9, `--` means pow(0.9,2),
+  etc.)
+- attention also applies to `[unconditioning]` so
+  `a tall thin man picking apricots [(ladder)0.01]` will _very gently_ nudge SD
+  away from trying to draw the man on a ladder
+
+You can use this to increase or decrease the amount of something. Starting from
+this prompt of `a man picking apricots from a tree`, let's see what happens if
+we increase and decrease how much attention we want Stable Diffusion to pay to
+the word `apricots`:
 
 ![an AI generated image of a man picking apricots from a tree](../assets/prompt_syntax/apricots-0.png)
 
 Using `-` to reduce apricot-ness:
 
-| `a man picking apricots- from a tree` | `a man picking apricots-- from a tree` | `a man picking apricots--- from a tree` |
-| -- | -- | -- |
+| `a man picking apricots- from a tree`                                                                                          | `a man picking apricots-- from a tree`                                                                                                        | `a man picking apricots--- from a tree`                                                                                                    |
+| ------------------------------------------------------------------------------------------------------------------------------ | --------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------ |
 | ![an AI generated image of a man picking apricots from a tree, with smaller apricots](../assets/prompt_syntax/apricots--1.png) | ![an AI generated image of a man picking apricots from a tree, with even smaller and fewer apricots](../assets/prompt_syntax/apricots--2.png) | ![an AI generated image of a man picking apricots from a tree, with very few very small apricots](../assets/prompt_syntax/apricots--3.png) |
 
 Using `+` to increase apricot-ness:
 
-| `a man picking apricots+ from a tree` | `a man picking apricots++ from a tree` | `a man picking apricots+++ from a tree` | `a man picking apricots++++ from a tree` | `a man picking apricots+++++ from a tree` |
-| -- | -- | -- | -- | -- |
+| `a man picking apricots+ from a tree`                                                                                                      | `a man picking apricots++ from a tree`                                                                                                              | `a man picking apricots+++ from a tree`                                                                                                                     | `a man picking apricots++++ from a tree`                                                                                                                                           | `a man picking apricots+++++ from a tree`                                                                                                                                                                           |
+| ------------------------------------------------------------------------------------------------------------------------------------------ | --------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | ![an AI generated image of a man picking apricots from a tree, with larger, more vibrant apricots](../assets/prompt_syntax/apricots-1.png) | ![an AI generated image of a man picking apricots from a tree with even larger, even more vibrant apricots](../assets/prompt_syntax/apricots-2.png) | ![an AI generated image of a man picking apricots from a tree, but the man has been replaced by a pile of apricots](../assets/prompt_syntax/apricots-3.png) | ![an AI generated image of a man picking apricots from a tree, but the man has been replaced by a mound of giant melting-looking apricots](../assets/prompt_syntax/apricots-4.png) | ![an AI generated image of a man picking apricots from a tree, but the man and the leaves and parts of the ground have all been replaced by giant melting-looking apricots](../assets/prompt_syntax/apricots-5.png) |
 
-You can also change the balance between different parts of a prompt. For example, below is a `mountain man`:
+You can also change the balance between different parts of a prompt. For
+example, below is a `mountain man`:
 
 ![an AI generated image of a mountain man](../assets/prompt_syntax/mountain-man.png)
 
 And here he is with more mountain:
 
-| `mountain+ man` | `mountain++ man` | `mountain+++ man` | 
-| -- | -- | -- |
+| `mountain+ man`                                | `mountain++ man`                               | `mountain+++ man`                              |
+| ---------------------------------------------- | ---------------------------------------------- | ---------------------------------------------- |
 | ![](../assets/prompt_syntax/mountain1-man.png) | ![](../assets/prompt_syntax/mountain2-man.png) | ![](../assets/prompt_syntax/mountain3-man.png) |
 
 Or, alternatively, with more man:
 
-| `mountain man+` | `mountain man++` | `mountain man+++` | `mountain man++++` | 
-| -- | -- | -- | -- |
+| `mountain man+`                                | `mountain man++`                               | `mountain man+++`                              | `mountain man++++`                             |
+| ---------------------------------------------- | ---------------------------------------------- | ---------------------------------------------- | ---------------------------------------------- |
 | ![](../assets/prompt_syntax/mountain-man1.png) | ![](../assets/prompt_syntax/mountain-man2.png) | ![](../assets/prompt_syntax/mountain-man3.png) | ![](../assets/prompt_syntax/mountain-man4.png) |
 
 ### Blending between prompts
 
-* `("a tall thin man picking apricots", "a tall thin man picking pears").blend(1,1)`
-* The existing prompt blending using `:<weight>` will continue to be supported - `("a tall thin man picking apricots", "a tall thin man picking pears").blend(1,1)` is equivalent to `a tall thin man picking apricots:1 a tall thin man picking pears:1` in the old syntax.
-* Attention weights can be nested inside blends.
-* Non-normalized blends are supported by passing `no_normalize` as an additional argument to the blend weights, eg `("a tall thin man picking apricots", "a tall thin man picking pears").blend(1,-1,no_normalize)`. very fun to explore local maxima in the feature space, but also easy to produce garbage output.
+- `("a tall thin man picking apricots", "a tall thin man picking pears").blend(1,1)`
+- The existing prompt blending using `:<weight>` will continue to be supported -
+  `("a tall thin man picking apricots", "a tall thin man picking pears").blend(1,1)`
+  is equivalent to
+  `a tall thin man picking apricots:1 a tall thin man picking pears:1` in the
+  old syntax.
+- Attention weights can be nested inside blends.
+- Non-normalized blends are supported by passing `no_normalize` as an additional
+  argument to the blend weights, eg
+  `("a tall thin man picking apricots", "a tall thin man picking pears").blend(1,-1,no_normalize)`.
+  very fun to explore local maxima in the feature space, but also easy to
+  produce garbage output.
 
-See the section below on "Prompt Blending" for more information about how this works.
+See the section below on "Prompt Blending" for more information about how this
+works.
 
 ### Cross-Attention Control ('prompt2prompt')
 
-Sometimes an image you generate is almost right, and you just want to
-change one detail without affecting the rest. You could use a photo editor and inpainting
-to overpaint the area, but that's a pain. Here's where `prompt2prompt`
-comes in handy.
+Sometimes an image you generate is almost right, and you just want to change one
+detail without affecting the rest. You could use a photo editor and inpainting
+to overpaint the area, but that's a pain. Here's where `prompt2prompt` comes in
+handy.
 
-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.
+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`.
+- `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`.
 
+The `prompt2prompt` code is based off
+[bloc97's colab](https://github.com/bloc97/CrossAttentionControl).
 
+Note that `prompt2prompt` is not currently working with the runwayML inpainting
+model, and may never work due to the way this model is set up. If you attempt to
+use `prompt2prompt` you will get the original image back. However, since this
+model is so good at inpainting, a good substitute is to use the `clipseg` text
+masking option:
 
-The `prompt2prompt` code is based off [bloc97's
-colab](https://github.com/bloc97/CrossAttentionControl).
-
-Note that `prompt2prompt` is not currently working with the runwayML
-inpainting model, and may never work due to the way this model is set
-up. If you attempt to use `prompt2prompt` you will get the original
-image back. However, since this model is so good at inpainting, a
-good substitute is to use the `clipseg` text masking option:
-
-```
+```bash
 invoke> a fluffy cat eating a hotdot
 Outputs:
 [1010] outputs/000025.2182095108.png: a fluffy cat eating a hotdog
@@ -181,94 +225,96 @@ invoke> a smiling dog eating a hotdog -I 000025.2182095108.png -tm cat
 
 ### Escaping parantheses () and speech marks ""
 
-If the model you are using has parentheses () or speech marks "" as
-part of its syntax, you will need to "escape" these using a backslash,
-so that`(my_keyword)` becomes `\(my_keyword\)`. Otherwise, the prompt
-parser will attempt to interpret the parentheses as part of the prompt
-syntax and it will get confused.
+If the model you are using has parentheses () or speech marks "" as part of its
+syntax, you will need to "escape" these using a backslash, so that`(my_keyword)`
+becomes `\(my_keyword\)`. Otherwise, the prompt parser will attempt to interpret
+the parentheses as part of the prompt syntax and it will get confused.
+
+---
 
 ## **Prompt Blending**
 
-You may blend together different sections of the prompt to explore the
-AI's latent semantic space and generate interesting (and often
-surprising!) variations. The syntax is:
+You may blend together different sections of the prompt to explore the AI's
+latent semantic space and generate interesting (and often surprising!)
+variations. The syntax is:
 
 ```bash
 blue sphere:0.25 red cube:0.75 hybrid
 ```
 
-This will tell the sampler to blend 25% of the concept of a blue
-sphere with 75% of the concept of a red cube. The blend weights can
-use any combination of integers and floating point numbers, and they
-do not need to add up to 1. Everything to the left of the `:XX` up to
-the previous `:XX` is used for merging, so the overall effect is:
+This will tell the sampler to blend 25% of the concept of a blue sphere with 75%
+of the concept of a red cube. The blend weights can use any combination of
+integers and floating point numbers, and they do not need to add up to 1.
+Everything to the left of the `:XX` up to the previous `:XX` is used for
+merging, so the overall effect is:
 
 ```bash
 0.25 * "blue sphere" + 0.75 * "white duck" + hybrid
 ```
 
-Because you are exploring the "mind" of the AI, the AI's way of mixing
-two concepts may not match yours, leading to surprising effects. To
-illustrate, here are three images generated using various combinations
-of blend weights. As usual, unless you fix the seed, the prompts will give you
-different results each time you run them.
+Because you are exploring the "mind" of the AI, the AI's way of mixing two
+concepts may not match yours, leading to surprising effects. To illustrate, here
+are three images generated using various combinations of blend weights. As
+usual, unless you fix the seed, the prompts will give you different results each
+time you run them.
 
----
-
-<div align="center" markdown>
+<figure markdown>
 ### "blue sphere, red cube, hybrid"
-</div>
+</figure>
 
-This example doesn't use melding at all and represents the default way
-of mixing concepts.
+This example doesn't use melding at all and represents the default way of mixing
+concepts.
 
-<div align="center" markdown>
+<figure markdown>
 ![blue-sphere-red-cube-hyprid](../assets/prompt-blending/blue-sphere-red-cube-hybrid.png)
-</div>
+</figure>
 
-It's interesting to see how the AI expressed the concept of "cube" as
-the four quadrants of the enclosing frame. If you look closely, there
-is depth there, so the enclosing frame is actually a cube.
+It's interesting to see how the AI expressed the concept of "cube" as the four
+quadrants of the enclosing frame. If you look closely, there is depth there, so
+the enclosing frame is actually a cube.
 
-<div align="center" markdown>
+<figure markdown>
 ### "blue sphere:0.25 red cube:0.75 hybrid"
 
 ![blue-sphere-25-red-cube-75](../assets/prompt-blending/blue-sphere-0.25-red-cube-0.75-hybrid.png)
-</div>
 
-Now that's interesting. We get neither a blue sphere nor a red cube,
-but a red sphere embedded in a brick wall, which represents a melding
-of concepts within the AI's "latent space" of semantic
-representations. Where is Ludwig Wittgenstein when you need him?
+</figure>
 
-<div align="center" markdown>
+Now that's interesting. We get neither a blue sphere nor a red cube, but a red
+sphere embedded in a brick wall, which represents a melding of concepts within
+the AI's "latent space" of semantic representations. Where is Ludwig
+Wittgenstein when you need him?
+
+<figure markdown>
 ### "blue sphere:0.75 red cube:0.25 hybrid"
 
 ![blue-sphere-75-red-cube-25](../assets/prompt-blending/blue-sphere-0.75-red-cube-0.25-hybrid.png)
-</div>
 
-Definitely more blue-spherey. The cube is gone entirely, but it's
-really cool abstract art.
+</figure>
 
-<div align="center" markdown>
+Definitely more blue-spherey. The cube is gone entirely, but it's really cool
+abstract art.
+
+<figure markdown>
 ### "blue sphere:0.5 red cube:0.5 hybrid"
 
 ![blue-sphere-5-red-cube-5-hybrid](../assets/prompt-blending/blue-sphere-0.5-red-cube-0.5-hybrid.png)
-</div>
 
-Whoa...! I see blue and red, but no spheres or cubes. Is the word
-"hybrid" summoning up the concept of some sort of scifi creature?
-Let's find out.
+</figure>
 
-<div align="center" markdown>
+Whoa...! I see blue and red, but no spheres or cubes. Is the word "hybrid"
+summoning up the concept of some sort of scifi creature? Let's find out.
+
+<figure markdown>
 ### "blue sphere:0.5 red cube:0.5"
 
 ![blue-sphere-5-red-cube-5](../assets/prompt-blending/blue-sphere-0.5-red-cube-0.5.png)
-</div>
 
-Indeed, removing the word "hybrid" produces an image that is more like
-what we'd expect.
+</figure>
 
-In conclusion, prompt blending is great for exploring creative space,
-but can be difficult to direct. A forthcoming release of InvokeAI will
-feature more deterministic prompt weighting.
+Indeed, removing the word "hybrid" produces an image that is more like what we'd
+expect.
+
+In conclusion, prompt blending is great for exploring creative space, but can be
+difficult to direct. A forthcoming release of InvokeAI will feature more
+deterministic prompt weighting.

docs/features/UNIFIED_CANVAS.md

@@ -0,0 +1,117 @@
+The Unified Canvas is a tool designed to streamline and simplify the process of composing an image using Stable Diffusion. It offers artists all of the available Stable Diffusion generation modes (Text To Image, Image To Image, Inpainting, and Outpainting) as a single unified workflow. The flexibility of the tool allows you to tweak and edit image generations, extend images beyond their initial size, and to create new content in a freeform way both inside and outside of existing images. 
+
+This document explains the basics of using the Unified Canvas, introducing you to its features and tools one by one. It also describes some of the more advanced tools available to power users of the Canvas.
+
+# Basics
+The Unified Canvas consists of two layers: the **Base Layer** and the **Mask Layer**. You can swap from one layer to the other by selecting the layer you want in the drop-down menu on the top left corner of the Unified Canvas, or by pressing the (Q) hotkey.
+
+### Base Layer
+The **Base Layer** is the image content currently managed by the Canvas, and can be exported at any time to the gallery by using the **Save to Gallery** option. When the Base Layer is selected, the Brush (B) and Eraser (E) tools will directly manipulate the base layer. Any images uploaded to the Canvas, or sent to the Unified Canvas from the gallery, will clear out all existing content and set the Base layer to the new image.
+
+### Staging Area
+When you generate images, they will display in the Canvas's **Staging Area**, alongside the Staging Area toolbar buttons. While the Staging Area is active, you cannot interact with the Canvas itself.
+
+<figure markdown>
+![staging area](../assets/canvas/staging_area.png)
+</figure>
+
+Accepting generations will commit the new generation to the **Base Layer**. You can review all generated images using the Prev/Next arrows, save any individual generations to your gallery (without committing to the Base layer) or discard generations. While you can Undo a discard in an individual Canvas session, any generations that are not saved will be lost when the Canvas resets.
+
+### Mask Layer
+The **Mask Layer** consists of any masked sections that have been created to inform Inpainting generations. You can paint a new mask, or edit an existing mask, using the Brush tool and the Eraser with the Mask layer set as your Active layer. Any masked areas will only affect generation inside of the current bounding box.
+
+### Bounding Box
+When generating a new image, Invoke will process and apply new images within the area denoted by the **Bounding Box**. The Width & Height settings of the Bounding Box, as well as its location within the Unified Canvas and pixels or empty space that it encloses, determine how new invocations are generated - see [Inpainting & Outpainting](#inpainting-and-outpainting) below. The Bounding Box can be moved and resized using the Move (V) tool. It can also be resized using the Bounding Box options in the Options Panel. By using these controls you can generate larger or smaller images, control which sections of the image are being processed, as well as control Bounding Box tools like the Bounding Box fill/erase. 
+
+### <a name="inpainting-and-outpainting"></a> Inpainting & Outpainting
+"Inpainting" means asking the AI to refine part of an image while leaving the rest alone. For example, updating a portrait of your grandmother to have her wear a biker's jacket.
+
+<figure markdown>
+![granny with a mask applied](../assets/canvas/mask_granny.png)
+</figure>
+
+<figure markdown>
+![just like magic, granny with a biker's jacket](../assets/canvas/biker_jacket_granny.png)
+</figure>
+
+"Outpainting" means asking the AI to expand the original image beyond its original borders, making a bigger image that's still based on the original. For example, extending the above image of your Grandmother in a biker's jacket to include her wearing jeans (and while we're at it, a motorcycle!)
+
+<figure markdown>
+![more magic - granny with a tattooed arm, denim pants, and an obscured motorcycle](../assets/canvas/biker_jacket_granny.png)
+</figure>
+
+When you are using the Unified Canvas, Invoke decides automatically whether to do Inpainting, Outpainting, ImageToImage, or TextToImage by looking inside the area enclosed by the Bounding Box. It chooses the appropriate type of generation based on whether the Bounding Box contains empty (transparent) areas on the Base layer, or whether it contains colored areas from previous generations (or from painted brushstrokes) on the Base layer, and/or whether the Mask layer contains any brushstrokes. See [Generation Methods](#generation-methods) below for more information.
+
+# Getting Started
+
+To get started with the Unified Canvas, you will want to generate a new base layer using Txt2Img or importing an initial image. We'll refer to either of these methods as the "initial image" in the below guide.
+
+From there, you can consider the following techniques to augment your image:
+* **New Images**: Move the bounding box to an empty area of the Canvas, type in your prompt, and Invoke, to generate a new image using the Text to Image function.
+* **Image Correction**: Use the color picker and brush tool to paint corrections on the image, switch to the Mask layer, and brush a mask over your painted area to use **Inpainting**. You can also use the **ImageToImage** generation method to invoke new interpretations of the image. 
+* **Image Expansion**: Move the bounding box to include a portion of your initial image, and a portion of transparent/empty pixels, then Invoke using a prompt that describes what you'd like to see in that area. This will Outpaint the image. You'll typically find more coherent results if you keep about 50-60% of the original image in the bounding box. Make sure that the Image To Image Strength slider is set to a high value - you may need to set it higher than you are used to.
+* **New Content on Existing Images**: If you want to add new details or objects into your image, use the brush tool to paint a sketch of what you'd like to see on the image, switch to the Mask layer, and brush a mask over your painted area to use **Inpainting**. If the masked area is small, consider using a smaller bounding box to take advantage of Invoke's automatic Scaling features, which can help to produce better details. 
+* **And more**: There are a number of creative ways to use the Canvas, and the above are just starting points. We're excited to see what you come up with!
+
+
+# <a name="generation-methods"></a> Generation Methods
+The Canvas can use all generation methods available (Txt2Img, Img2Img, Inpainting, and Outpainting), and these will be automatically selected and used based on the current selection area within the Bounding Box.
+
+## Text to Image
+If the Bounding Box is placed over an area of Canvas with an **empty Base Layer**, invoking a new image will use **TextToImage**. This generates an entirely new image based on your prompt.
+
+## Image to Image
+If the Bounding Box is placed over an area of Canvas with an **existing Base Layer area with no transparent pixels or masks**, invoking a new image will use **ImageToImage**. This uses the image within the bounding box and your prompt to interpret a new image. The image will be closer to your original image at lower Image to Image strengths.
+
+## Inpainting
+If the Bounding Box is placed over an area of Canvas with an **existing Base Layer and any pixels selected using the Mask layer**, invoking a new image will use **Inpainting**. Inpainting uses the existing colors/forms in the masked area in order to generate a new image for the masked area only. The unmasked portion of the image will remain the same. Image to Image strength applies to the inpainted area.
+
+If you desire something completely different from the original image in your new generation (i.e., if you want Invoke to ignore existing colors/forms), consider toggling the Inpaint Replace setting on, and use high values for both Inpaint Replace and Image To Image Strength.
+
+> Note: By default, the **Scale Before Processing** option &mdash; which inpaints more coherent details by generating at a larger resolution and then scaling &mdash; is only activated when the Bounding Box is relatively small. To get the best inpainting results you should therefore resize your Bounding Box to the smallest area that contains your mask and enough surrounding detail to help Stable Diffusion understand the context of what you want it to draw. You should also update your prompt so that it describes *just* the area within the Bounding Box.
+
+## Outpainting
+If the Bounding Box is placed over an area of Canvas partially filled by an existing Base Layer area and partially by transparent pixels or masks, invoking a new image will use **Outpainting**, as well as **Inpainting** any masked areas.
+
+____
+
+# Advanced Features
+
+Features with non-obvious behavior are detailed below, in order to provide clarity on the intent and common use cases we expect for utilizing them.
+
+## Toolbar
+
+### Mask Options
+* **Enable Mask** - This flag can be used to Enable or Disable the currently painted mask. If you have painted a mask, but you don't want it affect the next invocation, but you *also* don't want to delete it, then you can set this option to Disable. When you want the mask back, set this back to Enable. 
+* **Preserve Masked Area** - When enabled, Preserve Masked Area inverts the effect of the Mask on the Inpainting process. Pixels in masked areas will be kept unchanged, and unmasked areas will be regenerated.
+
+### Creative Tools
+* **Brush - Base/Mask Modes** - The Brush tool switches automatically between different modes of operation for the Base and Mask layers respectively. 
+  * On the Base layer, the brush will directly paint on the Canvas using the color selected on the Brush Options menu. 
+  * On the Mask layer, the brush will create a new mask. If you're finding the mask difficult to see over the existing content of the Unified Canvas, you can change the color it is drawn with using the color selector on the Mask Options dropdown.
+* **Erase Bounding Box** - On the Base layer, erases all pixels within the Bounding Box.
+* **Fill Bounding Box** - On the Base layer, fills all pixels within the Bounding Box with the currently selected color.
+
+### Canvas Tools
+* **Move Tool** - Allows for manipulation of the Canvas view (by dragging on the Canvas, outside the bounding box), the Bounding Box (by dragging the edges of the box), or the Width/Height of the Bounding Box (by dragging one of the 9 directional handles).
+* **Reset View** - Click to re-orients the view to the center of the Bounding Box. 
+* **Merge Visible** - If your browser is having performance problems drawing the image in the Unified Canvas, click this to consolidate all of the information currently being rendered by your browser into a merged copy of the image. This lowers the resource requirements and should improve performance.
+
+## Seam Correction
+When doing Inpainting or Outpainting, Invoke needs to merge the pixels generated by Stable Diffusion into your existing image. To do this, the area around the `seam` at the boundary between your image and the new generation is automatically blended to produce a seamless output. In a fully automatic process, a mask is generated to cover the seam, and then the area of the seam is Inpainted. 
+
+Although the default options should work well most of the time, sometimes it can help to alter the parameters that control the seam Inpainting. A wider seam and a blur setting of about 1/3 of the seam have been noted as producing consistently strong results (e.g. 96 wide and 16 blur - adds up to 32 blur with both sides). Seam strength of 0.7 is best for reducing hard seams.
+* **Seam Size** - The size of the seam masked area. Set higher to make a larger mask around the seam.
+* **Seam Blur** - The size of the blur that is applied on *each* side of the masked area. 
+* **Seam Strength** - The Image To Image Strength parameter used for the Inpainting generation that is applied to the seam area.
+* **Seam Steps** - The number of generation steps that should be used to Inpaint the seam.
+
+## Infill & Scaling
+* **Scale Before Processing & W/H**: When generating images with a bounding box smaller than the optimized W/H of the model (e.g., 512x512 for SD1.5), this feature first generates at a larger size with the same aspect ratio, and then scales that image down to fill the selected area. This is particularly useful when inpainting very small details. Scaling is optional but is enabled by default.
+* **Inpaint Replace**: When Inpainting, the default method is to utilize the existing RGB values of the Base layer to inform the generation process. If Inpaint Replace is enabled, noise is generated and blended with the existing pixels (completely replacing the original RGB values at an Inpaint Replace value of 1). This can help generate more variation from the pixels on the Base layers.
+  * > When using Inpaint Replace you should use a higher Image To Image Strength value, especially at higher Inpaint Replace values
+* **Infill Method**: Invoke currently supports two methods for producing RGB values for use in the Outpainting process: Patchmatch and Tile. We believe that Patchmatch is the superior method, however we provide support for Tile in case Patchmatch cannot be installed or is unavailable on your computer.
+  * **Tile Size**: The Tile method for Outpainting sources small portions of the original image and randomly place these into the areas being Outpainted. This value sets the size of those tiles.
+
+# Hot Keys
+The Unified Canvas is a tool that excels when you use hotkeys. You can view the full list of keyboard shortcuts, updated with all new features, by clicking the Keyboard Shortcuts icon at the top right of the InvokeAI WebUI.

docs/features/VARIATIONS.md

@@ -16,12 +16,10 @@ You are able to do the following:
 2. Given two or more variations that you like, you can combine them in a
    weighted fashion.
 
----
+!!! Information ""
 
-This cheat sheet provides a quick guide for how this works in practice, using
-variations to create the desired image of Xena, Warrior Princess.
-
----
+    This cheat sheet provides a quick guide for how this works in practice, using
+    variations to create the desired image of Xena, Warrior Princess.
 
 ## Step 1 -- Find a base image that you like
 

docs/features/WEB.md

@@ -4,56 +4,55 @@ title: InvokeAI Web Server
 
 # :material-web: InvokeAI Web Server
 
-As of version 2.0.0, this distribution comes with a full-featured web
-server (see screenshot). To use it, run the `invoke.py` script by
-adding the `--web` option:
+As of version 2.0.0, this distribution comes with a full-featured web server
+(see screenshot). To use it, run the `invoke.py` script by adding the `--web`
+option:
 
 ```bash
 (invokeai) ~/InvokeAI$ python3 scripts/invoke.py --web
 ```
 
 You can then connect to the server by pointing your web browser at
-http://localhost:9090. To reach the server from a different machine on
-your LAN, you may launch the web server with the `--host` argument and
-either the IP address of the host you are running it on, or the
-wildcard `0.0.0.0`. For example:
+http://localhost:9090. To reach the server from a different machine on your LAN,
+you may launch the web server with the `--host` argument and either the IP
+address of the host you are running it on, or the wildcard `0.0.0.0`. For
+example:
 
 ```bash
 (invokeai) ~/InvokeAI$ python3 scripts/invoke.py --web --host 0.0.0.0
 ```
 
-# Quick guided walkthrough of the WebGUI's features
+## Quick guided walkthrough of the WebGUI's features
 
-While most of the WebGUI's features are intuitive, here is a guided
-walkthrough through its various components.
+While most of the WebGUI's features are intuitive, here is a guided walkthrough
+through its various components.
 
 ![Invoke Web Server - Major Components](../assets/invoke-web-server-1.png){:width="640px"}
 
-The screenshot above shows the Text to Image tab of the WebGUI. There
-are three main sections:
+The screenshot above shows the Text to Image tab of the WebGUI. There are three
+main sections:
 
-1. A **control panel** on the left, which contains various settings
-for text to image generation. The most important part is the text
-field (currently showing `strawberry sushi`) for entering the text
-prompt, and the camera icon directly underneath that will render the
-image. We'll call this the *Invoke* button from now on.
+1. A **control panel** on the left, which contains various settings for text to
+   image generation. The most important part is the text field (currently
+   showing `strawberry sushi`) for entering the text prompt, and the camera icon
+   directly underneath that will render the image. We'll call this the _Invoke_
+   button from now on.
 
-2. The **current image** section in the middle, which shows a large
-format version of the image you are currently working on. A series of
-buttons at the top ("image to image", "Use All", "Use Seed", etc) lets
-you modify the image in various ways.
+2. The **current image** section in the middle, which shows a large format
+   version of the image you are currently working on. A series of buttons at the
+   top ("image to image", "Use All", "Use Seed", etc) lets you modify the image
+   in various ways.
 
-3. A **gallery* section on the left that contains a history of the
-images you have generated. These images are read and written to the
-directory specified at launch time in `--outdir`.
+3. A \*_gallery_ section on the left that contains a history of the images you
+   have generated. These images are read and written to the directory specified
+   at launch time in `--outdir`.
 
-In addition to these three elements, there are a series of icons for
-changing global settings, reporting bugs, and changing the theme on
-the upper right.
+In addition to these three elements, there are a series of icons for changing
+global settings, reporting bugs, and changing the theme on the upper right.
 
 There are also a series of icons to the left of the control panel (see
-highlighted area in the screenshot below) which select among a series
-of tabs for performing different types of operations.
+highlighted area in the screenshot below) which select among a series of tabs
+for performing different types of operations.
 
 <figure markdown>
 ![Invoke Web Server - Control Panel](../assets/invoke-web-server-2.png){:width="512px"}
@@ -61,174 +60,167 @@ of tabs for performing different types of operations.
 
 From top to bottom, these are:
 
-1. Text to Image  - generate images from text
-2. Image to Image - from an uploaded starting image (drawing or photograph) generate a new one, modified by the text prompt
-3. Inpainting (pending) - Interactively erase portions of a starting image and have the AI fill in the erased region from a text prompt.
-4. Outpainting (pending) - Interactively add blank space to the borders of a starting image and fill in the background from a text prompt.
-5. Postprocessing (pending) - Interactively postprocess generated images using a variety of filters.
+1. Text to Image - generate images from text
+2. Image to Image - from an uploaded starting image (drawing or photograph)
+   generate a new one, modified by the text prompt
+3. Inpainting (pending) - Interactively erase portions of a starting image and
+   have the AI fill in the erased region from a text prompt.
+4. Outpainting (pending) - Interactively add blank space to the borders of a
+   starting image and fill in the background from a text prompt.
+5. Postprocessing (pending) - Interactively postprocess generated images using a
+   variety of filters.
 
 The inpainting, outpainting and postprocessing tabs are currently in
-development. However, limited versions of their features can already
-be accessed through the Text to Image and Image to Image tabs.
+development. However, limited versions of their features can already be accessed
+through the Text to Image and Image to Image tabs.
 
 ## Walkthrough
 
-The following walkthrough will exercise most (but not all) of the
-WebGUI's feature set.
+The following walkthrough will exercise most (but not all) of the WebGUI's
+feature set.
 
 ### Text to Image
 
-1. Launch the WebGUI using `python scripts/invoke.py --web` and
-connect to it with your browser by accessing
-`http://localhost:9090`. If the browser and server are running on
-different machines on your LAN, add the option `--host 0.0.0.0` to the
-launch command line and connect to the machine hosting the web server
-using its IP address or domain name.
+1. Launch the WebGUI using `python scripts/invoke.py --web` and connect to it
+   with your browser by accessing `http://localhost:9090`. If the browser and
+   server are running on different machines on your LAN, add the option
+   `--host 0.0.0.0` to the launch command line and connect to the machine
+   hosting the web server using its IP address or domain name.
 
 2. If all goes well, the WebGUI should come up and you'll see a green
-`connected` message on the upper right.
+   `connected` message on the upper right.
 
 #### Basics
 
-1. Generate an image by typing *strawberry sushi* into the large
-prompt field on the upper left and then clicking on the Invoke button
-(the one with the Camera icon). After a short wait, you'll see a large
-image of sushi in the image panel, and a new thumbnail in the gallery
-on the right.
+1.  Generate an image by typing _strawberry sushi_ into the large prompt field
+    on the upper left and then clicking on the Invoke button (the one with the
+    Camera icon). After a short wait, you'll see a large image of sushi in the
+    image panel, and a new thumbnail in the gallery on the right.
 
-    If you need more room on the screen, you can turn the gallery  off
-    by clicking on the **x** to the right of "Your Invocations". You can
-    turn it back on later by clicking the image icon that appears in the
-    gallery's place.
+    If you need more room on the screen, you can turn the gallery off by
+    clicking on the **x** to the right of "Your Invocations". You can turn it
+    back on later by clicking the image icon that appears in the gallery's
+    place.
 
-    The images are written into the directory indicated by the `--outdir`
-    option provided at script launch time. By default, this is
-    `outputs/img-samples` under the InvokeAI directory.
+    The images are written into the directory indicated by the `--outdir` option
+    provided at script launch time. By default, this is `outputs/img-samples`
+    under the InvokeAI directory.
 
-2. Generate a bunch of strawberry sushi images by increasing the
-number of requested images by adjusting the Images counter just below
-the Camera button. As each is generated, it will be added to the
-gallery. You can switch the active image by clicking on the gallery
-thumbnails.
+2.  Generate a bunch of strawberry sushi images by increasing the number of
+    requested images by adjusting the Images counter just below the Camera
+    button. As each is generated, it will be added to the gallery. You can
+    switch the active image by clicking on the gallery thumbnails.
 
-3. Try playing with different settings, including image width and
-height, the Sampler, the Steps and the CFG scale.
+3.  Try playing with different settings, including image width and height, the
+    Sampler, the Steps and the CFG scale.
 
-    Image *Width* and *Height* do what you'd expect. However, be aware that
+    Image _Width_ and _Height_ do what you'd expect. However, be aware that
     larger images consume more VRAM memory and take longer to generate.
 
-    The *Sampler* controls how the AI selects the image to display. Some
-    samplers are more "creative" than others and will produce a wider
-    range of variations (see next section). Some samplers run faster than
-    others.
+    The _Sampler_ controls how the AI selects the image to display. Some
+    samplers are more "creative" than others and will produce a wider range of
+    variations (see next section). Some samplers run faster than others.
 
-    *Steps* controls how many noising/denoising/sampling steps the AI will
-    take. The higher this value, the more refined the image will be, but
-    the longer the image will take to generate. A typical strategy is to
-    generate images with a low number of steps in order to select one to
-    work on further, and then regenerate it using a higher number of
-    steps.
+    _Steps_ controls how many noising/denoising/sampling steps the AI will take.
+    The higher this value, the more refined the image will be, but the longer
+    the image will take to generate. A typical strategy is to generate images
+    with a low number of steps in order to select one to work on further, and
+    then regenerate it using a higher number of steps.
 
-    The *CFG Scale* controls how hard the AI tries to match the generated
-    image to the input prompt. You can go as high or low as you like, but
-    generally values greater than 20 won't improve things much, and values
-    lower than 5 will produce unexpected images. There are complex
-    interactions between *Steps*, *CFG Scale* and the *Sampler*, so
-    experiment to find out what works for you.
+    The _CFG Scale_ controls how hard the AI tries to match the generated image
+    to the input prompt. You can go as high or low as you like, but generally
+    values greater than 20 won't improve things much, and values lower than 5
+    will produce unexpected images. There are complex interactions between
+    _Steps_, _CFG Scale_ and the _Sampler_, so experiment to find out what works
+    for you.
 
-6. To regenerate a previously-generated image, select the image you
-want and click *Use All*. This loads the text prompt and other
-original settings into the control panel. If you then press *Invoke*
-it will regenerate the image exactly. You can also selectively modify
-the prompt or other settings to tweak the image.
+4.  To regenerate a previously-generated image, select the image you want and
+    click _Use All_. This loads the text prompt and other original settings into
+    the control panel. If you then press _Invoke_ it will regenerate the image
+    exactly. You can also selectively modify the prompt or other settings to
+    tweak the image.
 
-    Alternatively, you may click on *Use Seed* to load just the image's
-    seed, and leave other settings unchanged.
+    Alternatively, you may click on _Use Seed_ to load just the image's seed,
+    and leave other settings unchanged.
 
-7. To regenerate a Stable Diffusion image that was generated by
-another SD package, you need to know its text prompt and its
-*Seed*. Copy-paste the prompt into the prompt box, unset the
-*Randomize Seed* control in the control panel, and copy-paste the
-desired *Seed* into its text field. When you Invoke, you will get
-something similar to the original image. It will not be exact unless
-you also set the correct values for the original sampler, CFG,
-steps and dimensions, but it will (usually) be close.
+5.  To regenerate a Stable Diffusion image that was generated by another SD
+    package, you need to know its text prompt and its _Seed_. Copy-paste the
+    prompt into the prompt box, unset the _Randomize Seed_ control in the
+    control panel, and copy-paste the desired _Seed_ into its text field. When
+    you Invoke, you will get something similar to the original image. It will
+    not be exact unless you also set the correct values for the original
+    sampler, CFG, steps and dimensions, but it will (usually) be close.
 
 #### Variations on a theme
 
-1. Let's try generating some variations. Select your favorite sushi
-image from the gallery to load it. Then select "Use All" from the list
-of buttons above. This will load up all the settings used to generate
-this image, including its unique seed.
+1.  Let's try generating some variations. Select your favorite sushi image from
+    the gallery to load it. Then select "Use All" from the list of buttons
+    above. This will load up all the settings used to generate this image,
+    including its unique seed.
 
-    Go down to the Variations section of the Control Panel and set the
-    button to On. Set Variation Amount to 0.2 to generate a modest
-    number of variations on the image, and also set the Image counter to
-    `4`. Press the `invoke` button. This will generate a series of related
-    images. To obtain smaller variations, just lower the Variation
-    Amount. You may also experiment with changing the Sampler. Some
-    samplers generate more variability than others. *k_euler_a* is
-    particularly creative, while *ddim* is pretty conservative.
+    Go down to the Variations section of the Control Panel and set the button to
+    On. Set Variation Amount to 0.2 to generate a modest number of variations on
+    the image, and also set the Image counter to `4`. Press the `invoke` button.
+    This will generate a series of related images. To obtain smaller variations,
+    just lower the Variation Amount. You may also experiment with changing the
+    Sampler. Some samplers generate more variability than others. _k_euler_a_ is
+    particularly creative, while _ddim_ is pretty conservative.
 
-2. For even more variations, experiment with increasing the setting
-for *Perlin*. This adds a bit of noise to the image generation
-process. Note that values of Perlin noise greater than 0.15 produce
-poor images for several of the samplers.
+2.  For even more variations, experiment with increasing the setting for
+    _Perlin_. This adds a bit of noise to the image generation process. Note
+    that values of Perlin noise greater than 0.15 produce poor images for
+    several of the samplers.
 
 #### Facial reconstruction and upscaling
 
-Stable Diffusion frequently produces mangled faces, particularly when
-there are multiple figures in the same scene. Stable Diffusion has
-particular issues with generating reallistic eyes. InvokeAI provides
-the ability to reconstruct faces using either the GFPGAN or CodeFormer
-libraries. For more information see [POSTPROCESS](POSTPROCESS.md).
-  
-1. Invoke a prompt that generates a mangled face. A prompt that often
-gives this is "portrait of a lawyer, 3/4 shot" (this is not intended
-as a slur against lawyers!) Once you have an image that needs some
-touching up, load it into the Image panel, and press the button with
-the face icon (highlighted in the first screenshot below). A dialog
-box will appear. Leave *Strength* at 0.8 and press *Restore Faces". If
-all goes well, the eyes and other aspects of the face will be improved
-(see the second screenshot)
+Stable Diffusion frequently produces mangled faces, particularly when there are
+multiple figures in the same scene. Stable Diffusion has particular issues with
+generating reallistic eyes. InvokeAI provides the ability to reconstruct faces
+using either the GFPGAN or CodeFormer libraries. For more information see
+[POSTPROCESS](POSTPROCESS.md).
+
+1.  Invoke a prompt that generates a mangled face. A prompt that often gives
+    this is "portrait of a lawyer, 3/4 shot" (this is not intended as a slur
+    against lawyers!) Once you have an image that needs some touching up, load
+    it into the Image panel, and press the button with the face icon
+    (highlighted in the first screenshot below). A dialog box will appear. Leave
+    _Strength_ at 0.8 and press \*Restore Faces". If all goes well, the eyes and
+    other aspects of the face will be improved (see the second screenshot)
 
     ![Invoke Web Server - Original Image](../assets/invoke-web-server-3.png)
 
     ![Invoke Web Server - Retouched Image](../assets/invoke-web-server-4.png)
 
-    The facial reconstruction *Strength* field adjusts how aggressively
-    the face library will try to alter the face. It can be as high as 1.0,
-    but be aware that this often softens the face airbrush style, losing
-    some details. The default 0.8 is usually sufficient.
+    The facial reconstruction _Strength_ field adjusts how aggressively the face
+    library will try to alter the face. It can be as high as 1.0, but be aware
+    that this often softens the face airbrush style, losing some details. The
+    default 0.8 is usually sufficient.
 
-2. "Upscaling" is the process of increasing the size of an image while
-retaining the sharpness. InvokeAI uses an external library called
-"ESRGAN" to do this. To invoke upscaling, simply select an image and
-press the *HD* button above it. You can select between 2X and 4X
-upscaling, and adjust the upscaling strength, which has much the same
-meaning as in facial reconstruction. Try running this on one of your
-previously-generated images.
+2.  "Upscaling" is the process of increasing the size of an image while
+    retaining the sharpness. InvokeAI uses an external library called "ESRGAN"
+    to do this. To invoke upscaling, simply select an image and press the _HD_
+    button above it. You can select between 2X and 4X upscaling, and adjust the
+    upscaling strength, which has much the same meaning as in facial
+    reconstruction. Try running this on one of your previously-generated images.
 
-3. Finally, you can run facial reconstruction and/or upscaling
-automatically after each Invocation. Go to the Advanced Options
-section of the Control Panel and turn on *Restore Face* and/or
-*Upscale*.
+3.  Finally, you can run facial reconstruction and/or upscaling automatically
+    after each Invocation. Go to the Advanced Options section of the Control
+    Panel and turn on _Restore Face_ and/or _Upscale_.
 
 ### Image to Image
 
-InvokeAI lets you take an existing image and use it as the basis for a
-new creation. You can use any sort of image, including a photograph, a
-scanned sketch, or a digital drawing, as long as it is in PNG or JPEG
-format.
+InvokeAI lets you take an existing image and use it as the basis for a new
+creation. You can use any sort of image, including a photograph, a scanned
+sketch, or a digital drawing, as long as it is in PNG or JPEG format.
 
 For this tutorial, we'll use files named
-[Lincoln-and-Parrot-512.png](../assets/Lincoln-and-Parrot-512.png),
-and
+[Lincoln-and-Parrot-512.png](../assets/Lincoln-and-Parrot-512.png), and
 [Lincoln-and-Parrot-512-transparent.png](../assets/Lincoln-and-Parrot-512-transparent.png).
-Download these images to your local machine now to continue with the walkthrough.
+Download these images to your local machine now to continue with the
+walkthrough.
 
-1. Click on the *Image to Image* tab icon, which is the second icon
-from the top on the left-hand side of the screen:
+1.  Click on the _Image to Image_ tab icon, which is the second icon from the
+    top on the left-hand side of the screen:
 
     <figure markdown>
     ![Invoke Web Server - Image to Image Icon](../assets/invoke-web-server-5.png)
@@ -240,93 +232,94 @@ from the top on the left-hand side of the screen:
     ![Invoke Web Server - Image to Image Tab](../assets/invoke-web-server-6.png){:width="640px"}
     </figure>
 
-2. Drag-and-drop the Lincoln-and-Parrot image into the Image panel, or
-click the blank area to get an upload dialog. The image will load into
-an area marked *Initial Image*. (The WebGUI will also load the most
-recently-generated image from the gallery into a section on the left,
-but this image will be replaced in the next step.)
+2.  Drag-and-drop the Lincoln-and-Parrot image into the Image panel, or click
+    the blank area to get an upload dialog. The image will load into an area
+    marked _Initial Image_. (The WebGUI will also load the most
+    recently-generated image from the gallery into a section on the left, but
+    this image will be replaced in the next step.)
 
-3. Go to the prompt box and type *old sea captain with raven on
-shoulder* and press Invoke. A derived image will appear to the right
-of the original one:
+3.  Go to the prompt box and type _old sea captain with raven on shoulder_ and
+    press Invoke. A derived image will appear to the right of the original one:
 
     ![Invoke Web Server - Image to Image example](../assets/invoke-web-server-7.png){:width="640px"}
 
-4. Experiment with the different settings. The most influential one
-in Image to Image is *Image to Image Strength* located about midway
-down the control panel. By default it is set to 0.75, but can range
-from 0.0 to 0.99. The higher the value, the more of the original image
-the AI will replace. A value of 0 will leave the initial image
-completely unchanged, while 0.99 will replace it completely. However,
-the Sampler and CFG Scale also influence the final result. You can
-also generate variations in the same way as described in Text to
-Image.
+4.  Experiment with the different settings. The most influential one in Image to
+    Image is _Image to Image Strength_ located about midway down the control
+    panel. By default it is set to 0.75, but can range from 0.0 to 0.99. The
+    higher the value, the more of the original image the AI will replace. A
+    value of 0 will leave the initial image completely unchanged, while 0.99
+    will replace it completely. However, the Sampler and CFG Scale also
+    influence the final result. You can also generate variations in the same way
+    as described in Text to Image.
 
-5. What if we only want to change certain part(s) of the image and
-leave the rest intact? This is called Inpainting, and a future version
-of the InvokeAI web server will provide an interactive painting canvas
-on which you can directly draw the areas you wish to Inpaint into. For
-now, you can achieve this effect by using an external photoeditor tool
-to make one or more regions of the image transparent as described in
-[INPAINTING.md] and uploading that.
+5.  What if we only want to change certain part(s) of the image and leave the
+    rest intact? This is called Inpainting, and a future version of the InvokeAI
+    web server will provide an interactive painting canvas on which you can
+    directly draw the areas you wish to Inpaint into. For now, you can achieve
+    this effect by using an external photoeditor tool to make one or more
+    regions of the image transparent as described in [INPAINTING.md] and
+    uploading that.
 
     The file
     [Lincoln-and-Parrot-512-transparent.png](../assets/Lincoln-and-Parrot-512-transparent.png)
-    is a version of the earlier image in which the area around the parrot
-    has been replaced with transparency. Click on the "x" in the upper
-    right of the Initial Image and upload the transparent version. Using
-    the same prompt "old sea captain with raven on shoulder" try Invoking
-    an image. This time, only the parrot will be replaced, leaving the
-    rest of the original image intact:
+    is a version of the earlier image in which the area around the parrot has
+    been replaced with transparency. Click on the "x" in the upper right of the
+    Initial Image and upload the transparent version. Using the same prompt "old
+    sea captain with raven on shoulder" try Invoking an image. This time, only
+    the parrot will be replaced, leaving the rest of the original image intact:
 
-<figure markdown>
-![Invoke Web Server - Inpainting](../assets/invoke-web-server-8.png){:width="640px"}
-</figure>
+    <figure markdown>
+    ![Invoke Web Server - Inpainting](../assets/invoke-web-server-8.png){:width="640px"}
+    </figure>
 
-6. Would you like to modify a previously-generated image using the
-Image to Image facility? Easy! While in the Image to Image panel,
-hover over any of the gallery images to see a little menu of icons pop
-up.  Click the picture icon to instantly send the selected image to
-Image to Image as the initial image.
+6.  Would you like to modify a previously-generated image using the Image to
+    Image facility? Easy! While in the Image to Image panel, hover over any of
+    the gallery images to see a little menu of icons pop up. Click the picture
+    icon to instantly send the selected image to Image to Image as the initial
+    image.
 
-You can do the same from the Text to Image tab by clicking on the
-picture icon above the central image panel. The screenshot below
-shows where the "use as initial image" icons are located.
+You can do the same from the Text to Image tab by clicking on the picture icon
+above the central image panel. The screenshot below shows where the "use as
+initial image" icons are located.
 
 ![Invoke Web Server - Use as Image Links](../assets/invoke-web-server-9.png){:width="640px"}
 
 ## Parting remarks
 
-This concludes the walkthrough, but there are several more features that you
-can explore. Please check out the [Command Line Interface](CLI.md)
-documentation for further explanation of the advanced features that
-were not covered here.
+This concludes the walkthrough, but there are several more features that you can
+explore. Please check out the [Command Line Interface](CLI.md) documentation for
+further explanation of the advanced features that were not covered here.
 
-The WebGUI is only rapid development. Check back regularly for
-updates!
+The WebGUI is only rapid development. Check back regularly for updates!
 
 ## Reference
 
 ### Additional Options
 
- parameter <img width=160 align="right"> | effect
--- | --
-`--web_develop` | Starts the web server in development mode.
-`--web_verbose` | Enables verbose logging
-`--cors [CORS ...]` | Additional allowed origins, comma-separated
-`--host HOST` | Web server: Host or IP to listen on. Set to 0.0.0.0 to accept traffic from other devices on your network.
-`--port PORT` | Web server: Port to listen on
-`--gui` | Start InvokeAI GUI - This is the "desktop mode" version of the web app. It uses Flask to create a desktop app experience of the webserver.
+| parameter <img width=160 align="right"> | effect                                                                                                                                     |
+| --------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------ |
+| `--web_develop`                         | Starts the web server in development mode.                                                                                                 |
+| `--web_verbose`                         | Enables verbose logging                                                                                                                    |
+| `--cors [CORS ...]`                     | Additional allowed origins, comma-separated                                                                                                |
+| `--host HOST`                           | Web server: Host or IP to listen on. Set to 0.0.0.0 to accept traffic from other devices on your network.                                  |
+| `--port PORT`                           | Web server: Port to listen on                                                                                                              |
+| `--certfile CERTFILE`                   | Web server: Path to certificate file to use for SSL. Use together with --keyfile                                                           |
+| `--keyfile KEYFILE`                     | Web server: Path to private key file to use for SSL. Use together with --certfile'                                                         |
+| `--gui`                                 | Start InvokeAI GUI - This is the "desktop mode" version of the web app. It uses Flask to create a desktop app experience of the webserver. |
 
 ### Web Specific Features
 
-The web experience offers an incredibly easy-to-use experience for interacting with the InvokeAI toolkit. 
-For detailed guidance on individual features, see the Feature-specific help documents available in this directory.
-Note that the latest functionality available in the CLI may not always be available in the Web interface.
+The web experience offers an incredibly easy-to-use experience for interacting
+with the InvokeAI toolkit. For detailed guidance on individual features, see the
+Feature-specific help documents available in this directory. Note that the
+latest functionality available in the CLI may not always be available in the Web
+interface.
 
 #### Dark Mode & Light Mode
 
-The InvokeAI interface is available in a nano-carbon black & purple Dark Mode, and a "burn your eyes out Nosferatu" Light Mode. These can be toggled by clicking the Sun/Moon icons at the top right of the interface. 
+The InvokeAI interface is available in a nano-carbon black & purple Dark Mode,
+and a "burn your eyes out Nosferatu" Light Mode. These can be toggled by
+clicking the Sun/Moon icons at the top right of the interface.
 
 ![InvokeAI Web Server - Dark Mode](../assets/invoke_web_dark.png)
 
@@ -334,7 +327,10 @@ The InvokeAI interface is available in a nano-carbon black & purple Dark Mode, a
 
 #### Invocation Toolbar
 
-The left side of the InvokeAI interface is available for customizing the prompt and the settings used for invoking your new image. Typing your prompt into the open text field and clicking the Invoke button will produce the image based on the settings configured in the toolbar.
+The left side of the InvokeAI interface is available for customizing the prompt
+and the settings used for invoking your new image. Typing your prompt into the
+open text field and clicking the Invoke button will produce the image based on
+the settings configured in the toolbar.
 
 See below for additional documentation related to each feature:
 
@@ -347,11 +343,17 @@ See below for additional documentation related to each feature:
 
 #### Invocation Gallery
 
-The currently selected --outdir (or the default outputs folder) will display all previously generated files on load. As new invocations are generated, these will be dynamically added to the gallery, and can be previewed by selecting them. Each image also has a simple set of actions (e.g., Delete, Use Seed, Use All Parameters, etc.) that can be accessed by hovering over the image.
+The currently selected --outdir (or the default outputs folder) will display all
+previously generated files on load. As new invocations are generated, these will
+be dynamically added to the gallery, and can be previewed by selecting them.
+Each image also has a simple set of actions (e.g., Delete, Use Seed, Use All
+Parameters, etc.) that can be accessed by hovering over the image.
 
 #### Image Workspace
 
-When an image from the Invocation Gallery is selected, or is generated, the image will be displayed within the center of the interface. A quickbar of common image interactions are displayed along the top of the image, including:
+When an image from the Invocation Gallery is selected, or is generated, the
+image will be displayed within the center of the interface. A quickbar of common
+image interactions are displayed along the top of the image, including:
 
 - Use image in the `Image to Image` workflow
 - Initialize Face Restoration on the selected file
@@ -361,9 +363,9 @@ When an image from the Invocation Gallery is selected, or is generated, the imag
 
 ## Acknowledgements
 
-A huge shout-out to the core team working to make this vision a
-reality, including
-[psychedelicious](https://github.com/psychedelicious),
+A huge shout-out to the core team working to make this vision a reality,
+including [psychedelicious](https://github.com/psychedelicious),
 [Kyle0654](https://github.com/Kyle0654) and
-[blessedcoolant](https://github.com/blessedcoolant). [hipsterusername](https://github.com/hipsterusername)
-was the team's unofficial cheerleader and added tooltips/docs.
+[blessedcoolant](https://github.com/blessedcoolant).
+[hipsterusername](https://github.com/hipsterusername) was the team's unofficial
+cheerleader and added tooltips/docs.

docs/features/WEBUIHOTKEYS.md

@@ -1,58 +1,62 @@
-# **WebUI Hotkey List**
+---
+title: WebUI Hotkey List
+---
+
+# :material-keyboard: **WebUI Hotkey List**
 
 ## General
 
-| Setting      | Hotkey                 |
-| ------------ | ---------------------- |
-| a            | Set All Parameters     |
-| s            | Set Seed               |
-| u            | Upscale                |
-| r            | Restoration            |
-| i            | Show Metadata          |
-| Ddl          | Delete Image           |
-| alt + a      | Focus prompt input     |
-| shift + i    | Send To Image to Image |
-| ctrl + enter | Start processing       |
-| shift + x    | cancel Processing      |
-| shift + d    | Toggle Dark Mode       |
-| `            | Toggle console         |
+| Setting           | Hotkey                 |
+| ----------------- | ---------------------- |
+| ++a++             | Set All Parameters     |
+| ++s++             | Set Seed               |
+| ++u++             | Upscale                |
+| ++r++             | Restoration            |
+| ++i++             | Show Metadata          |
+| ++d++ ++d++ ++l++ | Delete Image           |
+| ++alt+a++         | Focus prompt input     |
+| ++shift+i++       | Send To Image to Image |
+| ++ctrl+enter++    | Start processing       |
+| ++shift+x++       | cancel Processing      |
+| ++shift+d++       | Toggle Dark Mode       |
+| ++"`"++           | Toggle console         |
 
 ## Tabs
 
 | Setting | Hotkey                    |
 | ------- | ------------------------- |
-| 1       | Go to Text To Image Tab   |
-| 2       | Go to Image to Image Tab  |
-| 3       | Go to Inpainting Tab      |
-| 4       | Go to Outpainting Tab     |
-| 5       | Go to Nodes Tab           |
-| 6       | Go to Post Processing Tab |
+| ++1++   | Go to Text To Image Tab   |
+| ++2++   | Go to Image to Image Tab  |
+| ++3++   | Go to Inpainting Tab      |
+| ++4++   | Go to Outpainting Tab     |
+| ++5++   | Go to Nodes Tab           |
+| ++6++   | Go to Post Processing Tab |
 
 ## Gallery
 
-| Setting      | Hotkey                          |
-| ------------ | ------------------------------- |
-| g            | Toggle Gallery                  |
-| left arrow   | Go to previous image in gallery |
-| right arrow  | Go to next image in gallery     |
-| shift + p    | Pin gallery                     |
-| shift + up   | Increase gallery image size     |
-| shift + down | Decrease gallery image size     |
-| shift + r    | Reset image gallery size        |
+| Setting        | Hotkey                          |
+| -------------- | ------------------------------- |
+| ++g++          | Toggle Gallery                  |
+| ++left++       | Go to previous image in gallery |
+| ++right++      | Go to next image in gallery     |
+| ++shift+p++    | Pin gallery                     |
+| ++shift+up++   | Increase gallery image size     |
+| ++shift+down++ | Decrease gallery image size     |
+| ++shift+r++    | Reset image gallery size        |
 
 ## Inpainting
 
-| Setting                    | Hotkey                |
-| -------------------------- | --------------------- |
-| [                          | Decrease brush size   |
-| ]                          | Increase brush size   |
-| alt + [                    | Decrease mask opacity |
-| alt + ]                    | Increase mask opacity |
-| b                          | Select brush          |
-| e                          | Select eraser         |
-| ctrl + z                   | Undo brush stroke     |
-| ctrl + shift + z, ctrl + y | Redo brush stroke     |
-| h                          | Hide mask             |
-| shift + m                  | Invert mask           |
-| shift + c                  | Clear mask            |
-| shift + j                  | Expand canvas         |
+| Setting                      | Hotkey                |
+| ---------------------------- | --------------------- |
+| ++"["++                      | Decrease brush size   |
+| ++"]"++                      | Increase brush size   |
+| ++alt+"["++                  | Decrease mask opacity |
+| ++alt+"]"++                  | Increase mask opacity |
+| ++b++                        | Select brush          |
+| ++e++                        | Select eraser         |
+| ++ctrl+z++                   | Undo brush stroke     |
+| ++ctrl+shift+z++, ++ctrl+y++ | Redo brush stroke     |
+| ++h++                        | Hide mask             |
+| ++shift+m++                  | Invert mask           |
+| ++shift+c++                  | Clear mask            |
+| ++shift+j++                  | Expand canvas         |

docs/help/TROUBLESHOOT.md

@@ -1,27 +1,25 @@
 ---
 title: F.A.Q.
-hide:
-  - toc
 ---
 
 # :material-frequently-asked-questions: F.A.Q.
 
 ## **Frequently-Asked-Questions**
 
-Here are a few common installation problems and their solutions. Often these are caused by
-incomplete installations or crashes during the install process.
+Here are a few common installation problems and their solutions. Often these are
+caused by incomplete installations or crashes during the install process.
 
 ---
 
-### **QUESTION**
+### During `conda env create`, conda hangs indefinitely
 
-During `conda env create`, conda hangs indefinitely.
+If it is because of the last PIP step (usually stuck in the Git Clone step, you
+can check the detailed log by this method):
 
-If it is because of the last PIP step (usually stuck in the Git Clone step, you can check the detailed log by this method):
 ```bash
 export PIP_LOG="/tmp/pip_log.txt"
 touch ${PIP_LOG}
-tail -f ${PIP_LOG} & 
+tail -f ${PIP_LOG} &
 conda env create -f environment-mac.yaml --debug --verbose
 killall tail
 rm ${PIP_LOG}
@@ -29,21 +27,20 @@ rm ${PIP_LOG}
 
 **SOLUTION**
 
-Conda sometimes gets stuck  at the last PIP step, in which several git repositories are
-cloned and built.
+Conda sometimes gets stuck at the last PIP step, in which several git
+repositories are cloned and built.
 
-Enter the stable-diffusion directory and completely remove the `src`
-directory and all its contents.  The safest way to do this is to enter
-the stable-diffusion directory and give the command `git clean -f`. If
-this still doesn't fix the problem, try "conda clean -all" and then
-restart at the `conda env create` step.
+Enter the stable-diffusion directory and completely remove the `src` directory
+and all its contents. The safest way to do this is to enter the stable-diffusion
+directory and give the command `git clean -f`. If this still doesn't fix the
+problem, try "conda clean -all" and then restart at the `conda env create` step.
 
 To further understand the problem to checking the install lot using this method:
 
 ```bash
 export PIP_LOG="/tmp/pip_log.txt"
 touch ${PIP_LOG}
-tail -f ${PIP_LOG} & 
+tail -f ${PIP_LOG} &
 conda env create -f environment-mac.yaml --debug --verbose
 killall tail
 rm ${PIP_LOG}
@@ -51,43 +48,44 @@ rm ${PIP_LOG}
 
 ---
 
-### **QUESTION**
+### `invoke.py` crashes with the complaint that it can't find `ldm.simplet2i.py`
 
-`invoke.py` crashes with the complaint that it can't find `ldm.simplet2i.py`. Or it complains that
-function is being passed incorrect parameters.
+Or it complains that function is being passed incorrect parameters.
 
-### **SOLUTION**
+**SOLUTION**
 
-Reinstall the stable diffusion modules. Enter the `stable-diffusion` directory and give the command
-`pip install -e .`
+Reinstall the stable diffusion modules. Enter the `stable-diffusion` directory
+and give the command `pip install -e .`
 
 ---
 
-### **QUESTION**
+### Missing modules
 
-`invoke.py` dies, complaining of various missing modules, none of which starts with `ldm`.
+`invoke.py` dies, complaining of various missing modules, none of which starts
+with `ldm`.
 
-### **SOLUTION**
+**SOLUTION**
 
-From within the `InvokeAI` directory, run `conda env update` This is also frequently the solution to
-complaints about an unknown function in a module.
+From within the `InvokeAI` directory, run `conda env update` This is also
+frequently the solution to complaints about an unknown function in a module.
 
 ---
 
-### **QUESTION**
+### How can I try new features
 
-There's a feature or bugfix in the Stable Diffusion GitHub that you want to try out.
+There's a feature or bugfix in the Stable Diffusion GitHub that you want to try
+out.
 
-### **SOLUTION**
+**SOLUTIONS**
 
 #### **Main Branch**
 
-If the fix/feature is on the `main` branch, enter the stable-diffusion directory and do a
-`git pull`.
+If the fix/feature is on the `main` branch, enter the stable-diffusion directory
+and do a `git pull`.
 
-Usually this will be sufficient, but if you start to see errors about
-missing or incorrect modules, use the command `pip install -e .`
-and/or `conda env update` (These commands won't break anything.)
+Usually this will be sufficient, but if you start to see errors about missing or
+incorrect modules, use the command `pip install -e .` and/or `conda env update`
+(These commands won't break anything.)
 
 `pip install -e .` and/or `conda env update -f environment.yaml`
 
@@ -95,33 +93,36 @@ and/or `conda env update` (These commands won't break anything.)
 
 #### **Sub Branch**
 
-If the feature/fix is on a branch (e.g. "_foo-bugfix_"), the recipe is similar, but do a
-`git pull <name of branch>`.
+If the feature/fix is on a branch (e.g. "_foo-bugfix_"), the recipe is similar,
+but do a `git pull <name of branch>`.
 
 #### **Not Committed**
 
-If the feature/fix is in a pull request that has not yet been made part of the main branch or a
-feature/bugfix branch, then from the page for the desired pull request, look for the line at the top
-that reads "_xxxx wants to merge xx commits into lstein:main from YYYYYY_". Copy the URL in YYYY. It
-should have the format
+If the feature/fix is in a pull request that has not yet been made part of the
+main branch or a feature/bugfix branch, then from the page for the desired pull
+request, look for the line at the top that reads "_xxxx wants to merge xx
+commits into lstein:main from YYYYYY_". Copy the URL in YYYY. It should have the
+format
 
 `https://github.com/<name of contributor>/stable-diffusion/tree/<name of branch>`
 
 Then **go to the directory above stable-diffusion** and rename the directory to
-"_stable-diffusion.lstein_", "_stable-diffusion.old_", or anything else. You can then git clone the
-branch that contains the pull request:
+"_stable-diffusion.lstein_", "_stable-diffusion.old_", or anything else. You can
+then git clone the branch that contains the pull request:
 
 `git clone https://github.com/<name of contributor>/stable-diffusion/tree/<name of branch>`
 
-You will need to go through the install procedure again, but it should be fast because all the
-dependencies are already loaded.
+You will need to go through the install procedure again, but it should be fast
+because all the dependencies are already loaded.
 
 ---
 
-### **QUESTION**
+### CUDA out of memory
 
-Image generation crashed with CUDA out of memory error after successful sampling. 
+Image generation crashed with CUDA out of memory error after successful
+sampling.
 
-### **SOLUTION**
+**SOLUTION**
 
-Try to run script with option `--free_gpu_mem` This will free memory before image decoding step.
+Try to run script with option `--free_gpu_mem` This will free memory before
+image decoding step.

docs/index.md

@@ -14,45 +14,63 @@ title: Home
 
 # ^^**InvokeAI: A Stable Diffusion Toolkit**^^ :tools: <br> <small>Formerly known as lstein/stable-diffusion</small>
 
-![project logo](assets/logo.png)
+[![project logo](assets/logo.png)](https://github.com/invoke-ai/InvokeAI)
 
 [![discord badge]][discord link]
 
-[![latest release badge]][latest release link] [![github stars badge]][github stars link] [![github forks badge]][github forks link]
+[![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]
+[![CI checks on dev badge]][ci checks on dev link]
+[![latest commit to dev badge]][latest commit to dev link]
 
-[![github open issues badge]][github open issues link] [![github open prs badge]][github open prs 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
+[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
 [discord link]: https://discord.gg/ZmtBAhwWhy
-[github forks badge]: https://flat.badgen.net/github/forks/invoke-ai/InvokeAI?icon=github
-[github forks link]: https://useful-forks.github.io/?repo=lstein%2Fstable-diffusion
-[github open issues badge]: https://flat.badgen.net/github/open-issues/invoke-ai/InvokeAI?icon=github
-[github open issues link]: https://github.com/invoke-ai/InvokeAI/issues?q=is%3Aissue+is%3Aopen
-[github open prs badge]: https://flat.badgen.net/github/open-prs/invoke-ai/InvokeAI?icon=github
-[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 forks badge]:
+  https://flat.badgen.net/github/forks/invoke-ai/InvokeAI?icon=github
+[github forks link]:
+  https://useful-forks.github.io/?repo=lstein%2Fstable-diffusion
+[github open issues badge]:
+  https://flat.badgen.net/github/open-issues/invoke-ai/InvokeAI?icon=github
+[github open issues link]:
+  https://github.com/invoke-ai/InvokeAI/issues?q=is%3Aissue+is%3Aopen
+[github open prs badge]:
+  https://flat.badgen.net/github/open-prs/invoke-ai/InvokeAI?icon=github
+[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 release badge]: https://flat.badgen.net/github/release/invoke-ai/InvokeAI/development?icon=github
+[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 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>
 
 <a href="https://github.com/invoke-ai/InvokeAI">InvokeAI</a> is an
 implementation of Stable Diffusion, the open source text-to-image and
-image-to-image generator. It provides a streamlined process with
-various new features and options to aid the image generation
-process. It runs on Windows, Mac and Linux machines, and runs on GPU
-cards with as little as 4 GB or RAM.
+image-to-image generator. It provides a streamlined process with various new
+features and options to aid the image generation process. It runs on Windows,
+Mac and Linux machines, and runs on GPU cards with as little as 4 GB or RAM.
 
-**Quick links**: [<a href="https://discord.gg/NwVCmKwY">Discord Server</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>]
+**Quick links**: [<a href="https://discord.gg/ZmtBAhwWhy">Discord Server</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>]
 
 <div align="center"><img src="assets/invoke-web-server-1.png" width=640></div>
 
@@ -62,12 +80,11 @@ cards with as little as 4 GB or RAM.
 
 ## :octicons-package-dependencies-24: Installation
 
-This fork is supported across multiple platforms. You can find individual installation instructions
-below.
-
-- :fontawesome-brands-linux: [Linux](installation/INSTALL_LINUX.md)
-- :fontawesome-brands-windows: [Windows](installation/INSTALL_WINDOWS.md)
-- :fontawesome-brands-apple: [Macintosh](installation/INSTALL_MAC.md)
+This fork is supported across Linux, Windows and Macintosh. Linux
+users can use either an Nvidia-based card (with CUDA support) or an
+AMD card (using the ROCm driver). For full installation and upgrade
+instructions, please see:
+[InvokeAI Installation Overview](https://invoke-ai.github.io/InvokeAI/installation/)
 
 ## :fontawesome-solid-computer: Hardware Requirements
 
@@ -76,6 +93,7 @@ below.
 You wil need one of the following:
 
 - :simple-nvidia: An NVIDIA-based graphics card with 4 GB or more VRAM memory.
+- :simple-amd: An AMD-based graphics card with 4 GB or more VRAM memory (Linux only)
 - :fontawesome-brands-apple: An Apple computer with an M1 chip.
 
 ### :fontawesome-solid-memory: Memory
@@ -84,109 +102,174 @@ You wil need one of the following:
 
 ### :fontawesome-regular-hard-drive: Disk
 
-- At least 12 GB of free disk space for the machine learning model, Python, and all its dependencies.
+- At least 12 GB of free disk space for the machine learning model, Python, and
+  all its dependencies.
 
-!!! note
+!!! info
 
     If you are have a Nvidia 10xx series card (e.g. the 1080ti), please run the invoke script in
     full-precision mode as shown below.
 
     Similarly, specify full-precision mode on Apple M1 hardware.
 
-    To run in full-precision mode, start `invoke.py` with the `--full_precision` flag:
+    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:
 
     ```bash
     (invokeai) ~/InvokeAI$ python scripts/invoke.py --full_precision
     ```
+## :octicons-gift-24: InvokeAI Features
+
+- [The InvokeAI Web Interface](features/WEB.md)
+    - [WebGUI hotkey reference guide](features/WEBUIHOTKEYS.md)
+<!-- this link does not exist    - [WebGUI Unified Canvas for Img2Img, inpainting and outpainting](features/UNIFIED_CANVAS.md) -->
+- [The Command Line Interace](features/CLI.md)
+    - [Image2Image](features/IMG2IMG.md)
+    - [Inpainting](features/INPAINTING.md)
+    - [Outpainting](features/OUTPAINTING.md)
+    - [Adding custom styles and subjects](features/CONCEPTS.md)
+    - [Upscaling and Face Reconstruction](features/POSTPROCESS.md)
+<!-- seperator -->
+- [Generating Variations](features/VARIATIONS.md)
+<!-- seperator -->
+- [Prompt Engineering](features/PROMPTS.md)
+<!-- seperator -->
+- Miscellaneous
+    - [Embiggen upscaling](features/EMBIGGEN.md)
+    - [Other](features/OTHER.md)
+
 ## :octicons-log-16: Latest Changes
 
+### v2.1.3 <small>(13 November 2022)</small>
+
+- A choice of installer scripts that automate installation and configuration. See [Installation](https://github.com/invoke-ai/InvokeAI/blob/2.1.3-rc6/docs/installation/INSTALL.md).
+- A streamlined manual installation process that works for both Conda and PIP-only installs. See [Manual Installation](https://github.com/invoke-ai/InvokeAI/blob/2.1.3-rc6/docs/installation/INSTALL_MANUAL.md).
+- The ability to save frequently-used startup options (model to load, steps, sampler, etc) in a `.invokeai` file. See [Client](https://github.com/invoke-ai/InvokeAI/blob/2.1.3-rc6/docs/features/CLI.md)
+- Support for AMD GPU cards (non-CUDA) on Linux machines.
+- Multiple bugs and edge cases squashed.
+
+### v2.1.0 <small>(2 November 2022)</small>
+
+- [Inpainting](https://invoke-ai.github.io/InvokeAI/features/INPAINTING/)
+  support in the WebGUI
+- Greatly improved navigation and user experience in the
+  [WebGUI](https://invoke-ai.github.io/InvokeAI/features/WEB/)
+- The prompt syntax has been enhanced with
+  [prompt weighting, cross-attention and prompt merging](https://invoke-ai.github.io/InvokeAI/features/PROMPTS/).
+- You can now load
+  [multiple models and switch among them quickly](https://docs.google.com/presentation/d/1WywGA1rny7bpFh7CLSdTr4nNpVKdlUeT0Bj0jCsILyU/edit?usp=sharing)
+  without leaving the CLI.
+- The installation process (via `scripts/preload_models.py`) now lets you select
+  among several popular
+  [Stable Diffusion models](https://invoke-ai.github.io/InvokeAI/installation/INSTALLING_MODELS/)
+  and downloads and installs them on your behalf. Among other models, this
+  script will install the current Stable Diffusion 1.5 model as well as a
+  StabilityAI variable autoencoder (VAE) which improves face generation.
+- Tired of struggling with photoeditors to get the masked region of for
+  inpainting just right? Let the AI make the mask for you using
+  [text masking](https://docs.google.com/presentation/d/1pWoY510hCVjz0M6X9CBbTznZgW2W5BYNKrmZm7B45q8/edit#slide=id.p).
+  This feature allows you to specify the part of the image to paint over using
+  just English-language phrases.
+- Tired of seeing the head of your subjects cropped off? Uncrop them in the CLI
+  with the
+  [outcrop feature](https://invoke-ai.github.io/InvokeAI/features/OUTPAINTING/#outcrop).
+- Tired of seeing your subject's bodies duplicated or mangled when generating
+  larger-dimension images? Check out the `--hires` option in the CLI, or select
+  the corresponding toggle in the WebGUI.
+- We now support textual inversion and fine-tune .bin styles and subjects from
+  the Hugging Face archive of
+  [SD Concepts](https://huggingface.co/sd-concepts-library). Load the .bin file
+  using the `--embedding_path` option. (The next version will support merging
+  and loading of multiple simultaneous models).
+- ...
+
+### v2.0.1 <small>(13 October 2022)</small>
+
+- fix noisy images at high step count when using k\* samplers
+- dream.py script now calls invoke.py module directly rather than via a new
+  python process (which could break the environment)
+
 ### v2.0.0 <small>(9 October 2022)</small>
-- `dream.py` script renamed `invoke.py`. A `dream.py` script wrapper remains
-    for backward compatibility.
+
+- `dream.py` script renamed `invoke.py`. A `dream.py` script wrapper remains for
+  backward compatibility.
 - Completely new WebGUI - launch with `python3 scripts/invoke.py --web`
-- Support for <a href="https://github.com/invoke-ai/InvokeAI/blob/main/docs/features/INPAINTING.md">inpainting</a> and <a href="https://github.com/invoke-ai/InvokeAI/blob/main/docs/features/OUTPAINTING.md">outpainting</a>
-- img2img runs on all k* samplers
-- Support for <a href="https://github.com/invoke-ai/InvokeAI/blob/main/docs/features/PROMPTS.md#negative-and-unconditioned-prompts">negative prompts</a>
+- Support for
+  <a href="https://invoke-ai.github.io/InvokeAI/features/INPAINTING/">inpainting</a>
+  and
+  <a href="https://invoke-ai.github.io/InvokeAI/features/OUTPAINTING/">outpainting</a>
+- img2img runs on all k\* samplers
+- Support for
+  <a href="https://invoke-ai.github.io/InvokeAI/features/PROMPTS/#negative-and-unconditioned-prompts">negative
+  prompts</a>
 - Support for CodeFormer face reconstruction
 - Support for Textual Inversion on Macintoshes
-- Support in both WebGUI and CLI for <a href="https://github.com/invoke-ai/InvokeAI/blob/main/docs/features/POSTPROCESS.md">post-processing of previously-generated images</a>
-    using facial reconstruction, ESRGAN upscaling, outcropping (similar to DALL-E infinite canvas),
-    and "embiggen" upscaling. See the `!fix` command.
-- New `--hires` option on `invoke>` line allows <a href="https://github.com/invoke-ai/InvokeAI/blob/main/docs/features/CLI.m#this-is-an-example-of-txt2img">larger images to be created without duplicating elements</a>, at the cost of some performance.
-- New `--perlin` and `--threshold` options allow you to add and control variation
-    during image generation (see <a href="https://github.com/invoke-ai/InvokeAI/blob/main/docs/features/OTHER.md#thresholding-and-perlin-noise-initialization-options">Thresholding and Perlin Noise Initialization</a>
-- Extensive metadata now written into PNG files, allowing reliable regeneration of images
-    and tweaking of previous settings.
-- Command-line completion in `invoke.py` now works on Windows, Linux and Mac platforms.
-- Improved <a href="https://github.com/invoke-ai/InvokeAI/blob/main/docs/features/CLI.m">command-line completion behavior</a>.
-    New commands added:
-       * List command-line history with `!history`
-       * Search command-line history with `!search`
-       * Clear history with `!clear`
+- Support in both WebGUI and CLI for
+  <a href="https://invoke-ai.github.io/InvokeAI/features/POSTPROCESS/">post-processing
+  of previously-generated images</a> using facial reconstruction, ESRGAN
+  upscaling, outcropping (similar to DALL-E infinite canvas), and "embiggen"
+  upscaling. See the `!fix` command.
+- New `--hires` option on `invoke>` line allows
+  <a href="https://invoke-ai.github.io/InvokeAI/features/CLI/#txt2img">larger
+  images to be created without duplicating elements</a>, at the cost of some
+  performance.
+- New `--perlin` and `--threshold` options allow you to add and control
+  variation during image generation (see
+  <a href="https://github.com/invoke-ai/InvokeAI/blob/main/docs/features/OTHER.md#thresholding-and-perlin-noise-initialization-options">Thresholding
+  and Perlin Noise Initialization</a>
+- Extensive metadata now written into PNG files, allowing reliable regeneration
+  of images and tweaking of previous settings.
+- Command-line completion in `invoke.py` now works on Windows, Linux and Mac
+  platforms.
+- Improved
+  <a href="https://invoke-ai.github.io/InvokeAI/features/CLI/">command-line
+  completion behavior</a>. New commands added:
+  - List command-line history with `!history`
+  - Search command-line history with `!search`
+  - Clear history with `!clear`
 - Deprecated `--full_precision` / `-F`. Simply omit it and `invoke.py` will auto
-    configure. To switch away from auto use the new flag like `--precision=float32`.
+  configure. To switch away from auto use the new flag like
+  `--precision=float32`.
 
-### v1.14 <small>(11 September 2022)</small>
-
-- Memory optimizations for small-RAM cards. 512x512 now possible on 4 GB GPUs.
-- Full support for Apple hardware with M1 or M2 chips.
-- Add "seamless mode" for circular tiling of image. Generates beautiful effects.
-  ([prixt](https://github.com/prixt)).
-- Inpainting support.
-- Improved web server GUI.
-- Lots of code and documentation cleanups.
-
-### v1.13 <small>(3 September 2022</small>
-
-- Support image variations (see [VARIATIONS](features/VARIATIONS.md)
-  ([Kevin Gibbons](https://github.com/bakkot) and many contributors and reviewers)
-- Supports a Google Colab notebook for a standalone server running on Google hardware
-  [Arturo Mendivil](https://github.com/artmen1516)
-- WebUI supports GFPGAN/ESRGAN facial reconstruction and upscaling
-  [Kevin Gibbons](https://github.com/bakkot)
-- WebUI supports incremental display of in-progress images during generation
-  [Kevin Gibbons](https://github.com/bakkot)
-- A new configuration file scheme that allows new models (including upcoming stable-diffusion-v1.5)
-  to be added without altering the code. ([David Wager](https://github.com/maddavid12))
-- Can specify --grid on invoke.py command line as the default.
-- Miscellaneous internal bug and stability fixes.
-- Works on M1 Apple hardware.
-- Multiple bug fixes.
-
-For older changelogs, please visit the **[CHANGELOG](features/CHANGELOG.md)**.
+For older changelogs, please visit the
+**[CHANGELOG](CHANGELOG/#v114-11-september-2022)**.
 
 ## :material-target: Troubleshooting
 
-Please check out our **[:material-frequently-asked-questions: Q&A](help/TROUBLESHOOT.md)** to get solutions for common installation
-problems and other issues.
+Please check out our
+**[:material-frequently-asked-questions: Q&A](help/TROUBLESHOOT.md)** to get
+solutions for common installation problems and other issues.
 
 ## :octicons-repo-push-24: Contributing
 
-Anyone who wishes to contribute to this project, whether documentation, features, bug fixes, code
-cleanup, testing, or code reviews, is very much encouraged to do so. If you are unfamiliar with how
-to contribute to GitHub projects, here is a
+Anyone who wishes to contribute to this project, whether documentation,
+features, bug fixes, code cleanup, testing, or code reviews, is very much
+encouraged to do so. 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, but for now the most
-important thing is to **make your pull request against the "development" branch**, and not against
-"main". This will help keep public breakage to a minimum and will allow you to propose more radical
-changes.
+A full set of contribution guidelines, along with templates, are in progress,
+but for now the most important thing is to **make your pull request against the
+"development" branch**, and not against "main". This will help keep public
+breakage to a minimum and will allow you to propose more radical changes.
 
 ## :octicons-person-24: Contributors
 
 This fork is a combined effort of various people from across the world.
-[Check out the list of all these amazing people](other/CONTRIBUTORS.md). We thank them for their
-time, hard work and effort.
+[Check out the list of all these amazing people](other/CONTRIBUTORS.md). We
+thank them for their time, hard work and effort.
 
 ## :octicons-question-24: 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. Feel
+free to send me an email if you use and like the script.
 
 Original portions of the software are Copyright (c) 2020
 [Lincoln D. Stein](https://github.com/lstein)
 
 ## :octicons-book-24: Further Reading
 
-Please see the original README for more information on this software and underlying algorithm,
-located in the file [README-CompViz.md](other/README-CompViz.md).
+Please see the original README for more information on this software and
+underlying algorithm, located in the file
+[README-CompViz.md](other/README-CompViz.md).

docs/installation/INSTALLING_MODELS.md

@@ -6,224 +6,223 @@ title: Installing Models
 
 ## Model Weight Files
 
-The model weight files ('*.ckpt') are the Stable Diffusion "secret
-sauce". They are the product of training the AI on millions of
-captioned images gathered from multiple sources.
+The model weight files ('\*.ckpt') are the Stable Diffusion "secret sauce". They
+are the product of training the AI on millions of captioned images gathered from
+multiple sources.
 
-Originally there was only a single Stable Diffusion weights file,
-which many people named `model.ckpt`. Now there are dozens or more
-that have been "fine tuned" to provide particulary styles, genres, or
-other features. InvokeAI allows you to install and run multiple model
-weight files and switch between them quickly in the command-line and
-web interfaces.
+Originally there was only a single Stable Diffusion weights file, which many
+people named `model.ckpt`. Now there are dozens or more that have been "fine
+tuned" to provide particulary styles, genres, or other features. InvokeAI allows
+you to install and run multiple model weight files and switch between them
+quickly in the command-line and web interfaces.
 
-This manual will guide you through installing and configuring model
-weight files.
+This manual will guide you through installing and configuring model weight
+files.
 
 ## Base Models
 
-InvokeAI comes with support for a good initial set of models listed in
-the model configuration file `configs/models.yaml`. They are:
+InvokeAI comes with support for a good initial set of models listed in the model
+configuration file `configs/models.yaml`. They are:
 
-| Model                   | Weight File                   |   Description                    | DOWNLOAD FROM            |
-| ----------------------  | ----------------------------- |--------------------------------- | ----------------|
-| stable-diffusion-1.5    | v1-5-pruned-emaonly.ckpt      | Most recent version of base Stable Diffusion model| https://huggingface.co/runwayml/stable-diffusion-v1-5 |
-| stable-diffusion-1.4    | sd-v1-4.ckpt                  | Previous version of base Stable Diffusion model | https://huggingface.co/CompVis/stable-diffusion-v-1-4-original |
-| inpainting-1.5          | sd-v1-5-inpainting.ckpt       | Stable Diffusion 1.5 model specialized for inpainting | https://huggingface.co/runwayml/stable-diffusion-inpainting |
-| waifu-diffusion-1.3     | model-epoch09-float32.ckpt    | Stable Diffusion 1.4 trained to produce anime images | https://huggingface.co/hakurei/waifu-diffusion-v1-3 |
-| <all models>            | vae-ft-mse-840000-ema-pruned.ckpt   | A fine-tune file add-on file that improves face generation | https://huggingface.co/stabilityai/sd-vae-ft-mse-original/ |
+| Model                | Weight File                       | Description                                                | DOWNLOAD FROM                                                  |
+| -------------------- | --------------------------------- | ---------------------------------------------------------- | -------------------------------------------------------------- |
+| stable-diffusion-1.5 | v1-5-pruned-emaonly.ckpt          | Most recent version of base Stable Diffusion model         | https://huggingface.co/runwayml/stable-diffusion-v1-5          |
+| stable-diffusion-1.4 | sd-v1-4.ckpt                      | Previous version of base Stable Diffusion model            | https://huggingface.co/CompVis/stable-diffusion-v-1-4-original |
+| inpainting-1.5       | sd-v1-5-inpainting.ckpt           | Stable Diffusion 1.5 model specialized for inpainting      | https://huggingface.co/runwayml/stable-diffusion-inpainting    |
+| waifu-diffusion-1.3  | model-epoch09-float32.ckpt        | Stable Diffusion 1.4 trained to produce anime images       | https://huggingface.co/hakurei/waifu-diffusion-v1-3            |
+| `<all models>`       | vae-ft-mse-840000-ema-pruned.ckpt | A fine-tune file add-on file that improves face generation | https://huggingface.co/stabilityai/sd-vae-ft-mse-original/     |
 
-
-Note that these files are covered by an "Ethical AI" license which
-forbids certain uses. You will need to create an account on the
-Hugging Face website and accept the license terms before you can
-access the files.
+Note that these files are covered by an "Ethical AI" license which forbids
+certain uses. You will need to create an account on the Hugging Face website and
+accept the license terms before you can access the files.
 
 The predefined configuration file for InvokeAI (located at
-`configs/models.yaml`) provides entries for each of these weights
-files. `stable-diffusion-1.5` is the default model used, and we
-strongly recommend that you install this weights file if nothing else.
+`configs/models.yaml`) provides entries for each of these weights files.
+`stable-diffusion-1.5` is the default model used, and we strongly recommend that
+you install this weights file if nothing else.
 
 ## Community-Contributed Models
 
-There are too many to list here and more are being contributed every
-day. Hugging Face maintains a [fast-growing
-repository](https://huggingface.co/sd-concepts-library) of fine-tune
-(".bin") models that can be imported into InvokeAI by passing the
+There are too many to list here and more are being contributed every day.
+Hugging Face maintains a
+[fast-growing repository](https://huggingface.co/sd-concepts-library) of
+fine-tune (".bin") models that can be imported into InvokeAI by passing the
 `--embedding_path` option to the `invoke.py` command.
 
-[This page](https://rentry.org/sdmodels) hosts a large list of
-official and unofficial Stable Diffusion models and where they can be
-obtained.
+[This page](https://rentry.org/sdmodels) hosts a large list of official and
+unofficial Stable Diffusion models and where they can be obtained.
 
 ## Installation
 
 There are three ways to install weights files:
 
-1. During InvokeAI installation, the `preload_models.py` script can
-download them for you.
+1. During InvokeAI installation, the `preload_models.py` script can download
+   them for you.
 
-2. You can use the command-line interface (CLI) to import, configure
-and modify new models files.
+2. You can use the command-line interface (CLI) to import, configure and modify
+   new models files.
 
-3. You can download the files manually and add the appropriate entries
-to `models.yaml`.
+3. You can download the files manually and add the appropriate entries to
+   `models.yaml`.
 
 ### Installation via `preload_models.py`
 
-This is the most automatic way. Run `scripts/preload_models.py` 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.
+This is the most automatic way. Run `scripts/preload_models.py` 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, from within the InvokeAI directory run the command `python
-scripts/preload_models.py` (Linux/MacOS) or `python
-scripts\preload_models.py` (Windows):
+To start, run `python scripts/preload_models.py` from within the InvokeAI:
+directory
 
-```
-Loading Python libraries...
+!!! example ""
 
-** INTRODUCTION **
-Welcome to InvokeAI. This script will help download the Stable Diffusion weight files
-and other large models that are needed for text to image generation. At any point you may interrupt
-this program and resume later.
+    ```text
+    Loading Python libraries...
 
-** WEIGHT SELECTION **
-Would you like to download the Stable Diffusion model weights now? [y] 
+    ** INTRODUCTION **
+    Welcome to InvokeAI. This script will help download the Stable Diffusion weight files
+    and other large models that are needed for text to image generation. At any point you may interrupt
+    this program and resume later.
 
-Choose the weight file(s) you wish to download. Before downloading you 
-will be given the option to view and change your selections.
+    ** WEIGHT SELECTION **
+    Would you like to download the Stable Diffusion model weights now? [y]
 
-[1] stable-diffusion-1.5:
-    The newest Stable Diffusion version 1.5 weight file (4.27 GB) (recommended)
-    Download? [y] 
-[2] inpainting-1.5:
-    RunwayML SD 1.5 model optimized for inpainting (4.27 GB) (recommended)
-    Download? [y] 
-[3] stable-diffusion-1.4:
-    The original Stable Diffusion version 1.4 weight file (4.27 GB) 
-    Download? [n] n
-[4] waifu-diffusion-1.3:
-    Stable Diffusion 1.4 fine tuned on anime-styled images (4.27) 
-    Download? [n] y
-[5] ft-mse-improved-autoencoder-840000:
-    StabilityAI improved autoencoder fine-tuned for human faces (recommended; 335 MB) (recommended)
-    Download? [y] y
-The following weight files will be downloaded:
-   [1] stable-diffusion-1.5*
-   [2] inpainting-1.5
-   [4] waifu-diffusion-1.3
-   [5] ft-mse-improved-autoencoder-840000
-*default
-Ok to download? [y] 
-** LICENSE AGREEMENT FOR WEIGHT FILES **
+    Choose the weight file(s) you wish to download. Before downloading you
+    will be given the option to view and change your selections.
 
-1. To download the Stable Diffusion weight files you need to read and accept the
-   CreativeML Responsible AI license. If you have not already done so, please 
-   create an account using the "Sign Up" button:
+    [1] stable-diffusion-1.5:
+        The newest Stable Diffusion version 1.5 weight file (4.27 GB) (recommended)
+        Download? [y]
+    [2] inpainting-1.5:
+        RunwayML SD 1.5 model optimized for inpainting (4.27 GB) (recommended)
+        Download? [y]
+    [3] stable-diffusion-1.4:
+        The original Stable Diffusion version 1.4 weight file (4.27 GB)
+        Download? [n] n
+    [4] waifu-diffusion-1.3:
+        Stable Diffusion 1.4 fine tuned on anime-styled images (4.27)
+        Download? [n] y
+    [5] ft-mse-improved-autoencoder-840000:
+        StabilityAI improved autoencoder fine-tuned for human faces (recommended; 335 MB) (recommended)
+        Download? [y] y
+    The following weight files will be downloaded:
+      [1] stable-diffusion-1.5*
+      [2] inpainting-1.5
+      [4] waifu-diffusion-1.3
+      [5] ft-mse-improved-autoencoder-840000
+    *default
+    Ok to download? [y]
+    ** LICENSE AGREEMENT FOR WEIGHT FILES **
 
-   https://huggingface.co 
+    1. To download the Stable Diffusion weight files you need to read and accept the
+      CreativeML Responsible AI license. If you have not already done so, please
+      create an account using the "Sign Up" button:
 
-   You will need to verify your email address as part of the HuggingFace
-   registration process.
+      https://huggingface.co
 
-2. After creating the account, login under your account and accept
-   the license terms located here:
+      You will need to verify your email address as part of the HuggingFace
+      registration process.
 
-   https://huggingface.co/CompVis/stable-diffusion-v-1-4-original
+    2. After creating the account, login under your account and accept
+      the license terms located here:
 
-Press <enter> when you are ready to continue:
-...
-```
+      https://huggingface.co/CompVis/stable-diffusion-v-1-4-original
 
-When the script is complete, you will find the downloaded weights
-files in `models/ldm/stable-diffusion-v1` and a matching configuration
-file in `configs/models.yaml`.
+    Press <enter> when you are ready to continue:
+    ...
+    ```
 
-You can run the script again to add any models you didn't select the
-first time. Note that as a safety measure the script will _never_
-remove a previously-installed weights file. You will have to do this
-manually.
+When the script is complete, you will find the downloaded weights files in
+`models/ldm/stable-diffusion-v1` and a matching configuration file in
+`configs/models.yaml`.
+
+You can run the script again to add any models you didn't select the first time.
+Note that as a safety measure the script will _never_ remove a
+previously-installed weights file. You will have to do this manually.
 
 ### Installation via the CLI
 
-You can install a new model, including any of the community-supported
-ones, via the command-line client's `!import_model` command.
+You can install a new model, including any of the community-supported ones, via
+the command-line client's `!import_model` command.
 
-1. First download the desired model weights file and place it under `models/ldm/stable-diffusion-v1/`.
-   You may rename the weights file to something more memorable if you wish. Record the path of the
-   weights file (e.g. `models/ldm/stable-diffusion-v1/arabian-nights-1.0.ckpt`)
+1.  First download the desired model weights file and place it under
+    `models/ldm/stable-diffusion-v1/`. You may rename the weights file to
+    something more memorable if you wish. Record the path of the weights file
+    (e.g. `models/ldm/stable-diffusion-v1/arabian-nights-1.0.ckpt`)
 
-2. Launch the `invoke.py` CLI with `python scripts/invoke.py`.
+2.  Launch the `invoke.py` CLI with `python scripts/invoke.py`.
 
-3. At the `invoke>` command-line, enter the command `!import_model <path to model>`.
-   For example:
+3.  At the `invoke>` command-line, enter the command
+    `!import_model <path to model>`. For example:
 
-   `invoke> !import_model models/ldm/stable-diffusion-v1/arabian-nights-1.0.ckpt`
+    `invoke> !import_model models/ldm/stable-diffusion-v1/arabian-nights-1.0.ckpt`
 
-   (Hint - the CLI supports file path autocompletion. Type a bit of the path
-   name and hit <tab> in order to get a choice of possible completions.)
+    !!! tip "the CLI supports file path autocompletion"
 
-4. Follow the wizard's instructions to complete installation as shown in the example
-   here:
+         Type a bit of the path name and hit ++tab++ in order to get a choice of
+         possible completions.
 
-```
-invoke> <b>!import_model models/ldm/stable-diffusion-v1/arabian-nights-1.0.ckpt</b>
->> Model import in process. Please enter the values needed to configure this model:
+4.  Follow the wizard's instructions to complete installation as shown in the
+    example here:
 
-Name for this model: <b>arabian-nights</b>
-Description of this model: <b>Arabian Nights Fine Tune v1.0</b>
-Configuration file for this model: <b>configs/stable-diffusion/v1-inference.yaml</b>
-Default image width: <b>512</b>
-Default image height: <b>512</b>
->> New configuration:
-arabian-nights:
-  config: configs/stable-diffusion/v1-inference.yaml
-  description: Arabian Nights Fine Tune v1.0
-  height: 512
-  weights: models/ldm/stable-diffusion-v1/arabian-nights-1.0.ckpt
-  width: 512
-OK to import [n]? <b>y</b>
->> Caching model stable-diffusion-1.4 in system RAM
->> Loading waifu-diffusion from models/ldm/stable-diffusion-v1/arabian-nights-1.0.ckpt
-   | LatentDiffusion: Running in eps-prediction mode
-   | DiffusionWrapper has 859.52 M params.
-   | Making attention of type 'vanilla' with 512 in_channels
-   | Working with z of shape (1, 4, 32, 32) = 4096 dimensions.
-   | Making attention of type 'vanilla' with 512 in_channels
-   | Using faster float16 precision
+    !!! example ""
 
-```
+        ```text
+        invoke> !import_model models/ldm/stable-diffusion-v1/arabian-nights-1.0.ckpt
+        >> Model import in process. Please enter the values needed to configure this model:
 
-If you've previously installed the fine-tune VAE file `vae-ft-mse-840000-ema-pruned.ckpt`,
-the wizard will also ask you if you want to add this VAE to the model.
+        Name for this model: arabian-nights
+        Description of this model: Arabian Nights Fine Tune v1.0
+        Configuration file for this model: configs/stable-diffusion/v1-inference.yaml
+        Default image width: 512
+        Default image height: 512
+        >> New configuration:
+        arabian-nights:
+          config: configs/stable-diffusion/v1-inference.yaml
+          description: Arabian Nights Fine Tune v1.0
+          height: 512
+          weights: models/ldm/stable-diffusion-v1/arabian-nights-1.0.ckpt
+          width: 512
+        OK to import [n]? y
+        >> Caching model stable-diffusion-1.4 in system RAM
+        >> Loading waifu-diffusion from models/ldm/stable-diffusion-v1/arabian-nights-1.0.ckpt
+          | LatentDiffusion: Running in eps-prediction mode
+          | DiffusionWrapper has 859.52 M params.
+          | Making attention of type 'vanilla' with 512 in_channels
+          | Working with z of shape (1, 4, 32, 32) = 4096 dimensions.
+          | Making attention of type 'vanilla' with 512 in_channels
+          | Using faster float16 precision
+        ```
 
-The appropriate entry for this model will be added to `configs/models.yaml` and it will
-be available to use in the CLI immediately.
+If you've previously installed the fine-tune VAE file
+`vae-ft-mse-840000-ema-pruned.ckpt`, the wizard will also ask you if you want to
+add this VAE to the model.
 
-The CLI has additional commands for switching among, viewing, editing,
-deleting the available models. These are described in [Command Line
-Client](../features/CLI.md#model-selection-and-importation), but the two most
-frequently-used are `!models` and `!switch <name of model>`. The first
-prints a table of models that InvokeAI knows about and their load
-status. The second will load the requested model and lets you switch
-back and forth quickly among loaded models.
+The appropriate entry for this model will be added to `configs/models.yaml` and
+it will be available to use in the CLI immediately.
+
+The CLI has additional commands for switching among, viewing, editing, deleting
+the available models. These are described in
+[Command Line Client](../features/CLI.md#model-selection-and-importation), but
+the two most frequently-used are `!models` and `!switch <name of model>`. The
+first prints a table of models that InvokeAI knows about and their load status.
+The second will load the requested model and lets you switch back and forth
+quickly among loaded models.
 
 ### Manually editing of `configs/models.yaml`
 
-If you are comfortable with a text editor then you may simply edit
-`models.yaml` directly.
+If you are comfortable with a text editor then you may simply edit `models.yaml`
+directly.
 
 First you need to download the desired .ckpt file and place it in
-`models/ldm/stable-diffusion-v1` as descirbed in step #1 in the
-previous section. Record the path to the weights file,
-e.g. `models/ldm/stable-diffusion-v1/arabian-nights-1.0.ckpt`
+`models/ldm/stable-diffusion-v1` as descirbed in step #1 in the previous
+section. Record the path to the weights file, e.g.
+`models/ldm/stable-diffusion-v1/arabian-nights-1.0.ckpt`
 
-Then using a **text** editor (e.g. the Windows Notepad application),
-open the file `configs/models.yaml`, and add a new stanza that follows
-this model:
+Then using a **text** editor (e.g. the Windows Notepad application), open the
+file `configs/models.yaml`, and add a new stanza that follows this model:
 
-```
+```yaml
 arabian-nights-1.0:
   description: A great fine-tune in Arabian Nights style
   weights: ./models/ldm/stable-diffusion-v1/arabian-nights-1.0.ckpt
@@ -234,34 +233,14 @@ arabian-nights-1.0:
   default: false
 ```
 
-* 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 `preload_models.py` 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.
+| name               | description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
+| :----------------- | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| 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 `preload_models.py` 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.                                                                                                                                                                                                                                                                                                                                                                                                                        |
 
 Save the `models.yaml` and relaunch InvokeAI. The new model should now be
 available for your use.
-
-

docs/installation/INSTALL_DOCKER.md

@@ -4,26 +4,30 @@ title: Docker
 
 # :fontawesome-brands-docker: Docker
 
-## Before you begin
+!!! warning "For end users"
 
-- For end users: Install Stable Diffusion locally using the instructions for
-  your OS.
-- For developers: For container-related development tasks or for enabling easy
-  deployment to other environments (on-premises or cloud), follow these
-  instructions. For general use, install locally to leverage your machine's GPU.
+    We highly recommend to Install InvokeAI locally using [these instructions](index.md)"
+
+!!! tip "For developers"
+
+    For container-related development tasks or for enabling easy
+    deployment to other environments (on-premises or cloud), follow these
+    instructions.
+
+    For general use, install locally to leverage your machine's GPU.
 
 ## Why containers?
 
-They provide a flexible, reliable way to build and deploy Stable Diffusion.
-You'll also use a Docker volume to store the largest model files and image
-outputs as a first step in decoupling storage and compute. Future enhancements
-can do this for other assets. See [Processes](https://12factor.net/processes)
-under the Twelve-Factor App methodology for details on why running applications
-in such a stateless fashion is important.
+They provide a flexible, reliable way to build and deploy InvokeAI. You'll also
+use a Docker volume to store the largest model files and image outputs as a
+first step in decoupling storage and compute. Future enhancements can do this
+for other assets. See [Processes](https://12factor.net/processes) under the
+Twelve-Factor App methodology for details on why running applications in such a
+stateless fashion is important.
 
 You can specify the target platform when building the image and running the
-container. You'll also need to specify the Stable Diffusion requirements file
-that matches the container's OS and the architecture it will run on.
+container. You'll also need to specify the InvokeAI requirements file that
+matches the container's OS and the architecture it will run on.
 
 Developers on Apple silicon (M1/M2): You
 [can't access your GPU cores from Docker containers](https://github.com/pytorch/pytorch/issues/81224)
@@ -38,16 +42,19 @@ another environment with NVIDIA GPUs on-premises or in the cloud.
 
 #### Install [Docker](https://github.com/santisbon/guides#docker)
 
-On the Docker Desktop app, go to Preferences, Resources, Advanced. Increase the
-CPUs and Memory to avoid this
+On the [Docker Desktop app](https://docs.docker.com/get-docker/), go to
+Preferences, Resources, Advanced. Increase the CPUs and Memory to avoid this
 [Issue](https://github.com/invoke-ai/InvokeAI/issues/342). You may need to
 increase Swap and Disk image size too.
 
 #### Get a Huggingface-Token
 
-Go to [Hugging Face](https://huggingface.co/settings/tokens), create a token and
-temporary place it somewhere like a open texteditor window (but dont save it!,
-only keep it open, we need it in the next step)
+Besides the Docker Agent you will need an Account on
+[huggingface.co](https://huggingface.co/join).
+
+After you succesfully registered your account, go to
+[huggingface.co/settings/tokens](https://huggingface.co/settings/tokens), create
+a token and copy it, since you will need in for the next step.
 
 ### Setup
 
@@ -65,13 +72,19 @@ created in the last step.
 
 Some Suggestions of variables you may want to change besides the Token:
 
-| Environment-Variable                                                | Description                                                              |
-| ------------------------------------------------------------------- | ------------------------------------------------------------------------ |
-| `HUGGINGFACE_TOKEN="hg_aewirhghlawrgkjbarug2"`                      | This is the only required variable, without you can't get the checkpoint |
-| `ARCH=aarch64`                                                      | if you are using a ARM based CPU                                         |
-| `INVOKEAI_TAG=yourname/invokeai:latest`                             | the Container Repository / Tag which will be used                        |
-| `INVOKEAI_CONDA_ENV_FILE=environment-linux-aarch64.yml`             | since environment.yml wouldn't work with aarch                           |
-| `INVOKEAI_GIT="-b branchname https://github.com/username/reponame"` | if you want to use your own fork                                         |
+<figure markdown>
+
+| Environment-Variable | Default value                 | Description                                                                                  |
+| -------------------- | ----------------------------- | -------------------------------------------------------------------------------------------- |
+| `HUGGINGFACE_TOKEN`  | No default, but **required**! | This is the only **required** variable, without it you can't download the huggingface models |
+| `PROJECT_NAME`       | `invokeai`                    | affects the project folder, tag- and volume name                                             |
+| `VOLUMENAME`         | `${PROJECT_NAME}_data`        | Name of the Docker Volume where model files will be stored                                   |
+| `ARCH`               | `x86_64`                      | can be changed to f.e. aarch64 if you are using a ARM based CPU                              |
+| `INVOKEAI_TAG`       | `${PROJECT_NAME}:${ARCH}`     | the Container Repository / Tag which will be used                                            |
+| `PIP_REQUIREMENTS`   | `requirements-lin-cuda.txt`   | the requirements file to use (from `environments-and-requirements`)                          |
+| `INVOKE_DOCKERFILE`  | `docker-build/Dockerfile`     | the Dockerfile which should be built, handy for development                                  |
+
+</figure>
 
 #### Build the Image
 
@@ -79,25 +92,41 @@ I provided a build script, which is located in `docker-build/build.sh` but still
 needs to be executed from the Repository root.
 
 ```bash
-docker-build/build.sh
+./docker-build/build.sh
 ```
 
 The build Script not only builds the container, but also creates the docker
-volume if not existing yet, or if empty it will just download the models. When
-it is done you can run the container via the run script
+volume if not existing yet, or if empty it will just download the models.
+
+#### Run the Container
+
+After the build process is done, you can run the container via the provided
+`docker-build/run.sh` script
 
 ```bash
-docker-build/run.sh
+./docker-build/run.sh
 ```
 
-When used without arguments, the container will start the website and provide
+When used without arguments, the container will start the webserver and provide
 you the link to open it. But if you want to use some other parameters you can
 also do so.
 
+!!! example "run script example"
+
+    ```bash
+    ./docker-build/run.sh "banana sushi" -Ak_lms -S42 -s10
+    ```
+
+    This would generate the legendary "banana sushi" with Seed 42, k_lms Sampler and 10 steps. 
+
+    Find out more about available CLI-Parameters at [features/CLI.md](../../features/CLI/#arguments)
+
+---
+
 !!! warning "Deprecated"
 
-    From here on it is the rest of the previous Docker-Docs, which will still
-    provide usefull informations for one or the other.
+    From here on you will find the the previous Docker-Docs, which will still
+    provide some usefull informations.
 
 ## Usage (time to have fun)
 

docs/installation/INSTALL_INVOKE.md

@@ -0,0 +1,64 @@
+---
+title: InvokeAI Installer
+---
+
+The InvokeAI installer is a shell script that will install InvokeAI onto a stock
+computer running recent versions of Linux, MacOSX or Windows. It will leave you
+with a version that runs a stable version of InvokeAI. When a new version of
+InvokeAI is released, you will download and reinstall the new version.
+
+If you wish to tinker with unreleased versions of InvokeAI that introduce
+potentially unstable new features, you should consider using the
+[source installer](INSTALL_SOURCE.md) or one of the
+[manual install](INSTALL_MANUAL.md) methods.
+
+**Important Caveats**
+  - This script does not support AMD GPUs. For Linux AMD support,
+    please use the manual or source code installer methods.
+
+  - This script has difficulty on some Macintosh machines
+    that have previously been used for Python development due to
+    conflicting development tools versions. Mac developers may wish
+    to try the source code installer or one of the manual methods instead.
+
+!!! todo
+
+    Before you begin, make sure that you meet
+    the[hardware requirements](/#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).
+
+Installation requires roughly 18G of free disk space to load the libraries and
+recommended model weights files.
+
+## Steps to Install
+
+1. Download the
+   [latest release](https://github.com/invoke-ai/InvokeAI/releases/latest) of
+   InvokeAI's installer for your platform
+
+2. Place the downloaded package someplace where you have plenty of HDD space,
+   and have full permissions (i.e. `~/` on Lin/Mac; your home folder on Windows)
+
+3. Extract the 'InvokeAI' folder from the downloaded package
+
+4. Open the extracted 'InvokeAI' folder
+
+5. Double-click 'install.bat' (Windows), or 'install.sh' (Lin/Mac) (or run from
+   a terminal)
+
+6. Follow the prompts
+
+7. After installation, please run the 'invoke.bat' file (on Windows) or
+   'invoke.sh' file (on Linux/Mac) to start InvokeAI.
+
+## Troubleshooting
+
+If you run into problems during or after installation, the InvokeAI team is
+available to help you. Either create an
+[Issue](https://github.com/invoke-ai/InvokeAI/issues) at our GitHub site, or
+make a request for help on the "bugs-and-support" channel of our
+[Discord server](https://discord.gg/ZmtBAhwWhy). We are a 100% volunteer
+organization, but typically somebody will be available to help you within 24
+hours, and often much sooner.

docs/installation/INSTALL_JUPYTER.md

@@ -0,0 +1,27 @@
+---
+title: Running InvokeAI on Google Colab using a Jupyter Notebook
+---
+
+# THIS NEEDS TO BE FLESHED OUT
+
+## Introduction
+
+We have a [Jupyter
+notebook](https://github.com/invoke-ai/InvokeAI/blob/main/notebooks/Stable-Diffusion-local-Windows.ipynb)
+with cell-by-cell installation steps. It will download the code in
+this repo as one of the steps, so instead of cloning this repo, simply
+download the notebook from the link above and load it up in VSCode
+(with the appropriate extensions installed)/Jupyter/JupyterLab and
+start running the cells one-by-one.
+
+!!! Note "you will need NVIDIA drivers, Python 3.10, and Git installed beforehand"
+
+## Walkthrough
+
+## Updating to newer versions
+
+### Updating the stable version
+
+### Updating to the development version
+
+## Troubleshooting

docs/installation/INSTALL_LINUX.md

@@ -1,101 +0,0 @@
----
-title: Manual Installation, Linux
----
-
-# :fontawesome-brands-linux: Linux
-
-## Installation
-
-1. You will need to install the following prerequisites if they are not already
-   available. Use your operating system's preferred installer.
-
-    - Python (version 3.8.5 recommended; higher may work)
-    - git
-
-2. Install the Python Anaconda environment manager.
-
-    ```bash
-    ~$  wget https://repo.anaconda.com/archive/Anaconda3-2022.05-Linux-x86_64.sh
-    ~$  chmod +x Anaconda3-2022.05-Linux-x86_64.sh
-    ~$  ./Anaconda3-2022.05-Linux-x86_64.sh
-    ```
-
-    After installing anaconda, you should log out of your system and log back in. If
-    the installation worked, your command prompt will be prefixed by the name of the
-    current anaconda environment - `(base)`.
-
-3. Copy the InvokeAI source code from GitHub:
-
-    ```bash
-    (base) ~$ 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. From this step forward make sure that you are working in the InvokeAI directory!
-
-    ```bash
-    (base) ~$ cd InvokeAI
-    (base) ~/InvokeAI$
-    ```
-
-5. Use anaconda to copy necessary python packages, create a new python
-   environment named `invokeai` and activate the environment.
-
-    ```bash
-    (base) ~/InvokeAI$ conda env create
-    (base) ~/InvokeAI$ conda activate invokeai
-    (invokeai) ~/InvokeAI$
-    ```
-
-    After these steps, your command prompt will be prefixed by `(invokeai)` as shown
-    above.
-
-6. Load a couple of small machine-learning models required by stable diffusion:
-
-    ```bash
-    (invokeai) ~/InvokeAI$ python3 scripts/preload_models.py
-    ```
-
-    !!! note
-
-        This step is necessary because I modified the original just-in-time
-        model loading scheme to allow the script to work on GPU machines that are not
-        internet connected. See [Preload Models](../features/OTHER.md#preload-models)
-
-7. Install the weights for the stable diffusion model.
-
-- Sign up at https://huggingface.co
-- Go to the [Stable diffusion diffusion model page](https://huggingface.co/CompVis/stable-diffusion-v-1-4-original)
-- Accept the terms and click Access Repository
-- Download [v1-5-pruned-emaonly.ckpt (4.27 GB)](https://huggingface.co/runwayml/stable-diffusion-v1-5/blob/main/v1-5-pruned-emaonly.ckpt)
-and move it into this directory under `models/ldm/stable_diffusion_v1/v1-5-pruned-emaonly.ckpt`
-
-There are many other models that you can use. Please see [../features/INSTALLING_MODELS.md]
-for details.
-
-8. Start generating images!
-
-    ```bash
-    # for the pre-release weights use the -l or --liaon400m switch
-    (invokeai) ~/InvokeAI$ python3 scripts/invoke.py -l
-
-    # for the post-release weights do not use the switch
-    (invokeai) ~/InvokeAI$ python3 scripts/invoke.py
-
-    # for additional configuration switches and arguments, use -h or --help
-    (invokeai) ~/InvokeAI$ python3 scripts/invoke.py -h
-    ```
-
-9. Subsequently, to relaunch the script, be sure to run "conda activate invokeai" (step 5, second command), enter the `InvokeAI` directory, and then launch the invoke script (step 8). 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
-(invokeai) ~/InvokeAI$ git pull
-(invokeai) ~/InvokeAI$ conda env update -f environment.yml
-```
-
-This will bring your local copy into sync with the remote one.

docs/installation/INSTALL_MANUAL.md

@@ -0,0 +1,429 @@
+---
+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 expirienced 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/preload_models.py
+    ```
+
+    The script `preload_models.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/preload_models.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.
+
+#### `preload_models.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/INSTALL_PCP.md

@@ -0,0 +1,17 @@
+---
+title: Installing InvokeAI with the Pre-Compiled PIP Installer
+---
+
+# THIS NEEDS TO BE FLESHED OUT
+
+## Introduction
+
+## Walkthrough
+
+## Updating to newer versions
+
+### Updating the stable version
+
+### Updating to the development version
+
+## Troubleshooting