whoops

- Fix the ANSI escape codes for macOS
- Add check for python binary name to `tag_release.sh`
- Print `git remote -v` in `tag_release.sh`

.github/actions/install-frontend-deps/action.yml

@@ -0,0 +1,33 @@
+name: Install frontend dependencies
+description: Installs frontend dependencies with pnpm, with caching
+runs:
+  using: 'composite'
+  steps:
+    - name: Setup Node 18
+      uses: actions/setup-node@v4
+      with:
+        node-version: '18'
+
+    - name: Setup pnpm
+      uses: pnpm/action-setup@v2
+      with:
+        version: 8
+        run_install: false
+
+    - name: Get pnpm store directory
+      shell: bash
+      run: |
+        echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
+
+    - uses: actions/cache@v3
+      name: Setup pnpm cache
+      with:
+        path: ${{ env.STORE_PATH }}
+        key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+        restore-keys: |
+          ${{ runner.os }}-pnpm-store-
+
+    - name: Install frontend dependencies
+      run: pnpm install --prefer-frozen-lockfile
+      shell: bash
+      working-directory: invokeai/frontend/web

.github/actions/install-python-deps/action.yml

@@ -0,0 +1,11 @@
+name: Install python dependencies
+description: Install python dependencies with pip, with caching
+runs:
+  using: 'composite'
+  steps:
+    - name: Setup python
+      uses: actions/setup-python@v5
+      with:
+        python-version: '3.10'
+        cache: pip
+        cache-dependency-path: pyproject.toml

.github/workflows/build-container.yml

@@ -11,7 +11,7 @@ on:
       - 'docker/docker-entrypoint.sh'
       - 'workflows/build-container.yml'
     tags:
-      - 'v*'
+      - 'v*.*.*'
   workflow_dispatch:
 
 permissions:

.github/workflows/check-frontend.yml

@@ -0,0 +1,34 @@
+name: 'Check: frontend'
+
+on:
+  workflow_dispatch:
+  workflow_call:
+
+defaults:
+  run:
+    working-directory: invokeai/frontend/web
+
+jobs:
+  check-frontend:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up frontend
+        uses: ./.github/actions/install-frontend-deps
+
+      - name: Run tsc check
+        run: 'pnpm run lint:tsc'
+        shell: bash
+
+      - name: Run madge check
+        run: 'pnpm run lint:madge'
+        shell: bash
+
+      - name: Run eslint check
+        run: 'pnpm run lint:eslint'
+        shell: bash
+
+      - name: Run prettier check
+        run: 'pnpm run lint:prettier'
+        shell: bash

.github/workflows/check-pytest.yml

@@ -1,15 +1,8 @@
-name: Test invoke.py pip
+name: 'Check: pytest'
+
 on:
-  push:
-    branches:
-      - 'main'
-  pull_request:
-    types:
-      - 'ready_for_review'
-      - 'opened'
-      - 'synchronize'
-  merge_group:
   workflow_dispatch:
+  workflow_call:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
@@ -17,11 +10,9 @@ concurrency:
 
 jobs:
   matrix:
-    if: github.event.pull_request.draft == false
     strategy:
       matrix:
         python-version:
-          # - '3.9'
           - '3.10'
         pytorch:
           - linux-cuda-11_7
@@ -52,27 +43,12 @@ jobs:
     env:
       PIP_USE_PEP517: '1'
     steps:
-      - name: Checkout sources
-        id: checkout-sources
-        uses: actions/checkout@v3
-
-      - name: Check for changed python files
-        id: changed-files
-        uses: tj-actions/changed-files@v37
-        with:
-          files_yaml: |
-            python:
-              - 'pyproject.toml'
-              - 'invokeai/**'
-              - '!invokeai/frontend/web/**'
-              - 'tests/**'
+      - uses: actions/checkout@v4
 
       - name: set test prompt to main branch validation
-        if: steps.changed-files.outputs.python_any_changed == 'true'
         run: echo "TEST_PROMPTS=tests/validate_pr_prompt.txt" >> ${{ matrix.github-env }}
 
       - name: setup python
-        if: steps.changed-files.outputs.python_any_changed == 'true'
         uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
@@ -80,7 +56,6 @@ jobs:
           cache-dependency-path: pyproject.toml
 
       - name: install invokeai
-        if: steps.changed-files.outputs.python_any_changed == 'true'
         env:
           PIP_EXTRA_INDEX_URL: ${{ matrix.extra-index-url }}
         run: >
@@ -88,7 +63,6 @@ jobs:
           --editable=".[test]"
 
       - name: run pytest
-        if: steps.changed-files.outputs.python_any_changed == 'true'
         id: run-pytest
         run: pytest
 

.github/workflows/check-python.yml

@@ -0,0 +1,26 @@
+name: 'Check: python'
+
+on:
+  workflow_dispatch:
+  workflow_call:
+
+jobs:
+  check-backend:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install python dependencies
+        uses: ./.github/actions/install-python-deps
+
+      - name: Install ruff
+        run: pip install ruff
+        shell: bash
+
+      - name: Ruff check
+        run: ruff check --output-format=github .
+        shell: bash
+
+      - name: Ruff format
+        run: ruff format --check .
+        shell: bash

.github/workflows/lint-frontend.yml

@@ -1,43 +0,0 @@
-name: Lint frontend
-
-on:
-  pull_request:
-    types:
-      - 'ready_for_review'
-      - 'opened'
-      - 'synchronize'
-  push:
-    branches:
-      - 'main'
-  merge_group:
-  workflow_dispatch:
-
-defaults:
-  run:
-    working-directory: invokeai/frontend/web
-
-jobs:
-  lint-frontend:
-    if: github.event.pull_request.draft == false
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Setup Node 18
-        uses: actions/setup-node@v4
-        with:
-          node-version: '18'
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Setup pnpm
-        uses: pnpm/action-setup@v2
-        with:
-          version: '8.12.1'
-      - name: Install dependencies
-        run: 'pnpm install --prefer-frozen-lockfile'
-      - name: Typescript
-        run: 'pnpm run lint:tsc'
-      - name: Madge
-        run: 'pnpm run lint:madge'
-      - name: ESLint
-        run: 'pnpm run lint:eslint'
-      - name: Prettier
-        run: 'pnpm run lint:prettier'

.github/workflows/on-change-check-frontend.yml

@@ -0,0 +1,34 @@
+name: 'On change: run check-frontend'
+
+on:
+  push:
+    branches:
+      - 'main'
+  pull_request:
+    types:
+      - 'ready_for_review'
+      - 'opened'
+      - 'synchronize'
+  merge_group:
+
+jobs:
+  check-changed-frontend-files:
+    if: github.event.pull_request.draft == false
+    runs-on: ubuntu-latest
+    outputs:
+      frontend_any_changed: ${{ steps.changed-files.outputs.frontend_any_changed }}
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Check for changed frontend files
+        id: changed-files
+        uses: tj-actions/changed-files@v40
+        with:
+          files_yaml: |
+            frontend:
+              - 'invokeai/frontend/web/**'
+
+  run-check-frontend:
+    needs: check-changed-frontend-files
+    if: ${{ needs.check-changed-frontend-files.outputs.frontend_any_changed == 'true' }}
+    uses: ./.github/workflows/check-frontend.yml

.github/workflows/on-change-check-python.yml

@@ -0,0 +1,37 @@
+name: 'On change: run check-python'
+
+on:
+  push:
+    branches:
+      - 'main'
+  pull_request:
+    types:
+      - 'ready_for_review'
+      - 'opened'
+      - 'synchronize'
+  merge_group:
+
+jobs:
+  check-changed-python-files:
+    if: github.event.pull_request.draft == false
+    runs-on: ubuntu-latest
+    outputs:
+      python_any_changed: ${{ steps.changed-files.outputs.python_any_changed }}
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Check for changed python files
+        id: changed-files
+        uses: tj-actions/changed-files@v40
+        with:
+          files_yaml: |
+            python:
+              - 'pyproject.toml'
+              - 'invokeai/**'
+              - '!invokeai/frontend/web/**'
+              - 'tests/**'
+
+  run-check-python:
+    needs: check-changed-python-files
+    if: ${{ needs.check-changed-python-files.outputs.python_any_changed == 'true' }}
+    uses: ./.github/workflows/check-python.yml

.github/workflows/on-change-pytest.yml

@@ -0,0 +1,37 @@
+name: 'On change: run pytest'
+
+on:
+  push:
+    branches:
+      - 'main'
+  pull_request:
+    types:
+      - 'ready_for_review'
+      - 'opened'
+      - 'synchronize'
+  merge_group:
+
+jobs:
+  check-changed-python-files:
+    if: github.event.pull_request.draft == false
+    runs-on: ubuntu-latest
+    outputs:
+      python_any_changed: ${{ steps.changed-files.outputs.python_any_changed }}
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Check for changed python files
+        id: changed-files
+        uses: tj-actions/changed-files@v40
+        with:
+          files_yaml: |
+            python:
+              - 'pyproject.toml'
+              - 'invokeai/**'
+              - '!invokeai/frontend/web/**'
+              - 'tests/**'
+
+  run-pytest:
+    needs: check-changed-python-files
+    if: ${{ needs.check-changed-python-files.outputs.python_any_changed == 'true' }}
+    uses: ./.github/workflows/check-pytest.yml

.github/workflows/release.yml

@@ -0,0 +1,103 @@
+name: Release
+
+on:
+  push:
+    tags:
+      - 'v*.*.*'
+  workflow_dispatch:
+    inputs:
+      skip_code_checks:
+        description: 'Skip code checks'
+        required: true
+        default: true
+        type: boolean
+
+jobs:
+  check-version:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: samuelcolvin/check-python-version@v4
+        id: check-python-version
+        with:
+          version_file_path: invokeai/version/invokeai_version.py
+
+  check-frontend:
+    if: github.event.inputs.skip_code_checks != 'true'
+    uses: ./.github/workflows/check-frontend.yml
+
+  check-python:
+    if: github.event.inputs.skip_code_checks != 'true'
+    uses: ./.github/workflows/check-python.yml
+
+  check-pytest:
+    if: github.event.inputs.skip_code_checks != 'true'
+    uses: ./.github/workflows/check-pytest.yml
+
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install python dependencies
+        uses: ./.github/actions/install-python-deps
+
+      - name: Install pypa/build
+        run: pip install --upgrade build
+
+      - name: Setup frontend
+        uses: ./.github/actions/install-frontend-deps
+
+      - name: Run create_installer.sh
+        id: create_installer
+        run: ./create_installer.sh --skip_frontend_checks
+        working-directory: installer
+
+      - name: Upload python distribution artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: dist
+          path: ${{ steps.create_installer.outputs.DIST_PATH }}
+
+      - name: Upload installer artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ steps.create_installer.outputs.INSTALLER_FILENAME }}
+          path: ${{ steps.create_installer.outputs.INSTALLER_PATH }}
+
+  publish-testpypi:
+    runs-on: ubuntu-latest
+    needs: [check-version, check-frontend, check-python, check-pytest, build]
+    if: github.event_name != 'workflow_dispatch'
+    environment:
+      name: testpypi
+      url: https://test.pypi.org/p/invokeai
+    steps:
+      - name: Download distribution from build job
+        uses: actions/download-artifact@v4
+        with:
+          name: dist
+          path: dist/
+
+      - name: Publish distribution to TestPyPI
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          repository-url: https://test.pypi.org/legacy/
+
+  publish-pypi:
+    runs-on: ubuntu-latest
+    needs: [check-version, check-frontend, check-python, check-pytest, build]
+    if: github.event_name != 'workflow_dispatch'
+    environment:
+      name: pypi
+      url: https://pypi.org/p/invokeai
+    steps:
+      - name: Download distribution from build job
+        uses: actions/download-artifact@v4
+        with:
+          name: dist
+          path: dist/
+
+      - name: Publish distribution to PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1

.github/workflows/style-checks.yml

@@ -1,24 +0,0 @@
-name: style checks
-
-on:
-  pull_request:
-  push:
-    branches: main
-
-jobs:
-  ruff:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Setup Python
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.10'
-
-      - name: Install dependencies with pip
-        run: |
-          pip install ruff
-
-      - run: ruff check --output-format=github .
-      - run: ruff format --check .

.prettierrc.yaml

@@ -7,7 +7,7 @@ embeddedLanguageFormatting: auto
 overrides:
   - files: '*.md'
     options:
-      proseWrap: always
+      proseWrap: preserve
       printWidth: 80
       parser: markdown
       cursorOffset: -1

README.md

@@ -1,10 +1,10 @@
 <div align="center">
 
-![project hero](https://github.com/invoke-ai/InvokeAI/assets/31807370/6e3728c7-e90e-4711-905c-3b55844ff5be)
+![project hero](https://github.com/invoke-ai/InvokeAI/assets/31807370/1a917d94-e099-4fa1-a70f-7dd8d0691018)
 
-# Invoke - Professional Creative AI Tools for Visual Media 
-##  To learn more about Invoke, or implement our Business solutions, visit [invoke.com](https://www.invoke.com/about)
-  
+# Invoke AI - Generative AI for Professional Creatives
+## Professional Creative Tools for Stable Diffusion, Custom-Trained Models, and more. 
+  To learn more about Invoke AI, get started instantly, or implement our Business solutions, visit [invoke.ai](https://invoke.ai)
 
 
 [![discord badge]][discord link]
@@ -56,9 +56,7 @@ the foundation for multiple commercial products.
 
 <div align="center">
 
-
-![Highlighted Features - Canvas and Workflows](https://github.com/invoke-ai/InvokeAI/assets/31807370/708f7a82-084f-4860-bfbe-e2588c53548d)
-
+![canvas preview](https://github.com/invoke-ai/InvokeAI/raw/main/docs/assets/canvas_preview.png)
 
 </div>
 

docker/.env.sample

@@ -2,17 +2,14 @@
 ## Any environment variables supported by InvokeAI can be specified here,
 ## in addition to the examples below.
 
-# HOST_INVOKEAI_ROOT is the path on the docker host's filesystem where InvokeAI will store data.
+# INVOKEAI_ROOT is the path to a path on the local filesystem where InvokeAI will store data.
 # Outputs will also be stored here by default.
-# If relative, it will be relative to the docker directory in which the docker-compose.yml file is located
-#HOST_INVOKEAI_ROOT=../../invokeai-data
-
-# INVOKEAI_ROOT is the path to the root of the InvokeAI repository within the container.
-# INVOKEAI_ROOT=~/invokeai
+# This **must** be an absolute path.
+INVOKEAI_ROOT=
 
 # Get this value from your HuggingFace account settings page.
 # HUGGING_FACE_HUB_TOKEN=
 
 ## optional variables specific to the docker setup.
-# GPU_DRIVER=nvidia #| rocm
+# GPU_DRIVER=cuda # or rocm
 # CONTAINER_UID=1000

docker/README.md

@@ -1,14 +1,6 @@
 # InvokeAI Containerized
 
-All commands should be run within the `docker` directory: `cd docker`
-
-## Quickstart :rocket:
-
-On a known working Linux+Docker+CUDA (Nvidia) system, execute `./run.sh` in this directory. It will take a few minutes - depending on your internet speed - to install the core models. Once the application starts up, open `http://localhost:9090` in your browser to Invoke!
-
-For more configuration options (using an AMD GPU, custom root directory location, etc): read on.
-
-## Detailed setup
+All commands are to be run from the `docker` directory: `cd docker`
 
 #### Linux
 
@@ -26,7 +18,7 @@ For more configuration options (using an AMD GPU, custom root directory location
 
 This is done via Docker Desktop preferences
 
-### Configure Invoke environment
+## Quickstart
 
 1. Make a copy of `env.sample` and name it `.env` (`cp env.sample .env` (Mac/Linux) or `copy example.env .env` (Windows)). Make changes as necessary. Set `INVOKEAI_ROOT` to an absolute path to:
     a. the desired location of the InvokeAI runtime directory, or
@@ -45,21 +37,19 @@ The runtime directory (holding models and outputs) will be created in the locati
 
 The Docker daemon on the system must be already set up to use the GPU. In case of Linux, this involves installing `nvidia-docker-runtime` and configuring the `nvidia` runtime as default. Steps will be different for AMD. Please see Docker documentation for the most up-to-date instructions for using your GPU with Docker.
 
-To use an AMD GPU, set `GPU_DRIVER=rocm` in your `.env` file.
-
 ## Customize
 
 Check the `.env.sample` file. It contains some environment variables for running in Docker. Copy it, name it `.env`, and fill it in with your own values. Next time you run `run.sh`, your custom values will be used.
 
 You can also set these values in `docker-compose.yml` directly, but `.env` will help avoid conflicts when code is updated.
 
-Values are optional, but setting `INVOKEAI_ROOT` is highly recommended. The default is `~/invokeai`. Example:
+Example (values are optional, but setting `INVOKEAI_ROOT` is highly recommended):
 
 ```bash
 INVOKEAI_ROOT=/Volumes/WorkDrive/invokeai
 HUGGINGFACE_TOKEN=the_actual_token
 CONTAINER_UID=1000
-GPU_DRIVER=nvidia
+GPU_DRIVER=cuda
 ```
 
 Any environment variables supported by InvokeAI can be set here - please see the [Configuration docs](https://invoke-ai.github.io/InvokeAI/features/CONFIGURATION/) for further detail.

docker/docker-compose.yml

@@ -21,9 +21,7 @@ x-invokeai: &invokeai
     ports:
       - "${INVOKEAI_PORT:-9090}:9090"
     volumes:
-      - type: bind
-        source: ${HOST_INVOKEAI_ROOT:-${INVOKEAI_ROOT:-~/invokeai}}
-        target: ${INVOKEAI_ROOT:-/invokeai}
+      - ${INVOKEAI_ROOT:-~/invokeai}:${INVOKEAI_ROOT:-/invokeai}
       - ${HF_HOME:-~/.cache/huggingface}:${HF_HOME:-/invokeai/.cache/huggingface}
       # - ${INVOKEAI_MODELS_DIR:-${INVOKEAI_ROOT:-/invokeai/models}}
       # - ${INVOKEAI_MODELS_CONFIG_PATH:-${INVOKEAI_ROOT:-/invokeai/configs/models.yaml}}

docker/run.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -e -o pipefail
+set -e
 
 run() {
   local scriptdir=$(dirname "${BASH_SOURCE[0]}")
@@ -8,18 +8,14 @@ run() {
   local build_args=""
   local profile=""
 
-  touch .env
-  build_args=$(awk '$1 ~ /=[^$]/ && $0 !~ /^#/ {print "--build-arg " $0 " "}' .env) &&
-  profile="$(awk -F '=' '/GPU_DRIVER/ {print $2}' .env)"
-
-  [[ -z "$profile" ]] && profile="nvidia"
+  [[ -f ".env" ]] &&
+    build_args=$(awk '$1 ~ /=[^$]/ && $0 !~ /^#/ {print "--build-arg " $0 " "}' .env) &&
+    profile="$(awk -F '=' '/GPU_DRIVER/ {print $2}' .env)"
 
   local service_name="invokeai-$profile"
 
-  if [[ ! -z "$build_args" ]]; then
-    printf "%s\n" "docker compose build args:"
-    printf "%s\n" "$build_args"
-  fi
+  printf "%s\n" "docker compose build args:"
+  printf "%s\n" "$build_args"
 
   docker compose build $build_args
   unset build_args

docs/RELEASE.md

@@ -0,0 +1,157 @@
+# Release
+
+The app is published in twice, in different build formats.
+
+- A [PyPI] distribution. This includes both a source distribution and built distribution (a wheel). Users install with `pip install invokeai`. The updater uses this build.
+- An installer on the [InvokeAI Releases Page]. This is a zip file with install scripts and a wheel. This is only used for new installs.
+
+## General Prep
+
+Make a developer call-out for PRs to merge. Merge and test things out.
+
+While the release workflow does not include end-to-end tests, it does pause before publishing so you can download and test the final build.
+
+## Release Workflow
+
+The `release.yml` workflow runs a number of jobs to handle code checks, tests, build and publish on PyPI.
+
+It is triggered on **tag push**. It doesn't matter if you've prepped a release branch like `release/v3.5.0` or are releasing from `main` - it works the same.
+
+!!! info
+
+    Commits are reference-counted, so as long as a something points to a commit, that commit will not be garbage-collected'd from the repo.
+
+    It is safe to create a release branch, tag it and have the workflow do its thing, then delete the branch. So long as the tag is not deleted, that snapshot of the repo will forever exist at the tag.
+
+### Pushing the Tag
+
+Run `make tag-release` to tag the current commit and kick off the workflow.
+
+### Tag Push Example
+
+Any tag push will trigger the workflow, but it will publish only if the git ref (the tag) matches the app version.
+
+Say `invokeai_version.py` looks like this:
+
+```py
+__version__ = "3.5.0rc2"
+```
+
+- If you push tag `v3.5.0rc2`, the workflow will trigger and run. If the checks and build succeed, you'll be able to publish the release.
+
+- If you push tag `v3.5.0rc3` or `banana-sushi`, the workflow will trigger and run. Even if the checks and build succeed, you'll _will not_ be able to publish the release, because the tag doesn't match the app version.
+
+!!! info
+
+    Any valid [version specifier] works, so long as the tag matches the version. The release workflow works exactly the same for `RC`, `post`, `dev`, etc.
+
+### code quality jobs
+
+Three jobs are run concurrently:
+
+- **`pytest`**: runs `pytest` on matrix of platforms
+- **`check-python`**: runs `ruff` (format and lint)
+- **`check-frontend`**: runs `prettier` (format), `eslint` (lint), `madge` (circular refs) and `tsc` (static type check)
+
+If any fail, the release workflow bails.
+
+!!! info Future Enhancement
+
+    We should add `mypy` or `pyright` to the **`check-python`** job at some point.
+
+### `build`
+
+This sets up both python and frontend dependencies and builds the python package. Internally, this runs `installer/create_installer.sh` and uploads two artifacts:
+
+- **`dist`**: the python distribution, to be published on PyPI
+- **`InvokeAI-installer-${VERSION}.zip`**: the installer to be included in the GitHub release
+
+!!! info
+
+    The installer uses the uses the same wheel file that is included in the PyPI distribution, so you _should_ get exactly the same thing using the installer or PyPI dist.
+
+### Sanity Check & Smoke Test
+
+At this point, the release workflow pauses (the remaining jobs all require approval).
+
+The maintainer who is running this release should go to the **Summary** tab of the workflow, download the installer and test it.
+
+You could also download the `dist`, unzip it and install directly from the wheel. That same wheel will be uploaded to PyPI.
+
+### Publish
+
+The publish jobs use [GitHub environments], which are configured as [trusted publishers] on PyPI.
+
+Both jobs require a maintainer to approve them from the workflow's **Summary** tab.
+
+- Click the **Review deployments** button
+- Select the environment (either `testpypi` or `pypi`)
+- Click **Approve and deploy**
+
+#### Skip and Failure Conditions
+
+The publish jobs may skip or fail in certain situations:
+
+- **If code checks or build fail, the jobs will be skipped.**
+- **If code checks were skipped, the jobs will be skipped.** This can only happen when [manually] running the workflow.
+- **If the git ref targetted by the workflow doesn't match the app version, the jobs will fail.** This protects us from accidentally publishing the wrong version to PyPI. This is achieved with [samuelcolvin/check-python-version].
+- **If the version already exists on PyPI, the jobs will fail.** PyPI only allows a particular version to be published once - you cannot change it. If version published on PyPI has a problem, you'll need to "fail forward" by bumping the app version and publishing a followup release.
+
+#### `publish-testpypi`
+
+Publishes the distribution on the [Test PyPI] index using the `testpypi` GitHub environment.
+
+This job is optional:
+
+- It is not require for the final `publish-pypi` job to run.
+- The wheel used in the installer and PyPI dist (uploaded as artifacts from the workflow, as described above) are identical, so this job _should_ be extraneous.
+
+That said, you could approve it and then test installing from PyPI before running the production PyPI publish job:
+
+```sh
+# Create a new virtual environment
+python -m venv ~/.test-invokeai-dist --prompt test-invokeai-dist
+# Install the distribution from Test PyPI
+pip install --index-url https://test.pypi.org/simple/ invokeai
+# Run and test the app
+invokeai-web
+# Cleanup
+deactivate
+rm -rf ~/.test-invokeai-dist
+```
+
+#### `publish-pypi`
+
+Publishes the distribution on the production PyPI index, using the `pypi` GitHub environment.
+
+Once this finishes, `pip install invokeai` will get the release!
+
+## Publish the GitHub RC with installer
+
+1. [Draft a new release] on GitHub, choosing the tag that initiated the release.
+2. Write the release notes, describing important changes. The **Generate release notes** button automatically inserts the changelog and new contributors, and you can copy/paste the intro from previous releases.
+3. Upload the zip file created in [Build the installer] into the Assets section of the release notes. You can also upload the zip into the body of the release notes, since it can be hard for users to find the Assets section.
+4. Check the **Set as a pre-release** and **Create a discussion for this release** checkboxes at the bottom of the release page.
+5. Publish the pre-release.
+6. Announce the pre-release in Discord.
+
+!!! info Future Enhancement
+
+    Workflows can do things like create a release from a template and upload release assets. One popular action to handle this is [ncipollo/release-action]. A future enhancement to the release process could set this up.
+
+## Manually Running the Release Workflow
+
+The release workflow can be kicked off manually. This is useful to get an installer build and test it out without needing to push a tag.
+
+When run this way, you'll see **Skip code checks** checkbox. This allows the workflow to run without the time-consuming 3 code quality check jobs. The publish jobs will be skipped if enabled.
+
+[InvokeAI Releases Page]: https://github.com/invoke-ai/InvokeAI/releases
+[PyPI]: https://pypi.org/
+[Draft a new release]: https://github.com/invoke-ai/InvokeAI/releases/new
+[Test PyPI]: https://test.pypi.org/
+[version specifier]: https://packaging.python.org/en/latest/specifications/version-specifiers/
+[ncipollo/release-action]: https://github.com/ncipollo/release-action
+[GitHub environments]: https://docs.github.com/en/actions/deployment/targeting-different-environments/using-environments-for-deployment
+[trusted publishers]: https://docs.pypi.org/trusted-publishers/
+[samuelcolvin/check-python-version]: https://github.com/samuelcolvin/check-python-version
+[manually]: #manually-running-the-release-workflow

docs/javascripts/init_kapa_widget.js

@@ -1,10 +1,10 @@
-document.addEventListener("DOMContentLoaded", function () {
-  var script = document.createElement("script");
-  script.src = "https://widget.kapa.ai/kapa-widget.bundle.js";
-  script.setAttribute("data-website-id", "b5973bb1-476b-451e-8cf4-98de86745a10");
-  script.setAttribute("data-project-name", "Invoke.AI");
-  script.setAttribute("data-project-color", "#11213C");
-  script.setAttribute("data-project-logo", "https://avatars.githubusercontent.com/u/113954515?s=280&v=4");
-  script.async = true;
-  document.head.appendChild(script);
-});
+document.addEventListener("DOMContentLoaded", function () {
+  var script = document.createElement("script");
+  script.src = "https://widget.kapa.ai/kapa-widget.bundle.js";
+  script.setAttribute("data-website-id", "b5973bb1-476b-451e-8cf4-98de86745a10");
+  script.setAttribute("data-project-name", "Invoke.AI");
+  script.setAttribute("data-project-color", "#11213C");
+  script.setAttribute("data-project-logo", "https://avatars.githubusercontent.com/u/113954515?s=280&v=4");
+  script.async = true;
+  document.head.appendChild(script);
+});

docs/nodes/communityNodes.md

@@ -36,8 +36,7 @@ To use a community workflow, download the the `.json` node graph file and load i
     + [Mask Operations](#mask-operations)
     + [Match Histogram](#match-histogram)
     + [Metadata-Linked](#metadata-linked-nodes)
-    + [Negative Image](#negative-image)
-    + [Nightmare Promptgen](#nightmare-promptgen)    
+    + [Negative Image](#negative-image)    
     + [Oobabooga](#oobabooga)
     + [Prompt Tools](#prompt-tools)
     + [Remote Image](#remote-image)
@@ -347,13 +346,6 @@ Node Link: https://github.com/VeyDlin/negative-image-node
 View:
 </br><img src="https://raw.githubusercontent.com/VeyDlin/negative-image-node/master/.readme/node.png" width="500" />
 
---------------------------------
-### Nightmare Promptgen
-
-**Description:** Nightmare Prompt Generator - Uses a local text generation model to create unique imaginative (but usually nightmarish) prompts for InvokeAI. By default, it allows you to choose from some gpt-neo models I finetuned on over 2500 of my own InvokeAI prompts in Compel format, but you're able to add your own, as well. Offers support for replacing any troublesome words with a random choice from list you can also define.
-
-**Node Link:** [https://github.com/gogurtenjoyer/nightmare-promptgen](https://github.com/gogurtenjoyer/nightmare-promptgen)
-
 --------------------------------
 ### Oobabooga
 

docs/workflows/Text_to_Image.json

@@ -1,8 +1,8 @@
 {
-  "name": "Text to Image - SD1.5",
+  "name": "Text to Image",
   "author": "InvokeAI",
   "description": "Sample text to image workflow for Stable Diffusion 1.5/2",
-  "version": "1.1.0",
+  "version": "1.0.1",
   "contact": "invoke@invoke.ai",
   "tags": "text2image, SD1.5, SD2, default",
   "notes": "",
@@ -18,19 +18,10 @@
     {
       "nodeId": "93dc02a4-d05b-48ed-b99c-c9b616af3402",
       "fieldName": "prompt"
-    },
-    {
-      "nodeId": "55705012-79b9-4aac-9f26-c0b10309785b",
-      "fieldName": "width"
-    },
-    {
-      "nodeId": "55705012-79b9-4aac-9f26-c0b10309785b",
-      "fieldName": "height"
     }
   ],
   "meta": {
-    "category": "default",
-    "version": "2.0.0"
+    "version": "1.0.0"
   },
   "nodes": [
     {
@@ -39,56 +30,44 @@
       "data": {
         "id": "93dc02a4-d05b-48ed-b99c-c9b616af3402",
         "type": "compel",
-        "label": "Negative Compel Prompt",
-        "isOpen": true,
-        "notes": "",
-        "isIntermediate": true,
-        "useCache": true,
-        "version": "1.0.0",
-        "nodePack": "invokeai",
         "inputs": {
           "prompt": {
             "id": "7739aff6-26cb-4016-8897-5a1fb2305e4e",
             "name": "prompt",
+            "type": "string",
             "fieldKind": "input",
             "label": "Negative Prompt",
-            "type": {
-              "isCollection": false,
-              "isCollectionOrScalar": false,
-              "name": "StringField"
-            },
             "value": ""
           },
           "clip": {
             "id": "48d23dce-a6ae-472a-9f8c-22a714ea5ce0",
             "name": "clip",
+            "type": "ClipField",
             "fieldKind": "input",
-            "label": "",
-            "type": {
-              "isCollection": false,
-              "isCollectionOrScalar": false,
-              "name": "ClipField"
-            }
+            "label": ""
           }
         },
         "outputs": {
           "conditioning": {
             "id": "37cf3a9d-f6b7-4b64-8ff6-2558c5ecc447",
             "name": "conditioning",
-            "fieldKind": "output",
-            "type": {
-              "isCollection": false,
-              "isCollectionOrScalar": false,
-              "name": "ConditioningField"
-            }
+            "type": "ConditioningField",
+            "fieldKind": "output"
           }
-        }
+        },
+        "label": "Negative Compel Prompt",
+        "isOpen": true,
+        "notes": "",
+        "embedWorkflow": false,
+        "isIntermediate": true,
+        "useCache": true,
+        "version": "1.0.0"
       },
       "width": 320,
-      "height": 259,
+      "height": 261,
       "position": {
-        "x": 1000,
-        "y": 350
+        "x": 995.7263915923627,
+        "y": 239.67783573351227
       }
     },
     {
@@ -97,60 +76,37 @@
       "data": {
         "id": "55705012-79b9-4aac-9f26-c0b10309785b",
         "type": "noise",
-        "label": "",
-        "isOpen": true,
-        "notes": "",
-        "isIntermediate": true,
-        "useCache": true,
-        "version": "1.0.1",
-        "nodePack": "invokeai",
         "inputs": {
           "seed": {
             "id": "6431737c-918a-425d-a3b4-5d57e2f35d4d",
             "name": "seed",
+            "type": "integer",
             "fieldKind": "input",
             "label": "",
-            "type": {
-              "isCollection": false,
-              "isCollectionOrScalar": false,
-              "name": "IntegerField"
-            },
             "value": 0
           },
           "width": {
             "id": "38fc5b66-fe6e-47c8-bba9-daf58e454ed7",
             "name": "width",
+            "type": "integer",
             "fieldKind": "input",
             "label": "",
-            "type": {
-              "isCollection": false,
-              "isCollectionOrScalar": false,
-              "name": "IntegerField"
-            },
             "value": 512
           },
           "height": {
             "id": "16298330-e2bf-4872-a514-d6923df53cbb",
             "name": "height",
+            "type": "integer",
             "fieldKind": "input",
             "label": "",
-            "type": {
-              "isCollection": false,
-              "isCollectionOrScalar": false,
-              "name": "IntegerField"
-            },
             "value": 512
           },
           "use_cpu": {
             "id": "c7c436d3-7a7a-4e76-91e4-c6deb271623c",
             "name": "use_cpu",
+            "type": "boolean",
             "fieldKind": "input",
             "label": "",
-            "type": {
-              "isCollection": false,
-              "isCollectionOrScalar": false,
-              "name": "BooleanField"
-            },
             "value": true
           }
         },
@@ -158,40 +114,35 @@
           "noise": {
             "id": "50f650dc-0184-4e23-a927-0497a96fe954",
             "name": "noise",
-            "fieldKind": "output",
-            "type": {
-              "isCollection": false,
-              "isCollectionOrScalar": false,
-              "name": "LatentsField"
-            }
+            "type": "LatentsField",
+            "fieldKind": "output"
           },
           "width": {
             "id": "bb8a452b-133d-42d1-ae4a-3843d7e4109a",
             "name": "width",
-            "fieldKind": "output",
-            "type": {
-              "isCollection": false,
-              "isCollectionOrScalar": false,
-              "name": "IntegerField"
-            }
+            "type": "integer",
+            "fieldKind": "output"
           },
           "height": {
             "id": "35cfaa12-3b8b-4b7a-a884-327ff3abddd9",
             "name": "height",
-            "fieldKind": "output",
-            "type": {
-              "isCollection": false,
-              "isCollectionOrScalar": false,
-              "name": "IntegerField"
-            }
+            "type": "integer",
+            "fieldKind": "output"
           }
-        }
+        },
+        "label": "",
+        "isOpen": true,
+        "notes": "",
+        "embedWorkflow": false,
+        "isIntermediate": true,
+        "useCache": true,
+        "version": "1.0.0"
       },
       "width": 320,
-      "height": 388,
+      "height": 389,
       "position": {
-        "x": 600,
-        "y": 325
+        "x": 993.4442117555518,
+        "y": 605.6757415334787
       }
     },
     {
@@ -200,24 +151,13 @@
       "data": {
         "id": "c8d55139-f380-4695-b7f2-8b3d1e1e3db8",
         "type": "main_model_loader",
-        "label": "",
-        "isOpen": true,
-        "notes": "",
-        "isIntermediate": true,
-        "useCache": true,
-        "version": "1.0.0",
-        "nodePack": "invokeai",
         "inputs": {
           "model": {
             "id": "993eabd2-40fd-44fe-bce7-5d0c7075ddab",
             "name": "model",
+            "type": "MainModelField",
             "fieldKind": "input",
             "label": "",
-            "type": {
-              "isCollection": false,
-              "isCollectionOrScalar": false,
-              "name": "MainModelField"
-            },
             "value": {
               "model_name": "stable-diffusion-v1-5",
               "base_model": "sd-1",
@@ -229,40 +169,35 @@
           "unet": {
             "id": "5c18c9db-328d-46d0-8cb9-143391c410be",
             "name": "unet",
-            "fieldKind": "output",
-            "type": {
-              "isCollection": false,
-              "isCollectionOrScalar": false,
-              "name": "UNetField"
-            }
+            "type": "UNetField",
+            "fieldKind": "output"
           },
           "clip": {
             "id": "6effcac0-ec2f-4bf5-a49e-a2c29cf921f4",
             "name": "clip",
-            "fieldKind": "output",
-            "type": {
-              "isCollection": false,
-              "isCollectionOrScalar": false,
-              "name": "ClipField"
-            }
+            "type": "ClipField",
+            "fieldKind": "output"
           },
           "vae": {
             "id": "57683ba3-f5f5-4f58-b9a2-4b83dacad4a1",
             "name": "vae",
-            "fieldKind": "output",
-            "type": {
-              "isCollection": false,
-              "isCollectionOrScalar": false,
-              "name": "VaeField"
-            }
+            "type": "VaeField",
+            "fieldKind": "output"
           }
-        }
+        },
+        "label": "",
+        "isOpen": true,
+        "notes": "",
+        "embedWorkflow": false,
+        "isIntermediate": true,
+        "useCache": true,
+        "version": "1.0.0"
       },
       "width": 320,
       "height": 226,
       "position": {
-        "x": 600,
-        "y": 25
+        "x": 163.04436745878343,
+        "y": 254.63156870373479
       }
     },
     {
@@ -271,56 +206,44 @@
       "data": {
         "id": "7d8bf987-284f-413a-b2fd-d825445a5d6c",
         "type": "compel",
-        "label": "Positive Compel Prompt",
-        "isOpen": true,
-        "notes": "",
-        "isIntermediate": true,
-        "useCache": true,
-        "version": "1.0.0",
-        "nodePack": "invokeai",
         "inputs": {
           "prompt": {
             "id": "7739aff6-26cb-4016-8897-5a1fb2305e4e",
             "name": "prompt",
+            "type": "string",
             "fieldKind": "input",
             "label": "Positive Prompt",
-            "type": {
-              "isCollection": false,
-              "isCollectionOrScalar": false,
-              "name": "StringField"
-            },
-            "value": "Super cute tiger cub, national geographic award-winning photograph"
+            "value": ""
           },
           "clip": {
             "id": "48d23dce-a6ae-472a-9f8c-22a714ea5ce0",
             "name": "clip",
+            "type": "ClipField",
             "fieldKind": "input",
-            "label": "",
-            "type": {
-              "isCollection": false,
-              "isCollectionOrScalar": false,
-              "name": "ClipField"
-            }
+            "label": ""
           }
         },
         "outputs": {
           "conditioning": {
             "id": "37cf3a9d-f6b7-4b64-8ff6-2558c5ecc447",
             "name": "conditioning",
-            "fieldKind": "output",
-            "type": {
-              "isCollection": false,
-              "isCollectionOrScalar": false,
-              "name": "ConditioningField"
-            }
+            "type": "ConditioningField",
+            "fieldKind": "output"
           }
-        }
+        },
+        "label": "Positive Compel Prompt",
+        "isOpen": true,
+        "notes": "",
+        "embedWorkflow": false,
+        "isIntermediate": true,
+        "useCache": true,
+        "version": "1.0.0"
       },
       "width": 320,
-      "height": 259,
+      "height": 261,
       "position": {
-        "x": 1000,
-        "y": 25
+        "x": 595.7263915923627,
+        "y": 239.67783573351227
       }
     },
     {
@@ -329,36 +252,21 @@
       "data": {
         "id": "ea94bc37-d995-4a83-aa99-4af42479f2f2",
         "type": "rand_int",
-        "label": "Random Seed",
-        "isOpen": false,
-        "notes": "",
-        "isIntermediate": true,
-        "useCache": false,
-        "version": "1.0.0",
-        "nodePack": "invokeai",
         "inputs": {
           "low": {
             "id": "3ec65a37-60ba-4b6c-a0b2-553dd7a84b84",
             "name": "low",
+            "type": "integer",
             "fieldKind": "input",
             "label": "",
-            "type": {
-              "isCollection": false,
-              "isCollectionOrScalar": false,
-              "name": "IntegerField"
-            },
             "value": 0
           },
           "high": {
             "id": "085f853a-1a5f-494d-8bec-e4ba29a3f2d1",
             "name": "high",
+            "type": "integer",
             "fieldKind": "input",
             "label": "",
-            "type": {
-              "isCollection": false,
-              "isCollectionOrScalar": false,
-              "name": "IntegerField"
-            },
             "value": 2147483647
           }
         },
@@ -366,20 +274,23 @@
           "value": {
             "id": "812ade4d-7699-4261-b9fc-a6c9d2ab55ee",
             "name": "value",
-            "fieldKind": "output",
-            "type": {
-              "isCollection": false,
-              "isCollectionOrScalar": false,
-              "name": "IntegerField"
-            }
+            "type": "integer",
+            "fieldKind": "output"
           }
-        }
+        },
+        "label": "Random Seed",
+        "isOpen": true,
+        "notes": "",
+        "embedWorkflow": false,
+        "isIntermediate": true,
+        "useCache": false,
+        "version": "1.0.0"
       },
       "width": 320,
-      "height": 32,
+      "height": 218,
       "position": {
-        "x": 600,
-        "y": 275
+        "x": 541.094822888628,
+        "y": 694.5704476446829
       }
     },
     {
@@ -388,224 +299,144 @@
       "data": {
         "id": "eea2702a-19fb-45b5-9d75-56b4211ec03c",
         "type": "denoise_latents",
-        "label": "",
-        "isOpen": true,
-        "notes": "",
-        "isIntermediate": true,
-        "useCache": true,
-        "version": "1.5.0",
-        "nodePack": "invokeai",
         "inputs": {
           "positive_conditioning": {
             "id": "90b7f4f8-ada7-4028-8100-d2e54f192052",
             "name": "positive_conditioning",
+            "type": "ConditioningField",
             "fieldKind": "input",
-            "label": "",
-            "type": {
-              "isCollection": false,
-              "isCollectionOrScalar": false,
-              "name": "ConditioningField"
-            }
+            "label": ""
           },
           "negative_conditioning": {
             "id": "9393779e-796c-4f64-b740-902a1177bf53",
             "name": "negative_conditioning",
+            "type": "ConditioningField",
             "fieldKind": "input",
-            "label": "",
-            "type": {
-              "isCollection": false,
-              "isCollectionOrScalar": false,
-              "name": "ConditioningField"
-            }
+            "label": ""
           },
           "noise": {
             "id": "8e17f1e5-4f98-40b1-b7f4-86aeeb4554c1",
             "name": "noise",
+            "type": "LatentsField",
             "fieldKind": "input",
-            "label": "",
-            "type": {
-              "isCollection": false,
-              "isCollectionOrScalar": false,
-              "name": "LatentsField"
-            }
+            "label": ""
           },
           "steps": {
             "id": "9b63302d-6bd2-42c9-ac13-9b1afb51af88",
             "name": "steps",
+            "type": "integer",
             "fieldKind": "input",
             "label": "",
-            "type": {
-              "isCollection": false,
-              "isCollectionOrScalar": false,
-              "name": "IntegerField"
-            },
-            "value": 50
+            "value": 10
           },
           "cfg_scale": {
             "id": "87dd04d3-870e-49e1-98bf-af003a810109",
             "name": "cfg_scale",
+            "type": "FloatPolymorphic",
             "fieldKind": "input",
             "label": "",
-            "type": {
-              "isCollection": false,
-              "isCollectionOrScalar": true,
-              "name": "FloatField"
-            },
             "value": 7.5
           },
           "denoising_start": {
             "id": "f369d80f-4931-4740-9bcd-9f0620719fab",
             "name": "denoising_start",
+            "type": "float",
             "fieldKind": "input",
             "label": "",
-            "type": {
-              "isCollection": false,
-              "isCollectionOrScalar": false,
-              "name": "FloatField"
-            },
             "value": 0
           },
           "denoising_end": {
             "id": "747d10e5-6f02-445c-994c-0604d814de8c",
             "name": "denoising_end",
+            "type": "float",
             "fieldKind": "input",
             "label": "",
-            "type": {
-              "isCollection": false,
-              "isCollectionOrScalar": false,
-              "name": "FloatField"
-            },
             "value": 1
           },
           "scheduler": {
             "id": "1de84a4e-3a24-4ec8-862b-16ce49633b9b",
             "name": "scheduler",
+            "type": "Scheduler",
             "fieldKind": "input",
             "label": "",
-            "type": {
-              "isCollection": false,
-              "isCollectionOrScalar": false,
-              "name": "SchedulerField"
-            },
-            "value": "unipc"
+            "value": "euler"
           },
           "unet": {
             "id": "ffa6fef4-3ce2-4bdb-9296-9a834849489b",
             "name": "unet",
+            "type": "UNetField",
             "fieldKind": "input",
-            "label": "",
-            "type": {
-              "isCollection": false,
-              "isCollectionOrScalar": false,
-              "name": "UNetField"
-            }
+            "label": ""
           },
           "control": {
             "id": "077b64cb-34be-4fcc-83f2-e399807a02bd",
             "name": "control",
+            "type": "ControlPolymorphic",
             "fieldKind": "input",
-            "label": "",
-            "type": {
-              "isCollection": false,
-              "isCollectionOrScalar": true,
-              "name": "ControlField"
-            }
+            "label": ""
           },
           "ip_adapter": {
             "id": "1d6948f7-3a65-4a65-a20c-768b287251aa",
             "name": "ip_adapter",
+            "type": "IPAdapterPolymorphic",
             "fieldKind": "input",
-            "label": "",
-            "type": {
-              "isCollection": false,
-              "isCollectionOrScalar": true,
-              "name": "IPAdapterField"
-            }
+            "label": ""
           },
           "t2i_adapter": {
             "id": "75e67b09-952f-4083-aaf4-6b804d690412",
             "name": "t2i_adapter",
+            "type": "T2IAdapterPolymorphic",
             "fieldKind": "input",
-            "label": "",
-            "type": {
-              "isCollection": false,
-              "isCollectionOrScalar": true,
-              "name": "T2IAdapterField"
-            }
-          },
-          "cfg_rescale_multiplier": {
-            "id": "9101f0a6-5fe0-4826-b7b3-47e5d506826c",
-            "name": "cfg_rescale_multiplier",
-            "fieldKind": "input",
-            "label": "",
-            "type": {
-              "isCollection": false,
-              "isCollectionOrScalar": false,
-              "name": "FloatField"
-            },
-            "value": 0
+            "label": ""
           },
           "latents": {
             "id": "334d4ba3-5a99-4195-82c5-86fb3f4f7d43",
             "name": "latents",
+            "type": "LatentsField",
             "fieldKind": "input",
-            "label": "",
-            "type": {
-              "isCollection": false,
-              "isCollectionOrScalar": false,
-              "name": "LatentsField"
-            }
+            "label": ""
           },
           "denoise_mask": {
             "id": "0d3dbdbf-b014-4e95-8b18-ff2ff9cb0bfa",
             "name": "denoise_mask",
+            "type": "DenoiseMaskField",
             "fieldKind": "input",
-            "label": "",
-            "type": {
-              "isCollection": false,
-              "isCollectionOrScalar": false,
-              "name": "DenoiseMaskField"
-            }
+            "label": ""
           }
         },
         "outputs": {
           "latents": {
             "id": "70fa5bbc-0c38-41bb-861a-74d6d78d2f38",
             "name": "latents",
-            "fieldKind": "output",
-            "type": {
-              "isCollection": false,
-              "isCollectionOrScalar": false,
-              "name": "LatentsField"
-            }
+            "type": "LatentsField",
+            "fieldKind": "output"
           },
           "width": {
             "id": "98ee0e6c-82aa-4e8f-8be5-dc5f00ee47f0",
             "name": "width",
-            "fieldKind": "output",
-            "type": {
-              "isCollection": false,
-              "isCollectionOrScalar": false,
-              "name": "IntegerField"
-            }
+            "type": "integer",
+            "fieldKind": "output"
           },
           "height": {
             "id": "e8cb184a-5e1a-47c8-9695-4b8979564f5d",
             "name": "height",
-            "fieldKind": "output",
-            "type": {
-              "isCollection": false,
-              "isCollectionOrScalar": false,
-              "name": "IntegerField"
-            }
+            "type": "integer",
+            "fieldKind": "output"
           }
-        }
+        },
+        "label": "",
+        "isOpen": true,
+        "notes": "",
+        "embedWorkflow": false,
+        "isIntermediate": true,
+        "useCache": true,
+        "version": "1.4.0"
       },
       "width": 320,
-      "height": 703,
+      "height": 646,
       "position": {
-        "x": 1400,
-        "y": 25
+        "x": 1476.5794704734735,
+        "y": 256.80174342731783
       }
     },
     {
@@ -614,185 +445,153 @@
       "data": {
         "id": "58c957f5-0d01-41fc-a803-b2bbf0413d4f",
         "type": "l2i",
-        "label": "",
-        "isOpen": true,
-        "notes": "",
-        "isIntermediate": false,
-        "useCache": true,
-        "version": "1.2.0",
-        "nodePack": "invokeai",
         "inputs": {
           "metadata": {
             "id": "ab375f12-0042-4410-9182-29e30db82c85",
             "name": "metadata",
+            "type": "MetadataField",
             "fieldKind": "input",
-            "label": "",
-            "type": {
-              "isCollection": false,
-              "isCollectionOrScalar": false,
-              "name": "MetadataField"
-            }
+            "label": ""
           },
           "latents": {
             "id": "3a7e7efd-bff5-47d7-9d48-615127afee78",
             "name": "latents",
+            "type": "LatentsField",
             "fieldKind": "input",
-            "label": "",
-            "type": {
-              "isCollection": false,
-              "isCollectionOrScalar": false,
-              "name": "LatentsField"
-            }
+            "label": ""
           },
           "vae": {
             "id": "a1f5f7a1-0795-4d58-b036-7820c0b0ef2b",
             "name": "vae",
+            "type": "VaeField",
             "fieldKind": "input",
-            "label": "",
-            "type": {
-              "isCollection": false,
-              "isCollectionOrScalar": false,
-              "name": "VaeField"
-            }
+            "label": ""
           },
           "tiled": {
             "id": "da52059a-0cee-4668-942f-519aa794d739",
             "name": "tiled",
+            "type": "boolean",
             "fieldKind": "input",
             "label": "",
-            "type": {
-              "isCollection": false,
-              "isCollectionOrScalar": false,
-              "name": "BooleanField"
-            },
             "value": false
           },
           "fp32": {
             "id": "c4841df3-b24e-4140-be3b-ccd454c2522c",
             "name": "fp32",
+            "type": "boolean",
             "fieldKind": "input",
             "label": "",
-            "type": {
-              "isCollection": false,
-              "isCollectionOrScalar": false,
-              "name": "BooleanField"
-            },
-            "value": true
+            "value": false
           }
         },
         "outputs": {
           "image": {
             "id": "72d667d0-cf85-459d-abf2-28bd8b823fe7",
             "name": "image",
-            "fieldKind": "output",
-            "type": {
-              "isCollection": false,
-              "isCollectionOrScalar": false,
-              "name": "ImageField"
-            }
+            "type": "ImageField",
+            "fieldKind": "output"
           },
           "width": {
             "id": "c8c907d8-1066-49d1-b9a6-83bdcd53addc",
             "name": "width",
-            "fieldKind": "output",
-            "type": {
-              "isCollection": false,
-              "isCollectionOrScalar": false,
-              "name": "IntegerField"
-            }
+            "type": "integer",
+            "fieldKind": "output"
           },
           "height": {
             "id": "230f359c-b4ea-436c-b372-332d7dcdca85",
             "name": "height",
-            "fieldKind": "output",
-            "type": {
-              "isCollection": false,
-              "isCollectionOrScalar": false,
-              "name": "IntegerField"
-            }
+            "type": "integer",
+            "fieldKind": "output"
           }
-        }
+        },
+        "label": "",
+        "isOpen": true,
+        "notes": "",
+        "embedWorkflow": false,
+        "isIntermediate": false,
+        "useCache": true,
+        "version": "1.0.0"
       },
       "width": 320,
-      "height": 266,
+      "height": 267,
       "position": {
-        "x": 1800,
-        "y": 25
+        "x": 2037.9648469717395,
+        "y": 426.10844427600136
       }
     }
   ],
   "edges": [
     {
-      "id": "reactflow__edge-ea94bc37-d995-4a83-aa99-4af42479f2f2value-55705012-79b9-4aac-9f26-c0b10309785bseed",
       "source": "ea94bc37-d995-4a83-aa99-4af42479f2f2",
-      "target": "55705012-79b9-4aac-9f26-c0b10309785b",
-      "type": "default",
       "sourceHandle": "value",
-      "targetHandle": "seed"
+      "target": "55705012-79b9-4aac-9f26-c0b10309785b",
+      "targetHandle": "seed",
+      "id": "reactflow__edge-ea94bc37-d995-4a83-aa99-4af42479f2f2value-55705012-79b9-4aac-9f26-c0b10309785bseed",
+      "type": "default"
     },
     {
-      "id": "reactflow__edge-c8d55139-f380-4695-b7f2-8b3d1e1e3db8clip-7d8bf987-284f-413a-b2fd-d825445a5d6cclip",
       "source": "c8d55139-f380-4695-b7f2-8b3d1e1e3db8",
+      "sourceHandle": "clip",
       "target": "7d8bf987-284f-413a-b2fd-d825445a5d6c",
-      "type": "default",
-      "sourceHandle": "clip",
-      "targetHandle": "clip"
+      "targetHandle": "clip",
+      "id": "reactflow__edge-c8d55139-f380-4695-b7f2-8b3d1e1e3db8clip-7d8bf987-284f-413a-b2fd-d825445a5d6cclip",
+      "type": "default"
     },
     {
-      "id": "reactflow__edge-c8d55139-f380-4695-b7f2-8b3d1e1e3db8clip-93dc02a4-d05b-48ed-b99c-c9b616af3402clip",
       "source": "c8d55139-f380-4695-b7f2-8b3d1e1e3db8",
+      "sourceHandle": "clip",
       "target": "93dc02a4-d05b-48ed-b99c-c9b616af3402",
-      "type": "default",
-      "sourceHandle": "clip",
-      "targetHandle": "clip"
+      "targetHandle": "clip",
+      "id": "reactflow__edge-c8d55139-f380-4695-b7f2-8b3d1e1e3db8clip-93dc02a4-d05b-48ed-b99c-c9b616af3402clip",
+      "type": "default"
     },
     {
-      "id": "reactflow__edge-55705012-79b9-4aac-9f26-c0b10309785bnoise-eea2702a-19fb-45b5-9d75-56b4211ec03cnoise",
       "source": "55705012-79b9-4aac-9f26-c0b10309785b",
-      "target": "eea2702a-19fb-45b5-9d75-56b4211ec03c",
-      "type": "default",
       "sourceHandle": "noise",
-      "targetHandle": "noise"
+      "target": "eea2702a-19fb-45b5-9d75-56b4211ec03c",
+      "targetHandle": "noise",
+      "id": "reactflow__edge-55705012-79b9-4aac-9f26-c0b10309785bnoise-eea2702a-19fb-45b5-9d75-56b4211ec03cnoise",
+      "type": "default"
     },
     {
-      "id": "reactflow__edge-7d8bf987-284f-413a-b2fd-d825445a5d6cconditioning-eea2702a-19fb-45b5-9d75-56b4211ec03cpositive_conditioning",
       "source": "7d8bf987-284f-413a-b2fd-d825445a5d6c",
-      "target": "eea2702a-19fb-45b5-9d75-56b4211ec03c",
-      "type": "default",
       "sourceHandle": "conditioning",
-      "targetHandle": "positive_conditioning"
+      "target": "eea2702a-19fb-45b5-9d75-56b4211ec03c",
+      "targetHandle": "positive_conditioning",
+      "id": "reactflow__edge-7d8bf987-284f-413a-b2fd-d825445a5d6cconditioning-eea2702a-19fb-45b5-9d75-56b4211ec03cpositive_conditioning",
+      "type": "default"
     },
     {
-      "id": "reactflow__edge-93dc02a4-d05b-48ed-b99c-c9b616af3402conditioning-eea2702a-19fb-45b5-9d75-56b4211ec03cnegative_conditioning",
       "source": "93dc02a4-d05b-48ed-b99c-c9b616af3402",
-      "target": "eea2702a-19fb-45b5-9d75-56b4211ec03c",
-      "type": "default",
       "sourceHandle": "conditioning",
-      "targetHandle": "negative_conditioning"
-    },
-    {
-      "id": "reactflow__edge-c8d55139-f380-4695-b7f2-8b3d1e1e3db8unet-eea2702a-19fb-45b5-9d75-56b4211ec03cunet",
-      "source": "c8d55139-f380-4695-b7f2-8b3d1e1e3db8",
       "target": "eea2702a-19fb-45b5-9d75-56b4211ec03c",
-      "type": "default",
-      "sourceHandle": "unet",
-      "targetHandle": "unet"
+      "targetHandle": "negative_conditioning",
+      "id": "reactflow__edge-93dc02a4-d05b-48ed-b99c-c9b616af3402conditioning-eea2702a-19fb-45b5-9d75-56b4211ec03cnegative_conditioning",
+      "type": "default"
     },
     {
-      "id": "reactflow__edge-eea2702a-19fb-45b5-9d75-56b4211ec03clatents-58c957f5-0d01-41fc-a803-b2bbf0413d4flatents",
-      "source": "eea2702a-19fb-45b5-9d75-56b4211ec03c",
-      "target": "58c957f5-0d01-41fc-a803-b2bbf0413d4f",
-      "type": "default",
-      "sourceHandle": "latents",
-      "targetHandle": "latents"
-    },
-    {
-      "id": "reactflow__edge-c8d55139-f380-4695-b7f2-8b3d1e1e3db8vae-58c957f5-0d01-41fc-a803-b2bbf0413d4fvae",
       "source": "c8d55139-f380-4695-b7f2-8b3d1e1e3db8",
+      "sourceHandle": "unet",
+      "target": "eea2702a-19fb-45b5-9d75-56b4211ec03c",
+      "targetHandle": "unet",
+      "id": "reactflow__edge-c8d55139-f380-4695-b7f2-8b3d1e1e3db8unet-eea2702a-19fb-45b5-9d75-56b4211ec03cunet",
+      "type": "default"
+    },
+    {
+      "source": "eea2702a-19fb-45b5-9d75-56b4211ec03c",
+      "sourceHandle": "latents",
       "target": "58c957f5-0d01-41fc-a803-b2bbf0413d4f",
-      "type": "default",
+      "targetHandle": "latents",
+      "id": "reactflow__edge-eea2702a-19fb-45b5-9d75-56b4211ec03clatents-58c957f5-0d01-41fc-a803-b2bbf0413d4flatents",
+      "type": "default"
+    },
+    {
+      "source": "c8d55139-f380-4695-b7f2-8b3d1e1e3db8",
       "sourceHandle": "vae",
-      "targetHandle": "vae"
+      "target": "58c957f5-0d01-41fc-a803-b2bbf0413d4f",
+      "targetHandle": "vae",
+      "id": "reactflow__edge-c8d55139-f380-4695-b7f2-8b3d1e1e3db8vae-58c957f5-0d01-41fc-a803-b2bbf0413d4fvae",
+      "type": "default"
     }
   ]
-}
+}

installer/create_installer.sh

@@ -2,12 +2,12 @@
 
 set -e
 
-BCYAN="\e[1;36m"
-BYELLOW="\e[1;33m"
-BGREEN="\e[1;32m"
-BRED="\e[1;31m"
-RED="\e[31m"
-RESET="\e[0m"
+BCYAN="\033[1;36m"
+BYELLOW="\033[1;33m"
+BGREEN="\033[1;32m"
+BRED="\033[1;31m"
+RED="\033[31m"
+RESET="\033[0m"
 
 function is_bin_in_path {
     builtin type -P "$1" &>/dev/null
@@ -19,11 +19,6 @@ function git_show {
 
 cd "$(dirname "$0")"
 
-echo -e "${BYELLOW}This script must be run from the installer directory!${RESET}"
-echo "The current working directory is $(pwd)"
-read -p "If that looks right, press any key to proceed, or CTRL-C to exit..."
-echo
-
 # Some machines only have `python3` in PATH, others have `python` - make an alias.
 # We can use a function to approximate an alias within a non-interactive shell.
 if ! is_bin_in_path python && is_bin_in_path python3; then
@@ -32,7 +27,7 @@ if ! is_bin_in_path python && is_bin_in_path python3; then
     }
 fi
 
-if [[ -v "VIRTUAL_ENV" ]]; then
+if [ -n "${VIRTUAL_ENV+set}" ]; then
     # we can't just call 'deactivate' because this function is not exported
     # to the environment of this script from the bash process that runs the script
     echo -e "${BRED}A virtual environment is activated. Please deactivate it before proceeding.${RESET}"
@@ -43,8 +38,7 @@ VERSION=$(
     cd ..
     python -c "from invokeai.version import __version__ as version; print(version)"
 )
-PATCH=""
-VERSION="v${VERSION}${PATCH}"
+VERSION="v${VERSION}"
 
 echo -e "${BGREEN}HEAD${RESET}:"
 git_show
@@ -59,8 +53,14 @@ echo
 pnpm i --frozen-lockfile
 echo
 echo "Building frontend..."
+if [[ -v CI ]]; then
+    # In CI, we have already done the frontend checks and can just build
+    pnpm vite build
+else
+    # This runs all the frontend checks and builds
+    pnpm build
+fi
 echo
-pnpm build
 popd
 
 # ---------------------- BACKEND ----------------------
@@ -77,7 +77,7 @@ fi
 
 rm -rf ../build
 
-python -m build --wheel --outdir dist/ ../.
+python -m build --outdir dist/ ../.
 
 # ----------------------
 
@@ -97,8 +97,8 @@ done
 mkdir InvokeAI-Installer/lib
 cp lib/*.py InvokeAI-Installer/lib
 
-# Move the wheel
-mv dist/*.whl InvokeAI-Installer/lib/
+# Copy the wheel
+cp dist/*.whl InvokeAI-Installer/lib/
 
 # Install scripts
 # Mac/Linux
@@ -109,10 +109,21 @@ chmod a+x InvokeAI-Installer/install.sh
 perl -p -e "s/^set INVOKEAI_VERSION=.*/set INVOKEAI_VERSION=$VERSION/" install.bat.in >InvokeAI-Installer/install.bat
 cp WinLongPathsEnabled.reg InvokeAI-Installer/
 
-# Zip everything up
-zip -r InvokeAI-installer-$VERSION.zip InvokeAI-Installer
+FILENAME=InvokeAI-installer-$VERSION.zip
 
-# clean up
-rm -rf InvokeAI-Installer tmp dist ../invokeai/frontend/web/dist/
+# Zip everything up
+zip -r $FILENAME InvokeAI-Installer
+
+if [[ ! -v CI ]]; then
+    # clean up, but only if we are not in a github action
+    rm -rf InvokeAI-Installer tmp dist ../invokeai/frontend/web/dist/
+fi
+
+if [[ -v CI ]]; then
+    # Set the output variable for github action
+    echo "INSTALLER_FILENAME=$FILENAME" >>$GITHUB_OUTPUT
+    echo "INSTALLER_PATH=installer/$FILENAME" >>$GITHUB_OUTPUT
+    echo "DIST_PATH=installer/dist/" >>$GITHUB_OUTPUT
+fi
 
 exit 0

installer/lib/installer.py

@@ -244,9 +244,9 @@ class InvokeAiInstance:
                 "numpy~=1.24.0",  # choose versions that won't be uninstalled during phase 2
                 "urllib3~=1.26.0",
                 "requests~=2.28.0",
-                "torch==2.1.2",
+                "torch==2.1.1",
                 "torchmetrics==0.11.4",
-                "torchvision>=0.16.2",
+                "torchvision>=0.16.1",
                 "--force-reinstall",
                 "--find-links" if find_links is not None else None,
                 find_links,

installer/tag_release.sh

@@ -2,12 +2,16 @@
 
 set -e
 
-BCYAN="\e[1;36m"
-BYELLOW="\e[1;33m"
-BGREEN="\e[1;32m"
-BRED="\e[1;31m"
-RED="\e[31m"
-RESET="\e[0m"
+BCYAN="\033[1;36m"
+BYELLOW="\033[1;33m"
+BGREEN="\033[1;32m"
+BRED="\033[1;31m"
+RED="\033[31m"
+RESET="\033[0m"
+
+function is_bin_in_path {
+    builtin type -P "$1" &>/dev/null
+}
 
 function does_tag_exist {
     git rev-parse --quiet --verify "refs/tags/$1" >/dev/null
@@ -21,6 +25,14 @@ function git_show {
     git show -s --format='%h %s' $1
 }
 
+# Some machines only have `python3` in PATH, others have `python` - make an alias.
+# We can use a function to approximate an alias within a non-interactive shell.
+if ! is_bin_in_path python && is_bin_in_path python3; then
+    function python {
+        python3 "$@"
+    }
+fi
+
 VERSION=$(
     cd ..
     python -c "from invokeai.version import __version__ as version; print(version)"
@@ -45,27 +57,31 @@ echo -e "${BGREEN}HEAD${RESET}:"
 git_show
 echo
 
-echo -e -n "Create tags ${BCYAN}${VERSION}${RESET} and ${BCYAN}${LATEST_TAG}${RESET} @ ${BGREEN}HEAD${RESET}, ${RED}deleting existing tags on remote${RESET}? "
+echo -e "${BGREEN}git remote -v${RESET}:"
+git remote -v
+echo
+
+echo -e -n "Create tags ${BCYAN}${VERSION}${RESET} and ${BCYAN}${LATEST_TAG}${RESET} @ ${BGREEN}HEAD${RESET}, ${RED}deleting existing tags on origin remote${RESET}? "
 read -e -p 'y/n [n]: ' input
 RESPONSE=${input:='n'}
 if [ "$RESPONSE" == 'y' ]; then
     echo
-    echo -e "Deleting ${BCYAN}${VERSION}${RESET} tag on remote..."
-    git push --delete origin $VERSION
+    echo -e "Deleting ${BCYAN}${VERSION}${RESET} tag on origin remote..."
+    git push origin :refs/tags/$VERSION
 
-    echo -e "Tagging ${BGREEN}HEAD${RESET} with ${BCYAN}${VERSION}${RESET} locally..."
+    echo -e "Tagging ${BGREEN}HEAD${RESET} with ${BCYAN}${VERSION}${RESET} on locally..."
     if ! git tag -fa $VERSION; then
         echo "Existing/invalid tag"
         exit -1
     fi
 
-    echo -e "Deleting ${BCYAN}${LATEST_TAG}${RESET} tag on remote..."
-    git push --delete origin $LATEST_TAG
+    echo -e "Deleting ${BCYAN}${LATEST_TAG}${RESET} tag on origin remote..."
+    git push origin :refs/tags/$LATEST_TAG
 
     echo -e "Tagging ${BGREEN}HEAD${RESET} with ${BCYAN}${LATEST_TAG}${RESET} locally..."
     git tag -fa $LATEST_TAG
 
-    echo -e "Pushing updated tags to remote..."
+    echo -e "Pushing updated tags to origin remote..."
     git push origin --tags
 fi
 exit 0

invokeai/app/api/routers/utilities.py

@@ -23,11 +23,10 @@ class DynamicPromptsResponse(BaseModel):
 )
 async def parse_dynamicprompts(
     prompt: str = Body(description="The prompt to parse with dynamicprompts"),
-    max_prompts: int = Body(ge=1, le=10000, default=1000, description="The max number of prompts to generate"),
+    max_prompts: int = Body(default=1000, description="The max number of prompts to generate"),
     combinatorial: bool = Body(default=True, description="Whether to use the combinatorial generator"),
 ) -> DynamicPromptsResponse:
     """Creates a batch process"""
-    max_prompts = min(max_prompts, 10000)
     generator: Union[RandomPromptGenerator, CombinatorialPromptGenerator]
     try:
         error: Optional[str] = None

invokeai/app/invocations/controlnet_image_processors.py

@@ -24,10 +24,9 @@ from controlnet_aux import (
 )
 from controlnet_aux.util import HWC3, ade_palette
 from PIL import Image
-from pydantic import BaseModel, ConfigDict, Field, field_validator, model_validator
+from pydantic import BaseModel, ConfigDict, Field, field_validator
 
 from invokeai.app.invocations.primitives import ImageField, ImageOutput
-from invokeai.app.invocations.util import validate_begin_end_step, validate_weights
 from invokeai.app.services.image_records.image_records_common import ImageCategory, ResourceOrigin
 from invokeai.app.shared.fields import FieldDescriptions
 
@@ -76,16 +75,17 @@ class ControlField(BaseModel):
     resize_mode: CONTROLNET_RESIZE_VALUES = Field(default="just_resize", description="The resize mode to use")
 
     @field_validator("control_weight")
-    @classmethod
     def validate_control_weight(cls, v):
-        validate_weights(v)
+        """Validate that all control weights in the valid range"""
+        if isinstance(v, list):
+            for i in v:
+                if i < -1 or i > 2:
+                    raise ValueError("Control weights must be within -1 to 2 range")
+        else:
+            if v < -1 or v > 2:
+                raise ValueError("Control weights must be within -1 to 2 range")
         return v
 
-    @model_validator(mode="after")
-    def validate_begin_end_step_percent(self):
-        validate_begin_end_step(self.begin_step_percent, self.end_step_percent)
-        return self
-
 
 @invocation_output("control_output")
 class ControlOutput(BaseInvocationOutput):
@@ -95,17 +95,17 @@ class ControlOutput(BaseInvocationOutput):
     control: ControlField = OutputField(description=FieldDescriptions.control)
 
 
-@invocation("controlnet", title="ControlNet", tags=["controlnet"], category="controlnet", version="1.1.1")
+@invocation("controlnet", title="ControlNet", tags=["controlnet"], category="controlnet", version="1.1.0")
 class ControlNetInvocation(BaseInvocation):
     """Collects ControlNet info to pass to other nodes"""
 
     image: ImageField = InputField(description="The control image")
     control_model: ControlNetModelField = InputField(description=FieldDescriptions.controlnet_model, input=Input.Direct)
     control_weight: Union[float, List[float]] = InputField(
-        default=1.0, ge=-1, le=2, description="The weight given to the ControlNet"
+        default=1.0, description="The weight given to the ControlNet"
     )
     begin_step_percent: float = InputField(
-        default=0, ge=0, le=1, description="When the ControlNet is first applied (% of total steps)"
+        default=0, ge=-1, le=2, description="When the ControlNet is first applied (% of total steps)"
     )
     end_step_percent: float = InputField(
         default=1, ge=0, le=1, description="When the ControlNet is last applied (% of total steps)"
@@ -113,17 +113,6 @@ class ControlNetInvocation(BaseInvocation):
     control_mode: CONTROLNET_MODE_VALUES = InputField(default="balanced", description="The control mode used")
     resize_mode: CONTROLNET_RESIZE_VALUES = InputField(default="just_resize", description="The resize mode used")
 
-    @field_validator("control_weight")
-    @classmethod
-    def validate_control_weight(cls, v):
-        validate_weights(v)
-        return v
-
-    @model_validator(mode="after")
-    def validate_begin_end_step_percent(self) -> "ControlNetInvocation":
-        validate_begin_end_step(self.begin_step_percent, self.end_step_percent)
-        return self
-
     def invoke(self, context: InvocationContext) -> ControlOutput:
         return ControlOutput(
             control=ControlField(

invokeai/app/invocations/ip_adapter.py

@@ -2,7 +2,7 @@ import os
 from builtins import float
 from typing import List, Union
 
-from pydantic import BaseModel, ConfigDict, Field, field_validator, model_validator
+from pydantic import BaseModel, ConfigDict, Field
 
 from invokeai.app.invocations.baseinvocation import (
     BaseInvocation,
@@ -15,7 +15,6 @@ from invokeai.app.invocations.baseinvocation import (
     invocation_output,
 )
 from invokeai.app.invocations.primitives import ImageField
-from invokeai.app.invocations.util import validate_begin_end_step, validate_weights
 from invokeai.app.shared.fields import FieldDescriptions
 from invokeai.backend.model_management.models.base import BaseModelType, ModelType
 from invokeai.backend.model_management.models.ip_adapter import get_ip_adapter_image_encoder_model_id
@@ -40,6 +39,7 @@ class IPAdapterField(BaseModel):
     ip_adapter_model: IPAdapterModelField = Field(description="The IP-Adapter model to use.")
     image_encoder_model: CLIPVisionModelField = Field(description="The name of the CLIP image encoder model.")
     weight: Union[float, List[float]] = Field(default=1, description="The weight given to the ControlNet")
+    # weight: float = Field(default=1.0, ge=0, description="The weight of the IP-Adapter.")
     begin_step_percent: float = Field(
         default=0, ge=0, le=1, description="When the IP-Adapter is first applied (% of total steps)"
     )
@@ -47,17 +47,6 @@ class IPAdapterField(BaseModel):
         default=1, ge=0, le=1, description="When the IP-Adapter is last applied (% of total steps)"
     )
 
-    @field_validator("weight")
-    @classmethod
-    def validate_ip_adapter_weight(cls, v):
-        validate_weights(v)
-        return v
-
-    @model_validator(mode="after")
-    def validate_begin_end_step_percent(self):
-        validate_begin_end_step(self.begin_step_percent, self.end_step_percent)
-        return self
-
 
 @invocation_output("ip_adapter_output")
 class IPAdapterOutput(BaseInvocationOutput):
@@ -65,7 +54,7 @@ class IPAdapterOutput(BaseInvocationOutput):
     ip_adapter: IPAdapterField = OutputField(description=FieldDescriptions.ip_adapter, title="IP-Adapter")
 
 
-@invocation("ip_adapter", title="IP-Adapter", tags=["ip_adapter", "control"], category="ip_adapter", version="1.1.1")
+@invocation("ip_adapter", title="IP-Adapter", tags=["ip_adapter", "control"], category="ip_adapter", version="1.1.0")
 class IPAdapterInvocation(BaseInvocation):
     """Collects IP-Adapter info to pass to other nodes."""
 
@@ -75,27 +64,18 @@ class IPAdapterInvocation(BaseInvocation):
         description="The IP-Adapter model.", title="IP-Adapter Model", input=Input.Direct, ui_order=-1
     )
 
+    # weight: float = InputField(default=1.0, description="The weight of the IP-Adapter.", ui_type=UIType.Float)
     weight: Union[float, List[float]] = InputField(
-        default=1, description="The weight given to the IP-Adapter", title="Weight"
+        default=1, ge=-1, description="The weight given to the IP-Adapter", title="Weight"
     )
+
     begin_step_percent: float = InputField(
-        default=0, ge=0, le=1, description="When the IP-Adapter is first applied (% of total steps)"
+        default=0, ge=-1, le=2, description="When the IP-Adapter is first applied (% of total steps)"
     )
     end_step_percent: float = InputField(
         default=1, ge=0, le=1, description="When the IP-Adapter is last applied (% of total steps)"
     )
 
-    @field_validator("weight")
-    @classmethod
-    def validate_ip_adapter_weight(cls, v):
-        validate_weights(v)
-        return v
-
-    @model_validator(mode="after")
-    def validate_begin_end_step_percent(self):
-        validate_begin_end_step(self.begin_step_percent, self.end_step_percent)
-        return self
-
     def invoke(self, context: InvocationContext) -> IPAdapterOutput:
         # Lookup the CLIP Vision encoder that is intended to be used with the IP-Adapter model.
         ip_adapter_info = context.services.model_manager.model_info(

invokeai/app/invocations/latent.py

@@ -1,6 +1,5 @@
 # Copyright (c) 2023 Kyle Schouviller (https://github.com/kyle0654)
 
-import contextlib
 from contextlib import ExitStack
 from functools import singledispatchmethod
 from typing import List, Literal, Optional, Union
@@ -221,7 +220,7 @@ def get_scheduler(
     title="Denoise Latents",
     tags=["latents", "denoise", "txt2img", "t2i", "t2l", "img2img", "i2i", "l2l"],
     category="latents",
-    version="1.5.1",
+    version="1.5.0",
 )
 class DenoiseLatentsInvocation(BaseInvocation):
     """Denoises noisy latents to decodable images"""
@@ -280,7 +279,7 @@ class DenoiseLatentsInvocation(BaseInvocation):
         ui_order=7,
     )
     cfg_rescale_multiplier: float = InputField(
-        title="CFG Rescale Multiplier", default=0, ge=0, lt=1, description=FieldDescriptions.cfg_rescale_multiplier
+        default=0, ge=0, lt=1, description=FieldDescriptions.cfg_rescale_multiplier
     )
     latents: Optional[LatentsField] = InputField(
         default=None,
@@ -717,23 +716,10 @@ class DenoiseLatentsInvocation(BaseInvocation):
                 **self.unet.unet.model_dump(),
                 context=context,
             )
-
-            # Prepare seamless context, if configured.
-            seamless_context = contextlib.nullcontext()
-            seamless_config = self.unet.seamless
-            if seamless_config is not None:
-                seamless_context = set_seamless(
-                    model=unet_info.context.model,
-                    axes=seamless_config.axes,
-                    skipped_layers=seamless_config.skipped_layers,
-                    skip_second_resnet=seamless_config.skip_second_resnet,
-                    skip_conv2=seamless_config.skip_conv2,
-                )
-
             with (
                 ExitStack() as exit_stack,
                 ModelPatcher.apply_freeu(unet_info.context.model, self.unet.freeu_config),
-                seamless_context,
+                set_seamless(unet_info.context.model, self.unet.seamless_axes),
                 unet_info as unet,
                 # Apply the LoRA after unet has been moved to its target device for faster patching.
                 ModelPatcher.apply_lora_unet(unet, _lora_loader()),
@@ -840,19 +826,7 @@ class LatentsToImageInvocation(BaseInvocation, WithMetadata):
             context=context,
         )
 
-        # Prepare seamless context, if configured.
-        seamless_context = contextlib.nullcontext()
-        seamless_config = self.vae.seamless
-        if seamless_config is not None:
-            seamless_context = set_seamless(
-                model=vae_info.context.model,
-                axes=seamless_config.axes,
-                skipped_layers=seamless_config.skipped_layers,
-                skip_second_resnet=seamless_config.skip_second_resnet,
-                skip_conv2=seamless_config.skip_conv2,
-            )
-
-        with seamless_context, vae_info as vae:
+        with set_seamless(vae_info.context.model, self.vae.seamless_axes), vae_info as vae:
             latents = latents.to(vae.device)
             if self.fp32:
                 vae.to(dtype=torch.float32)

invokeai/app/invocations/model.py

@@ -19,13 +19,6 @@ from .baseinvocation import (
 )
 
 
-class SeamlessSettings(BaseModel):
-    axes: List[str] = Field(description="Axes('x' and 'y') to which apply seamless")
-    skipped_layers: int = Field(description="How much down layers skip when applying seamless")
-    skip_second_resnet: bool = Field(description="Skip or not second resnet in down blocks when applying seamless")
-    skip_conv2: bool = Field(description="Skip or not conv2 in down blocks when applying seamless")
-
-
 class ModelInfo(BaseModel):
     model_name: str = Field(description="Info to load submodel")
     base_model: BaseModelType = Field(description="Base model")
@@ -43,8 +36,8 @@ class UNetField(BaseModel):
     unet: ModelInfo = Field(description="Info to load unet submodel")
     scheduler: ModelInfo = Field(description="Info to load scheduler submodel")
     loras: List[LoraInfo] = Field(description="Loras to apply on model loading")
+    seamless_axes: List[str] = Field(default_factory=list, description='Axes("x" and "y") to which apply seamless')
     freeu_config: Optional[FreeUConfig] = Field(default=None, description="FreeU configuration")
-    seamless: Optional[SeamlessSettings] = Field(default=None, description="Seamless settings applied to model")
 
 
 class ClipField(BaseModel):
@@ -57,7 +50,7 @@ class ClipField(BaseModel):
 class VaeField(BaseModel):
     # TODO: better naming?
     vae: ModelInfo = Field(description="Info to load vae submodel")
-    seamless: Optional[SeamlessSettings] = Field(default=None, description="Seamless settings applied to model")
+    seamless_axes: List[str] = Field(default_factory=list, description='Axes("x" and "y") to which apply seamless')
 
 
 @invocation_output("unet_output")
@@ -458,11 +451,6 @@ class SeamlessModeInvocation(BaseInvocation):
     )
     seamless_y: bool = InputField(default=True, input=Input.Any, description="Specify whether Y axis is seamless")
     seamless_x: bool = InputField(default=True, input=Input.Any, description="Specify whether X axis is seamless")
-    skipped_layers: int = InputField(default=0, input=Input.Any, description="How much model's down layers to skip")
-    skip_second_resnet: bool = InputField(
-        default=True, input=Input.Any, description="Skip or not second resnet in down layers"
-    )
-    skip_conv2: bool = InputField(default=True, input=Input.Any, description="Skip or not conv2 in down layers")
 
     def invoke(self, context: InvocationContext) -> SeamlessModeOutput:
         # Conditionally append 'x' and 'y' based on seamless_x and seamless_y
@@ -477,19 +465,9 @@ class SeamlessModeInvocation(BaseInvocation):
             seamless_axes_list.append("y")
 
         if unet is not None:
-            unet.seamless = SeamlessSettings(
-                axes=seamless_axes_list,
-                skipped_layers=self.skipped_layers,
-                skip_second_resnet=self.skip_second_resnet,
-                skip_conv2=self.skip_conv2,
-            )
+            unet.seamless_axes = seamless_axes_list
         if vae is not None:
-            vae.seamless = SeamlessSettings(
-                axes=seamless_axes_list,
-                skipped_layers=self.skipped_layers,
-                skip_second_resnet=self.skip_second_resnet,
-                skip_conv2=self.skip_conv2,
-            )
+            vae.seamless_axes = seamless_axes_list
 
         return SeamlessModeOutput(unet=unet, vae=vae)
 

invokeai/app/invocations/t2i_adapter.py

@@ -1,6 +1,6 @@
 from typing import Union
 
-from pydantic import BaseModel, ConfigDict, Field, field_validator, model_validator
+from pydantic import BaseModel, ConfigDict, Field
 
 from invokeai.app.invocations.baseinvocation import (
     BaseInvocation,
@@ -14,7 +14,6 @@ from invokeai.app.invocations.baseinvocation import (
 )
 from invokeai.app.invocations.controlnet_image_processors import CONTROLNET_RESIZE_VALUES
 from invokeai.app.invocations.primitives import ImageField
-from invokeai.app.invocations.util import validate_begin_end_step, validate_weights
 from invokeai.app.shared.fields import FieldDescriptions
 from invokeai.backend.model_management.models.base import BaseModelType
 
@@ -38,17 +37,6 @@ class T2IAdapterField(BaseModel):
     )
     resize_mode: CONTROLNET_RESIZE_VALUES = Field(default="just_resize", description="The resize mode to use")
 
-    @field_validator("weight")
-    @classmethod
-    def validate_ip_adapter_weight(cls, v):
-        validate_weights(v)
-        return v
-
-    @model_validator(mode="after")
-    def validate_begin_end_step_percent(self):
-        validate_begin_end_step(self.begin_step_percent, self.end_step_percent)
-        return self
-
 
 @invocation_output("t2i_adapter_output")
 class T2IAdapterOutput(BaseInvocationOutput):
@@ -56,7 +44,7 @@ class T2IAdapterOutput(BaseInvocationOutput):
 
 
 @invocation(
-    "t2i_adapter", title="T2I-Adapter", tags=["t2i_adapter", "control"], category="t2i_adapter", version="1.0.1"
+    "t2i_adapter", title="T2I-Adapter", tags=["t2i_adapter", "control"], category="t2i_adapter", version="1.0.0"
 )
 class T2IAdapterInvocation(BaseInvocation):
     """Collects T2I-Adapter info to pass to other nodes."""
@@ -73,7 +61,7 @@ class T2IAdapterInvocation(BaseInvocation):
         default=1, ge=0, description="The weight given to the T2I-Adapter", title="Weight"
     )
     begin_step_percent: float = InputField(
-        default=0, ge=0, le=1, description="When the T2I-Adapter is first applied (% of total steps)"
+        default=0, ge=-1, le=2, description="When the T2I-Adapter is first applied (% of total steps)"
     )
     end_step_percent: float = InputField(
         default=1, ge=0, le=1, description="When the T2I-Adapter is last applied (% of total steps)"
@@ -83,17 +71,6 @@ class T2IAdapterInvocation(BaseInvocation):
         description="The resize mode applied to the T2I-Adapter input image so that it matches the target output size.",
     )
 
-    @field_validator("weight")
-    @classmethod
-    def validate_ip_adapter_weight(cls, v):
-        validate_weights(v)
-        return v
-
-    @model_validator(mode="after")
-    def validate_begin_end_step_percent(self):
-        validate_begin_end_step(self.begin_step_percent, self.end_step_percent)
-        return self
-
     def invoke(self, context: InvocationContext) -> T2IAdapterOutput:
         return T2IAdapterOutput(
             t2i_adapter=T2IAdapterField(

invokeai/app/invocations/util.py

@@ -1,14 +0,0 @@
-from typing import Union
-
-
-def validate_weights(weights: Union[float, list[float]]) -> None:
-    """Validate that all control weights in the valid range"""
-    to_validate = weights if isinstance(weights, list) else [weights]
-    if any(i < -1 or i > 2 for i in to_validate):
-        raise ValueError("Control weights must be within -1 to 2 range")
-
-
-def validate_begin_end_step(begin_step_percent: float, end_step_percent: float) -> None:
-    """Validate that begin_step_percent is less than end_step_percent"""
-    if begin_step_percent >= end_step_percent:
-        raise ValueError("Begin step percent must be less than or equal to end step percent")

invokeai/app/services/shared/sqlite_migrator/migrations/migration_2.py

@@ -167,9 +167,6 @@ class Migration2Callback:
             except ImageFileNotFoundException:
                 self._logger.warning(f"Image {image_name} not found, skipping")
                 continue
-            except Exception as e:
-                self._logger.warning(f"Error while checking image {image_name}, skipping: {e}")
-                continue
             if "invokeai_workflow" in pil_image.info:
                 try:
                     UnsafeWorkflowWithVersionValidator.validate_json(pil_image.info.get("invokeai_workflow", ""))

invokeai/app/services/workflow_records/default_workflows/ESRGAN Upscaling with Canny ControlNet.json

@@ -459,7 +459,7 @@
               "name": "ControlNetModelField"
             },
             "value": {
-              "model_name": "canny",
+              "model_name": "sd-controlnet-canny",
               "base_model": "sd-1"
             }
           },

invokeai/app/services/workflow_records/default_workflows/Multi ControlNet (Canny & Depth).json

@@ -136,7 +136,7 @@
               "name": "ControlNetModelField"
             },
             "value": {
-              "model_name": "depth",
+              "model_name": "sd-controlnet-depth",
               "base_model": "sd-1"
             }
           },
@@ -444,7 +444,7 @@
               "name": "ControlNetModelField"
             },
             "value": {
-              "model_name": "canny",
+              "model_name": "sd-controlnet-canny",
               "base_model": "sd-1"
             }
           },

invokeai/backend/model_management/lora.py

@@ -215,9 +215,7 @@ class ModelPatcher:
             text_encoder.resize_token_embeddings(init_tokens_count + new_tokens_added, pad_to_multiple_of)
             model_embeddings = text_encoder.get_input_embeddings()
 
-            for ti_name, ti in ti_list:
-                ti_embedding = _get_ti_embedding(text_encoder.get_input_embeddings(), ti)
-
+            for ti_name, _ in ti_list:
                 ti_tokens = []
                 for i in range(ti_embedding.shape[0]):
                     embedding = ti_embedding[i]

invokeai/backend/model_management/seamless.py

@@ -25,55 +25,71 @@ def _conv_forward_asymmetric(self, input, weight, bias):
 
 
 @contextmanager
-def set_seamless(
-    model: Union[UNet2DConditionModel, AutoencoderKL],
-    axes: List[str],
-    skipped_layers: int,
-    skip_second_resnet: bool,
-    skip_conv2: bool,
-):
+def set_seamless(model: Union[UNet2DConditionModel, AutoencoderKL], seamless_axes: List[str]):
     try:
         to_restore = []
 
         for m_name, m in model.named_modules():
-            if not isinstance(m, (nn.Conv2d, nn.ConvTranspose2d)):
-                continue
-
-            if isinstance(model, UNet2DConditionModel) and m_name.startswith("down_blocks.") and ".resnets." in m_name:
-                # down_blocks.1.resnets.1.conv1
-                _, block_num, _, resnet_num, submodule_name = m_name.split(".")
-                block_num = int(block_num)
-                resnet_num = int(resnet_num)
-
-                # if block_num >= seamless_down_blocks:
-                if block_num >= len(model.down_blocks) - skipped_layers:
+            if isinstance(model, UNet2DConditionModel):
+                if ".attentions." in m_name:
                     continue
 
-                if resnet_num > 0 and skip_second_resnet:
+                if ".resnets." in m_name:
+                    if ".conv2" in m_name:
+                        continue
+                    if ".conv_shortcut" in m_name:
+                        continue
+
+            """
+            if isinstance(model, UNet2DConditionModel):
+                if False and ".upsamplers." in m_name:
                     continue
 
-                if submodule_name == "conv2" and skip_conv2:
+                if False and ".downsamplers." in m_name:
                     continue
 
-            m.asymmetric_padding_mode = {}
-            m.asymmetric_padding = {}
-            m.asymmetric_padding_mode["x"] = "circular" if ("x" in axes) else "constant"
-            m.asymmetric_padding["x"] = (
-                m._reversed_padding_repeated_twice[0],
-                m._reversed_padding_repeated_twice[1],
-                0,
-                0,
-            )
-            m.asymmetric_padding_mode["y"] = "circular" if ("y" in axes) else "constant"
-            m.asymmetric_padding["y"] = (
-                0,
-                0,
-                m._reversed_padding_repeated_twice[2],
-                m._reversed_padding_repeated_twice[3],
-            )
+                if True and ".resnets." in m_name:
+                    if True and ".conv1" in m_name:
+                        if False and "down_blocks" in m_name:
+                            continue
+                        if False and "mid_block" in m_name:
+                            continue
+                        if False and "up_blocks" in m_name:
+                            continue
 
-            to_restore.append((m, m._conv_forward))
-            m._conv_forward = _conv_forward_asymmetric.__get__(m, nn.Conv2d)
+                    if True and ".conv2" in m_name:
+                        continue
+
+                    if True and ".conv_shortcut" in m_name:
+                        continue
+
+                if True and ".attentions." in m_name:
+                    continue
+
+                if False and m_name in ["conv_in", "conv_out"]:
+                    continue
+            """
+
+            if isinstance(m, (nn.Conv2d, nn.ConvTranspose2d)):
+                m.asymmetric_padding_mode = {}
+                m.asymmetric_padding = {}
+                m.asymmetric_padding_mode["x"] = "circular" if ("x" in seamless_axes) else "constant"
+                m.asymmetric_padding["x"] = (
+                    m._reversed_padding_repeated_twice[0],
+                    m._reversed_padding_repeated_twice[1],
+                    0,
+                    0,
+                )
+                m.asymmetric_padding_mode["y"] = "circular" if ("y" in seamless_axes) else "constant"
+                m.asymmetric_padding["y"] = (
+                    0,
+                    0,
+                    m._reversed_padding_repeated_twice[2],
+                    m._reversed_padding_repeated_twice[3],
+                )
+
+                to_restore.append((m, m._conv_forward))
+                m._conv_forward = _conv_forward_asymmetric.__get__(m, nn.Conv2d)
 
         yield
 

invokeai/backend/stable_diffusion/diffusers_pipeline.py

@@ -276,11 +276,7 @@ class StableDiffusionGeneratorPipeline(StableDiffusionPipeline):
             self.disable_attention_slicing()
             return
         elif config.attention_type == "torch-sdp":
-            if hasattr(torch.nn.functional, "scaled_dot_product_attention"):
-                # diffusers enables sdp automatically
-                return
-            else:
-                raise Exception("torch-sdp attention slicing not available")
+            raise Exception("torch-sdp attention slicing not yet implemented")
 
         # the remainder if this code is called when attention_type=='auto'
         if self.unet.device.type == "cuda":
@@ -288,7 +284,7 @@ class StableDiffusionGeneratorPipeline(StableDiffusionPipeline):
                 self.enable_xformers_memory_efficient_attention()
                 return
             elif hasattr(torch.nn.functional, "scaled_dot_product_attention"):
-                # diffusers enables sdp automatically
+                # diffusers enable sdp automatically
                 return
 
         if self.unet.device.type == "cpu" or self.unet.device.type == "mps":

invokeai/backend/util/devices.py

@@ -44,7 +44,7 @@ def torch_dtype(device: torch.device) -> torch.dtype:
     if config.full_precision:
         return torch.float32
     if choose_precision(device) == "float16":
-        return torch.bfloat16 if device.type == "cuda" else torch.float16
+        return torch.float16
     else:
         return torch.float32
 

invokeai/frontend/install/invokeai_update.py

@@ -68,9 +68,12 @@ def welcome(latest_release: str, latest_prerelease: str):
         yield ""
         yield "This script will update InvokeAI to the latest release, or to the development version of your choice."
         yield ""
+        yield "When updating to an arbitrary tag or branch, be aware that the front end may be mismatched to the backend,"
+        yield "making the web frontend unusable. Please downgrade to the latest release if this happens."
+        yield ""
         yield "[bold yellow]Options:"
         yield f"""[1] Update to the latest [bold]official release[/bold] ([italic]{latest_release}[/italic])
-[2] Update to the latest [bold]pre-release[/bold] (may be buggy, database backups are recommended before installation; caveat emptor!) ([italic]{latest_prerelease}[/italic])
+[2] Update to the latest [bold]pre-release[/bold] (may be buggy; caveat emptor!) ([italic]{latest_prerelease}[/italic])
 [3] Manually enter the [bold]version[/bold] you wish to update to"""
 
     console.rule()

invokeai/frontend/web/.eslintignore

@@ -7,4 +7,4 @@ stats.html
 index.html
 .yarn/
 *.scss
-src/services/api/schema.ts
+src/services/api/schema.d.ts

invokeai/frontend/web/.eslintrc.js

@@ -28,16 +28,12 @@ module.exports = {
     'i18next',
     'path',
     'unused-imports',
-    'simple-import-sort',
-    'eslint-plugin-import',
-    // These rules are too strict for normal usage, but are useful for optimizing rerenders
-    // '@arthurgeron/react-usememo',
   ],
   root: true,
   rules: {
     'path/no-relative-imports': ['error', { maxDepth: 0 }],
     curly: 'error',
-    'i18next/no-literal-string': 'warn',
+    'i18next/no-literal-string': 2,
     'react/jsx-no-bind': ['error', { allowBind: true }],
     'react/jsx-curly-brace-presence': [
       'error',
@@ -47,7 +43,6 @@ module.exports = {
     'no-var': 'error',
     'brace-style': 'error',
     'prefer-template': 'error',
-    'import/no-duplicates': 'error',
     radix: 'error',
     'space-before-blocks': 'error',
     'import/prefer-default-export': 'off',
@@ -62,18 +57,6 @@ module.exports = {
         argsIgnorePattern: '^_',
       },
     ],
-    // These rules are too strict for normal usage, but are useful for optimizing rerenders
-    // '@arthurgeron/react-usememo/require-usememo': [
-    //   'warn',
-    //   {
-    //     strict: false,
-    //     checkHookReturnObject: false,
-    //     fix: { addImports: true },
-    //     checkHookCalls: false,
-
-    //   },
-    // ],
-    // '@arthurgeron/react-usememo/require-memo': 'warn',
     '@typescript-eslint/ban-ts-comment': 'warn',
     '@typescript-eslint/no-explicit-any': 'warn',
     '@typescript-eslint/no-empty-interface': [
@@ -82,26 +65,7 @@ module.exports = {
         allowSingleExtends: true,
       },
     ],
-    '@typescript-eslint/consistent-type-imports': [
-      'error',
-      {
-        prefer: 'type-imports',
-        fixStyle: 'separate-type-imports',
-        disallowTypeAnnotations: true,
-      },
-    ],
-    '@typescript-eslint/no-import-type-side-effects': 'error',
-    'simple-import-sort/imports': 'error',
-    'simple-import-sort/exports': 'error',
   },
-  overrides: [
-    {
-      files: ['*.stories.tsx'],
-      rules: {
-        'i18next/no-literal-string': 'off',
-      },
-    },
-  ],
   settings: {
     react: {
       version: 'detect',

invokeai/frontend/web/.prettierignore

@@ -9,8 +9,7 @@ index.html
 .yarn/
 .yalc/
 *.scss
-src/services/api/schema.ts
+src/services/api/schema.d.ts
 static/
 src/theme/css/overlayscrollbars.css
-src/theme_/css/overlayscrollbars.css
 pnpm-lock.yaml

invokeai/frontend/web/.storybook/ReduxInit.tsx

@@ -1,25 +0,0 @@
-import { PropsWithChildren, memo, useEffect } from 'react';
-import { modelChanged } from '../src/features/parameters/store/generationSlice';
-import { useAppDispatch } from '../src/app/store/storeHooks';
-import { useGlobalModifiersInit } from '../src/common/hooks/useGlobalModifiers';
-/**
- * Initializes some state for storybook. Must be in a different component
- * so that it is run inside the redux context.
- */
-export const ReduxInit = memo((props: PropsWithChildren) => {
-  const dispatch = useAppDispatch();
-  useGlobalModifiersInit();
-  useEffect(() => {
-    dispatch(
-      modelChanged({
-        model_name: 'test_model',
-        base_model: 'sd-1',
-        model_type: 'main',
-      })
-    );
-  }, []);
-
-  return props.children;
-});
-
-ReduxInit.displayName = 'ReduxInit';

invokeai/frontend/web/.storybook/main.ts

@@ -6,7 +6,6 @@ const config: StorybookConfig = {
     '@storybook/addon-links',
     '@storybook/addon-essentials',
     '@storybook/addon-interactions',
-    '@storybook/addon-storysource',
   ],
   framework: {
     name: '@storybook/react-vite',

invokeai/frontend/web/.storybook/preview.tsx

@@ -1,17 +1,16 @@
 import { Preview } from '@storybook/react';
 import { themes } from '@storybook/theming';
 import i18n from 'i18next';
+import React from 'react';
 import { initReactI18next } from 'react-i18next';
 import { Provider } from 'react-redux';
+import GlobalHotkeys from '../src/app/components/GlobalHotkeys';
 import ThemeLocaleProvider from '../src/app/components/ThemeLocaleProvider';
-import { $baseUrl } from '../src/app/store/nanostores/baseUrl';
 import { createStore } from '../src/app/store/store';
-import { Container } from '@chakra-ui/react';
 // TODO: Disabled for IDE performance issues with our translation JSON
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 import translationEN from '../public/locales/en.json';
-import { ReduxInit } from './ReduxInit';
 
 i18n.use(initReactI18next).init({
   lng: 'en',
@@ -26,21 +25,17 @@ i18n.use(initReactI18next).init({
 });
 
 const store = createStore(undefined, false);
-$baseUrl.set('http://localhost:9090');
 
 const preview: Preview = {
   decorators: [
-    (Story) => {
-      return (
-        <Provider store={store}>
-          <ThemeLocaleProvider>
-            <ReduxInit>
-              <Story />
-            </ReduxInit>
-          </ThemeLocaleProvider>
-        </Provider>
-      );
-    },
+    (Story) => (
+      <Provider store={store}>
+        <ThemeLocaleProvider>
+          <GlobalHotkeys />
+          <Story />
+        </ThemeLocaleProvider>
+      </Provider>
+    ),
   ],
   parameters: {
     docs: {

invokeai/frontend/web/.unimportedrc.json

@@ -1,15 +0,0 @@
-{
-  "entry": ["src/main.tsx"],
-  "extensions": [".ts", ".tsx"],
-  "ignorePatterns": [
-    "**/node_modules/**",
-    "dist/**",
-    "public/**",
-    "**/*.stories.tsx",
-    "config/**"
-  ],
-  "ignoreUnresolved": [],
-  "ignoreUnimported": ["src/i18.d.ts", "vite.config.ts", "src/vite-env.d.ts"],
-  "respectGitignore": true,
-  "ignoreUnused": []
-}

invokeai/frontend/web/config/common.ts

@@ -1,6 +1,6 @@
 import react from '@vitejs/plugin-react-swc';
 import { visualizer } from 'rollup-plugin-visualizer';
-import type { PluginOption, UserConfig } from 'vite';
+import { PluginOption, UserConfig } from 'vite';
 import eslint from 'vite-plugin-eslint';
 import tsconfigPaths from 'vite-tsconfig-paths';
 

invokeai/frontend/web/config/vite.app.config.ts

@@ -1,6 +1,5 @@
-import type { UserConfig } from 'vite';
-
-import { commonPlugins } from './common.mjs';
+import { UserConfig } from 'vite';
+import { commonPlugins } from './common';
 
 export const appConfig: UserConfig = {
   base: './',

invokeai/frontend/web/config/vite.package.config.ts

@@ -1,9 +1,8 @@
 import path from 'path';
-import type { UserConfig } from 'vite';
-import cssInjectedByJsPlugin from 'vite-plugin-css-injected-by-js';
+import { UserConfig } from 'vite';
 import dts from 'vite-plugin-dts';
-
-import { commonPlugins } from './common.mjs';
+import cssInjectedByJsPlugin from 'vite-plugin-css-injected-by-js';
+import { commonPlugins } from './common';
 
 export const packageConfig: UserConfig = {
   base: './',

invokeai/frontend/web/index.html

@@ -1,27 +1,24 @@
 <!DOCTYPE html>
 <html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate">
+    <meta http-equiv="Pragma" content="no-cache">
+    <meta http-equiv="Expires" content="0">
+    <title>InvokeAI - A Stable Diffusion Toolkit</title>
+    <link rel="shortcut icon" type="icon" href="favicon.ico" />
+    <style>
+      html,
+      body {
+        padding: 0;
+        margin: 0;
+      }
+    </style>
+  </head>
 
-<head>
-  <meta charset="UTF-8" />
-  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate">
-  <meta http-equiv="Pragma" content="no-cache">
-  <meta http-equiv="Expires" content="0">
-  <title>InvokeAI - A Stable Diffusion Toolkit</title>
-  <link rel="mask-icon" href="/invoke-key-ylw-sm.svg" color="#E6FD13" sizes="any" />
-  <link rel="icon" href="/invoke-key-char-on-ylw.svg" />
-  <style>
-    html,
-    body {
-      padding: 0;
-      margin: 0;
-    }
-  </style>
-</head>
-
-<body dir="ltr">
-  <div id="root"></div>
-  <script type="module" src="/src/main.tsx"></script>
-</body>
-
-</html>
+  <body dir="ltr">
+    <div id="root"></div>
+    <script type="module" src="/src/main.tsx"></script>
+  </body>
+</html>

invokeai/frontend/web/package.json

@@ -31,17 +31,13 @@
     "lint": "concurrently -g -n eslint,prettier,tsc,madge -c cyan,green,magenta,yellow \"pnpm run lint:eslint\" \"pnpm run lint:prettier\" \"pnpm run lint:tsc\" \"pnpm run lint:madge\"",
     "fix": "eslint --fix . && prettier --log-level warn --write .",
     "preinstall": "npx only-allow pnpm",
-    "postinstall": "pnpm run theme",
+    "postinstall": "patch-package && pnpm run theme",
     "theme": "chakra-cli tokens src/theme/theme.ts",
     "theme:watch": "chakra-cli tokens src/theme/theme.ts --watch",
     "storybook": "storybook dev -p 6006",
-    "build-storybook": "storybook build",
-    "unimported": "npx unimported"
+    "build-storybook": "storybook build"
   },
   "madge": {
-    "excludeRegExp": [
-      "^index.ts$"
-    ],
     "detectiveOptions": {
       "ts": {
         "skipTypeImports": true
@@ -57,56 +53,56 @@
     "@chakra-ui/layout": "^2.3.1",
     "@chakra-ui/portal": "^2.1.0",
     "@chakra-ui/react": "^2.8.2",
-    "@chakra-ui/react-use-size": "^2.1.0",
     "@chakra-ui/styled-system": "^2.9.2",
     "@chakra-ui/theme-tools": "^2.1.2",
     "@dagrejs/graphlib": "^2.1.13",
     "@dnd-kit/core": "^6.1.0",
     "@dnd-kit/utilities": "^3.2.2",
-    "@emotion/react": "^11.11.3",
+    "@emotion/react": "^11.11.1",
     "@emotion/styled": "^11.11.0",
     "@fontsource-variable/inter": "^5.0.16",
-    "@mantine/form": "6.0.21",
+    "@mantine/core": "^6.0.19",
+    "@mantine/form": "^6.0.19",
+    "@mantine/hooks": "^6.0.19",
     "@nanostores/react": "^0.7.1",
-    "@reduxjs/toolkit": "2.0.1",
+    "@reduxjs/toolkit": "^2.0.1",
     "@roarr/browser-log-writer": "^1.3.0",
-    "chakra-react-select": "^4.7.6",
+    "@storybook/manager-api": "^7.6.4",
+    "@storybook/theming": "^7.6.4",
     "compare-versions": "^6.1.0",
     "dateformat": "^5.0.3",
-    "framer-motion": "^10.16.16",
-    "i18next": "^23.7.13",
+    "framer-motion": "^10.16.15",
+    "i18next": "^23.7.8",
     "i18next-http-backend": "^2.4.2",
     "idb-keyval": "^6.2.1",
-    "konva": "^9.3.0",
+    "konva": "^9.2.3",
     "lodash-es": "^4.17.21",
     "nanostores": "^0.9.5",
     "new-github-issue-url": "^1.0.0",
-    "overlayscrollbars": "^2.4.6",
+    "overlayscrollbars": "^2.4.5",
     "overlayscrollbars-react": "^0.5.3",
+    "patch-package": "^8.0.0",
     "query-string": "^8.1.0",
     "react": "^18.2.0",
     "react-colorful": "^5.6.1",
     "react-dom": "^18.2.0",
     "react-dropzone": "^14.2.3",
-    "react-error-boundary": "^4.0.12",
-    "react-hook-form": "^7.49.2",
+    "react-error-boundary": "^4.0.11",
     "react-hotkeys-hook": "4.4.1",
-    "react-i18next": "^14.0.0",
+    "react-i18next": "^13.5.0",
     "react-icons": "^4.12.0",
     "react-konva": "^18.2.10",
-    "react-redux": "9.0.4",
-    "react-resizable-panels": "^1.0.7",
-    "react-select": "5.8.0",
-    "react-textarea-autosize": "^8.5.3",
+    "react-redux": "^9.0.2",
+    "react-resizable-panels": "^0.0.55",
     "react-use": "^17.4.2",
     "react-virtuoso": "^4.6.2",
     "reactflow": "^11.10.1",
     "redux-dynamic-middlewares": "^2.2.0",
-    "redux-remember": "^5.0.1",
+    "redux-remember": "^5.0.0",
     "roarr": "^7.21.0",
     "serialize-error": "^11.0.3",
     "socket.io-client": "^4.7.2",
-    "type-fest": "^4.9.0",
+    "type-fest": "^4.8.3",
     "use-debounce": "^10.0.0",
     "use-image": "^1.1.1",
     "uuid": "^9.0.1",
@@ -121,56 +117,44 @@
     "ts-toolbelt": "^9.6.0"
   },
   "devDependencies": {
-    "@arthurgeron/eslint-plugin-react-usememo": "^2.2.2",
     "@chakra-ui/cli": "^2.4.1",
-    "@storybook/addon-docs": "^7.6.6",
-    "@storybook/addon-essentials": "^7.6.6",
-    "@storybook/addon-interactions": "^7.6.6",
-    "@storybook/addon-links": "^7.6.6",
-    "@storybook/addon-storysource": "^7.6.6",
-    "@storybook/blocks": "^7.6.6",
-    "@storybook/manager-api": "^7.6.6",
-    "@storybook/react": "^7.6.6",
-    "@storybook/react-vite": "^7.6.6",
-    "@storybook/test": "^7.6.6",
-    "@storybook/theming": "^7.6.6",
+    "@storybook/addon-essentials": "^7.6.4",
+    "@storybook/addon-interactions": "^7.6.4",
+    "@storybook/addon-links": "^7.6.4",
+    "@storybook/blocks": "^7.6.4",
+    "@storybook/react": "^7.6.4",
+    "@storybook/react-vite": "^7.6.4",
+    "@storybook/test": "^7.6.4",
     "@types/dateformat": "^5.0.2",
     "@types/lodash-es": "^4.17.12",
-    "@types/node": "^20.10.6",
-    "@types/react": "^18.2.46",
-    "@types/react-dom": "^18.2.18",
+    "@types/node": "^20.9.0",
+    "@types/react": "^18.2.37",
+    "@types/react-dom": "^18.2.17",
     "@types/uuid": "^9.0.7",
-    "@typescript-eslint/eslint-plugin": "^6.16.0",
-    "@typescript-eslint/parser": "^6.16.0",
+    "@typescript-eslint/eslint-plugin": "^6.13.2",
+    "@typescript-eslint/parser": "^6.13.2",
     "@vitejs/plugin-react-swc": "^3.5.0",
     "concurrently": "^8.2.2",
-    "eslint": "^8.56.0",
+    "eslint": "^8.55.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-i18next": "^6.0.3",
-    "eslint-plugin-import": "^2.29.1",
-    "eslint-plugin-path": "^1.2.3",
+    "eslint-plugin-path": "^1.2.2",
     "eslint-plugin-react": "^7.33.2",
     "eslint-plugin-react-hooks": "^4.6.0",
-    "eslint-plugin-simple-import-sort": "^10.0.0",
     "eslint-plugin-storybook": "^0.6.15",
     "eslint-plugin-unused-imports": "^3.0.0",
     "madge": "^6.1.0",
     "openapi-types": "^12.1.3",
-    "openapi-typescript": "^6.7.3",
-    "prettier": "^3.1.1",
-    "rollup-plugin-visualizer": "^5.12.0",
-    "storybook": "^7.6.6",
+    "openapi-typescript": "^6.7.2",
+    "prettier": "^3.1.0",
+    "rollup-plugin-visualizer": "^5.10.0",
+    "storybook": "^7.6.4",
     "ts-toolbelt": "^9.6.0",
     "typescript": "^5.3.3",
-    "vite": "^5.0.10",
-    "vite-plugin-css-injected-by-js": "^3.3.1",
-    "vite-plugin-dts": "^3.7.0",
+    "vite": "^4.5.1",
+    "vite-plugin-css-injected-by-js": "^3.3.0",
+    "vite-plugin-dts": "^3.6.4",
     "vite-plugin-eslint": "^1.8.1",
-    "vite-tsconfig-paths": "^4.2.3"
-  },
-  "pnpm": {
-    "patchedDependencies": {
-      "reselect@5.0.1": "patches/reselect@5.0.1.patch"
-    }
+    "vite-tsconfig-paths": "^4.2.2"
   }
 }

invokeai/frontend/web/public/invoke-key-char-on-ylw.svg

@@ -1,4 +0,0 @@
-<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="32" height="32" rx="6" fill="#E6FD13"/>
-<path d="M19.2378 10.9H25V7H7V10.9H12.7622L19.2378 21.1H25V25H7V21.1H12.7622" stroke="#181818" stroke-width="1.5"/>
-</svg>

invokeai/frontend/web/public/locales/ar.json

@@ -83,6 +83,10 @@
             "title": "خيارات التثبيت",
             "desc": "ثبت لوحة الخيارات"
         },
+        "toggleViewer": {
+            "title": "تبديل العارض",
+            "desc": "فتح وإغلاق مشاهد الصور"
+        },
         "toggleGallery": {
             "title": "تبديل المعرض",
             "desc": "فتح وإغلاق درابزين المعرض"
@@ -143,6 +147,10 @@
             "title": "الصورة التالية",
             "desc": "عرض الصورة التالية في الصالة"
         },
+        "toggleGalleryPin": {
+            "title": "تبديل تثبيت الصالة",
+            "desc": "يثبت ويفتح تثبيت الصالة على الواجهة الرسومية"
+        },
         "increaseGalleryThumbSize": {
             "title": "زيادة حجم صورة الصالة",
             "desc": "يزيد حجم الصور المصغرة في الصالة"

invokeai/frontend/web/public/locales/de.json

@@ -168,6 +168,10 @@
             "title": "Optionen anheften",
             "desc": "Anheften des Optionsfeldes"
         },
+        "toggleViewer": {
+            "title": "Bildbetrachter umschalten",
+            "desc": "Bildbetrachter öffnen und schließen"
+        },
         "toggleGallery": {
             "title": "Galerie umschalten",
             "desc": "Öffnen und Schließen des Galerie-Schubfachs"
@@ -228,6 +232,10 @@
             "title": "Nächstes Bild",
             "desc": "Nächstes Bild in Galerie anzeigen"
         },
+        "toggleGalleryPin": {
+            "title": "Galerie anheften umschalten",
+            "desc": "Heftet die Galerie an die Benutzeroberfläche bzw. löst die sie"
+        },
         "increaseGalleryThumbSize": {
             "title": "Größe der Galeriebilder erhöhen",
             "desc": "Vergrößert die Galerie-Miniaturansichten"
@@ -752,6 +760,7 @@
         "w": "W",
         "addControlNet": "$t(common.controlNet) hinzufügen",
         "none": "Kein",
+        "incompatibleBaseModel": "Inkompatibles Basismodell:",
         "enableControlnet": "Aktiviere ControlNet",
         "detectResolution": "Auflösung erkennen",
         "controlNetT2IMutexDesc": "$t(common.controlNet) und $t(common.t2iAdapter) zur gleichen Zeit wird nicht unterstützt.",

invokeai/frontend/web/public/locales/en.json

@@ -50,33 +50,9 @@
         "uncategorized": "Uncategorized",
         "downloadBoard": "Download Board"
     },
-    "accordions": {
-        "generation": {
-            "title": "Generation",
-            "modelTab": "Model",
-            "conceptsTab": "Concepts"
-        },
-        "image": {
-            "title": "Image"
-        },
-        "advanced": {
-            "title": "Advanced"
-        },
-        "control": {
-            "title": "Control",
-            "controlAdaptersTab": "Control Adapters",
-            "ipTab": "Image Prompts"
-        },
-        "compositing": {
-            "title": "Compositing",
-            "coherenceTab": "Coherence Pass",
-            "infillTab": "Infill"
-        }
-    },
     "common": {
         "accept": "Accept",
         "advanced": "Advanced",
-        "advancedOptions": "Advanced Options",
         "ai": "ai",
         "areYouSure": "Are you sure?",
         "auto": "Auto",
@@ -86,7 +62,6 @@
         "copyError": "$t(gallery.copy) Error",
         "close": "Close",
         "on": "On",
-        "or": "or",
         "checkpoint": "Checkpoint",
         "communityLabel": "Community",
         "controlNet": "ControlNet",
@@ -104,7 +79,6 @@
         "file": "File",
         "folder": "Folder",
         "format": "format",
-        "free": "Free",
         "generate": "Generate",
         "githubLabel": "Github",
         "hotkeysLabel": "Hotkeys",
@@ -157,7 +131,6 @@
         "save": "Save",
         "saveAs": "Save As",
         "settingsLabel": "Settings",
-        "preferencesLabel": "Preferences",
         "simple": "Simple",
         "somethingWentWrong": "Something went wrong",
         "statusConnected": "Connected",
@@ -248,6 +221,7 @@
         "colorMapTileSize": "Tile Size",
         "importImageFromCanvas": "Import Image From Canvas",
         "importMaskFromCanvas": "Import Mask From Canvas",
+        "incompatibleBaseModel": "Incompatible base model:",
         "lineart": "Lineart",
         "lineartAnime": "Lineart Anime",
         "lineartAnimeDescription": "Anime-style lineart processing",
@@ -272,7 +246,6 @@
         "prompt": "Prompt",
         "resetControlImage": "Reset Control Image",
         "resize": "Resize",
-        "resizeSimple": "Resize (Simple)",
         "resizeMode": "Resize Mode",
         "safe": "Safe",
         "saveControlImage": "Save Control Image",
@@ -311,7 +284,7 @@
         "queue": "Queue",
         "queueFront": "Add to Front of Queue",
         "queueBack": "Add to Queue",
-        "queueCountPrediction": "{{promptsCount}} prompts × {{iterations}} iterations -> {{count}} generations",
+        "queueCountPrediction": "Add {{predicted}} to Queue",
         "queueMaxExceeded": "Max of {{max_queue_size}} exceeded, would skip {{skip}}",
         "queuedCount": "{{pending}} Pending",
         "queueTotal": "{{total}} Total",
@@ -367,8 +340,7 @@
         "back": "back",
         "batchFailedToQueue": "Failed to Queue Batch",
         "graphQueued": "Graph queued",
-        "graphFailedToQueue": "Failed to queue graph",
-        "openQueue": "Open Queue"
+        "graphFailedToQueue": "Failed to queue graph"
     },
     "invocationCache": {
         "invocationCache": "Invocation Cache",
@@ -428,9 +400,6 @@
         "problemDeletingImagesDesc": "One or more images could not be deleted"
     },
     "hotkeys": {
-        "searchHotkeys": "Search Hotkeys",
-        "clearSearch": "Clear Search",
-        "noHotkeysFound": "No Hotkeys Found",
         "acceptStagingImage": {
             "desc": "Accept Current Staging Area Image",
             "title": "Accept Staging Image"
@@ -439,15 +408,11 @@
             "desc": "Opens the add node menu",
             "title": "Add Nodes"
         },
-        "appHotkeys": "App",
+        "appHotkeys": "App Hotkeys",
         "cancel": {
-            "desc": "Cancel current queue item",
+            "desc": "Cancel image generation",
             "title": "Cancel"
         },
-        "cancelAndClear": {
-            "desc": "Cancel current queue item and clear all pending items",
-            "title": "Cancel and Clear"
-        },
         "changeTabs": {
             "desc": "Switch to another workspace",
             "title": "Change Tabs"
@@ -504,8 +469,8 @@
             "desc": "Focus the prompt input area",
             "title": "Focus Prompt"
         },
-        "galleryHotkeys": "Gallery",
-        "generalHotkeys": "General",
+        "galleryHotkeys": "Gallery Hotkeys",
+        "generalHotkeys": "General Hotkeys",
         "hideMask": {
             "desc": "Hide and unhide mask",
             "title": "Hide Mask"
@@ -526,7 +491,7 @@
             "desc": "Generate an image",
             "title": "Invoke"
         },
-        "keyboardShortcuts": "Hotkeys",
+        "keyboardShortcuts": "Keyboard Shortcuts",
         "maximizeWorkSpace": {
             "desc": "Close panels and maximize work area",
             "title": "Maximize Workspace"
@@ -547,7 +512,7 @@
             "desc": "Next Staging Area Image",
             "title": "Next Staging Image"
         },
-        "nodesHotkeys": "Nodes",
+        "nodesHotkeys": "Nodes Hotkeys",
         "pinOptions": {
             "desc": "Pin the options panel",
             "title": "Pin Options"
@@ -616,31 +581,31 @@
             "desc": "Open and close the gallery drawer",
             "title": "Toggle Gallery"
         },
-        "toggleOptions": {
-            "desc": "Open and close the options panel",
-            "title": "Toggle Options"
-        },
-        "toggleOptionsAndGallery": {
-            "desc": "Open and close the options and gallery panels",
-            "title": "Toggle Options and Gallery"
-        },
-        "resetOptionsAndGallery": {
-            "desc": "Resets the options and gallery panels",
-            "title": "Reset Options and Gallery"
+        "toggleGalleryPin": {
+            "desc": "Pins and unpins the gallery to the UI",
+            "title": "Toggle Gallery Pin"
         },
         "toggleLayer": {
             "desc": "Toggles mask/base layer selection",
             "title": "Toggle Layer"
         },
+        "toggleOptions": {
+            "desc": "Open and close the options panel",
+            "title": "Toggle Options"
+        },
         "toggleSnap": {
             "desc": "Toggles Snap to Grid",
             "title": "Toggle Snap"
         },
+        "toggleViewer": {
+            "desc": "Open and close Image Viewer",
+            "title": "Toggle Viewer"
+        },
         "undoStroke": {
             "desc": "Undo a brush stroke",
             "title": "Undo Stroke"
         },
-        "unifiedCanvasHotkeys": "Unified Canvas",
+        "unifiedCanvasHotkeys": "Unified Canvas Hotkeys",
         "upscale": {
             "desc": "Upscale the current image",
             "title": "Upscale"
@@ -823,23 +788,17 @@
     },
     "models": {
         "addLora": "Add LoRA",
-        "allLoRAsAdded": "All LoRAs added",
-        "loraAlreadyAdded": "LoRA already added",
         "esrganModel": "ESRGAN Model",
         "loading": "loading",
-        "incompatibleBaseModel": "Incompatible base model",
-        "noMainModelSelected": "No main model selected",
         "noLoRAsAvailable": "No LoRAs available",
         "noLoRAsLoaded": "No LoRAs Loaded",
         "noMatchingLoRAs": "No matching LoRAs",
         "noMatchingModels": "No matching Models",
         "noModelsAvailable": "No models available",
-        "lora": "LoRA",
         "selectLoRA": "Select a LoRA",
         "selectModel": "Select a Model",
         "noLoRAsInstalled": "No LoRAs installed",
-        "noRefinerModelsInstalled": "No SDXL Refiner models installed",
-        "defaultVAE": "Default VAE"
+        "noRefinerModelsInstalled": "No SDXL Refiner models installed"
     },
     "nodes": {
         "addNode": "Add Node",
@@ -1078,14 +1037,8 @@
         "prototypeDesc": "This invocation is a prototype. It may have breaking changes during app updates and may be removed at any time."
     },
     "parameters": {
-        "aspect": "Aspect",
         "aspectRatio": "Aspect Ratio",
         "aspectRatioFree": "Free",
-        "lockAspectRatio": "Lock Aspect Ratio",
-        "swapDimensions": "Swap Dimensions",
-        "setToOptimalSize": "Optimize size for model",
-        "setToOptimalSizeTooSmall": "$t(parameters.setToOptimalSize) (may be too small)",
-        "setToOptimalSizeTooLarge": "$t(parameters.setToOptimalSize) (may be too large)",
         "boundingBoxHeader": "Bounding Box",
         "boundingBoxHeight": "Bounding Box Height",
         "boundingBoxWidth": "Bounding Box Width",
@@ -1124,7 +1077,6 @@
         "imageFit": "Fit Initial Image To Output Size",
         "images": "Images",
         "imageToImage": "Image to Image",
-        "imageSize": "Image Size",
         "img2imgStrength": "Image To Image Strength",
         "infillMethod": "Infill Method",
         "infillScalingHeader": "Infill and Scaling",
@@ -1139,7 +1091,7 @@
             "noControlImageForControlAdapter": "Control Adapter #{{number}} has no control image",
             "noInitialImageSelected": "No initial image selected",
             "noModelForControlAdapter": "Control Adapter #{{number}} has no model selected.",
-            "incompatibleBaseModelForControlAdapter": "Control Adapter #{{number}} model is incompatible with main model.",
+            "incompatibleBaseModelForControlAdapter": "Control Adapter #{{number}} model is invalid with main model.",
             "noModelSelected": "No model selected",
             "noPrompts": "No prompts generated",
             "noNodesInGraph": "No nodes in graph",
@@ -1175,8 +1127,8 @@
         "seamCorrectionHeader": "Seam Correction",
         "seamHighThreshold": "High",
         "seamlessTiling": "Seamless Tiling",
-        "seamlessXAxis": "Seamless Tiling X Axis",
-        "seamlessYAxis": "Seamless Tiling Y Axis",
+        "seamlessXAxis": "X Axis",
+        "seamlessYAxis": "Y Axis",
         "seamlessX": "Seamless X",
         "seamlessY": "Seamless Y",
         "seamlessX&Y": "Seamless X & Y",
@@ -1219,7 +1171,6 @@
     },
     "dynamicPrompts": {
         "combinatorial": "Combinatorial Generation",
-        "showDynamicPrompts": "Show Dynamic Prompts",
         "dynamicPrompts": "Dynamic Prompts",
         "enableDynamicPrompts": "Enable Dynamic Prompts",
         "maxPrompts": "Max Prompts",
@@ -1232,13 +1183,11 @@
             "perIterationDesc": "Use a different seed for each iteration",
             "perPromptLabel": "Seed per Image",
             "perPromptDesc": "Use a different seed for each image"
-        },
-        "loading": "Generating Dynamic Prompts..."
+        }
     },
     "sdxl": {
         "cfgScale": "CFG Scale",
-        "concatPromptStyle": "Linking Prompt & Style",
-        "freePromptStyle": "Manual Style Prompting",
+        "concatPromptStyle": "Concatenate Prompt & Style",
         "denoisingStrength": "Denoising Strength",
         "loading": "Loading...",
         "negAestheticScore": "Negative Aesthetic Score",

invokeai/frontend/web/public/locales/es.json

@@ -127,6 +127,10 @@
             "title": "Fijar opciones",
             "desc": "Fijar el panel de opciones"
         },
+        "toggleViewer": {
+            "title": "Alternar visor",
+            "desc": "Mostar y ocultar el visor de imágenes"
+        },
         "toggleGallery": {
             "title": "Alternar galería",
             "desc": "Mostar y ocultar la galería de imágenes"
@@ -187,6 +191,10 @@
             "title": "Imagen siguiente",
             "desc": "Muetra la imagen siguiente en la galería"
         },
+        "toggleGalleryPin": {
+            "title": "Alternar fijado de galería",
+            "desc": "Fijar o desfijar la galería en la interfaz"
+        },
         "increaseGalleryThumbSize": {
             "title": "Aumentar imagen en galería",
             "desc": "Aumenta el tamaño de las miniaturas de la galería"

invokeai/frontend/web/public/locales/fr.json

@@ -96,6 +96,10 @@
             "title": "Epinglage des options",
             "desc": "Epingler le panneau d'options"
         },
+        "toggleViewer": {
+            "title": "Affichage de la visionneuse",
+            "desc": "Afficher et masquer la visionneuse d'image"
+        },
         "toggleGallery": {
             "title": "Affichage de la galerie",
             "desc": "Afficher et masquer la galerie"
@@ -156,6 +160,10 @@
             "title": "Image suivante",
             "desc": "Afficher l'image suivante dans la galerie"
         },
+        "toggleGalleryPin": {
+            "title": "Activer/désactiver l'épinglage de la galerie",
+            "desc": "Épingle ou dépingle la galerie à l'interface"
+        },
         "increaseGalleryThumbSize": {
             "title": "Augmenter la taille des miniatures de la galerie",
             "desc": "Augmente la taille des miniatures de la galerie"

invokeai/frontend/web/public/locales/he.json

@@ -192,6 +192,10 @@
             "title": "הצמד הגדרות",
             "desc": "הצמד את פאנל ההגדרות"
         },
+        "toggleViewer": {
+            "title": "הצג את חלון ההצגה",
+            "desc": "פתח וסגור את מציג התמונות"
+        },
         "changeTabs": {
             "title": "החלף לשוניות",
             "desc": "החלף לאיזור עבודה אחר"
@@ -232,6 +236,10 @@
             "title": "תמונה קודמת",
             "desc": "הצג את התמונה הקודמת בגלריה"
         },
+        "toggleGalleryPin": {
+            "title": "הצג את מצמיד הגלריה",
+            "desc": "הצמדה וביטול הצמדה של הגלריה לממשק המשתמש"
+        },
         "decreaseGalleryThumbSize": {
             "title": "הקטנת גודל תמונת גלריה",
             "desc": "מקטין את גודל התמונות הממוזערות של הגלריה"

invokeai/frontend/web/public/locales/it.json

@@ -113,10 +113,7 @@
         "orderBy": "Ordinato per",
         "nextPage": "Pagina successiva",
         "saveAs": "Salva come",
-        "unsaved": "Non salvato",
-        "direction": "Direzione",
-        "advancedOptions": "Opzioni avanzate",
-        "free": "Libero"
+        "unsaved": "Non salvato"
     },
     "gallery": {
         "generations": "Generazioni",
@@ -134,7 +131,7 @@
         "noImagesInGallery": "Nessuna immagine da visualizzare",
         "deleteImage": "Elimina l'immagine",
         "deleteImagePermanent": "Le immagini eliminate non possono essere ripristinate.",
-        "deleteImageBin": "Le immagini eliminate verranno spostate nel cestino del tuo sistema operativo.",
+        "deleteImageBin": "Le immagini eliminate verranno spostate nel Cestino del tuo sistema operativo.",
         "assets": "Risorse",
         "autoAssignBoardOnClick": "Assegna automaticamente la bacheca al clic",
         "featuresWillReset": "Se elimini questa immagine, quelle funzionalità verranno immediatamente ripristinate.",
@@ -159,18 +156,18 @@
         "problemDeletingImages": "Problema durante l'eliminazione delle immagini"
     },
     "hotkeys": {
-        "keyboardShortcuts": "Tasti di scelta rapida",
-        "appHotkeys": "Applicazione",
-        "generalHotkeys": "Generale",
-        "galleryHotkeys": "Galleria",
-        "unifiedCanvasHotkeys": "Tela Unificata",
+        "keyboardShortcuts": "Tasti rapidi",
+        "appHotkeys": "Tasti di scelta rapida dell'applicazione",
+        "generalHotkeys": "Tasti di scelta rapida generali",
+        "galleryHotkeys": "Tasti di scelta rapida della galleria",
+        "unifiedCanvasHotkeys": "Tasti di scelta rapida Tela Unificata",
         "invoke": {
             "title": "Invoke",
             "desc": "Genera un'immagine"
         },
         "cancel": {
             "title": "Annulla",
-            "desc": "Annulla l'elemento della coda corrente"
+            "desc": "Annulla la generazione dell'immagine"
         },
         "focusPrompt": {
             "title": "Metti a fuoco il Prompt",
@@ -184,8 +181,12 @@
             "title": "Appunta le opzioni",
             "desc": "Blocca il pannello delle opzioni"
         },
+        "toggleViewer": {
+            "title": "Attiva/disattiva visualizzatore",
+            "desc": "Apre e chiude il visualizzatore immagini"
+        },
         "toggleGallery": {
-            "title": "Attiva/disattiva galleria",
+            "title": "Attiva/disattiva Galleria",
             "desc": "Apre e chiude il pannello della galleria"
         },
         "maximizeWorkSpace": {
@@ -244,6 +245,10 @@
             "title": "Immagine successiva",
             "desc": "Visualizza l'immagine successiva nella galleria"
         },
+        "toggleGalleryPin": {
+            "title": "Attiva/disattiva il blocco della galleria",
+            "desc": "Blocca/sblocca la galleria dall'interfaccia utente"
+        },
         "increaseGalleryThumbSize": {
             "title": "Aumenta dimensione immagini nella galleria",
             "desc": "Aumenta la dimensione delle miniature della galleria"
@@ -356,26 +361,11 @@
             "title": "Accetta l'immagine della sessione",
             "desc": "Accetta l'immagine dell'area della sessione corrente"
         },
-        "nodesHotkeys": "Nodi",
+        "nodesHotkeys": "Tasti di scelta rapida dei Nodi",
         "addNodes": {
             "title": "Aggiungi Nodi",
             "desc": "Apre il menu Aggiungi Nodi"
-        },
-        "cancelAndClear": {
-            "desc": "Annulla l'elemento della coda corrente e cancella tutti gli elementi in sospeso",
-            "title": "Annulla e cancella"
-        },
-        "resetOptionsAndGallery": {
-            "title": "Ripristina Opzioni e Galleria",
-            "desc": "Reimposta le opzioni e i pannelli della galleria"
-        },
-        "searchHotkeys": "Cerca tasti di scelta rapida",
-        "noHotkeysFound": "Nessun tasto di scelta rapida trovato",
-        "toggleOptionsAndGallery": {
-            "desc": "Apre e chiude le opzioni e i pannelli della galleria",
-            "title": "Attiva/disattiva le Opzioni e la Galleria"
-        },
-        "clearSearch": "Cancella ricerca"
+        }
     },
     "modelManager": {
         "modelManager": "Gestione Modelli",
@@ -590,8 +580,8 @@
         "hidePreview": "Nascondi l'anteprima",
         "showPreview": "Mostra l'anteprima",
         "noiseSettings": "Rumore",
-        "seamlessXAxis": "Piastrella senza cucitura Asse X",
-        "seamlessYAxis": "Piastrella senza cucitura Asse Y",
+        "seamlessXAxis": "Asse X",
+        "seamlessYAxis": "Asse Y",
         "scheduler": "Campionatore",
         "boundingBoxWidth": "Larghezza riquadro di delimitazione",
         "boundingBoxHeight": "Altezza riquadro di delimitazione",
@@ -651,14 +641,7 @@
         "unmasked": "No maschera",
         "cfgRescaleMultiplier": "Moltiplicatore riscala CFG",
         "cfgRescale": "Riscala CFG",
-        "useSize": "Usa Dimensioni",
-        "setToOptimalSize": "Ottimizza le dimensioni per il modello",
-        "setToOptimalSizeTooSmall": "$t(parameters.setToOptimalSize) (potrebbe essere troppo piccolo)",
-        "imageSize": "Dimensione dell'immagine",
-        "lockAspectRatio": "Blocca proporzioni",
-        "swapDimensions": "Scambia dimensioni",
-        "aspect": "Aspetto",
-        "setToOptimalSizeTooLarge": "$t(parameters.setToOptimalSize) (potrebbe essere troppo grande)"
+        "useSize": "Usa Dimensioni"
     },
     "settings": {
         "models": "Modelli",
@@ -1129,8 +1112,7 @@
         "betaDesc": "Questa invocazione è in versione beta. Fino a quando non sarà stabile, potrebbe subire modifiche importanti durante gli aggiornamenti dell'app. Abbiamo intenzione di supportare questa invocazione a lungo termine.",
         "newWorkflow": "Nuovo flusso di lavoro",
         "newWorkflowDesc": "Creare un nuovo flusso di lavoro?",
-        "newWorkflowDesc2": "Il flusso di lavoro attuale presenta modifiche non salvate.",
-        "unsupportedAnyOfLength": "unione di troppi elementi ({{count}})"
+        "newWorkflowDesc2": "Il flusso di lavoro attuale presenta modifiche non salvate."
     },
     "boards": {
         "autoAddBoard": "Aggiungi automaticamente bacheca",
@@ -1194,6 +1176,7 @@
         "w": "W",
         "processor": "Processore",
         "none": "Nessuno",
+        "incompatibleBaseModel": "Modello base incompatibile:",
         "pidiDescription": "Elaborazione immagini PIDI",
         "fill": "Riempie",
         "colorMapDescription": "Genera una mappa dei colori dall'immagine",
@@ -1229,13 +1212,12 @@
         "minConfidence": "Confidenza minima",
         "scribble": "Scribble",
         "amult": "Angolo di illuminazione",
-        "coarse": "Approssimativo",
-        "resizeSimple": "Ridimensiona (semplice)"
+        "coarse": "Approssimativo"
     },
     "queue": {
         "queueFront": "Aggiungi all'inizio della coda",
         "queueBack": "Aggiungi alla coda",
-        "queueCountPrediction": "{{promptsCount}} prompt × {{iterations}} iterazioni -> {{count}} generazioni",
+        "queueCountPrediction": "Aggiungi {{predicted}} alla coda",
         "queue": "Coda",
         "status": "Stato",
         "pruneSucceeded": "Rimossi {{item_count}} elementi completati dalla coda",
@@ -1293,8 +1275,7 @@
         "graphFailedToQueue": "Impossibile mettere in coda il grafico",
         "queueMaxExceeded": "È stato superato il limite massimo di {{max_queue_size}} e {{skip}} elementi verrebbero saltati",
         "batchFieldValues": "Valori Campi Lotto",
-        "time": "Tempo",
-        "openQueue": "Apri coda"
+        "time": "Tempo"
     },
     "embedding": {
         "noMatchingEmbedding": "Nessun Incorporamento corrispondente",
@@ -1314,12 +1295,7 @@
         "noLoRAsInstalled": "Nessun LoRA installato",
         "esrganModel": "Modello ESRGAN",
         "addLora": "Aggiungi LoRA",
-        "noLoRAsLoaded": "Nessun LoRA caricato",
-        "noMainModelSelected": "Nessun modello principale selezionato",
-        "allLoRAsAdded": "Tutti i LoRA aggiunti",
-        "defaultVAE": "VAE predefinito",
-        "incompatibleBaseModel": "Modello base incompatibile",
-        "loraAlreadyAdded": "LoRA già aggiunto"
+        "noLoRAsLoaded": "Nessuna LoRA caricata"
     },
     "invocationCache": {
         "disable": "Disabilita",
@@ -1353,9 +1329,7 @@
         "promptsWithCount_many": "{{count}} Prompt",
         "promptsWithCount_other": "{{count}} Prompt",
         "dynamicPrompts": "Prompt dinamici",
-        "promptsPreview": "Anteprima dei prompt",
-        "showDynamicPrompts": "Mostra prompt dinamici",
-        "loading": "Generazione prompt dinamici..."
+        "promptsPreview": "Anteprima dei prompt"
     },
     "popovers": {
         "paramScheduler": {
@@ -1581,7 +1555,7 @@
         "scheduler": "Campionatore",
         "noModelsAvailable": "Nessun modello disponibile",
         "denoisingStrength": "Forza di riduzione del rumore",
-        "concatPromptStyle": "Collega Prompt & Stile",
+        "concatPromptStyle": "Concatena Prompt & Stile",
         "loading": "Caricamento...",
         "steps": "Passi",
         "refinerStart": "Inizio Affinamento",
@@ -1592,8 +1566,7 @@
         "useRefiner": "Utilizza l'affinatore",
         "refinermodel": "Modello Affinatore",
         "posAestheticScore": "Punteggio estetico positivo",
-        "posStylePrompt": "Prompt Stile positivo",
-        "freePromptStyle": "Prompt di stile manuale"
+        "posStylePrompt": "Prompt Stile positivo"
     },
     "metadata": {
         "initImage": "Immagine iniziale",
@@ -1666,28 +1639,5 @@
     },
     "app": {
         "storeNotInitialized": "Il negozio non è inizializzato"
-    },
-    "accordions": {
-        "compositing": {
-            "infillTab": "Riempimento",
-            "coherenceTab": "Passaggio di coerenza",
-            "title": "Composizione"
-        },
-        "control": {
-            "controlAdaptersTab": "Adattatori di Controllo",
-            "ipTab": "Prompt immagine",
-            "title": "Controllo"
-        },
-        "generation": {
-            "title": "Generazione",
-            "conceptsTab": "Concetti",
-            "modelTab": "Modello"
-        },
-        "advanced": {
-            "title": "Avanzate"
-        },
-        "image": {
-            "title": "Immagine"
-        }
     }
 }

invokeai/frontend/web/public/locales/ja.json

@@ -133,6 +133,10 @@
             "title": "ピン",
             "desc": "オプションパネルを固定"
         },
+        "toggleViewer": {
+            "title": "ビュワーのトグル",
+            "desc": "ビュワーを開閉"
+        },
         "toggleGallery": {
             "title": "ギャラリーのトグル",
             "desc": "ギャラリードロワーの開閉"
@@ -193,6 +197,10 @@
             "title": "次の画像",
             "desc": "ギャラリー内の1つ後の画像を表示"
         },
+        "toggleGalleryPin": {
+            "title": "ギャラリードロワーの固定",
+            "desc": "ギャラリーをUIにピン留め/解除"
+        },
         "increaseGalleryThumbSize": {
             "title": "ギャラリーの画像を拡大",
             "desc": "ギャラリーのサムネイル画像を拡大"
@@ -582,6 +590,7 @@
         "processor": "プロセッサー",
         "addControlNet": "$t(common.controlNet)を追加",
         "none": "なし",
+        "incompatibleBaseModel": "互換性のないベースモデル:",
         "enableControlnet": "コントロールネットを有効化",
         "detectResolution": "検出解像度",
         "controlNetT2IMutexDesc": "$t(common.controlNet)と$t(common.t2iAdapter)の同時使用は現在サポートされていません。",

invokeai/frontend/web/public/locales/ko.json

@@ -15,7 +15,7 @@
         "langBrPortuguese": "Português do Brasil",
         "langRussian": "Русский",
         "langSpanish": "Español",
-        "nodes": "Workflow Editor",
+        "nodes": "노드",
         "nodesDesc": "이미지 생성을 위한 노드 기반 시스템은 현재 개발 중입니다. 이 놀라운 기능에 대한 업데이트를 계속 지켜봐 주세요.",
         "postProcessing": "후처리",
         "postProcessDesc2": "보다 진보된 후처리 작업을 위한 전용 UI가 곧 출시될 예정입니다.",
@@ -25,7 +25,7 @@
         "trainingDesc2": "InvokeAI는 이미 메인 스크립트를 사용한 Textual Inversion를 이용한 Custom embedding 학습을 지원하고 있습니다.",
         "upload": "업로드",
         "close": "닫기",
-        "load": "불러오기",
+        "load": "로드",
         "back": "뒤로 가기",
         "statusConnected": "연결됨",
         "statusDisconnected": "연결 끊김",
@@ -58,69 +58,7 @@
         "statusGeneratingImageToImage": "이미지->이미지 생성",
         "statusProcessingComplete": "처리 완료",
         "statusIterationComplete": "반복(Iteration) 완료",
-        "statusSavingImage": "이미지 저장",
-        "t2iAdapter": "T2I 어댑터",
-        "communityLabel": "커뮤니티",
-        "txt2img": "텍스트->이미지",
-        "dontAskMeAgain": "다시 묻지 마세요",
-        "loadingInvokeAI": "Invoke AI 불러오는 중",
-        "checkpoint": "체크포인트",
-        "format": "형식",
-        "unknown": "알려지지 않음",
-        "areYouSure": "확실하나요?",
-        "folder": "폴더",
-        "inpaint": "inpaint",
-        "updated": "업데이트 됨",
-        "on": "켜기",
-        "save": "저장",
-        "langPortuguese": "Português",
-        "created": "생성됨",
-        "nodeEditor": "Node Editor",
-        "error": "에러",
-        "prevPage": "이전 페이지",
-        "ipAdapter": "IP 어댑터",
-        "controlAdapter": "제어 어댑터",
-        "installed": "설치됨",
-        "accept": "수락",
-        "ai": "인공지능",
-        "auto": "자동",
-        "file": "파일",
-        "openInNewTab": "새 탭에서 열기",
-        "delete": "삭제",
-        "template": "템플릿",
-        "cancel": "취소",
-        "controlNet": "컨트롤넷",
-        "outputs": "결과물",
-        "unknownError": "알려지지 않은 에러",
-        "statusProcessing": "처리 중",
-        "linear": "선형",
-        "imageFailedToLoad": "이미지를 로드할 수 없음",
-        "direction": "방향",
-        "data": "데이터",
-        "somethingWentWrong": "뭔가 잘못됐어요",
-        "imagePrompt": "이미지 프롬프트",
-        "modelManager": "Model Manager",
-        "lightMode": "라이트 모드",
-        "safetensors": "Safetensors",
-        "outpaint": "outpaint",
-        "langKorean": "한국어",
-        "orderBy": "정렬 기준",
-        "generate": "생성",
-        "copyError": "$t(gallery.copy) 에러",
-        "learnMore": "더 알아보기",
-        "nextPage": "다음 페이지",
-        "saveAs": "다른 이름으로 저장",
-        "darkMode": "다크 모드",
-        "loading": "불러오는 중",
-        "random": "랜덤",
-        "langHebrew": "Hebrew",
-        "batch": "Batch 매니저",
-        "postprocessing": "후처리",
-        "advanced": "고급",
-        "unsaved": "저장되지 않음",
-        "input": "입력",
-        "details": "세부사항",
-        "notInstalled": "설치되지 않음"
+        "statusSavingImage": "이미지 저장"
     },
     "gallery": {
         "showGenerations": "생성된 이미지 보기",
@@ -130,35 +68,7 @@
         "galleryImageSize": "이미지 크기",
         "galleryImageResetSize": "사이즈 리셋",
         "gallerySettings": "갤러리 설정",
-        "maintainAspectRatio": "종횡비 유지",
-        "deleteSelection": "선택 항목 삭제",
-        "featuresWillReset": "이 이미지를 삭제하면 해당 기능이 즉시 재설정됩니다.",
-        "deleteImageBin": "삭제된 이미지는 운영 체제의 Bin으로 전송됩니다.",
-        "assets": "자산",
-        "problemDeletingImagesDesc": "하나 이상의 이미지를 삭제할 수 없습니다",
-        "noImagesInGallery": "보여줄 이미지가 없음",
-        "autoSwitchNewImages": "새로운 이미지로 자동 전환",
-        "loading": "불러오는 중",
-        "unableToLoad": "갤러리를 로드할 수 없음",
-        "preparingDownload": "다운로드 준비",
-        "preparingDownloadFailed": "다운로드 준비 중 발생한 문제",
-        "singleColumnLayout": "단일 열 레이아웃",
-        "image": "이미지",
-        "loadMore": "더 불러오기",
-        "drop": "드랍",
-        "problemDeletingImages": "이미지 삭제 중 발생한 문제",
-        "downloadSelection": "선택 항목 다운로드",
-        "deleteImage": "이미지 삭제",
-        "currentlyInUse": "이 이미지는 현재 다음 기능에서 사용되고 있습니다:",
-        "allImagesLoaded": "불러온 모든 이미지",
-        "dropOrUpload": "$t(gallery.drop) 또는 업로드",
-        "copy": "복사",
-        "download": "다운로드",
-        "deleteImagePermanent": "삭제된 이미지는 복원할 수 없습니다.",
-        "noImageSelected": "선택된 이미지 없음",
-        "autoAssignBoardOnClick": "클릭 시 Board로 자동 할당",
-        "setCurrentImage": "현재 이미지로 설정",
-        "dropToUpload": "업로드를 위해 $t(gallery.drop)"
+        "maintainAspectRatio": "종횡비 유지"
     },
     "unifiedCanvas": {
         "betaPreserveMasked": "마스크 레이어 유지"
@@ -169,743 +79,6 @@
         "nextImage": "다음 이미지",
         "mode": "모드",
         "menu": "메뉴",
-        "modelSelect": "모델 선택",
-        "zoomIn": "확대하기",
-        "rotateClockwise": "시계방향으로 회전",
-        "uploadImage": "이미지 업로드",
-        "showGalleryPanel": "갤러리 패널 표시",
-        "useThisParameter": "해당 변수 사용",
-        "reset": "리셋",
-        "loadMore": "더 불러오기",
-        "zoomOut": "축소하기",
-        "rotateCounterClockwise": "반시계방향으로 회전",
-        "showOptionsPanel": "사이드 패널 표시",
-        "toggleAutoscroll": "자동 스크롤 전환",
-        "toggleLogViewer": "Log Viewer 전환"
-    },
-    "modelManager": {
-        "pathToCustomConfig": "사용자 지정 구성 경로",
-        "importModels": "모델 가져오기",
-        "availableModels": "사용 가능한 모델",
-        "conversionNotSupported": "변환이 지원되지 않음",
-        "noCustomLocationProvided": "사용자 지정 위치가 제공되지 않음",
-        "onnxModels": "Onnx",
-        "vaeRepoID": "VAE Repo ID",
-        "modelExists": "모델 존재",
-        "custom": "사용자 지정",
-        "addModel": "모델 추가",
-        "none": "없음",
-        "modelConverted": "변환된 모델",
-        "width": "너비",
-        "weightedSum": "가중합",
-        "inverseSigmoid": "Inverse Sigmoid",
-        "invokeAIFolder": "Invoke AI 폴더",
-        "syncModelsDesc": "모델이 백엔드와 동기화되지 않은 경우 이 옵션을 사용하여 새로 고침할 수 있습니다. 이는 일반적으로 응용 프로그램이 부팅된 후 수동으로 모델.yaml 파일을 업데이트하거나 InvokeAI root 폴더에 모델을 추가하는 경우에 유용합니다.",
-        "convert": "변환",
-        "vae": "VAE",
-        "noModels": "모델을 찾을 수 없음",
-        "statusConverting": "변환중",
-        "sigmoid": "Sigmoid",
-        "deleteModel": "모델 삭제",
-        "modelLocation": "모델 위치",
-        "merge": "병합",
-        "v1": "v1",
-        "description": "Description",
-        "modelMergeInterpAddDifferenceHelp": "이 모드에서 모델 3은 먼저 모델 2에서 차감됩니다. 결과 버전은 위에 설정된 Alpha 비율로 모델 1과 혼합됩니다.",
-        "customConfig": "사용자 지정 구성",
-        "cannotUseSpaces": "공백을 사용할 수 없음",
-        "formMessageDiffusersModelLocationDesc": "적어도 하나 이상 입력해 주세요.",
-        "addDiffuserModel": "Diffusers 추가",
-        "search": "검색",
-        "predictionType": "예측 유형(안정 확산 2.x 모델 및 간혹 안정 확산 1.x 모델의 경우)",
-        "widthValidationMsg": "모형의 기본 너비.",
-        "selectAll": "모두 선택",
-        "vaeLocation": "VAE 위치",
-        "selectModel": "모델 선택",
-        "modelAdded": "추가된 모델",
-        "repo_id": "Repo ID",
-        "modelSyncFailed": "모델 동기화 실패",
-        "convertToDiffusersHelpText6": "이 모델을 변환하시겠습니까?",
-        "config": "구성",
-        "quickAdd": "빠른 추가",
-        "selected": "선택된",
-        "modelTwo": "모델 2",
-        "simpleModelDesc": "로컬 Difffusers 모델, 로컬 체크포인트/안전 센서 모델 HuggingFace Repo ID 또는 체크포인트/Diffusers 모델 URL의 경로를 제공합니다.",
-        "customSaveLocation": "사용자 정의 저장 위치",
-        "advanced": "고급",
-        "modelsFound": "발견된 모델",
-        "load": "불러오기",
-        "height": "높이",
-        "modelDeleted": "삭제된 모델",
-        "inpainting": "v1 Inpainting",
-        "vaeLocationValidationMsg": "VAE가 있는 경로.",
-        "convertToDiffusersHelpText2": "이 프로세스는 모델 관리자 항목을 동일한 모델의 Diffusers 버전으로 대체합니다.",
-        "modelUpdateFailed": "모델 업데이트 실패",
-        "modelUpdated": "업데이트된 모델",
-        "noModelsFound": "모델을 찾을 수 없음",
-        "useCustomConfig": "사용자 지정 구성 사용",
-        "formMessageDiffusersVAELocationDesc": "제공되지 않은 경우 호출AIA 파일을 위의 모델 위치 내에서 VAE 파일을 찾습니다.",
-        "formMessageDiffusersVAELocation": "VAE 위치",
-        "checkpointModels": "Checkpoints",
-        "modelOne": "모델 1",
-        "settings": "설정",
-        "heightValidationMsg": "모델의 기본 높이입니다.",
-        "selectAndAdd": "아래 나열된 모델 선택 및 추가",
-        "convertToDiffusersHelpText5": "디스크 공간이 충분한지 확인해 주세요. 모델은 일반적으로 2GB에서 7GB 사이로 다양합니다.",
-        "deleteConfig": "구성 삭제",
-        "deselectAll": "모두 선택 취소",
-        "modelConversionFailed": "모델 변환 실패",
-        "clearCheckpointFolder": "Checkpoint Folder 지우기",
-        "modelEntryDeleted": "모델 항목 삭제",
-        "deleteMsg1": "InvokeAI에서 이 모델을 삭제하시겠습니까?",
-        "syncModels": "동기화 모델",
-        "mergedModelSaveLocation": "위치 저장",
-        "checkpointOrSafetensors": "$t(common.checkpoint) / $t(common.safetensors)",
-        "modelType": "모델 유형",
-        "nameValidationMsg": "모델 이름 입력",
-        "cached": "cached",
-        "modelsMerged": "병합된 모델",
-        "formMessageDiffusersModelLocation": "Diffusers 모델 위치",
-        "modelsMergeFailed": "모델 병합 실패",
-        "convertingModelBegin": "모델 변환 중입니다. 잠시만 기다려 주십시오.",
-        "v2_base": "v2 (512px)",
-        "scanForModels": "모델 검색",
-        "modelLocationValidationMsg": "Diffusers 모델이 저장된 로컬 폴더의 경로 제공",
-        "name": "이름",
-        "selectFolder": "폴더 선택",
-        "updateModel": "모델 업데이트",
-        "addNewModel": "새로운 모델 추가",
-        "customConfigFileLocation": "사용자 지정 구성 파일 위치",
-        "descriptionValidationMsg": "모델에 대한 description 추가",
-        "safetensorModels": "SafeTensors",
-        "convertToDiffusersHelpText1": "이 모델은 🧨 Diffusers 형식으로 변환됩니다.",
-        "modelsSynced": "동기화된 모델",
-        "vaePrecision": "VAE 정밀도",
-        "invokeRoot": "InvokeAI 폴더",
-        "checkpointFolder": "Checkpoint Folder",
-        "mergedModelCustomSaveLocation": "사용자 지정 경로",
-        "mergeModels": "모델 병합",
-        "interpolationType": "Interpolation 타입",
-        "modelMergeHeaderHelp2": "Diffusers만 병합이 가능합니다. 체크포인트 모델 병합을 원하신다면 먼저 Diffusers로 변환해주세요.",
-        "convertToDiffusersSaveLocation": "위치 저장",
-        "deleteMsg2": "모델이 InvokeAI root 폴더에 있으면 디스크에서 모델이 삭제됩니다. 사용자 지정 위치를 사용하는 경우 모델이 디스크에서 삭제되지 않습니다.",
-        "oliveModels": "Olives",
-        "repoIDValidationMsg": "모델의 온라인 저장소",
-        "baseModel": "기본 모델",
-        "scanAgain": "다시 검색",
-        "pickModelType": "모델 유형 선택",
-        "sameFolder": "같은 폴더",
-        "addNew": "New 추가",
-        "manual": "매뉴얼",
-        "convertToDiffusersHelpText3": "디스크의 체크포인트 파일이 InvokeAI root 폴더에 있으면 삭제됩니다. 사용자 지정 위치에 있으면 삭제되지 않습니다.",
-        "addCheckpointModel": "체크포인트 / 안전 센서 모델 추가",
-        "configValidationMsg": "모델의 구성 파일에 대한 경로.",
-        "modelManager": "모델 매니저",
-        "variant": "Variant",
-        "vaeRepoIDValidationMsg": "VAE의 온라인 저장소",
-        "loraModels": "LoRAs",
-        "modelDeleteFailed": "모델을 삭제하지 못했습니다",
-        "convertToDiffusers": "Diffusers로 변환",
-        "allModels": "모든 모델",
-        "modelThree": "모델 3",
-        "findModels": "모델 찾기",
-        "notLoaded": "로드되지 않음",
-        "alpha": "Alpha",
-        "diffusersModels": "Diffusers",
-        "modelMergeAlphaHelp": "Alpha는 모델의 혼합 강도를 제어합니다. Alpha 값이 낮을수록 두 번째 모델의 영향력이 줄어듭니다.",
-        "addDifference": "Difference 추가",
-        "noModelSelected": "선택한 모델 없음",
-        "modelMergeHeaderHelp1": "최대 3개의 다른 모델을 병합하여 필요에 맞는 혼합물을 만들 수 있습니다.",
-        "ignoreMismatch": "선택한 모델 간의 불일치 무시",
-        "v2_768": "v2 (768px)",
-        "convertToDiffusersHelpText4": "이것은 한 번의 과정일 뿐입니다. 컴퓨터 사양에 따라 30-60초 정도 소요될 수 있습니다.",
-        "model": "모델",
-        "addManually": "Manually 추가",
-        "addSelected": "Selected 추가",
-        "mergedModelName": "병합된 모델 이름",
-        "delete": "삭제"
-    },
-    "controlnet": {
-        "amult": "a_mult",
-        "resize": "크기 조정",
-        "showAdvanced": "고급 표시",
-        "contentShuffleDescription": "이미지에서 content 섞기",
-        "bgth": "bg_th",
-        "addT2IAdapter": "$t(common.t2iAdapter) 추가",
-        "pidi": "PIDI",
-        "importImageFromCanvas": "캔버스에서 이미지 가져오기",
-        "lineartDescription": "이미지->lineart 변환",
-        "normalBae": "Normal BAE",
-        "importMaskFromCanvas": "캔버스에서 Mask 가져오기",
-        "hed": "HED",
-        "contentShuffle": "Content Shuffle",
-        "controlNetEnabledT2IDisabled": "$t(common.controlNet) 사용 가능, $t(common.t2iAdapter) 사용 불가능",
-        "ipAdapterModel": "Adapter 모델",
-        "resetControlImage": "Control Image 재설정",
-        "beginEndStepPercent": "Begin / End Step Percentage",
-        "mlsdDescription": "Minimalist Line Segment Detector",
-        "duplicate": "복제",
-        "balanced": "Balanced",
-        "f": "F",
-        "h": "H",
-        "prompt": "프롬프트",
-        "depthMidasDescription": "Midas를 사용하여 Depth map 생성하기",
-        "openPoseDescription": "Openpose를 이용한 사람 포즈 추정",
-        "control": "Control",
-        "resizeMode": "크기 조정 모드",
-        "t2iEnabledControlNetDisabled": "$t(common.t2iAdapter) 사용 가능,$t(common.controlNet) 사용 불가능",
-        "coarse": "Coarse",
-        "weight": "Weight",
-        "selectModel": "모델 선택",
-        "crop": "Crop",
-        "depthMidas": "Depth (Midas)",
-        "w": "W",
-        "processor": "프로세서",
-        "addControlNet": "$t(common.controlNet) 추가",
-        "none": "해당없음",
-        "enableControlnet": "사용 가능한 ControlNet",
-        "detectResolution": "해상도 탐지",
-        "controlNetT2IMutexDesc": "$t(common.controlNet)와 $t(common.t2iAdapter)는 현재 동시에 지원되지 않습니다.",
-        "pidiDescription": "PIDI image 처리",
-        "mediapipeFace": "Mediapipe Face",
-        "mlsd": "M-LSD",
-        "controlMode": "Control Mode",
-        "fill": "채우기",
-        "cannyDescription": "Canny 모서리 삭제",
-        "addIPAdapter": "$t(common.ipAdapter) 추가",
-        "lineart": "Lineart",
-        "colorMapDescription": "이미지에서 color map을 생성합니다",
-        "lineartAnimeDescription": "Anime-style lineart 처리",
-        "minConfidence": "Min Confidence",
-        "imageResolution": "이미지 해상도",
-        "megaControl": "Mega Control",
-        "depthZoe": "Depth (Zoe)",
-        "colorMap": "색",
-        "lowThreshold": "Low Threshold",
-        "autoConfigure": "프로세서 자동 구성",
-        "highThreshold": "High Threshold",
-        "normalBaeDescription": "Normal BAE 처리",
-        "noneDescription": "처리되지 않음",
-        "saveControlImage": "Control Image 저장",
-        "openPose": "Openpose",
-        "toggleControlNet": "해당 ControlNet으로 전환",
-        "delete": "삭제",
-        "controlAdapter_other": "Control Adapter(s)",
-        "safe": "Safe",
-        "colorMapTileSize": "타일 크기",
-        "lineartAnime": "Lineart Anime",
-        "ipAdapterImageFallback": "IP Adapter Image가 선택되지 않음",
-        "mediapipeFaceDescription": "Mediapipe를 사용하여 Face 탐지",
-        "canny": "Canny",
-        "depthZoeDescription": "Zoe를 사용하여 Depth map 생성하기",
-        "hedDescription": "Holistically-Nested 모서리 탐지",
-        "setControlImageDimensions": "Control Image Dimensions를 W/H로 설정",
-        "scribble": "scribble",
-        "resetIPAdapterImage": "IP Adapter Image 재설정",
-        "handAndFace": "Hand and Face",
-        "enableIPAdapter": "사용 가능한 IP Adapter",
-        "maxFaces": "Max Faces"
-    },
-    "hotkeys": {
-        "toggleSnap": {
-            "desc": "Snap을 Grid로 전환",
-            "title": "Snap 전환"
-        },
-        "setSeed": {
-            "title": "시드 설정",
-            "desc": "현재 이미지의 시드 사용"
-        },
-        "keyboardShortcuts": "키보드 바로 가기",
-        "decreaseGalleryThumbSize": {
-            "desc": "갤러리 미리 보기 크기 축소",
-            "title": "갤러리 이미지 크기 축소"
-        },
-        "previousStagingImage": {
-            "title": "이전 스테이징 이미지",
-            "desc": "이전 스테이징 영역 이미지"
-        },
-        "decreaseBrushSize": {
-            "title": "브러시 크기 줄이기",
-            "desc": "캔버스 브러시/지우개 크기 감소"
-        },
-        "consoleToggle": {
-            "desc": "콘솔 열고 닫기",
-            "title": "콘솔 전환"
-        },
-        "selectBrush": {
-            "desc": "캔버스 브러시를 선택",
-            "title": "브러시 선택"
-        },
-        "upscale": {
-            "desc": "현재 이미지를 업스케일",
-            "title": "업스케일"
-        },
-        "previousImage": {
-            "title": "이전 이미지",
-            "desc": "갤러리에 이전 이미지 표시"
-        },
-        "unifiedCanvasHotkeys": "Unified Canvas Hotkeys",
-        "toggleOptions": {
-            "desc": "옵션 패널을 열고 닫기",
-            "title": "옵션 전환"
-        },
-        "selectEraser": {
-            "title": "지우개 선택",
-            "desc": "캔버스 지우개를 선택"
-        },
-        "setPrompt": {
-            "title": "프롬프트 설정",
-            "desc": "현재 이미지의 프롬프트 사용"
-        },
-        "acceptStagingImage": {
-            "desc": "현재 준비 영역 이미지 허용",
-            "title": "준비 이미지 허용"
-        },
-        "resetView": {
-            "desc": "Canvas View 초기화",
-            "title": "View 초기화"
-        },
-        "hideMask": {
-            "title": "Mask 숨김",
-            "desc": "mask 숨김/숨김 해제"
-        },
-        "pinOptions": {
-            "title": "옵션 고정",
-            "desc": "옵션 패널을 고정"
-        },
-        "toggleGallery": {
-            "desc": "gallery drawer 열기 및 닫기",
-            "title": "Gallery 전환"
-        },
-        "quickToggleMove": {
-            "title": "빠른 토글 이동",
-            "desc": "일시적으로 이동 모드 전환"
-        },
-        "generalHotkeys": "General Hotkeys",
-        "showHideBoundingBox": {
-            "desc": "bounding box 표시 전환",
-            "title": "Bounding box 표시/숨김"
-        },
-        "showInfo": {
-            "desc": "현재 이미지의 metadata 정보 표시",
-            "title": "정보 표시"
-        },
-        "copyToClipboard": {
-            "title": "클립보드로 복사",
-            "desc": "현재 캔버스를 클립보드로 복사"
-        },
-        "restoreFaces": {
-            "title": "Faces 복원",
-            "desc": "현재 이미지 복원"
-        },
-        "fillBoundingBox": {
-            "title": "Bounding Box 채우기",
-            "desc": "bounding box를 브러시 색으로 채웁니다"
-        },
-        "closePanels": {
-            "desc": "열린 panels 닫기",
-            "title": "panels 닫기"
-        },
-        "downloadImage": {
-            "desc": "현재 캔버스 다운로드",
-            "title": "이미지 다운로드"
-        },
-        "setParameters": {
-            "title": "매개 변수 설정",
-            "desc": "현재 이미지의 모든 매개 변수 사용"
-        },
-        "maximizeWorkSpace": {
-            "desc": "패널을 닫고 작업 면적을 극대화",
-            "title": "작업 공간 극대화"
-        },
-        "galleryHotkeys": "Gallery Hotkeys",
-        "cancel": {
-            "desc": "이미지 생성 취소",
-            "title": "취소"
-        },
-        "saveToGallery": {
-            "title": "갤러리에 저장",
-            "desc": "현재 캔버스를 갤러리에 저장"
-        },
-        "eraseBoundingBox": {
-            "desc": "bounding box 영역을 지웁니다",
-            "title": "Bounding Box 지우기"
-        },
-        "nextImage": {
-            "title": "다음 이미지",
-            "desc": "갤러리에 다음 이미지 표시"
-        },
-        "colorPicker": {
-            "desc": "canvas color picker 선택",
-            "title": "Color Picker 선택"
-        },
-        "invoke": {
-            "desc": "이미지 생성",
-            "title": "불러오기"
-        },
-        "sendToImageToImage": {
-            "desc": "현재 이미지를 이미지로 보내기"
-        },
-        "toggleLayer": {
-            "desc": "mask/base layer 선택 전환",
-            "title": "Layer 전환"
-        },
-        "increaseBrushSize": {
-            "title": "브러시 크기 증가",
-            "desc": "캔버스 브러시/지우개 크기 증가"
-        },
-        "appHotkeys": "App Hotkeys",
-        "deleteImage": {
-            "title": "이미지 삭제",
-            "desc": "현재 이미지 삭제"
-        },
-        "moveTool": {
-            "desc": "캔버스 탐색 허용",
-            "title": "툴 옮기기"
-        },
-        "clearMask": {
-            "desc": "전체 mask 제거",
-            "title": "Mask 제거"
-        },
-        "increaseGalleryThumbSize": {
-            "title": "갤러리 이미지 크기 증가",
-            "desc": "갤러리 미리 보기 크기를 늘립니다"
-        },
-        "increaseBrushOpacity": {
-            "desc": "캔버스 브러시의 불투명도를 높입니다",
-            "title": "브러시 불투명도 증가"
-        },
-        "focusPrompt": {
-            "desc": "프롬프트 입력 영역에 초점을 맞춥니다",
-            "title": "프롬프트에 초점 맞추기"
-        },
-        "decreaseBrushOpacity": {
-            "desc": "캔버스 브러시의 불투명도를 줄입니다",
-            "title": "브러시 불투명도 감소"
-        },
-        "nextStagingImage": {
-            "desc": "다음 스테이징 영역 이미지",
-            "title": "다음 스테이징 이미지"
-        },
-        "redoStroke": {
-            "title": "Stroke 다시 실행",
-            "desc": "brush stroke 다시 실행"
-        },
-        "nodesHotkeys": "Nodes Hotkeys",
-        "addNodes": {
-            "desc": "노드 추가 메뉴 열기",
-            "title": "노드 추가"
-        },
-        "undoStroke": {
-            "title": "Stroke 실행 취소",
-            "desc": "brush stroke 실행 취소"
-        },
-        "changeTabs": {
-            "desc": "다른 workspace으로 전환",
-            "title": "탭 바꾸기"
-        },
-        "mergeVisible": {
-            "desc": "캔버스의 보이는 모든 레이어 병합"
-        }
-    },
-    "nodes": {
-        "inputField": "입력 필드",
-        "controlFieldDescription": "노드 간에 전달된 Control 정보입니다.",
-        "latentsFieldDescription": "노드 사이에 Latents를 전달할 수 있습니다.",
-        "denoiseMaskFieldDescription": "노드 간에 Denoise Mask가 전달될 수 있음",
-        "floatCollectionDescription": "실수 컬렉션.",
-        "missingTemplate": "잘못된 노드: {{type}} 유형의 {{node}} 템플릿 누락(설치되지 않으셨나요?)",
-        "outputSchemaNotFound": "Output schema가 발견되지 않음",
-        "ipAdapterPolymorphicDescription": "IP-Adapters 컬렉션.",
-        "latentsPolymorphicDescription": "노드 사이에 Latents를 전달할 수 있습니다.",
-        "colorFieldDescription": "RGBA 색.",
-        "mainModelField": "모델",
-        "ipAdapterCollection": "IP-Adapters 컬렉션",
-        "conditioningCollection": "Conditioning 컬렉션",
-        "maybeIncompatible": "설치된 것과 호환되지 않을 수 있음",
-        "ipAdapterPolymorphic": "IP-Adapter 다형성",
-        "noNodeSelected": "선택한 노드 없음",
-        "addNode": "노드 추가",
-        "hideGraphNodes": "그래프 오버레이 숨기기",
-        "enum": "Enum",
-        "loadWorkflow": "Workflow 불러오기",
-        "integerPolymorphicDescription": "정수 컬렉션.",
-        "noOutputRecorded": "기록된 출력 없음",
-        "conditioningCollectionDescription": "노드 간에 Conditioning을 전달할 수 있습니다.",
-        "colorPolymorphic": "색상 다형성",
-        "colorCodeEdgesHelp": "연결된 필드에 따른 색상 코드 선",
-        "collectionDescription": "해야 할 일",
-        "hideLegendNodes": "필드 유형 범례 숨기기",
-        "addLinearView": "Linear View에 추가",
-        "float": "실수",
-        "targetNodeFieldDoesNotExist": "잘못된 모서리: 대상/입력 필드 {{node}}. {{field}}이(가) 없습니다",
-        "animatedEdges": "애니메이션 모서리",
-        "conditioningPolymorphic": "Conditioning 다형성",
-        "integer": "정수",
-        "colorField": "색",
-        "boardField": "Board",
-        "nodeTemplate": "노드 템플릿",
-        "latentsCollection": "Latents 컬렉션",
-        "nodeOpacity": "노드 불투명도",
-        "sourceNodeDoesNotExist": "잘못된 모서리: 소스/출력 노드 {{node}}이(가) 없습니다",
-        "pickOne": "하나 고르기",
-        "collectionItemDescription": "해야 할 일",
-        "integerDescription": "정수는 소수점이 없는 숫자입니다.",
-        "outputField": "출력 필드",
-        "conditioningPolymorphicDescription": "노드 간에 Conditioning을 전달할 수 있습니다.",
-        "noFieldsLinearview": "Linear View에 추가된 필드 없음",
-        "imagePolymorphic": "이미지 다형성",
-        "nodeSearch": "노드 검색",
-        "imagePolymorphicDescription": "이미지 컬렉션.",
-        "floatPolymorphic": "실수 다형성",
-        "outputFieldInInput": "입력 중 출력필드",
-        "doesNotExist": "존재하지 않음",
-        "ipAdapterCollectionDescription": "IP-Adapters 컬렉션.",
-        "controlCollection": "Control 컬렉션",
-        "inputMayOnlyHaveOneConnection": "입력에 하나의 연결만 있을 수 있습니다",
-        "notes": "메모",
-        "nodeOutputs": "노드 결과물",
-        "currentImageDescription": "Node Editor에 현재 이미지를 표시합니다",
-        "downloadWorkflow": "Workflow JSON 다운로드",
-        "ipAdapter": "IP-Adapter",
-        "integerCollection": "정수 컬렉션",
-        "collectionItem": "컬렉션 아이템",
-        "noConnectionInProgress": "진행중인 연결이 없습니다",
-        "controlCollectionDescription": "노드 간에 전달된 Control 정보입니다.",
-        "noConnectionData": "연결 데이터 없음",
-        "outputFields": "출력 필드",
-        "fieldTypesMustMatch": "필드 유형은 일치해야 합니다",
-        "edge": "Edge",
-        "inputNode": "입력 노드",
-        "enumDescription": "Enums은 여러 옵션 중 하나일 수 있는 값입니다.",
-        "sourceNodeFieldDoesNotExist": "잘못된 모서리: 소스/출력 필드 {{node}}. {{field}}이(가) 없습니다",
-        "loRAModelFieldDescription": "해야 할 일",
-        "imageField": "이미지",
-        "animatedEdgesHelp": "선택한 노드에 연결된 선택한 가장자리 및 가장자리를 애니메이션화합니다",
-        "cannotDuplicateConnection": "중복 연결을 만들 수 없습니다",
-        "booleanPolymorphic": "Boolean 다형성",
-        "noWorkflow": "Workflow 없음",
-        "colorCollectionDescription": "해야 할 일",
-        "integerCollectionDescription": "정수 컬렉션.",
-        "colorPolymorphicDescription": "색의 컬렉션.",
-        "denoiseMaskField": "Denoise Mask",
-        "missingCanvaInitImage": "캔버스 init 이미지 누락",
-        "conditioningFieldDescription": "노드 간에 Conditioning을 전달할 수 있습니다.",
-        "clipFieldDescription": "Tokenizer 및 text_encoder 서브모델.",
-        "fullyContainNodesHelp": "선택하려면 노드가 선택 상자 안에 완전히 있어야 합니다",
-        "noImageFoundState": "상태에서 초기 이미지를 찾을 수 없습니다",
-        "clipField": "Clip",
-        "nodePack": "Node pack",
-        "nodeType": "노드 유형",
-        "noMatchingNodes": "일치하는 노드 없음",
-        "fullyContainNodes": "선택할 노드 전체 포함",
-        "integerPolymorphic": "정수 다형성",
-        "executionStateInProgress": "진행중",
-        "noFieldType": "필드 유형 없음",
-        "colorCollection": "색의 컬렉션.",
-        "executionStateError": "에러",
-        "noOutputSchemaName": "ref 개체에 output schema 이름이 없습니다",
-        "ipAdapterModel": "IP-Adapter 모델",
-        "latentsPolymorphic": "Latents 다형성",
-        "ipAdapterDescription": "이미지 프롬프트 어댑터(IP-Adapter).",
-        "boolean": "Booleans",
-        "missingCanvaInitMaskImages": "캔버스 init 및 mask 이미지 누락",
-        "problemReadingMetadata": "이미지에서 metadata를 읽는 중 문제가 발생했습니다",
-        "hideMinimapnodes": "미니맵 숨기기",
-        "oNNXModelField": "ONNX 모델",
-        "executionStateCompleted": "완료된",
-        "node": "노드",
-        "currentImage": "현재 이미지",
-        "controlField": "Control",
-        "booleanDescription": "Booleans은 참 또는 거짓입니다.",
-        "collection": "컬렉션",
-        "ipAdapterModelDescription": "IP-Adapter 모델 필드",
-        "cannotConnectInputToInput": "입력을 입력에 연결할 수 없습니다",
-        "invalidOutputSchema": "잘못된 output schema",
-        "boardFieldDescription": "A gallery board",
-        "floatDescription": "실수는 소수점이 있는 숫자입니다.",
-        "floatPolymorphicDescription": "실수 컬렉션.",
-        "conditioningField": "Conditioning",
-        "collectionFieldType": "{{name}} 컬렉션",
-        "floatCollection": "실수 컬렉션",
-        "latentsField": "Latents",
-        "cannotConnectOutputToOutput": "출력을 출력에 연결할 수 없습니다",
-        "booleanCollection": "Boolean 컬렉션",
-        "connectionWouldCreateCycle": "연결하면 주기가 생성됩니다",
-        "cannotConnectToSelf": "자체에 연결할 수 없습니다",
-        "notesDescription": "Workflow에 대한 메모 추가",
-        "inputFields": "입력 필드",
-        "colorCodeEdges": "색상-코드 선",
-        "targetNodeDoesNotExist": "잘못된 모서리: 대상/입력 노드 {{node}}이(가) 없습니다",
-        "imageCollectionDescription": "이미지 컬렉션.",
-        "mismatchedVersion": "잘못된 노드: {{type}} 유형의 {{node}} 노드에 일치하지 않는 버전이 있습니다(업데이트 해보시겠습니까?)",
-        "imageFieldDescription": "노드 간에 이미지를 전달할 수 있습니다.",
-        "outputNode": "출력노드",
-        "addNodeToolTip": "노드 추가(Shift+A, Space)",
-        "collectionOrScalarFieldType": "{{name}} 컬렉션|Scalar",
-        "nodeVersion": "노드 버전",
-        "loadingNodes": "노드 로딩중...",
-        "mainModelFieldDescription": "해야 할 일",
-        "loRAModelField": "LoRA",
-        "deletedInvalidEdge": "잘못된 모서리 {{source}} -> {{target}} 삭제",
-        "latentsCollectionDescription": "노드 사이에 Latents를 전달할 수 있습니다.",
-        "oNNXModelFieldDescription": "ONNX 모델 필드.",
-        "imageCollection": "이미지 컬렉션"
-    },
-    "queue": {
-        "status": "상태",
-        "pruneSucceeded": "Queue로부터 {{item_count}} 완성된 항목 잘라내기",
-        "cancelTooltip": "현재 항목 취소",
-        "queueEmpty": "비어있는 Queue",
-        "pauseSucceeded": "중지된 프로세서",
-        "in_progress": "진행 중",
-        "queueFront": "Front of Queue에 추가",
-        "notReady": "Queue를 생성할 수 없음",
-        "batchFailedToQueue": "Queue Batch에 실패",
-        "completed": "완성된",
-        "queueBack": "Queue에 추가",
-        "batchValues": "Batch 값들",
-        "cancelFailed": "항목 취소 중 발생한 문제",
-        "queueCountPrediction": "Queue에 {{predicted}} 추가",
-        "batchQueued": "Batch Queued",
-        "pauseFailed": "프로세서 중지 중 발생한 문제",
-        "clearFailed": "Queue 제거 중 발생한 문제",
-        "queuedCount": "{{pending}} Pending",
-        "front": "front",
-        "clearSucceeded": "제거된 Queue",
-        "pause": "중지",
-        "pruneTooltip": "{{item_count}} 완성된 항목 잘라내기",
-        "cancelSucceeded": "취소된 항목",
-        "batchQueuedDesc_other": "queue의 {{direction}}에 추가된 {{count}}세션",
-        "queue": "Queue",
-        "batch": "Batch",
-        "clearQueueAlertDialog": "Queue를 지우면 처리 항목이 즉시 취소되고 Queue가 완전히 지워집니다.",
-        "resumeFailed": "프로세서 재개 중 발생한 문제",
-        "clear": "제거하다",
-        "prune": "잘라내다",
-        "total": "총 개수",
-        "canceled": "취소된",
-        "pruneFailed": "Queue 잘라내는 중 발생한 문제",
-        "cancelBatchSucceeded": "취소된 Batch",
-        "clearTooltip": "모든 항목을 취소하고 제거",
-        "current": "최근",
-        "pauseTooltip": "프로세서 중지",
-        "failed": "실패한",
-        "cancelItem": "항목 취소",
-        "next": "다음",
-        "cancelBatch": "Batch 취소",
-        "back": "back",
-        "batchFieldValues": "Batch 필드 값들",
-        "cancel": "취소",
-        "session": "세션",
-        "time": "시간",
-        "queueTotal": "{{total}} Total",
-        "resumeSucceeded": "재개된 프로세서",
-        "enqueueing": "Queueing Batch",
-        "resumeTooltip": "프로세서 재개",
-        "resume": "재개",
-        "cancelBatchFailed": "Batch 취소 중 발생한 문제",
-        "clearQueueAlertDialog2": "Queue를 지우시겠습니까?",
-        "item": "항목",
-        "graphFailedToQueue": "queue graph에 실패"
-    },
-    "metadata": {
-        "positivePrompt": "긍정적 프롬프트",
-        "negativePrompt": "부정적인 프롬프트",
-        "generationMode": "Generation Mode",
-        "Threshold": "Noise Threshold",
-        "metadata": "Metadata",
-        "seed": "시드",
-        "imageDetails": "이미지 세부 정보",
-        "perlin": "Perlin Noise",
-        "model": "모델",
-        "noImageDetails": "이미지 세부 정보를 찾을 수 없습니다",
-        "hiresFix": "고해상도 최적화",
-        "cfgScale": "CFG scale",
-        "initImage": "초기이미지",
-        "recallParameters": "매개변수 호출",
-        "height": "Height",
-        "variations": "Seed-weight 쌍",
-        "noMetaData": "metadata를 찾을 수 없습니다",
-        "cfgRescaleMultiplier": "$t(parameters.cfgRescaleMultiplier)",
-        "width": "너비",
-        "vae": "VAE",
-        "createdBy": "~에 의해 생성된",
-        "workflow": "작업의 흐름",
-        "steps": "단계",
-        "scheduler": "스케줄러",
-        "noRecallParameters": "호출할 매개 변수가 없습니다"
-    },
-    "invocationCache": {
-        "useCache": "캐시 사용",
-        "disable": "이용 불가능한",
-        "misses": "캐시 미스",
-        "enableFailed": "Invocation 캐시를 사용하도록 설정하는 중 발생한 문제",
-        "invocationCache": "Invocation 캐시",
-        "clearSucceeded": "제거된 Invocation 캐시",
-        "enableSucceeded": "이용 가능한 Invocation 캐시",
-        "clearFailed": "Invocation 캐시 제거 중 발생한 문제",
-        "hits": "캐시 적중",
-        "disableSucceeded": "이용 불가능한 Invocation 캐시",
-        "disableFailed": "Invocation 캐시를 이용하지 못하게 설정 중 발생한 문제",
-        "enable": "이용 가능한",
-        "clear": "제거",
-        "maxCacheSize": "최대 캐시 크기",
-        "cacheSize": "캐시 크기"
-    },
-    "embedding": {
-        "noEmbeddingsLoaded": "불러온 Embeddings이 없음",
-        "noMatchingEmbedding": "일치하는 Embeddings이 없음",
-        "addEmbedding": "Embedding 추가",
-        "incompatibleModel": "호환되지 않는 기본 모델:"
-    },
-    "hrf": {
-        "enableHrf": "이용 가능한 고해상도 고정",
-        "upscaleMethod": "업스케일 방법",
-        "enableHrfTooltip": "낮은 초기 해상도로 생성하고 기본 해상도로 업스케일한 다음 Image-to-Image를 실행합니다.",
-        "metadata": {
-            "strength": "고해상도 고정 강도",
-            "enabled": "고해상도 고정 사용",
-            "method": "고해상도 고정 방법"
-        },
-        "hrf": "고해상도 고정",
-        "hrfStrength": "고해상도 고정 강도"
-    },
-    "models": {
-        "noLoRAsLoaded": "로드된 LoRA 없음",
-        "noMatchingModels": "일치하는 모델 없음",
-        "esrganModel": "ESRGAN 모델",
-        "loading": "로딩중",
-        "noMatchingLoRAs": "일치하는 LoRA 없음",
-        "noLoRAsAvailable": "사용 가능한 LoRA 없음",
-        "noModelsAvailable": "사용 가능한 모델이 없음",
-        "addLora": "LoRA 추가",
-        "selectModel": "모델 선택",
-        "noRefinerModelsInstalled": "SDXL Refiner 모델이 설치되지 않음",
-        "noLoRAsInstalled": "설치된 LoRA 없음",
-        "selectLoRA": "LoRA 선택"
-    },
-    "boards": {
-        "autoAddBoard": "자동 추가 Board",
-        "topMessage": "이 보드에는 다음 기능에 사용되는 이미지가 포함되어 있습니다:",
-        "move": "이동",
-        "menuItemAutoAdd": "해당 Board에 자동 추가",
-        "myBoard": "나의 Board",
-        "searchBoard": "Board 찾는 중...",
-        "deleteBoardOnly": "Board만 삭제",
-        "noMatching": "일치하는 Board들이 없음",
-        "movingImagesToBoard_other": "{{count}}이미지를 Board로 이동시키기",
-        "selectBoard": "Board 선택",
-        "cancel": "취소",
-        "addBoard": "Board 추가",
-        "bottomMessage": "이 보드와 이미지를 삭제하면 현재 사용 중인 모든 기능이 재설정됩니다.",
-        "uncategorized": "미분류",
-        "downloadBoard": "Board 다운로드",
-        "changeBoard": "Board 바꾸기",
-        "loading": "불러오는 중...",
-        "clearSearch": "검색 지우기",
-        "deleteBoard": "Board 삭제",
-        "deleteBoardAndImages": "Board와 이미지 삭제",
-        "deletedBoardsCannotbeRestored": "삭제된 Board는 복원할 수 없습니다"
+        "modelSelect": "모델 선택"
     }
 }

invokeai/frontend/web/public/locales/nl.json

@@ -148,6 +148,10 @@
             "title": "Zet Opties vast",
             "desc": "Zet het deelscherm Opties vast"
         },
+        "toggleViewer": {
+            "title": "Zet Viewer vast",
+            "desc": "Opent of sluit Afbeeldingsviewer"
+        },
         "toggleGallery": {
             "title": "Zet Galerij vast",
             "desc": "Opent of sluit het deelscherm Galerij"
@@ -208,6 +212,10 @@
             "title": "Volgende afbeelding",
             "desc": "Toont de volgende afbeelding in de galerij"
         },
+        "toggleGalleryPin": {
+            "title": "Zet galerij vast/los",
+            "desc": "Zet de galerij vast of los aan de gebruikersinterface"
+        },
         "increaseGalleryThumbSize": {
             "title": "Vergroot afbeeldingsgrootte galerij",
             "desc": "Vergroot de grootte van de galerijminiaturen"
@@ -1063,6 +1071,7 @@
         "processor": "Verwerker",
         "addControlNet": "Voeg $t(common.controlNet) toe",
         "none": "Geen",
+        "incompatibleBaseModel": "Niet-compatibel basismodel:",
         "enableControlnet": "Schakel ControlNet in",
         "detectResolution": "Herken resolutie",
         "controlNetT2IMutexDesc": "Gelijktijdig gebruik van $t(common.controlNet) en $t(common.t2iAdapter) wordt op dit moment niet ondersteund.",

invokeai/frontend/web/public/locales/pl.json

@@ -86,6 +86,10 @@
             "title": "Przypnij opcje",
             "desc": "Przypina panel opcji"
         },
+        "toggleViewer": {
+            "title": "Przełącz podgląd",
+            "desc": "Otwiera lub zamyka widok podglądu"
+        },
         "toggleGallery": {
             "title": "Przełącz galerię",
             "desc": "Wysuwa lub chowa galerię"
@@ -146,6 +150,10 @@
             "title": "Następny obraz",
             "desc": "Aktywuje następny obraz z galerii"
         },
+        "toggleGalleryPin": {
+            "title": "Przypnij galerię",
+            "desc": "Przypina lub odpina widok galerii"
+        },
         "increaseGalleryThumbSize": {
             "title": "Powiększ obrazy",
             "desc": "Powiększa rozmiar obrazów w galerii"

invokeai/frontend/web/public/locales/pt.json

@@ -81,6 +81,10 @@
     "hotkeys": {
         "generalHotkeys": "Atalhos Gerais",
         "galleryHotkeys": "Atalhos da Galeria",
+        "toggleViewer": {
+            "title": "Ativar Visualizador",
+            "desc": "Abrir e fechar o Visualizador de Imagens"
+        },
         "maximizeWorkSpace": {
             "desc": "Fechar painéis e maximixar área de trabalho",
             "title": "Maximizar a Área de Trabalho"
@@ -228,6 +232,10 @@
             "title": "Apagar Imagem",
             "desc": "Apaga a imagem atual"
         },
+        "toggleGalleryPin": {
+            "title": "Ativar Fixar Galeria",
+            "desc": "Fixa e desafixa a galeria na interface"
+        },
         "increaseGalleryThumbSize": {
             "title": "Aumentar Tamanho da Galeria de Imagem",
             "desc": "Aumenta o tamanho das thumbs na galeria"

invokeai/frontend/web/public/locales/pt_BR.json

@@ -103,6 +103,10 @@
             "title": "Fixar Opções",
             "desc": "Fixar o painel de opções"
         },
+        "toggleViewer": {
+            "title": "Ativar Visualizador",
+            "desc": "Abrir e fechar o Visualizador de Imagens"
+        },
         "toggleGallery": {
             "title": "Ativar Galeria",
             "desc": "Abrir e fechar a gaveta da galeria"
@@ -163,6 +167,10 @@
             "title": "Próxima Imagem",
             "desc": "Mostra a próxima imagem na galeria"
         },
+        "toggleGalleryPin": {
+            "title": "Ativar Fixar Galeria",
+            "desc": "Fixa e desafixa a galeria na interface"
+        },
         "increaseGalleryThumbSize": {
             "title": "Aumentar Tamanho da Galeria de Imagem",
             "desc": "Aumenta o tamanho das thumbs na galeria"

invokeai/frontend/web/public/locales/ru.json

@@ -189,6 +189,10 @@
             "title": "Закрепить параметры",
             "desc": "Закрепить панель параметров"
         },
+        "toggleViewer": {
+            "title": "Показать просмотр",
+            "desc": "Открывать и закрывать просмотрщик изображений"
+        },
         "toggleGallery": {
             "title": "Показать галерею",
             "desc": "Открывать и закрывать ящик галереи"
@@ -249,6 +253,10 @@
             "title": "Следующее изображение",
             "desc": "Отображение следующего изображения в галерее"
         },
+        "toggleGalleryPin": {
+            "title": "Закрепить галерею",
+            "desc": "Закрепляет и открепляет галерею"
+        },
         "increaseGalleryThumbSize": {
             "title": "Увеличить размер миниатюр галереи",
             "desc": "Увеличивает размер миниатюр галереи"
@@ -515,7 +523,7 @@
     "parameters": {
         "images": "Изображения",
         "steps": "Шаги",
-        "cfgScale": "Шкала точности (CFG)",
+        "cfgScale": "Точность следования запросу (CFG)",
         "width": "Ширина",
         "height": "Высота",
         "seed": "Сид",
@@ -1154,6 +1162,7 @@
         "processor": "Процессор",
         "addControlNet": "Добавить $t(common.controlNet)",
         "none": "ничего",
+        "incompatibleBaseModel": "Несовместимая базовая модель:",
         "controlNetT2IMutexDesc": "$t(common.controlNet) и $t(common.t2iAdapter) одновременно в настоящее время не поддерживаются.",
         "ip_adapter": "$t(controlnet.controlAdapter_one) №{{number}} $t(common.ipAdapter)",
         "pidiDescription": "PIDI-обработка изображений",

invokeai/frontend/web/public/locales/sv.json

@@ -129,6 +129,10 @@
             "title": "Växla inställningar",
             "desc": "Öppna och stäng alternativpanelen"
         },
+        "toggleViewer": {
+            "title": "Växla visaren",
+            "desc": "Öppna och stäng bildvisaren"
+        },
         "toggleGallery": {
             "title": "Växla galleri",
             "desc": "Öppna eller stäng galleribyrån"
@@ -189,6 +193,10 @@
             "title": "Nästa bild",
             "desc": "Visa nästa bild"
         },
+        "toggleGalleryPin": {
+            "title": "Växla gallerinål",
+            "desc": "Nålar fast eller nålar av galleriet i gränssnittet"
+        },
         "increaseGalleryThumbSize": {
             "title": "Förstora galleriets bildstorlek",
             "desc": "Förstora miniatyrbildernas storlek"

invokeai/frontend/web/public/locales/uk.json

@@ -111,6 +111,10 @@
             "title": "Закріпити параметри",
             "desc": "Закріпити панель параметрів"
         },
+        "toggleViewer": {
+            "title": "Показати перегляд",
+            "desc": "Відкривати і закривати переглядач зображень"
+        },
         "toggleGallery": {
             "title": "Показати галерею",
             "desc": "Відкривати і закривати скриньку галереї"
@@ -171,6 +175,10 @@
             "title": "Наступне зображення",
             "desc": "Відображення наступного зображення в галереї"
         },
+        "toggleGalleryPin": {
+            "title": "Закріпити галерею",
+            "desc": "Закріплює і відкріплює галерею"
+        },
         "increaseGalleryThumbSize": {
             "title": "Збільшити розмір мініатюр галереї",
             "desc": "Збільшує розмір мініатюр галереї"

invokeai/frontend/web/public/locales/zh_CN.json

@@ -120,8 +120,7 @@
         "orderBy": "排序方式：",
         "nextPage": "下一页",
         "saveAs": "保存为",
-        "unsaved": "未保存",
-        "ai": "ai"
+        "unsaved": "未保存"
     },
     "gallery": {
         "generations": "生成的图像",
@@ -189,6 +188,10 @@
             "title": "常开选项卡",
             "desc": "保持选项浮窗常开"
         },
+        "toggleViewer": {
+            "title": "切换图像查看器",
+            "desc": "打开或关闭图像查看器"
+        },
         "toggleGallery": {
             "title": "切换图库",
             "desc": "打开或关闭图库"
@@ -249,6 +252,10 @@
             "title": "下一张图像",
             "desc": "显示图库中的下一张图像"
         },
+        "toggleGalleryPin": {
+            "title": "切换图库常开",
+            "desc": "开关图库在界面中的常开模式"
+        },
         "increaseGalleryThumbSize": {
             "title": "增大预览尺寸",
             "desc": "增大图库中预览的尺寸"
@@ -1115,8 +1122,7 @@
         "betaDesc": "此调用尚处于测试阶段。在稳定之前，它可能会在项目更新期间发生破坏性更改。本项目计划长期支持这种调用。",
         "newWorkflow": "新建工作流",
         "newWorkflowDesc": "是否创建一个新的工作流？",
-        "newWorkflowDesc2": "当前工作流有未保存的更改。",
-        "unsupportedAnyOfLength": "联合（union）数据类型数目过多 ({{count}})"
+        "newWorkflowDesc2": "当前工作流有未保存的更改。"
     },
     "controlnet": {
         "resize": "直接缩放",
@@ -1141,6 +1147,7 @@
         "crop": "裁剪",
         "processor": "处理器",
         "none": "无",
+        "incompatibleBaseModel": "不兼容的基础模型：",
         "enableControlnet": "启用 ControlNet",
         "detectResolution": "检测分辨率",
         "pidiDescription": "像素差分 (PIDI) 图像处理",

invokeai/frontend/web/scripts/typegen.js

@@ -1,9 +1,8 @@
 import fs from 'node:fs';
-
 import openapiTS from 'openapi-typescript';
 
 const OPENAPI_URL = 'http://127.0.0.1:9090/openapi.json';
-const OUTPUT_FILE = 'src/services/api/schema.ts';
+const OUTPUT_FILE = 'src/services/api/schema.d.ts';
 
 async function main() {
   process.stdout.write(

invokeai/frontend/web/src/app/components/App.tsx

@@ -1,29 +1,27 @@
-import { Box } from '@chakra-ui/react';
-import { useSocketIO } from 'app/hooks/useSocketIO';
+import { Flex, Grid } from '@chakra-ui/react';
+import { useStore } from '@nanostores/react';
 import { useLogger } from 'app/logging/useLogger';
 import { appStarted } from 'app/store/middleware/listenerMiddleware/listeners/appStarted';
+import { $headerComponent } from 'app/store/nanostores/headerComponent';
 import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
-import type { PartialAppConfig } from 'app/types/invokeai';
-import ImageUploadOverlay from 'common/components/ImageUploadOverlay';
-import { useClearStorage } from 'common/hooks/useClearStorage';
-import { useFullscreenDropzone } from 'common/hooks/useFullscreenDropzone';
-import { useGlobalHotkeys } from 'common/hooks/useGlobalHotkeys';
-import { useGlobalModifiersInit } from 'common/hooks/useGlobalModifiers';
+import { PartialAppConfig } from 'app/types/invokeai';
+import ImageUploader from 'common/components/ImageUploader';
 import ChangeBoardModal from 'features/changeBoardModal/components/ChangeBoardModal';
 import DeleteImageModal from 'features/deleteImageModal/components/DeleteImageModal';
-import { DynamicPromptsModal } from 'features/dynamicPrompts/components/DynamicPromptsPreviewModal';
+import SiteHeader from 'features/system/components/SiteHeader';
 import { configChanged } from 'features/system/store/configSlice';
 import { languageSelector } from 'features/system/store/systemSelectors';
 import InvokeTabs from 'features/ui/components/InvokeTabs';
-import { AnimatePresence } from 'framer-motion';
 import i18n from 'i18n';
 import { size } from 'lodash-es';
 import { memo, useCallback, useEffect } from 'react';
 import { ErrorBoundary } from 'react-error-boundary';
-
 import AppErrorBoundaryFallback from './AppErrorBoundaryFallback';
+import GlobalHotkeys from './GlobalHotkeys';
 import PreselectedImage from './PreselectedImage';
 import Toaster from './Toaster';
+import { useSocketIO } from 'app/hooks/useSocketIO';
+import { useClearStorage } from 'common/hooks/useClearStorage';
 
 const DEFAULT_CONFIG = {};
 
@@ -43,11 +41,6 @@ const App = ({ config = DEFAULT_CONFIG, selectedImage }: Props) => {
 
   // singleton!
   useSocketIO();
-  useGlobalModifiersInit();
-  useGlobalHotkeys();
-
-  const { dropzone, isHandlingUpload, setIsHandlingUpload } =
-    useFullscreenDropzone();
 
   const handleReset = useCallback(() => {
     clearStorage();
@@ -70,34 +63,41 @@ const App = ({ config = DEFAULT_CONFIG, selectedImage }: Props) => {
     dispatch(appStarted());
   }, [dispatch]);
 
+  const headerComponent = useStore($headerComponent);
+
   return (
     <ErrorBoundary
       onReset={handleReset}
       FallbackComponent={AppErrorBoundaryFallback}
     >
-      <Box
-        id="invoke-app-wrapper"
-        w="100vw"
-        h="100vh"
-        position="relative"
-        overflow="hidden"
-        {...dropzone.getRootProps()}
-      >
-        <input {...dropzone.getInputProps()} />
-        <InvokeTabs />
-        <AnimatePresence>
-          {dropzone.isDragActive && isHandlingUpload && (
-            <ImageUploadOverlay
-              dropzone={dropzone}
-              setIsHandlingUpload={setIsHandlingUpload}
-            />
-          )}
-        </AnimatePresence>
-      </Box>
+      <Grid w="100vw" h="100vh" position="relative" overflow="hidden">
+        <ImageUploader>
+          <Grid
+            sx={{
+              gap: 4,
+              p: 4,
+              gridAutoRows: 'min-content auto',
+              w: 'full',
+              h: 'full',
+            }}
+          >
+            {headerComponent || <SiteHeader />}
+            <Flex
+              sx={{
+                gap: 4,
+                w: 'full',
+                h: 'full',
+              }}
+            >
+              <InvokeTabs />
+            </Flex>
+          </Grid>
+        </ImageUploader>
+      </Grid>
       <DeleteImageModal />
       <ChangeBoardModal />
-      <DynamicPromptsModal />
       <Toaster />
+      <GlobalHotkeys />
       <PreselectedImage selectedImage={selectedImage} />
     </ErrorBoundary>
   );

invokeai/frontend/web/src/app/components/AppErrorBoundaryFallback.tsx

@@ -1,6 +1,5 @@
-import { Flex, Heading, Link, useToast } from '@chakra-ui/react';
-import { InvButton } from 'common/components/InvButton/InvButton';
-import { InvText } from 'common/components/InvText/wrapper';
+import { Flex, Heading, Link, Text, useToast } from '@chakra-ui/react';
+import IAIButton from 'common/components/IAIButton';
 import newGithubIssueUrl from 'new-github-issue-url';
 import { memo, useCallback, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -38,48 +37,60 @@ const AppErrorBoundaryFallback = ({ error, resetErrorBoundary }: Props) => {
   return (
     <Flex
       layerStyle="body"
-      w="100vw"
-      h="100vh"
-      alignItems="center"
-      justifyContent="center"
-      p={4}
+      sx={{
+        w: '100vw',
+        h: '100vh',
+        alignItems: 'center',
+        justifyContent: 'center',
+        p: 4,
+      }}
     >
       <Flex
         layerStyle="first"
-        flexDir="column"
-        borderRadius="base"
-        justifyContent="center"
-        gap={8}
-        p={16}
+        sx={{
+          flexDir: 'column',
+          borderRadius: 'base',
+          justifyContent: 'center',
+          gap: 8,
+          p: 16,
+        }}
       >
         <Heading>{t('common.somethingWentWrong')}</Heading>
         <Flex
           layerStyle="second"
-          px={8}
-          py={4}
-          gap={4}
-          borderRadius="base"
-          justifyContent="space-between"
-          alignItems="center"
+          sx={{
+            px: 8,
+            py: 4,
+            borderRadius: 'base',
+            gap: 4,
+            justifyContent: 'space-between',
+            alignItems: 'center',
+          }}
         >
-          <InvText fontWeight="semibold" color="error.400">
+          <Text
+            sx={{
+              fontWeight: 600,
+              color: 'error.500',
+              _dark: { color: 'error.400' },
+            }}
+          >
             {error.name}: {error.message}
-          </InvText>
+          </Text>
         </Flex>
-        <Flex gap={4}>
-          <InvButton
+        <Flex sx={{ gap: 4 }}>
+          <IAIButton
             leftIcon={<FaArrowRotateLeft />}
             onClick={resetErrorBoundary}
           >
             {t('accessibility.resetUI')}
-          </InvButton>
-          <InvButton leftIcon={<FaCopy />} onClick={handleCopy}>
+          </IAIButton>
+          <IAIButton leftIcon={<FaCopy />} onClick={handleCopy}>
             {t('common.copyError')}
-          </InvButton>
+          </IAIButton>
           <Link href={url} isExternal>
-            <InvButton leftIcon={<FaExternalLinkAlt />}>
+            <IAIButton leftIcon={<FaExternalLinkAlt />}>
               {t('accessibility.createIssue')}
-            </InvButton>
+            </IAIButton>
           </Link>
         </Flex>
       </Flex>

invokeai/frontend/web/src/app/components/GlobalHotkeys.ts

@@ -0,0 +1,112 @@
+import { createMemoizedSelector } from 'app/store/createMemoizedSelector';
+import { stateSelector } from 'app/store/store';
+import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
+import { useQueueBack } from 'features/queue/hooks/useQueueBack';
+import { useQueueFront } from 'features/queue/hooks/useQueueFront';
+import {
+  ctrlKeyPressed,
+  metaKeyPressed,
+  shiftKeyPressed,
+} from 'features/ui/store/hotkeysSlice';
+import { setActiveTab } from 'features/ui/store/uiSlice';
+import React, { memo } from 'react';
+import { isHotkeyPressed, useHotkeys } from 'react-hotkeys-hook';
+
+const globalHotkeysSelector = createMemoizedSelector(
+  [stateSelector],
+  ({ hotkeys }) => {
+    const { shift, ctrl, meta } = hotkeys;
+    return { shift, ctrl, meta };
+  }
+);
+
+// TODO: Does not catch keypresses while focused in an input. Maybe there is a way?
+
+/**
+ * Logical component. Handles app-level global hotkeys.
+ * @returns null
+ */
+const GlobalHotkeys: React.FC = () => {
+  const dispatch = useAppDispatch();
+  const { shift, ctrl, meta } = useAppSelector(globalHotkeysSelector);
+  const {
+    queueBack,
+    isDisabled: isDisabledQueueBack,
+    isLoading: isLoadingQueueBack,
+  } = useQueueBack();
+
+  useHotkeys(
+    ['ctrl+enter', 'meta+enter'],
+    queueBack,
+    {
+      enabled: () => !isDisabledQueueBack && !isLoadingQueueBack,
+      preventDefault: true,
+      enableOnFormTags: ['input', 'textarea', 'select'],
+    },
+    [queueBack, isDisabledQueueBack, isLoadingQueueBack]
+  );
+
+  const {
+    queueFront,
+    isDisabled: isDisabledQueueFront,
+    isLoading: isLoadingQueueFront,
+  } = useQueueFront();
+
+  useHotkeys(
+    ['ctrl+shift+enter', 'meta+shift+enter'],
+    queueFront,
+    {
+      enabled: () => !isDisabledQueueFront && !isLoadingQueueFront,
+      preventDefault: true,
+      enableOnFormTags: ['input', 'textarea', 'select'],
+    },
+    [queueFront, isDisabledQueueFront, isLoadingQueueFront]
+  );
+
+  useHotkeys(
+    '*',
+    () => {
+      if (isHotkeyPressed('shift')) {
+        !shift && dispatch(shiftKeyPressed(true));
+      } else {
+        shift && dispatch(shiftKeyPressed(false));
+      }
+      if (isHotkeyPressed('ctrl')) {
+        !ctrl && dispatch(ctrlKeyPressed(true));
+      } else {
+        ctrl && dispatch(ctrlKeyPressed(false));
+      }
+      if (isHotkeyPressed('meta')) {
+        !meta && dispatch(metaKeyPressed(true));
+      } else {
+        meta && dispatch(metaKeyPressed(false));
+      }
+    },
+    { keyup: true, keydown: true },
+    [shift, ctrl, meta]
+  );
+
+  useHotkeys('1', () => {
+    dispatch(setActiveTab('txt2img'));
+  });
+
+  useHotkeys('2', () => {
+    dispatch(setActiveTab('img2img'));
+  });
+
+  useHotkeys('3', () => {
+    dispatch(setActiveTab('unifiedCanvas'));
+  });
+
+  useHotkeys('4', () => {
+    dispatch(setActiveTab('nodes'));
+  });
+
+  useHotkeys('5', () => {
+    dispatch(setActiveTab('modelManager'));
+  });
+
+  return null;
+};
+
+export default memo(GlobalHotkeys);

invokeai/frontend/web/src/app/components/InvokeAIUI.tsx

@@ -1,27 +1,29 @@
-import 'i18n';
-
-import type { Middleware } from '@reduxjs/toolkit';
+import { Middleware } from '@reduxjs/toolkit';
 import { $socketOptions } from 'app/hooks/useSocketIO';
 import { $authToken } from 'app/store/nanostores/authToken';
 import { $baseUrl } from 'app/store/nanostores/baseUrl';
-import { $customNavComponent } from 'app/store/nanostores/customNavComponent';
-import type { CustomStarUi } from 'app/store/nanostores/customStarUI';
-import { $customStarUI } from 'app/store/nanostores/customStarUI';
-import { $galleryHeader } from 'app/store/nanostores/galleryHeader';
+import { $customStarUI, CustomStarUi } from 'app/store/nanostores/customStarUI';
+import { $headerComponent } from 'app/store/nanostores/headerComponent';
 import { $isDebugging } from 'app/store/nanostores/isDebugging';
-import { $logo } from 'app/store/nanostores/logo';
 import { $projectId } from 'app/store/nanostores/projectId';
 import { $queueId, DEFAULT_QUEUE_ID } from 'app/store/nanostores/queueId';
 import { $store } from 'app/store/nanostores/store';
 import { createStore } from 'app/store/store';
-import type { PartialAppConfig } from 'app/types/invokeai';
+import { PartialAppConfig } from 'app/types/invokeai';
 import Loading from 'common/components/Loading/Loading';
 import AppDndContext from 'features/dnd/components/AppDndContext';
-import type { PropsWithChildren, ReactNode } from 'react';
-import React, { lazy, memo, useEffect, useMemo } from 'react';
+import 'i18n';
+import React, {
+  PropsWithChildren,
+  ReactNode,
+  lazy,
+  memo,
+  useEffect,
+  useMemo,
+} from 'react';
 import { Provider } from 'react-redux';
 import { addMiddleware, resetMiddlewares } from 'redux-dynamic-middlewares';
-import type { ManagerOptions, SocketOptions } from 'socket.io-client';
+import { ManagerOptions, SocketOptions } from 'socket.io-client';
 
 const App = lazy(() => import('./App'));
 const ThemeLocaleProvider = lazy(() => import('./ThemeLocaleProvider'));
@@ -30,10 +32,9 @@ interface Props extends PropsWithChildren {
   apiUrl?: string;
   token?: string;
   config?: PartialAppConfig;
-  customNavComponent?: ReactNode;
+  headerComponent?: ReactNode;
   middleware?: Middleware[];
   projectId?: string;
-  galleryHeader?: ReactNode;
   queueId?: string;
   selectedImage?: {
     imageName: string;
@@ -42,23 +43,20 @@ interface Props extends PropsWithChildren {
   customStarUi?: CustomStarUi;
   socketOptions?: Partial<ManagerOptions & SocketOptions>;
   isDebugging?: boolean;
-  logo?: ReactNode;
 }
 
 const InvokeAIUI = ({
   apiUrl,
   token,
   config,
-  customNavComponent,
+  headerComponent,
   middleware,
   projectId,
-  galleryHeader,
   queueId,
   selectedImage,
   customStarUi,
   socketOptions,
   isDebugging = false,
-  logo,
 }: Props) => {
   useEffect(() => {
     // configure API client token
@@ -114,34 +112,14 @@ const InvokeAIUI = ({
   }, [customStarUi]);
 
   useEffect(() => {
-    if (customNavComponent) {
-      $customNavComponent.set(customNavComponent);
+    if (headerComponent) {
+      $headerComponent.set(headerComponent);
     }
 
     return () => {
-      $customNavComponent.set(undefined);
+      $headerComponent.set(undefined);
     };
-  }, [customNavComponent]);
-
-  useEffect(() => {
-    if (galleryHeader) {
-      $galleryHeader.set(galleryHeader);
-    }
-
-    return () => {
-      $galleryHeader.set(undefined);
-    };
-  }, [galleryHeader]);
-
-  useEffect(() => {
-    if (logo) {
-      $logo.set(logo);
-    }
-
-    return () => {
-      $logo.set(undefined);
-    };
-  }, [logo]);
+  }, [headerComponent]);
 
   useEffect(() => {
     if (socketOptions) {
@@ -167,15 +145,6 @@ const InvokeAIUI = ({
 
   useEffect(() => {
     $store.set(store);
-    if (import.meta.env.MODE === 'development') {
-      window.$store = $store;
-    }
-    () => {
-      $store.set(undefined);
-      if (import.meta.env.MODE === 'development') {
-        window.$store = undefined;
-      }
-    };
   }, [store]);
 
   return (

invokeai/frontend/web/src/app/components/ThemeLocaleProvider.tsx

@@ -1,17 +1,24 @@
-import '@fontsource-variable/inter';
-import 'overlayscrollbars/overlayscrollbars.css';
-import 'common/components/OverlayScrollbars/overlayscrollbars.css';
-
-import { ChakraProvider, extendTheme } from '@chakra-ui/react';
-import type { ReactNode } from 'react';
-import { memo, useEffect, useMemo } from 'react';
+import {
+  ChakraProvider,
+  createLocalStorageManager,
+  extendTheme,
+} from '@chakra-ui/react';
+import { ReactNode, memo, useEffect, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
-import { theme as invokeAITheme, TOAST_OPTIONS } from 'theme/theme';
+import { TOAST_OPTIONS, theme as invokeAITheme } from 'theme/theme';
+
+import '@fontsource-variable/inter';
+import { MantineProvider } from '@mantine/core';
+import { useMantineTheme } from 'mantine-theme/theme';
+import 'overlayscrollbars/overlayscrollbars.css';
+import 'theme/css/overlayscrollbars.css';
 
 type ThemeLocaleProviderProps = {
   children: ReactNode;
 };
 
+const manager = createLocalStorageManager('@@invokeai-color-mode');
+
 function ThemeLocaleProvider({ children }: ThemeLocaleProviderProps) {
   const { i18n } = useTranslation();
 
@@ -28,10 +35,18 @@ function ThemeLocaleProvider({ children }: ThemeLocaleProviderProps) {
     document.body.dir = direction;
   }, [direction]);
 
+  const mantineTheme = useMantineTheme();
+
   return (
-    <ChakraProvider theme={theme} toastOptions={TOAST_OPTIONS}>
-      {children}
-    </ChakraProvider>
+    <MantineProvider theme={mantineTheme}>
+      <ChakraProvider
+        theme={theme}
+        colorModeManager={manager}
+        toastOptions={TOAST_OPTIONS}
+      >
+        {children}
+      </ChakraProvider>
+    </MantineProvider>
   );
 }
 

invokeai/frontend/web/src/app/components/Toaster.ts

@@ -1,8 +1,7 @@
 import { useToast } from '@chakra-ui/react';
 import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
 import { addToast, clearToastQueue } from 'features/system/store/systemSlice';
-import type { MakeToastArg } from 'features/system/util/makeToast';
-import { makeToast } from 'features/system/util/makeToast';
+import { MakeToastArg, makeToast } from 'features/system/util/makeToast';
 import { memo, useCallback, useEffect } from 'react';
 
 /**
@@ -11,7 +10,7 @@ import { memo, useCallback, useEffect } from 'react';
  */
 const Toaster = () => {
   const dispatch = useAppDispatch();
-  const toastQueue = useAppSelector((s) => s.system.toastQueue);
+  const toastQueue = useAppSelector((state) => state.system.toastQueue);
   const toast = useToast();
   useEffect(() => {
     toastQueue.forEach((t) => {

invokeai/frontend/web/src/app/features.ts

@@ -0,0 +1,94 @@
+import { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
+
+type FeatureHelpInfo = {
+  text: string;
+  href: string;
+  guideImage: string;
+};
+
+export enum Feature {
+  PROMPT,
+  GALLERY,
+  OTHER,
+  SEED,
+  VARIATIONS,
+  UPSCALE,
+  FACE_CORRECTION,
+  IMAGE_TO_IMAGE,
+  BOUNDING_BOX,
+  SEAM_CORRECTION,
+  INFILL_AND_SCALING,
+}
+/** For each tooltip in the UI, the below feature definitions & props will pull relevant information into the tooltip.
+ *
+ * To-do: href & GuideImages are placeholders, and are not currently utilized, but will be updated (along with the tooltip UI) as feature and UI develop and we get a better idea on where things "forever homes" will be .
+ */
+const useFeatures = (): Record<Feature, FeatureHelpInfo> => {
+  const { t } = useTranslation();
+  return useMemo(
+    () => ({
+      [Feature.PROMPT]: {
+        text: t('tooltip.feature.prompt'),
+        href: 'link/to/docs/feature3.html',
+        guideImage: 'asset/path.gif',
+      },
+      [Feature.GALLERY]: {
+        text: t('tooltip.feature.gallery'),
+        href: 'link/to/docs/feature3.html',
+        guideImage: 'asset/path.gif',
+      },
+      [Feature.OTHER]: {
+        text: t('tooltip.feature.other'),
+        href: 'link/to/docs/feature3.html',
+        guideImage: 'asset/path.gif',
+      },
+      [Feature.SEED]: {
+        text: t('tooltip.feature.seed'),
+        href: 'link/to/docs/feature3.html',
+        guideImage: 'asset/path.gif',
+      },
+      [Feature.VARIATIONS]: {
+        text: t('tooltip.feature.variations'),
+        href: 'link/to/docs/feature3.html',
+        guideImage: 'asset/path.gif',
+      },
+      [Feature.UPSCALE]: {
+        text: t('tooltip.feature.upscale'),
+        href: 'link/to/docs/feature1.html',
+        guideImage: 'asset/path.gif',
+      },
+      [Feature.FACE_CORRECTION]: {
+        text: t('tooltip.feature.faceCorrection'),
+        href: 'link/to/docs/feature3.html',
+        guideImage: 'asset/path.gif',
+      },
+      [Feature.IMAGE_TO_IMAGE]: {
+        text: t('tooltip.feature.imageToImage'),
+        href: 'link/to/docs/feature3.html',
+        guideImage: 'asset/path.gif',
+      },
+      [Feature.BOUNDING_BOX]: {
+        text: t('tooltip.feature.boundingBox'),
+        href: 'link/to/docs/feature3.html',
+        guideImage: 'asset/path.gif',
+      },
+      [Feature.SEAM_CORRECTION]: {
+        text: t('tooltip.feature.seamCorrection'),
+        href: 'link/to/docs/feature3.html',
+        guideImage: 'asset/path.gif',
+      },
+      [Feature.INFILL_AND_SCALING]: {
+        text: t('tooltip.feature.infillAndScaling'),
+        href: 'link/to/docs/feature3.html',
+        guideImage: 'asset/path.gif',
+      },
+    }),
+    [t]
+  );
+};
+
+export const useFeatureHelpInfo = (feature: Feature): FeatureHelpInfo => {
+  const features = useFeatures();
+  return features[feature];
+};

invokeai/frontend/web/src/app/hooks/useSocketIO.ts

@@ -3,16 +3,14 @@ import { $authToken } from 'app/store/nanostores/authToken';
 import { $baseUrl } from 'app/store/nanostores/baseUrl';
 import { $isDebugging } from 'app/store/nanostores/isDebugging';
 import { useAppDispatch } from 'app/store/storeHooks';
-import type { MapStore } from 'nanostores';
-import { atom, map } from 'nanostores';
+import { MapStore, atom, map } from 'nanostores';
 import { useEffect, useMemo } from 'react';
-import type {
+import {
   ClientToServerEvents,
   ServerToClientEvents,
 } from 'services/events/types';
 import { setEventListeners } from 'services/events/util/setEventListeners';
-import type { ManagerOptions, Socket, SocketOptions } from 'socket.io-client';
-import { io } from 'socket.io-client';
+import { ManagerOptions, Socket, SocketOptions, io } from 'socket.io-client';
 
 // Inject socket options and url into window for debugging
 declare global {

invokeai/frontend/web/src/app/logging/logger.ts

@@ -1,8 +1,6 @@
 import { createLogWriter } from '@roarr/browser-log-writer';
 import { atom } from 'nanostores';
-import type { Logger } from 'roarr';
-import { ROARR, Roarr } from 'roarr';
-import { z } from 'zod';
+import { Logger, ROARR, Roarr } from 'roarr';
 
 ROARR.write = createLogWriter();
 
@@ -28,20 +26,19 @@ export type LoggerNamespace =
 export const logger = (namespace: LoggerNamespace) =>
   $logger.get().child({ namespace });
 
-export const zLogLevel = z.enum([
+export const VALID_LOG_LEVELS = [
   'trace',
   'debug',
   'info',
   'warn',
   'error',
   'fatal',
-]);
-export type LogLevel = z.infer<typeof zLogLevel>;
-export const isLogLevel = (v: unknown): v is LogLevel =>
-  zLogLevel.safeParse(v).success;
+] as const;
+
+export type InvokeLogLevel = (typeof VALID_LOG_LEVELS)[number];
 
 // Translate human-readable log levels to numbers, used for log filtering
-export const LOG_LEVEL_MAP: Record<LogLevel, number> = {
+export const LOG_LEVEL_MAP: Record<InvokeLogLevel, number> = {
   trace: 10,
   debug: 20,
   info: 30,

invokeai/frontend/web/src/app/logging/useLogger.ts

@@ -1,14 +1,28 @@
 import { createLogWriter } from '@roarr/browser-log-writer';
+import { createMemoizedSelector } from 'app/store/createMemoizedSelector';
+import { stateSelector } from 'app/store/store';
 import { useAppSelector } from 'app/store/storeHooks';
 import { useEffect, useMemo } from 'react';
 import { ROARR, Roarr } from 'roarr';
+import {
+  $logger,
+  BASE_CONTEXT,
+  LOG_LEVEL_MAP,
+  LoggerNamespace,
+  logger,
+} from './logger';
 
-import type { LoggerNamespace } from './logger';
-import { $logger, BASE_CONTEXT, LOG_LEVEL_MAP, logger } from './logger';
+const selector = createMemoizedSelector(stateSelector, ({ system }) => {
+  const { consoleLogLevel, shouldLogToConsole } = system;
+
+  return {
+    consoleLogLevel,
+    shouldLogToConsole,
+  };
+});
 
 export const useLogger = (namespace: LoggerNamespace) => {
-  const consoleLogLevel = useAppSelector((s) => s.system.consoleLogLevel);
-  const shouldLogToConsole = useAppSelector((s) => s.system.shouldLogToConsole);
+  const { consoleLogLevel, shouldLogToConsole } = useAppSelector(selector);
 
   // The provided Roarr browser log writer uses localStorage to config logging to console
   useEffect(() => {

invokeai/frontend/web/src/app/store/actions.ts

@@ -1,6 +1,6 @@
 import { createAction } from '@reduxjs/toolkit';
-import type { InvokeTabName } from 'features/ui/store/tabMap';
-import type { BatchConfig } from 'services/api/types';
+import { InvokeTabName } from 'features/ui/store/tabMap';
+import { BatchConfig } from 'services/api/types';
 
 export const enqueueRequested = createAction<{
   tabName: InvokeTabName;

invokeai/frontend/web/src/app/store/createMemoizedSelector.ts

@@ -1,9 +1,4 @@
-import {
-  createDraftSafeSelectorCreator,
-  createSelectorCreator,
-  lruMemoize,
-} from '@reduxjs/toolkit';
-import type { GetSelectorsOptions } from '@reduxjs/toolkit/dist/entities/state_selectors';
+import { createSelectorCreator, lruMemoize } from '@reduxjs/toolkit';
 import { isEqual } from 'lodash-es';
 
 /**
@@ -14,22 +9,4 @@ export const createMemoizedSelector = createSelectorCreator({
   memoizeOptions: {
     resultEqualityCheck: isEqual,
   },
-  argsMemoize: lruMemoize,
 });
-
-/**
- * A memoized selector creator that uses LRU cache default shallow equality check.
- */
-export const createLruSelector = createSelectorCreator({
-  memoize: lruMemoize,
-  argsMemoize: lruMemoize,
-});
-
-export const createLruDraftSafeSelector = createDraftSafeSelectorCreator({
-  memoize: lruMemoize,
-  argsMemoize: lruMemoize,
-});
-
-export const getSelectorsOptions: GetSelectorsOptions = {
-  createSelector: createLruDraftSafeSelector,
-};

invokeai/frontend/web/src/app/store/enhancers/reduxRemember/serialize.ts

@@ -8,7 +8,7 @@ import { postprocessingPersistDenylist } from 'features/parameters/store/postpro
 import { systemPersistDenylist } from 'features/system/store/systemPersistDenylist';
 import { uiPersistDenylist } from 'features/ui/store/uiPersistDenylist';
 import { omit } from 'lodash-es';
-import type { SerializeFunction } from 'redux-remember';
+import { SerializeFunction } from 'redux-remember';
 
 const serializationDenylist: {
   [key: string]: string[];

invokeai/frontend/web/src/app/store/enhancers/reduxRemember/unserialize.ts

@@ -8,9 +8,10 @@ import { initialPostprocessingState } from 'features/parameters/store/postproces
 import { initialSDXLState } from 'features/sdxl/store/sdxlSlice';
 import { initialConfigState } from 'features/system/store/configSlice';
 import { initialSystemState } from 'features/system/store/systemSlice';
+import { initialHotkeysState } from 'features/ui/store/hotkeysSlice';
 import { initialUIState } from 'features/ui/store/uiSlice';
 import { defaultsDeep } from 'lodash-es';
-import type { UnserializeFunction } from 'redux-remember';
+import { UnserializeFunction } from 'redux-remember';
 
 const initialStates: {
   [key: string]: object; // TODO: type this properly
@@ -23,6 +24,7 @@ const initialStates: {
   system: initialSystemState,
   config: initialConfigState,
   ui: initialUIState,
+  hotkeys: initialHotkeysState,
   controlAdapters: initialControlAdapterState,
   dynamicPrompts: initialDynamicPromptsState,
   sdxl: initialSDXLState,

invokeai/frontend/web/src/app/store/middleware/devtools/actionSanitizer.ts

@@ -1,8 +1,8 @@
-import type { UnknownAction } from '@reduxjs/toolkit';
+import { UnknownAction } from '@reduxjs/toolkit';
 import { isAnyGraphBuilt } from 'features/nodes/store/actions';
-import { nodeTemplatesBuilt } from 'features/nodes/store/nodeTemplatesSlice';
+import { nodeTemplatesBuilt } from 'features/nodes/store/nodesSlice';
 import { receivedOpenAPISchema } from 'services/api/thunks/schema';
-import type { Graph } from 'services/api/types';
+import { Graph } from 'services/api/types';
 
 export const actionSanitizer = <A extends UnknownAction>(action: A): A => {
   if (isAnyGraphBuilt(action)) {

invokeai/frontend/web/src/app/store/middleware/devtools/actionsDenylist.ts

@@ -3,14 +3,19 @@
  */
 export const actionsDenylist = [
   // very spammy canvas actions
+  'canvas/setCursorPosition',
   'canvas/setStageCoordinates',
   'canvas/setStageScale',
+  'canvas/setIsDrawing',
   'canvas/setBoundingBoxCoordinates',
   'canvas/setBoundingBoxDimensions',
+  'canvas/setIsDrawing',
   'canvas/addPointToCurrentLine',
   // bazillions during generation
   'socket/socketGeneratorProgress',
   'socket/appSocketGeneratorProgress',
+  // every time user presses shift
+  // 'hotkeys/shiftKeyPressed',
   // this happens after every state change
   '@@REMEMBER_PERSISTED',
 ];

invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/index.ts

@@ -1,12 +1,11 @@
-import type {
-  ListenerEffect,
-  TypedAddListener,
-  TypedStartListening,
+import type { TypedAddListener, TypedStartListening } from '@reduxjs/toolkit';
+import {
   UnknownAction,
+  ListenerEffect,
+  addListener,
+  createListenerMiddleware,
 } from '@reduxjs/toolkit';
-import { addListener, createListenerMiddleware } from '@reduxjs/toolkit';
 import type { AppDispatch, RootState } from 'app/store/store';
-
 import { addCommitStagingAreaImageListener } from './listeners/addCommitStagingAreaImageListener';
 import { addFirstListImagesListener } from './listeners/addFirstListImagesListener.ts';
 import { addAnyEnqueuedListener } from './listeners/anyEnqueued';
@@ -43,13 +42,13 @@ import {
   addImageRemovedFromBoardFulfilledListener,
   addImageRemovedFromBoardRejectedListener,
 } from './listeners/imageRemovedFromBoard';
-import { addImagesStarredListener } from './listeners/imagesStarred';
-import { addImagesUnstarredListener } from './listeners/imagesUnstarred';
 import { addImageToDeleteSelectedListener } from './listeners/imageToDeleteSelected';
 import {
   addImageUploadedFulfilledListener,
   addImageUploadedRejectedListener,
 } from './listeners/imageUploaded';
+import { addImagesStarredListener } from './listeners/imagesStarred';
+import { addImagesUnstarredListener } from './listeners/imagesUnstarred';
 import { addInitialImageSelectedListener } from './listeners/initialImageSelected';
 import { addModelSelectedListener } from './listeners/modelSelected';
 import { addModelsLoadedListener } from './listeners/modelsLoaded';
@@ -70,9 +69,9 @@ import { addSocketSubscribedEventListener as addSocketSubscribedListener } from
 import { addSocketUnsubscribedEventListener as addSocketUnsubscribedListener } from './listeners/socketio/socketUnsubscribed';
 import { addStagingAreaImageSavedListener } from './listeners/stagingAreaImageSaved';
 import { addTabChangedListener } from './listeners/tabChanged';
-import { addUpdateAllNodesRequestedListener } from './listeners/updateAllNodesRequested';
 import { addUpscaleRequestedListener } from './listeners/upscaleRequested';
 import { addWorkflowLoadRequestedListener } from './listeners/workflowLoadRequested';
+import { addUpdateAllNodesRequestedListener } from './listeners/updateAllNodesRequested';
 
 export const listenerMiddleware = createListenerMiddleware();
 

invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/addCommitStagingAreaImageListener.ts

@@ -8,7 +8,6 @@ import {
 import { addToast } from 'features/system/store/systemSlice';
 import { t } from 'i18next';
 import { queueApi } from 'services/api/endpoints/queue';
-
 import { startAppListening } from '..';
 
 const matcher = isAnyOf(commitStagingAreaImage, discardStagedImages);

invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/addFirstListImagesListener.ts.ts

@@ -2,10 +2,9 @@ import { createAction } from '@reduxjs/toolkit';
 import { imageSelected } from 'features/gallery/store/gallerySlice';
 import { IMAGE_CATEGORIES } from 'features/gallery/store/types';
 import { imagesApi } from 'services/api/endpoints/images';
-import type { ImageCache } from 'services/api/types';
-import { getListImagesUrl, imagesSelectors } from 'services/api/util';
-
 import { startAppListening } from '..';
+import { getListImagesUrl, imagesAdapter } from 'services/api/util';
+import { ImageCache } from 'services/api/types';
 
 export const appStarted = createAction('app/appStarted');
 
@@ -33,7 +32,7 @@ export const addFirstListImagesListener = () => {
 
       if (data.ids.length > 0) {
         // Select the first image
-        const firstImage = imagesSelectors.selectAll(data)[0];
+        const firstImage = imagesAdapter.getSelectors().selectAll(data)[0];
         dispatch(imageSelected(firstImage ?? null));
       }
     },

invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/anyEnqueued.ts

@@ -1,5 +1,4 @@
 import { queueApi } from 'services/api/endpoints/queue';
-
 import { startAppListening } from '..';
 
 export const addAnyEnqueuedListener = () => {