wip

docker/Dockerfile

@@ -55,7 +55,6 @@ RUN --mount=type=cache,target=/root/.cache/pip \
 FROM node:20-slim AS web-builder
 ENV PNPM_HOME="/pnpm"
 ENV PATH="$PNPM_HOME:$PATH"
-RUN corepack use pnpm@8.x
 RUN corepack enable
 
 WORKDIR /build

invokeai/app/api/routers/model_manager.py

@@ -6,7 +6,7 @@ import pathlib
 import traceback
 from copy import deepcopy
 from tempfile import TemporaryDirectory
-from typing import List, Optional, Type
+from typing import Any, Dict, List, Optional, Type
 
 from fastapi import Body, Path, Query, Response, UploadFile
 from fastapi.responses import FileResponse, HTMLResponse
@@ -430,11 +430,13 @@ async def delete_model_image(
 async def install_model(
     source: str = Query(description="Model source to install, can be a local path, repo_id, or remote URL"),
     inplace: Optional[bool] = Query(description="Whether or not to install a local model in place", default=False),
-    access_token: Optional[str] = Query(description="access token for the remote resource", default=None),
-    config: ModelRecordChanges = Body(
-        description="Object containing fields that override auto-probed values in the model config record, such as name, description and prediction_type ",
+    # TODO(MM2): Can we type this?
+    config: Optional[Dict[str, Any]] = Body(
+        description="Dict of fields that override auto-probed values in the model config record, such as name, description and prediction_type ",
+        default=None,
         example={"name": "string", "description": "string"},
     ),
+    access_token: Optional[str] = None,
 ) -> ModelInstallJob:
     """Install a model using a string identifier.
 
@@ -449,9 +451,8 @@ async def install_model(
        - model/name:fp16:path/to/model.safetensors
        - model/name::path/to/model.safetensors
 
-    `config` is a ModelRecordChanges object. Fields in this object will override
-    the ones that are probed automatically. Pass an empty object to accept
-    all the defaults.
+    `config` is an optional dict containing model configuration values that will override
+    the ones that are probed automatically.
 
     `access_token` is an optional access token for use with Urls that require
     authentication.
@@ -736,7 +737,7 @@ async def convert_model(
         # write the converted file to the convert path
         raw_model = converted_model.model
         assert hasattr(raw_model, "save_pretrained")
-        raw_model.save_pretrained(convert_path)  # type: ignore
+        raw_model.save_pretrained(convert_path)
         assert convert_path.exists()
 
         # temporarily rename the original safetensors file so that there is no naming conflict
@@ -749,12 +750,12 @@ async def convert_model(
         try:
             new_key = installer.install_path(
                 convert_path,
-                config=ModelRecordChanges(
-                    name=original_name,
-                    description=model_config.description,
-                    hash=model_config.hash,
-                    source=model_config.source,
-                ),
+                config={
+                    "name": original_name,
+                    "description": model_config.description,
+                    "hash": model_config.hash,
+                    "source": model_config.source,
+                },
             )
         except Exception as e:
             logger.error(str(e))

invokeai/app/invocations/denoise_latents.py

@@ -58,10 +58,7 @@ from invokeai.backend.stable_diffusion.diffusion.conditioning_data import (
 from invokeai.backend.stable_diffusion.diffusion.custom_atttention import CustomAttnProcessor2_0
 from invokeai.backend.stable_diffusion.diffusion_backend import StableDiffusionBackend
 from invokeai.backend.stable_diffusion.extension_callback_type import ExtensionCallbackType
-from invokeai.backend.stable_diffusion.extensions.controlnet import ControlNetExt
-from invokeai.backend.stable_diffusion.extensions.freeu import FreeUExt
 from invokeai.backend.stable_diffusion.extensions.preview import PreviewExt
-from invokeai.backend.stable_diffusion.extensions.rescale_cfg import RescaleCFGExt
 from invokeai.backend.stable_diffusion.extensions_manager import ExtensionsManager
 from invokeai.backend.stable_diffusion.schedulers import SCHEDULER_MAP
 from invokeai.backend.stable_diffusion.schedulers.schedulers import SCHEDULER_NAME_VALUES
@@ -466,38 +463,6 @@ class DenoiseLatentsInvocation(BaseInvocation):
 
         return controlnet_data
 
-    @staticmethod
-    def parse_controlnet_field(
-        exit_stack: ExitStack,
-        context: InvocationContext,
-        control_input: ControlField | list[ControlField] | None,
-        ext_manager: ExtensionsManager,
-    ) -> None:
-        # Normalize control_input to a list.
-        control_list: list[ControlField]
-        if isinstance(control_input, ControlField):
-            control_list = [control_input]
-        elif isinstance(control_input, list):
-            control_list = control_input
-        elif control_input is None:
-            control_list = []
-        else:
-            raise ValueError(f"Unexpected control_input type: {type(control_input)}")
-
-        for control_info in control_list:
-            model = exit_stack.enter_context(context.models.load(control_info.control_model))
-            ext_manager.add_extension(
-                ControlNetExt(
-                    model=model,
-                    image=context.images.get_pil(control_info.image.image_name),
-                    weight=control_info.control_weight,
-                    begin_step_percent=control_info.begin_step_percent,
-                    end_step_percent=control_info.end_step_percent,
-                    control_mode=control_info.control_mode,
-                    resize_mode=control_info.resize_mode,
-                )
-            )
-
     def prep_ip_adapter_image_prompts(
         self,
         context: InvocationContext,
@@ -825,38 +790,22 @@ class DenoiseLatentsInvocation(BaseInvocation):
 
         ext_manager.add_extension(PreviewExt(step_callback))
 
-        ### cfg rescale
-        if self.cfg_rescale_multiplier > 0:
-            ext_manager.add_extension(RescaleCFGExt(self.cfg_rescale_multiplier))
+        # ext: t2i/ip adapter
+        ext_manager.run_callback(ExtensionCallbackType.SETUP, denoise_ctx)
 
-        ### freeu
-        if self.unet.freeu_config:
-            ext_manager.add_extension(FreeUExt(self.unet.freeu_config))
-
-        # context for loading additional models
-        with ExitStack() as exit_stack:
-            # later should be smth like:
-            # for extension_field in self.extensions:
-            #    ext = extension_field.to_extension(exit_stack, context, ext_manager)
-            #    ext_manager.add_extension(ext)
-            self.parse_controlnet_field(exit_stack, context, self.control, ext_manager)
-
-            # ext: t2i/ip adapter
-            ext_manager.run_callback(ExtensionCallbackType.SETUP, denoise_ctx)
-
-            unet_info = context.models.load(self.unet.unet)
-            assert isinstance(unet_info.model, UNet2DConditionModel)
-            with (
-                unet_info.model_on_device() as (cached_weights, unet),
-                ModelPatcher.patch_unet_attention_processor(unet, denoise_ctx.inputs.attention_processor_cls),
-                # ext: controlnet
-                ext_manager.patch_extensions(denoise_ctx),
-                # ext: freeu, seamless, ip adapter, lora
-                ext_manager.patch_unet(unet, cached_weights),
-            ):
-                sd_backend = StableDiffusionBackend(unet, scheduler)
-                denoise_ctx.unet = unet
-                result_latents = sd_backend.latents_from_embeddings(denoise_ctx, ext_manager)
+        unet_info = context.models.load(self.unet.unet)
+        assert isinstance(unet_info.model, UNet2DConditionModel)
+        with (
+            unet_info.model_on_device() as (model_state_dict, unet),
+            ModelPatcher.patch_unet_attention_processor(unet, denoise_ctx.inputs.attention_processor_cls),
+            # ext: controlnet
+            ext_manager.patch_extensions(unet),
+            # ext: freeu, seamless, ip adapter, lora
+            ext_manager.patch_unet(model_state_dict, unet),
+        ):
+            sd_backend = StableDiffusionBackend(unet, scheduler)
+            denoise_ctx.unet = unet
+            result_latents = sd_backend.latents_from_embeddings(denoise_ctx, ext_manager)
 
         # https://discuss.huggingface.co/t/memory-usage-by-later-pipeline-stages/23699
         result_latents = result_latents.detach().to("cpu")

invokeai/app/invocations/spandrel_image_to_image.py

@@ -1,5 +1,3 @@
-from typing import Callable
-
 import numpy as np
 import torch
 from PIL import Image
@@ -23,7 +21,7 @@ from invokeai.backend.tiles.tiles import calc_tiles_min_overlap
 from invokeai.backend.tiles.utils import TBLR, Tile
 
 
-@invocation("spandrel_image_to_image", title="Image-to-Image", tags=["upscale"], category="upscale", version="1.3.0")
+@invocation("spandrel_image_to_image", title="Image-to-Image", tags=["upscale"], category="upscale", version="1.1.0")
 class SpandrelImageToImageInvocation(BaseInvocation, WithMetadata, WithBoard):
     """Run any spandrel image-to-image model (https://github.com/chaiNNer-org/spandrel)."""
 
@@ -37,8 +35,7 @@ class SpandrelImageToImageInvocation(BaseInvocation, WithMetadata, WithBoard):
         default=512, description="The tile size for tiled image-to-image. Set to 0 to disable tiling."
     )
 
-    @classmethod
-    def scale_tile(cls, tile: Tile, scale: int) -> Tile:
+    def _scale_tile(self, tile: Tile, scale: int) -> Tile:
         return Tile(
             coords=TBLR(
                 top=tile.coords.top * scale,
@@ -54,22 +51,20 @@ class SpandrelImageToImageInvocation(BaseInvocation, WithMetadata, WithBoard):
             ),
         )
 
-    @classmethod
-    def upscale_image(
-        cls,
-        image: Image.Image,
-        tile_size: int,
-        spandrel_model: SpandrelImageToImageModel,
-        is_canceled: Callable[[], bool],
-    ) -> Image.Image:
+    @torch.inference_mode()
+    def invoke(self, context: InvocationContext) -> ImageOutput:
+        # Images are converted to RGB, because most models don't support an alpha channel. In the future, we may want to
+        # revisit this.
+        image = context.images.get_pil(self.image.image_name, mode="RGB")
+
         # Compute the image tiles.
-        if tile_size > 0:
+        if self.tile_size > 0:
             min_overlap = 20
             tiles = calc_tiles_min_overlap(
                 image_height=image.height,
                 image_width=image.width,
-                tile_height=tile_size,
-                tile_width=tile_size,
+                tile_height=self.tile_size,
+                tile_width=self.tile_size,
                 min_overlap=min_overlap,
             )
         else:
@@ -90,164 +85,60 @@ class SpandrelImageToImageInvocation(BaseInvocation, WithMetadata, WithBoard):
         # Prepare input image for inference.
         image_tensor = SpandrelImageToImageModel.pil_to_tensor(image)
 
-        # Scale the tiles for re-assembling the final image.
-        scale = spandrel_model.scale
-        scaled_tiles = [cls.scale_tile(tile, scale=scale) for tile in tiles]
-
-        # Prepare the output tensor.
-        _, channels, height, width = image_tensor.shape
-        output_tensor = torch.zeros(
-            (height * scale, width * scale, channels), dtype=torch.uint8, device=torch.device("cpu")
-        )
-
-        image_tensor = image_tensor.to(device=spandrel_model.device, dtype=spandrel_model.dtype)
+        # Load the model.
+        spandrel_model_info = context.models.load(self.image_to_image_model)
 
         # Run the model on each tile.
-        for tile, scaled_tile in tqdm(list(zip(tiles, scaled_tiles, strict=True)), desc="Upscaling Tiles"):
-            # Exit early if the invocation has been canceled.
-            if is_canceled():
-                raise CanceledException
+        with spandrel_model_info as spandrel_model:
+            assert isinstance(spandrel_model, SpandrelImageToImageModel)
 
-            # Extract the current tile from the input tensor.
-            input_tile = image_tensor[
-                :, :, tile.coords.top : tile.coords.bottom, tile.coords.left : tile.coords.right
-            ].to(device=spandrel_model.device, dtype=spandrel_model.dtype)
+            # Scale the tiles for re-assembling the final image.
+            scale = spandrel_model.scale
+            scaled_tiles = [self._scale_tile(tile, scale=scale) for tile in tiles]
 
-            # Run the model on the tile.
-            output_tile = spandrel_model.run(input_tile)
+            # Prepare the output tensor.
+            _, channels, height, width = image_tensor.shape
+            output_tensor = torch.zeros(
+                (height * scale, width * scale, channels), dtype=torch.uint8, device=torch.device("cpu")
+            )
 
-            # Convert the output tile into the output tensor's format.
-            # (N, C, H, W) -> (C, H, W)
-            output_tile = output_tile.squeeze(0)
-            # (C, H, W) -> (H, W, C)
-            output_tile = output_tile.permute(1, 2, 0)
-            output_tile = output_tile.clamp(0, 1)
-            output_tile = (output_tile * 255).to(dtype=torch.uint8, device=torch.device("cpu"))
+            image_tensor = image_tensor.to(device=spandrel_model.device, dtype=spandrel_model.dtype)
 
-            # Merge the output tile into the output tensor.
-            # We only keep half of the overlap on the top and left side of the tile. We do this in case there are
-            # edge artifacts. We don't bother with any 'blending' in the current implementation - for most upscalers
-            # it seems unnecessary, but we may find a need in the future.
-            top_overlap = scaled_tile.overlap.top // 2
-            left_overlap = scaled_tile.overlap.left // 2
-            output_tensor[
-                scaled_tile.coords.top + top_overlap : scaled_tile.coords.bottom,
-                scaled_tile.coords.left + left_overlap : scaled_tile.coords.right,
-                :,
-            ] = output_tile[top_overlap:, left_overlap:, :]
+            for tile, scaled_tile in tqdm(list(zip(tiles, scaled_tiles, strict=True)), desc="Upscaling Tiles"):
+                # Exit early if the invocation has been canceled.
+                if context.util.is_canceled():
+                    raise CanceledException
+
+                # Extract the current tile from the input tensor.
+                input_tile = image_tensor[
+                    :, :, tile.coords.top : tile.coords.bottom, tile.coords.left : tile.coords.right
+                ].to(device=spandrel_model.device, dtype=spandrel_model.dtype)
+
+                # Run the model on the tile.
+                output_tile = spandrel_model.run(input_tile)
+
+                # Convert the output tile into the output tensor's format.
+                # (N, C, H, W) -> (C, H, W)
+                output_tile = output_tile.squeeze(0)
+                # (C, H, W) -> (H, W, C)
+                output_tile = output_tile.permute(1, 2, 0)
+                output_tile = output_tile.clamp(0, 1)
+                output_tile = (output_tile * 255).to(dtype=torch.uint8, device=torch.device("cpu"))
+
+                # Merge the output tile into the output tensor.
+                # We only keep half of the overlap on the top and left side of the tile. We do this in case there are
+                # edge artifacts. We don't bother with any 'blending' in the current implementation - for most upscalers
+                # it seems unnecessary, but we may find a need in the future.
+                top_overlap = scaled_tile.overlap.top // 2
+                left_overlap = scaled_tile.overlap.left // 2
+                output_tensor[
+                    scaled_tile.coords.top + top_overlap : scaled_tile.coords.bottom,
+                    scaled_tile.coords.left + left_overlap : scaled_tile.coords.right,
+                    :,
+                ] = output_tile[top_overlap:, left_overlap:, :]
 
         # Convert the output tensor to a PIL image.
         np_image = output_tensor.detach().numpy().astype(np.uint8)
         pil_image = Image.fromarray(np_image)
-
-        return pil_image
-
-    @torch.inference_mode()
-    def invoke(self, context: InvocationContext) -> ImageOutput:
-        # Images are converted to RGB, because most models don't support an alpha channel. In the future, we may want to
-        # revisit this.
-        image = context.images.get_pil(self.image.image_name, mode="RGB")
-
-        # Load the model.
-        spandrel_model_info = context.models.load(self.image_to_image_model)
-
-        # Do the upscaling.
-        with spandrel_model_info as spandrel_model:
-            assert isinstance(spandrel_model, SpandrelImageToImageModel)
-
-            # Upscale the image
-            pil_image = self.upscale_image(image, self.tile_size, spandrel_model, context.util.is_canceled)
-
-        image_dto = context.images.save(image=pil_image)
-        return ImageOutput.build(image_dto)
-
-
-@invocation(
-    "spandrel_image_to_image_autoscale",
-    title="Image-to-Image (Autoscale)",
-    tags=["upscale"],
-    category="upscale",
-    version="1.0.0",
-)
-class SpandrelImageToImageAutoscaleInvocation(SpandrelImageToImageInvocation):
-    """Run any spandrel image-to-image model (https://github.com/chaiNNer-org/spandrel) until the target scale is reached."""
-
-    scale: float = InputField(
-        default=4.0,
-        gt=0.0,
-        le=16.0,
-        description="The final scale of the output image. If the model does not upscale the image, this will be ignored.",
-    )
-    fit_to_multiple_of_8: bool = InputField(
-        default=False,
-        description="If true, the output image will be resized to the nearest multiple of 8 in both dimensions.",
-    )
-
-    @torch.inference_mode()
-    def invoke(self, context: InvocationContext) -> ImageOutput:
-        # Images are converted to RGB, because most models don't support an alpha channel. In the future, we may want to
-        # revisit this.
-        image = context.images.get_pil(self.image.image_name, mode="RGB")
-
-        # Load the model.
-        spandrel_model_info = context.models.load(self.image_to_image_model)
-
-        # The target size of the image, determined by the provided scale. We'll run the upscaler until we hit this size.
-        # Later, we may mutate this value if the model doesn't upscale the image or if the user requested a multiple of 8.
-        target_width = int(image.width * self.scale)
-        target_height = int(image.height * self.scale)
-
-        # Do the upscaling.
-        with spandrel_model_info as spandrel_model:
-            assert isinstance(spandrel_model, SpandrelImageToImageModel)
-
-            # First pass of upscaling. Note: `pil_image` will be mutated.
-            pil_image = self.upscale_image(image, self.tile_size, spandrel_model, context.util.is_canceled)
-
-            # Some models don't upscale the image, but we have no way to know this in advance. We'll check if the model
-            # upscaled the image and run the loop below if it did. We'll require the model to upscale both dimensions
-            # to be considered an upscale model.
-            is_upscale_model = pil_image.width > image.width and pil_image.height > image.height
-
-            if is_upscale_model:
-                # This is an upscale model, so we should keep upscaling until we reach the target size.
-                iterations = 1
-                while pil_image.width < target_width or pil_image.height < target_height:
-                    pil_image = self.upscale_image(pil_image, self.tile_size, spandrel_model, context.util.is_canceled)
-                    iterations += 1
-
-                    # Sanity check to prevent excessive or infinite loops. All known upscaling models are at least 2x.
-                    # Our max scale is 16x, so with a 2x model, we should never exceed 16x == 2^4 -> 4 iterations.
-                    # We'll allow one extra iteration "just in case" and bail at 5 upscaling iterations. In practice,
-                    # we should never reach this limit.
-                    if iterations >= 5:
-                        context.logger.warning(
-                            "Upscale loop reached maximum iteration count of 5, stopping upscaling early."
-                        )
-                        break
-            else:
-                # This model doesn't upscale the image. We should ignore the scale parameter, modifying the output size
-                # to be the same as the processed image size.
-
-                # The output size is now the size of the processed image.
-                target_width = pil_image.width
-                target_height = pil_image.height
-
-                # Warn the user if they requested a scale greater than 1.
-                if self.scale > 1:
-                    context.logger.warning(
-                        "Model does not increase the size of the image, but a greater scale than 1 was requested. Image will not be scaled."
-                    )
-
-        # We may need to resize the image to a multiple of 8. Use floor division to ensure we don't scale the image up
-        # in the final resize
-        if self.fit_to_multiple_of_8:
-            target_width = int(target_width // 8 * 8)
-            target_height = int(target_height // 8 * 8)
-
-        # Final resize. Per PIL documentation, Lanczos provides the best quality for both upscale and downscale.
-        # See: https://pillow.readthedocs.io/en/stable/handbook/concepts.html#filters-comparison-table
-        pil_image = pil_image.resize((target_width, target_height), resample=Image.Resampling.LANCZOS)
-
         image_dto = context.images.save(image=pil_image)
         return ImageOutput.build(image_dto)

invokeai/app/services/model_install/model_install_base.py

@@ -3,7 +3,7 @@
 
 from abc import ABC, abstractmethod
 from pathlib import Path
-from typing import List, Optional, Union
+from typing import Any, Dict, List, Optional, Union
 
 from pydantic.networks import AnyHttpUrl
 
@@ -12,7 +12,7 @@ from invokeai.app.services.download import DownloadQueueServiceBase
 from invokeai.app.services.events.events_base import EventServiceBase
 from invokeai.app.services.invoker import Invoker
 from invokeai.app.services.model_install.model_install_common import ModelInstallJob, ModelSource
-from invokeai.app.services.model_records import ModelRecordChanges, ModelRecordServiceBase
+from invokeai.app.services.model_records import ModelRecordServiceBase
 from invokeai.backend.model_manager import AnyModelConfig
 
 
@@ -64,7 +64,7 @@ class ModelInstallServiceBase(ABC):
     def register_path(
         self,
         model_path: Union[Path, str],
-        config: Optional[ModelRecordChanges] = None,
+        config: Optional[Dict[str, Any]] = None,
     ) -> str:
         """
         Probe and register the model at model_path.
@@ -72,7 +72,7 @@ class ModelInstallServiceBase(ABC):
         This keeps the model in its current location.
 
         :param model_path: Filesystem Path to the model.
-        :param config: ModelRecordChanges object that will override autoassigned model record values.
+        :param config: Dict of attributes that will override autoassigned values.
         :returns id: The string ID of the registered model.
         """
 
@@ -92,7 +92,7 @@ class ModelInstallServiceBase(ABC):
     def install_path(
         self,
         model_path: Union[Path, str],
-        config: Optional[ModelRecordChanges] = None,
+        config: Optional[Dict[str, Any]] = None,
     ) -> str:
         """
         Probe, register and install the model in the models directory.
@@ -101,7 +101,7 @@ class ModelInstallServiceBase(ABC):
         the models directory handled by InvokeAI.
 
         :param model_path: Filesystem Path to the model.
-        :param config: ModelRecordChanges object that will override autoassigned model record values.
+        :param config: Dict of attributes that will override autoassigned values.
         :returns id: The string ID of the registered model.
         """
 
@@ -109,14 +109,14 @@ class ModelInstallServiceBase(ABC):
     def heuristic_import(
         self,
         source: str,
-        config: Optional[ModelRecordChanges] = None,
+        config: Optional[Dict[str, Any]] = None,
         access_token: Optional[str] = None,
         inplace: Optional[bool] = False,
     ) -> ModelInstallJob:
         r"""Install the indicated model using heuristics to interpret user intentions.
 
         :param source: String source
-        :param config: Optional ModelRecordChanges object. Any fields in this object
+        :param config: Optional dict. Any fields in this dict
          will override corresponding autoassigned probe fields in the
          model's config record as described in `import_model()`.
         :param access_token: Optional access token for remote sources.
@@ -147,7 +147,7 @@ class ModelInstallServiceBase(ABC):
     def import_model(
         self,
         source: ModelSource,
-        config: Optional[ModelRecordChanges] = None,
+        config: Optional[Dict[str, Any]] = None,
     ) -> ModelInstallJob:
         """Install the indicated model.
 

invokeai/app/services/model_install/model_install_common.py

@@ -2,14 +2,13 @@ import re
 import traceback
 from enum import Enum
 from pathlib import Path
-from typing import Literal, Optional, Set, Union
+from typing import Any, Dict, Literal, Optional, Set, Union
 
 from pydantic import BaseModel, Field, PrivateAttr, field_validator
 from pydantic.networks import AnyHttpUrl
 from typing_extensions import Annotated
 
 from invokeai.app.services.download import DownloadJob, MultiFileDownloadJob
-from invokeai.app.services.model_records import ModelRecordChanges
 from invokeai.backend.model_manager import AnyModelConfig, ModelRepoVariant
 from invokeai.backend.model_manager.config import ModelSourceType
 from invokeai.backend.model_manager.metadata import AnyModelRepoMetadata
@@ -134,9 +133,8 @@ class ModelInstallJob(BaseModel):
     id: int = Field(description="Unique ID for this job")
     status: InstallStatus = Field(default=InstallStatus.WAITING, description="Current status of install process")
     error_reason: Optional[str] = Field(default=None, description="Information about why the job failed")
-    config_in: ModelRecordChanges = Field(
-        default_factory=ModelRecordChanges,
-        description="Configuration information (e.g. 'description') to apply to model.",
+    config_in: Dict[str, Any] = Field(
+        default_factory=dict, description="Configuration information (e.g. 'description') to apply to model."
     )
     config_out: Optional[AnyModelConfig] = Field(
         default=None, description="After successful installation, this will hold the configuration object."

invokeai/app/services/model_install/model_install_default.py

@@ -163,27 +163,26 @@ class ModelInstallService(ModelInstallServiceBase):
     def register_path(
         self,
         model_path: Union[Path, str],
-        config: Optional[ModelRecordChanges] = None,
+        config: Optional[Dict[str, Any]] = None,
     ) -> str:  # noqa D102
         model_path = Path(model_path)
-        config = config or ModelRecordChanges()
-        if not config.source:
-            config.source = model_path.resolve().as_posix()
-        config.source_type = ModelSourceType.Path
+        config = config or {}
+        if not config.get("source"):
+            config["source"] = model_path.resolve().as_posix()
+        config["source_type"] = ModelSourceType.Path
         return self._register(model_path, config)
 
     def install_path(
         self,
         model_path: Union[Path, str],
-        config: Optional[ModelRecordChanges] = None,
+        config: Optional[Dict[str, Any]] = None,
     ) -> str:  # noqa D102
         model_path = Path(model_path)
-        config = config or ModelRecordChanges()
-        info: AnyModelConfig = ModelProbe.probe(
-            Path(model_path), config.model_dump(), hash_algo=self._app_config.hashing_algorithm
-        )  # type: ignore
+        config = config or {}
 
-        if preferred_name := config.name:
+        info: AnyModelConfig = ModelProbe.probe(Path(model_path), config, hash_algo=self._app_config.hashing_algorithm)
+
+        if preferred_name := config.get("name"):
             preferred_name = Path(preferred_name).with_suffix(model_path.suffix)
 
         dest_path = (
@@ -205,7 +204,7 @@ class ModelInstallService(ModelInstallServiceBase):
     def heuristic_import(
         self,
         source: str,
-        config: Optional[ModelRecordChanges] = None,
+        config: Optional[Dict[str, Any]] = None,
         access_token: Optional[str] = None,
         inplace: Optional[bool] = False,
     ) -> ModelInstallJob:
@@ -217,7 +216,7 @@ class ModelInstallService(ModelInstallServiceBase):
             source_obj.access_token = access_token
         return self.import_model(source_obj, config)
 
-    def import_model(self, source: ModelSource, config: Optional[ModelRecordChanges] = None) -> ModelInstallJob:  # noqa D102
+    def import_model(self, source: ModelSource, config: Optional[Dict[str, Any]] = None) -> ModelInstallJob:  # noqa D102
         similar_jobs = [x for x in self.list_jobs() if x.source == source and not x.in_terminal_state]
         if similar_jobs:
             self._logger.warning(f"There is already an active install job for {source}. Not enqueuing.")
@@ -319,17 +318,16 @@ class ModelInstallService(ModelInstallServiceBase):
                         model_path = self._app_config.models_path / model_path
                     model_path = model_path.resolve()
 
-                    config = ModelRecordChanges(
-                        name=model_name,
-                        description=stanza.get("description"),
-                    )
+                    config: dict[str, Any] = {}
+                    config["name"] = model_name
+                    config["description"] = stanza.get("description")
                     legacy_config_path = stanza.get("config")
                     if legacy_config_path:
                         # In v3, these paths were relative to the root. Migrate them to be relative to the legacy_conf_dir.
                         legacy_config_path = self._app_config.root_path / legacy_config_path
                         if legacy_config_path.is_relative_to(self._app_config.legacy_conf_path):
                             legacy_config_path = legacy_config_path.relative_to(self._app_config.legacy_conf_path)
-                        config.config_path = str(legacy_config_path)
+                        config["config_path"] = str(legacy_config_path)
                     try:
                         id = self.register_path(model_path=model_path, config=config)
                         self._logger.info(f"Migrated {model_name} with id {id}")
@@ -502,11 +500,11 @@ class ModelInstallService(ModelInstallServiceBase):
         job.total_bytes = self._stat_size(job.local_path)
         job.bytes = job.total_bytes
         self._signal_job_running(job)
-        job.config_in.source = str(job.source)
-        job.config_in.source_type = MODEL_SOURCE_TO_TYPE_MAP[job.source.__class__]
+        job.config_in["source"] = str(job.source)
+        job.config_in["source_type"] = MODEL_SOURCE_TO_TYPE_MAP[job.source.__class__]
         # enter the metadata, if there is any
         if isinstance(job.source_metadata, (HuggingFaceMetadata)):
-            job.config_in.source_api_response = job.source_metadata.api_response
+            job.config_in["source_api_response"] = job.source_metadata.api_response
 
         if job.inplace:
             key = self.register_path(job.local_path, job.config_in)
@@ -641,11 +639,11 @@ class ModelInstallService(ModelInstallServiceBase):
         return new_path
 
     def _register(
-        self, model_path: Path, config: Optional[ModelRecordChanges] = None, info: Optional[AnyModelConfig] = None
+        self, model_path: Path, config: Optional[Dict[str, Any]] = None, info: Optional[AnyModelConfig] = None
     ) -> str:
-        config = config or ModelRecordChanges()
+        config = config or {}
 
-        info = info or ModelProbe.probe(model_path, config.model_dump(), hash_algo=self._app_config.hashing_algorithm)  # type: ignore
+        info = info or ModelProbe.probe(model_path, config, hash_algo=self._app_config.hashing_algorithm)
 
         model_path = model_path.resolve()
 
@@ -676,13 +674,11 @@ class ModelInstallService(ModelInstallServiceBase):
         precision = TorchDevice.choose_torch_dtype()
         return ModelRepoVariant.FP16 if precision == torch.float16 else None
 
-    def _import_local_model(
-        self, source: LocalModelSource, config: Optional[ModelRecordChanges] = None
-    ) -> ModelInstallJob:
+    def _import_local_model(self, source: LocalModelSource, config: Optional[Dict[str, Any]]) -> ModelInstallJob:
         return ModelInstallJob(
             id=self._next_id(),
             source=source,
-            config_in=config or ModelRecordChanges(),
+            config_in=config or {},
             local_path=Path(source.path),
             inplace=source.inplace or False,
         )
@@ -690,7 +686,7 @@ class ModelInstallService(ModelInstallServiceBase):
     def _import_from_hf(
         self,
         source: HFModelSource,
-        config: Optional[ModelRecordChanges] = None,
+        config: Optional[Dict[str, Any]] = None,
     ) -> ModelInstallJob:
         # Add user's cached access token to HuggingFace requests
         if source.access_token is None:
@@ -706,7 +702,7 @@ class ModelInstallService(ModelInstallServiceBase):
     def _import_from_url(
         self,
         source: URLModelSource,
-        config: Optional[ModelRecordChanges] = None,
+        config: Optional[Dict[str, Any]],
     ) -> ModelInstallJob:
         remote_files, metadata = self._remote_files_from_source(source)
         return self._import_remote_model(
@@ -721,7 +717,7 @@ class ModelInstallService(ModelInstallServiceBase):
         source: HFModelSource | URLModelSource,
         remote_files: List[RemoteModelFile],
         metadata: Optional[AnyModelRepoMetadata],
-        config: Optional[ModelRecordChanges],
+        config: Optional[Dict[str, Any]],
     ) -> ModelInstallJob:
         if len(remote_files) == 0:
             raise ValueError(f"{source}: No downloadable files found")
@@ -734,7 +730,7 @@ class ModelInstallService(ModelInstallServiceBase):
         install_job = ModelInstallJob(
             id=self._next_id(),
             source=source,
-            config_in=config or ModelRecordChanges(),
+            config_in=config or {},
             source_metadata=metadata,
             local_path=destdir,  # local path may change once the download has started due to content-disposition handling
             bytes=0,

invokeai/app/services/model_records/model_records_base.py

@@ -18,7 +18,6 @@ from invokeai.backend.model_manager.config import (
     ControlAdapterDefaultSettings,
     MainModelDefaultSettings,
     ModelFormat,
-    ModelSourceType,
     ModelType,
     ModelVariantType,
     SchedulerPredictionType,
@@ -67,16 +66,10 @@ class ModelRecordChanges(BaseModelExcludeNull):
     """A set of changes to apply to a model."""
 
     # Changes applicable to all models
-    source: Optional[str] = Field(description="original source of the model", default=None)
-    source_type: Optional[ModelSourceType] = Field(description="type of model source", default=None)
-    source_api_response: Optional[str] = Field(description="metadata from remote source", default=None)
     name: Optional[str] = Field(description="Name of the model.", default=None)
     path: Optional[str] = Field(description="Path to the model.", default=None)
     description: Optional[str] = Field(description="Model description", default=None)
     base: Optional[BaseModelType] = Field(description="The base model.", default=None)
-    type: Optional[ModelType] = Field(description="Type of model", default=None)
-    key: Optional[str] = Field(description="Database ID for this model", default=None)
-    hash: Optional[str] = Field(description="hash of model file", default=None)
     trigger_phrases: Optional[set[str]] = Field(description="Set of trigger phrases for this model", default=None)
     default_settings: Optional[MainModelDefaultSettings | ControlAdapterDefaultSettings] = Field(
         description="Default settings for this model", default=None

invokeai/backend/model_manager/config.py

@@ -354,7 +354,7 @@ class CLIPVisionDiffusersConfig(DiffusersConfigBase):
     """Model config for CLIPVision."""
 
     type: Literal[ModelType.CLIPVision] = ModelType.CLIPVision
-    format: Literal[ModelFormat.Diffusers] = ModelFormat.Diffusers
+    format: Literal[ModelFormat.Diffusers]
 
     @staticmethod
     def get_tag() -> Tag:
@@ -365,7 +365,7 @@ class T2IAdapterConfig(DiffusersConfigBase, ControlAdapterConfigBase):
     """Model config for T2I."""
 
     type: Literal[ModelType.T2IAdapter] = ModelType.T2IAdapter
-    format: Literal[ModelFormat.Diffusers] = ModelFormat.Diffusers
+    format: Literal[ModelFormat.Diffusers]
 
     @staticmethod
     def get_tag() -> Tag:

invokeai/backend/model_manager/load/model_loaders/stable_diffusion.py

@@ -98,9 +98,6 @@ class StableDiffusionDiffusersModel(GenericDiffusersLoader):
                 ModelVariantType.Normal: StableDiffusionXLPipeline,
                 ModelVariantType.Inpaint: StableDiffusionXLInpaintPipeline,
             },
-            BaseModelType.StableDiffusionXLRefiner: {
-                ModelVariantType.Normal: StableDiffusionXLPipeline,
-            },
         }
         assert isinstance(config, MainCheckpointConfig)
         try:

invokeai/backend/model_manager/starter_models.py

@@ -187,171 +187,164 @@ STARTER_MODELS: list[StarterModel] = [
     # endregion
     # region ControlNet
     StarterModel(
-        name="QRCode Monster v2 (SD1.5)",
+        name="QRCode Monster",
         base=BaseModelType.StableDiffusion1,
-        source="monster-labs/control_v1p_sd15_qrcode_monster::v2",
-        description="ControlNet model that generates scannable creative QR codes",
-        type=ModelType.ControlNet,
-    ),
-    StarterModel(
-        name="QRCode Monster (SDXL)",
-        base=BaseModelType.StableDiffusionXL,
-        source="monster-labs/control_v1p_sdxl_qrcode_monster",
-        description="ControlNet model that generates scannable creative QR codes",
+        source="monster-labs/control_v1p_sd15_qrcode_monster",
+        description="Controlnet model that generates scannable creative QR codes",
         type=ModelType.ControlNet,
     ),
     StarterModel(
         name="canny",
         base=BaseModelType.StableDiffusion1,
         source="lllyasviel/control_v11p_sd15_canny",
-        description="ControlNet weights trained on sd-1.5 with canny conditioning.",
+        description="Controlnet weights trained on sd-1.5 with canny conditioning.",
         type=ModelType.ControlNet,
     ),
     StarterModel(
         name="inpaint",
         base=BaseModelType.StableDiffusion1,
         source="lllyasviel/control_v11p_sd15_inpaint",
-        description="ControlNet weights trained on sd-1.5 with canny conditioning, inpaint version",
+        description="Controlnet weights trained on sd-1.5 with canny conditioning, inpaint version",
         type=ModelType.ControlNet,
     ),
     StarterModel(
         name="mlsd",
         base=BaseModelType.StableDiffusion1,
         source="lllyasviel/control_v11p_sd15_mlsd",
-        description="ControlNet weights trained on sd-1.5 with canny conditioning, MLSD version",
+        description="Controlnet weights trained on sd-1.5 with canny conditioning, MLSD version",
         type=ModelType.ControlNet,
     ),
     StarterModel(
         name="depth",
         base=BaseModelType.StableDiffusion1,
         source="lllyasviel/control_v11f1p_sd15_depth",
-        description="ControlNet weights trained on sd-1.5 with depth conditioning",
+        description="Controlnet weights trained on sd-1.5 with depth conditioning",
         type=ModelType.ControlNet,
     ),
     StarterModel(
         name="normal_bae",
         base=BaseModelType.StableDiffusion1,
         source="lllyasviel/control_v11p_sd15_normalbae",
-        description="ControlNet weights trained on sd-1.5 with normalbae image conditioning",
+        description="Controlnet weights trained on sd-1.5 with normalbae image conditioning",
         type=ModelType.ControlNet,
     ),
     StarterModel(
         name="seg",
         base=BaseModelType.StableDiffusion1,
         source="lllyasviel/control_v11p_sd15_seg",
-        description="ControlNet weights trained on sd-1.5 with seg image conditioning",
+        description="Controlnet weights trained on sd-1.5 with seg image conditioning",
         type=ModelType.ControlNet,
     ),
     StarterModel(
         name="lineart",
         base=BaseModelType.StableDiffusion1,
         source="lllyasviel/control_v11p_sd15_lineart",
-        description="ControlNet weights trained on sd-1.5 with lineart image conditioning",
+        description="Controlnet weights trained on sd-1.5 with lineart image conditioning",
         type=ModelType.ControlNet,
     ),
     StarterModel(
         name="lineart_anime",
         base=BaseModelType.StableDiffusion1,
         source="lllyasviel/control_v11p_sd15s2_lineart_anime",
-        description="ControlNet weights trained on sd-1.5 with anime image conditioning",
+        description="Controlnet weights trained on sd-1.5 with anime image conditioning",
         type=ModelType.ControlNet,
     ),
     StarterModel(
         name="openpose",
         base=BaseModelType.StableDiffusion1,
         source="lllyasviel/control_v11p_sd15_openpose",
-        description="ControlNet weights trained on sd-1.5 with openpose image conditioning",
+        description="Controlnet weights trained on sd-1.5 with openpose image conditioning",
         type=ModelType.ControlNet,
     ),
     StarterModel(
         name="scribble",
         base=BaseModelType.StableDiffusion1,
         source="lllyasviel/control_v11p_sd15_scribble",
-        description="ControlNet weights trained on sd-1.5 with scribble image conditioning",
+        description="Controlnet weights trained on sd-1.5 with scribble image conditioning",
         type=ModelType.ControlNet,
     ),
     StarterModel(
         name="softedge",
         base=BaseModelType.StableDiffusion1,
         source="lllyasviel/control_v11p_sd15_softedge",
-        description="ControlNet weights trained on sd-1.5 with soft edge conditioning",
+        description="Controlnet weights trained on sd-1.5 with soft edge conditioning",
         type=ModelType.ControlNet,
     ),
     StarterModel(
         name="shuffle",
         base=BaseModelType.StableDiffusion1,
         source="lllyasviel/control_v11e_sd15_shuffle",
-        description="ControlNet weights trained on sd-1.5 with shuffle image conditioning",
+        description="Controlnet weights trained on sd-1.5 with shuffle image conditioning",
         type=ModelType.ControlNet,
     ),
     StarterModel(
         name="tile",
         base=BaseModelType.StableDiffusion1,
         source="lllyasviel/control_v11f1e_sd15_tile",
-        description="ControlNet weights trained on sd-1.5 with tiled image conditioning",
+        description="Controlnet weights trained on sd-1.5 with tiled image conditioning",
         type=ModelType.ControlNet,
     ),
     StarterModel(
         name="ip2p",
         base=BaseModelType.StableDiffusion1,
         source="lllyasviel/control_v11e_sd15_ip2p",
-        description="ControlNet weights trained on sd-1.5 with ip2p conditioning.",
+        description="Controlnet weights trained on sd-1.5 with ip2p conditioning.",
         type=ModelType.ControlNet,
     ),
     StarterModel(
         name="canny-sdxl",
         base=BaseModelType.StableDiffusionXL,
-        source="xinsir/controlNet-canny-sdxl-1.0",
-        description="ControlNet weights trained on sdxl-1.0 with canny conditioning, by Xinsir.",
+        source="xinsir/controlnet-canny-sdxl-1.0",
+        description="Controlnet weights trained on sdxl-1.0 with canny conditioning, by Xinsir.",
         type=ModelType.ControlNet,
     ),
     StarterModel(
         name="depth-sdxl",
         base=BaseModelType.StableDiffusionXL,
-        source="diffusers/controlNet-depth-sdxl-1.0",
-        description="ControlNet weights trained on sdxl-1.0 with depth conditioning.",
+        source="diffusers/controlnet-depth-sdxl-1.0",
+        description="Controlnet weights trained on sdxl-1.0 with depth conditioning.",
         type=ModelType.ControlNet,
     ),
     StarterModel(
         name="softedge-dexined-sdxl",
         base=BaseModelType.StableDiffusionXL,
-        source="SargeZT/controlNet-sd-xl-1.0-softedge-dexined",
-        description="ControlNet weights trained on sdxl-1.0 with dexined soft edge preprocessing.",
+        source="SargeZT/controlnet-sd-xl-1.0-softedge-dexined",
+        description="Controlnet weights trained on sdxl-1.0 with dexined soft edge preprocessing.",
         type=ModelType.ControlNet,
     ),
     StarterModel(
         name="depth-16bit-zoe-sdxl",
         base=BaseModelType.StableDiffusionXL,
-        source="SargeZT/controlNet-sd-xl-1.0-depth-16bit-zoe",
-        description="ControlNet weights trained on sdxl-1.0 with Zoe's preprocessor (16 bits).",
+        source="SargeZT/controlnet-sd-xl-1.0-depth-16bit-zoe",
+        description="Controlnet weights trained on sdxl-1.0 with Zoe's preprocessor (16 bits).",
         type=ModelType.ControlNet,
     ),
     StarterModel(
         name="depth-zoe-sdxl",
         base=BaseModelType.StableDiffusionXL,
-        source="diffusers/controlNet-zoe-depth-sdxl-1.0",
-        description="ControlNet weights trained on sdxl-1.0 with Zoe's preprocessor (32 bits).",
+        source="diffusers/controlnet-zoe-depth-sdxl-1.0",
+        description="Controlnet weights trained on sdxl-1.0 with Zoe's preprocessor (32 bits).",
         type=ModelType.ControlNet,
     ),
     StarterModel(
         name="openpose-sdxl",
         base=BaseModelType.StableDiffusionXL,
-        source="xinsir/controlNet-openpose-sdxl-1.0",
-        description="ControlNet weights trained on sdxl-1.0 compatible with the DWPose processor by Xinsir.",
+        source="xinsir/controlnet-openpose-sdxl-1.0",
+        description="Controlnet weights trained on sdxl-1.0 compatible with the DWPose processor by Xinsir.",
         type=ModelType.ControlNet,
     ),
     StarterModel(
         name="scribble-sdxl",
         base=BaseModelType.StableDiffusionXL,
-        source="xinsir/controlNet-scribble-sdxl-1.0",
-        description="ControlNet weights trained on sdxl-1.0 compatible with various lineart processors and black/white sketches by Xinsir.",
+        source="xinsir/controlnet-scribble-sdxl-1.0",
+        description="Controlnet weights trained on sdxl-1.0 compatible with various lineart processors and black/white sketches by Xinsir.",
         type=ModelType.ControlNet,
     ),
     StarterModel(
         name="tile-sdxl",
         base=BaseModelType.StableDiffusionXL,
-        source="xinsir/controlNet-tile-sdxl-1.0",
-        description="ControlNet weights trained on sdxl-1.0 with tiled image conditioning",
+        source="xinsir/controlnet-tile-sdxl-1.0",
+        description="Controlnet weights trained on sdxl-1.0 with tiled image conditioning",
         type=ModelType.ControlNet,
     ),
     # endregion

invokeai/backend/stable_diffusion/denoise_context.py

@@ -83,47 +83,47 @@ class DenoiseContext:
     unet: Optional[UNet2DConditionModel] = None
 
     # Current state of latent-space image in denoising process.
-    # None until `PRE_DENOISE_LOOP` callback.
+    # None until `pre_denoise_loop` callback.
     # Shape: [batch, channels, latent_height, latent_width]
     latents: Optional[torch.Tensor] = None
 
     # Current denoising step index.
-    # None until `PRE_STEP` callback.
+    # None until `pre_step` callback.
     step_index: Optional[int] = None
 
     # Current denoising step timestep.
-    # None until `PRE_STEP` callback.
+    # None until `pre_step` callback.
     timestep: Optional[torch.Tensor] = None
 
     # Arguments which will be passed to UNet model.
-    # Available in `PRE_UNET`/`POST_UNET` callbacks, otherwise will be None.
+    # Available in `pre_unet`/`post_unet` callbacks, otherwise will be None.
     unet_kwargs: Optional[UNetKwargs] = None
 
     # SchedulerOutput class returned from step function(normally, generated by scheduler).
-    # Supposed to be used only in `POST_STEP` callback, otherwise can be None.
+    # Supposed to be used only in `post_step` callback, otherwise can be None.
     step_output: Optional[SchedulerOutput] = None
 
     # Scaled version of `latents`, which will be passed to unet_kwargs initialization.
-    # Available in events inside step(between `PRE_STEP` and `POST_STEP`).
+    # Available in events inside step(between `pre_step` and `post_stop`).
     # Shape: [batch, channels, latent_height, latent_width]
     latent_model_input: Optional[torch.Tensor] = None
 
     # [TMP] Defines on which conditionings current unet call will be runned.
-    # Available in `PRE_UNET`/`POST_UNET` callbacks, otherwise will be None.
+    # Available in `pre_unet`/`post_unet` callbacks, otherwise will be None.
     conditioning_mode: Optional[ConditioningMode] = None
 
     # [TMP] Noise predictions from negative conditioning.
-    # Available in `POST_COMBINE_NOISE_PREDS` callback, otherwise will be None.
+    # Available in `apply_cfg` and `post_apply_cfg` callbacks, otherwise will be None.
     # Shape: [batch, channels, latent_height, latent_width]
     negative_noise_pred: Optional[torch.Tensor] = None
 
     # [TMP] Noise predictions from positive conditioning.
-    # Available in `POST_COMBINE_NOISE_PREDS` callback, otherwise will be None.
+    # Available in `apply_cfg` and `post_apply_cfg` callbacks, otherwise will be None.
     # Shape: [batch, channels, latent_height, latent_width]
     positive_noise_pred: Optional[torch.Tensor] = None
 
     # Combined noise prediction from passed conditionings.
-    # Available in `POST_COMBINE_NOISE_PREDS` callback, otherwise will be None.
+    # Available in `apply_cfg` and `post_apply_cfg` callbacks, otherwise will be None.
     # Shape: [batch, channels, latent_height, latent_width]
     noise_pred: Optional[torch.Tensor] = None
 

invokeai/backend/stable_diffusion/diffusion_backend.py

@@ -76,12 +76,12 @@ class StableDiffusionBackend:
             both_noise_pred = self.run_unet(ctx, ext_manager, ConditioningMode.Both)
             ctx.negative_noise_pred, ctx.positive_noise_pred = both_noise_pred.chunk(2)
 
-        # ext: override combine_noise_preds
-        ctx.noise_pred = self.combine_noise_preds(ctx)
+        # ext: override apply_cfg
+        ctx.noise_pred = self.apply_cfg(ctx)
 
         # ext: cfg_rescale [modify_noise_prediction]
         # TODO: rename
-        ext_manager.run_callback(ExtensionCallbackType.POST_COMBINE_NOISE_PREDS, ctx)
+        ext_manager.run_callback(ExtensionCallbackType.POST_APPLY_CFG, ctx)
 
         # compute the previous noisy sample x_t -> x_t-1
         step_output = ctx.scheduler.step(ctx.noise_pred, ctx.timestep, ctx.latents, **ctx.inputs.scheduler_step_kwargs)
@@ -95,15 +95,13 @@ class StableDiffusionBackend:
         return step_output
 
     @staticmethod
-    def combine_noise_preds(ctx: DenoiseContext) -> torch.Tensor:
+    def apply_cfg(ctx: DenoiseContext) -> torch.Tensor:
         guidance_scale = ctx.inputs.conditioning_data.guidance_scale
         if isinstance(guidance_scale, list):
             guidance_scale = guidance_scale[ctx.step_index]
 
-        # Note: Although this `torch.lerp(...)` line is logically equivalent to the current CFG line, it seems to result
-        # in slightly different outputs. It is suspected that this is caused by small precision differences.
-        # return torch.lerp(ctx.negative_noise_pred, ctx.positive_noise_pred, guidance_scale)
-        return ctx.negative_noise_pred + guidance_scale * (ctx.positive_noise_pred - ctx.negative_noise_pred)
+        return torch.lerp(ctx.negative_noise_pred, ctx.positive_noise_pred, guidance_scale)
+        # return ctx.negative_noise_pred + guidance_scale * (ctx.positive_noise_pred - ctx.negative_noise_pred)
 
     def run_unet(self, ctx: DenoiseContext, ext_manager: ExtensionsManager, conditioning_mode: ConditioningMode):
         sample = ctx.latent_model_input

invokeai/backend/stable_diffusion/extension_callback_type.py

@@ -9,4 +9,4 @@ class ExtensionCallbackType(Enum):
     POST_STEP = "post_step"
     PRE_UNET = "pre_unet"
     POST_UNET = "post_unet"
-    POST_COMBINE_NOISE_PREDS = "post_combine_noise_preds"
+    POST_APPLY_CFG = "post_apply_cfg"

invokeai/backend/stable_diffusion/extensions/base.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from contextlib import contextmanager
 from dataclasses import dataclass
-from typing import TYPE_CHECKING, Callable, Dict, List, Optional
+from typing import TYPE_CHECKING, Callable, Dict, List
 
 import torch
 from diffusers import UNet2DConditionModel
@@ -52,9 +52,9 @@ class ExtensionBase:
         return self._callbacks
 
     @contextmanager
-    def patch_extension(self, ctx: DenoiseContext):
+    def patch_extension(self, context: DenoiseContext):
         yield None
 
     @contextmanager
-    def patch_unet(self, unet: UNet2DConditionModel, cached_weights: Optional[Dict[str, torch.Tensor]] = None):
+    def patch_unet(self, state_dict: Dict[str, torch.Tensor], unet: UNet2DConditionModel):
         yield None

invokeai/backend/stable_diffusion/extensions/controlnet.py

@@ -1,158 +0,0 @@
-from __future__ import annotations
-
-import math
-from contextlib import contextmanager
-from typing import TYPE_CHECKING, List, Optional, Union
-
-import torch
-from PIL.Image import Image
-
-from invokeai.app.invocations.constants import LATENT_SCALE_FACTOR
-from invokeai.app.util.controlnet_utils import CONTROLNET_MODE_VALUES, CONTROLNET_RESIZE_VALUES, prepare_control_image
-from invokeai.backend.stable_diffusion.denoise_context import UNetKwargs
-from invokeai.backend.stable_diffusion.diffusion.conditioning_data import ConditioningMode
-from invokeai.backend.stable_diffusion.extension_callback_type import ExtensionCallbackType
-from invokeai.backend.stable_diffusion.extensions.base import ExtensionBase, callback
-
-if TYPE_CHECKING:
-    from invokeai.backend.stable_diffusion.denoise_context import DenoiseContext
-    from invokeai.backend.util.hotfixes import ControlNetModel
-
-
-class ControlNetExt(ExtensionBase):
-    def __init__(
-        self,
-        model: ControlNetModel,
-        image: Image,
-        weight: Union[float, List[float]],
-        begin_step_percent: float,
-        end_step_percent: float,
-        control_mode: CONTROLNET_MODE_VALUES,
-        resize_mode: CONTROLNET_RESIZE_VALUES,
-    ):
-        super().__init__()
-        self._model = model
-        self._image = image
-        self._weight = weight
-        self._begin_step_percent = begin_step_percent
-        self._end_step_percent = end_step_percent
-        self._control_mode = control_mode
-        self._resize_mode = resize_mode
-
-        self._image_tensor: Optional[torch.Tensor] = None
-
-    @contextmanager
-    def patch_extension(self, ctx: DenoiseContext):
-        original_processors = self._model.attn_processors
-        try:
-            self._model.set_attn_processor(ctx.inputs.attention_processor_cls())
-
-            yield None
-        finally:
-            self._model.set_attn_processor(original_processors)
-
-    @callback(ExtensionCallbackType.PRE_DENOISE_LOOP)
-    def resize_image(self, ctx: DenoiseContext):
-        _, _, latent_height, latent_width = ctx.latents.shape
-        image_height = latent_height * LATENT_SCALE_FACTOR
-        image_width = latent_width * LATENT_SCALE_FACTOR
-
-        self._image_tensor = prepare_control_image(
-            image=self._image,
-            do_classifier_free_guidance=False,
-            width=image_width,
-            height=image_height,
-            device=ctx.latents.device,
-            dtype=ctx.latents.dtype,
-            control_mode=self._control_mode,
-            resize_mode=self._resize_mode,
-        )
-
-    @callback(ExtensionCallbackType.PRE_UNET)
-    def pre_unet_step(self, ctx: DenoiseContext):
-        # skip if model not active in current step
-        total_steps = len(ctx.inputs.timesteps)
-        first_step = math.floor(self._begin_step_percent * total_steps)
-        last_step = math.ceil(self._end_step_percent * total_steps)
-        if ctx.step_index < first_step or ctx.step_index > last_step:
-            return
-
-        # convert mode to internal flags
-        soft_injection = self._control_mode in ["more_prompt", "more_control"]
-        cfg_injection = self._control_mode in ["more_control", "unbalanced"]
-
-        # no negative conditioning in cfg_injection mode
-        if cfg_injection:
-            if ctx.conditioning_mode == ConditioningMode.Negative:
-                return
-            down_samples, mid_sample = self._run(ctx, soft_injection, ConditioningMode.Positive)
-
-            if ctx.conditioning_mode == ConditioningMode.Both:
-                # add zeros as samples for negative conditioning
-                down_samples = [torch.cat([torch.zeros_like(d), d]) for d in down_samples]
-                mid_sample = torch.cat([torch.zeros_like(mid_sample), mid_sample])
-
-        else:
-            down_samples, mid_sample = self._run(ctx, soft_injection, ctx.conditioning_mode)
-
-        if (
-            ctx.unet_kwargs.down_block_additional_residuals is None
-            and ctx.unet_kwargs.mid_block_additional_residual is None
-        ):
-            ctx.unet_kwargs.down_block_additional_residuals = down_samples
-            ctx.unet_kwargs.mid_block_additional_residual = mid_sample
-        else:
-            # add controlnet outputs together if have multiple controlnets
-            ctx.unet_kwargs.down_block_additional_residuals = [
-                samples_prev + samples_curr
-                for samples_prev, samples_curr in zip(
-                    ctx.unet_kwargs.down_block_additional_residuals, down_samples, strict=True
-                )
-            ]
-            ctx.unet_kwargs.mid_block_additional_residual += mid_sample
-
-    def _run(self, ctx: DenoiseContext, soft_injection: bool, conditioning_mode: ConditioningMode):
-        total_steps = len(ctx.inputs.timesteps)
-
-        model_input = ctx.latent_model_input
-        image_tensor = self._image_tensor
-        if conditioning_mode == ConditioningMode.Both:
-            model_input = torch.cat([model_input] * 2)
-            image_tensor = torch.cat([image_tensor] * 2)
-
-        cn_unet_kwargs = UNetKwargs(
-            sample=model_input,
-            timestep=ctx.timestep,
-            encoder_hidden_states=None,  # set later by conditioning
-            cross_attention_kwargs=dict(  # noqa: C408
-                percent_through=ctx.step_index / total_steps,
-            ),
-        )
-
-        ctx.inputs.conditioning_data.to_unet_kwargs(cn_unet_kwargs, conditioning_mode=conditioning_mode)
-
-        # get static weight, or weight corresponding to current step
-        weight = self._weight
-        if isinstance(weight, list):
-            weight = weight[ctx.step_index]
-
-        tmp_kwargs = vars(cn_unet_kwargs)
-
-        # Remove kwargs not related to ControlNet unet
-        # ControlNet guidance fields
-        del tmp_kwargs["down_block_additional_residuals"]
-        del tmp_kwargs["mid_block_additional_residual"]
-
-        # T2i Adapter guidance fields
-        del tmp_kwargs["down_intrablock_additional_residuals"]
-
-        # controlnet(s) inference
-        down_samples, mid_sample = self._model(
-            controlnet_cond=image_tensor,
-            conditioning_scale=weight,  # controlnet specific, NOT the guidance scale
-            guess_mode=soft_injection,  # this is still called guess_mode in diffusers ControlNetModel
-            return_dict=False,
-            **vars(cn_unet_kwargs),
-        )
-
-        return down_samples, mid_sample

invokeai/backend/stable_diffusion/extensions/freeu.py

@@ -1,35 +0,0 @@
-from __future__ import annotations
-
-from contextlib import contextmanager
-from typing import TYPE_CHECKING, Dict, Optional
-
-import torch
-from diffusers import UNet2DConditionModel
-
-from invokeai.backend.stable_diffusion.extensions.base import ExtensionBase
-
-if TYPE_CHECKING:
-    from invokeai.app.shared.models import FreeUConfig
-
-
-class FreeUExt(ExtensionBase):
-    def __init__(
-        self,
-        freeu_config: FreeUConfig,
-    ):
-        super().__init__()
-        self._freeu_config = freeu_config
-
-    @contextmanager
-    def patch_unet(self, unet: UNet2DConditionModel, cached_weights: Optional[Dict[str, torch.Tensor]] = None):
-        unet.enable_freeu(
-            b1=self._freeu_config.b1,
-            b2=self._freeu_config.b2,
-            s1=self._freeu_config.s1,
-            s2=self._freeu_config.s2,
-        )
-
-        try:
-            yield
-        finally:
-            unet.disable_freeu()

invokeai/backend/stable_diffusion/extensions/rescale_cfg.py

@@ -1,36 +0,0 @@
-from __future__ import annotations
-
-from typing import TYPE_CHECKING
-
-import torch
-
-from invokeai.backend.stable_diffusion.extension_callback_type import ExtensionCallbackType
-from invokeai.backend.stable_diffusion.extensions.base import ExtensionBase, callback
-
-if TYPE_CHECKING:
-    from invokeai.backend.stable_diffusion.denoise_context import DenoiseContext
-
-
-class RescaleCFGExt(ExtensionBase):
-    def __init__(self, rescale_multiplier: float):
-        super().__init__()
-        self._rescale_multiplier = rescale_multiplier
-
-    @staticmethod
-    def _rescale_cfg(total_noise_pred: torch.Tensor, pos_noise_pred: torch.Tensor, multiplier: float = 0.7):
-        """Implementation of Algorithm 2 from https://arxiv.org/pdf/2305.08891.pdf."""
-        ro_pos = torch.std(pos_noise_pred, dim=(1, 2, 3), keepdim=True)
-        ro_cfg = torch.std(total_noise_pred, dim=(1, 2, 3), keepdim=True)
-
-        x_rescaled = total_noise_pred * (ro_pos / ro_cfg)
-        x_final = multiplier * x_rescaled + (1.0 - multiplier) * total_noise_pred
-        return x_final
-
-    @callback(ExtensionCallbackType.POST_COMBINE_NOISE_PREDS)
-    def rescale_noise_pred(self, ctx: DenoiseContext):
-        if self._rescale_multiplier > 0:
-            ctx.noise_pred = self._rescale_cfg(
-                ctx.noise_pred,
-                ctx.positive_noise_pred,
-                self._rescale_multiplier,
-            )

invokeai/backend/stable_diffusion/extensions_manager.py

@@ -52,24 +52,20 @@ class ExtensionsManager:
             cb.function(ctx)
 
     @contextmanager
-    def patch_extensions(self, ctx: DenoiseContext):
+    def patch_extensions(self, context: DenoiseContext):
         if self._is_canceled and self._is_canceled():
             raise CanceledException
 
         with ExitStack() as exit_stack:
             for ext in self._extensions:
-                exit_stack.enter_context(ext.patch_extension(ctx))
+                exit_stack.enter_context(ext.patch_extension(context))
 
             yield None
 
     @contextmanager
-    def patch_unet(self, unet: UNet2DConditionModel, cached_weights: Optional[Dict[str, torch.Tensor]] = None):
+    def patch_unet(self, state_dict: Dict[str, torch.Tensor], unet: UNet2DConditionModel):
         if self._is_canceled and self._is_canceled():
             raise CanceledException
 
-        # TODO: create weight patch logic in PR with extension which uses it
-        with ExitStack() as exit_stack:
-            for ext in self._extensions:
-                exit_stack.enter_context(ext.patch_unet(unet, cached_weights))
-
-            yield None
+        # TODO: create logic in PR with extension which uses it
+        yield None

invokeai/frontend/web/package.json

@@ -155,8 +155,5 @@
     "vite-plugin-eslint": "^1.8.1",
     "vite-tsconfig-paths": "^4.3.2",
     "vitest": "^1.6.0"
-  },
-  "engines": {
-    "pnpm": "8"
   }
 }

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

@@ -77,6 +77,10 @@
             "title": "استعادة الوجوه",
             "desc": "استعادة الصورة الحالية"
         },
+        "upscale": {
+            "title": "تحسين الحجم",
+            "desc": "تحسين حجم الصورة الحالية"
+        },
         "showInfo": {
             "title": "عرض المعلومات",
             "desc": "عرض معلومات البيانات الخاصة بالصورة الحالية"
@@ -251,6 +255,8 @@
         "type": "نوع",
         "strength": "قوة",
         "upscaling": "تصغير",
+        "upscale": "تصغير",
+        "upscaleImage": "تصغير الصورة",
         "scale": "مقياس",
         "imageFit": "ملائمة الصورة الأولية لحجم الخرج",
         "scaleBeforeProcessing": "تحجيم قبل المعالجة",

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

@@ -187,6 +187,10 @@
             "title": "Gesicht restaurieren",
             "desc": "Das aktuelle Bild restaurieren"
         },
+        "upscale": {
+            "title": "Hochskalieren",
+            "desc": "Das aktuelle Bild hochskalieren"
+        },
         "showInfo": {
             "title": "Info anzeigen",
             "desc": "Metadaten des aktuellen Bildes anzeigen"
@@ -429,6 +433,8 @@
         "type": "Art",
         "strength": "Stärke",
         "upscaling": "Hochskalierung",
+        "upscale": "Hochskalieren (Shift + U)",
+        "upscaleImage": "Bild hochskalieren",
         "scale": "Maßstab",
         "imageFit": "Ausgangsbild an Ausgabegröße anpassen",
         "scaleBeforeProcessing": "Skalieren vor der Verarbeitung",

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

@@ -32,14 +32,12 @@
         "deleteBoardAndImages": "Delete Board and Images",
         "deleteBoardOnly": "Delete Board Only",
         "deletedBoardsCannotbeRestored": "Deleted boards cannot be restored",
-        "hideBoards": "Hide Boards",
         "loading": "Loading...",
         "menuItemAutoAdd": "Auto-add to this Board",
         "move": "Move",
         "movingImagesToBoard_one": "Moving {{count}} image to board:",
         "movingImagesToBoard_other": "Moving {{count}} images to board:",
         "myBoard": "My Board",
-        "noBoards": "No {{boardType}} Boards",
         "noMatching": "No matching Boards",
         "private": "Private Boards",
         "searchBoard": "Search Boards...",
@@ -48,7 +46,6 @@
         "topMessage": "This board contains images used in the following features:",
         "unarchiveBoard": "Unarchive Board",
         "uncategorized": "Uncategorized",
-        "viewBoards": "View Boards",
         "downloadBoard": "Download Board",
         "imagesWithCount_one": "{{count}} image",
         "imagesWithCount_other": "{{count}} images",
@@ -105,7 +102,6 @@
         "negativePrompt": "Negative Prompt",
         "discordLabel": "Discord",
         "dontAskMeAgain": "Don't ask me again",
-        "dontShowMeThese": "Don't show me these",
         "editor": "Editor",
         "error": "Error",
         "file": "File",
@@ -377,14 +373,10 @@
         "displayBoardSearch": "Display Board Search",
         "displaySearch": "Display Search",
         "download": "Download",
-        "exitBoardSearch": "Exit Board Search",
-        "exitSearch": "Exit Search",
         "featuresWillReset": "If you delete this image, those features will immediately be reset.",
         "galleryImageSize": "Image Size",
         "gallerySettings": "Gallery Settings",
-        "go": "Go",
         "image": "image",
-        "jump": "Jump",
         "loading": "Loading",
         "loadMore": "Load More",
         "newestFirst": "Newest First",
@@ -644,9 +636,9 @@
             "title": "Undo Stroke"
         },
         "unifiedCanvasHotkeys": "Unified Canvas",
-        "postProcess": {
-            "desc": "Process the current image using the selected post-processing model",
-            "title": "Process Image"
+        "upscale": {
+            "desc": "Upscale the current image",
+            "title": "Upscale"
         },
         "toggleViewer": {
             "desc": "Switches between the Image Viewer and workspace for the current tab.",
@@ -1035,7 +1027,6 @@
         "imageActions": "Image Actions",
         "sendToImg2Img": "Send to Image to Image",
         "sendToUnifiedCanvas": "Send To Unified Canvas",
-        "sendToUpscale": "Send To Upscale",
         "showOptionsPanel": "Show Side Panel (O or T)",
         "shuffle": "Shuffle Seed",
         "steps": "Steps",
@@ -1043,8 +1034,8 @@
         "symmetry": "Symmetry",
         "tileSize": "Tile Size",
         "type": "Type",
-        "postProcessing": "Post-Processing (Shift + U)",
-        "processImage": "Process Image",
+        "upscale": "Upscale (Shift + U)",
+        "upscaleImage": "Upscale Image",
         "upscaling": "Upscaling",
         "useAll": "Use All",
         "useSize": "Use Size",
@@ -1100,8 +1091,6 @@
         "displayInProgress": "Display Progress Images",
         "enableImageDebugging": "Enable Image Debugging",
         "enableInformationalPopovers": "Enable Informational Popovers",
-        "informationalPopoversDisabled": "Informational Popovers Disabled",
-        "informationalPopoversDisabledDesc": "Informational popovers have been disabled. Enable them in Settings.",
         "enableInvisibleWatermark": "Enable Invisible Watermark",
         "enableNSFWChecker": "Enable NSFW Checker",
         "general": "General",
@@ -1509,30 +1498,6 @@
         "seamlessTilingYAxis": {
             "heading": "Seamless Tiling Y Axis",
             "paragraphs": ["Seamlessly tile an image along the vertical axis."]
-        },
-        "upscaleModel": {
-            "heading": "Upscale Model",
-            "paragraphs": [
-                "The upscale model scales the image to the output size before details are added. Any supported upscale model may be used, but some are specialized for different kinds of images, like photos or line drawings."
-            ]
-        },
-        "scale": {
-            "heading": "Scale",
-            "paragraphs": [
-                "Scale controls the output image size, and is based on a multiple of the input image resolution. For example a 2x upscale on a 1024x1024 image would produce a 2048 x 2048 output."
-            ]
-        },
-        "creativity": {
-            "heading": "Creativity",
-            "paragraphs": [
-                "Creativity controls the amount of freedom granted to the model when adding details. Low creativity stays close to the original image, while high creativity allows for more change. When using a prompt, high creativity increases the influence of the prompt."
-            ]
-        },
-        "structure": {
-            "heading": "Structure",
-            "paragraphs": [
-                "Structure controls how closely the output image will keep to the layout of the original. Low structure allows major changes, while high structure strictly maintains the original composition and layout."
-            ]
         }
     },
     "unifiedCanvas": {
@@ -1675,27 +1640,6 @@
         "layers_one": "Layer",
         "layers_other": "Layers"
     },
-    "upscaling": {
-        "creativity": "Creativity",
-        "structure": "Structure",
-        "upscaleModel": "Upscale Model",
-        "postProcessingModel": "Post-Processing Model",
-        "scale": "Scale",
-        "postProcessingMissingModelWarning": "Visit the <LinkComponent>Model Manager</LinkComponent> to install a post-processing (image to image) model.",
-        "missingModelsWarning": "Visit the <LinkComponent>Model Manager</LinkComponent> to install the required models:",
-        "mainModelDesc": "Main model (SD1.5 or SDXL architecture)",
-        "tileControlNetModelDesc": "Tile ControlNet model for the chosen main model architecture",
-        "upscaleModelDesc": "Upscale (image to image) model",
-        "missingUpscaleInitialImage": "Missing initial image for upscaling",
-        "missingUpscaleModel": "Missing upscale model",
-        "missingTileControlNetModel": "No valid tile ControlNet models installed"
-    },
-    "upsell": {
-        "inviteTeammates": "Invite Teammates",
-        "professional": "Professional",
-        "professionalUpsell": "Available in Invoke’s Professional Edition. Click here or visit invoke.com/pricing for more details.",
-        "shareAccess": "Share Access"
-    },
     "ui": {
         "tabs": {
             "generation": "Generation",
@@ -1707,9 +1651,7 @@
             "models": "Models",
             "modelsTab": "$t(ui.tabs.models) $t(common.tab)",
             "queue": "Queue",
-            "queueTab": "$t(ui.tabs.queue) $t(common.tab)",
-            "upscaling": "Upscaling",
-            "upscalingTab": "$t(ui.tabs.upscaling) $t(common.tab)"
+            "queueTab": "$t(ui.tabs.queue) $t(common.tab)"
         }
     }
 }

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

@@ -151,6 +151,10 @@
             "title": "Restaurar rostros",
             "desc": "Restaurar rostros en la imagen actual"
         },
+        "upscale": {
+            "title": "Aumentar resolución",
+            "desc": "Aumentar la resolución de la imagen actual"
+        },
         "showInfo": {
             "title": "Mostrar información",
             "desc": "Mostar metadatos de la imagen actual"
@@ -356,6 +360,8 @@
         "type": "Tipo",
         "strength": "Fuerza",
         "upscaling": "Aumento de resolución",
+        "upscale": "Aumentar resolución",
+        "upscaleImage": "Aumentar la resolución de la imagen",
         "scale": "Escala",
         "imageFit": "Ajuste tamaño de imagen inicial al tamaño objetivo",
         "scaleBeforeProcessing": "Redimensionar antes de procesar",
@@ -402,12 +408,7 @@
         "showProgressInViewer": "Mostrar las imágenes del progreso en el visor",
         "ui": "Interfaz del usuario",
         "generation": "Generación",
-        "beta": "Beta",
-        "reloadingIn": "Recargando en",
-        "intermediatesClearedFailed": "Error limpiando los intermediarios",
-        "intermediatesCleared_one": "Borrado {{count}} intermediario",
-        "intermediatesCleared_many": "Borrados {{count}} intermediarios",
-        "intermediatesCleared_other": "Borrados {{count}} intermediarios"
+        "beta": "Beta"
     },
     "toast": {
         "uploadFailed": "Error al subir archivo",
@@ -425,12 +426,7 @@
         "parameterSet": "Conjunto de parámetros",
         "parameterNotSet": "Parámetro no configurado",
         "problemCopyingImage": "No se puede copiar la imagen",
-        "errorCopied": "Error al copiar",
-        "baseModelChanged": "Modelo base cambiado",
-        "addedToBoard": "Añadido al tablero",
-        "baseModelChangedCleared_one": "Borrado o desactivado {{count}} submodelo incompatible",
-        "baseModelChangedCleared_many": "Borrados o desactivados {{count}} submodelos incompatibles",
-        "baseModelChangedCleared_other": "Borrados o desactivados {{count}} submodelos incompatibles"
+        "errorCopied": "Error al copiar"
     },
     "tooltip": {
         "feature": {
@@ -544,13 +540,7 @@
         "downloadBoard": "Descargar panel",
         "deleteBoardOnly": "Borrar solo el panel",
         "myBoard": "Mi panel",
-        "noMatching": "No hay paneles que coincidan",
-        "imagesWithCount_one": "{{count}} imagen",
-        "imagesWithCount_many": "{{count}} imágenes",
-        "imagesWithCount_other": "{{count}} imágenes",
-        "assetsWithCount_one": "{{count}} activo",
-        "assetsWithCount_many": "{{count}} activos",
-        "assetsWithCount_other": "{{count}} activos"
+        "noMatching": "No hay paneles que coincidan"
     },
     "accordions": {
         "compositing": {
@@ -600,27 +590,6 @@
         "balanced": "Equilibrado",
         "beginEndStepPercent": "Inicio / Final Porcentaje de pasos",
         "detectResolution": "Detectar resolución",
-        "beginEndStepPercentShort": "Inicio / Final %",
-        "t2i_adapter": "$t(controlnet.controlAdapter_one) #{{number}} ($t(common.t2iAdapter))",
-        "controlnet": "$t(controlnet.controlAdapter_one) #{{number}} ($t(common.controlNet))",
-        "ip_adapter": "$t(controlnet.controlAdapter_one) #{{number}} ($t(common.ipAdapter))",
-        "addControlNet": "Añadir $t(common.controlNet)",
-        "addIPAdapter": "Añadir $t(common.ipAdapter)",
-        "controlAdapter_one": "Adaptador de control",
-        "controlAdapter_many": "Adaptadores de control",
-        "controlAdapter_other": "Adaptadores de control",
-        "addT2IAdapter": "Añadir $t(common.t2iAdapter)"
-    },
-    "queue": {
-        "back": "Atrás",
-        "front": "Delante",
-        "batchQueuedDesc_one": "Se agregó {{count}} sesión a {{direction}} la cola",
-        "batchQueuedDesc_many": "Se agregaron {{count}} sesiones a {{direction}} la cola",
-        "batchQueuedDesc_other": "Se agregaron {{count}} sesiones a {{direction}} la cola"
-    },
-    "upsell": {
-        "inviteTeammates": "Invitar compañeros de equipo",
-        "shareAccess": "Compartir acceso",
-        "professionalUpsell": "Disponible en la edición profesional de Invoke. Haz clic aquí o visita invoke.com/pricing para obtener más detalles."
+        "beginEndStepPercentShort": "Inicio / Final %"
     }
 }

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

@@ -130,6 +130,10 @@
             "title": "Restaurer les visages",
             "desc": "Restaurer l'image actuelle"
         },
+        "upscale": {
+            "title": "Agrandir",
+            "desc": "Agrandir l'image actuelle"
+        },
         "showInfo": {
             "title": "Afficher les informations",
             "desc": "Afficher les informations de métadonnées de l'image actuelle"
@@ -304,6 +308,8 @@
         "type": "Type",
         "strength": "Force",
         "upscaling": "Agrandissement",
+        "upscale": "Agrandir",
+        "upscaleImage": "Image en Agrandissement",
         "scale": "Echelle",
         "imageFit": "Ajuster Image Initiale à la Taille de Sortie",
         "scaleBeforeProcessing": "Echelle Avant Traitement",

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

@@ -90,6 +90,10 @@
             "desc": "שחזור התמונה הנוכחית",
             "title": "שחזור פרצופים"
         },
+        "upscale": {
+            "title": "הגדלת קנה מידה",
+            "desc": "הגדל את התמונה הנוכחית"
+        },
         "showInfo": {
             "title": "הצג מידע",
             "desc": "הצגת פרטי מטא-נתונים של התמונה הנוכחית"
@@ -259,6 +263,8 @@
         "seed": "זרע",
         "type": "סוג",
         "strength": "חוזק",
+        "upscale": "הגדלת קנה מידה",
+        "upscaleImage": "הגדלת קנה מידת התמונה",
         "denoisingStrength": "חוזק מנטרל הרעש",
         "scaleBeforeProcessing": "שנה קנה מידה לפני עיבוד",
         "scaledWidth": "קנה מידה לאחר שינוי W",

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

@@ -150,11 +150,7 @@
         "showArchivedBoards": "Mostra le bacheche archiviate",
         "searchImages": "Ricerca per metadati",
         "displayBoardSearch": "Mostra la ricerca nelle Bacheche",
-        "displaySearch": "Mostra la ricerca",
-        "selectAllOnPage": "Seleziona tutto nella pagina",
-        "selectAllOnBoard": "Seleziona tutto nella bacheca",
-        "exitBoardSearch": "Esci da Ricerca bacheca",
-        "exitSearch": "Esci dalla ricerca"
+        "displaySearch": "Mostra la ricerca"
     },
     "hotkeys": {
         "keyboardShortcuts": "Tasti di scelta rapida",
@@ -214,6 +210,10 @@
             "title": "Restaura volti",
             "desc": "Restaura l'immagine corrente"
         },
+        "upscale": {
+            "title": "Amplia",
+            "desc": "Amplia l'immagine corrente"
+        },
         "showInfo": {
             "title": "Mostra informazioni",
             "desc": "Mostra le informazioni sui metadati dell'immagine corrente"
@@ -377,10 +377,6 @@
         "toggleViewer": {
             "title": "Attiva/disattiva il visualizzatore di immagini",
             "desc": "Passa dal visualizzatore immagini all'area di lavoro per la scheda corrente."
-        },
-        "postProcess": {
-            "desc": "Elabora l'immagine corrente utilizzando il modello di post-elaborazione selezionato",
-            "title": "Elabora immagine"
         }
     },
     "modelManager": {
@@ -509,6 +505,8 @@
         "type": "Tipo",
         "strength": "Forza",
         "upscaling": "Ampliamento",
+        "upscale": "Amplia (Shift + U)",
+        "upscaleImage": "Amplia Immagine",
         "scale": "Scala",
         "imageFit": "Adatta l'immagine iniziale alle dimensioni di output",
         "scaleBeforeProcessing": "Scala prima dell'elaborazione",
@@ -593,10 +591,7 @@
         "infillColorValue": "Colore di riempimento",
         "globalSettings": "Impostazioni globali",
         "globalPositivePromptPlaceholder": "Prompt positivo globale",
-        "globalNegativePromptPlaceholder": "Prompt negativo globale",
-        "processImage": "Elabora Immagine",
-        "sendToUpscale": "Invia a Ampliare",
-        "postProcessing": "Post-elaborazione (Shift + U)"
+        "globalNegativePromptPlaceholder": "Prompt negativo globale"
     },
     "settings": {
         "models": "Modelli",
@@ -969,10 +964,7 @@
         "boards": "Bacheche",
         "private": "Bacheche private",
         "shared": "Bacheche condivise",
-        "addPrivateBoard": "Aggiungi una Bacheca Privata",
-        "noBoards": "Nessuna bacheca {{boardType}}",
-        "hideBoards": "Nascondi bacheche",
-        "viewBoards": "Visualizza bacheche"
+        "addPrivateBoard": "Aggiungi una Bacheca Privata"
     },
     "controlnet": {
         "contentShuffleDescription": "Rimescola il contenuto di un'immagine",
@@ -1692,30 +1684,7 @@
             "models": "Modelli",
             "modelsTab": "$t(ui.tabs.models) $t(common.tab)",
             "queue": "Coda",
-            "queueTab": "$t(ui.tabs.queue) $t(common.tab)",
-            "upscaling": "Ampliamento",
-            "upscalingTab": "$t(ui.tabs.upscaling) $t(common.tab)"
+            "queueTab": "$t(ui.tabs.queue) $t(common.tab)"
         }
-    },
-    "upscaling": {
-        "creativity": "Creatività",
-        "structure": "Struttura",
-        "upscaleModel": "Modello di Ampliamento",
-        "scale": "Scala",
-        "missingModelsWarning": "Visita <LinkComponent>Gestione modelli</LinkComponent> per installare i modelli richiesti:",
-        "mainModelDesc": "Modello principale (architettura SD1.5 o SDXL)",
-        "tileControlNetModelDesc": "Modello Tile ControlNet per l'architettura del modello principale scelto",
-        "upscaleModelDesc": "Modello per l'ampliamento (da immagine a immagine)",
-        "missingUpscaleInitialImage": "Immagine iniziale mancante per l'ampliamento",
-        "missingUpscaleModel": "Modello per l’ampliamento mancante",
-        "missingTileControlNetModel": "Nessun modello ControlNet Tile valido installato",
-        "postProcessingModel": "Modello di post-elaborazione",
-        "postProcessingMissingModelWarning": "Visita <LinkComponent>Gestione modelli</LinkComponent> per installare un modello di post-elaborazione (da immagine a immagine)."
-    },
-    "upsell": {
-        "inviteTeammates": "Invita collaboratori",
-        "shareAccess": "Condividi l'accesso",
-        "professional": "Professionale",
-        "professionalUpsell": "Disponibile nell'edizione Professional di Invoke. Fai clic qui o visita invoke.com/pricing per ulteriori dettagli."
     }
 }

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

@@ -199,6 +199,10 @@
             "title": "顔の修復",
             "desc": "現在の画像を修復"
         },
+        "upscale": {
+            "title": "アップスケール",
+            "desc": "現在の画像をアップスケール"
+        },
         "showInfo": {
             "title": "情報を見る",
             "desc": "現在の画像のメタデータ情報を表示"
@@ -423,6 +427,8 @@
         "shuffle": "シャッフル",
         "strength": "強度",
         "upscaling": "アップスケーリング",
+        "upscale": "アップスケール",
+        "upscaleImage": "画像をアップスケール",
         "scale": "Scale",
         "scaleBeforeProcessing": "処理前のスケール",
         "scaledWidth": "幅のスケール",

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

@@ -258,6 +258,10 @@
             "desc": "캔버스 브러시를 선택",
             "title": "브러시 선택"
         },
+        "upscale": {
+            "desc": "현재 이미지를 업스케일",
+            "title": "업스케일"
+        },
         "previousImage": {
             "title": "이전 이미지",
             "desc": "갤러리에 이전 이미지 표시"

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

@@ -168,6 +168,10 @@
             "title": "Herstel gezichten",
             "desc": "Herstelt de huidige afbeelding"
         },
+        "upscale": {
+            "title": "Schaal op",
+            "desc": "Schaalt de huidige afbeelding op"
+        },
         "showInfo": {
             "title": "Toon info",
             "desc": "Toont de metagegevens van de huidige afbeelding"
@@ -408,6 +412,8 @@
         "type": "Soort",
         "strength": "Sterkte",
         "upscaling": "Opschalen",
+        "upscale": "Vergroot (Shift + U)",
+        "upscaleImage": "Schaal afbeelding op",
         "scale": "Schaal",
         "imageFit": "Pas initiële afbeelding in uitvoergrootte",
         "scaleBeforeProcessing": "Schalen voor verwerking",

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

@@ -78,6 +78,10 @@
             "title": "Popraw twarze",
             "desc": "Uruchamia proces poprawiania twarzy dla aktywnego obrazu"
         },
+        "upscale": {
+            "title": "Powiększ",
+            "desc": "Uruchamia proces powiększania aktywnego obrazu"
+        },
         "showInfo": {
             "title": "Pokaż informacje",
             "desc": "Pokazuje metadane zapisane w aktywnym obrazie"
@@ -228,6 +232,8 @@
         "type": "Metoda",
         "strength": "Siła",
         "upscaling": "Powiększanie",
+        "upscale": "Powiększ",
+        "upscaleImage": "Powiększ obraz",
         "scale": "Skala",
         "imageFit": "Przeskaluj oryginalny obraz",
         "scaleBeforeProcessing": "Tryb skalowania",

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

@@ -160,6 +160,10 @@
             "title": "Restaurar Rostos",
             "desc": "Restaurar a imagem atual"
         },
+        "upscale": {
+            "title": "Redimensionar",
+            "desc": "Redimensionar a imagem atual"
+        },
         "showInfo": {
             "title": "Mostrar Informações",
             "desc": "Mostrar metadados de informações da imagem atual"
@@ -271,6 +275,8 @@
         "showOptionsPanel": "Mostrar Painel de Opções",
         "strength": "Força",
         "upscaling": "Redimensionando",
+        "upscale": "Redimensionar",
+        "upscaleImage": "Redimensionar Imagem",
         "scaleBeforeProcessing": "Escala Antes do Processamento",
         "images": "Imagems",
         "steps": "Passos",

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

@@ -80,6 +80,10 @@
             "title": "Restaurar Rostos",
             "desc": "Restaurar a imagem atual"
         },
+        "upscale": {
+            "title": "Redimensionar",
+            "desc": "Redimensionar a imagem atual"
+        },
         "showInfo": {
             "title": "Mostrar Informações",
             "desc": "Mostrar metadados de informações da imagem atual"
@@ -264,6 +268,8 @@
         "type": "Tipo",
         "strength": "Força",
         "upscaling": "Redimensionando",
+        "upscale": "Redimensionar",
+        "upscaleImage": "Redimensionar Imagem",
         "scale": "Escala",
         "imageFit": "Caber Imagem Inicial No Tamanho de Saída",
         "scaleBeforeProcessing": "Escala Antes do Processamento",

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

@@ -214,6 +214,10 @@
             "title": "Восстановить лица",
             "desc": "Восстановить лица на текущем изображении"
         },
+        "upscale": {
+            "title": "Увеличение",
+            "desc": "Увеличить текущеее изображение"
+        },
         "showInfo": {
             "title": "Показать метаданные",
             "desc": "Показать метаданные из текущего изображения"
@@ -508,6 +512,8 @@
         "type": "Тип",
         "strength": "Сила",
         "upscaling": "Увеличение",
+        "upscale": "Увеличить",
+        "upscaleImage": "Увеличить изображение",
         "scale": "Масштаб",
         "imageFit": "Уместить изображение",
         "scaleBeforeProcessing": "Масштабировать",

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

@@ -90,6 +90,10 @@
             "title": "Återskapa ansikten",
             "desc": "Återskapa nuvarande bild"
         },
+        "upscale": {
+            "title": "Skala upp",
+            "desc": "Skala upp nuvarande bild"
+        },
         "showInfo": {
             "title": "Visa info",
             "desc": "Visa metadata för nuvarande bild"

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

@@ -416,6 +416,10 @@
             "desc": "Maske/Taban katmanları arasında geçiş yapar",
             "title": "Katmanı Gizle-Göster"
         },
+        "upscale": {
+            "title": "Büyüt",
+            "desc": "Seçili görseli büyüt"
+        },
         "setSeed": {
             "title": "Tohumu Kullan",
             "desc": "Seçili görselin tohumunu kullan"
@@ -637,6 +641,7 @@
         "copyImage": "Görseli Kopyala",
         "height": "Boy",
         "width": "En",
+        "upscale": "Büyüt (Shift + U)",
         "useSize": "Boyutu Kullan",
         "symmetry": "Bakışım",
         "tileSize": "Döşeme Boyutu",
@@ -652,6 +657,7 @@
         "showOptionsPanel": "Yan Paneli Göster (O ya da T)",
         "shuffle": "Kar",
         "usePrompt": "İstemi Kullan",
+        "upscaleImage": "Görseli Büyüt",
         "setToOptimalSizeTooSmall": "$t(parameters.setToOptimalSize) (çok küçük olabilir)",
         "setToOptimalSizeTooLarge": "$t(parameters.setToOptimalSize) (çok büyük olabilir)",
         "cfgRescaleMultiplier": "CFG Rescale Çarpanı",

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

@@ -85,6 +85,10 @@
             "title": "Відновити обличчя",
             "desc": "Відновити обличчя на поточному зображенні"
         },
+        "upscale": {
+            "title": "Збільшення",
+            "desc": "Збільшити поточне зображення"
+        },
         "showInfo": {
             "title": "Показати метадані",
             "desc": "Показати метадані з поточного зображення"
@@ -272,6 +276,8 @@
         "type": "Тип",
         "strength": "Сила",
         "upscaling": "Збільшення",
+        "upscale": "Збільшити",
+        "upscaleImage": "Збільшити зображення",
         "scale": "Масштаб",
         "imageFit": "Вмістити зображення",
         "scaleBeforeProcessing": "Масштабувати",

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

@@ -193,6 +193,10 @@
             "title": "面部修复",
             "desc": "对当前图像进行面部修复"
         },
+        "upscale": {
+            "title": "放大",
+            "desc": "对当前图像进行放大"
+        },
         "showInfo": {
             "title": "显示信息",
             "desc": "显示当前图像的元数据"
@@ -418,6 +422,8 @@
         "type": "种类",
         "strength": "强度",
         "upscaling": "放大",
+        "upscale": "放大 (Shift + U)",
+        "upscaleImage": "放大图像",
         "scale": "等级",
         "imageFit": "使生成图像长宽适配初始图像",
         "scaleBeforeProcessing": "处理前缩放",

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

@@ -1,6 +1,5 @@
 import type { TypedStartListening } from '@reduxjs/toolkit';
 import { createListenerMiddleware } from '@reduxjs/toolkit';
-import { addAdHocPostProcessingRequestedListener } from 'app/store/middleware/listenerMiddleware/listeners/addAdHocPostProcessingRequestedListener';
 import { addCommitStagingAreaImageListener } from 'app/store/middleware/listenerMiddleware/listeners/addCommitStagingAreaImageListener';
 import { addAnyEnqueuedListener } from 'app/store/middleware/listenerMiddleware/listeners/anyEnqueued';
 import { addAppConfigReceivedListener } from 'app/store/middleware/listenerMiddleware/listeners/appConfigReceived';
@@ -48,11 +47,11 @@ import { addModelLoadEventListener } from 'app/store/middleware/listenerMiddlewa
 import { addSocketQueueItemStatusChangedEventListener } from 'app/store/middleware/listenerMiddleware/listeners/socketio/socketQueueItemStatusChanged';
 import { addStagingAreaImageSavedListener } from 'app/store/middleware/listenerMiddleware/listeners/stagingAreaImageSaved';
 import { addUpdateAllNodesRequestedListener } from 'app/store/middleware/listenerMiddleware/listeners/updateAllNodesRequested';
+import { addUpscaleRequestedListener } from 'app/store/middleware/listenerMiddleware/listeners/upscaleRequested';
 import { addWorkflowLoadRequestedListener } from 'app/store/middleware/listenerMiddleware/listeners/workflowLoadRequested';
 import type { AppDispatch, RootState } from 'app/store/store';
 
 import { addArchivedOrDeletedBoardListener } from './listeners/addArchivedOrDeletedBoardListener';
-import { addEnqueueRequestedUpscale } from './listeners/enqueueRequestedUpscale';
 
 export const listenerMiddleware = createListenerMiddleware();
 
@@ -86,7 +85,6 @@ addGalleryOffsetChangedListener(startAppListening);
 addEnqueueRequestedCanvasListener(startAppListening);
 addEnqueueRequestedNodes(startAppListening);
 addEnqueueRequestedLinear(startAppListening);
-addEnqueueRequestedUpscale(startAppListening);
 addAnyEnqueuedListener(startAppListening);
 addBatchEnqueuedListener(startAppListening);
 
@@ -142,7 +140,7 @@ addModelsLoadedListener(startAppListening);
 addAppConfigReceivedListener(startAppListening);
 
 // Ad-hoc upscale workflwo
-addAdHocPostProcessingRequestedListener(startAppListening);
+addUpscaleRequestedListener(startAppListening);
 
 // Prompts
 addDynamicPromptsListener(startAppListening);

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

@@ -1,36 +0,0 @@
-import { enqueueRequested } from 'app/store/actions';
-import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
-import { isImageViewerOpenChanged } from 'features/gallery/store/gallerySlice';
-import { prepareLinearUIBatch } from 'features/nodes/util/graph/buildLinearBatchConfig';
-import { buildMultidiffusionUpscaleGraph } from 'features/nodes/util/graph/buildMultidiffusionUpscaleGraph';
-import { queueApi } from 'services/api/endpoints/queue';
-
-export const addEnqueueRequestedUpscale = (startAppListening: AppStartListening) => {
-  startAppListening({
-    predicate: (action): action is ReturnType<typeof enqueueRequested> =>
-      enqueueRequested.match(action) && action.payload.tabName === 'upscaling',
-    effect: async (action, { getState, dispatch }) => {
-      const state = getState();
-      const { shouldShowProgressInViewer } = state.ui;
-      const { prepend } = action.payload;
-
-      const graph = await buildMultidiffusionUpscaleGraph(state);
-
-      const batchConfig = prepareLinearUIBatch(state, graph, prepend);
-
-      const req = dispatch(
-        queueApi.endpoints.enqueueBatch.initiate(batchConfig, {
-          fixedCacheKey: 'enqueueBatch',
-        })
-      );
-      try {
-        await req.unwrap();
-        if (shouldShowProgressInViewer) {
-          dispatch(isImageViewerOpenChanged(true));
-        }
-      } finally {
-        req.reset();
-      }
-    },
-  });
-};

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

@@ -23,7 +23,6 @@ import {
 } from 'features/gallery/store/gallerySlice';
 import { fieldImageValueChanged } from 'features/nodes/store/nodesSlice';
 import { selectOptimalDimension } from 'features/parameters/store/generationSlice';
-import { upscaleInitialImageChanged } from 'features/parameters/store/upscaleSlice';
 import { imagesApi } from 'services/api/endpoints/images';
 
 export const dndDropped = createAction<{
@@ -244,20 +243,6 @@ export const addImageDroppedListener = (startAppListening: AppStartListening) =>
         return;
       }
 
-      /**
-       * Image dropped on upscale initial image
-       */
-      if (
-        overData.actionType === 'SET_UPSCALE_INITIAL_IMAGE' &&
-        activeData.payloadType === 'IMAGE_DTO' &&
-        activeData.payload.imageDTO
-      ) {
-        const { imageDTO } = activeData.payload;
-
-        dispatch(upscaleInitialImageChanged(imageDTO));
-        return;
-      }
-
       /**
        * Multiple images dropped on user board
        */

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

@@ -14,7 +14,6 @@ import {
 import { selectListBoardsQueryArgs } from 'features/gallery/store/gallerySelectors';
 import { fieldImageValueChanged } from 'features/nodes/store/nodesSlice';
 import { selectOptimalDimension } from 'features/parameters/store/generationSlice';
-import { upscaleInitialImageChanged } from 'features/parameters/store/upscaleSlice';
 import { toast } from 'features/toast/toast';
 import { t } from 'i18next';
 import { omit } from 'lodash-es';
@@ -90,15 +89,6 @@ export const addImageUploadedFulfilledListener = (startAppListening: AppStartLis
         return;
       }
 
-      if (postUploadAction?.type === 'SET_UPSCALE_INITIAL_IMAGE') {
-        dispatch(upscaleInitialImageChanged(imageDTO));
-        toast({
-          ...DEFAULT_UPLOADED_TOAST,
-          description: 'set as upscale initial image',
-        });
-        return;
-      }
-
       if (postUploadAction?.type === 'SET_CONTROL_ADAPTER_IMAGE') {
         const { id } = postUploadAction;
         dispatch(

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

@@ -10,7 +10,6 @@ import { heightChanged, widthChanged } from 'features/controlLayers/store/contro
 import { loraRemoved } from 'features/lora/store/loraSlice';
 import { calculateNewSize } from 'features/parameters/components/ImageSize/calculateNewSize';
 import { modelChanged, vaeSelected } from 'features/parameters/store/generationSlice';
-import { postProcessingModelChanged, upscaleModelChanged } from 'features/parameters/store/upscaleSlice';
 import { zParameterModel, zParameterVAEModel } from 'features/parameters/types/parameterSchemas';
 import { getIsSizeOptimal, getOptimalDimension } from 'features/parameters/util/optimalDimension';
 import { refinerModelChanged } from 'features/sdxl/store/sdxlSlice';
@@ -18,12 +17,7 @@ import { forEach } from 'lodash-es';
 import type { Logger } from 'roarr';
 import { modelConfigsAdapterSelectors, modelsApi } from 'services/api/endpoints/models';
 import type { AnyModelConfig } from 'services/api/types';
-import {
-  isNonRefinerMainModelConfig,
-  isRefinerMainModelModelConfig,
-  isSpandrelImageToImageModelConfig,
-  isVAEModelConfig,
-} from 'services/api/types';
+import { isNonRefinerMainModelConfig, isRefinerMainModelModelConfig, isVAEModelConfig } from 'services/api/types';
 
 export const addModelsLoadedListener = (startAppListening: AppStartListening) => {
   startAppListening({
@@ -42,7 +36,6 @@ export const addModelsLoadedListener = (startAppListening: AppStartListening) =>
       handleVAEModels(models, state, dispatch, log);
       handleLoRAModels(models, state, dispatch, log);
       handleControlAdapterModels(models, state, dispatch, log);
-      handleSpandrelImageToImageModels(models, state, dispatch, log);
     },
   });
 };
@@ -184,25 +177,3 @@ const handleControlAdapterModels: ModelHandler = (models, state, dispatch, _log)
     dispatch(controlAdapterModelCleared({ id: ca.id }));
   });
 };
-
-const handleSpandrelImageToImageModels: ModelHandler = (models, state, dispatch, _log) => {
-  const { upscaleModel: currentUpscaleModel, postProcessingModel: currentPostProcessingModel } = state.upscale;
-  const upscaleModels = models.filter(isSpandrelImageToImageModelConfig);
-  const firstModel = upscaleModels[0] || null;
-
-  const isCurrentUpscaleModelAvailable = currentUpscaleModel
-    ? upscaleModels.some((m) => m.key === currentUpscaleModel.key)
-    : false;
-
-  if (!isCurrentUpscaleModelAvailable) {
-    dispatch(upscaleModelChanged(firstModel));
-  }
-
-  const isCurrentPostProcessingModelAvailable = currentPostProcessingModel
-    ? upscaleModels.some((m) => m.key === currentPostProcessingModel.key)
-    : false;
-
-  if (!isCurrentPostProcessingModelAvailable) {
-    dispatch(postProcessingModelChanged(firstModel));
-  }
-};

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

@@ -2,28 +2,46 @@ import { createAction } from '@reduxjs/toolkit';
 import { logger } from 'app/logging/logger';
 import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
 import { parseify } from 'common/util/serialize';
-import { buildAdHocPostProcessingGraph } from 'features/nodes/util/graph/buildAdHocPostProcessingGraph';
+import { buildAdHocUpscaleGraph } from 'features/nodes/util/graph/buildAdHocUpscaleGraph';
+import { createIsAllowedToUpscaleSelector } from 'features/parameters/hooks/useIsAllowedToUpscale';
 import { toast } from 'features/toast/toast';
 import { t } from 'i18next';
 import { queueApi } from 'services/api/endpoints/queue';
 import type { BatchConfig, ImageDTO } from 'services/api/types';
 
-export const adHocPostProcessingRequested = createAction<{ imageDTO: ImageDTO }>(`upscaling/postProcessingRequested`);
+export const upscaleRequested = createAction<{ imageDTO: ImageDTO }>(`upscale/upscaleRequested`);
 
-export const addAdHocPostProcessingRequestedListener = (startAppListening: AppStartListening) => {
+export const addUpscaleRequestedListener = (startAppListening: AppStartListening) => {
   startAppListening({
-    actionCreator: adHocPostProcessingRequested,
+    actionCreator: upscaleRequested,
     effect: async (action, { dispatch, getState }) => {
       const log = logger('session');
 
       const { imageDTO } = action.payload;
+      const { image_name } = imageDTO;
       const state = getState();
 
+      const { isAllowedToUpscale, detailTKey } = createIsAllowedToUpscaleSelector(imageDTO)(state);
+
+      // if we can't upscale, show a toast and return
+      if (!isAllowedToUpscale) {
+        log.error(
+          { imageDTO },
+          t(detailTKey ?? 'parameters.isAllowedToUpscale.tooLarge') // should never coalesce
+        );
+        toast({
+          id: 'NOT_ALLOWED_TO_UPSCALE',
+          title: t(detailTKey ?? 'parameters.isAllowedToUpscale.tooLarge'), // should never coalesce
+          status: 'error',
+        });
+        return;
+      }
+
       const enqueueBatchArg: BatchConfig = {
         prepend: true,
         batch: {
-          graph: await buildAdHocPostProcessingGraph({
-            image: imageDTO,
+          graph: buildAdHocUpscaleGraph({
+            image_name,
             state,
           }),
           runs: 1,

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

@@ -25,7 +25,7 @@ import { nodesPersistConfig, nodesSlice, nodesUndoableConfig } from 'features/no
 import { workflowSettingsPersistConfig, workflowSettingsSlice } from 'features/nodes/store/workflowSettingsSlice';
 import { workflowPersistConfig, workflowSlice } from 'features/nodes/store/workflowSlice';
 import { generationPersistConfig, generationSlice } from 'features/parameters/store/generationSlice';
-import { upscalePersistConfig, upscaleSlice } from 'features/parameters/store/upscaleSlice';
+import { postprocessingPersistConfig, postprocessingSlice } from 'features/parameters/store/postprocessingSlice';
 import { queueSlice } from 'features/queue/store/queueSlice';
 import { sdxlPersistConfig, sdxlSlice } from 'features/sdxl/store/sdxlSlice';
 import { configSlice } from 'features/system/store/configSlice';
@@ -52,6 +52,7 @@ const allReducers = {
   [gallerySlice.name]: gallerySlice.reducer,
   [generationSlice.name]: generationSlice.reducer,
   [nodesSlice.name]: undoable(nodesSlice.reducer, nodesUndoableConfig),
+  [postprocessingSlice.name]: postprocessingSlice.reducer,
   [systemSlice.name]: systemSlice.reducer,
   [configSlice.name]: configSlice.reducer,
   [uiSlice.name]: uiSlice.reducer,
@@ -68,7 +69,6 @@ const allReducers = {
   [controlLayersSlice.name]: undoable(controlLayersSlice.reducer, controlLayersUndoableConfig),
   [workflowSettingsSlice.name]: workflowSettingsSlice.reducer,
   [api.reducerPath]: api.reducer,
-  [upscaleSlice.name]: upscaleSlice.reducer,
 };
 
 const rootReducer = combineReducers(allReducers);
@@ -102,6 +102,7 @@ const persistConfigs: { [key in keyof typeof allReducers]?: PersistConfig } = {
   [galleryPersistConfig.name]: galleryPersistConfig,
   [generationPersistConfig.name]: generationPersistConfig,
   [nodesPersistConfig.name]: nodesPersistConfig,
+  [postprocessingPersistConfig.name]: postprocessingPersistConfig,
   [systemPersistConfig.name]: systemPersistConfig,
   [workflowPersistConfig.name]: workflowPersistConfig,
   [uiPersistConfig.name]: uiPersistConfig,
@@ -113,7 +114,6 @@ const persistConfigs: { [key in keyof typeof allReducers]?: PersistConfig } = {
   [hrfPersistConfig.name]: hrfPersistConfig,
   [controlLayersPersistConfig.name]: controlLayersPersistConfig,
   [workflowSettingsPersistConfig.name]: workflowSettingsPersistConfig,
-  [upscalePersistConfig.name]: upscalePersistConfig,
 };
 
 const unserialize: UnserializeFunction = (data, key) => {

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

@@ -72,6 +72,7 @@ export type AppConfig = {
   canRestoreDeletedImagesFromBin: boolean;
   nodesAllowlist: string[] | undefined;
   nodesDenylist: string[] | undefined;
+  maxUpscalePixels?: number;
   metadataFetchDebounce?: number;
   workflowFetchDebounce?: number;
   isLocal?: boolean;

invokeai/frontend/web/src/common/components/InformationalPopover/InformationalPopover.tsx

@@ -10,12 +10,9 @@ import {
   PopoverContent,
   PopoverTrigger,
   Portal,
-  Spacer,
   Text,
 } from '@invoke-ai/ui-library';
-import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
-import { setShouldEnableInformationalPopovers } from 'features/system/store/systemSlice';
-import { toast } from 'features/toast/toast';
+import { useAppSelector } from 'app/store/storeHooks';
 import { merge, omit } from 'lodash-es';
 import type { ReactElement } from 'react';
 import { memo, useCallback, useMemo } from 'react';
@@ -74,7 +71,7 @@ type ContentProps = {
 
 const Content = ({ data, feature }: ContentProps) => {
   const { t } = useTranslation();
-  const dispatch = useAppDispatch();
+
   const heading = useMemo<string | undefined>(() => t(`popovers.${feature}.heading`), [feature, t]);
 
   const paragraphs = useMemo<string[]>(
@@ -85,25 +82,16 @@ const Content = ({ data, feature }: ContentProps) => {
     [feature, t]
   );
 
-  const onClickLearnMore = useCallback(() => {
+  const handleClick = useCallback(() => {
     if (!data?.href) {
       return;
     }
     window.open(data.href);
   }, [data?.href]);
 
-  const onClickDontShowMeThese = useCallback(() => {
-    dispatch(setShouldEnableInformationalPopovers(false));
-    toast({
-      title: t('settings.informationalPopoversDisabled'),
-      description: t('settings.informationalPopoversDisabledDesc'),
-      status: 'info',
-    });
-  }, [dispatch, t]);
-
   return (
-    <PopoverContent maxW={300}>
-      <PopoverCloseButton top={2} />
+    <PopoverContent w={96}>
+      <PopoverCloseButton />
       <PopoverBody>
         <Flex gap={2} flexDirection="column" alignItems="flex-start">
           {heading && (
@@ -128,19 +116,20 @@ const Content = ({ data, feature }: ContentProps) => {
           {paragraphs.map((p) => (
             <Text key={p}>{p}</Text>
           ))}
-
-          <Divider />
-          <Flex alignItems="center" justifyContent="space-between" w="full">
-            <Button onClick={onClickDontShowMeThese} variant="link" size="sm">
-              {t('common.dontShowMeThese')}
-            </Button>
-            <Spacer />
-            {data?.href && (
-              <Button onClick={onClickLearnMore} leftIcon={<PiArrowSquareOutBold />} variant="link" size="sm">
+          {data?.href && (
+            <>
+              <Divider />
+              <Button
+                pt={1}
+                onClick={handleClick}
+                leftIcon={<PiArrowSquareOutBold />}
+                alignSelf="flex-end"
+                variant="link"
+              >
                 {t('common.learnMore') ?? heading}
               </Button>
-            )}
-          </Flex>
+            </>
+          )}
         </Flex>
       </PopoverBody>
     </PopoverContent>

invokeai/frontend/web/src/common/components/InformationalPopover/constants.ts

@@ -53,11 +53,7 @@ export type Feature =
   | 'refinerCfgScale'
   | 'scaleBeforeProcessing'
   | 'seamlessTilingXAxis'
-  | 'seamlessTilingYAxis'
-  | 'upscaleModel'
-  | 'scale'
-  | 'creativity'
-  | 'structure';
+  | 'seamlessTilingYAxis';
 
 export type PopoverData = PopoverProps & {
   image?: string;

invokeai/frontend/web/src/common/hooks/useAssertSingleton.ts

@@ -1,18 +0,0 @@
-import { useEffect } from 'react';
-import { assert } from 'tsafe';
-
-const IDS = new Set<string>();
-
-/**
- * Asserts that there is only one instance of a singleton entity. It can be a hook or a component.
- * @param id The ID of the singleton entity.
- */
-export function useAssertSingleton(id: string) {
-  useEffect(() => {
-    assert(!IDS.has(id), `There should be only one instance of ${id}`);
-    IDS.add(id);
-    return () => {
-      IDS.delete(id);
-    };
-  }, [id]);
-}

invokeai/frontend/web/src/common/hooks/useFullscreenDropzone.ts

@@ -21,10 +21,6 @@ const selectPostUploadAction = createMemoizedSelector(activeTabNameSelector, (ac
     postUploadAction = { type: 'SET_CANVAS_INITIAL_IMAGE' };
   }
 
-  if (activeTabName === 'upscaling') {
-    postUploadAction = { type: 'SET_UPSCALE_INITIAL_IMAGE' };
-  }
-
   return postUploadAction;
 });
 

invokeai/frontend/web/src/common/hooks/useIsReadyToEnqueue.ts

@@ -15,7 +15,6 @@ import type { Templates } from 'features/nodes/store/types';
 import { selectWorkflowSettingsSlice } from 'features/nodes/store/workflowSettingsSlice';
 import { isInvocationNode } from 'features/nodes/types/invocation';
 import { selectGenerationSlice } from 'features/parameters/store/generationSlice';
-import { selectUpscalelice } from 'features/parameters/store/upscaleSlice';
 import { selectSystemSlice } from 'features/system/store/systemSlice';
 import { activeTabNameSelector } from 'features/ui/store/uiSelectors';
 import i18n from 'i18next';
@@ -41,19 +40,8 @@ const createSelector = (templates: Templates) =>
       selectDynamicPromptsSlice,
       selectControlLayersSlice,
       activeTabNameSelector,
-      selectUpscalelice,
     ],
-    (
-      controlAdapters,
-      generation,
-      system,
-      nodes,
-      workflowSettings,
-      dynamicPrompts,
-      controlLayers,
-      activeTabName,
-      upscale
-    ) => {
+    (controlAdapters, generation, system, nodes, workflowSettings, dynamicPrompts, controlLayers, activeTabName) => {
       const { model } = generation;
       const { size } = controlLayers.present;
       const { positivePrompt } = controlLayers.present;
@@ -206,16 +194,6 @@ const createSelector = (templates: Templates) =>
                 reasons.push({ prefix, content });
               }
             });
-        } else if (activeTabName === 'upscaling') {
-          if (!upscale.upscaleInitialImage) {
-            reasons.push({ content: i18n.t('upscaling.missingUpscaleInitialImage') });
-          }
-          if (!upscale.upscaleModel) {
-            reasons.push({ content: i18n.t('upscaling.missingUpscaleModel') });
-          }
-          if (!upscale.tileControlnetModel) {
-            reasons.push({ content: i18n.t('upscaling.missingTileControlNetModel') });
-          }
         } else {
           // Handling for all other tabs
           selectControlAdapterAll(controlAdapters)

invokeai/frontend/web/src/features/dnd/types/index.ts

@@ -62,10 +62,6 @@ export type CanvasInitialImageDropData = BaseDropData & {
   actionType: 'SET_CANVAS_INITIAL_IMAGE';
 };
 
-type UpscaleInitialImageDropData = BaseDropData & {
-  actionType: 'SET_UPSCALE_INITIAL_IMAGE';
-};
-
 type NodesImageDropData = BaseDropData & {
   actionType: 'SET_NODES_IMAGE';
   context: {
@@ -102,8 +98,7 @@ export type TypesafeDroppableData =
   | IPALayerImageDropData
   | RGLayerIPAdapterImageDropData
   | IILayerImageDropData
-  | SelectForCompareDropData
-  | UpscaleInitialImageDropData;
+  | SelectForCompareDropData;
 
 type BaseDragData = {
   id: string;

invokeai/frontend/web/src/features/dnd/util/isValidDrop.ts

@@ -27,8 +27,6 @@ export const isValidDrop = (overData?: TypesafeDroppableData | null, activeData?
       return payloadType === 'IMAGE_DTO';
     case 'SET_CANVAS_INITIAL_IMAGE':
       return payloadType === 'IMAGE_DTO';
-    case 'SET_UPSCALE_INITIAL_IMAGE':
-      return payloadType === 'IMAGE_DTO';
     case 'SET_NODES_IMAGE':
       return payloadType === 'IMAGE_DTO';
     case 'SELECT_FOR_COMPARE':

invokeai/frontend/web/src/features/gallery/components/Boards/BoardsList/BoardTooltip.tsx

@@ -1,47 +0,0 @@
-import { Flex, Image, Text } from '@invoke-ai/ui-library';
-import { skipToken } from '@reduxjs/toolkit/query';
-import { useTranslation } from 'react-i18next';
-import { useGetBoardAssetsTotalQuery, useGetBoardImagesTotalQuery } from 'services/api/endpoints/boards';
-import { useGetImageDTOQuery } from 'services/api/endpoints/images';
-import type { BoardDTO } from 'services/api/types';
-
-type Props = {
-  board: BoardDTO | null;
-};
-
-export const BoardTooltip = ({ board }: Props) => {
-  const { t } = useTranslation();
-  const { imagesTotal } = useGetBoardImagesTotalQuery(board?.board_id || 'none', {
-    selectFromResult: ({ data }) => {
-      return { imagesTotal: data?.total ?? 0 };
-    },
-  });
-  const { assetsTotal } = useGetBoardAssetsTotalQuery(board?.board_id || 'none', {
-    selectFromResult: ({ data }) => {
-      return { assetsTotal: data?.total ?? 0 };
-    },
-  });
-  const { currentData: coverImage } = useGetImageDTOQuery(board?.cover_image_name ?? skipToken);
-
-  return (
-    <Flex flexDir="column" alignItems="center" gap={1}>
-      {coverImage && (
-        <Image
-          src={coverImage.thumbnail_url}
-          draggable={false}
-          objectFit="cover"
-          maxW={150}
-          aspectRatio="1/1"
-          borderRadius="base"
-          borderBottomRadius="lg"
-        />
-      )}
-      <Flex flexDir="column" alignItems="center">
-        <Text noOfLines={1}>
-          {t('boards.imagesWithCount', { count: imagesTotal })}, {t('boards.assetsWithCount', { count: assetsTotal })}
-        </Text>
-        {board?.archived && <Text>({t('boards.archived')})</Text>}
-      </Flex>
-    </Flex>
-  );
-};

invokeai/frontend/web/src/features/gallery/components/Boards/BoardsList/BoardTotalsTooltip.tsx

@@ -0,0 +1,22 @@
+import { useTranslation } from 'react-i18next';
+import { useGetBoardAssetsTotalQuery, useGetBoardImagesTotalQuery } from 'services/api/endpoints/boards';
+
+type Props = {
+  board_id: string;
+  isArchived: boolean;
+};
+
+export const BoardTotalsTooltip = ({ board_id, isArchived }: Props) => {
+  const { t } = useTranslation();
+  const { imagesTotal } = useGetBoardImagesTotalQuery(board_id, {
+    selectFromResult: ({ data }) => {
+      return { imagesTotal: data?.total ?? 0 };
+    },
+  });
+  const { assetsTotal } = useGetBoardAssetsTotalQuery(board_id, {
+    selectFromResult: ({ data }) => {
+      return { assetsTotal: data?.total ?? 0 };
+    },
+  });
+  return `${t('boards.imagesWithCount', { count: imagesTotal })}, ${t('boards.assetsWithCount', { count: assetsTotal })}${isArchived ? ` (${t('boards.archived')})` : ''}`;
+};

invokeai/frontend/web/src/features/gallery/components/Boards/BoardsList/BoardsList.tsx

@@ -1,10 +1,13 @@
-import { Button, Collapse, Flex, Icon, Text, useDisclosure } from '@invoke-ai/ui-library';
+import { Box, Flex, Text } from '@invoke-ai/ui-library';
 import { EMPTY_ARRAY } from 'app/store/constants';
 import { useAppSelector } from 'app/store/storeHooks';
+import { overlayScrollbarsParams } from 'common/components/OverlayScrollbars/constants';
+import DeleteBoardModal from 'features/gallery/components/Boards/DeleteBoardModal';
 import { selectListBoardsQueryArgs } from 'features/gallery/store/gallerySelectors';
-import { useMemo } from 'react';
+import { OverlayScrollbarsComponent } from 'overlayscrollbars-react';
+import type { CSSProperties } from 'react';
+import { memo, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { PiCaretDownBold } from 'react-icons/pi';
 import { useListAllBoardsQuery } from 'services/api/endpoints/boards';
 import type { BoardDTO } from 'services/api/types';
 
@@ -12,111 +15,101 @@ import AddBoardButton from './AddBoardButton';
 import GalleryBoard from './GalleryBoard';
 import NoBoardBoard from './NoBoardBoard';
 
-type Props = {
-  isPrivate: boolean;
-  setBoardToDelete: (board?: BoardDTO) => void;
+const overlayScrollbarsStyles: CSSProperties = {
+  height: '100%',
+  width: '100%',
 };
 
-export const BoardsList = ({ isPrivate, setBoardToDelete }: Props) => {
-  const { t } = useTranslation();
+const BoardsList = () => {
   const selectedBoardId = useAppSelector((s) => s.gallery.selectedBoardId);
   const boardSearchText = useAppSelector((s) => s.gallery.boardSearchText);
+  const allowPrivateBoards = useAppSelector((s) => s.config.allowPrivateBoards);
   const queryArgs = useAppSelector(selectListBoardsQueryArgs);
   const { data: boards } = useListAllBoardsQuery(queryArgs);
-  const allowPrivateBoards = useAppSelector((s) => s.config.allowPrivateBoards);
-  const { isOpen, onToggle } = useDisclosure({ defaultIsOpen: true });
+  const [boardToDelete, setBoardToDelete] = useState<BoardDTO>();
+  const { t } = useTranslation();
 
-  const filteredBoards = useMemo(() => {
-    if (!boards) {
-      return EMPTY_ARRAY;
-    }
-
-    return boards.filter((board) => {
-      if (boardSearchText.length) {
-        return board.is_private === isPrivate && board.board_name.toLowerCase().includes(boardSearchText.toLowerCase());
-      } else {
-        return board.is_private === isPrivate;
-      }
-    });
-  }, [boardSearchText, boards, isPrivate]);
-
-  const boardElements = useMemo(() => {
-    const elements = [];
-    if (allowPrivateBoards && isPrivate && !boardSearchText.length) {
-      elements.push(<NoBoardBoard key="none" isSelected={selectedBoardId === 'none'} />);
-    }
-
-    if (!allowPrivateBoards && !boardSearchText.length) {
-      elements.push(<NoBoardBoard key="none" isSelected={selectedBoardId === 'none'} />);
-    }
-
-    filteredBoards.forEach((board) => {
-      elements.push(
-        <GalleryBoard
-          board={board}
-          isSelected={selectedBoardId === board.board_id}
-          setBoardToDelete={setBoardToDelete}
-          key={board.board_id}
-        />
-      );
-    });
-
-    return elements;
-  }, [allowPrivateBoards, isPrivate, boardSearchText.length, filteredBoards, selectedBoardId, setBoardToDelete]);
-
-  const boardListTitle = useMemo(() => {
-    if (allowPrivateBoards) {
-      return isPrivate ? t('boards.private') : t('boards.shared');
-    } else {
-      return t('boards.boards');
-    }
-  }, [isPrivate, allowPrivateBoards, t]);
+  const { filteredPrivateBoards, filteredSharedBoards } = useMemo(() => {
+    const filteredBoards = boardSearchText
+      ? boards?.filter((board) => board.board_name.toLowerCase().includes(boardSearchText.toLowerCase()))
+      : boards;
+    const filteredPrivateBoards = filteredBoards?.filter((board) => board.is_private) ?? EMPTY_ARRAY;
+    const filteredSharedBoards = filteredBoards?.filter((board) => !board.is_private) ?? EMPTY_ARRAY;
+    return { filteredPrivateBoards, filteredSharedBoards };
+  }, [boardSearchText, boards]);
 
   return (
-    <Flex direction="column">
-      <Flex
-        position="sticky"
-        w="full"
-        justifyContent="space-between"
-        alignItems="center"
-        ps={2}
-        py={1}
-        zIndex={1}
-        top={0}
-        bg="base.900"
-      >
-        {allowPrivateBoards ? (
-          <Button variant="unstyled" onClick={onToggle}>
-            <Flex gap="2" alignItems="center">
-              <Icon
-                boxSize={4}
-                as={PiCaretDownBold}
-                transform={isOpen ? undefined : 'rotate(-90deg)'}
-                fill="base.500"
-              />
-              <Text fontSize="sm" fontWeight="semibold" userSelect="none" color="base.500">
-                {boardListTitle}
-              </Text>
+    <>
+      <Box position="relative" w="full" h="full">
+        <Box position="absolute" top={0} right={0} bottom={0} left={0}>
+          <OverlayScrollbarsComponent defer style={overlayScrollbarsStyles} options={overlayScrollbarsParams.options}>
+            {allowPrivateBoards && (
+              <Flex direction="column" gap={1}>
+                <Flex
+                  position="sticky"
+                  w="full"
+                  justifyContent="space-between"
+                  alignItems="center"
+                  ps={2}
+                  pb={1}
+                  pt={2}
+                  zIndex={1}
+                  top={0}
+                  bg="base.900"
+                >
+                  <Text fontSize="md" fontWeight="semibold" userSelect="none">
+                    {t('boards.private')}
+                  </Text>
+                  <AddBoardButton isPrivateBoard={true} />
+                </Flex>
+                <Flex direction="column" gap={1}>
+                  <NoBoardBoard isSelected={selectedBoardId === 'none'} />
+                  {filteredPrivateBoards.map((board) => (
+                    <GalleryBoard
+                      board={board}
+                      isSelected={selectedBoardId === board.board_id}
+                      setBoardToDelete={setBoardToDelete}
+                      key={board.board_id}
+                    />
+                  ))}
+                </Flex>
+              </Flex>
+            )}
+            <Flex direction="column" gap={1}>
+              <Flex
+                position="sticky"
+                w="full"
+                justifyContent="space-between"
+                alignItems="center"
+                ps={2}
+                pb={1}
+                pt={2}
+                zIndex={1}
+                top={0}
+                bg="base.900"
+              >
+                <Text fontSize="md" fontWeight="semibold" userSelect="none">
+                  {allowPrivateBoards ? t('boards.shared') : t('boards.boards')}
+                </Text>
+                <AddBoardButton isPrivateBoard={false} />
+              </Flex>
+              <Flex direction="column" gap={1}>
+                {!allowPrivateBoards && <NoBoardBoard isSelected={selectedBoardId === 'none'} />}
+                {filteredSharedBoards.map((board) => (
+                  <GalleryBoard
+                    board={board}
+                    isSelected={selectedBoardId === board.board_id}
+                    setBoardToDelete={setBoardToDelete}
+                    key={board.board_id}
+                  />
+                ))}
+              </Flex>
             </Flex>
-          </Button>
-        ) : (
-          <Text fontSize="sm" fontWeight="semibold" userSelect="none" color="base.500">
-            {boardListTitle}
-          </Text>
-        )}
-        <AddBoardButton isPrivateBoard={isPrivate} />
-      </Flex>
-      <Collapse in={isOpen}>
-        <Flex direction="column" gap={1}>
-          {boardElements.length ? (
-            boardElements
-          ) : (
-            <Text variant="subtext" textAlign="center">
-              {t('boards.noBoards', { boardType: boardSearchText.length ? 'Matching' : '' })}
-            </Text>
-          )}
-        </Flex>
-      </Collapse>
-    </Flex>
+          </OverlayScrollbarsComponent>
+        </Box>
+      </Box>
+      <DeleteBoardModal boardToDelete={boardToDelete} setBoardToDelete={setBoardToDelete} />
+    </>
   );
 };
+export default memo(BoardsList);

invokeai/frontend/web/src/features/gallery/components/Boards/BoardsList/BoardsListWrapper.tsx

@@ -1,35 +0,0 @@
-import { Box } from '@invoke-ai/ui-library';
-import { useAppSelector } from 'app/store/storeHooks';
-import { overlayScrollbarsParams } from 'common/components/OverlayScrollbars/constants';
-import DeleteBoardModal from 'features/gallery/components/Boards/DeleteBoardModal';
-import { OverlayScrollbarsComponent } from 'overlayscrollbars-react';
-import type { CSSProperties } from 'react';
-import { memo, useState } from 'react';
-import type { BoardDTO } from 'services/api/types';
-
-import { BoardsList } from './BoardsList';
-
-const overlayScrollbarsStyles: CSSProperties = {
-  height: '100%',
-  width: '100%',
-};
-
-const BoardsListWrapper = () => {
-  const allowPrivateBoards = useAppSelector((s) => s.config.allowPrivateBoards);
-  const [boardToDelete, setBoardToDelete] = useState<BoardDTO>();
-
-  return (
-    <>
-      <Box position="relative" w="full" h="full">
-        <Box position="absolute" top={0} right={0} bottom={0} left={0}>
-          <OverlayScrollbarsComponent defer style={overlayScrollbarsStyles} options={overlayScrollbarsParams.options}>
-            {allowPrivateBoards && <BoardsList isPrivate={true} setBoardToDelete={setBoardToDelete} />}
-            <BoardsList isPrivate={false} setBoardToDelete={setBoardToDelete} />
-          </OverlayScrollbarsComponent>
-        </Box>
-      </Box>
-      <DeleteBoardModal boardToDelete={boardToDelete} setBoardToDelete={setBoardToDelete} />
-    </>
-  );
-};
-export default memo(BoardsListWrapper);

invokeai/frontend/web/src/features/gallery/components/Boards/BoardsList/BoardsSearch.tsx

@@ -40,7 +40,7 @@ const BoardsSearch = () => {
   );
 
   return (
-    <InputGroup>
+    <InputGroup pt={2}>
       <Input
         placeholder={t('boards.searchBoard')}
         value={boardSearchText}

invokeai/frontend/web/src/features/gallery/components/Boards/BoardsList/GalleryBoard.tsx

@@ -17,7 +17,7 @@ import IAIDroppable from 'common/components/IAIDroppable';
 import type { AddToBoardDropData } from 'features/dnd/types';
 import { AutoAddBadge } from 'features/gallery/components/Boards/AutoAddBadge';
 import BoardContextMenu from 'features/gallery/components/Boards/BoardContextMenu';
-import { BoardTooltip } from 'features/gallery/components/Boards/BoardsList/BoardTooltip';
+import { BoardTotalsTooltip } from 'features/gallery/components/Boards/BoardsList/BoardTotalsTooltip';
 import { autoAddBoardIdChanged, boardIdSelected } from 'features/gallery/store/gallerySlice';
 import type { MouseEvent, MouseEventHandler, MutableRefObject } from 'react';
 import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react';
@@ -115,7 +115,12 @@ const GalleryBoard = ({ board, isSelected, setBoardToDelete }: GalleryBoardProps
   return (
     <BoardContextMenu board={board} setBoardToDelete={setBoardToDelete}>
       {(ref) => (
-        <Tooltip label={<BoardTooltip board={board} />} openDelay={1000} placement="left" closeOnScroll p={2}>
+        <Tooltip
+          label={<BoardTotalsTooltip board_id={board.board_id} isArchived={Boolean(board.archived)} />}
+          openDelay={1000}
+          placement="left"
+          closeOnScroll
+        >
           <Flex
             position="relative"
             ref={ref}
@@ -126,12 +131,10 @@ const GalleryBoard = ({ board, isSelected, setBoardToDelete }: GalleryBoardProps
             borderRadius="base"
             cursor="pointer"
             py={1}
-            ps={1}
-            pe={4}
-            gap={4}
+            px={2}
+            gap={2}
             bg={isSelected ? 'base.850' : undefined}
             _hover={_hover}
-            h={12}
           >
             <CoverImage board={board} />
             <Editable
@@ -146,17 +149,17 @@ const GalleryBoard = ({ board, isSelected, setBoardToDelete }: GalleryBoardProps
               onChange={onChange}
               onSubmit={onSubmit}
               isPreviewFocusable={false}
-              fontSize="sm"
             >
               <EditablePreview
                 cursor="pointer"
                 p={0}
-                fontSize="sm"
+                fontSize="md"
                 textOverflow="ellipsis"
                 noOfLines={1}
                 w="fit-content"
                 wordBreak="break-all"
-                fontWeight={isSelected ? 'bold' : 'normal'}
+                color={isSelected ? 'base.100' : 'base.400'}
+                fontWeight={isSelected ? 'semibold' : 'normal'}
               />
               <EditableInput sx={editableInputStyles} />
               <JankEditableHijack onStartEditingRef={onStartEditingRef} />
@@ -165,7 +168,7 @@ const GalleryBoard = ({ board, isSelected, setBoardToDelete }: GalleryBoardProps
             {board.archived && !editingDisclosure.isOpen && <Icon as={PiArchiveBold} fill="base.300" />}
             {!editingDisclosure.isOpen && <Text variant="subtext">{board.image_count}</Text>}
 
-            <IAIDroppable data={droppableData} dropLabel={<Text fontSize="lg">{t('unifiedCanvas.move')}</Text>} />
+            <IAIDroppable data={droppableData} dropLabel={<Text fontSize="md">{t('unifiedCanvas.move')}</Text>} />
           </Flex>
         </Tooltip>
       )}
@@ -194,8 +197,8 @@ const CoverImage = ({ board }: { board: BoardDTO }) => {
         src={coverImage.thumbnail_url}
         draggable={false}
         objectFit="cover"
-        w={10}
-        h={10}
+        w={8}
+        h={8}
         borderRadius="base"
         borderBottomRadius="lg"
       />
@@ -203,8 +206,8 @@ const CoverImage = ({ board }: { board: BoardDTO }) => {
   }
 
   return (
-    <Flex w={10} h={10} justifyContent="center" alignItems="center">
-      <Icon boxSize={10} as={PiImageSquare} opacity={0.7} color="base.500" />
+    <Flex w={8} h={8} justifyContent="center" alignItems="center">
+      <Icon boxSize={8} as={PiImageSquare} opacity={0.7} color="base.500" />
     </Flex>
   );
 };

invokeai/frontend/web/src/features/gallery/components/Boards/BoardsList/NoBoardBoard.tsx

@@ -4,7 +4,7 @@ import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
 import IAIDroppable from 'common/components/IAIDroppable';
 import type { RemoveFromBoardDropData } from 'features/dnd/types';
 import { AutoAddBadge } from 'features/gallery/components/Boards/AutoAddBadge';
-import { BoardTooltip } from 'features/gallery/components/Boards/BoardsList/BoardTooltip';
+import { BoardTotalsTooltip } from 'features/gallery/components/Boards/BoardsList/BoardTotalsTooltip';
 import NoBoardBoardContextMenu from 'features/gallery/components/Boards/NoBoardBoardContextMenu';
 import { autoAddBoardIdChanged, boardIdSelected } from 'features/gallery/store/gallerySlice';
 import { memo, useCallback, useMemo } from 'react';
@@ -46,16 +46,25 @@ const NoBoardBoard = memo(({ isSelected }: Props) => {
     []
   );
 
+  const filteredOut = useMemo(() => {
+    return boardSearchText ? !boardName.toLowerCase().includes(boardSearchText.toLowerCase()) : false;
+  }, [boardName, boardSearchText]);
+
   const { t } = useTranslation();
 
-  if (boardSearchText.length) {
+  if (filteredOut) {
     return null;
   }
 
   return (
     <NoBoardBoardContextMenu>
       {(ref) => (
-        <Tooltip label={<BoardTooltip board={null} />} openDelay={1000} placement="left" closeOnScroll>
+        <Tooltip
+          label={<BoardTotalsTooltip board_id="none" isArchived={false} />}
+          openDelay={1000}
+          placement="left"
+          closeOnScroll
+        >
           <Flex
             position="relative"
             ref={ref}
@@ -64,17 +73,15 @@ const NoBoardBoard = memo(({ isSelected }: Props) => {
             alignItems="center"
             borderRadius="base"
             cursor="pointer"
+            px={2}
             py={1}
-            ps={1}
-            pe={4}
-            gap={4}
+            gap={2}
             bg={isSelected ? 'base.850' : undefined}
             _hover={_hover}
-            h={12}
           >
-            <Flex w="10" justifyContent="space-around">
+            <Flex w={8} h={8} justifyContent="center" alignItems="center">
               {/* iconified from public/assets/images/invoke-symbol-wht-lrg.svg */}
-              <Icon boxSize={8} opacity={1} stroke="base.500" viewBox="0 0 66 66" fill="none">
+              <Icon boxSize={6} opacity={1} stroke="base.500" viewBox="0 0 66 66" fill="none">
                 <path
                   d="M43.9137 16H63.1211V3H3.12109V16H22.3285L43.9137 50H63.1211V63H3.12109V50H22.3285"
                   strokeWidth="5"
@@ -82,12 +89,18 @@ const NoBoardBoard = memo(({ isSelected }: Props) => {
               </Icon>
             </Flex>
 
-            <Text fontSize="sm" fontWeight={isSelected ? 'bold' : 'normal'} noOfLines={1} flexGrow={1}>
+            <Text
+              fontSize="md"
+              color={isSelected ? 'base.100' : 'base.400'}
+              fontWeight={isSelected ? 'semibold' : 'normal'}
+              noOfLines={1}
+              flexGrow={1}
+            >
               {boardName}
             </Text>
             {autoAddBoardId === 'none' && <AutoAddBadge />}
             <Text variant="subtext">{imagesTotal}</Text>
-            <IAIDroppable data={droppableData} dropLabel={<Text fontSize="lg">{t('unifiedCanvas.move')}</Text>} />
+            <IAIDroppable data={droppableData} dropLabel={<Text fontSize="md">{t('unifiedCanvas.move')}</Text>} />
           </Flex>
         </Tooltip>
       )}

invokeai/frontend/web/src/features/gallery/components/Gallery.tsx

@@ -1,105 +0,0 @@
-import type { ChakraProps } from '@invoke-ai/ui-library';
-import {
-  Box,
-  Collapse,
-  Flex,
-  IconButton,
-  Spacer,
-  Tab,
-  TabList,
-  Tabs,
-  Text,
-  useDisclosure,
-} from '@invoke-ai/ui-library';
-import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
-import { useGallerySearchTerm } from 'features/gallery/components/ImageGrid/useGallerySearchTerm';
-import { galleryViewChanged } from 'features/gallery/store/gallerySlice';
-import type { CSSProperties } from 'react';
-import { useCallback } from 'react';
-import { useTranslation } from 'react-i18next';
-import { PiMagnifyingGlassBold } from 'react-icons/pi';
-import { useBoardName } from 'services/api/hooks/useBoardName';
-
-import GalleryImageGrid from './ImageGrid/GalleryImageGrid';
-import { GalleryPagination } from './ImageGrid/GalleryPagination';
-import { GallerySearch } from './ImageGrid/GallerySearch';
-
-const BASE_STYLES: ChakraProps['sx'] = {
-  fontWeight: 'semibold',
-  fontSize: 'sm',
-  color: 'base.300',
-};
-
-const SELECTED_STYLES: ChakraProps['sx'] = {
-  borderColor: 'base.800',
-  borderBottomColor: 'base.900',
-  color: 'invokeBlue.300',
-};
-
-const COLLAPSE_STYLES: CSSProperties = { flexShrink: 0, minHeight: 0 };
-
-export const Gallery = () => {
-  const { t } = useTranslation();
-  const dispatch = useAppDispatch();
-  const galleryView = useAppSelector((s) => s.gallery.galleryView);
-  const initialSearchTerm = useAppSelector((s) => s.gallery.searchTerm);
-  const searchDisclosure = useDisclosure({ defaultIsOpen: initialSearchTerm.length > 0 });
-  const [searchTerm, onChangeSearchTerm, onResetSearchTerm] = useGallerySearchTerm();
-
-  const handleClickImages = useCallback(() => {
-    dispatch(galleryViewChanged('images'));
-  }, [dispatch]);
-
-  const handleClickAssets = useCallback(() => {
-    dispatch(galleryViewChanged('assets'));
-  }, [dispatch]);
-
-  const handleClickSearch = useCallback(() => {
-    searchDisclosure.onToggle();
-    onResetSearchTerm();
-  }, [onResetSearchTerm, searchDisclosure]);
-
-  const selectedBoardId = useAppSelector((s) => s.gallery.selectedBoardId);
-  const boardName = useBoardName(selectedBoardId);
-
-  return (
-    <Flex flexDirection="column" alignItems="center" justifyContent="space-between" h="full" w="full" pt={1}>
-      <Tabs index={galleryView === 'images' ? 0 : 1} variant="enclosed" display="flex" flexDir="column" w="full">
-        <TabList gap={2} fontSize="sm" borderColor="base.800" alignItems="center" w="full">
-          <Text fontSize="sm" fontWeight="semibold" noOfLines={1} px="2">
-            {boardName}
-          </Text>
-          <Spacer />
-          <Tab sx={BASE_STYLES} _selected={SELECTED_STYLES} onClick={handleClickImages} data-testid="images-tab">
-            {t('parameters.images')}
-          </Tab>
-          <Tab sx={BASE_STYLES} _selected={SELECTED_STYLES} onClick={handleClickAssets} data-testid="assets-tab">
-            {t('gallery.assets')}
-          </Tab>
-          <IconButton
-            onClick={handleClickSearch}
-            tooltip={searchDisclosure.isOpen ? `${t('gallery.exitSearch')}` : `${t('gallery.displaySearch')}`}
-            aria-label={t('gallery.displaySearch')}
-            icon={<PiMagnifyingGlassBold />}
-            colorScheme={searchDisclosure.isOpen ? 'invokeBlue' : 'base'}
-            variant="link"
-          />
-        </TabList>
-      </Tabs>
-
-      <Box w="full">
-        <Collapse in={searchDisclosure.isOpen} style={COLLAPSE_STYLES}>
-          <Box w="full" pt={2}>
-            <GallerySearch
-              searchTerm={searchTerm}
-              onChangeSearchTerm={onChangeSearchTerm}
-              onResetSearchTerm={onResetSearchTerm}
-            />
-          </Box>
-        </Collapse>
-      </Box>
-      <GalleryImageGrid />
-      <GalleryPagination />
-    </Flex>
-  );
-};

invokeai/frontend/web/src/features/gallery/components/GalleryBoardName.tsx

@@ -0,0 +1,33 @@
+import { Flex, Text } from '@invoke-ai/ui-library';
+import { useAppSelector } from 'app/store/storeHooks';
+import { memo } from 'react';
+import { useBoardName } from 'services/api/hooks/useBoardName';
+
+type Props = {
+  onClick: () => void;
+};
+
+const GalleryBoardName = (props: Props) => {
+  const selectedBoardId = useAppSelector((s) => s.gallery.selectedBoardId);
+  const boardName = useBoardName(selectedBoardId);
+
+  return (
+    <Flex
+      onClick={props.onClick}
+      as="button"
+      h="full"
+      w="full"
+      borderWidth={1}
+      borderRadius="base"
+      alignItems="center"
+      justifyContent="center"
+      px={2}
+    >
+      <Text fontWeight="semibold" fontSize="md" noOfLines={1} wordBreak="break-all" color="base.200">
+        {boardName}
+      </Text>
+    </Flex>
+  );
+};
+
+export default memo(GalleryBoardName);

invokeai/frontend/web/src/features/gallery/components/GalleryHeader.tsx

@@ -3,21 +3,32 @@ import { useStore } from '@nanostores/react';
 import { $projectName, $projectUrl } from 'app/store/nanostores/projectId';
 import { memo } from 'react';
 
-export const GalleryHeader = memo(() => {
+import GalleryBoardName from './GalleryBoardName';
+
+type Props = {
+  onClickBoardName: () => void;
+};
+
+export const GalleryHeader = memo((props: Props) => {
   const projectName = useStore($projectName);
   const projectUrl = useStore($projectUrl);
 
   if (projectName && projectUrl) {
     return (
       <Flex gap={2} w="full" alignItems="center" justifyContent="space-evenly" pe={2}>
-        <Text fontSize="md" fontWeight="semibold" noOfLines={1} wordBreak="break-all" w="full" textAlign="center">
+        <Text fontSize="md" fontWeight="semibold" noOfLines={1} w="full" textAlign="center">
           <Link href={projectUrl}>{projectName}</Link>
         </Text>
+        <GalleryBoardName onClick={props.onClickBoardName} />
       </Flex>
     );
   }
 
-  return null;
+  return (
+    <Flex w="full" pe={2}>
+      <GalleryBoardName onClick={props.onClickBoardName} />
+    </Flex>
+  );
 });
 
 GalleryHeader.displayName = 'GalleryHeader';

invokeai/frontend/web/src/features/gallery/components/ImageContextMenu/SingleSelectionMenuItems.tsx

@@ -13,7 +13,6 @@ import { sentImageToCanvas, sentImageToImg2Img } from 'features/gallery/store/ac
 import { imageToCompareChanged } from 'features/gallery/store/gallerySlice';
 import { $templates } from 'features/nodes/store/nodesSlice';
 import { selectOptimalDimension } from 'features/parameters/store/generationSlice';
-import { upscaleInitialImageChanged } from 'features/parameters/store/upscaleSlice';
 import { useFeatureStatus } from 'features/system/hooks/useFeatureStatus';
 import { toast } from 'features/toast/toast';
 import { setActiveTab } from 'features/ui/store/uiSlice';
@@ -125,11 +124,6 @@ const SingleSelectionMenuItems = (props: SingleSelectionMenuItemsProps) => {
     dispatch(imageToCompareChanged(imageDTO));
   }, [dispatch, imageDTO]);
 
-  const handleSendToUpscale = useCallback(() => {
-    dispatch(upscaleInitialImageChanged(imageDTO));
-    dispatch(setActiveTab('upscaling'));
-  }, [dispatch, imageDTO]);
-
   return (
     <>
       <MenuItem as="a" href={imageDTO.image_url} target="_blank" icon={<PiShareFatBold />}>
@@ -191,9 +185,6 @@ const SingleSelectionMenuItems = (props: SingleSelectionMenuItemsProps) => {
           {t('parameters.sendToUnifiedCanvas')}
         </MenuItem>
       )}
-      <MenuItem icon={<PiShareFatBold />} onClickCapture={handleSendToUpscale} id="send-to-upscale">
-        {t('parameters.sendToUpscale')}
-      </MenuItem>
       <MenuDivider />
       <MenuItem icon={<PiFoldersBold />} onClickCapture={handleChangeBoard}>
         {t('boards.changeBoard')}

invokeai/frontend/web/src/features/gallery/components/ImageGalleryContent.tsx

@@ -1,28 +1,57 @@
-import { Box, Button, Collapse, Divider, Flex, IconButton, useDisclosure } from '@invoke-ai/ui-library';
+import type { ChakraProps } from '@invoke-ai/ui-library';
+import {
+  Box,
+  Collapse,
+  Divider,
+  Flex,
+  IconButton,
+  Spacer,
+  Tab,
+  TabList,
+  Tabs,
+  useDisclosure,
+} from '@invoke-ai/ui-library';
 import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
 import { GalleryHeader } from 'features/gallery/components/GalleryHeader';
-import { boardSearchTextChanged } from 'features/gallery/store/gallerySlice';
+import { galleryViewChanged } from 'features/gallery/store/gallerySlice';
 import ResizeHandle from 'features/ui/components/tabs/ResizeHandle';
 import { usePanel, type UsePanelOptions } from 'features/ui/hooks/usePanel';
 import type { CSSProperties } from 'react';
 import { memo, useCallback, useMemo, useRef } from 'react';
 import { useTranslation } from 'react-i18next';
-import { PiCaretDownBold, PiCaretUpBold, PiMagnifyingGlassBold } from 'react-icons/pi';
+import { PiMagnifyingGlassBold } from 'react-icons/pi';
 import type { ImperativePanelGroupHandle } from 'react-resizable-panels';
 import { Panel, PanelGroup } from 'react-resizable-panels';
 
-import BoardsListWrapper from './Boards/BoardsList/BoardsListWrapper';
+import BoardsList from './Boards/BoardsList/BoardsList';
 import BoardsSearch from './Boards/BoardsList/BoardsSearch';
-import { Gallery } from './Gallery';
 import GallerySettingsPopover from './GallerySettingsPopover/GallerySettingsPopover';
+import GalleryImageGrid from './ImageGrid/GalleryImageGrid';
+import { GalleryPagination } from './ImageGrid/GalleryPagination';
+import { GallerySearch } from './ImageGrid/GallerySearch';
 
 const COLLAPSE_STYLES: CSSProperties = { flexShrink: 0, minHeight: 0 };
 
+const BASE_STYLES: ChakraProps['sx'] = {
+  fontWeight: 'semibold',
+  fontSize: 'sm',
+  color: 'base.300',
+};
+
+const SELECTED_STYLES: ChakraProps['sx'] = {
+  borderColor: 'base.800',
+  borderBottomColor: 'base.900',
+  color: 'invokeBlue.300',
+};
+
 const ImageGalleryContent = () => {
   const { t } = useTranslation();
+  const galleryView = useAppSelector((s) => s.gallery.galleryView);
+  const searchTerm = useAppSelector((s) => s.gallery.searchTerm);
   const boardSearchText = useAppSelector((s) => s.gallery.boardSearchText);
   const dispatch = useAppDispatch();
-  const boardSearchDisclosure = useDisclosure({ defaultIsOpen: !!boardSearchText.length });
+  const searchDisclosure = useDisclosure({ defaultIsOpen: false });
+  const boardSearchDisclosure = useDisclosure({ defaultIsOpen: false });
   const panelGroupRef = useRef<ImperativePanelGroupHandle>(null);
 
   const boardsListPanelOptions = useMemo<UsePanelOptions>(
@@ -38,58 +67,42 @@ const ImageGalleryContent = () => {
   );
   const boardsListPanel = usePanel(boardsListPanelOptions);
 
-  const handleClickBoardSearch = useCallback(() => {
-    if (boardSearchText.length) {
-      dispatch(boardSearchTextChanged(''));
-    }
-    boardSearchDisclosure.onToggle();
-    boardsListPanel.expand();
-  }, [boardSearchText.length, boardSearchDisclosure, boardsListPanel, dispatch]);
+  const handleClickImages = useCallback(() => {
+    dispatch(galleryViewChanged('images'));
+  }, [dispatch]);
 
-  const handleToggleBoardPanel = useCallback(() => {
-    if (boardSearchText.length) {
-      dispatch(boardSearchTextChanged(''));
-    }
-    boardSearchDisclosure.onClose();
-    boardsListPanel.toggle();
-  }, [boardSearchText.length, boardSearchDisclosure, boardsListPanel, dispatch]);
+  const handleClickAssets = useCallback(() => {
+    dispatch(galleryViewChanged('assets'));
+  }, [dispatch]);
 
   return (
     <Flex position="relative" flexDirection="column" h="full" w="full" pt={2}>
-      <Flex alignItems="center" gap={0}>
-        <GalleryHeader />
-        <Flex alignItems="center" justifyContent="space-between" w="full">
-          <Button
-            w={112}
-            size="sm"
-            variant="ghost"
-            onClick={handleToggleBoardPanel}
-            rightIcon={boardsListPanel.isCollapsed ? <PiCaretDownBold /> : <PiCaretUpBold />}
-          >
-            {boardsListPanel.isCollapsed ? t('boards.viewBoards') : t('boards.hideBoards')}
-          </Button>
-          <Flex alignItems="center" justifyContent="space-between">
-            <GallerySettingsPopover />
-            <Flex>
-              <IconButton
-                w="full"
-                h="full"
-                onClick={handleClickBoardSearch}
-                tooltip={
-                  boardSearchDisclosure.isOpen
-                    ? `${t('gallery.exitBoardSearch')}`
-                    : `${t('gallery.displayBoardSearch')}`
-                }
-                aria-label={t('gallery.displayBoardSearch')}
-                icon={<PiMagnifyingGlassBold />}
-                colorScheme={boardSearchDisclosure.isOpen ? 'invokeBlue' : 'base'}
-                variant="link"
-              />
-            </Flex>
-          </Flex>
-        </Flex>
+      <Flex alignItems="center" gap={2}>
+        <GalleryHeader onClickBoardName={boardsListPanel.toggle} />
+        <GallerySettingsPopover />
+        <Box position="relative" h="full">
+          <IconButton
+            w="full"
+            h="full"
+            onClick={boardSearchDisclosure.onToggle}
+            tooltip={`${t('gallery.displayBoardSearch')}`}
+            aria-label={t('gallery.displayBoardSearch')}
+            icon={<PiMagnifyingGlassBold />}
+            variant="link"
+          />
+          {boardSearchText && (
+            <Box
+              position="absolute"
+              w={2}
+              h={2}
+              bg="invokeBlue.300"
+              borderRadius="full"
+              insetBlockStart={2}
+              insetInlineEnd={2}
+            />
+          )}
+        </Box>
       </Flex>
-
       <PanelGroup ref={panelGroupRef} direction="vertical">
         <Panel
           id="boards-list-panel"
@@ -102,12 +115,10 @@ const ImageGalleryContent = () => {
         >
           <Flex flexDir="column" w="full" h="full">
             <Collapse in={boardSearchDisclosure.isOpen} style={COLLAPSE_STYLES}>
-              <Box w="full" pt={2}>
-                <BoardsSearch />
-              </Box>
+              <BoardsSearch />
             </Collapse>
             <Divider pt={2} />
-            <BoardsListWrapper />
+            <BoardsList />
           </Flex>
         </Panel>
         <ResizeHandle
@@ -116,7 +127,50 @@ const ImageGalleryContent = () => {
           onDoubleClick={boardsListPanel.onDoubleClickHandle}
         />
         <Panel id="gallery-wrapper-panel" minSize={20}>
-          <Gallery />
+          <Flex flexDirection="column" alignItems="center" justifyContent="space-between" h="full" w="full">
+            <Tabs index={galleryView === 'images' ? 0 : 1} variant="enclosed" display="flex" flexDir="column" w="full">
+              <TabList gap={2} fontSize="sm" borderColor="base.800">
+                <Tab sx={BASE_STYLES} _selected={SELECTED_STYLES} onClick={handleClickImages} data-testid="images-tab">
+                  {t('parameters.images')}
+                </Tab>
+                <Tab sx={BASE_STYLES} _selected={SELECTED_STYLES} onClick={handleClickAssets} data-testid="assets-tab">
+                  {t('gallery.assets')}
+                </Tab>
+                <Spacer />
+                <Box position="relative">
+                  <IconButton
+                    w="full"
+                    h="full"
+                    onClick={searchDisclosure.onToggle}
+                    tooltip={`${t('gallery.displaySearch')}`}
+                    aria-label={t('gallery.displaySearch')}
+                    icon={<PiMagnifyingGlassBold />}
+                    variant="link"
+                  />
+                  {searchTerm && (
+                    <Box
+                      position="absolute"
+                      w={2}
+                      h={2}
+                      bg="invokeBlue.300"
+                      borderRadius="full"
+                      insetBlockStart={2}
+                      insetInlineEnd={2}
+                    />
+                  )}
+                </Box>
+              </TabList>
+            </Tabs>
+            <Box w="full">
+              <Collapse in={searchDisclosure.isOpen} style={COLLAPSE_STYLES}>
+                <Box w="full" pt={2}>
+                  <GallerySearch />
+                </Box>
+              </Collapse>
+            </Box>
+            <GalleryImageGrid />
+            <GalleryPagination />
+          </Flex>
         </Panel>
       </PanelGroup>
     </Flex>

invokeai/frontend/web/src/features/gallery/components/ImageGrid/GalleryPagination.tsx

@@ -3,8 +3,6 @@ import { ELLIPSIS, useGalleryPagination } from 'features/gallery/hooks/useGaller
 import { useCallback } from 'react';
 import { PiCaretLeftBold, PiCaretRightBold } from 'react-icons/pi';
 
-import { JumpTo } from './JumpTo';
-
 export const GalleryPagination = () => {
   const { goPrev, goNext, isPrevEnabled, isNextEnabled, pageButtons, goToPage, currentPage, total } =
     useGalleryPagination();
@@ -22,7 +20,7 @@ export const GalleryPagination = () => {
   }
 
   return (
-    <Flex justifyContent="center" alignItems="center" w="full" gap={1} pt={2}>
+    <Flex gap={2} alignItems="center" w="full">
       <IconButton
         size="sm"
         aria-label="prev"
@@ -32,9 +30,25 @@ export const GalleryPagination = () => {
         variant="ghost"
       />
       <Spacer />
-      {pageButtons.map((page, i) => (
-        <PageButton key={`${page}_${i}`} page={page} currentPage={currentPage} goToPage={goToPage} />
-      ))}
+      {pageButtons.map((page, i) => {
+        if (page === ELLIPSIS) {
+          return (
+            <Button size="sm" key={`ellipsis_${i}`} variant="link" isDisabled>
+              ...
+            </Button>
+          );
+        }
+        return (
+          <Button
+            size="sm"
+            key={page}
+            onClick={goToPage.bind(null, page - 1)}
+            variant={currentPage === page - 1 ? 'solid' : 'outline'}
+          >
+            {page}
+          </Button>
+        );
+      })}
       <Spacer />
       <IconButton
         size="sm"
@@ -44,28 +58,6 @@ export const GalleryPagination = () => {
         isDisabled={!isNextEnabled}
         variant="ghost"
       />
-      <JumpTo />
     </Flex>
   );
 };
-
-type PageButtonProps = {
-  page: number | typeof ELLIPSIS;
-  currentPage: number;
-  goToPage: (page: number) => void;
-};
-
-const PageButton = ({ page, currentPage, goToPage }: PageButtonProps) => {
-  if (page === ELLIPSIS) {
-    return (
-      <Button size="sm" variant="link" isDisabled>
-        ...
-      </Button>
-    );
-  }
-  return (
-    <Button size="sm" onClick={goToPage.bind(null, page - 1)} variant={currentPage === page - 1 ? 'solid' : 'outline'}>
-      {page}
-    </Button>
-  );
-};

invokeai/frontend/web/src/features/gallery/components/ImageGrid/GallerySearch.tsx

@@ -1,60 +1,59 @@
 import { IconButton, Input, InputGroup, InputRightElement, Spinner } from '@invoke-ai/ui-library';
-import { useAppSelector } from 'app/store/storeHooks';
+import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
 import { selectListImagesQueryArgs } from 'features/gallery/store/gallerySelectors';
-import type { ChangeEvent, KeyboardEvent } from 'react';
-import { useCallback } from 'react';
+import { searchTermChanged } from 'features/gallery/store/gallerySlice';
+import { debounce } from 'lodash-es';
+import type { ChangeEvent } from 'react';
+import { useCallback, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { PiXBold } from 'react-icons/pi';
 import { useListImagesQuery } from 'services/api/endpoints/images';
 
-type Props = {
-  searchTerm: string;
-  onChangeSearchTerm: (value: string) => void;
-  onResetSearchTerm: () => void;
-};
-
-export const GallerySearch = ({ searchTerm, onChangeSearchTerm, onResetSearchTerm }: Props) => {
+export const GallerySearch = () => {
+  const dispatch = useAppDispatch();
+  const searchTerm = useAppSelector((s) => s.gallery.searchTerm);
   const { t } = useTranslation();
+  const [searchTermInput, setSearchTermInput] = useState(searchTerm);
   const queryArgs = useAppSelector(selectListImagesQueryArgs);
   const { isPending } = useListImagesQuery(queryArgs, {
     selectFromResult: ({ isLoading, isFetching }) => ({ isPending: isLoading || isFetching }),
   });
+  const debouncedSetSearchTerm = useMemo(() => {
+    return debounce((value: string) => {
+      dispatch(searchTermChanged(value));
+    }, 1000);
+  }, [dispatch]);
 
   const handleChangeInput = useCallback(
     (e: ChangeEvent<HTMLInputElement>) => {
-      onChangeSearchTerm(e.target.value);
+      setSearchTermInput(e.target.value);
+      debouncedSetSearchTerm(e.target.value);
     },
-    [onChangeSearchTerm]
+    [debouncedSetSearchTerm]
   );
 
-  const handleKeydown = useCallback(
-    (e: KeyboardEvent<HTMLInputElement>) => {
-      // exit search mode on escape
-      if (e.key === 'Escape') {
-        onResetSearchTerm();
-      }
-    },
-    [onResetSearchTerm]
-  );
+  const handleClearInput = useCallback(() => {
+    setSearchTermInput('');
+    dispatch(searchTermChanged(''));
+  }, [dispatch]);
 
   return (
     <InputGroup>
       <Input
         placeholder={t('gallery.searchImages')}
-        value={searchTerm}
+        value={searchTermInput}
         onChange={handleChangeInput}
         data-testid="image-search-input"
-        onKeyDown={handleKeydown}
       />
       {isPending && (
         <InputRightElement h="full" pe={2}>
           <Spinner size="sm" opacity={0.5} />
         </InputRightElement>
       )}
-      {!isPending && searchTerm.length && (
+      {!isPending && searchTermInput.length && (
         <InputRightElement h="full" pe={2}>
           <IconButton
-            onClick={onResetSearchTerm}
+            onClick={handleClearInput}
             size="sm"
             variant="link"
             aria-label={t('boards.clearSearch')}

invokeai/frontend/web/src/features/gallery/components/ImageGrid/JumpTo.tsx

@@ -1,97 +0,0 @@
-import {
-  Button,
-  CompositeNumberInput,
-  Flex,
-  FormControl,
-  Popover,
-  PopoverArrow,
-  PopoverBody,
-  PopoverContent,
-  PopoverTrigger,
-  useDisclosure,
-} from '@invoke-ai/ui-library';
-import { useGalleryPagination } from 'features/gallery/hooks/useGalleryPagination';
-import { useCallback, useEffect, useRef, useState } from 'react';
-import { useHotkeys } from 'react-hotkeys-hook';
-import { useTranslation } from 'react-i18next';
-
-export const JumpTo = () => {
-  const { t } = useTranslation();
-  const { goToPage, currentPage, pages } = useGalleryPagination();
-  const [newPage, setNewPage] = useState(currentPage);
-  const { isOpen, onToggle, onClose } = useDisclosure();
-  const ref = useRef<HTMLInputElement>(null);
-
-  const onOpen = useCallback(() => {
-    setNewPage(currentPage);
-    setTimeout(() => {
-      const input = ref.current?.querySelector('input');
-      input?.focus();
-      input?.select();
-    }, 0);
-  }, [currentPage]);
-
-  const onChangeJumpTo = useCallback((v: number) => {
-    setNewPage(v - 1);
-  }, []);
-
-  const onClickGo = useCallback(() => {
-    goToPage(newPage);
-    onClose();
-  }, [newPage, goToPage, onClose]);
-
-  useHotkeys(
-    'enter',
-    () => {
-      onClickGo();
-    },
-    { enabled: isOpen, enableOnFormTags: ['input'] },
-    [isOpen, onClickGo]
-  );
-
-  useHotkeys(
-    'esc',
-    () => {
-      setNewPage(currentPage);
-      onClose();
-    },
-    { enabled: isOpen, enableOnFormTags: ['input'] },
-    [isOpen, onClose]
-  );
-
-  useEffect(() => {
-    setNewPage(currentPage);
-  }, [currentPage]);
-
-  return (
-    <Popover isOpen={isOpen} onClose={onClose} onOpen={onOpen}>
-      <PopoverTrigger>
-        <Button aria-label={t('gallery.jump')} size="sm" onClick={onToggle} variant="outline">
-          {t('gallery.jump')}
-        </Button>
-      </PopoverTrigger>
-      <PopoverContent>
-        <PopoverArrow />
-        <PopoverBody>
-          <Flex gap={2} alignItems="center">
-            <FormControl>
-              <CompositeNumberInput
-                ref={ref}
-                size="sm"
-                maxW="60px"
-                value={newPage + 1}
-                min={1}
-                max={pages}
-                step={1}
-                onChange={onChangeJumpTo}
-              />
-            </FormControl>
-            <Button h="full" size="sm" onClick={onClickGo}>
-              {t('gallery.go')}
-            </Button>
-          </Flex>
-        </PopoverBody>
-      </PopoverContent>
-    </Popover>
-  );
-};

invokeai/frontend/web/src/features/gallery/components/ImageGrid/useGallerySearchTerm.ts

@@ -1,37 +0,0 @@
-import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
-import { useAssertSingleton } from 'common/hooks/useAssertSingleton';
-import { searchTermChanged } from 'features/gallery/store/gallerySlice';
-import { debounce } from 'lodash-es';
-import { useCallback, useMemo, useState } from 'react';
-
-export const useGallerySearchTerm = () => {
-  // Highlander!
-  useAssertSingleton('gallery-search-state');
-
-  const dispatch = useAppDispatch();
-  const searchTerm = useAppSelector((s) => s.gallery.searchTerm);
-
-  const [localSearchTerm, setLocalSearchTerm] = useState(searchTerm);
-
-  const debouncedSetSearchTerm = useMemo(() => {
-    return debounce((val: string) => {
-      dispatch(searchTermChanged(val));
-    }, 1000);
-  }, [dispatch]);
-
-  const onChange = useCallback(
-    (val: string) => {
-      setLocalSearchTerm(val);
-      debouncedSetSearchTerm(val);
-    },
-    [debouncedSetSearchTerm]
-  );
-
-  const onReset = useCallback(() => {
-    debouncedSetSearchTerm.cancel();
-    setLocalSearchTerm('');
-    dispatch(searchTermChanged(''));
-  }, [debouncedSetSearchTerm, dispatch]);
-
-  return [localSearchTerm, onChange, onReset] as const;
-};

invokeai/frontend/web/src/features/gallery/components/ImageViewer/CurrentImageButtons.tsx

@@ -2,7 +2,7 @@ import { ButtonGroup, IconButton, Menu, MenuButton, MenuList } from '@invoke-ai/
 import { useStore } from '@nanostores/react';
 import { createSelector } from '@reduxjs/toolkit';
 import { skipToken } from '@reduxjs/toolkit/query';
-import { adHocPostProcessingRequested } from 'app/store/middleware/listenerMiddleware/listeners/addAdHocPostProcessingRequestedListener';
+import { upscaleRequested } from 'app/store/middleware/listenerMiddleware/listeners/upscaleRequested';
 import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
 import { iiLayerAdded } from 'features/controlLayers/store/controlLayersSlice';
 import { DeleteImageButton } from 'features/deleteImageModal/components/DeleteImageButton';
@@ -14,7 +14,7 @@ import { selectLastSelectedImage } from 'features/gallery/store/gallerySelectors
 import { selectGallerySlice } from 'features/gallery/store/gallerySlice';
 import { parseAndRecallImageDimensions } from 'features/metadata/util/handlers';
 import { $templates } from 'features/nodes/store/nodesSlice';
-import { PostProcessingPopover } from 'features/parameters/components/PostProcessing/PostProcessingPopover';
+import ParamUpscalePopover from 'features/parameters/components/Upscale/ParamUpscaleSettings';
 import { useIsQueueMutationInProgress } from 'features/queue/hooks/useIsQueueMutationInProgress';
 import { useFeatureStatus } from 'features/system/hooks/useFeatureStatus';
 import { selectSystemSlice } from 'features/system/store/systemSlice';
@@ -97,7 +97,7 @@ const CurrentImageButtons = () => {
     if (!imageDTO) {
       return;
     }
-    dispatch(adHocPostProcessingRequested({ imageDTO }));
+    dispatch(upscaleRequested({ imageDTO }));
   }, [dispatch, imageDTO]);
 
   const handleDelete = useCallback(() => {
@@ -193,7 +193,7 @@ const CurrentImageButtons = () => {
 
       {isUpscalingEnabled && (
         <ButtonGroup isDisabled={isQueueMutationInProgress}>
-          {isUpscalingEnabled && <PostProcessingPopover imageDTO={imageDTO} />}
+          {isUpscalingEnabled && <ParamUpscalePopover imageDTO={imageDTO} />}
         </ButtonGroup>
       )}
 

invokeai/frontend/web/src/features/gallery/components/ImageViewer/ViewerToolbar.tsx

@@ -9,13 +9,7 @@ import CurrentImageButtons from './CurrentImageButtons';
 import { ViewerToggleMenu } from './ViewerToggleMenu';
 
 export const ViewerToolbar = memo(() => {
-  const showToggle = useAppSelector((s) => {
-    const tab = activeTabNameSelector(s);
-    if (tab === 'upscaling' || tab === 'workflows') {
-      return false;
-    }
-    return true;
-  });
+  const tab = useAppSelector(activeTabNameSelector);
   return (
     <Flex w="full" gap={2}>
       <Flex flex={1} justifyContent="center">
@@ -29,7 +23,7 @@ export const ViewerToolbar = memo(() => {
       </Flex>
       <Flex flex={1} justifyContent="center">
         <Flex gap={2} marginInlineStart="auto">
-          {showToggle && <ViewerToggleMenu />}
+          {tab !== 'workflows' && <ViewerToggleMenu />}
         </Flex>
       </Flex>
     </Flex>

invokeai/frontend/web/src/features/gallery/hooks/useGalleryPagination.ts

@@ -1,7 +1,6 @@
 import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
 import { selectListImagesQueryArgs } from 'features/gallery/store/gallerySelectors';
 import { offsetChanged } from 'features/gallery/store/gallerySlice';
-import { throttle } from 'lodash-es';
 import { useCallback, useEffect, useMemo } from 'react';
 import { useListImagesQuery } from 'services/api/endpoints/images';
 
@@ -81,41 +80,32 @@ export const useGalleryPagination = () => {
     return offset > 0;
   }, [count, offset]);
 
-  const onOffsetChanged = useCallback(
-    (arg: Parameters<typeof offsetChanged>[0]) => {
-      dispatch(offsetChanged(arg));
-    },
-    [dispatch]
-  );
-
-  const throttledOnOffsetChanged = useMemo(() => throttle(onOffsetChanged, 500), [onOffsetChanged]);
-
   const goNext = useCallback(
     (withHotkey?: 'arrow' | 'alt+arrow') => {
-      throttledOnOffsetChanged({ offset: offset + (limit || 0), withHotkey });
+      dispatch(offsetChanged({ offset: offset + (limit || 0), withHotkey }));
     },
-    [throttledOnOffsetChanged, offset, limit]
+    [dispatch, offset, limit]
   );
 
   const goPrev = useCallback(
     (withHotkey?: 'arrow' | 'alt+arrow') => {
-      throttledOnOffsetChanged({ offset: Math.max(offset - (limit || 0), 0), withHotkey });
+      dispatch(offsetChanged({ offset: Math.max(offset - (limit || 0), 0), withHotkey }));
     },
-    [throttledOnOffsetChanged, offset, limit]
+    [dispatch, offset, limit]
   );
 
   const goToPage = useCallback(
     (page: number) => {
-      throttledOnOffsetChanged({ offset: page * (limit || 0) });
+      dispatch(offsetChanged({ offset: page * (limit || 0) }));
     },
-    [throttledOnOffsetChanged, limit]
+    [dispatch, limit]
   );
   const goToFirst = useCallback(() => {
-    throttledOnOffsetChanged({ offset: 0 });
-  }, [throttledOnOffsetChanged]);
+    dispatch(offsetChanged({ offset: 0 }));
+  }, [dispatch]);
   const goToLast = useCallback(() => {
-    throttledOnOffsetChanged({ offset: (pages - 1) * (limit || 0) });
-  }, [throttledOnOffsetChanged, pages, limit]);
+    dispatch(offsetChanged({ offset: (pages - 1) * (limit || 0) }));
+  }, [dispatch, pages, limit]);
 
   // handle when total/pages decrease and user is on high page number (ie bulk removing or deleting)
   useEffect(() => {

invokeai/frontend/web/src/features/modelManagerV2/hooks/useControlNetOrT2IAdapterDefaultSettings.ts

@@ -1,10 +1,15 @@
+import { skipToken } from '@reduxjs/toolkit/query';
 import { isNil } from 'lodash-es';
 import { useMemo } from 'react';
-import type { ControlNetModelConfig, T2IAdapterModelConfig } from 'services/api/types';
+import { useGetModelConfigWithTypeGuard } from 'services/api/hooks/useGetModelConfigWithTypeGuard';
+import { isControlNetOrT2IAdapterModelConfig } from 'services/api/types';
+
+export const useControlNetOrT2IAdapterDefaultSettings = (modelKey?: string | null) => {
+  const { modelConfig, isLoading } = useGetModelConfigWithTypeGuard(
+    modelKey ?? skipToken,
+    isControlNetOrT2IAdapterModelConfig
+  );
 
-export const useControlNetOrT2IAdapterDefaultSettings = (
-  modelConfig: ControlNetModelConfig | T2IAdapterModelConfig
-) => {
   const defaultSettingsDefaults = useMemo(() => {
     return {
       preprocessor: {
@@ -14,5 +19,5 @@ export const useControlNetOrT2IAdapterDefaultSettings = (
     };
   }, [modelConfig?.default_settings]);
 
-  return defaultSettingsDefaults;
+  return { defaultSettingsDefaults, isLoading };
 };

invokeai/frontend/web/src/features/modelManagerV2/hooks/useInstallModel.ts

@@ -1,9 +1,11 @@
 import { toast } from 'features/toast/toast';
 import { useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
-import { type InstallModelArg, useInstallModelMutation } from 'services/api/endpoints/models';
+import { useInstallModelMutation } from 'services/api/endpoints/models';
 
-type InstallModelArgWithCallbacks = InstallModelArg & {
+type InstallModelArg = {
+  source: string;
+  inplace?: boolean;
   onSuccess?: () => void;
   onError?: (error: unknown) => void;
 };
@@ -13,9 +15,8 @@ export const useInstallModel = () => {
   const [_installModel, request] = useInstallModelMutation();
 
   const installModel = useCallback(
-    ({ source, inplace, config, onSuccess, onError }: InstallModelArgWithCallbacks) => {
-      config ||= {};
-      _installModel({ source, inplace, config })
+    ({ source, inplace, onSuccess, onError }: InstallModelArg) => {
+      _installModel({ source, inplace })
         .unwrap()
         .then((_) => {
           if (onSuccess) {

invokeai/frontend/web/src/features/modelManagerV2/hooks/useMainModelDefaultSettings.ts

@@ -1,9 +1,12 @@
+import { skipToken } from '@reduxjs/toolkit/query';
 import { createMemoizedSelector } from 'app/store/createMemoizedSelector';
 import { useAppSelector } from 'app/store/storeHooks';
+import { getOptimalDimension } from 'features/parameters/util/optimalDimension';
 import { selectConfigSlice } from 'features/system/store/configSlice';
 import { isNil } from 'lodash-es';
 import { useMemo } from 'react';
-import type { MainModelConfig } from 'services/api/types';
+import { useGetModelConfigWithTypeGuard } from 'services/api/hooks/useGetModelConfigWithTypeGuard';
+import { isNonRefinerMainModelConfig } from 'services/api/types';
 
 const initialStatesSelector = createMemoizedSelector(selectConfigSlice, (config) => {
   const { steps, guidance, scheduler, cfgRescaleMultiplier, vaePrecision, width, height } = config.sd;
@@ -19,7 +22,9 @@ const initialStatesSelector = createMemoizedSelector(selectConfigSlice, (config)
   };
 });
 
-export const useMainModelDefaultSettings = (modelConfig: MainModelConfig) => {
+export const useMainModelDefaultSettings = (modelKey?: string | null) => {
+  const { modelConfig, isLoading } = useGetModelConfigWithTypeGuard(modelKey ?? skipToken, isNonRefinerMainModelConfig);
+
   const {
     initialSteps,
     initialCfg,
@@ -76,5 +81,5 @@ export const useMainModelDefaultSettings = (modelConfig: MainModelConfig) => {
     initialHeight,
   ]);
 
-  return defaultSettingsDefaults;
+  return { defaultSettingsDefaults, isLoading, optimalDimension: getOptimalDimension(modelConfig) };
 };

invokeai/frontend/web/src/features/modelManagerV2/hooks/useStarterModelsToast.tsx

@@ -1,6 +1,5 @@
 import { Button, Text, useToast } from '@invoke-ai/ui-library';
 import { useAppDispatch } from 'app/store/storeHooks';
-import { $installModelsTab } from 'features/modelManagerV2/subpanels/InstallModels';
 import { useFeatureStatus } from 'features/system/hooks/useFeatureStatus';
 import { setActiveTab } from 'features/ui/store/uiSlice';
 import { useCallback, useEffect, useState } from 'react';
@@ -45,7 +44,6 @@ const ToastDescription = () => {
 
   const onClick = useCallback(() => {
     dispatch(setActiveTab('models'));
-    $installModelsTab.set(3);
     toast.close(TOAST_ID);
   }, [dispatch, toast]);
 

invokeai/frontend/web/src/features/modelManagerV2/store/modelManagerV2Slice.ts

@@ -1,6 +1,6 @@
 import type { PayloadAction } from '@reduxjs/toolkit';
 import { createSlice } from '@reduxjs/toolkit';
-import type { PersistConfig, RootState } from 'app/store/store';
+import type { PersistConfig } from 'app/store/store';
 import type { ModelType } from 'services/api/types';
 
 export type FilterableModelType = Exclude<ModelType, 'onnx' | 'clip_vision'> | 'refiner';
@@ -50,8 +50,6 @@ export const modelManagerV2Slice = createSlice({
 export const { setSelectedModelKey, setSearchTerm, setFilteredModelType, setSelectedModelMode, setScanPath } =
   modelManagerV2Slice.actions;
 
-export const selectModelManagerV2Slice = (state: RootState) => state.modelmanagerV2;
-
 /* eslint-disable-next-line @typescript-eslint/no-explicit-any */
 const migrateModelManagerState = (state: any): any => {
   if (!('_version' in state)) {

invokeai/frontend/web/src/features/modelManagerV2/subpanels/AddModelPanel/HuggingFaceFolder/HuggingFaceForm.tsx

@@ -1,13 +1,13 @@
 import { Button, Flex, FormControl, FormErrorMessage, FormHelperText, FormLabel, Input } from '@invoke-ai/ui-library';
 import { useInstallModel } from 'features/modelManagerV2/hooks/useInstallModel';
 import type { ChangeEventHandler } from 'react';
-import { memo, useCallback, useState } from 'react';
+import { useCallback, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useLazyGetHuggingFaceModelsQuery } from 'services/api/endpoints/models';
 
 import { HuggingFaceResults } from './HuggingFaceResults';
 
-export const HuggingFaceForm = memo(() => {
+export const HuggingFaceForm = () => {
   const [huggingFaceRepo, setHuggingFaceRepo] = useState('');
   const [displayResults, setDisplayResults] = useState(false);
   const [errorMessage, setErrorMessage] = useState('');
@@ -66,6 +66,4 @@ export const HuggingFaceForm = memo(() => {
       {data && data.urls && displayResults && <HuggingFaceResults results={data.urls} />}
     </Flex>
   );
-});
-
-HuggingFaceForm.displayName = 'HuggingFaceForm';
+};

invokeai/frontend/web/src/features/modelManagerV2/subpanels/AddModelPanel/HuggingFaceFolder/HuggingFaceResultItem.tsx

@@ -1,13 +1,13 @@
 import { Flex, IconButton, Text } from '@invoke-ai/ui-library';
 import { useInstallModel } from 'features/modelManagerV2/hooks/useInstallModel';
-import { memo, useCallback } from 'react';
+import { useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 import { PiPlusBold } from 'react-icons/pi';
 
 type Props = {
   result: string;
 };
-export const HuggingFaceResultItem = memo(({ result }: Props) => {
+export const HuggingFaceResultItem = ({ result }: Props) => {
   const { t } = useTranslation();
 
   const [installModel] = useInstallModel();
@@ -27,6 +27,4 @@ export const HuggingFaceResultItem = memo(({ result }: Props) => {
       <IconButton aria-label={t('modelManager.install')} icon={<PiPlusBold />} onClick={onClick} size="sm" />
     </Flex>
   );
-});
-
-HuggingFaceResultItem.displayName = 'HuggingFaceResultItem';
+};

invokeai/frontend/web/src/features/modelManagerV2/subpanels/AddModelPanel/HuggingFaceFolder/HuggingFaceResults.tsx

@@ -11,7 +11,7 @@ import {
 import ScrollableContent from 'common/components/OverlayScrollbars/ScrollableContent';
 import { useInstallModel } from 'features/modelManagerV2/hooks/useInstallModel';
 import type { ChangeEventHandler } from 'react';
-import { memo, useCallback, useMemo, useState } from 'react';
+import { useCallback, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { PiXBold } from 'react-icons/pi';
 
@@ -21,7 +21,7 @@ type HuggingFaceResultsProps = {
   results: string[];
 };
 
-export const HuggingFaceResults = memo(({ results }: HuggingFaceResultsProps) => {
+export const HuggingFaceResults = ({ results }: HuggingFaceResultsProps) => {
   const { t } = useTranslation();
   const [searchTerm, setSearchTerm] = useState('');
 
@@ -93,6 +93,4 @@ export const HuggingFaceResults = memo(({ results }: HuggingFaceResultsProps) =>
       </Flex>
     </>
   );
-});
-
-HuggingFaceResults.displayName = 'HuggingFaceResults';
+};

invokeai/frontend/web/src/features/modelManagerV2/subpanels/AddModelPanel/InstallModelForm.tsx

@@ -1,7 +1,7 @@
 import { Button, Checkbox, Flex, FormControl, FormHelperText, FormLabel, Input } from '@invoke-ai/ui-library';
 import { useInstallModel } from 'features/modelManagerV2/hooks/useInstallModel';
 import { t } from 'i18next';
-import { memo, useCallback } from 'react';
+import { useCallback } from 'react';
 import type { SubmitHandler } from 'react-hook-form';
 import { useForm } from 'react-hook-form';
 
@@ -10,7 +10,7 @@ type SimpleImportModelConfig = {
   inplace: boolean;
 };
 
-export const InstallModelForm = memo(() => {
+export const InstallModelForm = () => {
   const [installModel, { isLoading }] = useInstallModel();
 
   const { register, handleSubmit, formState, reset } = useForm<SimpleImportModelConfig>({
@@ -74,6 +74,4 @@ export const InstallModelForm = memo(() => {
       </Flex>
     </form>
   );
-});
-
-InstallModelForm.displayName = 'InstallModelForm';
+};

invokeai/frontend/web/src/features/modelManagerV2/subpanels/AddModelPanel/ModelInstallQueue/ModelInstallQueue.tsx

@@ -2,12 +2,12 @@ import { Box, Button, Flex, Heading } from '@invoke-ai/ui-library';
 import ScrollableContent from 'common/components/OverlayScrollbars/ScrollableContent';
 import { toast } from 'features/toast/toast';
 import { t } from 'i18next';
-import { memo, useCallback, useMemo } from 'react';
+import { useCallback, useMemo } from 'react';
 import { useListModelInstallsQuery, usePruneCompletedModelInstallsMutation } from 'services/api/endpoints/models';
 
 import { ModelInstallQueueItem } from './ModelInstallQueueItem';
 
-export const ModelInstallQueue = memo(() => {
+export const ModelInstallQueue = () => {
   const { data } = useListModelInstallsQuery();
 
   const [_pruneCompletedModelInstalls] = usePruneCompletedModelInstallsMutation();
@@ -61,6 +61,4 @@ export const ModelInstallQueue = memo(() => {
       </Box>
     </Flex>
   );
-});
-
-ModelInstallQueue.displayName = 'ModelInstallQueue';
+};

invokeai/frontend/web/src/features/modelManagerV2/subpanels/AddModelPanel/ModelInstallQueue/ModelInstallQueueItem.tsx

@@ -2,7 +2,7 @@ import { Flex, IconButton, Progress, Text, Tooltip } from '@invoke-ai/ui-library
 import { toast } from 'features/toast/toast';
 import { t } from 'i18next';
 import { isNil } from 'lodash-es';
-import { memo, useCallback, useMemo } from 'react';
+import { useCallback, useMemo } from 'react';
 import { PiXBold } from 'react-icons/pi';
 import { useCancelModelInstallMutation } from 'services/api/endpoints/models';
 import type { ModelInstallJob } from 'services/api/types';
@@ -25,7 +25,7 @@ const formatBytes = (bytes: number) => {
   return `${bytes.toFixed(2)} ${units[i]}`;
 };
 
-export const ModelInstallQueueItem = memo((props: ModelListItemProps) => {
+export const ModelInstallQueueItem = (props: ModelListItemProps) => {
   const { installJob } = props;
 
   const [deleteImportModel] = useCancelModelInstallMutation();
@@ -124,9 +124,7 @@ export const ModelInstallQueueItem = memo((props: ModelListItemProps) => {
       />
     </Flex>
   );
-});
-
-ModelInstallQueueItem.displayName = 'ModelInstallQueueItem';
+};
 
 type TooltipLabelProps = {
   installJob: ModelInstallJob;
@@ -134,7 +132,7 @@ type TooltipLabelProps = {
   source: string;
 };
 
-const TooltipLabel = memo(({ name, source, installJob }: TooltipLabelProps) => {
+const TooltipLabel = ({ name, source, installJob }: TooltipLabelProps) => {
   const progressString = useMemo(() => {
     if (installJob.status !== 'downloading' || installJob.bytes === undefined || installJob.total_bytes === undefined) {
       return '';
@@ -158,6 +156,4 @@ const TooltipLabel = memo(({ name, source, installJob }: TooltipLabelProps) => {
       )}
     </>
   );
-});
-
-TooltipLabel.displayName = 'TooltipLabel';
+};

invokeai/frontend/web/src/features/modelManagerV2/subpanels/AddModelPanel/ScanFolder/ScanFolderForm.tsx

@@ -2,13 +2,13 @@ import { Button, Flex, FormControl, FormErrorMessage, FormHelperText, FormLabel,
 import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
 import { setScanPath } from 'features/modelManagerV2/store/modelManagerV2Slice';
 import type { ChangeEventHandler } from 'react';
-import { memo, useCallback, useState } from 'react';
+import { useCallback, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useLazyScanFolderQuery } from 'services/api/endpoints/models';
 
 import { ScanModelsResults } from './ScanFolderResults';
 
-export const ScanModelsForm = memo(() => {
+export const ScanModelsForm = () => {
   const scanPath = useAppSelector((state) => state.modelmanagerV2.scanPath);
   const dispatch = useAppDispatch();
   const [errorMessage, setErrorMessage] = useState('');
@@ -56,6 +56,4 @@ export const ScanModelsForm = memo(() => {
       {data && <ScanModelsResults results={data} />}
     </Flex>
   );
-});
-
-ScanModelsForm.displayName = 'ScanModelsForm';
+};

invokeai/frontend/web/src/features/modelManagerV2/subpanels/AddModelPanel/ScanFolder/ScanFolderResultItem.tsx

@@ -1,5 +1,5 @@
 import { Badge, Box, Flex, IconButton, Text } from '@invoke-ai/ui-library';
-import { memo, useCallback } from 'react';
+import { useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 import { PiPlusBold } from 'react-icons/pi';
 import type { ScanFolderResponse } from 'services/api/endpoints/models';
@@ -8,7 +8,7 @@ type Props = {
   result: ScanFolderResponse[number];
   installModel: (source: string) => void;
 };
-export const ScanModelResultItem = memo(({ result, installModel }: Props) => {
+export const ScanModelResultItem = ({ result, installModel }: Props) => {
   const { t } = useTranslation();
 
   const handleInstall = useCallback(() => {
@@ -30,6 +30,4 @@ export const ScanModelResultItem = memo(({ result, installModel }: Props) => {
       </Box>
     </Flex>
   );
-});
-
-ScanModelResultItem.displayName = 'ScanModelResultItem';
+};

invokeai/frontend/web/src/features/modelManagerV2/subpanels/AddModelPanel/ScanFolder/ScanFolderResults.tsx

@@ -14,7 +14,7 @@ import {
 import ScrollableContent from 'common/components/OverlayScrollbars/ScrollableContent';
 import { useInstallModel } from 'features/modelManagerV2/hooks/useInstallModel';
 import type { ChangeEvent, ChangeEventHandler } from 'react';
-import { memo, useCallback, useMemo, useState } from 'react';
+import { useCallback, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { PiXBold } from 'react-icons/pi';
 import type { ScanFolderResponse } from 'services/api/endpoints/models';
@@ -25,7 +25,7 @@ type ScanModelResultsProps = {
   results: ScanFolderResponse;
 };
 
-export const ScanModelsResults = memo(({ results }: ScanModelResultsProps) => {
+export const ScanModelsResults = ({ results }: ScanModelResultsProps) => {
   const { t } = useTranslation();
   const [searchTerm, setSearchTerm] = useState('');
   const [inplace, setInplace] = useState(true);
@@ -116,6 +116,4 @@ export const ScanModelsResults = memo(({ results }: ScanModelResultsProps) => {
       </Flex>
     </>
   );
-});
-
-ScanModelsResults.displayName = 'ScanModelsResults';
+};

invokeai/frontend/web/src/features/modelManagerV2/subpanels/AddModelPanel/StarterModels/StartModelsResultItem.tsx

@@ -1,7 +1,7 @@
 import { Badge, Box, Flex, IconButton, Text } from '@invoke-ai/ui-library';
 import { useInstallModel } from 'features/modelManagerV2/hooks/useInstallModel';
 import ModelBaseBadge from 'features/modelManagerV2/subpanels/ModelManagerPanel/ModelBaseBadge';
-import { memo, useCallback, useMemo } from 'react';
+import { useCallback, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { PiPlusBold } from 'react-icons/pi';
 import type { GetStarterModelsResponse } from 'services/api/endpoints/models';
@@ -9,22 +9,20 @@ import type { GetStarterModelsResponse } from 'services/api/endpoints/models';
 type Props = {
   result: GetStarterModelsResponse[number];
 };
-export const StarterModelsResultItem = memo(({ result }: Props) => {
+export const StarterModelsResultItem = ({ result }: Props) => {
   const { t } = useTranslation();
   const allSources = useMemo(() => {
-    const _allSources = [{ source: result.source, config: { name: result.name, description: result.description } }];
+    const _allSources = [result.source];
     if (result.dependencies) {
-      for (const d of result.dependencies) {
-        _allSources.push({ source: d.source, config: { name: d.name, description: d.description } });
-      }
+      _allSources.push(...result.dependencies.map((d) => d.source));
     }
     return _allSources;
   }, [result]);
   const [installModel] = useInstallModel();
 
   const onClick = useCallback(() => {
-    for (const { config, source } of allSources) {
-      installModel({ config, source });
+    for (const source of allSources) {
+      installModel({ source });
     }
   }, [allSources, installModel]);
 
@@ -32,7 +30,7 @@ export const StarterModelsResultItem = memo(({ result }: Props) => {
     <Flex alignItems="center" justifyContent="space-between" w="100%" gap={3}>
       <Flex fontSize="sm" flexDir="column">
         <Flex gap={3}>
-          <Badge h="min-content">{result.type.replaceAll('_', ' ')}</Badge>
+          <Badge h="min-content">{result.type.replace('_', ' ')}</Badge>
           <ModelBaseBadge base={result.base} />
           <Text fontWeight="semibold">{result.name}</Text>
         </Flex>
@@ -47,6 +45,4 @@ export const StarterModelsResultItem = memo(({ result }: Props) => {
       </Box>
     </Flex>
   );
-});
-
-StarterModelsResultItem.displayName = 'StarterModelsResultItem';
+};

invokeai/frontend/web/src/features/modelManagerV2/subpanels/AddModelPanel/StarterModels/StarterModelsForm.tsx

@@ -1,11 +1,10 @@
 import { Flex } from '@invoke-ai/ui-library';
 import { FetchingModelsLoader } from 'features/modelManagerV2/subpanels/ModelManagerPanel/FetchingModelsLoader';
-import { memo } from 'react';
 import { useGetStarterModelsQuery } from 'services/api/endpoints/models';
 
 import { StarterModelsResults } from './StarterModelsResults';
 
-export const StarterModelsForm = memo(() => {
+export const StarterModelsForm = () => {
   const { isLoading, data } = useGetStarterModelsQuery();
 
   return (
@@ -14,6 +13,4 @@ export const StarterModelsForm = memo(() => {
       {data && <StarterModelsResults results={data} />}
     </Flex>
   );
-});
-
-StarterModelsForm.displayName = 'StarterModelsForm';
+};

invokeai/frontend/web/src/features/modelManagerV2/subpanels/AddModelPanel/StarterModels/StarterModelsResults.tsx

@@ -1,7 +1,7 @@
 import { Flex, IconButton, Input, InputGroup, InputRightElement } from '@invoke-ai/ui-library';
 import ScrollableContent from 'common/components/OverlayScrollbars/ScrollableContent';
 import type { ChangeEventHandler } from 'react';
-import { memo, useCallback, useMemo, useState } from 'react';
+import { useCallback, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { PiXBold } from 'react-icons/pi';
 import type { GetStarterModelsResponse } from 'services/api/endpoints/models';
@@ -12,30 +12,20 @@ type StarterModelsResultsProps = {
   results: NonNullable<GetStarterModelsResponse>;
 };
 
-export const StarterModelsResults = memo(({ results }: StarterModelsResultsProps) => {
+export const StarterModelsResults = ({ results }: StarterModelsResultsProps) => {
   const { t } = useTranslation();
   const [searchTerm, setSearchTerm] = useState('');
 
   const filteredResults = useMemo(() => {
     return results.filter((result) => {
-      const trimmedSearchTerm = searchTerm.trim().toLowerCase();
-      const matchStrings = [
-        result.name.toLowerCase(),
-        result.type.toLowerCase().replaceAll('_', ' '),
-        result.description.toLowerCase(),
-      ];
-      if (result.type === 'spandrel_image_to_image') {
-        matchStrings.push('upscale');
-        matchStrings.push('post-processing');
-        matchStrings.push('postprocessing');
-        matchStrings.push('post processing');
-      }
-      return matchStrings.some((matchString) => matchString.includes(trimmedSearchTerm));
+      const name = result.name.toLowerCase();
+      const type = result.type.toLowerCase();
+      return name.includes(searchTerm.toLowerCase()) || type.includes(searchTerm.toLowerCase());
     });
   }, [results, searchTerm]);
 
   const handleSearch: ChangeEventHandler<HTMLInputElement> = useCallback((e) => {
-    setSearchTerm(e.target.value);
+    setSearchTerm(e.target.value.trim());
   }, []);
 
   const clearSearch = useCallback(() => {
@@ -79,6 +69,4 @@ export const StarterModelsResults = memo(({ results }: StarterModelsResultsProps
       </Flex>
     </Flex>
   );
-});
-
-StarterModelsResults.displayName = 'StarterModelsResults';
+};

invokeai/frontend/web/src/features/modelManagerV2/subpanels/InstallModels.tsx

@@ -1,28 +1,28 @@
 import { Box, Flex, Heading, Tab, TabList, TabPanel, TabPanels, Tabs } from '@invoke-ai/ui-library';
-import { useStore } from '@nanostores/react';
 import { StarterModelsForm } from 'features/modelManagerV2/subpanels/AddModelPanel/StarterModels/StarterModelsForm';
-import { atom } from 'nanostores';
-import { memo, useCallback } from 'react';
+import { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
+import { useMainModels } from 'services/api/hooks/modelsByType';
 
 import { HuggingFaceForm } from './AddModelPanel/HuggingFaceFolder/HuggingFaceForm';
 import { InstallModelForm } from './AddModelPanel/InstallModelForm';
 import { ModelInstallQueue } from './AddModelPanel/ModelInstallQueue/ModelInstallQueue';
 import { ScanModelsForm } from './AddModelPanel/ScanFolder/ScanFolderForm';
 
-export const $installModelsTab = atom(0);
-
-export const InstallModels = memo(() => {
+export const InstallModels = () => {
   const { t } = useTranslation();
-  const index = useStore($installModelsTab);
-  const onChange = useCallback((index: number) => {
-    $installModelsTab.set(index);
-  }, []);
+  const [mainModels, { data }] = useMainModels();
+  const defaultIndex = useMemo(() => {
+    if (data && mainModels.length) {
+      return 0;
+    }
+    return 3;
+  }, [data, mainModels.length]);
 
   return (
     <Flex layerStyle="first" borderRadius="base" w="full" h="full" flexDir="column" gap={4}>
       <Heading fontSize="xl">{t('modelManager.addModel')}</Heading>
-      <Tabs variant="collapse" height="50%" display="flex" flexDir="column" index={index} onChange={onChange}>
+      <Tabs variant="collapse" height="50%" display="flex" flexDir="column" defaultIndex={defaultIndex}>
         <TabList>
           <Tab>{t('modelManager.urlOrLocalPath')}</Tab>
           <Tab>{t('modelManager.huggingFace')}</Tab>
@@ -49,6 +49,4 @@ export const InstallModels = memo(() => {
       </Box>
     </Flex>
   );
-});
-
-InstallModels.displayName = 'InstallModels';
+};

invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelManager.tsx

@@ -1,14 +1,14 @@
 import { Button, Flex, Heading } from '@invoke-ai/ui-library';
 import { useAppDispatch } from 'app/store/storeHooks';
 import { setSelectedModelKey } from 'features/modelManagerV2/store/modelManagerV2Slice';
-import { memo, useCallback } from 'react';
+import { useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 import { PiPlusBold } from 'react-icons/pi';
 
 import ModelList from './ModelManagerPanel/ModelList';
 import { ModelListNavigation } from './ModelManagerPanel/ModelListNavigation';
 
-export const ModelManager = memo(() => {
+export const ModelManager = () => {
   const { t } = useTranslation();
   const dispatch = useAppDispatch();
   const handleClickAddModel = useCallback(() => {
@@ -29,6 +29,4 @@ export const ModelManager = memo(() => {
       </Flex>
     </Flex>
   );
-});
-
-ModelManager.displayName = 'ModelManager';
+};

invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelManagerPanel/ModelList.tsx

@@ -21,8 +21,7 @@ import { FetchingModelsLoader } from './FetchingModelsLoader';
 import { ModelListWrapper } from './ModelListWrapper';
 
 const ModelList = () => {
-  const filteredModelType = useAppSelector((s) => s.modelmanagerV2.filteredModelType);
-  const searchTerm = useAppSelector((s) => s.modelmanagerV2.searchTerm);
+  const { searchTerm, filteredModelType } = useAppSelector((s) => s.modelmanagerV2);
   const { t } = useTranslation();
 
   const [mainModels, { isLoading: isLoadingMainModels }] = useMainModels();

invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelManagerPanel/ModelListItem.tsx

@@ -1,8 +1,7 @@
 import type { SystemStyleObject } from '@invoke-ai/ui-library';
 import { ConfirmationAlertDialog, Flex, IconButton, Spacer, Text, useDisclosure } from '@invoke-ai/ui-library';
-import { createSelector } from '@reduxjs/toolkit';
 import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
-import { selectModelManagerV2Slice, setSelectedModelKey } from 'features/modelManagerV2/store/modelManagerV2Slice';
+import { setSelectedModelKey } from 'features/modelManagerV2/store/modelManagerV2Slice';
 import ModelBaseBadge from 'features/modelManagerV2/subpanels/ModelManagerPanel/ModelBaseBadge';
 import ModelFormatBadge from 'features/modelManagerV2/subpanels/ModelManagerPanel/ModelFormatBadge';
 import { toast } from 'features/toast/toast';
@@ -24,21 +23,15 @@ const sx: SystemStyleObject = {
   "&[aria-selected='true']": { bg: 'base.700' },
 };
 
-const ModelListItem = ({ model }: ModelListItemProps) => {
+const ModelListItem = (props: ModelListItemProps) => {
   const { t } = useTranslation();
   const dispatch = useAppDispatch();
-  const selectIsSelected = useMemo(
-    () =>
-      createSelector(
-        selectModelManagerV2Slice,
-        (modelManagerV2Slice) => modelManagerV2Slice.selectedModelKey === model.key
-      ),
-    [model.key]
-  );
-  const isSelected = useAppSelector(selectIsSelected);
+  const selectedModelKey = useAppSelector((s) => s.modelmanagerV2.selectedModelKey);
   const [deleteModel] = useDeleteModelsMutation();
   const { isOpen, onOpen, onClose } = useDisclosure();
 
+  const { model } = props;
+
   const handleSelectModel = useCallback(() => {
     dispatch(setSelectedModelKey(model.key));
   }, [model.key, dispatch]);
@@ -50,6 +43,11 @@ const ModelListItem = ({ model }: ModelListItemProps) => {
     },
     [onOpen]
   );
+
+  const isSelected = useMemo(() => {
+    return selectedModelKey === model.key;
+  }, [selectedModelKey, model.key]);
+
   const handleModelDelete = useCallback(() => {
     deleteModel({ key: model.key })
       .unwrap()

invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelManagerPanel/ModelListNavigation.tsx

@@ -3,12 +3,12 @@ import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
 import { setSearchTerm } from 'features/modelManagerV2/store/modelManagerV2Slice';
 import { t } from 'i18next';
 import type { ChangeEventHandler } from 'react';
-import { memo, useCallback } from 'react';
+import { useCallback } from 'react';
 import { PiXBold } from 'react-icons/pi';
 
 import { ModelTypeFilter } from './ModelTypeFilter';
 
-export const ModelListNavigation = memo(() => {
+export const ModelListNavigation = () => {
   const dispatch = useAppDispatch();
   const searchTerm = useAppSelector((s) => s.modelmanagerV2.searchTerm);
 
@@ -49,6 +49,4 @@ export const ModelListNavigation = memo(() => {
       </InputGroup>
     </Flex>
   );
-});
-
-ModelListNavigation.displayName = 'ModelListNavigation';
+};

invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelManagerPanel/ModelListWrapper.tsx

@@ -1,5 +1,4 @@
 import { StickyScrollable } from 'features/system/components/StickyScrollable';
-import { memo } from 'react';
 import type { AnyModelConfig } from 'services/api/types';
 
 import ModelListItem from './ModelListItem';
@@ -9,7 +8,7 @@ type ModelListWrapperProps = {
   modelList: AnyModelConfig[];
 };
 
-export const ModelListWrapper = memo((props: ModelListWrapperProps) => {
+export const ModelListWrapper = (props: ModelListWrapperProps) => {
   const { title, modelList } = props;
   return (
     <StickyScrollable title={title} contentSx={{ gap: 1, p: 2 }}>
@@ -18,6 +17,4 @@ export const ModelListWrapper = memo((props: ModelListWrapperProps) => {
       ))}
     </StickyScrollable>
   );
-});
-
-ModelListWrapper.displayName = 'ModelListWrapper';
+};

invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelManagerPanel/ModelTypeFilter.tsx

@@ -2,12 +2,12 @@ import { Button, Menu, MenuButton, MenuItem, MenuList } from '@invoke-ai/ui-libr
 import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
 import type { FilterableModelType } from 'features/modelManagerV2/store/modelManagerV2Slice';
 import { setFilteredModelType } from 'features/modelManagerV2/store/modelManagerV2Slice';
-import { memo, useCallback, useMemo } from 'react';
+import { useCallback, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { PiFunnelBold } from 'react-icons/pi';
 import { objectKeys } from 'tsafe';
 
-export const ModelTypeFilter = memo(() => {
+export const ModelTypeFilter = () => {
   const { t } = useTranslation();
   const dispatch = useAppDispatch();
   const MODEL_TYPE_LABELS: Record<FilterableModelType, string> = useMemo(
@@ -57,6 +57,4 @@ export const ModelTypeFilter = memo(() => {
       </MenuList>
     </Menu>
   );
-});
-
-ModelTypeFilter.displayName = 'ModelTypeFilter';
+};

invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPane.tsx

@@ -1,17 +1,14 @@
 import { Box } from '@invoke-ai/ui-library';
 import { useAppSelector } from 'app/store/storeHooks';
-import { memo } from 'react';
 
 import { InstallModels } from './InstallModels';
 import { Model } from './ModelPanel/Model';
 
-export const ModelPane = memo(() => {
+export const ModelPane = () => {
   const selectedModelKey = useAppSelector((s) => s.modelmanagerV2.selectedModelKey);
   return (
     <Box layerStyle="first" p={4} borderRadius="base" w="50%" h="full">
       {selectedModelKey ? <Model key={selectedModelKey} /> : <InstallModels />}
     </Box>
   );
-});
-
-ModelPane.displayName = 'ModelPane';
+};

invokeai/frontend/web/src/features/modelManagerV2/subpanels/ModelPanel/ControlNetOrT2IAdapterDefaultSettings/ControlNetOrT2IAdapterDefaultSettings.tsx

@@ -1,28 +1,26 @@
-import { Button, Flex, Heading, SimpleGrid } from '@invoke-ai/ui-library';
+import { Button, Flex, Heading, SimpleGrid, Text } from '@invoke-ai/ui-library';
+import { useAppSelector } from 'app/store/storeHooks';
 import { useControlNetOrT2IAdapterDefaultSettings } from 'features/modelManagerV2/hooks/useControlNetOrT2IAdapterDefaultSettings';
 import { DefaultPreprocessor } from 'features/modelManagerV2/subpanels/ModelPanel/ControlNetOrT2IAdapterDefaultSettings/DefaultPreprocessor';
 import type { FormField } from 'features/modelManagerV2/subpanels/ModelPanel/MainModelDefaultSettings/MainModelDefaultSettings';
 import { toast } from 'features/toast/toast';
-import { memo, useCallback } from 'react';
+import { useCallback } from 'react';
 import type { SubmitHandler } from 'react-hook-form';
 import { useForm } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import { PiCheckBold } from 'react-icons/pi';
 import { useUpdateModelMutation } from 'services/api/endpoints/models';
-import type { ControlNetModelConfig, T2IAdapterModelConfig } from 'services/api/types';
 
 export type ControlNetOrT2IAdapterDefaultSettingsFormData = {
   preprocessor: FormField<string>;
 };
 
-type Props = {
-  modelConfig: ControlNetModelConfig | T2IAdapterModelConfig;
-};
-
-export const ControlNetOrT2IAdapterDefaultSettings = memo(({ modelConfig }: Props) => {
+export const ControlNetOrT2IAdapterDefaultSettings = () => {
+  const selectedModelKey = useAppSelector((s) => s.modelmanagerV2.selectedModelKey);
   const { t } = useTranslation();
 
-  const defaultSettingsDefaults = useControlNetOrT2IAdapterDefaultSettings(modelConfig);
+  const { defaultSettingsDefaults, isLoading: isLoadingDefaultSettings } =
+    useControlNetOrT2IAdapterDefaultSettings(selectedModelKey);
 
   const [updateModel, { isLoading: isLoadingUpdateModel }] = useUpdateModelMutation();
 
@@ -32,12 +30,16 @@ export const ControlNetOrT2IAdapterDefaultSettings = memo(({ modelConfig }: Prop
 
   const onSubmit = useCallback<SubmitHandler<ControlNetOrT2IAdapterDefaultSettingsFormData>>(
     (data) => {
+      if (!selectedModelKey) {
+        return;
+      }
+
       const body = {
         preprocessor: data.preprocessor.isEnabled ? data.preprocessor.value : null,
       };
 
       updateModel({
-        key: modelConfig.key,
+        key: selectedModelKey,
         body: { default_settings: body },
       })
         .unwrap()
@@ -59,9 +61,13 @@ export const ControlNetOrT2IAdapterDefaultSettings = memo(({ modelConfig }: Prop
           }
         });
     },
-    [updateModel, modelConfig.key, t, reset]
+    [selectedModelKey, reset, updateModel, t]
   );
 
+  if (isLoadingDefaultSettings) {
+    return <Text>{t('common.loading')}</Text>;
+  }
+
   return (
     <>
       <Flex gap="4" justifyContent="space-between" w="full" pb={4}>
@@ -83,6 +89,4 @@ export const ControlNetOrT2IAdapterDefaultSettings = memo(({ modelConfig }: Prop
       </SimpleGrid>
     </>
   );
-});
-
-ControlNetOrT2IAdapterDefaultSettings.displayName = 'ControlNetOrT2IAdapterDefaultSettings';
+};