Update diffuses to 0.25

.github/CODEOWNERS

@@ -1,5 +1,5 @@
 # continuous integration
-/.github/workflows/  @lstein @blessedcoolant @hipsterusername @ebr
+/.github/workflows/  @lstein @blessedcoolant @hipsterusername
 
 # documentation
 /docs/ @lstein @blessedcoolant @hipsterusername @Millu
@@ -10,7 +10,7 @@
 
 # installation and configuration
 /pyproject.toml  @lstein @blessedcoolant @hipsterusername
-/docker/  @lstein @blessedcoolant @hipsterusername @ebr
+/docker/  @lstein @blessedcoolant @hipsterusername
 /scripts/ @ebr @lstein @hipsterusername
 /installer/ @lstein @ebr @hipsterusername
 /invokeai/assets @lstein @ebr @hipsterusername
@@ -26,7 +26,9 @@
 
 # front ends
 /invokeai/frontend/CLI @lstein @hipsterusername
-/invokeai/frontend/install @lstein @ebr @hipsterusername
+/invokeai/frontend/install @lstein @ebr @hipsterusername 
 /invokeai/frontend/merge @lstein @blessedcoolant @hipsterusername
 /invokeai/frontend/training @lstein @blessedcoolant @hipsterusername
 /invokeai/frontend/web @psychedelicious @blessedcoolant @maryhipp @hipsterusername
+
+

.github/workflows/build-container.yml

@@ -40,14 +40,10 @@ jobs:
       - name: Free up more disk space on the runner
         # https://github.com/actions/runner-images/issues/2840#issuecomment-1284059930
         run: |
-          echo "----- Free space before cleanup"
-          df -h
           sudo rm -rf /usr/share/dotnet
           sudo rm -rf "$AGENT_TOOLSDIRECTORY"
           sudo swapoff /mnt/swapfile
           sudo rm -rf /mnt/swapfile
-          echo "----- Free space after cleanup"
-          df -h
 
       - name: Checkout
         uses: actions/checkout@v3
@@ -95,7 +91,6 @@ jobs:
       #     password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Build container
-        timeout-minutes: 40
         id: docker_build
         uses: docker/build-push-action@v4
         with:

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,13 +2,10 @@
 ## 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=

docker/Dockerfile

@@ -59,7 +59,7 @@ RUN --mount=type=cache,target=/root/.cache/pip \
 
 # #### Build the Web UI ------------------------------------
 
-FROM node:20-slim AS web-builder
+FROM node:18-slim AS web-builder
 ENV PNPM_HOME="/pnpm"
 ENV PATH="$PNPM_HOME:$PATH"
 RUN corepack enable
@@ -68,7 +68,7 @@ WORKDIR /build
 COPY invokeai/frontend/web/ ./
 RUN --mount=type=cache,target=/pnpm/store \
     pnpm install --frozen-lockfile
-RUN npx vite build
+RUN pnpm run build
 
 #### Runtime stage ---------------------------------------
 

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}}

docs/deprecated/2to3.md

@@ -1,53 +0,0 @@
-## :octicons-log-16: Important Changes Since Version 2.3
-
-### Nodes
-
-Behind the scenes, InvokeAI has been completely rewritten to support
-"nodes," small unitary operations that can be combined into graphs to
-form arbitrary workflows. For example, there is a prompt node that
-processes the prompt string and feeds it to a text2latent node that
-generates a latent image. The latents are then fed to a latent2image
-node that translates the latent image into a PNG.
-
-The WebGUI has a node editor that allows you to graphically design and
-execute custom node graphs. The ability to save and load graphs is
-still a work in progress, but coming soon.
-
-### Command-Line Interface Retired
-
-All "invokeai" command-line interfaces have been retired as of version
-3.4.
-
-To launch the Web GUI from the command-line, use the command
-`invokeai-web` rather than the traditional `invokeai --web`.
-
-### ControlNet
-
-This version of InvokeAI features ControlNet, a system that allows you
-to achieve exact poses for human and animal figures by providing a
-model to follow. Full details are found in [ControlNet](features/CONTROLNET.md)
-
-### New Schedulers
-
-The list of schedulers has been completely revamped and brought up to date:
-
-| **Short Name** | **Scheduler**                   | **Notes**                   |
-|----------------|---------------------------------|-----------------------------|
-| **ddim**       | DDIMScheduler                   |                             |
-| **ddpm**       | DDPMScheduler                   |                             |
-| **deis**       | DEISMultistepScheduler          |                             |
-| **lms**        | LMSDiscreteScheduler            |                             |
-| **pndm**       | PNDMScheduler                   |                             |
-| **heun**       | HeunDiscreteScheduler           | original noise schedule     |
-| **heun_k**     | HeunDiscreteScheduler           | using karras noise schedule |
-| **euler**      | EulerDiscreteScheduler          | original noise schedule     |
-| **euler_k**    | EulerDiscreteScheduler          | using karras noise schedule |
-| **kdpm_2**     | KDPM2DiscreteScheduler          |                             |
-| **kdpm_2_a**   | KDPM2AncestralDiscreteScheduler |                             |
-| **dpmpp_2s**   | DPMSolverSinglestepScheduler    |                             |
-| **dpmpp_2m**   | DPMSolverMultistepScheduler     | original noise scnedule     |
-| **dpmpp_2m_k** | DPMSolverMultistepScheduler     | using karras noise schedule |
-| **unipc**      | UniPCMultistepScheduler         | CPU only                    |
-| **lcm**        | LCMScheduler                    |                             |
-
-Please see [3.0.0 Release Notes](https://github.com/invoke-ai/InvokeAI/releases/tag/v3.0.0) for further details.

docs/features/UNIFIED_CANVAS.md

@@ -229,28 +229,29 @@ clarity on the intent and common use cases we expect for utilizing them.
   currently being rendered by your browser into a merged copy of the image. This
   lowers the resource requirements and should improve performance.
 
-### Compositing / Seam Correction
+### Seam Correction
 
 When doing Inpainting or Outpainting, Invoke needs to merge the pixels generated
-by Stable Diffusion into your existing image. This is achieved through compositing - the area around the the boundary between your image and the new generation is
+by Stable Diffusion into your existing image. To do this, the area around the
+`seam` at the boundary between your image and the new generation is
 automatically blended to produce a seamless output. In a fully automatic
-process, a mask is generated to cover the boundary, and then the area of the boundary is
+process, a mask is generated to cover the seam, and then the area of the seam is
 Inpainted.
 
 Although the default options should work well most of the time, sometimes it can
-help to alter the parameters that control the Compositing. A larger blur and
-a blur setting  have been noted as producing
-consistently strong results . Strength of 0.7 is best for reducing hard seams.
-
-- **Mode** - What part of the image will have the the Compositing applied to it.
-  - **Mask edge** will apply Compositing to the edge of the masked area
-  - **Mask** will apply Compositing to the entire masked area
-  - **Unmasked** will apply Compositing to the entire image
-- **Steps** - Number of generation steps that will occur during the Coherence Pass, similar to Denoising Steps. Higher step counts will generally have better results.
-- **Strength** - How much noise is added for the Coherence Pass, similar to Denoising Strength. A strength of 0 will result in an unchanged image, while a strength of 1 will result in an image with a completely new area as defined by the Mode setting.
-- **Blur** - Adjusts the pixel radius of the the mask. A larger blur radius will cause the mask to extend past the visibly masked area, while too small of a blur radius will result in a mask that is smaller than the visibly masked area.
-- **Blur Method** - The method of blur applied to the masked area. 
+help to alter the parameters that control the seam Inpainting. A wider seam and
+a blur setting of about 1/3 of the seam have been noted as producing
+consistently strong results (e.g. 96 wide and 16 blur - adds up to 32 blur with
+both sides). Seam strength of 0.7 is best for reducing hard seams.
 
+- **Seam Size** - The size of the seam masked area. Set higher to make a larger
+  mask around the seam.
+- **Seam Blur** - The size of the blur that is applied on _each_ side of the
+  masked area.
+- **Seam Strength** - The Image To Image Strength parameter used for the
+  Inpainting generation that is applied to the seam area.
+- **Seam Steps** - The number of generation steps that should be used to Inpaint
+  the seam.
 
 ### Infill & Scaling
 

docs/index.md

@@ -18,7 +18,7 @@ title: Home
       width: 100%;
       max-width: 100%;
       height: 50px;
-      background-color: #35A4DB;
+      background-color: #448AFF;
       color: #fff;
       font-size: 16px;
       border: none;
@@ -43,7 +43,7 @@ title: Home
 <div align="center" markdown>
 
 
-[![project logo](https://github.com/invoke-ai/InvokeAI/assets/31807370/6e3728c7-e90e-4711-905c-3b55844ff5be)](https://github.com/invoke-ai/InvokeAI)
+[![project logo](assets/invoke_ai_banner.png)](https://github.com/invoke-ai/InvokeAI)
 
 [![discord badge]][discord link]
 
@@ -145,6 +145,60 @@ Mac and Linux machines, and runs on GPU cards with as little as 4 GB of RAM.
 - [Guide to InvokeAI Runtime Settings](features/CONFIGURATION.md)
 - [Database Maintenance and other Command Line Utilities](features/UTILITIES.md)
 
+## :octicons-log-16: Important Changes Since Version 2.3
+
+### Nodes
+
+Behind the scenes, InvokeAI has been completely rewritten to support
+"nodes," small unitary operations that can be combined into graphs to
+form arbitrary workflows. For example, there is a prompt node that
+processes the prompt string and feeds it to a text2latent node that
+generates a latent image. The latents are then fed to a latent2image
+node that translates the latent image into a PNG.
+
+The WebGUI has a node editor that allows you to graphically design and
+execute custom node graphs. The ability to save and load graphs is
+still a work in progress, but coming soon.
+
+### Command-Line Interface Retired
+
+All "invokeai" command-line interfaces have been retired as of version
+3.4.
+
+To launch the Web GUI from the command-line, use the command
+`invokeai-web` rather than the traditional `invokeai --web`.
+
+### ControlNet
+
+This version of InvokeAI features ControlNet, a system that allows you
+to achieve exact poses for human and animal figures by providing a
+model to follow. Full details are found in [ControlNet](features/CONTROLNET.md)
+
+### New Schedulers
+
+The list of schedulers has been completely revamped and brought up to date:
+
+| **Short Name** | **Scheduler**                   | **Notes**                   |
+|----------------|---------------------------------|-----------------------------|
+| **ddim**       | DDIMScheduler                   |                             |
+| **ddpm**       | DDPMScheduler                   |                             |
+| **deis**       | DEISMultistepScheduler          |                             |
+| **lms**        | LMSDiscreteScheduler            |                             |
+| **pndm**       | PNDMScheduler                   |                             |
+| **heun**       | HeunDiscreteScheduler           | original noise schedule     |
+| **heun_k**     | HeunDiscreteScheduler           | using karras noise schedule |
+| **euler**      | EulerDiscreteScheduler          | original noise schedule     |
+| **euler_k**    | EulerDiscreteScheduler          | using karras noise schedule |
+| **kdpm_2**     | KDPM2DiscreteScheduler          |                             |
+| **kdpm_2_a**   | KDPM2AncestralDiscreteScheduler |                             |
+| **dpmpp_2s**   | DPMSolverSinglestepScheduler    |                             |
+| **dpmpp_2m**   | DPMSolverMultistepScheduler     | original noise scnedule     |
+| **dpmpp_2m_k** | DPMSolverMultistepScheduler     | using karras noise schedule |
+| **unipc**      | UniPCMultistepScheduler         | CPU only                    |
+| **lcm**        | LCMScheduler                    |                             |
+
+Please see [3.0.0 Release Notes](https://github.com/invoke-ai/InvokeAI/releases/tag/v3.0.0) for further details.
+
 ## :material-target: Troubleshooting
 
 Please check out our **[:material-frequently-asked-questions:

docs/nodes/NODES.md

@@ -6,17 +6,10 @@ If you're not familiar with Diffusion, take a look at our [Diffusion Overview.](
 
 ## Features
 
-### Workflow Library
-The Workflow Library enables you to save workflows to the Invoke database, allowing you to easily creating, modify and share workflows as needed. 
-
-A curated set of workflows are provided by default - these are designed to help explain important nodes' usage in the Workflow Editor.
-
-![workflow_library](../assets/nodes/workflow_library.png)
-
 ### Linear View
 The Workflow Editor allows you to create a UI for your workflow, to make it easier to iterate on your generations. 
 
-To add an input to the Linear UI, right click on the **input label** and select "Add to Linear View".
+To add an input to the Linear UI, right click on the input label and select "Add to Linear View".
 
 The Linear UI View will also be part of the saved workflow, allowing you share workflows and enable other to use them, regardless of complexity. 
 
@@ -37,7 +30,7 @@ Any node or input field can be renamed in the workflow editor. If the input fiel
 Nodes have a "Use Cache" option in their footer. This allows for performance improvements by using the previously cached values during the workflow processing. 
 
 
-## Important Nodes & Concepts 
+## Important Concepts 
 
 There are several node grouping concepts that can be examined with a narrow focus. These (and other) groupings can be pieced together to make up functional graph setups, and are important to understanding how groups of nodes work together as part of a whole. Note that the screenshots below aren't examples of complete functioning node graphs (see Examples).
 
@@ -63,7 +56,7 @@ The ImageToLatents node takes in a pixel image and a VAE and outputs a latents.
 
 It is common to want to use both the same seed (for continuity) and random seeds (for variety). To define a seed, simply enter it into the 'Seed' field on a noise node. Conversely, the RandomInt node generates a random integer between 'Low' and 'High', and can be used as input to the 'Seed' edge point on a noise node to randomize your seed.
 
-![groupsrandseed](../assets/nodes/groupsnoise.png)
+![groupsrandseed](../assets/nodes/groupsrandseed.png)
 
 ### ControlNet
 

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/nodes/exampleWorkflows.md

@@ -1,6 +1,6 @@
 # Example Workflows
 
-We've curated some example workflows for you to get started with Workflows in InvokeAI! These can also be found in the Workflow Library, located in the Workflow Editor of Invoke.
+We've curated some example workflows for you to get started with Workflows in InvokeAI
 
 To use them, right click on your desired workflow, follow the link to GitHub and click the "⬇" button to download the raw file. You can then use the "Load Workflow" functionality in InvokeAI to load the workflow and start generating images!
 

docs/other/CONTRIBUTORS.md

@@ -215,7 +215,6 @@ We thank them for all of their time and hard work.
 - Robert Bolender
 - Robin Rombach
 - Rohan Barar
-- rohinish404
 - rpagliuca
 - rromb
 - Rupesh Sreeraman

docs/stylesheets/extra.css

@@ -1,5 +0,0 @@
-:root {
-    --md-primary-fg-color:        #35A4DB;
-    --md-primary-fg-color--light: #35A4DB;
-    --md-primary-fg-color--dark:  #35A4DB;
-  }

installer/lib/installer.py

@@ -241,12 +241,12 @@ class InvokeAiInstance:
             pip[
                 "install",
                 "--require-virtualenv",
-                "numpy==1.26.3",  # choose versions that won't be uninstalled during phase 2
+                "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",
                 "torchmetrics==0.11.4",
-                "torchvision==0.16.2",
+                "torchvision>=0.16.2",
                 "--force-reinstall",
                 "--find-links" if find_links is not None else None,
                 find_links,

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/api_app.py

@@ -76,7 +76,7 @@ mimetypes.add_type("text/css", ".css")
 
 # Create the app
 # TODO: create this all in a method so configuration/etc. can be passed in?
-app = FastAPI(title="Invoke - Community Edition", docs_url=None, redoc_url=None, separate_input_output_schemas=False)
+app = FastAPI(title="Invoke AI", docs_url=None, redoc_url=None, separate_input_output_schemas=False)
 
 # Add event handler
 event_handler_id: int = id(app)
@@ -205,8 +205,8 @@ app.openapi = custom_openapi  # type: ignore [method-assign] # this is a valid a
 def overridden_swagger() -> HTMLResponse:
     return get_swagger_ui_html(
         openapi_url=app.openapi_url,  # type: ignore [arg-type] # this is always a string
-        title=f"{app.title} - Swagger UI",
-        swagger_favicon_url="static/docs/invoke-favicon-docs.svg",
+        title=app.title,
+        swagger_favicon_url="/static/docs/favicon.ico",
     )
 
 
@@ -214,8 +214,8 @@ def overridden_swagger() -> HTMLResponse:
 def overridden_redoc() -> HTMLResponse:
     return get_redoc_html(
         openapi_url=app.openapi_url,  # type: ignore [arg-type] # this is always a string
-        title=f"{app.title} - Redoc",
-        redoc_favicon_url="static/docs/invoke-favicon-docs.svg",
+        title=app.title,
+        redoc_favicon_url="/static/docs/favicon.ico",
     )
 
 
@@ -229,7 +229,7 @@ if (web_root_path / "dist").exists():
     def get_index() -> FileResponse:
         return FileResponse(Path(web_root_path, "dist/index.html"), headers={"Cache-Control": "no-store"})
 
-    # Must mount *after* the other routes else it borks em
+    # # Must mount *after* the other routes else it borks em
     app.mount("/assets", StaticFiles(directory=Path(web_root_path, "dist/assets/")), name="assets")
     app.mount("/locales", StaticFiles(directory=Path(web_root_path, "dist/locales/")), name="locales")
 

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

@@ -220,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"""
@@ -279,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,

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/config/__init__.py

@@ -1,7 +1,5 @@
 """Init file for InvokeAI configure package."""
 
-from invokeai.app.services.config.config_common import PagingArgumentParser
-
 from .config_default import InvokeAIAppConfig, get_invokeai_config
 
-__all__ = ["InvokeAIAppConfig", "get_invokeai_config", "PagingArgumentParser"]
+__all__ = ["InvokeAIAppConfig", "get_invokeai_config"]

invokeai/app/services/invocation_processor/invocation_processor_default.py

@@ -1,4 +1,3 @@
-import cProfile
 import time
 import traceback
 from threading import BoundedSemaphore, Event, Thread
@@ -40,9 +39,6 @@ class DefaultInvocationProcessor(InvocationProcessorABC):
             self.__threadLimit.acquire()
             queue_item: Optional[InvocationQueueItem] = None
 
-            profiler = None
-            last_gesid = None
-
             while not stop_event.is_set():
                 try:
                     queue_item = self.__invoker.services.queue.get()
@@ -53,21 +49,6 @@ class DefaultInvocationProcessor(InvocationProcessorABC):
                     # do not hammer the queue
                     time.sleep(0.5)
                     continue
-
-                if last_gesid != queue_item.graph_execution_state_id:
-                    if profiler is not None:
-                        # I'm not sure what would cause us to get here, but if we do, we should restart the profiler for
-                        # the new graph_execution_state_id.
-                        profiler.disable()
-                        logger.info(f"Stopped profiler for {last_gesid}.")
-                        profiler = None
-                        last_gesid = None
-
-                    profiler = cProfile.Profile()
-                    profiler.enable()
-                    last_gesid = queue_item.graph_execution_state_id
-                    logger.info(f"Started profiling {last_gesid}.")
-
                 try:
                     graph_execution_state = self.__invoker.services.graph_execution_manager.get(
                         queue_item.graph_execution_state_id
@@ -220,13 +201,6 @@ class DefaultInvocationProcessor(InvocationProcessorABC):
                         queue_id=queue_item.session_queue_id,
                         graph_execution_state_id=graph_execution_state.id,
                     )
-                    if profiler is not None:
-                        profiler.disable()
-                        dump_path = f"{last_gesid}.prof"
-                        profiler.dump_stats(dump_path)
-                        logger.info(f"Saved profile to {dump_path}.")
-                        profiler = None
-                        last_gesid = None
 
         except KeyboardInterrupt:
             pass  # Log something? KeyboardInterrupt is probably not going to be seen by the processor

invokeai/app/services/workflow_records/workflow_records_sqlite.py

@@ -169,7 +169,7 @@ class SqliteWorkflowRecordsStorage(WorkflowRecordsStorageBase):
 
             self._cursor.execute(count_query, count_params)
             total = self._cursor.fetchone()[0]
-            pages = total // per_page + (total % per_page > 0)
+            pages = int(total / per_page) + 1
 
             return PaginatedResults(
                 items=workflows,

invokeai/backend/model_management/detect_baked_in_vae.py

@@ -1,31 +0,0 @@
-# Copyright (c) 2024 Lincoln Stein and the InvokeAI Development Team
-"""
-This module exports the function has_baked_in_sdxl_vae().
-It returns True if an SDXL checkpoint model has the original SDXL 1.0 VAE,
-which doesn't work properly in fp16 mode.
-"""
-
-import hashlib
-from pathlib import Path
-
-from safetensors.torch import load_file
-
-SDXL_1_0_VAE_HASH = "bc40b16c3a0fa4625abdfc01c04ffc21bf3cefa6af6c7768ec61eb1f1ac0da51"
-
-
-def has_baked_in_sdxl_vae(checkpoint_path: Path) -> bool:
-    """Return true if the checkpoint contains a custom (non SDXL-1.0) VAE."""
-    hash = _vae_hash(checkpoint_path)
-    return hash != SDXL_1_0_VAE_HASH
-
-
-def _vae_hash(checkpoint_path: Path) -> str:
-    checkpoint = load_file(checkpoint_path, device="cpu")
-    vae_keys = [x for x in checkpoint.keys() if x.startswith("first_stage_model.")]
-    hash = hashlib.new("sha256")
-    for key in vae_keys:
-        value = checkpoint[key]
-        hash.update(bytes(key, "UTF-8"))
-        hash.update(bytes(str(value), "UTF-8"))
-
-    return hash.hexdigest()

invokeai/backend/model_management/lora.py

@@ -13,7 +13,6 @@ from safetensors.torch import load_file
 from transformers import CLIPTextModel, CLIPTokenizer
 
 from invokeai.app.shared.models import FreeUConfig
-from invokeai.backend.model_management.model_load_optimizations import skip_torch_weight_init
 
 from .models.lora import LoRAModel
 
@@ -212,12 +211,8 @@ class ModelPatcher:
                 for i in range(ti_embedding.shape[0]):
                     new_tokens_added += ti_tokenizer.add_tokens(_get_trigger(ti_name, i))
 
-            # Modify text_encoder.
-            # resize_token_embeddings(...) constructs a new torch.nn.Embedding internally. Initializing the weights of
-            # this embedding is slow and unnecessary, so we wrap this step in skip_torch_weight_init() to save some
-            # time.
-            with skip_torch_weight_init():
-                text_encoder.resize_token_embeddings(init_tokens_count + new_tokens_added, pad_to_multiple_of)
+            # modify text_encoder
+            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:

invokeai/backend/model_management/model_probe.py

@@ -370,8 +370,6 @@ class LoRACheckpointProbe(CheckpointProbeBase):
             return BaseModelType.StableDiffusion1
         elif token_vector_length == 1024:
             return BaseModelType.StableDiffusion2
-        elif token_vector_length == 1280:
-            return BaseModelType.StableDiffusionXL  # recognizes format at https://civitai.com/models/224641
         elif token_vector_length == 2048:
             return BaseModelType.StableDiffusionXL
         else:

invokeai/backend/model_management/models/sdxl.py

@@ -1,16 +1,11 @@
 import json
 import os
 from enum import Enum
-from pathlib import Path
 from typing import Literal, Optional
 
 from omegaconf import OmegaConf
 from pydantic import Field
 
-from invokeai.app.services.config import InvokeAIAppConfig
-from invokeai.backend.model_management.detect_baked_in_vae import has_baked_in_sdxl_vae
-from invokeai.backend.util.logging import InvokeAILogger
-
 from .base import (
     BaseModelType,
     DiffusersModel,
@@ -121,28 +116,14 @@ class StableDiffusionXLModel(DiffusersModel):
         # The convert script adapted from the diffusers package uses
         # strings for the base model type. To avoid making too many
         # source code changes, we simply translate here
-        if Path(output_path).exists():
-            return output_path
-
         if isinstance(config, cls.CheckpointConfig):
             from invokeai.backend.model_management.models.stable_diffusion import _convert_ckpt_and_cache
 
-            # Hack in VAE-fp16 fix - If model sdxl-vae-fp16-fix is installed,
-            # then we bake it into the converted model unless there is already
-            # a nonstandard VAE installed.
-            kwargs = {}
-            app_config = InvokeAIAppConfig.get_config()
-            vae_path = app_config.models_path / "sdxl/vae/sdxl-vae-fp16-fix"
-            if vae_path.exists() and not has_baked_in_sdxl_vae(Path(model_path)):
-                InvokeAILogger.get_logger().warning("No baked-in VAE detected. Inserting sdxl-vae-fp16-fix.")
-                kwargs["vae_path"] = vae_path
-
             return _convert_ckpt_and_cache(
                 version=base_model,
                 model_config=config,
                 output_path=output_path,
                 use_safetensors=False,  # corrupts sdxl models for some reason
-                **kwargs,
             )
         else:
             return model_path

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/.gitignore

@@ -8,7 +8,6 @@ pnpm-debug.log*
 lerna-debug.log*
 
 node_modules
-.pnpm-store
 # We want to distribute the repo
 dist
 dist/**

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,26 +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>Invoke - Community Edition</title>
-  <link rel="icon" type="icon" href="assets/images/invoke-favicon.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,57 +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.17.9",
-    "i18next": "^23.7.16",
+    "framer-motion": "^10.16.15",
+    "i18next": "^23.7.8",
     "i18next-http-backend": "^2.4.2",
     "idb-keyval": "^6.2.1",
-    "jsondiffpatch": "^0.6.0",
-    "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-hotkeys-hook": "4.4.3",
-    "react-i18next": "^14.0.0",
+    "react-error-boundary": "^4.0.11",
+    "react-hotkeys-hook": "4.4.1",
+    "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.8",
-    "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.1.0",
+    "redux-remember": "^5.0.0",
     "roarr": "^7.21.0",
     "serialize-error": "^11.0.3",
-    "socket.io-client": "^4.7.3",
-    "type-fest": "^4.9.0",
+    "socket.io-client": "^4.7.2",
+    "type-fest": "^4.8.3",
     "use-debounce": "^10.0.0",
     "use-image": "^1.1.1",
     "uuid": "^9.0.1",
@@ -122,56 +117,44 @@
     "ts-toolbelt": "^9.6.0"
   },
   "devDependencies": {
-    "@arthurgeron/eslint-plugin-react-usememo": "^2.2.3",
     "@chakra-ui/cli": "^2.4.1",
-    "@storybook/addon-docs": "^7.6.7",
-    "@storybook/addon-essentials": "^7.6.7",
-    "@storybook/addon-interactions": "^7.6.7",
-    "@storybook/addon-links": "^7.6.7",
-    "@storybook/addon-storysource": "^7.6.7",
-    "@storybook/blocks": "^7.6.7",
-    "@storybook/manager-api": "^7.6.7",
-    "@storybook/react": "^7.6.7",
-    "@storybook/react-vite": "^7.6.7",
-    "@storybook/test": "^7.6.7",
-    "@storybook/theming": "^7.6.7",
+    "@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.7",
-    "@types/react": "^18.2.47",
-    "@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.18.0",
-    "@typescript-eslint/parser": "^6.18.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.7",
+    "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.11",
-    "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/assets/images/invoke-avatar-circle.svg

@@ -1,4 +0,0 @@
-<svg width="100" height="100" viewBox="0 0 100 100" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="100" height="100" rx="50" fill="#E6FD13"/>
-<path d="M55.8887 40.7241H66.369V33.6309H33.6309V40.7241H44.1111L55.8887 59.2757H66.369V66.369H33.6309V59.2757H44.1111" stroke="#181818" stroke-width="2.5"/>
-</svg>

invokeai/frontend/web/public/assets/images/invoke-avatar-square.svg

@@ -1,4 +0,0 @@
-<svg width="100" height="100" viewBox="0 0 100 100" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="100" height="100" fill="#E6FD13"/>
-<path d="M55.8887 40.7241H66.369V33.6309H33.6309V40.7241H44.1111L55.8887 59.2757H66.369V66.369H33.6309V59.2757H44.1111" stroke="#181818" stroke-width="2.5"/>
-</svg>

invokeai/frontend/web/public/assets/images/invoke-favicon.svg

@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="16" height="16" rx="2" fill="#E6FD13"/>
-<path d="M9.61889 5.45H12.5V3.5H3.5V5.45H6.38111L9.61889 10.55H12.5V12.5H3.5V10.55H6.38111" stroke="black"/>
-</svg>

invokeai/frontend/web/public/assets/images/invoke-key-char-lrg.svg

@@ -1,4 +0,0 @@
-<svg width="106" height="106" viewBox="0 0 106 106" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="3" y="3" width="100" height="100" rx="6.66667" stroke="#181818" stroke-width="5"/>
-<path d="M63.9137 36H83.1211V23H23.1211V36H42.3285L63.9137 70H83.1211V83H23.1211V70H42.3285" stroke="#181818" stroke-width="5"/>
-</svg>

invokeai/frontend/web/public/assets/images/invoke-key-char-sml.svg

@@ -1,4 +0,0 @@
-<svg width="42" height="42" viewBox="0 0 42 42" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="1" y="1" width="40" height="40" rx="4" stroke="#181818" stroke-width="2"/>
-<path d="M25.3659 14.2H33.0488V9H9.04883V14.2H16.7318L25.3659 27.8H33.0488V33H9.04883V27.8H16.7318" stroke="#181818" stroke-width="2"/>
-</svg>

invokeai/frontend/web/public/assets/images/invoke-key-wht-lrg.svg

@@ -1,4 +0,0 @@
-<svg width="106" height="106" viewBox="0 0 106 106" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="3" y="3" width="100" height="100" rx="6.66667" stroke="white" stroke-width="5"/>
-<path d="M63.9137 36H83.1211V23H23.1211V36H42.3285L63.9137 70H83.1211V83H23.1211V70H42.3285" stroke="white" stroke-width="5"/>
-</svg>

invokeai/frontend/web/public/assets/images/invoke-key-wht-sml.svg

@@ -1,4 +0,0 @@
-<svg width="42" height="42" viewBox="0 0 42 42" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="1" y="1" width="40" height="40" rx="4" stroke="white" stroke-width="2"/>
-<path d="M25.3659 14.2H33.0488V9H9.04883V14.2H16.7318L25.3659 27.8H33.0488V33H9.04883V27.8H16.7318" stroke="white" stroke-width="2"/>
-</svg>

invokeai/frontend/web/public/assets/images/invoke-symbol-char-lrg.svg

@@ -1,3 +0,0 @@
-<svg width="66" height="66" viewBox="0 0 66 66" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M43.9137 16H63.1211V3H3.12109V16H22.3285L43.9137 50H63.1211V63H3.12109V50H22.3285" stroke="#181818" stroke-width="5"/>
-</svg>

invokeai/frontend/web/public/assets/images/invoke-symbol-char-sml.svg

@@ -1,3 +0,0 @@
-<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M14.5975 5.33333H21V1H1V5.33333H7.40246L14.5975 16.6667H21V21H1V16.6667H7.40246" stroke="#181818" stroke-width="2"/>
-</svg>

invokeai/frontend/web/public/assets/images/invoke-symbol-wht-lrg.svg

@@ -1,3 +0,0 @@
-<svg width="66" height="66" viewBox="0 0 66 66" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M43.9137 16H63.1211V3H3.12109V16H22.3285L43.9137 50H63.1211V63H3.12109V50H22.3285" stroke="white" stroke-width="5"/>
-</svg>

invokeai/frontend/web/public/assets/images/invoke-symbol-wht-sml.svg

@@ -1,3 +0,0 @@
-<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M14.5975 5.33333H21V1H1V5.33333H7.40246L14.5975 16.6667H21V21H1V16.6667H7.40246" stroke="white" stroke-width="2"/>
-</svg>

invokeai/frontend/web/public/assets/images/invoke-symbol-ylw-lrg.svg

@@ -1,3 +0,0 @@
-<svg width="44" height="44" viewBox="0 0 44 44" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M29.1951 10.6667H42V2H2V10.6667H14.8049L29.1951 33.3333H42V42H2V33.3333H14.8049" stroke="#E6FD13" stroke-width="2.8"/>
-</svg>

invokeai/frontend/web/public/assets/images/invoke-tag-char-lrg.svg

@@ -1,13 +0,0 @@
-<svg width="231" height="100" viewBox="0 0 231 100" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_659_3591)">
-<rect width="100" height="100" fill="#181818"/>
-<path d="M57.1951 38.6667H70V30H30V38.6667H42.8049L57.1951 61.3333H70V70H30V61.3333H42.8049" stroke="white" stroke-width="2.8"/>
-<rect width="131" height="100" transform="translate(100)" fill="#181818"/>
-<path d="M111.37 43.34H107.89V39.65H111.37V43.34ZM116.38 60.5H102.76V58.16H108.22V47.84H103.36V45.5H111.07V58.16H116.38V60.5ZM120.538 60.5V45.5H123.388V47.6C124.288 46.25 125.788 45.2 128.188 45.2C131.638 45.2 133.588 47.3 133.588 50.45V60.5H130.738V51.05C130.738 48.95 129.838 47.6 127.708 47.6H127.468C125.338 47.6 123.388 49.25 123.388 52.1V60.5H120.538ZM141.786 60.5L136.236 45.5H139.176L143.526 57.71L147.876 45.5H150.786L145.236 60.5H141.786ZM159.723 60.8C155.673 60.8 152.523 57.65 152.523 53C152.523 48.35 155.673 45.2 159.723 45.2C163.773 45.2 166.923 48.35 166.923 53C166.923 57.65 163.773 60.8 159.723 60.8ZM155.373 53C155.373 56.45 157.173 58.4 159.603 58.4H159.843C162.273 58.4 164.073 56.45 164.073 53C164.073 49.55 162.273 47.6 159.843 47.6H159.603C157.173 47.6 155.373 49.55 155.373 53ZM170.804 60.5V39.5H173.654V51.98L180.254 45.5H184.004L177.764 51.47L184.304 60.5H180.794L175.724 53.42L173.654 55.43V60.5H170.804ZM192.459 60.8C188.739 60.8 185.379 58.22 185.379 52.97C185.379 47.78 188.829 45.2 192.369 45.2C196.269 45.2 198.729 47.9 198.729 51.8V53.45H188.229C188.409 56.87 190.599 58.4 192.429 58.4H192.669C194.139 58.4 195.549 57.65 195.849 56.06H198.699C198.159 59.09 195.549 60.8 192.459 60.8ZM188.409 51.2H195.879C195.759 48.59 194.199 47.6 192.489 47.6H192.249C190.689 47.6 188.949 48.53 188.409 51.2Z" fill="white"/>
-</g>
-<defs>
-<clipPath id="clip0_659_3591">
-<rect width="231" height="100" rx="5" fill="white"/>
-</clipPath>
-</defs>
-</svg>

invokeai/frontend/web/public/assets/images/invoke-tag-char-sml.svg

@@ -1,13 +0,0 @@
-<svg width="116" height="50" viewBox="0 0 116 50" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_659_3586)">
-<rect width="50" height="50" fill="#181818"/>
-<path d="M28.5975 19.3333H35V15H15V19.3333H21.4025L28.5975 30.6667H35V35H15V30.6667H21.4025" stroke="white" stroke-width="1.2"/>
-<rect width="66" height="50" transform="translate(50)" fill="#181818"/>
-<path d="M55.685 21.92H53.945V20.075H55.685V21.92ZM58.19 30.5H51.38V29.33H54.11V24.17H51.68V23H55.535V29.33H58.19V30.5ZM60.2691 30.5V23H61.6941V24.05C62.1441 23.375 62.8941 22.85 64.0941 22.85C65.8191 22.85 66.7941 23.9 66.7941 25.475V30.5H65.3691V25.775C65.3691 24.725 64.9191 24.05 63.8541 24.05H63.7341C62.6691 24.05 61.6941 24.875 61.6941 26.3V30.5H60.2691ZM70.8931 30.5L68.1181 23H69.5881L71.7631 29.105L73.9381 23H75.3931L72.6181 30.5H70.8931ZM79.8614 30.65C77.8364 30.65 76.2614 29.075 76.2614 26.75C76.2614 24.425 77.8364 22.85 79.8614 22.85C81.8864 22.85 83.4614 24.425 83.4614 26.75C83.4614 29.075 81.8864 30.65 79.8614 30.65ZM77.6864 26.75C77.6864 28.475 78.5864 29.45 79.8014 29.45H79.9214C81.1364 29.45 82.0364 28.475 82.0364 26.75C82.0364 25.025 81.1364 24.05 79.9214 24.05H79.8014C78.5864 24.05 77.6864 25.025 77.6864 26.75ZM85.4018 30.5V20H86.8268V26.24L90.1268 23H92.0018L88.8818 25.985L92.1518 30.5H90.3968L87.8618 26.96L86.8268 27.965V30.5H85.4018ZM96.2296 30.65C94.3696 30.65 92.6896 29.36 92.6896 26.735C92.6896 24.14 94.4146 22.85 96.1846 22.85C98.1346 22.85 99.3646 24.2 99.3646 26.15V26.975H94.1146C94.2046 28.685 95.2996 29.45 96.2146 29.45H96.3346C97.0696 29.45 97.7746 29.075 97.9246 28.28H99.3496C99.0796 29.795 97.7746 30.65 96.2296 30.65ZM94.2046 25.85H97.9396C97.8796 24.545 97.0996 24.05 96.2446 24.05H96.1246C95.3446 24.05 94.4746 24.515 94.2046 25.85Z" fill="white"/>
-</g>
-<defs>
-<clipPath id="clip0_659_3586">
-<rect width="116" height="50" rx="4" fill="white"/>
-</clipPath>
-</defs>
-</svg>

invokeai/frontend/web/public/assets/images/invoke-tag-lrg.svg

@@ -1,13 +0,0 @@
-<svg width="231" height="100" viewBox="0 0 231 100" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_659_3578)">
-<rect width="100" height="100" fill="#E6FD13"/>
-<path d="M57.1951 38.6667H70V30H30V38.6667H42.8049L57.1951 61.3333H70V70H30V61.3333H42.8049" stroke="#181818" stroke-width="2.8"/>
-<rect width="131" height="100" transform="translate(100)" fill="#E6FD13"/>
-<path d="M111.37 43.34H107.89V39.65H111.37V43.34ZM116.38 60.5H102.76V58.16H108.22V47.84H103.36V45.5H111.07V58.16H116.38V60.5ZM120.538 60.5V45.5H123.388V47.6C124.288 46.25 125.788 45.2 128.188 45.2C131.638 45.2 133.588 47.3 133.588 50.45V60.5H130.738V51.05C130.738 48.95 129.838 47.6 127.708 47.6H127.468C125.338 47.6 123.388 49.25 123.388 52.1V60.5H120.538ZM141.786 60.5L136.236 45.5H139.176L143.526 57.71L147.876 45.5H150.786L145.236 60.5H141.786ZM159.723 60.8C155.673 60.8 152.523 57.65 152.523 53C152.523 48.35 155.673 45.2 159.723 45.2C163.773 45.2 166.923 48.35 166.923 53C166.923 57.65 163.773 60.8 159.723 60.8ZM155.373 53C155.373 56.45 157.173 58.4 159.603 58.4H159.843C162.273 58.4 164.073 56.45 164.073 53C164.073 49.55 162.273 47.6 159.843 47.6H159.603C157.173 47.6 155.373 49.55 155.373 53ZM170.804 60.5V39.5H173.654V51.98L180.254 45.5H184.004L177.764 51.47L184.304 60.5H180.794L175.724 53.42L173.654 55.43V60.5H170.804ZM192.459 60.8C188.739 60.8 185.379 58.22 185.379 52.97C185.379 47.78 188.829 45.2 192.369 45.2C196.269 45.2 198.729 47.9 198.729 51.8V53.45H188.229C188.409 56.87 190.599 58.4 192.429 58.4H192.669C194.139 58.4 195.549 57.65 195.849 56.06H198.699C198.159 59.09 195.549 60.8 192.459 60.8ZM188.409 51.2H195.879C195.759 48.59 194.199 47.6 192.489 47.6H192.249C190.689 47.6 188.949 48.53 188.409 51.2Z" fill="#181818"/>
-</g>
-<defs>
-<clipPath id="clip0_659_3578">
-<rect width="231" height="100" rx="5" fill="white"/>
-</clipPath>
-</defs>
-</svg>

invokeai/frontend/web/public/assets/images/invoke-tag-sml.svg

@@ -1,13 +0,0 @@
-<svg width="116" height="50" viewBox="0 0 116 50" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_659_3573)">
-<rect width="50" height="50" fill="#E6FD13"/>
-<path d="M28.5975 19.3333H35V15H15V19.3333H21.4025L28.5975 30.6667H35V35H15V30.6667H21.4025" stroke="#181818" stroke-width="1.2"/>
-<rect width="66" height="50" transform="translate(50)" fill="#E6FD13"/>
-<path d="M55.685 21.92H53.945V20.075H55.685V21.92ZM58.19 30.5H51.38V29.33H54.11V24.17H51.68V23H55.535V29.33H58.19V30.5ZM60.2691 30.5V23H61.6941V24.05C62.1441 23.375 62.8941 22.85 64.0941 22.85C65.8191 22.85 66.7941 23.9 66.7941 25.475V30.5H65.3691V25.775C65.3691 24.725 64.9191 24.05 63.8541 24.05H63.7341C62.6691 24.05 61.6941 24.875 61.6941 26.3V30.5H60.2691ZM70.8931 30.5L68.1181 23H69.5881L71.7631 29.105L73.9381 23H75.3931L72.6181 30.5H70.8931ZM79.8614 30.65C77.8364 30.65 76.2614 29.075 76.2614 26.75C76.2614 24.425 77.8364 22.85 79.8614 22.85C81.8864 22.85 83.4614 24.425 83.4614 26.75C83.4614 29.075 81.8864 30.65 79.8614 30.65ZM77.6864 26.75C77.6864 28.475 78.5864 29.45 79.8014 29.45H79.9214C81.1364 29.45 82.0364 28.475 82.0364 26.75C82.0364 25.025 81.1364 24.05 79.9214 24.05H79.8014C78.5864 24.05 77.6864 25.025 77.6864 26.75ZM85.4018 30.5V20H86.8268V26.24L90.1268 23H92.0018L88.8818 25.985L92.1518 30.5H90.3968L87.8618 26.96L86.8268 27.965V30.5H85.4018ZM96.2296 30.65C94.3696 30.65 92.6896 29.36 92.6896 26.735C92.6896 24.14 94.4146 22.85 96.1846 22.85C98.1346 22.85 99.3646 24.2 99.3646 26.15V26.975H94.1146C94.2046 28.685 95.2996 29.45 96.2146 29.45H96.3346C97.0696 29.45 97.7746 29.075 97.9246 28.28H99.3496C99.0796 29.795 97.7746 30.65 96.2296 30.65ZM94.2046 25.85H97.9396C97.8796 24.545 97.0996 24.05 96.2446 24.05H96.1246C95.3446 24.05 94.4746 24.515 94.2046 25.85Z" fill="#181818"/>
-</g>
-<defs>
-<clipPath id="clip0_659_3573">
-<rect width="116" height="50" rx="4" fill="white"/>
-</clipPath>
-</defs>
-</svg>

invokeai/frontend/web/public/assets/images/invoke-wordmark-charcoal.svg

@@ -1,8 +0,0 @@
-<svg width="293" height="65" viewBox="0 0 293 65" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M273.51 65.0002C269.604 65.0002 266.003 64.1152 262.707 62.3453C259.472 60.5143 256.848 57.7983 254.834 54.1974C252.881 50.5964 251.904 46.2326 251.904 41.1058C251.904 36.0401 252.881 31.7373 254.834 28.1974C256.848 24.5964 259.472 21.911 262.707 20.141C266.003 18.31 269.512 17.3945 273.235 17.3945C277.142 17.3945 280.559 18.249 283.489 19.9579C286.419 21.6058 288.677 23.9556 290.264 27.0072C291.851 30.0589 292.644 33.5683 292.644 37.5354V42.5706H260.602C260.785 45.8664 261.517 48.6434 262.799 50.9016C264.08 53.1598 265.667 54.8688 267.559 56.0284C269.512 57.127 271.465 57.6763 273.419 57.6763H274.151C276.531 57.6763 278.637 57.0659 280.468 55.8453C282.299 54.6246 283.428 52.8547 283.855 50.5354H292.553C291.759 55.0518 289.592 58.5918 286.052 61.1551C282.513 63.7185 278.332 65.0002 273.51 65.0002ZM283.947 35.7044C283.764 31.9814 282.696 29.2349 280.743 27.465C278.851 25.634 276.47 24.7185 273.602 24.7185H272.869C270.184 24.7185 267.742 25.6035 265.545 27.3734C263.409 29.1434 261.944 31.9204 261.151 35.7044H283.947Z" fill="#181818"/>
-<path d="M205.254 0H213.951V38.0846L234.092 18.3099H245.536L226.494 36.5282L246.451 64.0846H235.74L220.268 42.4789L213.951 48.6127V64.0846H205.254V0Z" fill="#181818"/>
-<path d="M173.507 65.0002C169.418 65.0002 165.695 63.9932 162.338 61.9791C158.981 59.965 156.326 57.1575 154.373 53.5565C152.481 49.9556 151.535 45.8359 151.535 41.1974C151.535 36.5589 152.481 32.4391 154.373 28.8382C156.326 25.2373 158.981 22.4297 162.338 20.4157C165.695 18.4016 169.418 17.3945 173.507 17.3945C177.596 17.3945 181.319 18.4016 184.676 20.4157C188.033 22.4297 190.658 25.2373 192.55 28.8382C194.503 32.4391 195.479 36.5589 195.479 41.1974C195.479 45.8359 194.503 49.9556 192.55 53.5565C190.658 57.1575 188.033 59.965 184.676 61.9791C181.319 63.9932 177.596 65.0002 173.507 65.0002ZM173.873 57.6763C177.657 57.6763 180.74 56.2115 183.12 53.2819C185.561 50.3523 186.782 46.3241 186.782 41.1974C186.782 36.0706 185.561 32.0424 183.12 29.1129C180.74 26.1833 177.657 24.7185 173.873 24.7185H173.141C169.357 24.7185 166.244 26.1833 163.803 29.1129C161.423 32.0424 160.232 36.0706 160.232 41.1974C160.232 46.3241 161.423 50.3523 163.803 53.2819C166.244 56.2115 169.357 57.6763 173.141 57.6763H173.873Z" fill="#181818"/>
-<path d="M146.078 18.3096L129.141 64.0843H118.613L101.676 18.3096H110.648L123.922 55.5702L137.197 18.3096H146.078Z" fill="#181818"/>
-<path d="M53.9727 18.31H62.6699V24.7185C65.9047 19.8358 70.7873 17.3945 77.3179 17.3945C82.5057 17.3945 86.5339 18.8593 89.4025 21.7889C92.3321 24.6575 93.7969 28.533 93.7969 33.4157V64.0847H85.0997V35.2467C85.0997 31.8899 84.3368 29.296 82.8109 27.465C81.3461 25.634 79.0268 24.7185 75.8531 24.7185H75.1207C72.9235 24.7185 70.8789 25.2678 68.9869 26.3664C67.0948 27.465 65.569 29.0518 64.4094 31.1269C63.2497 33.2021 62.6699 35.6434 62.6699 38.4509V64.0847H53.9727V18.31Z" fill="#181818"/>
-<path d="M15.732 0.144531H26.4041V11.4605H15.732V0.144531ZM0 56.9086H16.744V25.2606H1.84V18.0846H25.4841V56.9086H41.7681V64.0846H0V56.9086Z" fill="#181818"/>
-</svg>

invokeai/frontend/web/public/assets/images/invoke-wordmark-white.svg

@@ -1,8 +0,0 @@
-<svg width="293" height="65" viewBox="0 0 293 65" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M273.51 65.0002C269.604 65.0002 266.003 64.1152 262.707 62.3453C259.472 60.5143 256.848 57.7983 254.834 54.1974C252.881 50.5964 251.904 46.2326 251.904 41.1058C251.904 36.0401 252.881 31.7373 254.834 28.1974C256.848 24.5964 259.472 21.911 262.707 20.141C266.003 18.31 269.512 17.3945 273.235 17.3945C277.142 17.3945 280.559 18.249 283.489 19.9579C286.419 21.6058 288.677 23.9556 290.264 27.0072C291.851 30.0589 292.644 33.5683 292.644 37.5354V42.5706H260.602C260.785 45.8664 261.517 48.6434 262.799 50.9016C264.08 53.1598 265.667 54.8688 267.559 56.0284C269.512 57.127 271.465 57.6763 273.419 57.6763H274.151C276.531 57.6763 278.637 57.0659 280.468 55.8453C282.299 54.6246 283.428 52.8547 283.855 50.5354H292.553C291.759 55.0518 289.592 58.5918 286.052 61.1551C282.513 63.7185 278.332 65.0002 273.51 65.0002ZM283.947 35.7044C283.764 31.9814 282.696 29.2349 280.743 27.465C278.851 25.634 276.47 24.7185 273.602 24.7185H272.869C270.184 24.7185 267.742 25.6035 265.545 27.3734C263.409 29.1434 261.944 31.9204 261.151 35.7044H283.947Z" fill="white"/>
-<path d="M205.254 0H213.951V38.0846L234.092 18.3099H245.536L226.494 36.5282L246.451 64.0846H235.74L220.268 42.4789L213.951 48.6127V64.0846H205.254V0Z" fill="white"/>
-<path d="M173.507 65.0002C169.418 65.0002 165.695 63.9932 162.338 61.9791C158.981 59.965 156.326 57.1575 154.373 53.5565C152.481 49.9556 151.535 45.8359 151.535 41.1974C151.535 36.5589 152.481 32.4391 154.373 28.8382C156.326 25.2373 158.981 22.4297 162.338 20.4157C165.695 18.4016 169.418 17.3945 173.507 17.3945C177.596 17.3945 181.319 18.4016 184.676 20.4157C188.033 22.4297 190.658 25.2373 192.55 28.8382C194.503 32.4391 195.479 36.5589 195.479 41.1974C195.479 45.8359 194.503 49.9556 192.55 53.5565C190.658 57.1575 188.033 59.965 184.676 61.9791C181.319 63.9932 177.596 65.0002 173.507 65.0002ZM173.873 57.6763C177.657 57.6763 180.74 56.2115 183.12 53.2819C185.561 50.3523 186.782 46.3241 186.782 41.1974C186.782 36.0706 185.561 32.0424 183.12 29.1129C180.74 26.1833 177.657 24.7185 173.873 24.7185H173.141C169.357 24.7185 166.244 26.1833 163.803 29.1129C161.423 32.0424 160.232 36.0706 160.232 41.1974C160.232 46.3241 161.423 50.3523 163.803 53.2819C166.244 56.2115 169.357 57.6763 173.141 57.6763H173.873Z" fill="white"/>
-<path d="M146.078 18.3096L129.141 64.0843H118.613L101.676 18.3096H110.648L123.922 55.5702L137.197 18.3096H146.078Z" fill="white"/>
-<path d="M53.9727 18.31H62.6699V24.7185C65.9047 19.8358 70.7873 17.3945 77.3179 17.3945C82.5057 17.3945 86.5339 18.8593 89.4025 21.7889C92.3321 24.6575 93.7969 28.533 93.7969 33.4157V64.0847H85.0997V35.2467C85.0997 31.8899 84.3368 29.296 82.8109 27.465C81.3461 25.634 79.0268 24.7185 75.8531 24.7185H75.1207C72.9235 24.7185 70.8789 25.2678 68.9869 26.3664C67.0948 27.465 65.569 29.0518 64.4094 31.1269C63.2497 33.2021 62.6699 35.6434 62.6699 38.4509V64.0847H53.9727V18.31Z" fill="white"/>
-<path d="M15.732 0.144531H26.4041V11.4605H15.732V0.144531ZM0 56.9086H16.744V25.2606H1.84V18.0846H25.4841V56.9086H41.7681V64.0846H0V56.9086Z" fill="white"/>
-</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/hu.json

@@ -1,40 +0,0 @@
-{
-    "accessibility": {
-        "mode": "Mód",
-        "uploadImage": "Fénykép feltöltése",
-        "zoomIn": "Nagyítás",
-        "nextImage": "Következő kép",
-        "previousImage": "Előző kép",
-        "menu": "Menü",
-        "zoomOut": "Kicsinyítés",
-        "loadMore": "Több betöltése"
-    },
-    "boards": {
-        "cancel": "Mégsem",
-        "loading": "Betöltés..."
-    },
-    "accordions": {
-        "image": {
-            "title": "Kép"
-        }
-    },
-    "common": {
-        "accept": "Elfogad",
-        "ai": "ai",
-        "back": "Vissza",
-        "cancel": "Mégsem",
-        "close": "Bezár",
-        "or": "vagy",
-        "details": "Részletek",
-        "darkMode": "Sötét Mód",
-        "error": "Hiba",
-        "file": "Fájl",
-        "githubLabel": "Github",
-        "hotkeysLabel": "Gyorsbillentyűk",
-        "delete": "Törlés",
-        "data": "Adat",
-        "discordLabel": "Discord",
-        "folder": "Mappa",
-        "langEnglish": "Angol"
-    }
-}

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

@@ -114,11 +114,7 @@
         "nextPage": "Pagina successiva",
         "saveAs": "Salva come",
         "unsaved": "Non salvato",
-        "direction": "Direzione",
-        "advancedOptions": "Opzioni avanzate",
-        "free": "Libero",
-        "or": "o",
-        "preferencesLabel": "Preferenze"
+        "direction": "Direzione"
     },
     "gallery": {
         "generations": "Generazioni",
@@ -136,7 +132,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.",
@@ -161,18 +157,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",
@@ -186,8 +182,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": {
@@ -246,6 +246,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"
@@ -358,26 +362,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",
@@ -592,8 +581,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",
@@ -653,14 +642,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",
@@ -1196,6 +1178,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",
@@ -1231,13 +1214,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",
@@ -1295,8 +1277,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",
@@ -1316,12 +1297,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",
@@ -1355,9 +1331,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": {
@@ -1583,7 +1557,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",
@@ -1594,8 +1568,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",
@@ -1668,28 +1641,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

@@ -363,6 +363,7 @@
         "processor": "프로세서",
         "addControlNet": "$t(common.controlNet) 추가",
         "none": "해당없음",
+        "incompatibleBaseModel": "호환되지 않는 기본 모델:",
         "enableControlnet": "사용 가능한 ControlNet",
         "detectResolution": "해상도 탐지",
         "controlNetT2IMutexDesc": "$t(common.controlNet)와 $t(common.t2iAdapter)는 현재 동시에 지원되지 않습니다.",
@@ -407,6 +408,10 @@
         "maxFaces": "Max Faces"
     },
     "hotkeys": {
+        "toggleGalleryPin": {
+            "title": "Gallery Pin 전환",
+            "desc": "갤러리를 UI에 고정했다가 풉니다"
+        },
         "toggleSnap": {
             "desc": "Snap을 Grid로 전환",
             "title": "Snap 전환"
@@ -596,6 +601,10 @@
             "desc": "노드 추가 메뉴 열기",
             "title": "노드 추가"
         },
+        "toggleViewer": {
+            "desc": "이미지 뷰어 열기 및 닫기",
+            "title": "Viewer 전환"
+        },
         "undoStroke": {
             "title": "Stroke 실행 취소",
             "desc": "brush stroke 실행 취소"

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

@@ -121,11 +121,7 @@
         "unsaved": "несохраненный",
         "input": "Вход",
         "details": "Детали",
-        "notInstalled": "Нет $t(common.installed)",
-        "preferencesLabel": "Предпочтения",
-        "or": "или",
-        "advancedOptions": "Расширенные настройки",
-        "free": "Свободно"
+        "notInstalled": "Нет $t(common.installed)"
     },
     "gallery": {
         "generations": "Генерации",
@@ -193,6 +189,10 @@
             "title": "Закрепить параметры",
             "desc": "Закрепить панель параметров"
         },
+        "toggleViewer": {
+            "title": "Показать просмотр",
+            "desc": "Открывать и закрывать просмотрщик изображений"
+        },
         "toggleGallery": {
             "title": "Показать галерею",
             "desc": "Открывать и закрывать ящик галереи"
@@ -253,6 +253,10 @@
             "title": "Следующее изображение",
             "desc": "Отображение следующего изображения в галерее"
         },
+        "toggleGalleryPin": {
+            "title": "Закрепить галерею",
+            "desc": "Закрепляет и открепляет галерею"
+        },
         "increaseGalleryThumbSize": {
             "title": "Увеличить размер миниатюр галереи",
             "desc": "Увеличивает размер миниатюр галереи"
@@ -369,22 +373,7 @@
             "desc": "Открывает меню добавления узла",
             "title": "Добавление узлов"
         },
-        "nodesHotkeys": "Горячие клавиши узлов",
-        "cancelAndClear": {
-            "desc": "Отмена текущего элемента очереди и очистка всех ожидающих элементов",
-            "title": "Отменить и очистить"
-        },
-        "resetOptionsAndGallery": {
-            "title": "Сброс настроек и галереи",
-            "desc": "Сброс панелей галереи и настроек"
-        },
-        "searchHotkeys": "Поиск горячих клавиш",
-        "noHotkeysFound": "Горячие клавиши не найдены",
-        "toggleOptionsAndGallery": {
-            "desc": "Открытие и закрытие панели опций и галереи",
-            "title": "Переключить опции и галерею"
-        },
-        "clearSearch": "Очистить поиск"
+        "nodesHotkeys": "Горячие клавиши узлов"
     },
     "modelManager": {
         "modelManager": "Менеджер моделей",
@@ -534,7 +523,7 @@
     "parameters": {
         "images": "Изображения",
         "steps": "Шаги",
-        "cfgScale": "Шкала точности (CFG)",
+        "cfgScale": "Точность следования запросу (CFG)",
         "width": "Ширина",
         "height": "Высота",
         "seed": "Сид",
@@ -634,8 +623,7 @@
             "missingNodeTemplate": "Отсутствует шаблон узла",
             "readyToInvoke": "Готово к вызову",
             "missingFieldTemplate": "Отсутствует шаблон поля",
-            "addingImagesTo": "Добавление изображений в",
-            "invoke": "Создать"
+            "addingImagesTo": "Добавление изображений в"
         },
         "seamlessX&Y": "Бесшовный X & Y",
         "isAllowedToUpscale": {
@@ -663,14 +651,7 @@
         "useSize": "Использовать размер",
         "unmasked": "Без маски",
         "enableNoiseSettings": "Включить настройки шума",
-        "coherenceMode": "Режим",
-        "aspect": "Соотношение",
-        "imageSize": "Размер изображения",
-        "swapDimensions": "Поменять местами",
-        "setToOptimalSize": "Установить оптимальный для модели размер",
-        "setToOptimalSizeTooSmall": "$t(parameters.setToOptimalSize) (может быть слишком маленьким)",
-        "setToOptimalSizeTooLarge": "$t(parameters.setToOptimalSize) (может быть слишком большим)",
-        "lockAspectRatio": "Заблокировать соотношение"
+        "coherenceMode": "Режим"
     },
     "settings": {
         "models": "Модели",
@@ -1181,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-обработка изображений",
@@ -1215,8 +1197,7 @@
         "handAndFace": "Руки и Лицо",
         "enableIPAdapter": "Включить IP Adapter",
         "maxFaces": "Макс Лица",
-        "mlsdDescription": "Минималистичный детектор отрезков линии",
-        "resizeSimple": "Изменить размер (простой)"
+        "mlsdDescription": "Минималистичный детектор отрезков линии"
     },
     "boards": {
         "autoAddBoard": "Авто добавление Доски",
@@ -1258,9 +1239,7 @@
         "promptsWithCount_one": "{{count}} Запрос",
         "promptsWithCount_few": "{{count}} Запроса",
         "promptsWithCount_many": "{{count}} Запросов",
-        "dynamicPrompts": "Динамические запросы",
-        "loading": "Создание динамических запросов...",
-        "showDynamicPrompts": "Показать динамические запросы"
+        "dynamicPrompts": "Динамические запросы"
     },
     "popovers": {
         "noiseUseCPU": {
@@ -1523,7 +1502,7 @@
         "queueBack": "Добавить в очередь",
         "batchValues": "Пакетные значения",
         "cancelFailed": "Проблема с отменой элемента",
-        "queueCountPrediction": "{{promptsCount}} запросов × {{iterations}} изображений -> {{count}} генераций",
+        "queueCountPrediction": "Добавить {{predicted}} в очередь",
         "batchQueued": "Пакетная очередь",
         "pauseFailed": "Проблема с приостановкой рендеринга",
         "clearFailed": "Проблема с очисткой очереди",
@@ -1570,8 +1549,7 @@
         "cancelBatchFailed": "Проблема с отменой пакета",
         "clearQueueAlertDialog2": "Вы уверены, что хотите очистить очередь?",
         "item": "Элемент",
-        "graphFailedToQueue": "Не удалось поставить график в очередь",
-        "openQueue": "Открыть очередь"
+        "graphFailedToQueue": "Не удалось поставить график в очередь"
     },
     "sdxl": {
         "refinerStart": "Запуск перерисовщика",
@@ -1633,8 +1611,7 @@
         "workflows": "Рабочие процессы",
         "noDescription": "Без описания",
         "uploadWorkflow": "Загрузить рабочий процесс",
-        "userWorkflows": "Мои рабочие процессы",
-        "newWorkflowCreated": "Создан новый рабочий процесс"
+        "userWorkflows": "Мои рабочие процессы"
     },
     "embedding": {
         "noEmbeddingsLoaded": "встраивания не загружены",
@@ -1667,38 +1644,9 @@
         "selectModel": "Выберите модель",
         "noRefinerModelsInstalled": "Модели SDXL Refiner не установлены",
         "noLoRAsInstalled": "Нет установленных LoRA",
-        "selectLoRA": "Выберите LoRA",
-        "noMainModelSelected": "Базовая модель не выбрана",
-        "lora": "LoRA",
-        "allLoRAsAdded": "Все LoRA добавлены",
-        "defaultVAE": "Стандартное VAE",
-        "incompatibleBaseModel": "Несовместимая базовая модель",
-        "loraAlreadyAdded": "LoRA уже добавлена"
+        "selectLoRA": "Выберите LoRA"
     },
     "app": {
         "storeNotInitialized": "Магазин не инициализирован"
-    },
-    "accordions": {
-        "compositing": {
-            "infillTab": "Заполнение",
-            "coherenceTab": "Согласованность",
-            "title": "Композиция"
-        },
-        "control": {
-            "controlAdaptersTab": "Адаптеры контроля",
-            "ipTab": "Запросы изображений",
-            "title": "Контроль"
-        },
-        "generation": {
-            "title": "Генерация",
-            "conceptsTab": "Концепты",
-            "modelTab": "Модель"
-        },
-        "advanced": {
-            "title": "Расширенные"
-        },
-        "image": {
-            "title": "Изображение"
-        }
     }
 }

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

@@ -121,11 +121,7 @@
         "nextPage": "下一页",
         "saveAs": "保存为",
         "unsaved": "未保存",
-        "ai": "ai",
-        "preferencesLabel": "首选项",
-        "or": "或",
-        "advancedOptions": "高级选项",
-        "free": "自由"
+        "ai": "ai"
     },
     "gallery": {
         "generations": "生成的图像",
@@ -168,18 +164,18 @@
         "starImage": "收藏图像"
     },
     "hotkeys": {
-        "keyboardShortcuts": "快捷键",
-        "appHotkeys": "应用",
-        "generalHotkeys": "一般",
-        "galleryHotkeys": "图库",
-        "unifiedCanvasHotkeys": "统一画布",
+        "keyboardShortcuts": "键盘快捷键",
+        "appHotkeys": "应用快捷键",
+        "generalHotkeys": "一般快捷键",
+        "galleryHotkeys": "图库快捷键",
+        "unifiedCanvasHotkeys": "统一画布快捷键",
         "invoke": {
             "title": "Invoke",
             "desc": "生成图像"
         },
         "cancel": {
             "title": "取消",
-            "desc": "取消当前队列项目"
+            "desc": "取消图像生成"
         },
         "focusPrompt": {
             "title": "打开提示词框",
@@ -193,6 +189,10 @@
             "title": "常开选项卡",
             "desc": "保持选项浮窗常开"
         },
+        "toggleViewer": {
+            "title": "切换图像查看器",
+            "desc": "打开或关闭图像查看器"
+        },
         "toggleGallery": {
             "title": "切换图库",
             "desc": "打开或关闭图库"
@@ -253,6 +253,10 @@
             "title": "下一张图像",
             "desc": "显示图库中的下一张图像"
         },
+        "toggleGalleryPin": {
+            "title": "切换图库常开",
+            "desc": "开关图库在界面中的常开模式"
+        },
         "increaseGalleryThumbSize": {
             "title": "增大预览尺寸",
             "desc": "增大图库中预览的尺寸"
@@ -365,26 +369,11 @@
             "title": "接受暂存图像",
             "desc": "接受当前暂存区中的图像"
         },
-        "nodesHotkeys": "节点",
+        "nodesHotkeys": "节点快捷键",
         "addNodes": {
             "title": "添加节点",
             "desc": "打开添加节点菜单"
-        },
-        "cancelAndClear": {
-            "desc": "取消当前队列项目并且清除所有待定项目",
-            "title": "取消和清除"
-        },
-        "resetOptionsAndGallery": {
-            "title": "重置选项和图库",
-            "desc": "重置选项和图库面板"
-        },
-        "searchHotkeys": "检索快捷键",
-        "noHotkeysFound": "未找到快捷键",
-        "toggleOptionsAndGallery": {
-            "desc": "打开和关闭选项和图库面板",
-            "title": "开关选项和图库"
-        },
-        "clearSearch": "清除检索项"
+        }
     },
     "modelManager": {
         "modelManager": "模型管理器",
@@ -582,8 +571,8 @@
         "info": "信息",
         "initialImage": "初始图像",
         "showOptionsPanel": "显示侧栏浮窗 (O 或 T)",
-        "seamlessYAxis": "无缝平铺 Y 轴",
-        "seamlessXAxis": "无缝平铺 X 轴",
+        "seamlessYAxis": "Y 轴",
+        "seamlessXAxis": "X 轴",
         "boundingBoxWidth": "边界框宽度",
         "boundingBoxHeight": "边界框高度",
         "denoisingStrength": "去噪强度",
@@ -630,7 +619,7 @@
             "readyToInvoke": "准备调用",
             "noControlImageForControlAdapter": "有 #{{number}} 个 Control Adapter 缺失控制图像",
             "noModelForControlAdapter": "有 #{{number}} 个 Control Adapter 没有选择模型。",
-            "incompatibleBaseModelForControlAdapter": "有 #{{number}} 个 Control Adapter 模型与主模型不兼容。"
+            "incompatibleBaseModelForControlAdapter": "有 #{{number}} 个 Control Adapter 模型与主模型不匹配。"
         },
         "patchmatchDownScaleSize": "缩小",
         "coherenceSteps": "步数",
@@ -661,14 +650,7 @@
         "unmasked": "取消遮罩",
         "cfgRescaleMultiplier": "CFG 重缩放倍数",
         "cfgRescale": "CFG 重缩放",
-        "useSize": "使用尺寸",
-        "setToOptimalSize": "优化模型大小",
-        "setToOptimalSizeTooSmall": "$t(parameters.setToOptimalSize) （可能过小）",
-        "imageSize": "图像尺寸",
-        "lockAspectRatio": "锁定纵横比",
-        "swapDimensions": "交换尺寸",
-        "aspect": "纵横",
-        "setToOptimalSizeTooLarge": "$t(parameters.setToOptimalSize) （可能过大）"
+        "useSize": "使用尺寸"
     },
     "settings": {
         "models": "模型",
@@ -1167,6 +1149,7 @@
         "crop": "裁剪",
         "processor": "处理器",
         "none": "无",
+        "incompatibleBaseModel": "不兼容的基础模型：",
         "enableControlnet": "启用 ControlNet",
         "detectResolution": "检测分辨率",
         "pidiDescription": "像素差分 (PIDI) 图像处理",
@@ -1227,8 +1210,7 @@
         "openPose": "Openpose",
         "controlAdapter_other": "Control Adapters",
         "lineartAnime": "Lineart Anime",
-        "canny": "Canny",
-        "resizeSimple": "缩放（简单）"
+        "canny": "Canny"
     },
     "queue": {
         "status": "状态",
@@ -1275,7 +1257,7 @@
         "notReady": "无法排队",
         "batchFailedToQueue": "批次加入队列失败",
         "batchValues": "批次数",
-        "queueCountPrediction": "{{promptsCount}} 提示词 × {{iterations}} 迭代次数 -> {{count}} 次生成",
+        "queueCountPrediction": "添加 {{predicted}} 到队列",
         "batchQueued": "加入队列的批次",
         "queuedCount": "{{pending}} 待处理",
         "front": "前",
@@ -1289,8 +1271,7 @@
         "queueMaxExceeded": "超出最大值 {{max_queue_size}}，将跳过 {{skip}}",
         "graphFailedToQueue": "节点图加入队列失败",
         "batchFieldValues": "批处理值",
-        "time": "时间",
-        "openQueue": "打开队列"
+        "time": "时间"
     },
     "sdxl": {
         "refinerStart": "Refiner 开始作用时机",
@@ -1304,12 +1285,11 @@
         "denoisingStrength": "去噪强度",
         "refinermodel": "Refiner 模型",
         "posAestheticScore": "正向美学评分",
-        "concatPromptStyle": "链接提示词 & 样式",
+        "concatPromptStyle": "连接提示词 & 样式",
         "loading": "加载中...",
         "steps": "步数",
         "posStylePrompt": "正向样式提示词",
-        "refiner": "Refiner",
-        "freePromptStyle": "手动输入样式提示词"
+        "refiner": "Refiner"
     },
     "metadata": {
         "positivePrompt": "正向提示词",
@@ -1353,13 +1333,7 @@
         "noLoRAsInstalled": "无已安装的 LoRA",
         "esrganModel": "ESRGAN 模型",
         "addLora": "添加 LoRA",
-        "noLoRAsLoaded": "无已加载的 LoRA",
-        "noMainModelSelected": "未选择主模型",
-        "lora": "LoRA",
-        "allLoRAsAdded": "已添加所有 LoRA",
-        "defaultVAE": "默认 VAE",
-        "incompatibleBaseModel": "不兼容基础模型",
-        "loraAlreadyAdded": "LoRA 已经被添加"
+        "noLoRAsLoaded": "无已加载的 LoRA"
     },
     "boards": {
         "autoAddBoard": "自动添加面板",
@@ -1403,9 +1377,7 @@
         "maxPrompts": "最大提示词数",
         "dynamicPrompts": "动态提示词",
         "promptsWithCount_other": "{{count}} 个提示词",
-        "promptsPreview": "提示词预览",
-        "showDynamicPrompts": "显示动态提示词",
-        "loading": "生成动态提示词中..."
+        "promptsPreview": "提示词预览"
     },
     "popovers": {
         "compositingMaskAdjustments": {
@@ -1687,28 +1659,5 @@
     },
     "app": {
         "storeNotInitialized": "商店尚未初始化"
-    },
-    "accordions": {
-        "compositing": {
-            "infillTab": "内补",
-            "coherenceTab": "一致性层",
-            "title": "合成"
-        },
-        "control": {
-            "controlAdaptersTab": "Control Adapters",
-            "ipTab": "图像提示",
-            "title": "Control"
-        },
-        "generation": {
-            "title": "生成",
-            "conceptsTab": "概念",
-            "modelTab": "模型"
-        },
-        "advanced": {
-            "title": "高级"
-        },
-        "image": {
-            "title": "图像"
-        }
     }
 }

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>
   );