chore(ui): lint

When the invocation cache is used, we might skip all progress images. This can prevent auto-switch-on-first-progress from working, as we don't get any of those events.

It's much easier to only support auto-switch on complete.

.gitignore

@@ -180,7 +180,6 @@ cython_debug/
 # Scratch folder
 .scratch/
 .vscode/
-.zed/
 
 # source installer files
 installer/*zip

docs/contributing/frontend/workflows.md

@@ -297,7 +297,7 @@ Migration logic is in [migrations.ts].
 <!-- links -->
 
 [pydantic]: https://github.com/pydantic/pydantic 'pydantic'
-[zod]: https://github.com/colinhacks/zod 'zod/v4'
+[zod]: https://github.com/colinhacks/zod 'zod'
 [openapi-types]: https://github.com/kogosoftwarellc/open-api/tree/main/packages/openapi-types 'openapi-types'
 [reactflow]: https://github.com/xyflow/xyflow 'reactflow'
 [reactflow-concepts]: https://reactflow.dev/learn/concepts/terms-and-definitions

invokeai/app/api/routers/board_images.py

@@ -1,12 +1,21 @@
 from fastapi import Body, HTTPException
 from fastapi.routing import APIRouter
+from pydantic import BaseModel, Field
 
 from invokeai.app.api.dependencies import ApiDependencies
-from invokeai.app.services.images.images_common import AddImagesToBoardResult, RemoveImagesFromBoardResult
 
 board_images_router = APIRouter(prefix="/v1/board_images", tags=["boards"])
 
 
+class AddImagesToBoardResult(BaseModel):
+    board_id: str = Field(description="The id of the board the images were added to")
+    added_image_names: list[str] = Field(description="The image names that were added to the board")
+
+
+class RemoveImagesFromBoardResult(BaseModel):
+    removed_image_names: list[str] = Field(description="The image names that were removed from their board")
+
+
 @board_images_router.post(
     "/",
     operation_id="add_image_to_board",
@@ -14,26 +23,17 @@ board_images_router = APIRouter(prefix="/v1/board_images", tags=["boards"])
         201: {"description": "The image was added to a board successfully"},
     },
     status_code=201,
-    response_model=AddImagesToBoardResult,
 )
 async def add_image_to_board(
     board_id: str = Body(description="The id of the board to add to"),
     image_name: str = Body(description="The name of the image to add"),
-) -> AddImagesToBoardResult:
+):
     """Creates a board_image"""
     try:
-        added_images: set[str] = set()
-        affected_boards: set[str] = set()
-        old_board_id = ApiDependencies.invoker.services.images.get_dto(image_name).board_id or "none"
-        ApiDependencies.invoker.services.board_images.add_image_to_board(board_id=board_id, image_name=image_name)
-        added_images.add(image_name)
-        affected_boards.add(board_id)
-        affected_boards.add(old_board_id)
-
-        return AddImagesToBoardResult(
-            added_images=list(added_images),
-            affected_boards=list(affected_boards),
+        result = ApiDependencies.invoker.services.board_images.add_image_to_board(
+            board_id=board_id, image_name=image_name
         )
+        return result
     except Exception:
         raise HTTPException(status_code=500, detail="Failed to add image to board")
 
@@ -45,25 +45,14 @@ async def add_image_to_board(
         201: {"description": "The image was removed from the board successfully"},
     },
     status_code=201,
-    response_model=RemoveImagesFromBoardResult,
 )
 async def remove_image_from_board(
     image_name: str = Body(description="The name of the image to remove", embed=True),
-) -> RemoveImagesFromBoardResult:
+):
     """Removes an image from its board, if it had one"""
     try:
-        removed_images: set[str] = set()
-        affected_boards: set[str] = set()
-        old_board_id = ApiDependencies.invoker.services.images.get_dto(image_name).board_id or "none"
-        ApiDependencies.invoker.services.board_images.remove_image_from_board(image_name=image_name)
-        removed_images.add(image_name)
-        affected_boards.add("none")
-        affected_boards.add(old_board_id)
-        return RemoveImagesFromBoardResult(
-            removed_images=list(removed_images),
-            affected_boards=list(affected_boards),
-        )
-
+        result = ApiDependencies.invoker.services.board_images.remove_image_from_board(image_name=image_name)
+        return result
     except Exception:
         raise HTTPException(status_code=500, detail="Failed to remove image from board")
 
@@ -83,25 +72,16 @@ async def add_images_to_board(
 ) -> AddImagesToBoardResult:
     """Adds a list of images to a board"""
     try:
-        added_images: set[str] = set()
-        affected_boards: set[str] = set()
+        added_image_names: list[str] = []
         for image_name in image_names:
             try:
-                old_board_id = ApiDependencies.invoker.services.images.get_dto(image_name).board_id or "none"
                 ApiDependencies.invoker.services.board_images.add_image_to_board(
-                    board_id=board_id,
-                    image_name=image_name,
+                    board_id=board_id, image_name=image_name
                 )
-                added_images.add(image_name)
-                affected_boards.add(board_id)
-                affected_boards.add(old_board_id)
-
+                added_image_names.append(image_name)
             except Exception:
                 pass
-        return AddImagesToBoardResult(
-            added_images=list(added_images),
-            affected_boards=list(affected_boards),
-        )
+        return AddImagesToBoardResult(board_id=board_id, added_image_names=added_image_names)
     except Exception:
         raise HTTPException(status_code=500, detail="Failed to add images to board")
 
@@ -120,20 +100,13 @@ async def remove_images_from_board(
 ) -> RemoveImagesFromBoardResult:
     """Removes a list of images from their board, if they had one"""
     try:
-        removed_images: set[str] = set()
-        affected_boards: set[str] = set()
+        removed_image_names: list[str] = []
         for image_name in image_names:
             try:
-                old_board_id = ApiDependencies.invoker.services.images.get_dto(image_name).board_id or "none"
                 ApiDependencies.invoker.services.board_images.remove_image_from_board(image_name=image_name)
-                removed_images.add(image_name)
-                affected_boards.add("none")
-                affected_boards.add(old_board_id)
+                removed_image_names.append(image_name)
             except Exception:
                 pass
-        return RemoveImagesFromBoardResult(
-            removed_images=list(removed_images),
-            affected_boards=list(affected_boards),
-        )
+        return RemoveImagesFromBoardResult(removed_image_names=removed_image_names)
     except Exception:
         raise HTTPException(status_code=500, detail="Failed to remove images from board")

invokeai/app/api/routers/images.py

@@ -14,17 +14,10 @@ from invokeai.app.api.extract_metadata_from_image import extract_metadata_from_i
 from invokeai.app.invocations.fields import MetadataField
 from invokeai.app.services.image_records.image_records_common import (
     ImageCategory,
-    ImageNamesResult,
     ImageRecordChanges,
     ResourceOrigin,
 )
-from invokeai.app.services.images.images_common import (
-    DeleteImagesResult,
-    ImageDTO,
-    ImageUrlsDTO,
-    StarredImagesResult,
-    UnstarredImagesResult,
-)
+from invokeai.app.services.images.images_common import ImageDTO, ImageUrlsDTO
 from invokeai.app.services.shared.pagination import OffsetPaginatedResults
 from invokeai.app.services.shared.sqlite.sqlite_common import SQLiteDirection
 from invokeai.app.util.controlnet_utils import heuristic_resize_fast
@@ -160,30 +153,18 @@ async def create_image_upload_entry(
     raise HTTPException(status_code=501, detail="Not implemented")
 
 
-@images_router.delete("/i/{image_name}", operation_id="delete_image", response_model=DeleteImagesResult)
+@images_router.delete("/i/{image_name}", operation_id="delete_image")
 async def delete_image(
     image_name: str = Path(description="The name of the image to delete"),
-) -> DeleteImagesResult:
+) -> None:
     """Deletes an image"""
 
-    deleted_images: set[str] = set()
-    affected_boards: set[str] = set()
-
     try:
-        image_dto = ApiDependencies.invoker.services.images.get_dto(image_name)
-        board_id = image_dto.board_id or "none"
         ApiDependencies.invoker.services.images.delete(image_name)
-        deleted_images.add(image_name)
-        affected_boards.add(board_id)
     except Exception:
         # TODO: Does this need any exception handling at all?
         pass
 
-    return DeleteImagesResult(
-        deleted_images=list(deleted_images),
-        affected_boards=list(affected_boards),
-    )
-
 
 @images_router.delete("/intermediates", operation_id="clear_intermediates")
 async def clear_intermediates() -> int:
@@ -395,32 +376,31 @@ async def list_image_dtos(
     return image_dtos
 
 
-@images_router.post("/delete", operation_id="delete_images_from_list", response_model=DeleteImagesResult)
+class DeleteImagesFromListResult(BaseModel):
+    deleted_images: list[str]
+
+
+@images_router.post("/delete", operation_id="delete_images_from_list", response_model=DeleteImagesFromListResult)
 async def delete_images_from_list(
     image_names: list[str] = Body(description="The list of names of images to delete", embed=True),
-) -> DeleteImagesResult:
+) -> DeleteImagesFromListResult:
     try:
-        deleted_images: set[str] = set()
-        affected_boards: set[str] = set()
+        deleted_images: list[str] = []
         for image_name in image_names:
             try:
-                image_dto = ApiDependencies.invoker.services.images.get_dto(image_name)
-                board_id = image_dto.board_id or "none"
                 ApiDependencies.invoker.services.images.delete(image_name)
-                deleted_images.add(image_name)
-                affected_boards.add(board_id)
+                deleted_images.append(image_name)
             except Exception:
                 pass
-        return DeleteImagesResult(
-            deleted_images=list(deleted_images),
-            affected_boards=list(affected_boards),
-        )
+        return DeleteImagesFromListResult(deleted_images=deleted_images)
     except Exception:
         raise HTTPException(status_code=500, detail="Failed to delete images")
 
 
-@images_router.delete("/uncategorized", operation_id="delete_uncategorized_images", response_model=DeleteImagesResult)
-async def delete_uncategorized_images() -> DeleteImagesResult:
+@images_router.delete(
+    "/uncategorized", operation_id="delete_uncategorized_images", response_model=DeleteImagesFromListResult
+)
+async def delete_uncategorized_images() -> DeleteImagesFromListResult:
     """Deletes all images that are uncategorized"""
 
     image_names = ApiDependencies.invoker.services.board_images.get_all_board_image_names_for_board(
@@ -428,19 +408,14 @@ async def delete_uncategorized_images() -> DeleteImagesResult:
     )
 
     try:
-        deleted_images: set[str] = set()
-        affected_boards: set[str] = set()
+        deleted_images: list[str] = []
         for image_name in image_names:
             try:
                 ApiDependencies.invoker.services.images.delete(image_name)
-                deleted_images.add(image_name)
-                affected_boards.add("none")
+                deleted_images.append(image_name)
             except Exception:
                 pass
-        return DeleteImagesResult(
-            deleted_images=list(deleted_images),
-            affected_boards=list(affected_boards),
-        )
+        return DeleteImagesFromListResult(deleted_images=deleted_images)
     except Exception:
         raise HTTPException(status_code=500, detail="Failed to delete images")
 
@@ -449,50 +424,36 @@ class ImagesUpdatedFromListResult(BaseModel):
     updated_image_names: list[str] = Field(description="The image names that were updated")
 
 
-@images_router.post("/star", operation_id="star_images_in_list", response_model=StarredImagesResult)
+@images_router.post("/star", operation_id="star_images_in_list", response_model=ImagesUpdatedFromListResult)
 async def star_images_in_list(
     image_names: list[str] = Body(description="The list of names of images to star", embed=True),
-) -> StarredImagesResult:
+) -> ImagesUpdatedFromListResult:
     try:
-        starred_images: set[str] = set()
-        affected_boards: set[str] = set()
+        updated_image_names: list[str] = []
         for image_name in image_names:
             try:
-                updated_image_dto = ApiDependencies.invoker.services.images.update(
-                    image_name, changes=ImageRecordChanges(starred=True)
-                )
-                starred_images.add(image_name)
-                affected_boards.add(updated_image_dto.board_id or "none")
+                ApiDependencies.invoker.services.images.update(image_name, changes=ImageRecordChanges(starred=True))
+                updated_image_names.append(image_name)
             except Exception:
                 pass
-        return StarredImagesResult(
-            starred_images=list(starred_images),
-            affected_boards=list(affected_boards),
-        )
+        return ImagesUpdatedFromListResult(updated_image_names=updated_image_names)
     except Exception:
         raise HTTPException(status_code=500, detail="Failed to star images")
 
 
-@images_router.post("/unstar", operation_id="unstar_images_in_list", response_model=UnstarredImagesResult)
+@images_router.post("/unstar", operation_id="unstar_images_in_list", response_model=ImagesUpdatedFromListResult)
 async def unstar_images_in_list(
     image_names: list[str] = Body(description="The list of names of images to unstar", embed=True),
-) -> UnstarredImagesResult:
+) -> ImagesUpdatedFromListResult:
     try:
-        unstarred_images: set[str] = set()
-        affected_boards: set[str] = set()
+        updated_image_names: list[str] = []
         for image_name in image_names:
             try:
-                updated_image_dto = ApiDependencies.invoker.services.images.update(
-                    image_name, changes=ImageRecordChanges(starred=False)
-                )
-                unstarred_images.add(image_name)
-                affected_boards.add(updated_image_dto.board_id or "none")
+                ApiDependencies.invoker.services.images.update(image_name, changes=ImageRecordChanges(starred=False))
+                updated_image_names.append(image_name)
             except Exception:
                 pass
-        return UnstarredImagesResult(
-            unstarred_images=list(unstarred_images),
-            affected_boards=list(affected_boards),
-        )
+        return ImagesUpdatedFromListResult(updated_image_names=updated_image_names)
     except Exception:
         raise HTTPException(status_code=500, detail="Failed to unstar images")
 
@@ -563,61 +524,3 @@ async def get_bulk_download_item(
         return response
     except Exception:
         raise HTTPException(status_code=404)
-
-
-@images_router.get("/names", operation_id="get_image_names")
-async def get_image_names(
-    image_origin: Optional[ResourceOrigin] = Query(default=None, description="The origin of images to list."),
-    categories: Optional[list[ImageCategory]] = Query(default=None, description="The categories of image to include."),
-    is_intermediate: Optional[bool] = Query(default=None, description="Whether to list intermediate images."),
-    board_id: Optional[str] = Query(
-        default=None,
-        description="The board id to filter by. Use 'none' to find images without a board.",
-    ),
-    order_dir: SQLiteDirection = Query(default=SQLiteDirection.Descending, description="The order of sort"),
-    starred_first: bool = Query(default=True, description="Whether to sort by starred images first"),
-    search_term: Optional[str] = Query(default=None, description="The term to search for"),
-) -> ImageNamesResult:
-    """Gets ordered list of image names with metadata for optimistic updates"""
-
-    try:
-        result = ApiDependencies.invoker.services.images.get_image_names(
-            starred_first=starred_first,
-            order_dir=order_dir,
-            image_origin=image_origin,
-            categories=categories,
-            is_intermediate=is_intermediate,
-            board_id=board_id,
-            search_term=search_term,
-        )
-        return result
-    except Exception:
-        raise HTTPException(status_code=500, detail="Failed to get image names")
-
-
-@images_router.post(
-    "/images_by_names",
-    operation_id="get_images_by_names",
-    responses={200: {"model": list[ImageDTO]}},
-)
-async def get_images_by_names(
-    image_names: list[str] = Body(embed=True, description="Object containing list of image names to fetch DTOs for"),
-) -> list[ImageDTO]:
-    """Gets image DTOs for the specified image names. Maintains order of input names."""
-
-    try:
-        image_service = ApiDependencies.invoker.services.images
-
-        # Fetch DTOs preserving the order of requested names
-        image_dtos: list[ImageDTO] = []
-        for name in image_names:
-            try:
-                dto = image_service.get_dto(name)
-                image_dtos.append(dto)
-            except Exception:
-                # Skip missing images - they may have been deleted between name fetch and DTO fetch
-                continue
-
-        return image_dtos
-    except Exception:
-        raise HTTPException(status_code=500, detail="Failed to get image DTOs")

invokeai/app/api_app.py

@@ -158,7 +158,7 @@ web_root_path = Path(list(web_dir.__path__)[0])
 try:
     app.mount("/", NoCacheStaticFiles(directory=Path(web_root_path, "dist"), html=True), name="ui")
 except RuntimeError:
-    logger.warning(f"No UI found at {web_root_path}/dist, skipping UI mount")
+    logger.warn(f"No UI found at {web_root_path}/dist, skipping UI mount")
 app.mount(
     "/static", NoCacheStaticFiles(directory=Path(web_root_path, "static/")), name="static"
 )  # docs favicon is in here

invokeai/app/invocations/baseinvocation.py

@@ -499,7 +499,7 @@ def validate_fields(model_fields: dict[str, FieldInfo], model_type: str) -> None
 
         ui_type = field.json_schema_extra.get("ui_type", None)
         if isinstance(ui_type, str) and ui_type.startswith("DEPRECATED_"):
-            logger.warning(f'"UIType.{ui_type.split("_")[-1]}" is deprecated, ignoring')
+            logger.warn(f'"UIType.{ui_type.split("_")[-1]}" is deprecated, ignoring')
             field.json_schema_extra.pop("ui_type")
     return None
 
@@ -582,8 +582,6 @@ def invocation(
 
         fields: dict[str, tuple[Any, FieldInfo]] = {}
 
-        original_model_fields: dict[str, OriginalModelField] = {}
-
         for field_name, field_info in cls.model_fields.items():
             annotation = field_info.annotation
             assert annotation is not None, f"{field_name} on invocation {invocation_type} has no type annotation."
@@ -591,7 +589,7 @@ def invocation(
                 f"{field_name} on invocation {invocation_type} has a non-dict json_schema_extra, did you forget to use InputField?"
             )
 
-            original_model_fields[field_name] = OriginalModelField(annotation=annotation, field_info=field_info)
+            cls._original_model_fields[field_name] = OriginalModelField(annotation=annotation, field_info=field_info)
 
             validate_field_default(cls.__name__, field_name, invocation_type, annotation, field_info)
 
@@ -615,7 +613,7 @@ def invocation(
                 raise InvalidVersionError(f'Invalid version string for node "{invocation_type}": "{version}"') from e
             uiconfig["version"] = version
         else:
-            logger.warning(f'No version specified for node "{invocation_type}", using "1.0.0"')
+            logger.warn(f'No version specified for node "{invocation_type}", using "1.0.0"')
             uiconfig["version"] = "1.0.0"
 
         cls.UIConfig = UIConfigBase(**uiconfig)
@@ -678,7 +676,6 @@ def invocation(
         docstring = cls.__doc__
         new_class = create_model(cls.__qualname__, __base__=cls, __module__=cls.__module__, **fields)  # type: ignore
         new_class.__doc__ = docstring
-        new_class._original_model_fields = original_model_fields
 
         InvocationRegistry.register_invocation(new_class)
 

invokeai/app/invocations/compel.py

@@ -114,13 +114,6 @@ class CompelInvocation(BaseInvocation):
 
             c, _options = compel.build_conditioning_tensor_for_conjunction(conjunction)
 
-        del compel
-        del patched_tokenizer
-        del tokenizer
-        del ti_manager
-        del text_encoder
-        del text_encoder_info
-
         c = c.detach().to("cpu")
 
         conditioning_data = ConditioningFieldData(conditionings=[BasicConditioningInfo(embeds=c)])
@@ -229,10 +222,7 @@ class SDXLPromptInvocationBase:
             else:
                 c_pooled = None
 
-        del compel
-        del patched_tokenizer
         del tokenizer
-        del ti_manager
         del text_encoder
         del text_encoder_info
 

invokeai/app/invocations/fields.py

@@ -64,7 +64,6 @@ class UIType(str, Enum, metaclass=MetaEnum):
     Imagen3Model = "Imagen3ModelField"
     Imagen4Model = "Imagen4ModelField"
     ChatGPT4oModel = "ChatGPT4oModelField"
-    FluxKontextModel = "FluxKontextModelField"
     # endregion
 
     # region Misc Field Types
@@ -438,7 +437,7 @@ class WithWorkflow:
     workflow = None
 
     def __init_subclass__(cls) -> None:
-        logger.warning(
+        logger.warn(
             f"{cls.__module__.split('.')[0]}.{cls.__name__}: WithWorkflow is deprecated. Use `context.workflow` to access the workflow."
         )
         super().__init_subclass__()
@@ -579,7 +578,7 @@ def InputField(
 
     if default_factory is not _Unset and default_factory is not None:
         default = default_factory()
-        logger.warning('"default_factory" is not supported, calling it now to set "default"')
+        logger.warn('"default_factory" is not supported, calling it now to set "default"')
 
     # These are the args we may wish pass to the pydantic `Field()` function
     field_args = {

invokeai/app/services/config/config_default.py

@@ -24,6 +24,7 @@ from invokeai.frontend.cli.arg_parser import InvokeAIArgs
 INIT_FILE = Path("invokeai.yaml")
 DB_FILE = Path("invokeai.db")
 LEGACY_INIT_FILE = Path("invokeai.init")
+DEVICE = Literal["auto", "cpu", "cuda", "cuda:1", "mps"]
 PRECISION = Literal["auto", "float16", "bfloat16", "float32"]
 ATTENTION_TYPE = Literal["auto", "normal", "xformers", "sliced", "torch-sdp"]
 ATTENTION_SLICE_SIZE = Literal["auto", "balanced", "max", 1, 2, 3, 4, 5, 6, 7, 8]
@@ -92,7 +93,7 @@ class InvokeAIAppConfig(BaseSettings):
         vram: DEPRECATED: This setting is no longer used. It has been replaced by `max_cache_vram_gb`, but most users will not need to use this config since automatic cache size limits should work well in most cases. This config setting will be removed once the new model cache behavior is stable.
         lazy_offload: DEPRECATED: This setting is no longer used. Lazy-offloading is enabled by default. This config setting will be removed once the new model cache behavior is stable.
         pytorch_cuda_alloc_conf: Configure the Torch CUDA memory allocator. This will impact peak reserved VRAM usage and performance. Setting to "backend:cudaMallocAsync" works well on many systems. The optimal configuration is highly dependent on the system configuration (device type, VRAM, CUDA driver version, etc.), so must be tuned experimentally.
-        device: Preferred execution device. `auto` will choose the device depending on the hardware platform and the installed torch capabilities.<br>Valid values: `auto`, `cpu`, `cuda`, `mps`, `cuda:N` (where N is a device number)
+        device: Preferred execution device. `auto` will choose the device depending on the hardware platform and the installed torch capabilities.<br>Valid values: `auto`, `cpu`, `cuda`, `cuda:1`, `mps`
         precision: Floating point precision. `float16` will consume half the memory of `float32` but produce slightly lower-quality images. The `auto` setting will guess the proper precision based on your video card and operating system.<br>Valid values: `auto`, `float16`, `bfloat16`, `float32`
         sequential_guidance: Whether to calculate guidance in serial instead of in parallel, lowering memory requirements.
         attention_type: Attention type.<br>Valid values: `auto`, `normal`, `xformers`, `sliced`, `torch-sdp`
@@ -175,7 +176,7 @@ class InvokeAIAppConfig(BaseSettings):
     pytorch_cuda_alloc_conf: Optional[str] = Field(default=None,            description="Configure the Torch CUDA memory allocator. This will impact peak reserved VRAM usage and performance. Setting to \"backend:cudaMallocAsync\" works well on many systems. The optimal configuration is highly dependent on the system configuration (device type, VRAM, CUDA driver version, etc.), so must be tuned experimentally.")
 
     # DEVICE
-    device:                      str = Field(default="auto",                description="Preferred execution device. `auto` will choose the device depending on the hardware platform and the installed torch capabilities.<br>Valid values: `auto`, `cpu`, `cuda`, `mps`, `cuda:N` (where N is a device number)", pattern=r"^(auto|cpu|mps|cuda(:\d+)?)$")
+    device:                      DEVICE = Field(default="auto",             description="Preferred execution device. `auto` will choose the device depending on the hardware platform and the installed torch capabilities.")
     precision:                PRECISION = Field(default="auto",             description="Floating point precision. `float16` will consume half the memory of `float32` but produce slightly lower-quality images. The `auto` setting will guess the proper precision based on your video card and operating system.")
 
     # GENERATION

invokeai/app/services/image_records/image_records_base.py

@@ -5,7 +5,6 @@ from typing import Optional
 from invokeai.app.invocations.fields import MetadataField
 from invokeai.app.services.image_records.image_records_common import (
     ImageCategory,
-    ImageNamesResult,
     ImageRecord,
     ImageRecordChanges,
     ResourceOrigin,
@@ -98,17 +97,3 @@ class ImageRecordStorageBase(ABC):
     def get_most_recent_image_for_board(self, board_id: str) -> Optional[ImageRecord]:
         """Gets the most recent image for a board."""
         pass
-
-    @abstractmethod
-    def get_image_names(
-        self,
-        starred_first: bool = True,
-        order_dir: SQLiteDirection = SQLiteDirection.Descending,
-        image_origin: Optional[ResourceOrigin] = None,
-        categories: Optional[list[ImageCategory]] = None,
-        is_intermediate: Optional[bool] = None,
-        board_id: Optional[str] = None,
-        search_term: Optional[str] = None,
-    ) -> ImageNamesResult:
-        """Gets ordered list of image names with metadata for optimistic updates."""
-        pass

invokeai/app/services/image_records/image_records_common.py

@@ -3,7 +3,7 @@ import datetime
 from enum import Enum
 from typing import Optional, Union
 
-from pydantic import BaseModel, Field, StrictBool, StrictStr
+from pydantic import Field, StrictBool, StrictStr
 
 from invokeai.app.util.metaenum import MetaEnum
 from invokeai.app.util.misc import get_iso_timestamp
@@ -207,16 +207,3 @@ def deserialize_image_record(image_dict: dict) -> ImageRecord:
         starred=starred,
         has_workflow=has_workflow,
     )
-
-
-class ImageCollectionCounts(BaseModel):
-    starred_count: int = Field(description="The number of starred images in the collection.")
-    unstarred_count: int = Field(description="The number of unstarred images in the collection.")
-
-
-class ImageNamesResult(BaseModel):
-    """Response containing ordered image names with metadata for optimistic updates."""
-
-    image_names: list[str] = Field(description="Ordered list of image names")
-    starred_count: int = Field(description="Number of starred images (when starred_first=True)")
-    total_count: int = Field(description="Total number of images matching the query")

invokeai/app/services/image_records/image_records_sqlite.py

@@ -7,7 +7,6 @@ from invokeai.app.services.image_records.image_records_base import ImageRecordSt
 from invokeai.app.services.image_records.image_records_common import (
     IMAGE_DTO_COLS,
     ImageCategory,
-    ImageNamesResult,
     ImageRecord,
     ImageRecordChanges,
     ImageRecordDeleteException,
@@ -387,96 +386,3 @@ class SqliteImageRecordStorage(ImageRecordStorageBase):
             return None
 
         return deserialize_image_record(dict(result))
-
-    def get_image_names(
-        self,
-        starred_first: bool = True,
-        order_dir: SQLiteDirection = SQLiteDirection.Descending,
-        image_origin: Optional[ResourceOrigin] = None,
-        categories: Optional[list[ImageCategory]] = None,
-        is_intermediate: Optional[bool] = None,
-        board_id: Optional[str] = None,
-        search_term: Optional[str] = None,
-    ) -> ImageNamesResult:
-        cursor = self._conn.cursor()
-
-        # Build query conditions (reused for both starred count and image names queries)
-        query_conditions = ""
-        query_params: list[Union[int, str, bool]] = []
-
-        if image_origin is not None:
-            query_conditions += """--sql
-            AND images.image_origin = ?
-            """
-            query_params.append(image_origin.value)
-
-        if categories is not None:
-            category_strings = [c.value for c in set(categories)]
-            placeholders = ",".join("?" * len(category_strings))
-            query_conditions += f"""--sql
-            AND images.image_category IN ( {placeholders} )
-            """
-            for c in category_strings:
-                query_params.append(c)
-
-        if is_intermediate is not None:
-            query_conditions += """--sql
-            AND images.is_intermediate = ?
-            """
-            query_params.append(is_intermediate)
-
-        if board_id == "none":
-            query_conditions += """--sql
-            AND board_images.board_id IS NULL
-            """
-        elif board_id is not None:
-            query_conditions += """--sql
-            AND board_images.board_id = ?
-            """
-            query_params.append(board_id)
-
-        if search_term:
-            query_conditions += """--sql
-            AND (
-                images.metadata LIKE ?
-                OR images.created_at LIKE ?
-            )
-            """
-            query_params.append(f"%{search_term.lower()}%")
-            query_params.append(f"%{search_term.lower()}%")
-
-        # Get starred count if starred_first is enabled
-        starred_count = 0
-        if starred_first:
-            starred_count_query = f"""--sql
-            SELECT COUNT(*)
-            FROM images
-            LEFT JOIN board_images ON board_images.image_name = images.image_name
-            WHERE images.starred = TRUE AND (1=1{query_conditions})
-            """
-            cursor.execute(starred_count_query, query_params)
-            starred_count = cast(int, cursor.fetchone()[0])
-
-        # Get all image names with proper ordering
-        if starred_first:
-            names_query = f"""--sql
-            SELECT images.image_name
-            FROM images
-            LEFT JOIN board_images ON board_images.image_name = images.image_name
-            WHERE 1=1{query_conditions}
-            ORDER BY images.starred DESC, images.created_at {order_dir.value}
-            """
-        else:
-            names_query = f"""--sql
-            SELECT images.image_name
-            FROM images
-            LEFT JOIN board_images ON board_images.image_name = images.image_name
-            WHERE 1=1{query_conditions}
-            ORDER BY images.created_at {order_dir.value}
-            """
-
-        cursor.execute(names_query, query_params)
-        result = cast(list[sqlite3.Row], cursor.fetchall())
-        image_names = [row[0] for row in result]
-
-        return ImageNamesResult(image_names=image_names, starred_count=starred_count, total_count=len(image_names))

invokeai/app/services/images/images_base.py

@@ -6,7 +6,6 @@ from PIL.Image import Image as PILImageType
 from invokeai.app.invocations.fields import MetadataField
 from invokeai.app.services.image_records.image_records_common import (
     ImageCategory,
-    ImageNamesResult,
     ImageRecord,
     ImageRecordChanges,
     ResourceOrigin,
@@ -126,7 +125,7 @@ class ImageServiceABC(ABC):
         board_id: Optional[str] = None,
         search_term: Optional[str] = None,
     ) -> OffsetPaginatedResults[ImageDTO]:
-        """Gets a paginated list of image DTOs with starred images first when starred_first=True."""
+        """Gets a paginated list of image DTOs."""
         pass
 
     @abstractmethod
@@ -148,17 +147,3 @@ class ImageServiceABC(ABC):
     def delete_images_on_board(self, board_id: str):
         """Deletes all images on a board."""
         pass
-
-    @abstractmethod
-    def get_image_names(
-        self,
-        starred_first: bool = True,
-        order_dir: SQLiteDirection = SQLiteDirection.Descending,
-        image_origin: Optional[ResourceOrigin] = None,
-        categories: Optional[list[ImageCategory]] = None,
-        is_intermediate: Optional[bool] = None,
-        board_id: Optional[str] = None,
-        search_term: Optional[str] = None,
-    ) -> ImageNamesResult:
-        """Gets ordered list of image names with metadata for optimistic updates."""
-        pass

invokeai/app/services/images/images_common.py

@@ -1,6 +1,6 @@
 from typing import Optional
 
-from pydantic import BaseModel, Field
+from pydantic import Field
 
 from invokeai.app.services.image_records.image_records_common import ImageRecord
 from invokeai.app.util.model_exclude_null import BaseModelExcludeNull
@@ -39,27 +39,3 @@ def image_record_to_dto(
         thumbnail_url=thumbnail_url,
         board_id=board_id,
     )
-
-
-class ResultWithAffectedBoards(BaseModel):
-    affected_boards: list[str] = Field(description="The ids of boards affected by the delete operation")
-
-
-class DeleteImagesResult(ResultWithAffectedBoards):
-    deleted_images: list[str] = Field(description="The names of the images that were deleted")
-
-
-class StarredImagesResult(ResultWithAffectedBoards):
-    starred_images: list[str] = Field(description="The names of the images that were starred")
-
-
-class UnstarredImagesResult(ResultWithAffectedBoards):
-    unstarred_images: list[str] = Field(description="The names of the images that were unstarred")
-
-
-class AddImagesToBoardResult(ResultWithAffectedBoards):
-    added_images: list[str] = Field(description="The image names that were added to the board")
-
-
-class RemoveImagesFromBoardResult(ResultWithAffectedBoards):
-    removed_images: list[str] = Field(description="The image names that were removed from their board")

invokeai/app/services/images/images_default.py

@@ -10,7 +10,6 @@ from invokeai.app.services.image_files.image_files_common import (
 )
 from invokeai.app.services.image_records.image_records_common import (
     ImageCategory,
-    ImageNamesResult,
     ImageRecord,
     ImageRecordChanges,
     ImageRecordDeleteException,
@@ -79,7 +78,7 @@ class ImageService(ImageServiceABC):
                         board_id=board_id, image_name=image_name
                     )
                 except Exception as e:
-                    self.__invoker.services.logger.warning(f"Failed to add image to board {board_id}: {str(e)}")
+                    self.__invoker.services.logger.warn(f"Failed to add image to board {board_id}: {str(e)}")
             self.__invoker.services.image_files.save(
                 image_name=image_name, image=image, metadata=metadata, workflow=workflow, graph=graph
             )
@@ -310,27 +309,3 @@ class ImageService(ImageServiceABC):
         except Exception as e:
             self.__invoker.services.logger.error("Problem getting intermediates count")
             raise e
-
-    def get_image_names(
-        self,
-        starred_first: bool = True,
-        order_dir: SQLiteDirection = SQLiteDirection.Descending,
-        image_origin: Optional[ResourceOrigin] = None,
-        categories: Optional[list[ImageCategory]] = None,
-        is_intermediate: Optional[bool] = None,
-        board_id: Optional[str] = None,
-        search_term: Optional[str] = None,
-    ) -> ImageNamesResult:
-        try:
-            return self.__invoker.services.image_records.get_image_names(
-                starred_first=starred_first,
-                order_dir=order_dir,
-                image_origin=image_origin,
-                categories=categories,
-                is_intermediate=is_intermediate,
-                board_id=board_id,
-                search_term=search_term,
-            )
-        except Exception as e:
-            self.__invoker.services.logger.error("Problem getting image names")
-            raise e

invokeai/app/services/model_install/model_install_default.py

@@ -148,7 +148,7 @@ class ModelInstallService(ModelInstallServiceBase):
     def _clear_pending_jobs(self) -> None:
         for job in self.list_jobs():
             if not job.in_terminal_state:
-                self._logger.warning(f"Cancelling job {job.id}")
+                self._logger.warning("Cancelling job {job.id}")
                 self.cancel_job(job)
         while True:
             try:

invokeai/app/services/session_processor/session_processor_default.py

@@ -1,4 +1,3 @@
-import gc
 import traceback
 from contextlib import suppress
 from threading import BoundedSemaphore, Thread
@@ -440,12 +439,6 @@ class DefaultSessionProcessor(SessionProcessorBase):
                         poll_now_event.wait(self._polling_interval)
                         continue
 
-                    # GC-ing here can reduce peak memory usage of the invoke process by freeing allocated memory blocks.
-                    # Most queue items take seconds to execute, so the relative cost of a GC is very small.
-                    # Python will never cede allocated memory back to the OS, so anything we can do to reduce the peak
-                    # allocation is well worth it.
-                    gc.collect()
-
                     self._invoker.services.logger.info(
                         f"Executing queue item {self._queue_item.item_id}, session {self._queue_item.session_id}"
                     )

invokeai/app/services/session_queue/session_queue_common.py

@@ -205,7 +205,6 @@ class FieldIdentifier(BaseModel):
     kind: Literal["input", "output"] = Field(description="The kind of field")
     node_id: str = Field(description="The ID of the node")
     field_name: str = Field(description="The name of the field")
-    user_label: str | None = Field(description="The user label of the field, if any")
 
 
 class SessionQueueItem(BaseModel):

invokeai/app/services/session_queue/session_queue_sqlite.py

@@ -101,7 +101,11 @@ class SqliteSessionQueue(SessionQueueBase):
         return cast(Union[int, None], cursor.fetchone()[0]) or 0
 
     async def enqueue_batch(self, queue_id: str, batch: Batch, prepend: bool) -> EnqueueBatchResult:
+        return await asyncio.to_thread(self._enqueue_batch, queue_id, batch, prepend)
+
+    def _enqueue_batch(self, queue_id: str, batch: Batch, prepend: bool) -> EnqueueBatchResult:
         try:
+            cursor = self._conn.cursor()
             # TODO: how does this work in a multi-user scenario?
             current_queue_size = self._get_current_queue_size(queue_id)
             max_queue_size = self.__invoker.services.configuration.max_queue_size
@@ -111,12 +115,8 @@ class SqliteSessionQueue(SessionQueueBase):
             if prepend:
                 priority = self._get_highest_priority(queue_id) + 1
 
-            requested_count = await asyncio.to_thread(
-                calc_session_count,
-                batch=batch,
-            )
-            values_to_insert = await asyncio.to_thread(
-                prepare_values_to_insert,
+            requested_count = calc_session_count(batch)
+            values_to_insert = prepare_values_to_insert(
                 queue_id=queue_id,
                 batch=batch,
                 priority=priority,
@@ -124,16 +124,19 @@ class SqliteSessionQueue(SessionQueueBase):
             )
             enqueued_count = len(values_to_insert)
 
-            with self._conn:
-                cursor = self._conn.cursor()
-                cursor.executemany(
-                    """--sql
-                    INSERT INTO session_queue (queue_id, session, session_id, batch_id, field_values, priority, workflow, origin, destination, retried_from_item_id)
-                    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-                    """,
-                    values_to_insert,
-                )
+            if requested_count > enqueued_count:
+                values_to_insert = values_to_insert[:max_new_queue_items]
+
+            cursor.executemany(
+                """--sql
+                INSERT INTO session_queue (queue_id, session, session_id, batch_id, field_values, priority, workflow, origin, destination, retried_from_item_id)
+                VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+                """,
+                values_to_insert,
+            )
+            self._conn.commit()
         except Exception:
+            self._conn.rollback()
             raise
         enqueue_result = EnqueueBatchResult(
             queue_id=queue_id,

invokeai/backend/model_manager/config.py

@@ -37,7 +37,6 @@ from invokeai.app.util.misc import uuid_string
 from invokeai.backend.model_hash.hash_validator import validate_hash
 from invokeai.backend.model_hash.model_hash import HASHING_ALGORITHMS
 from invokeai.backend.model_manager.model_on_disk import ModelOnDisk
-from invokeai.backend.model_manager.omi import flux_dev_1_lora, stable_diffusion_xl_1_lora
 from invokeai.backend.model_manager.taxonomy import (
     AnyVariant,
     BaseModelType,
@@ -297,7 +296,7 @@ class LoRAConfigBase(ABC, BaseModel):
         from invokeai.backend.patches.lora_conversions.formats import flux_format_from_state_dict
 
         sd = mod.load_state_dict(mod.path)
-        value = flux_format_from_state_dict(sd, mod.metadata())
+        value = flux_format_from_state_dict(sd)
         mod.cache[key] = value
         return value
 
@@ -335,36 +334,6 @@ class T5EncoderBnbQuantizedLlmInt8bConfig(T5EncoderConfigBase, LegacyProbeMixin,
     format: Literal[ModelFormat.BnbQuantizedLlmInt8b] = ModelFormat.BnbQuantizedLlmInt8b
 
 
-class LoRAOmiConfig(LoRAConfigBase, ModelConfigBase):
-    format: Literal[ModelFormat.OMI] = ModelFormat.OMI
-
-    @classmethod
-    def matches(cls, mod: ModelOnDisk) -> bool:
-        if mod.path.is_dir():
-            return False
-
-        metadata = mod.metadata()
-        return (
-            metadata.get("modelspec.sai_model_spec")
-            and metadata.get("ot_branch") == "omi_format"
-            and metadata["modelspec.architecture"].split("/")[1].lower() == "lora"
-        )
-
-    @classmethod
-    def parse(cls, mod: ModelOnDisk) -> dict[str, Any]:
-        metadata = mod.metadata()
-        architecture = metadata["modelspec.architecture"]
-
-        if architecture == stable_diffusion_xl_1_lora:
-            base = BaseModelType.StableDiffusionXL
-        elif architecture == flux_dev_1_lora:
-            base = BaseModelType.Flux
-        else:
-            raise InvalidModelConfigException(f"Unrecognised/unsupported architecture for OMI LoRA: {architecture}")
-
-        return {"base": base}
-
-
 class LoRALyCORISConfig(LoRAConfigBase, ModelConfigBase):
     """Model config for LoRA/Lycoris models."""
 
@@ -381,7 +350,7 @@ class LoRALyCORISConfig(LoRAConfigBase, ModelConfigBase):
 
         state_dict = mod.load_state_dict()
         for key in state_dict.keys():
-            if isinstance(key, int):
+            if type(key) is int:
                 continue
 
             if key.startswith(("lora_te_", "lora_unet_", "lora_te1_", "lora_te2_", "lora_transformer_")):
@@ -699,7 +668,6 @@ AnyModelConfig = Annotated[
         Annotated[ControlNetDiffusersConfig, ControlNetDiffusersConfig.get_tag()],
         Annotated[ControlNetCheckpointConfig, ControlNetCheckpointConfig.get_tag()],
         Annotated[LoRALyCORISConfig, LoRALyCORISConfig.get_tag()],
-        Annotated[LoRAOmiConfig, LoRAOmiConfig.get_tag()],
         Annotated[ControlLoRALyCORISConfig, ControlLoRALyCORISConfig.get_tag()],
         Annotated[ControlLoRADiffusersConfig, ControlLoRADiffusersConfig.get_tag()],
         Annotated[LoRADiffusersConfig, LoRADiffusersConfig.get_tag()],

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

@@ -13,7 +13,6 @@ from invokeai.backend.model_manager.config import AnyModelConfig
 from invokeai.backend.model_manager.load.load_default import ModelLoader
 from invokeai.backend.model_manager.load.model_cache.model_cache import ModelCache
 from invokeai.backend.model_manager.load.model_loader_registry import ModelLoaderRegistry
-from invokeai.backend.model_manager.omi.omi import convert_from_omi
 from invokeai.backend.model_manager.taxonomy import (
     AnyModel,
     BaseModelType,
@@ -21,10 +20,6 @@ from invokeai.backend.model_manager.taxonomy import (
     ModelType,
     SubModelType,
 )
-from invokeai.backend.patches.lora_conversions.flux_aitoolkit_lora_conversion_utils import (
-    is_state_dict_likely_in_flux_aitoolkit_format,
-    lora_model_from_flux_aitoolkit_state_dict,
-)
 from invokeai.backend.patches.lora_conversions.flux_control_lora_utils import (
     is_state_dict_likely_flux_control,
     lora_model_from_flux_control_state_dict,
@@ -44,8 +39,6 @@ from invokeai.backend.patches.lora_conversions.sd_lora_conversion_utils import l
 from invokeai.backend.patches.lora_conversions.sdxl_lora_conversion_utils import convert_sdxl_keys_to_diffusers_format
 
 
-@ModelLoaderRegistry.register(base=BaseModelType.Flux, type=ModelType.LoRA, format=ModelFormat.OMI)
-@ModelLoaderRegistry.register(base=BaseModelType.StableDiffusionXL, type=ModelType.LoRA, format=ModelFormat.OMI)
 @ModelLoaderRegistry.register(base=BaseModelType.Any, type=ModelType.LoRA, format=ModelFormat.Diffusers)
 @ModelLoaderRegistry.register(base=BaseModelType.Any, type=ModelType.LoRA, format=ModelFormat.LyCORIS)
 @ModelLoaderRegistry.register(base=BaseModelType.Flux, type=ModelType.ControlLoRa, format=ModelFormat.LyCORIS)
@@ -80,23 +73,12 @@ class LoRALoader(ModelLoader):
         else:
             state_dict = torch.load(model_path, map_location="cpu")
 
-        # Strip 'bundle_emb' keys - these are unused and currently cause downstream errors.
-        # To revisit later to determine if they're needed/useful.
-        state_dict = {k: v for k, v in state_dict.items() if not k.startswith("bundle_emb")}
-
-        # At the time of writing, we support the OMI standard for base models Flux and SDXL
-        if config.format == ModelFormat.OMI and self._model_base in [
-            BaseModelType.StableDiffusionXL,
-            BaseModelType.Flux,
-        ]:
-            state_dict = convert_from_omi(state_dict, config.base)  # type: ignore
-
         # Apply state_dict key conversions, if necessary.
         if self._model_base == BaseModelType.StableDiffusionXL:
             state_dict = convert_sdxl_keys_to_diffusers_format(state_dict)
             model = lora_model_from_sd_state_dict(state_dict=state_dict)
         elif self._model_base == BaseModelType.Flux:
-            if config.format in [ModelFormat.Diffusers, ModelFormat.OMI]:
+            if config.format == ModelFormat.Diffusers:
                 # HACK(ryand): We set alpha=None for diffusers PEFT format models. These models are typically
                 # distributed as a single file without the associated metadata containing the alpha value. We chose
                 # alpha=None, because this is treated as alpha=rank internally in `LoRALayerBase.scale()`. alpha=rank
@@ -110,10 +92,8 @@ class LoRALoader(ModelLoader):
                     model = lora_model_from_flux_onetrainer_state_dict(state_dict=state_dict)
                 elif is_state_dict_likely_flux_control(state_dict=state_dict):
                     model = lora_model_from_flux_control_state_dict(state_dict=state_dict)
-                elif is_state_dict_likely_in_flux_aitoolkit_format(state_dict=state_dict):
-                    model = lora_model_from_flux_aitoolkit_state_dict(state_dict=state_dict)
                 else:
-                    raise ValueError("LoRA model is in unsupported FLUX format")
+                    raise ValueError(f"LoRA model is in unsupported FLUX format: {config.format}")
             else:
                 raise ValueError(f"LoRA model is in unsupported FLUX format: {config.format}")
         elif self._model_base in [BaseModelType.StableDiffusion1, BaseModelType.StableDiffusion2]:

invokeai/backend/model_manager/omi/__init__.py

@@ -1,7 +0,0 @@
-from invokeai.backend.model_manager.omi.omi import convert_from_omi
-from invokeai.backend.model_manager.omi.vendor.model_spec.architecture import (
-    flux_dev_1_lora,
-    stable_diffusion_xl_1_lora,
-)
-
-__all__ = ["flux_dev_1_lora", "stable_diffusion_xl_1_lora", "convert_from_omi"]

invokeai/backend/model_manager/omi/omi.py

@@ -1,21 +0,0 @@
-from invokeai.backend.model_manager.model_on_disk import StateDict
-from invokeai.backend.model_manager.omi.vendor.convert.lora import (
-    convert_flux_lora as omi_flux,
-)
-from invokeai.backend.model_manager.omi.vendor.convert.lora import (
-    convert_lora_util as lora_util,
-)
-from invokeai.backend.model_manager.omi.vendor.convert.lora import (
-    convert_sdxl_lora as omi_sdxl,
-)
-from invokeai.backend.model_manager.taxonomy import BaseModelType
-
-
-def convert_from_omi(weights_sd: StateDict, base: BaseModelType):
-    keyset = {
-        BaseModelType.Flux: omi_flux.convert_flux_lora_key_sets(),
-        BaseModelType.StableDiffusionXL: omi_sdxl.convert_sdxl_lora_key_sets(),
-    }[base]
-    source = "omi"
-    target = "legacy_diffusers"
-    return lora_util.__convert(weights_sd, keyset, source, target)  # type: ignore

invokeai/backend/model_manager/omi/vendor/convert/lora/convert_clip.py

@@ -1,20 +0,0 @@
-from invokeai.backend.model_manager.omi.vendor.convert.lora.convert_lora_util import (
-    LoraConversionKeySet,
-    map_prefix_range,
-)
-
-
-def map_clip(key_prefix: LoraConversionKeySet) -> list[LoraConversionKeySet]:
-    keys = []
-
-    keys += [LoraConversionKeySet("text_projection", "text_projection", parent=key_prefix)]
-
-    for k in map_prefix_range("text_model.encoder.layers", "text_model.encoder.layers", parent=key_prefix):
-        keys += [LoraConversionKeySet("mlp.fc1", "mlp.fc1", parent=k)]
-        keys += [LoraConversionKeySet("mlp.fc2", "mlp.fc2", parent=k)]
-        keys += [LoraConversionKeySet("self_attn.k_proj", "self_attn.k_proj", parent=k)]
-        keys += [LoraConversionKeySet("self_attn.out_proj", "self_attn.out_proj", parent=k)]
-        keys += [LoraConversionKeySet("self_attn.q_proj", "self_attn.q_proj", parent=k)]
-        keys += [LoraConversionKeySet("self_attn.v_proj", "self_attn.v_proj", parent=k)]
-
-    return keys

invokeai/backend/model_manager/omi/vendor/convert/lora/convert_flux_lora.py

@@ -1,84 +0,0 @@
-from invokeai.backend.model_manager.omi.vendor.convert.lora.convert_clip import map_clip
-from invokeai.backend.model_manager.omi.vendor.convert.lora.convert_lora_util import (
-    LoraConversionKeySet,
-    map_prefix_range,
-)
-from invokeai.backend.model_manager.omi.vendor.convert.lora.convert_t5 import map_t5
-
-
-def __map_double_transformer_block(key_prefix: LoraConversionKeySet) -> list[LoraConversionKeySet]:
-    keys = []
-
-    keys += [LoraConversionKeySet("img_attn.qkv.0", "attn.to_q", parent=key_prefix)]
-    keys += [LoraConversionKeySet("img_attn.qkv.1", "attn.to_k", parent=key_prefix)]
-    keys += [LoraConversionKeySet("img_attn.qkv.2", "attn.to_v", parent=key_prefix)]
-
-    keys += [LoraConversionKeySet("txt_attn.qkv.0", "attn.add_q_proj", parent=key_prefix)]
-    keys += [LoraConversionKeySet("txt_attn.qkv.1", "attn.add_k_proj", parent=key_prefix)]
-    keys += [LoraConversionKeySet("txt_attn.qkv.2", "attn.add_v_proj", parent=key_prefix)]
-
-    keys += [LoraConversionKeySet("img_attn.proj", "attn.to_out.0", parent=key_prefix)]
-    keys += [LoraConversionKeySet("img_mlp.0", "ff.net.0.proj", parent=key_prefix)]
-    keys += [LoraConversionKeySet("img_mlp.2", "ff.net.2", parent=key_prefix)]
-    keys += [LoraConversionKeySet("img_mod.lin", "norm1.linear", parent=key_prefix)]
-
-    keys += [LoraConversionKeySet("txt_attn.proj", "attn.to_add_out", parent=key_prefix)]
-    keys += [LoraConversionKeySet("txt_mlp.0", "ff_context.net.0.proj", parent=key_prefix)]
-    keys += [LoraConversionKeySet("txt_mlp.2", "ff_context.net.2", parent=key_prefix)]
-    keys += [LoraConversionKeySet("txt_mod.lin", "norm1_context.linear", parent=key_prefix)]
-
-    return keys
-
-
-def __map_single_transformer_block(key_prefix: LoraConversionKeySet) -> list[LoraConversionKeySet]:
-    keys = []
-
-    keys += [LoraConversionKeySet("linear1.0", "attn.to_q", parent=key_prefix)]
-    keys += [LoraConversionKeySet("linear1.1", "attn.to_k", parent=key_prefix)]
-    keys += [LoraConversionKeySet("linear1.2", "attn.to_v", parent=key_prefix)]
-    keys += [LoraConversionKeySet("linear1.3", "proj_mlp", parent=key_prefix)]
-
-    keys += [LoraConversionKeySet("linear2", "proj_out", parent=key_prefix)]
-    keys += [LoraConversionKeySet("modulation.lin", "norm.linear", parent=key_prefix)]
-
-    return keys
-
-
-def __map_transformer(key_prefix: LoraConversionKeySet) -> list[LoraConversionKeySet]:
-    keys = []
-
-    keys += [LoraConversionKeySet("txt_in", "context_embedder", parent=key_prefix)]
-    keys += [
-        LoraConversionKeySet("final_layer.adaLN_modulation.1", "norm_out.linear", parent=key_prefix, swap_chunks=True)
-    ]
-    keys += [LoraConversionKeySet("final_layer.linear", "proj_out", parent=key_prefix)]
-    keys += [
-        LoraConversionKeySet("guidance_in.in_layer", "time_text_embed.guidance_embedder.linear_1", parent=key_prefix)
-    ]
-    keys += [
-        LoraConversionKeySet("guidance_in.out_layer", "time_text_embed.guidance_embedder.linear_2", parent=key_prefix)
-    ]
-    keys += [LoraConversionKeySet("vector_in.in_layer", "time_text_embed.text_embedder.linear_1", parent=key_prefix)]
-    keys += [LoraConversionKeySet("vector_in.out_layer", "time_text_embed.text_embedder.linear_2", parent=key_prefix)]
-    keys += [LoraConversionKeySet("time_in.in_layer", "time_text_embed.timestep_embedder.linear_1", parent=key_prefix)]
-    keys += [LoraConversionKeySet("time_in.out_layer", "time_text_embed.timestep_embedder.linear_2", parent=key_prefix)]
-    keys += [LoraConversionKeySet("img_in.proj", "x_embedder", parent=key_prefix)]
-
-    for k in map_prefix_range("double_blocks", "transformer_blocks", parent=key_prefix):
-        keys += __map_double_transformer_block(k)
-
-    for k in map_prefix_range("single_blocks", "single_transformer_blocks", parent=key_prefix):
-        keys += __map_single_transformer_block(k)
-
-    return keys
-
-
-def convert_flux_lora_key_sets() -> list[LoraConversionKeySet]:
-    keys = []
-
-    keys += [LoraConversionKeySet("bundle_emb", "bundle_emb")]
-    keys += __map_transformer(LoraConversionKeySet("transformer", "lora_transformer"))
-    keys += map_clip(LoraConversionKeySet("clip_l", "lora_te1"))
-    keys += map_t5(LoraConversionKeySet("t5", "lora_te2"))
-
-    return keys

invokeai/backend/model_manager/omi/vendor/convert/lora/convert_lora_util.py

@@ -1,217 +0,0 @@
-import torch
-from torch import Tensor
-from typing_extensions import Self
-
-
-class LoraConversionKeySet:
-    def __init__(
-        self,
-        omi_prefix: str,
-        diffusers_prefix: str,
-        legacy_diffusers_prefix: str | None = None,
-        parent: Self | None = None,
-        swap_chunks: bool = False,
-        filter_is_last: bool | None = None,
-        next_omi_prefix: str | None = None,
-        next_diffusers_prefix: str | None = None,
-    ):
-        if parent is not None:
-            self.omi_prefix = combine(parent.omi_prefix, omi_prefix)
-            self.diffusers_prefix = combine(parent.diffusers_prefix, diffusers_prefix)
-        else:
-            self.omi_prefix = omi_prefix
-            self.diffusers_prefix = diffusers_prefix
-
-        if legacy_diffusers_prefix is None:
-            self.legacy_diffusers_prefix = self.diffusers_prefix.replace(".", "_")
-        elif parent is not None:
-            self.legacy_diffusers_prefix = combine(parent.legacy_diffusers_prefix, legacy_diffusers_prefix).replace(
-                ".", "_"
-            )
-        else:
-            self.legacy_diffusers_prefix = legacy_diffusers_prefix
-
-        self.parent = parent
-        self.swap_chunks = swap_chunks
-        self.filter_is_last = filter_is_last
-        self.prefix = parent
-
-        if next_omi_prefix is None and parent is not None:
-            self.next_omi_prefix = parent.next_omi_prefix
-            self.next_diffusers_prefix = parent.next_diffusers_prefix
-            self.next_legacy_diffusers_prefix = parent.next_legacy_diffusers_prefix
-        elif next_omi_prefix is not None and parent is not None:
-            self.next_omi_prefix = combine(parent.omi_prefix, next_omi_prefix)
-            self.next_diffusers_prefix = combine(parent.diffusers_prefix, next_diffusers_prefix)
-            self.next_legacy_diffusers_prefix = combine(parent.legacy_diffusers_prefix, next_diffusers_prefix).replace(
-                ".", "_"
-            )
-        elif next_omi_prefix is not None and parent is None:
-            self.next_omi_prefix = next_omi_prefix
-            self.next_diffusers_prefix = next_diffusers_prefix
-            self.next_legacy_diffusers_prefix = next_diffusers_prefix.replace(".", "_")
-        else:
-            self.next_omi_prefix = None
-            self.next_diffusers_prefix = None
-            self.next_legacy_diffusers_prefix = None
-
-    def __get_omi(self, in_prefix: str, key: str) -> str:
-        return self.omi_prefix + key.removeprefix(in_prefix)
-
-    def __get_diffusers(self, in_prefix: str, key: str) -> str:
-        return self.diffusers_prefix + key.removeprefix(in_prefix)
-
-    def __get_legacy_diffusers(self, in_prefix: str, key: str) -> str:
-        key = self.legacy_diffusers_prefix + key.removeprefix(in_prefix)
-
-        suffix = key[key.rfind(".") :]
-        if suffix not in [".alpha", ".dora_scale"]:  # some keys only have a single . in the suffix
-            suffix = key[key.removesuffix(suffix).rfind(".") :]
-        key = key.removesuffix(suffix)
-
-        return key.replace(".", "_") + suffix
-
-    def get_key(self, in_prefix: str, key: str, target: str) -> str:
-        if target == "omi":
-            return self.__get_omi(in_prefix, key)
-        elif target == "diffusers":
-            return self.__get_diffusers(in_prefix, key)
-        elif target == "legacy_diffusers":
-            return self.__get_legacy_diffusers(in_prefix, key)
-        return key
-
-    def __str__(self) -> str:
-        return f"omi: {self.omi_prefix}, diffusers: {self.diffusers_prefix}, legacy: {self.legacy_diffusers_prefix}"
-
-
-def combine(left: str, right: str) -> str:
-    left = left.rstrip(".")
-    right = right.lstrip(".")
-    if left == "" or left is None:
-        return right
-    elif right == "" or right is None:
-        return left
-    else:
-        return left + "." + right
-
-
-def map_prefix_range(
-    omi_prefix: str,
-    diffusers_prefix: str,
-    parent: LoraConversionKeySet,
-) -> list[LoraConversionKeySet]:
-    # 100 should be a safe upper bound. increase if it's not enough in the future
-    return [
-        LoraConversionKeySet(
-            omi_prefix=f"{omi_prefix}.{i}",
-            diffusers_prefix=f"{diffusers_prefix}.{i}",
-            parent=parent,
-            next_omi_prefix=f"{omi_prefix}.{i + 1}",
-            next_diffusers_prefix=f"{diffusers_prefix}.{i + 1}",
-        )
-        for i in range(100)
-    ]
-
-
-def __convert(
-    state_dict: dict[str, Tensor],
-    key_sets: list[LoraConversionKeySet],
-    source: str,
-    target: str,
-) -> dict[str, Tensor]:
-    out_states = {}
-
-    if source == target:
-        return dict(state_dict)
-
-    # TODO: maybe replace with a non O(n^2) algorithm
-    for key, tensor in state_dict.items():
-        for key_set in key_sets:
-            in_prefix = ""
-
-            if source == "omi":
-                in_prefix = key_set.omi_prefix
-            elif source == "diffusers":
-                in_prefix = key_set.diffusers_prefix
-            elif source == "legacy_diffusers":
-                in_prefix = key_set.legacy_diffusers_prefix
-
-            if not key.startswith(in_prefix):
-                continue
-
-            if key_set.filter_is_last is not None:
-                next_prefix = None
-                if source == "omi":
-                    next_prefix = key_set.next_omi_prefix
-                elif source == "diffusers":
-                    next_prefix = key_set.next_diffusers_prefix
-                elif source == "legacy_diffusers":
-                    next_prefix = key_set.next_legacy_diffusers_prefix
-
-                is_last = not any(k.startswith(next_prefix) for k in state_dict)
-                if key_set.filter_is_last != is_last:
-                    continue
-
-            name = key_set.get_key(in_prefix, key, target)
-
-            can_swap_chunks = target == "omi" or source == "omi"
-            if key_set.swap_chunks and name.endswith(".lora_up.weight") and can_swap_chunks:
-                chunk_0, chunk_1 = tensor.chunk(2, dim=0)
-                tensor = torch.cat([chunk_1, chunk_0], dim=0)
-
-            out_states[name] = tensor
-
-            break  # only map the first matching key set
-
-    return out_states
-
-
-def __detect_source(
-    state_dict: dict[str, Tensor],
-    key_sets: list[LoraConversionKeySet],
-) -> str:
-    omi_count = 0
-    diffusers_count = 0
-    legacy_diffusers_count = 0
-
-    for key in state_dict:
-        for key_set in key_sets:
-            if key.startswith(key_set.omi_prefix):
-                omi_count += 1
-            if key.startswith(key_set.diffusers_prefix):
-                diffusers_count += 1
-            if key.startswith(key_set.legacy_diffusers_prefix):
-                legacy_diffusers_count += 1
-
-    if omi_count > diffusers_count and omi_count > legacy_diffusers_count:
-        return "omi"
-    if diffusers_count > omi_count and diffusers_count > legacy_diffusers_count:
-        return "diffusers"
-    if legacy_diffusers_count > omi_count and legacy_diffusers_count > diffusers_count:
-        return "legacy_diffusers"
-
-    return ""
-
-
-def convert_to_omi(
-    state_dict: dict[str, Tensor],
-    key_sets: list[LoraConversionKeySet],
-) -> dict[str, Tensor]:
-    source = __detect_source(state_dict, key_sets)
-    return __convert(state_dict, key_sets, source, "omi")
-
-
-def convert_to_diffusers(
-    state_dict: dict[str, Tensor],
-    key_sets: list[LoraConversionKeySet],
-) -> dict[str, Tensor]:
-    source = __detect_source(state_dict, key_sets)
-    return __convert(state_dict, key_sets, source, "diffusers")
-
-
-def convert_to_legacy_diffusers(
-    state_dict: dict[str, Tensor],
-    key_sets: list[LoraConversionKeySet],
-) -> dict[str, Tensor]:
-    source = __detect_source(state_dict, key_sets)
-    return __convert(state_dict, key_sets, source, "legacy_diffusers")

invokeai/backend/model_manager/omi/vendor/convert/lora/convert_sdxl_lora.py

@@ -1,125 +0,0 @@
-from invokeai.backend.model_manager.omi.vendor.convert.lora.convert_clip import map_clip
-from invokeai.backend.model_manager.omi.vendor.convert.lora.convert_lora_util import (
-    LoraConversionKeySet,
-    map_prefix_range,
-)
-
-
-def __map_unet_resnet_block(key_prefix: LoraConversionKeySet) -> list[LoraConversionKeySet]:
-    keys = []
-
-    keys += [LoraConversionKeySet("emb_layers.1", "time_emb_proj", parent=key_prefix)]
-    keys += [LoraConversionKeySet("in_layers.2", "conv1", parent=key_prefix)]
-    keys += [LoraConversionKeySet("out_layers.3", "conv2", parent=key_prefix)]
-    keys += [LoraConversionKeySet("skip_connection", "conv_shortcut", parent=key_prefix)]
-
-    return keys
-
-
-def __map_unet_attention_block(key_prefix: LoraConversionKeySet) -> list[LoraConversionKeySet]:
-    keys = []
-
-    keys += [LoraConversionKeySet("proj_in", "proj_in", parent=key_prefix)]
-    keys += [LoraConversionKeySet("proj_out", "proj_out", parent=key_prefix)]
-    for k in map_prefix_range("transformer_blocks", "transformer_blocks", parent=key_prefix):
-        keys += [LoraConversionKeySet("attn1.to_q", "attn1.to_q", parent=k)]
-        keys += [LoraConversionKeySet("attn1.to_k", "attn1.to_k", parent=k)]
-        keys += [LoraConversionKeySet("attn1.to_v", "attn1.to_v", parent=k)]
-        keys += [LoraConversionKeySet("attn1.to_out.0", "attn1.to_out.0", parent=k)]
-        keys += [LoraConversionKeySet("attn2.to_q", "attn2.to_q", parent=k)]
-        keys += [LoraConversionKeySet("attn2.to_k", "attn2.to_k", parent=k)]
-        keys += [LoraConversionKeySet("attn2.to_v", "attn2.to_v", parent=k)]
-        keys += [LoraConversionKeySet("attn2.to_out.0", "attn2.to_out.0", parent=k)]
-        keys += [LoraConversionKeySet("ff.net.0.proj", "ff.net.0.proj", parent=k)]
-        keys += [LoraConversionKeySet("ff.net.2", "ff.net.2", parent=k)]
-
-    return keys
-
-
-def __map_unet_down_blocks(key_prefix: LoraConversionKeySet) -> list[LoraConversionKeySet]:
-    keys = []
-
-    keys += __map_unet_resnet_block(LoraConversionKeySet("1.0", "0.resnets.0", parent=key_prefix))
-    keys += __map_unet_resnet_block(LoraConversionKeySet("2.0", "0.resnets.1", parent=key_prefix))
-    keys += [LoraConversionKeySet("3.0.op", "0.downsamplers.0.conv", parent=key_prefix)]
-
-    keys += __map_unet_resnet_block(LoraConversionKeySet("4.0", "1.resnets.0", parent=key_prefix))
-    keys += __map_unet_attention_block(LoraConversionKeySet("4.1", "1.attentions.0", parent=key_prefix))
-    keys += __map_unet_resnet_block(LoraConversionKeySet("5.0", "1.resnets.1", parent=key_prefix))
-    keys += __map_unet_attention_block(LoraConversionKeySet("5.1", "1.attentions.1", parent=key_prefix))
-    keys += [LoraConversionKeySet("6.0.op", "1.downsamplers.0.conv", parent=key_prefix)]
-
-    keys += __map_unet_resnet_block(LoraConversionKeySet("7.0", "2.resnets.0", parent=key_prefix))
-    keys += __map_unet_attention_block(LoraConversionKeySet("7.1", "2.attentions.0", parent=key_prefix))
-    keys += __map_unet_resnet_block(LoraConversionKeySet("8.0", "2.resnets.1", parent=key_prefix))
-    keys += __map_unet_attention_block(LoraConversionKeySet("8.1", "2.attentions.1", parent=key_prefix))
-
-    return keys
-
-
-def __map_unet_mid_block(key_prefix: LoraConversionKeySet) -> list[LoraConversionKeySet]:
-    keys = []
-
-    keys += __map_unet_resnet_block(LoraConversionKeySet("0", "resnets.0", parent=key_prefix))
-    keys += __map_unet_attention_block(LoraConversionKeySet("1", "attentions.0", parent=key_prefix))
-    keys += __map_unet_resnet_block(LoraConversionKeySet("2", "resnets.1", parent=key_prefix))
-
-    return keys
-
-
-def __map_unet_up_block(key_prefix: LoraConversionKeySet) -> list[LoraConversionKeySet]:
-    keys = []
-
-    keys += __map_unet_resnet_block(LoraConversionKeySet("0.0", "0.resnets.0", parent=key_prefix))
-    keys += __map_unet_attention_block(LoraConversionKeySet("0.1", "0.attentions.0", parent=key_prefix))
-    keys += __map_unet_resnet_block(LoraConversionKeySet("1.0", "0.resnets.1", parent=key_prefix))
-    keys += __map_unet_attention_block(LoraConversionKeySet("1.1", "0.attentions.1", parent=key_prefix))
-    keys += __map_unet_resnet_block(LoraConversionKeySet("2.0", "0.resnets.2", parent=key_prefix))
-    keys += __map_unet_attention_block(LoraConversionKeySet("2.1", "0.attentions.2", parent=key_prefix))
-    keys += [LoraConversionKeySet("2.2.conv", "0.upsamplers.0.conv", parent=key_prefix)]
-
-    keys += __map_unet_resnet_block(LoraConversionKeySet("3.0", "1.resnets.0", parent=key_prefix))
-    keys += __map_unet_attention_block(LoraConversionKeySet("3.1", "1.attentions.0", parent=key_prefix))
-    keys += __map_unet_resnet_block(LoraConversionKeySet("4.0", "1.resnets.1", parent=key_prefix))
-    keys += __map_unet_attention_block(LoraConversionKeySet("4.1", "1.attentions.1", parent=key_prefix))
-    keys += __map_unet_resnet_block(LoraConversionKeySet("5.0", "1.resnets.2", parent=key_prefix))
-    keys += __map_unet_attention_block(LoraConversionKeySet("5.1", "1.attentions.2", parent=key_prefix))
-    keys += [LoraConversionKeySet("5.2.conv", "1.upsamplers.0.conv", parent=key_prefix)]
-
-    keys += __map_unet_resnet_block(LoraConversionKeySet("6.0", "2.resnets.0", parent=key_prefix))
-    keys += __map_unet_resnet_block(LoraConversionKeySet("7.0", "2.resnets.1", parent=key_prefix))
-    keys += __map_unet_resnet_block(LoraConversionKeySet("8.0", "2.resnets.2", parent=key_prefix))
-
-    return keys
-
-
-def __map_unet(key_prefix: LoraConversionKeySet) -> list[LoraConversionKeySet]:
-    keys = []
-
-    keys += [LoraConversionKeySet("input_blocks.0.0", "conv_in", parent=key_prefix)]
-
-    keys += [LoraConversionKeySet("time_embed.0", "time_embedding.linear_1", parent=key_prefix)]
-    keys += [LoraConversionKeySet("time_embed.2", "time_embedding.linear_2", parent=key_prefix)]
-
-    keys += [LoraConversionKeySet("label_emb.0.0", "add_embedding.linear_1", parent=key_prefix)]
-    keys += [LoraConversionKeySet("label_emb.0.2", "add_embedding.linear_2", parent=key_prefix)]
-
-    keys += __map_unet_down_blocks(LoraConversionKeySet("input_blocks", "down_blocks", parent=key_prefix))
-    keys += __map_unet_mid_block(LoraConversionKeySet("middle_block", "mid_block", parent=key_prefix))
-    keys += __map_unet_up_block(LoraConversionKeySet("output_blocks", "up_blocks", parent=key_prefix))
-
-    keys += [LoraConversionKeySet("out.0", "conv_norm_out", parent=key_prefix)]
-    keys += [LoraConversionKeySet("out.2", "conv_out", parent=key_prefix)]
-
-    return keys
-
-
-def convert_sdxl_lora_key_sets() -> list[LoraConversionKeySet]:
-    keys = []
-
-    keys += [LoraConversionKeySet("bundle_emb", "bundle_emb")]
-    keys += __map_unet(LoraConversionKeySet("unet", "lora_unet"))
-    keys += map_clip(LoraConversionKeySet("clip_l", "lora_te1"))
-    keys += map_clip(LoraConversionKeySet("clip_g", "lora_te2"))
-
-    return keys

invokeai/backend/model_manager/omi/vendor/convert/lora/convert_t5.py

@@ -1,19 +0,0 @@
-from invokeai.backend.model_manager.omi.vendor.convert.lora.convert_lora_util import (
-    LoraConversionKeySet,
-    map_prefix_range,
-)
-
-
-def map_t5(key_prefix: LoraConversionKeySet) -> list[LoraConversionKeySet]:
-    keys = []
-
-    for k in map_prefix_range("encoder.block", "encoder.block", parent=key_prefix):
-        keys += [LoraConversionKeySet("layer.0.SelfAttention.k", "layer.0.SelfAttention.k", parent=k)]
-        keys += [LoraConversionKeySet("layer.0.SelfAttention.o", "layer.0.SelfAttention.o", parent=k)]
-        keys += [LoraConversionKeySet("layer.0.SelfAttention.q", "layer.0.SelfAttention.q", parent=k)]
-        keys += [LoraConversionKeySet("layer.0.SelfAttention.v", "layer.0.SelfAttention.v", parent=k)]
-        keys += [LoraConversionKeySet("layer.1.DenseReluDense.wi_0", "layer.1.DenseReluDense.wi_0", parent=k)]
-        keys += [LoraConversionKeySet("layer.1.DenseReluDense.wi_1", "layer.1.DenseReluDense.wi_1", parent=k)]
-        keys += [LoraConversionKeySet("layer.1.DenseReluDense.wo", "layer.1.DenseReluDense.wo", parent=k)]
-
-    return keys

invokeai/backend/model_manager/omi/vendor/model_spec/architecture.py

@@ -1,31 +0,0 @@
-stable_diffusion_1_lora = "stable-diffusion-v1/lora"
-stable_diffusion_1_inpainting_lora = "stable-diffusion-v1-inpainting/lora"
-
-stable_diffusion_2_512_lora = "stable-diffusion-v2-512/lora"
-stable_diffusion_2_768_v_lora = "stable-diffusion-v2-768-v/lora"
-stable_diffusion_2_depth_lora = "stable-diffusion-v2-depth/lora"
-stable_diffusion_2_inpainting_lora = "stable-diffusion-v2-inpainting/lora"
-
-stable_diffusion_3_medium_lora = "stable-diffusion-v3-medium/lora"
-stable_diffusion_35_medium_lora = "stable-diffusion-v3.5-medium/lora"
-stable_diffusion_35_large_lora = "stable-diffusion-v3.5-large/lora"
-
-stable_diffusion_xl_1_lora = "stable-diffusion-xl-v1-base/lora"
-stable_diffusion_xl_1_inpainting_lora = "stable-diffusion-xl-v1-base-inpainting/lora"
-
-wuerstchen_2_lora = "wuerstchen-v2-prior/lora"
-stable_cascade_1_stage_a_lora = "stable-cascade-v1-stage-a/lora"
-stable_cascade_1_stage_b_lora = "stable-cascade-v1-stage-b/lora"
-stable_cascade_1_stage_c_lora = "stable-cascade-v1-stage-c/lora"
-
-pixart_alpha_lora = "pixart-alpha/lora"
-pixart_sigma_lora = "pixart-sigma/lora"
-
-flux_dev_1_lora = "Flux.1-dev/lora"
-flux_fill_dev_1_lora = "Flux.1-fill-dev/lora"
-
-sana_lora = "sana/lora"
-
-hunyuan_video_lora = "hunyuan-video/lora"
-
-hi_dream_i1_lora = "hidream-i1/lora"

invokeai/backend/model_manager/taxonomy.py

@@ -29,7 +29,6 @@ class BaseModelType(str, Enum):
     Imagen3 = "imagen3"
     Imagen4 = "imagen4"
     ChatGPT4o = "chatgpt-4o"
-    FluxKontext = "flux-kontext"
 
 
 class ModelType(str, Enum):
@@ -89,7 +88,6 @@ class ModelVariantType(str, Enum):
 class ModelFormat(str, Enum):
     """Storage format of model."""
 
-    OMI = "omi"
     Diffusers = "diffusers"
     Checkpoint = "checkpoint"
     LyCORIS = "lycoris"
@@ -139,7 +137,6 @@ class FluxLoRAFormat(str, Enum):
     Kohya = "flux.kohya"
     OneTrainer = "flux.onetrainer"
     Control = "flux.control"
-    AIToolkit = "flux.aitoolkit"
 
 
 AnyVariant: TypeAlias = Union[ModelVariantType, ClipVariantType, None]

invokeai/backend/model_patcher.py

@@ -46,10 +46,6 @@ class ModelPatcher:
         text_encoder: Union[CLIPTextModel, CLIPTextModelWithProjection],
         ti_list: List[Tuple[str, TextualInversionModelRaw]],
     ) -> Iterator[Tuple[CLIPTokenizer, TextualInversionManager]]:
-        if len(ti_list) == 0:
-            yield tokenizer, TextualInversionManager(tokenizer)
-            return
-
         init_tokens_count = None
         new_tokens_added = None
 

invokeai/backend/patches/lora_conversions/flux_aitoolkit_lora_conversion_utils.py

@@ -1,63 +0,0 @@
-import json
-from dataclasses import dataclass, field
-from typing import Any
-
-import torch
-
-from invokeai.backend.patches.layers.base_layer_patch import BaseLayerPatch
-from invokeai.backend.patches.layers.utils import any_lora_layer_from_state_dict
-from invokeai.backend.patches.lora_conversions.flux_diffusers_lora_conversion_utils import _group_by_layer
-from invokeai.backend.patches.lora_conversions.flux_lora_constants import FLUX_LORA_TRANSFORMER_PREFIX
-from invokeai.backend.patches.model_patch_raw import ModelPatchRaw
-from invokeai.backend.util import InvokeAILogger
-
-
-def is_state_dict_likely_in_flux_aitoolkit_format(state_dict: dict[str, Any], metadata: dict[str, Any] = None) -> bool:
-    if metadata:
-        try:
-            software = json.loads(metadata.get("software", "{}"))
-        except json.JSONDecodeError:
-            return False
-        return software.get("name") == "ai-toolkit"
-    # metadata got lost somewhere
-    return any("diffusion_model" == k.split(".", 1)[0] for k in state_dict.keys())
-
-
-@dataclass
-class GroupedStateDict:
-    transformer: dict[str, Any] = field(default_factory=dict)
-    # might also grow CLIP and T5 submodels
-
-
-def _group_state_by_submodel(state_dict: dict[str, Any]) -> GroupedStateDict:
-    logger = InvokeAILogger.get_logger()
-    grouped = GroupedStateDict()
-    for key, value in state_dict.items():
-        submodel_name, param_name = key.split(".", 1)
-        match submodel_name:
-            case "diffusion_model":
-                grouped.transformer[param_name] = value
-            case _:
-                logger.warning(f"Unexpected submodel name: {submodel_name}")
-    return grouped
-
-
-def _rename_peft_lora_keys(state_dict: dict[str, torch.Tensor]) -> dict[str, torch.Tensor]:
-    """Renames keys from the PEFT LoRA format to the InvokeAI format."""
-    renamed_state_dict = {}
-    for key, value in state_dict.items():
-        renamed_key = key.replace(".lora_A.", ".lora_down.").replace(".lora_B.", ".lora_up.")
-        renamed_state_dict[renamed_key] = value
-    return renamed_state_dict
-
-
-def lora_model_from_flux_aitoolkit_state_dict(state_dict: dict[str, torch.Tensor]) -> ModelPatchRaw:
-    state_dict = _rename_peft_lora_keys(state_dict)
-    by_layer = _group_by_layer(state_dict)
-    by_model = _group_state_by_submodel(by_layer)
-
-    layers: dict[str, BaseLayerPatch] = {}
-    for layer_key, layer_state_dict in by_model.transformer.items():
-        layers[FLUX_LORA_TRANSFORMER_PREFIX + layer_key] = any_lora_layer_from_state_dict(layer_state_dict)
-
-    return ModelPatchRaw(layers=layers)

invokeai/backend/patches/lora_conversions/formats.py

@@ -1,7 +1,4 @@
 from invokeai.backend.model_manager.taxonomy import FluxLoRAFormat
-from invokeai.backend.patches.lora_conversions.flux_aitoolkit_lora_conversion_utils import (
-    is_state_dict_likely_in_flux_aitoolkit_format,
-)
 from invokeai.backend.patches.lora_conversions.flux_control_lora_utils import is_state_dict_likely_flux_control
 from invokeai.backend.patches.lora_conversions.flux_diffusers_lora_conversion_utils import (
     is_state_dict_likely_in_flux_diffusers_format,
@@ -14,7 +11,7 @@ from invokeai.backend.patches.lora_conversions.flux_onetrainer_lora_conversion_u
 )
 
 
-def flux_format_from_state_dict(state_dict: dict, metadata: dict | None = None) -> FluxLoRAFormat | None:
+def flux_format_from_state_dict(state_dict):
     if is_state_dict_likely_in_flux_kohya_format(state_dict):
         return FluxLoRAFormat.Kohya
     elif is_state_dict_likely_in_flux_onetrainer_format(state_dict):
@@ -23,7 +20,5 @@ def flux_format_from_state_dict(state_dict: dict, metadata: dict | None = None)
         return FluxLoRAFormat.Diffusers
     elif is_state_dict_likely_flux_control(state_dict):
         return FluxLoRAFormat.Control
-    elif is_state_dict_likely_in_flux_aitoolkit_format(state_dict, metadata):
-        return FluxLoRAFormat.AIToolkit
     else:
         return None

invokeai/frontend/web/.eslintrc.js

@@ -12,13 +12,11 @@ module.exports = {
     // TODO: ENABLE THIS RULE BEFORE v6.0.0
     // 'i18next/no-literal-string': 'error',
     // https://eslint.org/docs/latest/rules/no-console
-    'no-console': 'warn',
+    'no-console': 'error',
     // https://eslint.org/docs/latest/rules/no-promise-executor-return
     'no-promise-executor-return': 'error',
     // https://eslint.org/docs/latest/rules/require-await
     'require-await': 'error',
-    // TODO: ENABLE THIS RULE BEFORE v6.0.0
-    'react/display-name': 'off',
     'no-restricted-properties': [
       'error',
       {
@@ -33,27 +31,6 @@ module.exports = {
           'The Clipboard API is not available by default in Firefox. Use the `useClipboard` hook instead, which wraps clipboard access to prevent errors.',
       },
     ],
-    'no-restricted-imports': [
-      'error',
-      {
-        paths: [
-          {
-            name: 'lodash-es',
-            importNames: ['isEqual'],
-            message: 'Please use objectEquals from @observ33r/object-equals instead.',
-          },
-          {
-            name: 'lodash-es',
-            message: 'Please use es-toolkit instead.',
-          },
-          {
-            name: 'es-toolkit',
-            importNames: ['isEqual'],
-            message: 'Please use objectEquals from @observ33r/object-equals instead.',
-          },
-        ],
-      },
-    ],
   },
   overrides: [
     /**

invokeai/frontend/web/package.json

@@ -52,58 +52,56 @@
     }
   },
   "dependencies": {
-    "@atlaskit/pragmatic-drag-and-drop": "^1.7.4",
-    "@atlaskit/pragmatic-drag-and-drop-auto-scroll": "^2.1.1",
-    "@atlaskit/pragmatic-drag-and-drop-hitbox": "^1.1.0",
-    "@dagrejs/dagre": "^1.1.5",
+    "@atlaskit/pragmatic-drag-and-drop": "^1.5.3",
+    "@atlaskit/pragmatic-drag-and-drop-auto-scroll": "^2.1.0",
+    "@atlaskit/pragmatic-drag-and-drop-hitbox": "^1.0.3",
+    "@dagrejs/dagre": "^1.1.4",
     "@dagrejs/graphlib": "^2.2.4",
-    "@fontsource-variable/inter": "^5.2.6",
+    "@fontsource-variable/inter": "^5.2.5",
     "@invoke-ai/ui-library": "^0.0.46",
     "@nanostores/react": "^1.0.0",
-    "@observ33r/object-equals": "^1.1.4",
     "@reduxjs/toolkit": "2.8.2",
     "@roarr/browser-log-writer": "^1.3.0",
-    "@xyflow/react": "^12.7.1",
+    "@xyflow/react": "^12.6.0",
     "async-mutex": "^0.5.0",
     "chakra-react-select": "^4.9.2",
     "cmdk": "^1.1.1",
     "compare-versions": "^6.1.1",
-    "dockview": "^4.4.0",
-    "es-toolkit": "^1.39.5",
     "filesize": "^10.1.6",
-    "fracturedjsonjs": "^4.1.0",
+    "fracturedjsonjs": "^4.0.2",
     "framer-motion": "^11.10.0",
-    "i18next": "^25.2.1",
+    "i18next": "^25.0.1",
     "i18next-http-backend": "^3.0.2",
-    "idb-keyval": "^6.2.2",
+    "idb-keyval": "^6.2.1",
     "jsondiffpatch": "^0.7.3",
     "konva": "^9.3.20",
-    "linkify-react": "^4.3.1",
-    "linkifyjs": "^4.3.1",
+    "linkify-react": "^4.2.0",
+    "linkifyjs": "^4.2.0",
+    "lodash-es": "^4.17.21",
     "lru-cache": "^11.1.0",
     "mtwist": "^1.0.2",
     "nanoid": "^5.1.5",
     "nanostores": "^1.0.1",
     "new-github-issue-url": "^1.1.0",
-    "overlayscrollbars": "^2.11.4",
+    "overlayscrollbars": "^2.11.1",
     "overlayscrollbars-react": "^0.5.6",
     "perfect-freehand": "^1.2.2",
-    "query-string": "^9.2.1",
+    "query-string": "^9.1.1",
     "raf-throttle": "^2.0.6",
     "react": "^18.3.1",
     "react-colorful": "^5.6.1",
     "react-dom": "^18.3.1",
     "react-dropzone": "^14.3.8",
     "react-error-boundary": "^5.0.0",
-    "react-hook-form": "^7.58.1",
+    "react-hook-form": "^7.56.1",
     "react-hotkeys-hook": "4.5.0",
-    "react-i18next": "^15.5.3",
+    "react-i18next": "^15.5.1",
     "react-icons": "^5.5.0",
     "react-redux": "9.2.0",
-    "react-resizable-panels": "^3.0.3",
+    "react-resizable-panels": "^2.1.8",
     "react-textarea-autosize": "^8.5.9",
     "react-use": "^17.6.0",
-    "react-virtuoso": "^4.13.0",
+    "react-virtuoso": "^4.12.6",
     "redux-dynamic-middlewares": "^2.2.0",
     "redux-remember": "^5.2.0",
     "redux-undo": "^1.1.0",
@@ -111,12 +109,12 @@
     "roarr": "^7.21.1",
     "serialize-error": "^12.0.0",
     "socket.io-client": "^4.8.1",
-    "stable-hash": "^0.0.6",
-    "use-debounce": "^10.0.5",
+    "stable-hash": "^0.0.5",
+    "use-debounce": "^10.0.4",
     "use-device-pixel-ratio": "^1.1.2",
     "uuid": "^11.1.0",
-    "zod": "^3.25.67",
-    "zod-validation-error": "^3.5.2"
+    "zod": "^3.24.3",
+    "zod-validation-error": "^3.4.0"
   },
   "peerDependencies": {
     "react": "^18.2.0",
@@ -133,6 +131,7 @@
     "@storybook/react": "^8.6.12",
     "@storybook/react-vite": "^8.6.12",
     "@storybook/theming": "^8.6.12",
+    "@types/lodash-es": "^4.17.12",
     "@types/node": "^22.15.1",
     "@types/react": "^18.3.11",
     "@types/react-dom": "^18.3.0",

invokeai/frontend/web/pnpm-lock.yaml

@@ -6,32 +6,29 @@ settings:
 
 dependencies:
   '@atlaskit/pragmatic-drag-and-drop':
-    specifier: ^1.7.4
-    version: 1.7.4
+    specifier: ^1.5.3
+    version: 1.5.3
   '@atlaskit/pragmatic-drag-and-drop-auto-scroll':
-    specifier: ^2.1.1
-    version: 2.1.1
+    specifier: ^2.1.0
+    version: 2.1.0
   '@atlaskit/pragmatic-drag-and-drop-hitbox':
-    specifier: ^1.1.0
-    version: 1.1.0
+    specifier: ^1.0.3
+    version: 1.0.3
   '@dagrejs/dagre':
-    specifier: ^1.1.5
-    version: 1.1.5
+    specifier: ^1.1.4
+    version: 1.1.4
   '@dagrejs/graphlib':
     specifier: ^2.2.4
     version: 2.2.4
   '@fontsource-variable/inter':
-    specifier: ^5.2.6
-    version: 5.2.6
+    specifier: ^5.2.5
+    version: 5.2.5
   '@invoke-ai/ui-library':
     specifier: ^0.0.46
-    version: 0.0.46(@chakra-ui/system@2.6.2)(@fontsource-variable/inter@5.2.6)(@types/react@18.3.11)(i18next@25.2.1)(react-dom@18.3.1)(react@18.3.1)(typescript@5.8.3)
+    version: 0.0.46(@chakra-ui/system@2.6.2)(@fontsource-variable/inter@5.2.5)(@types/react@18.3.11)(i18next@25.0.1)(react-dom@18.3.1)(react@18.3.1)(typescript@5.8.3)
   '@nanostores/react':
     specifier: ^1.0.0
     version: 1.0.0(nanostores@1.0.1)(react@18.3.1)
-  '@observ33r/object-equals':
-    specifier: ^1.1.4
-    version: 1.1.4
   '@reduxjs/toolkit':
     specifier: 2.8.2
     version: 2.8.2(react-redux@9.2.0)(react@18.3.1)
@@ -39,8 +36,8 @@ dependencies:
     specifier: ^1.3.0
     version: 1.3.0
   '@xyflow/react':
-    specifier: ^12.7.1
-    version: 12.7.1(@types/react@18.3.11)(react-dom@18.3.1)(react@18.3.1)
+    specifier: ^12.6.0
+    version: 12.6.0(@types/react@18.3.11)(react-dom@18.3.1)(react@18.3.1)
   async-mutex:
     specifier: ^0.5.0
     version: 0.5.0
@@ -53,30 +50,24 @@ dependencies:
   compare-versions:
     specifier: ^6.1.1
     version: 6.1.1
-  dockview:
-    specifier: ^4.4.0
-    version: 4.4.0(react@18.3.1)
-  es-toolkit:
-    specifier: ^1.39.5
-    version: 1.39.5
   filesize:
     specifier: ^10.1.6
     version: 10.1.6
   fracturedjsonjs:
-    specifier: ^4.1.0
-    version: 4.1.0
+    specifier: ^4.0.2
+    version: 4.0.2
   framer-motion:
     specifier: ^11.10.0
     version: 11.10.0(react-dom@18.3.1)(react@18.3.1)
   i18next:
-    specifier: ^25.2.1
-    version: 25.2.1(typescript@5.8.3)
+    specifier: ^25.0.1
+    version: 25.0.1(typescript@5.8.3)
   i18next-http-backend:
     specifier: ^3.0.2
     version: 3.0.2
   idb-keyval:
-    specifier: ^6.2.2
-    version: 6.2.2
+    specifier: ^6.2.1
+    version: 6.2.1
   jsondiffpatch:
     specifier: ^0.7.3
     version: 0.7.3
@@ -84,11 +75,14 @@ dependencies:
     specifier: ^9.3.20
     version: 9.3.20
   linkify-react:
-    specifier: ^4.3.1
-    version: 4.3.1(linkifyjs@4.3.1)(react@18.3.1)
+    specifier: ^4.2.0
+    version: 4.2.0(linkifyjs@4.2.0)(react@18.3.1)
   linkifyjs:
-    specifier: ^4.3.1
-    version: 4.3.1
+    specifier: ^4.2.0
+    version: 4.2.0
+  lodash-es:
+    specifier: ^4.17.21
+    version: 4.17.21
   lru-cache:
     specifier: ^11.1.0
     version: 11.1.0
@@ -105,17 +99,17 @@ dependencies:
     specifier: ^1.1.0
     version: 1.1.0
   overlayscrollbars:
-    specifier: ^2.11.4
-    version: 2.11.4
+    specifier: ^2.11.1
+    version: 2.11.1
   overlayscrollbars-react:
     specifier: ^0.5.6
-    version: 0.5.6(overlayscrollbars@2.11.4)(react@18.3.1)
+    version: 0.5.6(overlayscrollbars@2.11.1)(react@18.3.1)
   perfect-freehand:
     specifier: ^1.2.2
     version: 1.2.2
   query-string:
-    specifier: ^9.2.1
-    version: 9.2.1
+    specifier: ^9.1.1
+    version: 9.1.1
   raf-throttle:
     specifier: ^2.0.6
     version: 2.0.6
@@ -135,14 +129,14 @@ dependencies:
     specifier: ^5.0.0
     version: 5.0.0(react@18.3.1)
   react-hook-form:
-    specifier: ^7.58.1
-    version: 7.58.1(react@18.3.1)
+    specifier: ^7.56.1
+    version: 7.56.1(react@18.3.1)
   react-hotkeys-hook:
     specifier: 4.5.0
     version: 4.5.0(react-dom@18.3.1)(react@18.3.1)
   react-i18next:
-    specifier: ^15.5.3
-    version: 15.5.3(i18next@25.2.1)(react-dom@18.3.1)(react@18.3.1)(typescript@5.8.3)
+    specifier: ^15.5.1
+    version: 15.5.1(i18next@25.0.1)(react-dom@18.3.1)(react@18.3.1)(typescript@5.8.3)
   react-icons:
     specifier: ^5.5.0
     version: 5.5.0(react@18.3.1)
@@ -150,8 +144,8 @@ dependencies:
     specifier: 9.2.0
     version: 9.2.0(@types/react@18.3.11)(react@18.3.1)(redux@5.0.1)
   react-resizable-panels:
-    specifier: ^3.0.3
-    version: 3.0.3(react-dom@18.3.1)(react@18.3.1)
+    specifier: ^2.1.8
+    version: 2.1.8(react-dom@18.3.1)(react@18.3.1)
   react-textarea-autosize:
     specifier: ^8.5.9
     version: 8.5.9(@types/react@18.3.11)(react@18.3.1)
@@ -159,8 +153,8 @@ dependencies:
     specifier: ^17.6.0
     version: 17.6.0(react-dom@18.3.1)(react@18.3.1)
   react-virtuoso:
-    specifier: ^4.13.0
-    version: 4.13.0(react-dom@18.3.1)(react@18.3.1)
+    specifier: ^4.12.6
+    version: 4.12.6(react-dom@18.3.1)(react@18.3.1)
   redux-dynamic-middlewares:
     specifier: ^2.2.0
     version: 2.2.0
@@ -183,11 +177,11 @@ dependencies:
     specifier: ^4.8.1
     version: 4.8.1
   stable-hash:
-    specifier: ^0.0.6
-    version: 0.0.6
+    specifier: ^0.0.5
+    version: 0.0.5
   use-debounce:
-    specifier: ^10.0.5
-    version: 10.0.5(react@18.3.1)
+    specifier: ^10.0.4
+    version: 10.0.4(react@18.3.1)
   use-device-pixel-ratio:
     specifier: ^1.1.2
     version: 1.1.2(react@18.3.1)
@@ -195,11 +189,11 @@ dependencies:
     specifier: ^11.1.0
     version: 11.1.0
   zod:
-    specifier: ^3.25.67
-    version: 3.25.67
+    specifier: ^3.24.3
+    version: 3.24.3
   zod-validation-error:
-    specifier: ^3.5.2
-    version: 3.5.2(zod@3.25.67)
+    specifier: ^3.4.0
+    version: 3.4.0(zod@3.24.3)
 
 devDependencies:
   '@invoke-ai/eslint-config-react':
@@ -232,6 +226,9 @@ devDependencies:
   '@storybook/theming':
     specifier: ^8.6.12
     version: 8.6.12(storybook@8.6.12)
+  '@types/lodash-es':
+    specifier: ^4.17.12
+    version: 4.17.12
   '@types/node':
     specifier: ^22.15.1
     version: 22.15.1
@@ -331,24 +328,24 @@ packages:
       '@jridgewell/trace-mapping': 0.3.25
     dev: true
 
-  /@atlaskit/pragmatic-drag-and-drop-auto-scroll@2.1.1:
-    resolution: {integrity: sha512-VAQEb3NVLY9Q5ZgC5Eiws9Uf6xOINY9/pAZMdbOVlF90uRXEkmpYqdTL+zeyZ8U8deuqYCmXr7oWIEnxpNQVzA==}
+  /@atlaskit/pragmatic-drag-and-drop-auto-scroll@2.1.0:
+    resolution: {integrity: sha512-E52y8/0BTTf4ai6BJyFYgdVHFgQ1AES33KvAVQpZ41jMkoukLIq6UoCudOXku7xs3qoPygQdpC+vitVUuEFJXw==}
     dependencies:
-      '@atlaskit/pragmatic-drag-and-drop': 1.7.4
-      '@babel/runtime': 7.27.6
+      '@atlaskit/pragmatic-drag-and-drop': 1.5.3
+      '@babel/runtime': 7.27.0
     dev: false
 
-  /@atlaskit/pragmatic-drag-and-drop-hitbox@1.1.0:
-    resolution: {integrity: sha512-JWt6eVp6Br2FPHRM8s0dUIHQk/jFInGP1f3ti5CdtM1Ji5/pt8Akm44wDC063Gv2i5RGseixtbW0z/t6RYtbdg==}
+  /@atlaskit/pragmatic-drag-and-drop-hitbox@1.0.3:
+    resolution: {integrity: sha512-/Sbu/HqN2VGLYBhnsG7SbRNg98XKkbF6L7XDdBi+izRybfaK1FeMfodPpm/xnBHPJzwYMdkE0qtLyv6afhgMUA==}
     dependencies:
-      '@atlaskit/pragmatic-drag-and-drop': 1.7.4
-      '@babel/runtime': 7.27.6
+      '@atlaskit/pragmatic-drag-and-drop': 1.5.3
+      '@babel/runtime': 7.25.7
     dev: false
 
-  /@atlaskit/pragmatic-drag-and-drop@1.7.4:
-    resolution: {integrity: sha512-lZHnO9BJdHPKnwB0uvVUCyDnIhL+WAHzXQ2EXX0qacogOsnvIUiCgY0BLKhBqTCWln3/f/Ox5jU54MKO6ayh9A==}
+  /@atlaskit/pragmatic-drag-and-drop@1.5.3:
+    resolution: {integrity: sha512-YFhSvBJjnPbYuZrCDaiTLwdJ+zxgS7uBaBObzB8Io77DFnGi3M4IV87Jwc1dwb6RS4BszslPOrX0axz0pODCsw==}
     dependencies:
-      '@babel/runtime': 7.27.6
+      '@babel/runtime': 7.27.0
       bind-event-listener: 3.0.0
       raf-schd: 4.0.3
     dev: false
@@ -536,11 +533,6 @@ packages:
     dependencies:
       regenerator-runtime: 0.14.1
 
-  /@babel/runtime@7.27.6:
-    resolution: {integrity: sha512-vbavdySgbTTrmFE+EsiqUTzlOr5bzlnJtUv9PynGCAKvfQqjIXbvFdumPM/GxMDfyuGMJaJAU6TO4zc1Jf1i8Q==}
-    engines: {node: '>=6.9.0'}
-    dev: false
-
   /@babel/template@7.25.7:
     resolution: {integrity: sha512-wRwtAgI3bAS+JGU2upWNL9lSlDcRCqD05BZ1n3X2ONLH1WilFP6O1otQjeMK/1g0pvYcXC7b/qVUB1keofjtZA==}
     engines: {node: '>=6.9.0'}
@@ -1091,8 +1083,8 @@ packages:
       react: 18.3.1
     dev: false
 
-  /@dagrejs/dagre@1.1.5:
-    resolution: {integrity: sha512-Ghgrh08s12DCL5SeiR6AoyE80mQELTWhJBRmXfFoqDiFkR458vPEdgTbbjA0T+9ETNxUblnD0QW55tfdvi5pjQ==}
+  /@dagrejs/dagre@1.1.4:
+    resolution: {integrity: sha512-QUTc54Cg/wvmlEUxB+uvoPVKFazM1H18kVHBQNmK2NbrDR5ihOCR6CXLnDSZzMcSQKJtabPUWridBOlJM3WkDg==}
     dependencies:
       '@dagrejs/graphlib': 2.2.4
     dev: false
@@ -1594,8 +1586,8 @@ packages:
     resolution: {integrity: sha512-kym7SodPp8/wloecOpcmSnWJsK7M0E5Wg8UcFA+uO4B9s5d0ywXOEro/8HM9x0rW+TljRzul/14UYz3TleT3ig==}
     dev: false
 
-  /@fontsource-variable/inter@5.2.6:
-    resolution: {integrity: sha512-jks/bficUPQ9nn7GvXvHtlQIPudW7Wx8CrlZoY8bhxgeobNxlQan8DclUJuYF2loYRrGpfrhCIZZspXYysiVGg==}
+  /@fontsource-variable/inter@5.2.5:
+    resolution: {integrity: sha512-TrWffUAFOnT8zroE9YmGybagoOgM/HjRqMQ8k9R0vVgXlnUh/vnpbGPAS/Caz1KIlOPnPGh6fvJbb7DHbFCncA==}
     dev: false
 
   /@humanwhocodes/config-array@0.13.0:
@@ -1654,7 +1646,7 @@ packages:
       prettier: 3.5.3
     dev: true
 
-  /@invoke-ai/ui-library@0.0.46(@chakra-ui/system@2.6.2)(@fontsource-variable/inter@5.2.6)(@types/react@18.3.11)(i18next@25.2.1)(react-dom@18.3.1)(react@18.3.1)(typescript@5.8.3):
+  /@invoke-ai/ui-library@0.0.46(@chakra-ui/system@2.6.2)(@fontsource-variable/inter@5.2.5)(@types/react@18.3.11)(i18next@25.0.1)(react-dom@18.3.1)(react@18.3.1)(typescript@5.8.3):
     resolution: {integrity: sha512-3YBuWWhRbTUHi0RZKeyvDEvweoyZmeBdUGJIhemjdAgGx6l98rAMeCs8IQH+SYjSAIhiGRGf45fQ33PDK8Jkmw==}
     peerDependencies:
       '@fontsource-variable/inter': ^5.0.16
@@ -1670,7 +1662,7 @@ packages:
       '@chakra-ui/theme-tools': 2.2.7(@chakra-ui/styled-system@2.12.1)(react@18.3.1)
       '@emotion/react': 11.14.0(@types/react@18.3.11)(react@18.3.1)
       '@emotion/styled': 11.14.0(@emotion/react@11.14.0)(@types/react@18.3.11)(react@18.3.1)
-      '@fontsource-variable/inter': 5.2.6
+      '@fontsource-variable/inter': 5.2.5
       '@nanostores/react': 0.7.3(nanostores@0.11.4)(react@18.3.1)
       chakra-react-select: 4.10.1(@chakra-ui/react@2.10.4)(@emotion/react@11.14.0)(@types/react@18.3.11)(react-dom@18.3.1)(react@18.3.1)
       framer-motion: 10.18.0(react-dom@18.3.1)(react@18.3.1)
@@ -1680,7 +1672,7 @@ packages:
       overlayscrollbars-react: 0.5.6(overlayscrollbars@2.10.0)(react@18.3.1)
       react: 18.3.1
       react-dom: 18.3.1(react@18.3.1)
-      react-i18next: 15.5.3(i18next@25.2.1)(react-dom@18.3.1)(react@18.3.1)(typescript@5.8.3)
+      react-i18next: 15.5.1(i18next@25.0.1)(react-dom@18.3.1)(react@18.3.1)(typescript@5.8.3)
       react-icons: 5.5.0(react@18.3.1)
       react-select: 5.10.0(@types/react@18.3.11)(react-dom@18.3.1)(react@18.3.1)
     transitivePeerDependencies:
@@ -1858,10 +1850,6 @@ packages:
       fastq: 1.17.1
     dev: true
 
-  /@observ33r/object-equals@1.1.4:
-    resolution: {integrity: sha512-a46ys2Zvyyu1NPo8C8mF6FLztVxxaBtXpZwxlQutaaRtQFcD71yTMwyPY4DOuHsz//YEZjLkCw+mJoKDiG/CgA==}
-    dev: false
-
   /@pkgjs/parseargs@0.11.0:
     resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==}
     engines: {node: '>=14'}
@@ -2807,7 +2795,7 @@ packages:
     peerDependencies:
       storybook: ^8.6.12
     dependencies:
-      es-toolkit: 1.39.5
+      es-toolkit: 1.36.0
       estraverse: 5.3.0
       prettier: 3.5.3
       storybook: 8.6.12(prettier@3.5.3)
@@ -3098,10 +3086,16 @@ packages:
     resolution: {integrity: sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==}
     dev: true
 
+  /@types/lodash-es@4.17.12:
+    resolution: {integrity: sha512-0NgftHUcV4v34VhXm8QBSftKVXtbkBG3ViCjs6+eJ5a6y6Mi/jiFGPc1sC7QK+9BFhWrURE3EOggmWaSxL9OzQ==}
+    dependencies:
+      '@types/lodash': 4.17.10
+    dev: true
+
   /@types/lodash.mergewith@4.6.7:
     resolution: {integrity: sha512-3m+lkO5CLRRYU0fhGRp7zbsGi6+BZj0uTVSwvcKU+nSlhjA9/QRNfuSGnD2mX6hQA7ZbmcCkzk5h4ZYGOtk14A==}
     dependencies:
-      '@types/lodash': 4.17.18
+      '@types/lodash': 4.17.16
     dev: false
 
   /@types/lodash.mergewith@4.6.9:
@@ -3112,10 +3106,9 @@ packages:
 
   /@types/lodash@4.17.10:
     resolution: {integrity: sha512-YpS0zzoduEhuOWjAotS6A5AVCva7X4lVlYLF0FYHAY9sdraBfnatttHItlWeZdGhuEkf+OzMNg2ZYAx8t+52uQ==}
-    dev: false
 
-  /@types/lodash@4.17.18:
-    resolution: {integrity: sha512-KJ65INaxqxmU6EoCiJmRPZC9H9RVWCRd349tXM2M3O5NA7cY6YL7c0bHAHQ93NOfTObEQ004kd2QVHs/r0+m4g==}
+  /@types/lodash@4.17.16:
+    resolution: {integrity: sha512-HX7Em5NYQAXKW+1T+FiuG27NGwzJfCX3s1GjOa7ujxZa52kjJLOr4FUxT+giF6Tgxv1e+/czV/iTtBw27WTU9g==}
     dev: false
 
   /@types/mdx@2.0.13:
@@ -3591,32 +3584,30 @@ packages:
     resolution: {integrity: sha512-N8tkAACJx2ww8vFMneJmaAgmjAG1tnVBZJRLRcx061tmsLRZHSEZSLuGWnwPtunsSLvSqXQ2wfp7Mgqg1I+2dQ==}
     dev: false
 
-  /@xyflow/react@12.7.1(@types/react@18.3.11)(react-dom@18.3.1)(react@18.3.1):
-    resolution: {integrity: sha512-uvIPQIZdf8tt0mDWvhkEpg/7t5E/e/KE4RWjNczAEhEYA+uvLc+4A5kIPJqCjJJbVHfMiAojT5JOB5mB7/EgFw==}
+  /@xyflow/react@12.6.0(@types/react@18.3.11)(react-dom@18.3.1)(react@18.3.1):
+    resolution: {integrity: sha512-YzsSK4SlpC6e9Ki1g6O9B1UH7xvz/bzWF+tJ+vWDD8Am5xJmFn0jYnCEuqvzvH8dRKb1NFBmyuqEGqWN39xXsA==}
     peerDependencies:
       react: '>=17'
       react-dom: '>=17'
     dependencies:
-      '@xyflow/system': 0.0.63
+      '@xyflow/system': 0.0.57
       classcat: 5.0.5
       react: 18.3.1
       react-dom: 18.3.1(react@18.3.1)
-      zustand: 4.5.7(@types/react@18.3.11)(react@18.3.1)
+      zustand: 4.5.6(@types/react@18.3.11)(react@18.3.1)
     transitivePeerDependencies:
       - '@types/react'
       - immer
     dev: false
 
-  /@xyflow/system@0.0.63:
-    resolution: {integrity: sha512-lCZRh5o7RCPE7iNe3yKzV8UuS4hijVIWJ9nbQh9eowsRJOwgy5KlUnZ3Q43SOlRsZnOht8px5phpsjBHPRn+oQ==}
+  /@xyflow/system@0.0.57:
+    resolution: {integrity: sha512-1YpBo0WgmZLR5wQw9Jvk3Tu0gISi/oYc4uSimrDuAsA/G2rGleulLrKkM59uuT/QU5m6DYC2VdBDAzjSNMGuBA==}
     dependencies:
       '@types/d3-drag': 3.0.7
-      '@types/d3-interpolate': 3.0.4
       '@types/d3-selection': 3.0.11
       '@types/d3-transition': 3.0.9
       '@types/d3-zoom': 3.0.8
       d3-drag: 3.0.0
-      d3-interpolate: 3.0.1
       d3-selection: 3.0.0
       d3-zoom: 3.0.0
     dev: false
@@ -3908,7 +3899,7 @@ packages:
     resolution: {integrity: sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==}
     engines: {node: '>=10', npm: '>=6'}
     dependencies:
-      '@babel/runtime': 7.27.0
+      '@babel/runtime': 7.25.7
       cosmiconfig: 7.1.0
       resolve: 1.22.8
     dev: false
@@ -4501,19 +4492,6 @@ packages:
     resolution: {integrity: sha512-c68LpLbO+7kP/b1Hr1qs8/BJ09F5khZGTxqxZuhzxpmwJKOgRFHJWIb9/KmqnqHhLdO55aOxFH/EGBvUQbL/RQ==}
     dev: false
 
-  /dockview-core@4.4.0:
-    resolution: {integrity: sha512-UsBJwS3lfZXM+gaTA+bJs8rAxLd7ZEmNcUf5CbKKhiPeKIPJrNCxXxTLcnQb3IXMJUGkE0aX1ZJ4BDaZGMtzlA==}
-    dev: false
-
-  /dockview@4.4.0(react@18.3.1):
-    resolution: {integrity: sha512-cWi5R40R5kDky69vAqsKGznRx5tA0gk3Mdqe5aS2r4ollK951mWNJ/EeMmac+UP/juw4cbl0/APhXTV+EMnAbg==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
-    dependencies:
-      dockview-core: 4.4.0
-      react: 18.3.1
-    dev: false
-
   /doctrine@2.1.0:
     resolution: {integrity: sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==}
     engines: {node: '>=0.10.0'}
@@ -4539,7 +4517,7 @@ packages:
   /dom-helpers@5.2.1:
     resolution: {integrity: sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==}
     dependencies:
-      '@babel/runtime': 7.27.0
+      '@babel/runtime': 7.25.7
       csstype: 3.1.3
     dev: false
 
@@ -4762,8 +4740,9 @@ packages:
       is-symbol: 1.0.4
     dev: true
 
-  /es-toolkit@1.39.5:
-    resolution: {integrity: sha512-z9V0qU4lx1TBXDNFWfAASWk6RNU6c6+TJBKE+FLIg8u0XJ6Yw58Hi0yX8ftEouj6p1QARRlXLFfHbIli93BdQQ==}
+  /es-toolkit@1.36.0:
+    resolution: {integrity: sha512-5lpkRpDELuTSeAL//Rcg5urg+K/yOD1BobJSiNeCc89snMqgrhckmj8jdljqraDbpREiXTNW311RN518eVHBng==}
+    dev: true
 
   /esbuild-register@3.6.0(esbuild@0.25.3):
     resolution: {integrity: sha512-H2/S7Pm8a9CL1uhp9OvjwrBh5Pvx0H8qVOxNu8Wed9Y7qv56MPtq+GGM8RJpq6glYJn9Wspr8uw7l55uyinNeg==}
@@ -5301,8 +5280,8 @@ packages:
       signal-exit: 4.1.0
     dev: true
 
-  /fracturedjsonjs@4.1.0:
-    resolution: {integrity: sha512-qy6LPA8OOiiyRHt5/sNKDayD7h5r3uHmHxSOLbBsgtU/hkt5vOVWOR51MdfDbeCNfj7k/dKCRbXYm8FBAJcgWQ==}
+  /fracturedjsonjs@4.0.2:
+    resolution: {integrity: sha512-+vGJH9wK0EEhbbn50V2sOebLRaar1VL3EXr02kxchIwpkhQk0ItrPjIOtYPYuU9hNFpVzxjrPgzjtMJih+ae4A==}
     dev: false
 
   /framer-motion@10.18.0(react-dom@18.3.1)(react@18.3.1):
@@ -5631,20 +5610,20 @@ packages:
       - encoding
     dev: false
 
-  /i18next@25.2.1(typescript@5.8.3):
-    resolution: {integrity: sha512-+UoXK5wh+VlE1Zy5p6MjcvctHXAhRwQKCxiJD8noKZzIXmnAX8gdHX5fLPA3MEVxEN4vbZkQFy8N0LyD9tUqPw==}
+  /i18next@25.0.1(typescript@5.8.3):
+    resolution: {integrity: sha512-8S8PyZbrymJZn3DaN70/34JYWNhsqrU6yA4MuzcygJBv+41dgNMocEA8h+kV1P7MCc1ll03lOTOIXE7mpNCicw==}
     peerDependencies:
       typescript: ^5
     peerDependenciesMeta:
       typescript:
         optional: true
     dependencies:
-      '@babel/runtime': 7.27.6
+      '@babel/runtime': 7.27.0
       typescript: 5.8.3
     dev: false
 
-  /idb-keyval@6.2.2:
-    resolution: {integrity: sha512-yjD9nARJ/jb1g+CvD0tlhUHOrJ9Sy0P8T9MF3YaLlHnSRpwPfpTX0XIvpmw3gAJUmEu3FiICLBDPXVwyEvrleg==}
+  /idb-keyval@6.2.1:
+    resolution: {integrity: sha512-8Sb3veuYCyrZL+VBt9LJfZjLUPWVvqn8tG28VqYNFCo43KHcKuq+b4EiXGeuaLAQWL2YmyDgMp2aSpH9JHsEQg==}
     dev: false
 
   /ieee754@1.2.1:
@@ -6151,8 +6130,8 @@ packages:
       smol-toml: 1.3.4
       strip-json-comments: 5.0.1
       typescript: 5.8.3
-      zod: 3.25.67
-      zod-validation-error: 3.5.2(zod@3.25.67)
+      zod: 3.24.3
+      zod-validation-error: 3.4.0(zod@3.24.3)
     dev: true
 
   /kolorist@1.8.0:
@@ -6175,18 +6154,18 @@ packages:
     resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==}
     dev: false
 
-  /linkify-react@4.3.1(linkifyjs@4.3.1)(react@18.3.1):
-    resolution: {integrity: sha512-w8ahBdCwF9C/doS4V3nE93QF1oyORmosvi8UEUbpHYws077eGzhkxUzJQcE2/SU5Q2K7SD80M4ybwwZGHErx5Q==}
+  /linkify-react@4.2.0(linkifyjs@4.2.0)(react@18.3.1):
+    resolution: {integrity: sha512-dIcDGo+n4FP2FPIHDcqB7cUE+omkcEgQJpc7sNNP4+XZ9FUhFAkKjGnHMzsZM+B4yF93sK166z9K5cKTe/JpzA==}
     peerDependencies:
       linkifyjs: ^4.0.0
       react: '>= 15.0.0'
     dependencies:
-      linkifyjs: 4.3.1
+      linkifyjs: 4.2.0
       react: 18.3.1
     dev: false
 
-  /linkifyjs@4.3.1:
-    resolution: {integrity: sha512-DRSlB9DKVW04c4SUdGvKK5FR6be45lTU9M76JnngqPeeGDqPwYc0zdUErtsNVMtxPXgUWV4HbXbnC4sNyBxkYg==}
+  /linkifyjs@4.2.0:
+    resolution: {integrity: sha512-pCj3PrQyATaoTYKHrgWRF3SJwsm61udVh+vuls/Rl6SptiDhgE7ziUIudAedRY9QEfynmM7/RmLEfPUyw1HPCw==}
     dev: false
 
   /liqe@3.8.0:
@@ -6630,13 +6609,13 @@ packages:
       react: 18.3.1
     dev: false
 
-  /overlayscrollbars-react@0.5.6(overlayscrollbars@2.11.4)(react@18.3.1):
+  /overlayscrollbars-react@0.5.6(overlayscrollbars@2.11.1)(react@18.3.1):
     resolution: {integrity: sha512-E5To04bL5brn9GVCZ36SnfGanxa2I2MDkWoa4Cjo5wol7l+diAgi4DBc983V7l2nOk/OLJ6Feg4kySspQEGDBw==}
     peerDependencies:
       overlayscrollbars: ^2.0.0
       react: '>=16.8.0'
     dependencies:
-      overlayscrollbars: 2.11.4
+      overlayscrollbars: 2.11.1
       react: 18.3.1
     dev: false
 
@@ -6644,8 +6623,8 @@ packages:
     resolution: {integrity: sha512-diNMeEafWTE0A4GJfwRpdBp2rE/BEvrhptBdBcDu8/UeytWcdCy9Td8tZWnztJeJ26f8/uHCWfPnPUC/dtgJdw==}
     dev: false
 
-  /overlayscrollbars@2.11.4:
-    resolution: {integrity: sha512-GKYQo3OZ1QWnppNjQVv5hfpn+glYUxc6+ufW+ivdXUyLWFNc01XoH2Z36KGM4I8e5pXYeA3ElNItcXiLvmUhnQ==}
+  /overlayscrollbars@2.11.1:
+    resolution: {integrity: sha512-kogaNaBTIizRenQ2GTzt2cpkEH9B0nUBXseRxqQblH/YicJ3TaWuvn8E5TXPPfJCVoHYSgBYZzzva40kCERKHg==}
     dev: false
 
   /p-limit@3.1.0:
@@ -6851,8 +6830,8 @@ packages:
     resolution: {integrity: sha512-t41VRkMYbkHyCYmOvx/6URnN80H7k4X0lLdBMGsz+maAwrJQYB1djpV6vHrQIBE0WBSGqhtEHrK9U3DWWH8v7A==}
     dev: true
 
-  /query-string@9.2.1:
-    resolution: {integrity: sha512-3jTGGLRzlhu/1ws2zlr4Q+GVMLCQTLFOj8CMX5x44cdZG9FQE07x2mQhaNxaKVPNmIDu0mvJ/cEwtY7Pim7hqA==}
+  /query-string@9.1.1:
+    resolution: {integrity: sha512-MWkCOVIcJP9QSKU52Ngow6bsAWAPlPK2MludXvcrS2bGZSl+T1qX9MZvRIkqUIkGLJquMJHWfsT6eRqUpp4aWg==}
     engines: {node: '>=18'}
     dependencies:
       decode-uri-component: 0.4.1
@@ -6982,8 +6961,8 @@ packages:
       use-sidecar: 1.1.2(@types/react@18.3.11)(react@18.3.1)
     dev: false
 
-  /react-hook-form@7.58.1(react@18.3.1):
-    resolution: {integrity: sha512-Lml/KZYEEFfPhUVgE0RdCVpnC4yhW+PndRhbiTtdvSlQTL8IfVR+iQkBjLIvmmc6+GGoVeM11z37ktKFPAb0FA==}
+  /react-hook-form@7.56.1(react@18.3.1):
+    resolution: {integrity: sha512-qWAVokhSpshhcEuQDSANHx3jiAEFzu2HAaaQIzi/r9FNPm1ioAvuJSD4EuZzWd7Al7nTRKcKPnBKO7sRn+zavQ==}
     engines: {node: '>=18.0.0'}
     peerDependencies:
       react: ^16.8.0 || ^17 || ^18 || ^19
@@ -7001,8 +6980,8 @@ packages:
       react-dom: 18.3.1(react@18.3.1)
     dev: false
 
-  /react-i18next@15.5.3(i18next@25.2.1)(react-dom@18.3.1)(react@18.3.1)(typescript@5.8.3):
-    resolution: {integrity: sha512-ypYmOKOnjqPEJZO4m1BI0kS8kWqkBNsKYyhVUfij0gvjy9xJNoG/VcGkxq5dRlVwzmrmY1BQMAmpbbUBLwC4Kw==}
+  /react-i18next@15.5.1(i18next@25.0.1)(react-dom@18.3.1)(react@18.3.1)(typescript@5.8.3):
+    resolution: {integrity: sha512-C8RZ7N7H0L+flitiX6ASjq9p5puVJU1Z8VyL3OgM/QOMRf40BMZX+5TkpxzZVcTmOLPX5zlti4InEX5pFyiVeA==}
     peerDependencies:
       i18next: '>= 23.2.3'
       react: '>= 16.8.0'
@@ -7017,9 +6996,9 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@babel/runtime': 7.27.6
+      '@babel/runtime': 7.27.0
       html-parse-stringify: 3.0.1
-      i18next: 25.2.1(typescript@5.8.3)
+      i18next: 25.0.1(typescript@5.8.3)
       react: 18.3.1
       react-dom: 18.3.1(react@18.3.1)
       typescript: 5.8.3
@@ -7129,8 +7108,8 @@ packages:
       use-sidecar: 1.1.3(@types/react@18.3.11)(react@18.3.1)
     dev: false
 
-  /react-resizable-panels@3.0.3(react-dom@18.3.1)(react@18.3.1):
-    resolution: {integrity: sha512-7HA8THVBHTzhDK4ON0tvlGXyMAJN1zBeRpuyyremSikgYh2ku6ltD7tsGQOcXx4NKPrZtYCm/5CBr+dkruTGQw==}
+  /react-resizable-panels@2.1.8(react-dom@18.3.1)(react@18.3.1):
+    resolution: {integrity: sha512-oDvD0sw34Ecx00cQFLiRJpAE2fCgNLBr8DMrBzkrsaUiLpAycIQoY3eAWfMblDql3pTIMZ60wJ/P89RO1htM2w==}
     peerDependencies:
       react: ^16.14.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc
       react-dom: ^16.14.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc
@@ -7278,8 +7257,8 @@ packages:
       tslib: 2.8.1
     dev: false
 
-  /react-virtuoso@4.13.0(react-dom@18.3.1)(react@18.3.1):
-    resolution: {integrity: sha512-XHv2Fglpx80yFPdjZkV9d1baACKghg/ucpDFEXwaix7z0AfVQj+mF6lM+YQR6UC/TwzXG2rJKydRMb3+7iV3PA==}
+  /react-virtuoso@4.12.6(react-dom@18.3.1)(react@18.3.1):
+    resolution: {integrity: sha512-bfvS6aCL1ehXmq39KRiz/vxznGUbtA27I5I24TYCe1DhMf84O3aVNCIwrSjYQjkJGJGzY46ihdN8WkYlemuhMQ==}
     peerDependencies:
       react: '>=16 || >=17 || >= 18 || >= 19'
       react-dom: '>=16 || >=17 || >= 18 || >=19'
@@ -7775,8 +7754,8 @@ packages:
     resolution: {integrity: sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==}
     dev: true
 
-  /stable-hash@0.0.6:
-    resolution: {integrity: sha512-0afH4mobqTybYZsXImQRLOjHV4gvOW+92HdUIax9t7a8d9v54KWykEuMVIcXhD9BCi+w3kS4x7O6fmZQ3JlG/g==}
+  /stable-hash@0.0.5:
+    resolution: {integrity: sha512-+L3ccpzibovGXFK+Ap/f8LOS0ahMrHTf3xu7mMLSpEGU0EO9ucaysSylKo9eRDFNhWve/y275iPmIZ4z39a9iA==}
     dev: false
 
   /stack-generator@2.0.10:
@@ -8329,8 +8308,8 @@ packages:
       react: 18.3.1
     dev: false
 
-  /use-debounce@10.0.5(react@18.3.1):
-    resolution: {integrity: sha512-Q76E3lnIV+4YT9AHcrHEHYmAd9LKwUAbPXDm7FlqVGDHiSOhX3RDjT8dm0AxbJup6WgOb1YEcKyCr11kBJR5KQ==}
+  /use-debounce@10.0.4(react@18.3.1):
+    resolution: {integrity: sha512-6Cf7Yr7Wk7Kdv77nnJMf6de4HuDE4dTxKij+RqE9rufDsI6zsbjyAxcH5y2ueJCQAnfgKbzXbZHYlkFwmBlWkw==}
     engines: {node: '>= 16.0.0'}
     peerDependencies:
       react: '*'
@@ -8868,19 +8847,19 @@ packages:
     engines: {node: '>=10'}
     dev: true
 
-  /zod-validation-error@3.5.2(zod@3.25.67):
-    resolution: {integrity: sha512-mdi7YOLtram5dzJ5aDtm1AG9+mxRma1iaMrZdYIpFO7epdKBUwLHIxTF8CPDeCQ828zAXYtizrKlEJAtzgfgrw==}
+  /zod-validation-error@3.4.0(zod@3.24.3):
+    resolution: {integrity: sha512-ZOPR9SVY6Pb2qqO5XHt+MkkTRxGXb4EVtnjc9JpXUOtUB1T9Ru7mZOT361AN3MsetVe7R0a1KZshJDZdgp9miQ==}
     engines: {node: '>=18.0.0'}
     peerDependencies:
-      zod: ^3.25.0
+      zod: ^3.18.0
     dependencies:
-      zod: 3.25.67
+      zod: 3.24.3
 
-  /zod@3.25.67:
-    resolution: {integrity: sha512-idA2YXwpCdqUSKRCACDE6ItZD9TZzy3OZMtpfLoh6oPR47lipysRrJfjzMqFxQ3uJuUPyUeWe1r9vLH33xO/Qw==}
+  /zod@3.24.3:
+    resolution: {integrity: sha512-HhY1oqzWCQWuUqvBFnsyrtZRhyPeR7SUGv+C4+MsisMuVfSPx8HpwWqH8tRahSlt6M3PiFAcoeFhZAqIXTxoSg==}
 
-  /zustand@4.5.7(@types/react@18.3.11)(react@18.3.1):
-    resolution: {integrity: sha512-CHOUy7mu3lbD6o6LJLfllpjkzhHXSBlX8B9+qPddUsIfeF5S/UZ5q0kmCsnRqT1UHFQZchNFDDzMbQsuesHWlw==}
+  /zustand@4.5.6(@types/react@18.3.11)(react@18.3.1):
+    resolution: {integrity: sha512-ibr/n1hBzLLj5Y+yUcU7dYw8p6WnIVzdJbnX+1YpaScvZVF2ziugqHs+LAmHw4lWO9c/zRj+K1ncgWDQuthEdQ==}
     engines: {node: '>=12.7.0'}
     peerDependencies:
       '@types/react': '>=16.8'

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

@@ -1147,7 +1147,6 @@
             "modelIncompatibleScaledBboxWidth": "Scaled bbox width is {{width}} but {{model}} requires multiple of {{multiple}}",
             "modelIncompatibleScaledBboxHeight": "Scaled bbox height is {{height}} but {{model}} requires multiple of {{multiple}}",
             "fluxModelMultipleControlLoRAs": "Can only use 1 Control LoRA at a time",
-            "fluxKontextMultipleReferenceImages": "Can only use 1 Reference Image at a time with Flux Kontext",
             "canvasIsFiltering": "Canvas is busy (filtering)",
             "canvasIsTransforming": "Canvas is busy (transforming)",
             "canvasIsRasterizing": "Canvas is busy (rasterizing)",
@@ -1338,7 +1337,6 @@
         "fluxFillIncompatibleWithT2IAndI2I": "FLUX Fill is not compatible with Text to Image or Image to Image. Use other FLUX models for these tasks.",
         "imagenIncompatibleGenerationMode": "Google {{model}} supports Text to Image only. Use other models for Image to Image, Inpainting and Outpainting tasks.",
         "chatGPT4oIncompatibleGenerationMode": "ChatGPT 4o supports Text to Image and Image to Image only. Use other models Inpainting and Outpainting tasks.",
-        "fluxKontextIncompatibleGenerationMode": "Flux Kontext supports Text to Image only. Use other models for Image to Image, Inpainting and Outpainting tasks.",
         "problemUnpublishingWorkflow": "Problem Unpublishing Workflow",
         "problemUnpublishingWorkflowDescription": "There was a problem unpublishing the workflow. Please try again.",
         "workflowUnpublished": "Workflow Unpublished"

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

@@ -3,7 +3,7 @@ import { useStore } from '@nanostores/react';
 import { GlobalHookIsolator } from 'app/components/GlobalHookIsolator';
 import { GlobalModalIsolator } from 'app/components/GlobalModalIsolator';
 import type { StudioInitAction } from 'app/hooks/useStudioInitAction';
-import { $globalIsLoading } from 'app/store/nanostores/globalIsLoading';
+import { $didStudioInit } from 'app/hooks/useStudioInitAction';
 import type { PartialAppConfig } from 'app/types/invokeai';
 import Loading from 'common/components/Loading/Loading';
 import { useClearStorage } from 'common/hooks/useClearStorage';
@@ -20,7 +20,7 @@ interface Props {
 }
 
 const App = ({ config = DEFAULT_CONFIG, studioInitAction }: Props) => {
-  const globalIsLoading = useStore($globalIsLoading);
+  const didStudioInit = useStore($didStudioInit);
   const clearStorage = useClearStorage();
 
   const handleReset = useCallback(() => {
@@ -33,7 +33,7 @@ const App = ({ config = DEFAULT_CONFIG, studioInitAction }: Props) => {
     <ErrorBoundary onReset={handleReset} FallbackComponent={AppErrorBoundaryFallback}>
       <Box id="invoke-app-wrapper" w="100dvw" h="100dvh" position="relative" overflow="hidden">
         <AppContent />
-        {globalIsLoading && <Loading />}
+        {!didStudioInit && <Loading />}
       </Box>
       <GlobalHookIsolator config={config} studioInitAction={studioInitAction} />
       <GlobalModalIsolator />

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

@@ -10,14 +10,16 @@ import type { PartialAppConfig } from 'app/types/invokeai';
 import { useFocusRegionWatcher } from 'common/hooks/focus';
 import { useCloseChakraTooltipsOnDragFix } from 'common/hooks/useCloseChakraTooltipsOnDragFix';
 import { useGlobalHotkeys } from 'common/hooks/useGlobalHotkeys';
-import { size } from 'es-toolkit/compat';
 import { useDynamicPromptsWatcher } from 'features/dynamicPrompts/hooks/useDynamicPromptsWatcher';
+import { toggleImageViewer } from 'features/gallery/components/ImageViewer/useImageViewer';
 import { useStarterModelsToast } from 'features/modelManagerV2/hooks/useStarterModelsToast';
 import { useWorkflowBuilderWatcher } from 'features/nodes/components/sidePanel/workflow/IsolatedWorkflowBuilderWatcher';
 import { useReadinessWatcher } from 'features/queue/store/readiness';
+import { useRegisteredHotkeys } from 'features/system/components/HotkeysModal/useHotkeyData';
 import { configChanged } from 'features/system/store/configSlice';
 import { selectLanguage } from 'features/system/store/systemSelectors';
 import i18n from 'i18n';
+import { size } from 'lodash-es';
 import { memo, useEffect } from 'react';
 import { useGetOpenAPISchemaQuery } from 'services/api/endpoints/appInfo';
 import { useGetQueueCountsByDestinationQuery } from 'services/api/endpoints/queue';
@@ -70,6 +72,12 @@ export const GlobalHookIsolator = memo(
     useWorkflowBuilderWatcher();
     useDynamicPromptsWatcher();
 
+    useRegisteredHotkeys({
+      id: 'toggleViewer',
+      category: 'viewer',
+      callback: toggleImageViewer,
+    });
+
     return null;
   }
 );

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

@@ -7,13 +7,11 @@ import { selectLastSelectedImage } from 'features/gallery/store/gallerySelectors
 import { useRegisteredHotkeys } from 'features/system/components/HotkeysModal/useHotkeyData';
 import { useFeatureStatus } from 'features/system/hooks/useFeatureStatus';
 import { memo } from 'react';
-import { useImageDTO } from 'services/api/endpoints/images';
 import type { ImageDTO } from 'services/api/types';
 
 export const GlobalImageHotkeys = memo(() => {
   useAssertSingleton('GlobalImageHotkeys');
-  const imageName = useAppSelector(selectLastSelectedImage);
-  const imageDTO = useImageDTO(imageName);
+  const imageDTO = useAppSelector(selectLastSelectedImage);
 
   if (!imageDTO) {
     return null;

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

@@ -11,6 +11,7 @@ import { FullscreenDropzone } from 'features/dnd/FullscreenDropzone';
 import { DynamicPromptsModal } from 'features/dynamicPrompts/components/DynamicPromptsPreviewModal';
 import DeleteBoardModal from 'features/gallery/components/Boards/DeleteBoardModal';
 import { ImageContextMenu } from 'features/gallery/components/ImageContextMenu/ImageContextMenu';
+import { ImageViewerModal } from 'features/gallery/components/ImageViewer/ImageViewer';
 import { ShareWorkflowModal } from 'features/nodes/components/sidePanel/workflow/WorkflowLibrary/ShareWorkflowModal';
 import { WorkflowLibraryModal } from 'features/nodes/components/sidePanel/workflow/WorkflowLibrary/WorkflowLibraryModal';
 import { CancelAllExceptCurrentQueueItemConfirmationAlertDialog } from 'features/queue/components/CancelAllExceptCurrentQueueItemConfirmationAlertDialog';
@@ -60,6 +61,7 @@ export const GlobalModalIsolator = memo(() => {
         <CanvasPasteModal />
       </CanvasManagerProviderGate>
       <LoadWorkflowFromGraphModal />
+      <ImageViewerModal />
     </>
   );
 });

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

@@ -1,7 +1,6 @@
 import '@fontsource-variable/inter';
 import 'overlayscrollbars/overlayscrollbars.css';
 import '@xyflow/react/dist/base.css';
-import 'common/components/OverlayScrollbars/overlayscrollbars.css';
 
 import { ChakraProvider, DarkMode, extendTheme, theme as _theme, TOAST_OPTIONS } from '@invoke-ai/ui-library';
 import type { ReactNode } from 'react';

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

@@ -7,6 +7,7 @@ import { rasterLayerAdded } from 'features/controlLayers/store/canvasSlice';
 import { paramsReset } from 'features/controlLayers/store/paramsSlice';
 import type { CanvasRasterLayerState } from 'features/controlLayers/store/types';
 import { imageDTOToImageObject } from 'features/controlLayers/store/util';
+import { $imageViewer } from 'features/gallery/components/ImageViewer/useImageViewer';
 import { sentImageToCanvas } from 'features/gallery/store/actions';
 import { parseAndRecallAllMetadata } from 'features/metadata/util/handlers';
 import { $hasTemplates } from 'features/nodes/store/nodesSlice';
@@ -93,6 +94,7 @@ export const useStudioInitAction = (action?: StudioInitAction) => {
       store.dispatch(canvasReset());
       store.dispatch(rasterLayerAdded({ overrides, isSelected: true }));
       store.dispatch(sentImageToCanvas());
+      $imageViewer.set(false);
       toast({
         title: t('toast.sentToCanvas'),
         status: 'info',
@@ -162,10 +164,12 @@ export const useStudioInitAction = (action?: StudioInitAction) => {
           // Go to the canvas tab, open the image viewer, and enable send-to-gallery mode
           store.dispatch(paramsReset());
           store.dispatch(activeTabCanvasRightPanelChanged('gallery'));
+          $imageViewer.set(true);
           break;
         case 'canvas':
           // Go to the canvas tab, close the image viewer, and disable send-to-gallery mode
           store.dispatch(canvasReset());
+          $imageViewer.set(false);
           break;
         case 'workflows':
           // Go to the workflows tab

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

@@ -2,7 +2,7 @@ import { createLogWriter } from '@roarr/browser-log-writer';
 import { atom } from 'nanostores';
 import type { Logger, MessageSerializer } from 'roarr';
 import { ROARR, Roarr } from 'roarr';
-import { z } from 'zod/v4';
+import { z } from 'zod';
 
 const serializeMessage: MessageSerializer = (message) => {
   return JSON.stringify(message);

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

@@ -1,13 +1,13 @@
-import { objectEquals } from '@observ33r/object-equals';
 import { createDraftSafeSelectorCreator, createSelectorCreator, lruMemoize } from '@reduxjs/toolkit';
+import { isEqual } from 'lodash-es';
 
 /**
- * A memoized selector creator that uses LRU cache and @observ33r/object-equals's objectEquals for equality check.
+ * A memoized selector creator that uses LRU cache and lodash's isEqual for equality check.
  */
 export const createMemoizedSelector = createSelectorCreator({
   memoize: lruMemoize,
   memoizeOptions: {
-    resultEqualityCheck: objectEquals,
+    resultEqualityCheck: isEqual,
   },
   argsMemoize: lruMemoize,
 });

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

@@ -8,13 +8,10 @@ import { diff } from 'jsondiffpatch';
  * Super simple logger middleware. Useful for debugging when the redux devtools are awkward.
  */
 export const getDebugLoggerMiddleware =
-  (options?: { filter?: (action: unknown) => boolean; withDiff?: boolean; withNextState?: boolean }): Middleware =>
+  (options?: { withDiff?: boolean; withNextState?: boolean }): Middleware =>
   (api: MiddlewareAPI) =>
   (next) =>
   (action) => {
-    if (options?.filter?.(action)) {
-      return next(action);
-    }
     const originalState = api.getState();
     console.log('REDUX: dispatching', action);
     const result = next(action);

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

@@ -9,9 +9,14 @@ import { addDeleteBoardAndImagesFulfilledListener } from 'app/store/middleware/l
 import { addBoardIdSelectedListener } from 'app/store/middleware/listenerMiddleware/listeners/boardIdSelected';
 import { addBulkDownloadListeners } from 'app/store/middleware/listenerMiddleware/listeners/bulkDownload';
 import { addEnqueueRequestedLinear } from 'app/store/middleware/listenerMiddleware/listeners/enqueueRequestedLinear';
+import { addEnsureImageIsSelectedListener } from 'app/store/middleware/listenerMiddleware/listeners/ensureImageIsSelectedListener';
+import { addGalleryImageClickedListener } from 'app/store/middleware/listenerMiddleware/listeners/galleryImageClicked';
+import { addGalleryOffsetChangedListener } from 'app/store/middleware/listenerMiddleware/listeners/galleryOffsetChanged';
 import { addGetOpenAPISchemaListener } from 'app/store/middleware/listenerMiddleware/listeners/getOpenAPISchema';
 import { addImageAddedToBoardFulfilledListener } from 'app/store/middleware/listenerMiddleware/listeners/imageAddedToBoard';
 import { addImageRemovedFromBoardFulfilledListener } from 'app/store/middleware/listenerMiddleware/listeners/imageRemovedFromBoard';
+import { addImagesStarredListener } from 'app/store/middleware/listenerMiddleware/listeners/imagesStarred';
+import { addImagesUnstarredListener } from 'app/store/middleware/listenerMiddleware/listeners/imagesUnstarred';
 import { addImageUploadedFulfilledListener } from 'app/store/middleware/listenerMiddleware/listeners/imageUploaded';
 import { addModelSelectedListener } from 'app/store/middleware/listenerMiddleware/listeners/modelSelected';
 import { addModelsLoadedListener } from 'app/store/middleware/listenerMiddleware/listeners/modelsLoaded';
@@ -42,6 +47,14 @@ addImageUploadedFulfilledListener(startAppListening);
 // Image deleted
 addDeleteBoardAndImagesFulfilledListener(startAppListening);
 
+// Image starred
+addImagesStarredListener(startAppListening);
+addImagesUnstarredListener(startAppListening);
+
+// Gallery
+addGalleryImageClickedListener(startAppListening);
+addGalleryOffsetChangedListener(startAppListening);
+
 // User Invoked
 addEnqueueRequestedLinear(startAppListening);
 addEnqueueRequestedUpscale(startAppListening);
@@ -75,3 +88,5 @@ addAppConfigReceivedListener(startAppListening);
 addAdHocPostProcessingRequestedListener(startAppListening);
 
 addSetDefaultSettingsListener(startAppListening);
+
+addEnsureImageIsSelectedListener(startAppListening);

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

@@ -25,7 +25,7 @@ export const addArchivedOrDeletedBoardListener = (startAppListening: AppStartLis
     matcher: matchAnyBoardDeleted,
     effect: (action, { dispatch, getState }) => {
       const state = getState();
-      const deletedBoardId = action.meta.arg.originalArgs.board_id;
+      const deletedBoardId = action.meta.arg.originalArgs;
       const { autoAddBoardId, selectedBoardId } = state.gallery;
 
       // If the deleted board was currently selected, we should reset the selected board to uncategorized

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

@@ -1,29 +1,15 @@
 import { createAction } from '@reduxjs/toolkit';
 import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
-import { selectLastSelectedImage } from 'features/gallery/store/gallerySelectors';
-import { imageSelected } from 'features/gallery/store/gallerySlice';
-import { imagesApi } from 'services/api/endpoints/images';
 
 export const appStarted = createAction('app/appStarted');
 
 export const addAppStartedListener = (startAppListening: AppStartListening) => {
   startAppListening({
     actionCreator: appStarted,
-    effect: async (action, { unsubscribe, cancelActiveListeners, take, getState, dispatch }) => {
+    effect: (action, { unsubscribe, cancelActiveListeners }) => {
       // this should only run once
       cancelActiveListeners();
       unsubscribe();
-
-      // ensure an image is selected when we load the first board
-      const firstImageLoad = await take(imagesApi.endpoints.getImageNames.matchFulfilled);
-      if (firstImageLoad !== null) {
-        const [{ payload }] = firstImageLoad;
-        const selectedImage = selectLastSelectedImage(getState());
-        if (selectedImage) {
-          return;
-        }
-        dispatch(imageSelected(payload.image_names.at(0) ?? null));
-      }
     },
   });
 };

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

@@ -1,9 +1,9 @@
 import { logger } from 'app/logging/logger';
 import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
-import { truncate } from 'es-toolkit/compat';
 import { zPydanticValidationError } from 'features/system/store/zodSchemas';
 import { toast } from 'features/toast/toast';
 import { t } from 'i18next';
+import { truncate } from 'lodash-es';
 import { serializeError } from 'serialize-error';
 import { queueApi } from 'services/api/endpoints/queue';
 import type { JsonObject } from 'type-fest';

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

@@ -1,6 +1,6 @@
 import { isAnyOf } from '@reduxjs/toolkit';
 import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
-import { selectListImageNamesQueryArgs, selectSelectedBoardId } from 'features/gallery/store/gallerySelectors';
+import { selectListImagesQueryArgs } from 'features/gallery/store/gallerySelectors';
 import { boardIdSelected, galleryViewChanged, imageSelected } from 'features/gallery/store/gallerySlice';
 import { imagesApi } from 'services/api/endpoints/images';
 
@@ -11,35 +11,36 @@ export const addBoardIdSelectedListener = (startAppListening: AppStartListening)
       // Cancel any in-progress instances of this listener, we don't want to select an image from a previous board
       cancelActiveListeners();
 
-      if (boardIdSelected.match(action) && action.payload.selectedImageName) {
-        // This action already has a selected image name, we trust it is valid
-        return;
-      }
-
       const state = getState();
 
-      const board_id = selectSelectedBoardId(state);
-
-      const queryArgs = { ...selectListImageNamesQueryArgs(state), board_id };
+      const queryArgs = selectListImagesQueryArgs(state);
 
       // wait until the board has some images - maybe it already has some from a previous fetch
       // must use getState() to ensure we do not have stale state
       const isSuccess = await condition(
-        () => imagesApi.endpoints.getImageNames.select(queryArgs)(getState()).isSuccess,
+        () => imagesApi.endpoints.listImages.select(queryArgs)(getState()).isSuccess,
         5000
       );
 
-      if (!isSuccess) {
+      if (isSuccess) {
+        // the board was just changed - we can select the first image
+        const { data: boardImagesData } = imagesApi.endpoints.listImages.select(queryArgs)(getState());
+
+        if (boardImagesData && boardIdSelected.match(action) && action.payload.selectedImageName) {
+          const selectedImage = boardImagesData.items.find(
+            (item) => item.image_name === action.payload.selectedImageName
+          );
+          dispatch(imageSelected(selectedImage || null));
+        } else if (boardImagesData) {
+          dispatch(imageSelected(boardImagesData.items[0] || null));
+        } else {
+          // board has no images - deselect
+          dispatch(imageSelected(null));
+        }
+      } else {
+        // fallback - deselect
         dispatch(imageSelected(null));
-        return;
       }
-
-      // the board was just changed - we can select the first image
-      const imageNames = imagesApi.endpoints.getImageNames.select(queryArgs)(getState()).data?.image_names;
-
-      const imageToSelect = imageNames?.at(0) ?? null;
-
-      dispatch(imageSelected(imageToSelect));
     },
   });
 };

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

@@ -16,7 +16,6 @@ import { prepareLinearUIBatch } from 'features/nodes/util/graph/buildLinearBatch
 import { buildChatGPT4oGraph } from 'features/nodes/util/graph/generation/buildChatGPT4oGraph';
 import { buildCogView4Graph } from 'features/nodes/util/graph/generation/buildCogView4Graph';
 import { buildFLUXGraph } from 'features/nodes/util/graph/generation/buildFLUXGraph';
-import { buildFluxKontextGraph } from 'features/nodes/util/graph/generation/buildFluxKontextGraph';
 import { buildImagen3Graph } from 'features/nodes/util/graph/generation/buildImagen3Graph';
 import { buildImagen4Graph } from 'features/nodes/util/graph/generation/buildImagen4Graph';
 import { buildSD1Graph } from 'features/nodes/util/graph/generation/buildSD1Graph';
@@ -90,8 +89,6 @@ export const addEnqueueRequestedLinear = (startAppListening: AppStartListening)
             return await buildImagen4Graph(state, manager);
           case 'chatgpt-4o':
             return await buildChatGPT4oGraph(state, manager);
-          case 'flux-kontext':
-            return await buildFluxKontextGraph(state, manager);
           default:
             assert(false, `No graph builders for base ${base}`);
         }
@@ -127,7 +124,7 @@ export const addEnqueueRequestedLinear = (startAppListening: AppStartListening)
           prepend,
           seedFieldIdentifier,
           positivePromptFieldIdentifier,
-          origin: tab,
+          origin: 'canvas',
           destination,
         })
       );

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

@@ -0,0 +1,16 @@
+import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
+import { imageSelected } from 'features/gallery/store/gallerySlice';
+import { imagesApi } from 'services/api/endpoints/images';
+
+export const addEnsureImageIsSelectedListener = (startAppListening: AppStartListening) => {
+  // When we list images, if no images is selected, select the first one.
+  startAppListening({
+    matcher: imagesApi.endpoints.listImages.matchFulfilled,
+    effect: (action, { dispatch, getState }) => {
+      const selection = getState().gallery.selection;
+      if (selection.length === 0) {
+        dispatch(imageSelected(action.payload.items[0] ?? null));
+      }
+    },
+  });
+};

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

@@ -0,0 +1,73 @@
+import { createAction } from '@reduxjs/toolkit';
+import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
+import { selectListImagesQueryArgs } from 'features/gallery/store/gallerySelectors';
+import { imageToCompareChanged, selectionChanged } from 'features/gallery/store/gallerySlice';
+import { imagesApi } from 'services/api/endpoints/images';
+import type { ImageDTO } from 'services/api/types';
+
+export const galleryImageClicked = createAction<{
+  imageDTO: ImageDTO;
+  shiftKey: boolean;
+  ctrlKey: boolean;
+  metaKey: boolean;
+  altKey: boolean;
+}>('gallery/imageClicked');
+
+/**
+ * This listener handles the logic for selecting images in the gallery.
+ *
+ * Previously, this logic was in a `useCallback` with the whole gallery selection as a dependency. Every time
+ * the selection changed, the callback got recreated and all images rerendered. This could easily block for
+ * hundreds of ms, more for lower end devices.
+ *
+ * Moving this logic into a listener means we don't need to recalculate anything dynamically and the gallery
+ * is much more responsive.
+ */
+
+export const addGalleryImageClickedListener = (startAppListening: AppStartListening) => {
+  startAppListening({
+    actionCreator: galleryImageClicked,
+    effect: (action, { dispatch, getState }) => {
+      const { imageDTO, shiftKey, ctrlKey, metaKey, altKey } = action.payload;
+      const state = getState();
+      const queryArgs = selectListImagesQueryArgs(state);
+      const queryResult = imagesApi.endpoints.listImages.select(queryArgs)(state);
+
+      if (!queryResult.data) {
+        // Should never happen if we have clicked a gallery image
+        return;
+      }
+
+      const imageDTOs = queryResult.data.items;
+      const selection = state.gallery.selection;
+
+      if (altKey) {
+        if (state.gallery.imageToCompare?.image_name === imageDTO.image_name) {
+          dispatch(imageToCompareChanged(null));
+        } else {
+          dispatch(imageToCompareChanged(imageDTO));
+        }
+      } else if (shiftKey) {
+        const rangeEndImageName = imageDTO.image_name;
+        const lastSelectedImage = selection[selection.length - 1]?.image_name;
+        const lastClickedIndex = imageDTOs.findIndex((n) => n.image_name === lastSelectedImage);
+        const currentClickedIndex = imageDTOs.findIndex((n) => n.image_name === rangeEndImageName);
+        if (lastClickedIndex > -1 && currentClickedIndex > -1) {
+          // We have a valid range!
+          const start = Math.min(lastClickedIndex, currentClickedIndex);
+          const end = Math.max(lastClickedIndex, currentClickedIndex);
+          const imagesToSelect = imageDTOs.slice(start, end + 1);
+          dispatch(selectionChanged(selection.concat(imagesToSelect)));
+        }
+      } else if (ctrlKey || metaKey) {
+        if (selection.some((i) => i.image_name === imageDTO.image_name) && selection.length > 1) {
+          dispatch(selectionChanged(selection.filter((n) => n.image_name !== imageDTO.image_name)));
+        } else {
+          dispatch(selectionChanged(selection.concat(imageDTO)));
+        }
+      } else {
+        dispatch(selectionChanged([imageDTO]));
+      }
+    },
+  });
+};

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

@@ -0,0 +1,119 @@
+import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
+import { selectListImagesQueryArgs } from 'features/gallery/store/gallerySelectors';
+import { imageToCompareChanged, offsetChanged, selectionChanged } from 'features/gallery/store/gallerySlice';
+import { imagesApi } from 'services/api/endpoints/images';
+
+export const addGalleryOffsetChangedListener = (startAppListening: AppStartListening) => {
+  /**
+   * When the user changes pages in the gallery, we need to wait until the next page of images is loaded, then maybe
+   * update the selection.
+   *
+   * There are a three scenarios:
+   *
+   * 1. The page is changed by clicking the pagination buttons. No changes to selection are needed.
+   *
+   * 2. The page is changed by using the arrow keys (without alt).
+   * - When going backwards, select the last image.
+   * - When going forwards, select the first image.
+   *
+   * 3. The page is changed by using the arrows keys with alt. This means the user is changing the comparison image.
+   * - When going backwards, select the last image _as the comparison image_.
+   * - When going forwards, select the first image _as the comparison image_.
+   */
+  startAppListening({
+    actionCreator: offsetChanged,
+    effect: async (action, { dispatch, getState, getOriginalState, take, cancelActiveListeners }) => {
+      // Cancel any active listeners to prevent the selection from changing without user input
+      cancelActiveListeners();
+
+      const { withHotkey } = action.payload;
+
+      if (!withHotkey) {
+        // User changed pages by clicking the pagination buttons - no changes to selection
+        return;
+      }
+
+      const originalState = getOriginalState();
+      const prevOffset = originalState.gallery.offset;
+      const offset = getState().gallery.offset;
+
+      if (offset === prevOffset) {
+        // The page didn't change - bail
+        return;
+      }
+
+      /**
+       * We need to wait until the next page of images is loaded before updating the selection, so we use the correct
+       * page of images.
+       *
+       * The simplest way to do it would be to use `take` to wait for the next fulfilled action, but RTK-Q doesn't
+       * dispatch an action on cache hits. This means the `take` will only return if the cache is empty. If the user
+       * changes to a cached page - a common situation - the `take` will never resolve.
+       *
+       * So we need to take a two-step approach. First, check if we have data in the cache for the page of images. If
+       * we have data cached, use it to update the selection. If we don't have data cached, wait for the next fulfilled
+       * action, which updates the cache, then use the cache to update the selection.
+       */
+
+      // Check if we have data in the cache for the page of images
+      const queryArgs = selectListImagesQueryArgs(getState());
+      let { data } = imagesApi.endpoints.listImages.select(queryArgs)(getState());
+
+      // No data yet - wait for the network request to complete
+      if (!data) {
+        const takeResult = await take(imagesApi.endpoints.listImages.matchFulfilled, 5000);
+        if (!takeResult) {
+          // The request didn't complete in time - bail
+          return;
+        }
+        data = takeResult[0].payload;
+      }
+
+      // We awaited a network request - state could have changed, get fresh state
+      const state = getState();
+      const { selection, imageToCompare } = state.gallery;
+      const imageDTOs = data?.items;
+
+      if (!imageDTOs) {
+        // The page didn't load - bail
+        return;
+      }
+
+      if (withHotkey === 'arrow') {
+        // User changed pages by using the arrow keys - selection changes to first or last image depending
+        if (offset < prevOffset) {
+          // We've gone backwards
+          const lastImage = imageDTOs[imageDTOs.length - 1];
+          if (!selection.some((selectedImage) => selectedImage.image_name === lastImage?.image_name)) {
+            dispatch(selectionChanged(lastImage ? [lastImage] : []));
+          }
+        } else {
+          // We've gone forwards
+          const firstImage = imageDTOs[0];
+          if (!selection.some((selectedImage) => selectedImage.image_name === firstImage?.image_name)) {
+            dispatch(selectionChanged(firstImage ? [firstImage] : []));
+          }
+        }
+        return;
+      }
+
+      if (withHotkey === 'alt+arrow') {
+        // User changed pages by using the arrow keys with alt - comparison image changes to first or last depending
+        if (offset < prevOffset) {
+          // We've gone backwards
+          const lastImage = imageDTOs[imageDTOs.length - 1];
+          if (lastImage && imageToCompare?.image_name !== lastImage.image_name) {
+            dispatch(imageToCompareChanged(lastImage));
+          }
+        } else {
+          // We've gone forwards
+          const firstImage = imageDTOs[0];
+          if (firstImage && imageToCompare?.image_name !== firstImage.image_name) {
+            dispatch(imageToCompareChanged(firstImage));
+          }
+        }
+        return;
+      }
+    },
+  });
+};

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

@@ -1,9 +1,9 @@
 import { logger } from 'app/logging/logger';
 import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
 import { parseify } from 'common/util/serialize';
-import { size } from 'es-toolkit/compat';
 import { $templates } from 'features/nodes/store/nodesSlice';
 import { parseSchema } from 'features/nodes/util/schema/parseSchema';
+import { size } from 'lodash-es';
 import { serializeError } from 'serialize-error';
 import { appInfoApi } from 'services/api/endpoints/appInfo';
 import type { JsonObject } from 'type-fest';

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

@@ -8,16 +8,16 @@ export const addImageAddedToBoardFulfilledListener = (startAppListening: AppStar
   startAppListening({
     matcher: imagesApi.endpoints.addImageToBoard.matchFulfilled,
     effect: (action) => {
-      const { board_id, image_name } = action.meta.arg.originalArgs;
-      log.debug({ board_id, image_name }, 'Image added to board');
+      const { board_id, imageDTO } = action.meta.arg.originalArgs;
+      log.debug({ board_id, imageDTO }, 'Image added to board');
     },
   });
 
   startAppListening({
     matcher: imagesApi.endpoints.addImageToBoard.matchRejected,
     effect: (action) => {
-      const { board_id, image_name } = action.meta.arg.originalArgs;
-      log.debug({ board_id, image_name }, 'Problem adding image to board');
+      const { board_id, imageDTO } = action.meta.arg.originalArgs;
+      log.debug({ board_id, imageDTO }, 'Problem adding image to board');
     },
   });
 };

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

@@ -2,12 +2,12 @@ import { isAnyOf } from '@reduxjs/toolkit';
 import { logger } from 'app/logging/logger';
 import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
 import type { RootState } from 'app/store/store';
-import { omit } from 'es-toolkit/compat';
 import { imageUploadedClientSide } from 'features/gallery/store/actions';
 import { selectListBoardsQueryArgs } from 'features/gallery/store/gallerySelectors';
 import { boardIdSelected, galleryViewChanged } from 'features/gallery/store/gallerySlice';
 import { toast } from 'features/toast/toast';
 import { t } from 'i18next';
+import { omit } from 'lodash-es';
 import { boardsApi } from 'services/api/endpoints/boards';
 import { imagesApi } from 'services/api/endpoints/images';
 import type { ImageDTO } from 'services/api/types';

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

@@ -0,0 +1,30 @@
+import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
+import { selectionChanged } from 'features/gallery/store/gallerySlice';
+import { imagesApi } from 'services/api/endpoints/images';
+import type { ImageDTO } from 'services/api/types';
+
+export const addImagesStarredListener = (startAppListening: AppStartListening) => {
+  startAppListening({
+    matcher: imagesApi.endpoints.starImages.matchFulfilled,
+    effect: (action, { dispatch, getState }) => {
+      const { updated_image_names: starredImages } = action.payload;
+
+      const state = getState();
+
+      const { selection } = state.gallery;
+      const updatedSelection: ImageDTO[] = [];
+
+      selection.forEach((selectedImageDTO) => {
+        if (starredImages.includes(selectedImageDTO.image_name)) {
+          updatedSelection.push({
+            ...selectedImageDTO,
+            starred: true,
+          });
+        } else {
+          updatedSelection.push(selectedImageDTO);
+        }
+      });
+      dispatch(selectionChanged(updatedSelection));
+    },
+  });
+};

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

@@ -0,0 +1,30 @@
+import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
+import { selectionChanged } from 'features/gallery/store/gallerySlice';
+import { imagesApi } from 'services/api/endpoints/images';
+import type { ImageDTO } from 'services/api/types';
+
+export const addImagesUnstarredListener = (startAppListening: AppStartListening) => {
+  startAppListening({
+    matcher: imagesApi.endpoints.unstarImages.matchFulfilled,
+    effect: (action, { dispatch, getState }) => {
+      const { updated_image_names: unstarredImages } = action.payload;
+
+      const state = getState();
+
+      const { selection } = state.gallery;
+      const updatedSelection: ImageDTO[] = [];
+
+      selection.forEach((selectedImageDTO) => {
+        if (unstarredImages.includes(selectedImageDTO.image_name)) {
+          updatedSelection.push({
+            ...selectedImageDTO,
+            starred: false,
+          });
+        } else {
+          updatedSelection.push(selectedImageDTO);
+        }
+      });
+      dispatch(selectionChanged(updatedSelection));
+    },
+  });
+};

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

@@ -1,8 +1,8 @@
-import { objectEquals } from '@observ33r/object-equals';
 import { createAction } from '@reduxjs/toolkit';
 import { logger } from 'app/logging/logger';
 import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
 import { $baseUrl } from 'app/store/nanostores/baseUrl';
+import { isEqual } from 'lodash-es';
 import { atom } from 'nanostores';
 import { api } from 'services/api';
 import { modelsApi } from 'services/api/endpoints/models';
@@ -64,7 +64,7 @@ export const addSocketConnectedEventListener = (startAppListening: AppStartListe
         const nextQueueStatusData = await queueStatusRequest.unwrap();
 
         // If the queue hasn't changed, we don't need to do anything.
-        if (objectEquals(prevQueueStatusData?.queue, nextQueueStatusData.queue)) {
+        if (isEqual(prevQueueStatusData?.queue, nextQueueStatusData.queue)) {
           return;
         }
 

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

@@ -1,13 +0,0 @@
-import { $didStudioInit } from 'app/hooks/useStudioInitAction';
-import { atom, computed } from 'nanostores';
-import { flushSync } from 'react-dom';
-
-export const $isLayoutLoading = atom(false);
-export const setIsLayoutLoading = (isLoading: boolean) => {
-  flushSync(() => {
-    $isLayoutLoading.set(isLoading);
-  });
-};
-export const $globalIsLoading = computed([$didStudioInit, $isLayoutLoading], (didStudioInit, isLayoutLoading) => {
-  return !didStudioInit || isLayoutLoading;
-});

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

@@ -4,7 +4,6 @@ import { logger } from 'app/logging/logger';
 import { idbKeyValDriver } from 'app/store/enhancers/reduxRemember/driver';
 import { errorHandler } from 'app/store/enhancers/reduxRemember/errors';
 import { deepClone } from 'common/util/deepClone';
-import { keys, mergeWith, omit, pick } from 'es-toolkit/compat';
 import { changeBoardModalSlice } from 'features/changeBoardModal/store/slice';
 import { canvasSettingsPersistConfig, canvasSettingsSlice } from 'features/controlLayers/store/canvasSettingsSlice';
 import { canvasPersistConfig, canvasSlice, canvasUndoableConfig } from 'features/controlLayers/store/canvasSlice';
@@ -29,6 +28,7 @@ import { configSlice } from 'features/system/store/configSlice';
 import { systemPersistConfig, systemSlice } from 'features/system/store/systemSlice';
 import { uiPersistConfig, uiSlice } from 'features/ui/store/uiSlice';
 import { diff } from 'jsondiffpatch';
+import { keys, mergeWith, omit, pick } from 'lodash-es';
 import dynamicMiddlewares from 'redux-dynamic-middlewares';
 import type { SerializeFunction, UnserializeFunction } from 'redux-remember';
 import { rememberEnhancer, rememberReducer } from 'redux-remember';

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

@@ -15,9 +15,9 @@ import {
 } from '@invoke-ai/ui-library';
 import { createSelector } from '@reduxjs/toolkit';
 import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
-import { merge, omit } from 'es-toolkit/compat';
 import { selectSystemSlice, setShouldEnableInformationalPopovers } from 'features/system/store/systemSlice';
 import { toast } from 'features/toast/toast';
+import { merge, omit } from 'lodash-es';
 import type { ReactElement } from 'react';
 import { memo, useCallback, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';

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

@@ -17,7 +17,6 @@ const Loading = () => {
       right={0}
       bottom={0}
       left={0}
-      zIndex={99999}
     >
       <Image src={InvokeLogoWhite} w="8rem" h="8rem" />
       <Spinner

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

@@ -1,5 +1,5 @@
 import { deepClone } from 'common/util/deepClone';
-import { merge } from 'es-toolkit/compat';
+import { merge } from 'lodash-es';
 import { ClickScrollPlugin, OverlayScrollbars } from 'overlayscrollbars';
 import type { UseOverlayScrollbarsParams } from 'overlayscrollbars-react';
 import type { CSSProperties } from 'react';

invokeai/frontend/web/src/common/components/OverlayScrollbars/overlayscrollbars.css

@@ -1,6 +1,6 @@
 .os-scrollbar {
   /*      The size of the scrollbar */
-  --os-size: 8px;
+  --os-size: 9px;
   /*      The axis-perpedicular padding of the scrollbar (horizontal: padding-y, vertical: padding-x) */
   /* --os-padding-perpendicular: 0; */
   /*      The axis padding of the scrollbar (horizontal: padding-x, vertical: padding-y) */
@@ -8,11 +8,11 @@
   /*      The border radius of the scrollbar track */
   /* --os-track-border-radius: 0; */
   /*      The background of the scrollbar track */
-  --os-track-bg: rgba(0, 0, 0, 0.5);
+  /* --os-track-bg: rgba(0, 0, 0, 0.3); */
   /*      The :hover background of the scrollbar track */
-  --os-track-bg-hover: rgba(0, 0, 0, 0.5);
+  /* --os-track-bg-hover: rgba(0, 0, 0, 0.3); */
   /*      The :active background of the scrollbar track */
-  --os-track-bg-active: rgba(0, 0, 0, 0.6);
+  /* --os-track-bg-active: rgba(0, 0, 0, 0.3); */
   /*      The border of the scrollbar track */
   /* --os-track-border: none; */
   /*      The :hover background of the scrollbar track */
@@ -22,11 +22,11 @@
   /*      The border radius of the scrollbar handle */
   /* --os-handle-border-radius: 2px; */
   /*      The background of the scrollbar handle */
-  --os-handle-bg: var(--invoke-colors-base-400);
+  /* --os-handle-bg: var(--invokeai-colors-accentAlpha-500); */
   /*      The :hover background of the scrollbar handle */
-  --os-handle-bg-hover: var(--invoke-colors-base-300);
+  /* --os-handle-bg-hover: var(--invokeai-colors-accentAlpha-700); */
   /*      The :active background of the scrollbar handle */
-  --os-handle-bg-active: var(--invoke-colors-base-250);
+  /* --os-handle-bg-active: var(--invokeai-colors-accentAlpha-800); */
   /*      The border of the scrollbar handle */
   /* --os-handle-border: none; */
   /*      The :hover border of the scrollbar handle */
@@ -34,23 +34,23 @@
   /*      The :active border of the scrollbar handle */
   /* --os-handle-border-active: none; */
   /*      The min size of the scrollbar handle */
-  --os-handle-min-size: 32px;
+  --os-handle-min-size: 50px;
   /*      The max size of the scrollbar handle */
   /* --os-handle-max-size: none; */
   /*      The axis-perpedicular size of the scrollbar handle (horizontal: height, vertical: width) */
   /* --os-handle-perpendicular-size: 100%; */
   /*      The :hover axis-perpedicular size of the scrollbar handle (horizontal: height, vertical: width) */
-  --os-handle-perpendicular-size-hover: 100%;
+  /* --os-handle-perpendicular-size-hover: 100%; */
   /*      The :active axis-perpedicular size of the scrollbar handle (horizontal: height, vertical: width) */
   /* --os-handle-perpendicular-size-active: 100%; */
   /*      Increases the interactive area of the scrollbar handle. */
-  --os-handle-interactive-area-offset: -1px;
+  /* --os-handle-interactive-area-offset: 0; */
 }
 
 .os-scrollbar-handle {
-  /* cursor: grab; */
+  cursor: grab;
 }
 
 .os-scrollbar-handle:active {
-  /* cursor: grabbing; */
+  cursor: grabbing;
 }

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

@@ -1,29 +0,0 @@
-import { combine } from '@atlaskit/pragmatic-drag-and-drop/combine';
-import { dropTargetForElements } from '@atlaskit/pragmatic-drag-and-drop/element/adapter';
-import { dropTargetForExternal } from '@atlaskit/pragmatic-drag-and-drop/external/adapter';
-import { useTimeoutCallback } from 'common/hooks/useTimeoutCallback';
-import type { RefObject } from 'react';
-import { useEffect } from 'react';
-
-export const useCallbackOnDragEnter = (cb: () => void, ref: RefObject<HTMLElement>, delay = 300) => {
-  const [run, cancel] = useTimeoutCallback(cb, delay);
-
-  useEffect(() => {
-    const element = ref.current;
-    if (!element) {
-      return;
-    }
-    return combine(
-      dropTargetForElements({
-        element,
-        onDragEnter: run,
-        onDragLeave: cancel,
-      }),
-      dropTargetForExternal({
-        element,
-        onDragEnter: run,
-        onDragLeave: cancel,
-      })
-    );
-  }, [cancel, ref, run]);
-};

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

@@ -61,15 +61,6 @@ export const useGlobalHotkeys = () => {
     dependencies: [clearQueue],
   });
 
-  useRegisteredHotkeys({
-    id: 'selectGenerateTab',
-    category: 'app',
-    callback: () => {
-      dispatch(setActiveTab('generate'));
-    },
-    dependencies: [dispatch],
-  });
-
   useRegisteredHotkeys({
     id: 'selectCanvasTab',
     category: 'app',
@@ -117,20 +108,4 @@ export const useGlobalHotkeys = () => {
     },
     dependencies: [dispatch, isModelManagerEnabled],
   });
-
-  // TODO: implement delete - needs to handle gallery focus, which has changed w/ dockview
-  // useRegisteredHotkeys({
-  //   id: 'deleteSelection',
-  //   category: 'gallery',
-  //   callback: () => {
-  //     if (!selection.length) {
-  //       return;
-  //     }
-  //     deleteImageModal.delete(selection);
-  //   },
-  //   options: {
-  //     enabled: (isGalleryFocused || isImageViewerFocused) && isDeleteEnabledByTab && !isWorkflowsFocused,
-  //   },
-  //   dependencies: [isWorkflowsFocused, isDeleteEnabledByTab, selection, isWorkflowsFocused],
-  // });
 };

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

@@ -2,10 +2,10 @@ import type { ComboboxOnChange, ComboboxOption } from '@invoke-ai/ui-library';
 import { createSelector } from '@reduxjs/toolkit';
 import { useAppSelector } from 'app/store/storeHooks';
 import type { GroupBase } from 'chakra-react-select';
-import { groupBy, reduce } from 'es-toolkit/compat';
 import { selectParamsSlice } from 'features/controlLayers/store/paramsSlice';
 import type { ModelIdentifierField } from 'features/nodes/types/common';
 import { selectSystemShouldEnableModelDescriptions } from 'features/system/store/systemSlice';
+import { groupBy, reduce } from 'lodash-es';
 import { useCallback, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import type { AnyModelConfig } from 'services/api/types';

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

@@ -1,7 +1,7 @@
 import { useAppStore } from 'app/store/nanostores/store';
-import { debounce } from 'es-toolkit/compat';
 import type { Dimensions } from 'features/controlLayers/store/types';
 import { selectUiSlice, textAreaSizesStateChanged } from 'features/ui/store/uiSlice';
+import { debounce } from 'lodash-es';
 import { type RefObject, useCallback, useEffect, useMemo } from 'react';
 
 type Options = {

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

@@ -3,10 +3,10 @@ import { EMPTY_ARRAY } from 'app/store/constants';
 import { createMemoizedSelector } from 'app/store/createMemoizedSelector';
 import { useAppSelector } from 'app/store/storeHooks';
 import type { GroupBase } from 'chakra-react-select';
-import { uniq } from 'es-toolkit/compat';
 import { selectLoRAsSlice } from 'features/controlLayers/store/lorasSlice';
 import { selectParamsSlice } from 'features/controlLayers/store/paramsSlice';
 import type { ModelIdentifierField } from 'features/nodes/types/common';
+import { uniq } from 'lodash-es';
 import { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useGetRelatedModelIdsBatchQuery } from 'services/api/endpoints/modelRelationships';

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

@@ -1,28 +0,0 @@
-import type { Selector } from '@reduxjs/toolkit';
-import type { RootState } from 'app/store/store';
-import { useAppStore } from 'app/store/storeHooks';
-import type { Atom, WritableAtom } from 'nanostores';
-import { atom } from 'nanostores';
-import { useEffect, useState } from 'react';
-
-/* eslint-disable-next-line @typescript-eslint/no-explicit-any */
-export const useSelectorAsAtom = <T extends Selector<RootState, any>>(selector: T): Atom<ReturnType<T>> => {
-  const store = useAppStore();
-  const $atom = useState<WritableAtom<ReturnType<T>>>(() => atom<ReturnType<T>>(selector(store.getState())))[0];
-
-  useEffect(() => {
-    const unsubscribe = store.subscribe(() => {
-      const prev = $atom.get();
-      const next = selector(store.getState());
-      if (prev !== next) {
-        $atom.set(next);
-      }
-    });
-
-    return () => {
-      unsubscribe();
-    };
-  }, [$atom, selector, store]);
-
-  return $atom;
-};

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

@@ -1,21 +0,0 @@
-import { useCallback, useMemo, useRef } from 'react';
-
-export const useTimeoutCallback = (callback: () => void, delay: number, onCancel?: () => void) => {
-  const timeoutRef = useRef<number | null>(null);
-  const cancel = useCallback(() => {
-    if (timeoutRef.current !== null) {
-      window.clearTimeout(timeoutRef.current);
-      timeoutRef.current = null;
-      onCancel?.();
-    }
-  }, [onCancel]);
-  const callWithTimeout = useCallback(() => {
-    cancel();
-    timeoutRef.current = window.setTimeout(() => {
-      callback();
-      timeoutRef.current = null;
-    }, delay);
-  }, [callback, cancel, delay]);
-  const api = useMemo(() => [callWithTimeout, cancel] as const, [callWithTimeout, cancel]);
-  return api;
-};

invokeai/frontend/web/src/common/util/generateSeeds.ts

@@ -1,5 +1,5 @@
 import { NUMPY_RAND_MAX, NUMPY_RAND_MIN } from 'app/constants';
-import { random } from 'es-toolkit/compat';
+import { random } from 'lodash-es';
 
 type GenerateSeedsArg = {
   count: number;

invokeai/frontend/web/src/common/util/zodUtils.ts

@@ -1,4 +1,4 @@
-import type { z } from 'zod/v4';
+import type { z } from 'zod';
 
 /**
  * Helper to create a type guard from a zod schema. The type guard will infer the schema's TS type.

invokeai/frontend/web/src/features/changeBoardModal/components/ChangeBoardModal.tsx

@@ -16,7 +16,7 @@ import { useAddImagesToBoardMutation, useRemoveImagesFromBoardMutation } from 's
 
 const selectImagesToChange = createMemoizedSelector(
   selectChangeBoardModalSlice,
-  (changeBoardModal) => changeBoardModal.image_names
+  (changeBoardModal) => changeBoardModal.imagesToChange
 );
 
 const selectIsModalOpen = createSelector(
@@ -57,10 +57,10 @@ const ChangeBoardModal = () => {
     }
 
     if (selectedBoard === 'none') {
-      removeImagesFromBoard({ image_names: imagesToChange });
+      removeImagesFromBoard({ imageDTOs: imagesToChange });
     } else {
       addImagesToBoard({
-        image_names: imagesToChange,
+        imageDTOs: imagesToChange,
         board_id: selectedBoard,
       });
     }

invokeai/frontend/web/src/features/changeBoardModal/store/initialState.ts

@@ -2,5 +2,5 @@ import type { ChangeBoardModalState } from './types';
 
 export const initialState: ChangeBoardModalState = {
   isModalOpen: false,
-  image_names: [],
+  imagesToChange: [],
 };

invokeai/frontend/web/src/features/changeBoardModal/store/slice.ts

@@ -1,6 +1,7 @@
 import type { PayloadAction } from '@reduxjs/toolkit';
 import { createSlice } from '@reduxjs/toolkit';
 import type { RootState } from 'app/store/store';
+import type { ImageDTO } from 'services/api/types';
 
 import { initialState } from './initialState';
 
@@ -11,11 +12,11 @@ export const changeBoardModalSlice = createSlice({
     isModalOpenChanged: (state, action: PayloadAction<boolean>) => {
       state.isModalOpen = action.payload;
     },
-    imagesToChangeSelected: (state, action: PayloadAction<string[]>) => {
-      state.image_names = action.payload;
+    imagesToChangeSelected: (state, action: PayloadAction<ImageDTO[]>) => {
+      state.imagesToChange = action.payload;
     },
     changeBoardReset: (state) => {
-      state.image_names = [];
+      state.imagesToChange = [];
       state.isModalOpen = false;
     },
   },

invokeai/frontend/web/src/features/changeBoardModal/store/types.ts

@@ -1,4 +1,6 @@
+import type { ImageDTO } from 'services/api/types';
+
 export type ChangeBoardModalState = {
   isModalOpen: boolean;
-  image_names: string[];
+  imagesToChange: ImageDTO[];
 };

invokeai/frontend/web/src/features/controlLayers/components/AdvancedSession/AdvancedSession.tsx

@@ -1,18 +1,5 @@
 import type { SystemStyleObject } from '@invoke-ai/ui-library';
-import {
-  ContextMenu,
-  Divider,
-  Flex,
-  IconButton,
-  Menu,
-  MenuButton,
-  MenuList,
-  Tab,
-  TabList,
-  TabPanel,
-  TabPanels,
-  Tabs,
-} from '@invoke-ai/ui-library';
+import { ContextMenu, Divider, Flex, IconButton, Menu, MenuButton, MenuList } from '@invoke-ai/ui-library';
 import { useAppSelector } from 'app/store/storeHooks';
 import { FocusRegionWrapper } from 'common/components/FocusRegionWrapper';
 import { CanvasAlertsInvocationProgress } from 'features/controlLayers/components/CanvasAlerts/CanvasAlertsInvocationProgress';
@@ -26,15 +13,12 @@ import { CanvasHUD } from 'features/controlLayers/components/HUD/CanvasHUD';
 import { InvokeCanvasComponent } from 'features/controlLayers/components/InvokeCanvasComponent';
 import { SelectObject } from 'features/controlLayers/components/SelectObject/SelectObject';
 import { CanvasSessionContextProvider } from 'features/controlLayers/components/SimpleSession/context';
-import { GenerateLaunchpadPanel } from 'features/controlLayers/components/SimpleSession/GenerateLaunchpadPanel';
 import { StagingAreaItemsList } from 'features/controlLayers/components/SimpleSession/StagingAreaItemsList';
 import { StagingAreaToolbar } from 'features/controlLayers/components/StagingArea/StagingAreaToolbar';
 import { CanvasToolbar } from 'features/controlLayers/components/Toolbar/CanvasToolbar';
 import { Transform } from 'features/controlLayers/components/Transform/Transform';
 import { CanvasManagerProviderGate } from 'features/controlLayers/contexts/CanvasManagerProviderGate';
 import { selectDynamicGrid, selectShowHUD } from 'features/controlLayers/store/canvasSettingsSlice';
-import { ImageViewer } from 'features/gallery/components/ImageViewer/ImageViewer';
-import { ViewerToolbar } from 'features/gallery/components/ImageViewer/ViewerToolbar';
 import { memo, useCallback } from 'react';
 import { PiDotsThreeOutlineVerticalFill } from 'react-icons/pi';
 
@@ -76,107 +60,87 @@ export const AdvancedSession = memo(({ id }: { id: string | null }) => {
   }, []);
 
   return (
-    <Tabs w="full" h="full">
-      <TabList>
-        <Tab>Welcome</Tab>
-        <Tab>Workspace</Tab>
-        <Tab>Viewer</Tab>
-      </TabList>
-      <TabPanels w="full" h="full">
-        <TabPanel w="full" h="full" justifyContent="center">
-          <GenerateLaunchpadPanel />
-        </TabPanel>
-        <TabPanel w="full" h="full">
-          <FocusRegionWrapper region="canvas" sx={FOCUS_REGION_STYLES}>
-            <Flex
-              tabIndex={-1}
-              borderRadius="base"
-              position="relative"
-              flexDirection="column"
-              height="full"
-              width="full"
-              gap={2}
-              alignItems="center"
-              justifyContent="center"
-              overflow="hidden"
-            >
+    <FocusRegionWrapper region="canvas" sx={FOCUS_REGION_STYLES}>
+      <Flex
+        tabIndex={-1}
+        borderRadius="base"
+        position="relative"
+        flexDirection="column"
+        height="full"
+        width="full"
+        gap={2}
+        alignItems="center"
+        justifyContent="center"
+        overflow="hidden"
+      >
+        <CanvasManagerProviderGate>
+          <CanvasToolbar />
+        </CanvasManagerProviderGate>
+        <Divider />
+        <ContextMenu<HTMLDivElement> renderMenu={renderMenu} withLongPress={false}>
+          {(ref) => (
+            <Flex ref={ref} sx={canvasBgSx} data-dynamic-grid={dynamicGrid}>
+              <InvokeCanvasComponent />
               <CanvasManagerProviderGate>
-                <CanvasToolbar />
-              </CanvasManagerProviderGate>
-              <Divider />
-              <ContextMenu<HTMLDivElement> renderMenu={renderMenu} withLongPress={false}>
-                {(ref) => (
-                  <Flex ref={ref} sx={canvasBgSx} data-dynamic-grid={dynamicGrid}>
-                    <InvokeCanvasComponent />
-                    <CanvasManagerProviderGate>
-                      <Flex
-                        position="absolute"
-                        flexDir="column"
-                        top={1}
-                        insetInlineStart={1}
-                        pointerEvents="none"
-                        gap={2}
-                        alignItems="flex-start"
-                      >
-                        {showHUD && <CanvasHUD />}
-                        <CanvasAlertsSelectedEntityStatus />
-                        <CanvasAlertsPreserveMask />
-                        <CanvasAlertsInvocationProgress />
-                      </Flex>
-                      <Flex position="absolute" top={1} insetInlineEnd={1}>
-                        <Menu>
-                          <MenuButton as={IconButton} icon={<PiDotsThreeOutlineVerticalFill />} colorScheme="base" />
-                          <MenuContent />
-                        </Menu>
-                      </Flex>
-                    </CanvasManagerProviderGate>
-                  </Flex>
-                )}
-              </ContextMenu>
-              {id !== null && (
-                <CanvasManagerProviderGate>
-                  <CanvasSessionContextProvider type="advanced" id={id}>
-                    <Flex
-                      position="absolute"
-                      flexDir="column"
-                      bottom={4}
-                      gap={2}
-                      align="center"
-                      justify="center"
-                      left={4}
-                      right={4}
-                    >
-                      <Flex position="relative" maxW="full" w="full" h={108}>
-                        <StagingAreaItemsList />
-                      </Flex>
-                      <Flex gap={2}>
-                        <StagingAreaToolbar />
-                      </Flex>
-                    </Flex>
-                  </CanvasSessionContextProvider>
-                </CanvasManagerProviderGate>
-              )}
-              <Flex position="absolute" bottom={4}>
-                <CanvasManagerProviderGate>
-                  <Filter />
-                  <Transform />
-                  <SelectObject />
-                </CanvasManagerProviderGate>
-              </Flex>
-              <CanvasManagerProviderGate>
-                <CanvasDropArea />
+                <Flex
+                  position="absolute"
+                  flexDir="column"
+                  top={1}
+                  insetInlineStart={1}
+                  pointerEvents="none"
+                  gap={2}
+                  alignItems="flex-start"
+                >
+                  {showHUD && <CanvasHUD />}
+                  <CanvasAlertsSelectedEntityStatus />
+                  <CanvasAlertsPreserveMask />
+                  <CanvasAlertsInvocationProgress />
+                </Flex>
+                <Flex position="absolute" top={1} insetInlineEnd={1}>
+                  <Menu>
+                    <MenuButton as={IconButton} icon={<PiDotsThreeOutlineVerticalFill />} colorScheme="base" />
+                    <MenuContent />
+                  </Menu>
+                </Flex>
               </CanvasManagerProviderGate>
             </Flex>
-          </FocusRegionWrapper>
-        </TabPanel>
-        <TabPanel w="full" h="full">
-          <Flex flexDir="column" w="full" h="full">
-            <ViewerToolbar />
-            <ImageViewer />
-          </Flex>
-        </TabPanel>
-      </TabPanels>
-    </Tabs>
+          )}
+        </ContextMenu>
+        {id !== null && (
+          <CanvasManagerProviderGate>
+            <CanvasSessionContextProvider type="advanced" id={id}>
+              <Flex
+                position="absolute"
+                flexDir="column"
+                bottom={4}
+                gap={2}
+                align="center"
+                justify="center"
+                left={4}
+                right={4}
+              >
+                <Flex position="relative" maxW="full" w="full" h={108}>
+                  <StagingAreaItemsList />
+                </Flex>
+                <Flex gap={2}>
+                  <StagingAreaToolbar />
+                </Flex>
+              </Flex>
+            </CanvasSessionContextProvider>
+          </CanvasManagerProviderGate>
+        )}
+        <Flex position="absolute" bottom={4}>
+          <CanvasManagerProviderGate>
+            <Filter />
+            <Transform />
+            <SelectObject />
+          </CanvasManagerProviderGate>
+        </Flex>
+        <CanvasManagerProviderGate>
+          <CanvasDropArea />
+        </CanvasManagerProviderGate>
+      </Flex>
+    </FocusRegionWrapper>
   );
 });
 AdvancedSession.displayName = 'AdvancedSession';

invokeai/frontend/web/src/features/controlLayers/components/CanvasEntityList/CanvasEntityGroupList.tsx

@@ -118,7 +118,7 @@ export const CanvasEntityGroupList = memo(({ isSelected, type, children, entityI
 
   return (
     <Flex flexDir="column" w="full">
-      <Flex w="full" ps={2}>
+      <Flex w="full">
         <Flex
           flexGrow={1}
           as={Button}

invokeai/frontend/web/src/features/controlLayers/components/CanvasEntityList/EntityListSelectedEntityActionBarOpacity.tsx

@@ -15,7 +15,6 @@ import {
 } from '@invoke-ai/ui-library';
 import { createSelector } from '@reduxjs/toolkit';
 import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
-import { clamp, round } from 'es-toolkit/compat';
 import { snapToNearest } from 'features/controlLayers/konva/util';
 import { entityOpacityChanged } from 'features/controlLayers/store/canvasSlice';
 import {
@@ -23,6 +22,7 @@ import {
   selectEntity,
   selectSelectedEntityIdentifier,
 } from 'features/controlLayers/store/selectors';
+import { clamp, round } from 'lodash-es';
 import type { KeyboardEvent } from 'react';
 import { memo, useCallback, useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';

invokeai/frontend/web/src/features/controlLayers/components/CanvasLayersPanelContent.tsx

@@ -1,20 +1,25 @@
-import { Divider, Flex } from '@invoke-ai/ui-library';
+import { Divider, Flex, type SystemStyleObject } from '@invoke-ai/ui-library';
 import { useAppSelector } from 'app/store/storeHooks';
+import { FocusRegionWrapper } from 'common/components/FocusRegionWrapper';
 import { CanvasAddEntityButtons } from 'features/controlLayers/components/CanvasAddEntityButtons';
 import { CanvasEntityList } from 'features/controlLayers/components/CanvasEntityList/CanvasEntityList';
 import { EntityListSelectedEntityActionBar } from 'features/controlLayers/components/CanvasEntityList/EntityListSelectedEntityActionBar';
-import { CanvasManagerProviderGate } from 'features/controlLayers/contexts/CanvasManagerProviderGate';
 import { selectHasEntities } from 'features/controlLayers/store/selectors';
 import { memo } from 'react';
 
 import { ParamDenoisingStrength } from './ParamDenoisingStrength';
 
-export const CanvasLayersPanel = memo(() => {
+const FOCUS_REGION_STYLES: SystemStyleObject = {
+  width: 'full',
+  height: 'full',
+};
+
+export const CanvasLayersPanelContent = memo(() => {
   const hasEntities = useAppSelector(selectHasEntities);
 
   return (
-    <CanvasManagerProviderGate>
-      <Flex flexDir="column" gap={2} w="full" h="full" p={2}>
+    <FocusRegionWrapper region="layers" sx={FOCUS_REGION_STYLES}>
+      <Flex flexDir="column" gap={2} w="full" h="full">
         <EntityListSelectedEntityActionBar />
         <Divider py={0} />
         <ParamDenoisingStrength />
@@ -22,8 +27,8 @@ export const CanvasLayersPanel = memo(() => {
         {!hasEntities && <CanvasAddEntityButtons />}
         {hasEntities && <CanvasEntityList />}
       </Flex>
-    </CanvasManagerProviderGate>
+    </FocusRegionWrapper>
   );
 });
 
-CanvasLayersPanel.displayName = 'CanvasLayersPanel';
+CanvasLayersPanelContent.displayName = 'CanvasLayersPanelContent';

invokeai/frontend/web/src/features/controlLayers/components/Filters/FilterTypeSelect.tsx

@@ -3,10 +3,10 @@ import { Combobox, Flex, FormControl, FormLabel } from '@invoke-ai/ui-library';
 import { createSelector } from '@reduxjs/toolkit';
 import { useAppSelector } from 'app/store/storeHooks';
 import { InformationalPopover } from 'common/components/InformationalPopover/InformationalPopover';
-import { includes, map } from 'es-toolkit/compat';
 import type { FilterConfig } from 'features/controlLayers/store/filters';
 import { IMAGE_FILTERS, isFilterType } from 'features/controlLayers/store/filters';
 import { selectConfigSlice } from 'features/system/store/configSlice';
+import { includes, map } from 'lodash-es';
 import { memo, useCallback, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { assert } from 'tsafe';

invokeai/frontend/web/src/features/controlLayers/components/RefImage/RefImage.tsx

@@ -0,0 +1,132 @@
+import {
+  Divider,
+  Flex,
+  IconButton,
+  Image,
+  Popover,
+  PopoverAnchor,
+  PopoverArrow,
+  PopoverBody,
+  PopoverContent,
+  Portal,
+  Skeleton,
+} from '@invoke-ai/ui-library';
+import { skipToken } from '@reduxjs/toolkit/query';
+import { POPPER_MODIFIERS } from 'common/components/InformationalPopover/constants';
+import type { UseDisclosure } from 'common/hooks/useBoolean';
+import { useDisclosure } from 'common/hooks/useBoolean';
+import { DEFAULT_FILTER, useFilterableOutsideClick } from 'common/hooks/useFilterableOutsideClick';
+import { RefImageHeader } from 'features/controlLayers/components/RefImage/RefImageHeader';
+import { RefImageSettings } from 'features/controlLayers/components/RefImage/RefImageSettings';
+import { useRefImageEntity } from 'features/controlLayers/components/RefImage/useRefImageEntity';
+import { useRefImageIdContext } from 'features/controlLayers/contexts/RefImageIdContext';
+import { memo, useCallback, useRef } from 'react';
+import { PiImageBold } from 'react-icons/pi';
+import { useGetImageDTOQuery } from 'services/api/endpoints/images';
+
+// There is some awkwardness here with closing the popover when clicking outside of it, related to Chakra's
+// handling of refs, portals, outside clicks, and a race condition with framer-motion animations that can leave
+// the popover closed when its internal state is still open.
+//
+// We have to manually manage the popover open state to work around the race condition, and then have to do special
+// handling to close the popover when clicking outside of it.
+
+// We have to reach outside react to identify the popover trigger element instead of using refs, thanks to how Chakra
+// handles refs for PopoverAnchor internally. Maybe there is some way to merge them but I couldn't figure it out.
+const getRefImagePopoverTriggerId = (id: string) => `ref-image-popover-trigger-${id}`;
+
+export const RefImage = memo(() => {
+  const id = useRefImageIdContext();
+  const ref = useRef<HTMLDivElement>(null);
+  const disclosure = useDisclosure(false);
+  // This filter prevents the popover from closing when clicking on a sibling portal element, like the dropdown menu
+  // inside the ref image settings popover. It also prevents the popover from closing when clicking on the popover's
+  // own trigger element.
+  const filter = useCallback(
+    (el: HTMLElement | SVGElement) => {
+      return DEFAULT_FILTER(el) || el.id === getRefImagePopoverTriggerId(id);
+    },
+    [id]
+  );
+  useFilterableOutsideClick({ ref, handler: disclosure.close, filter });
+
+  return (
+    <Popover
+      // The popover contains a react-select component, which uses a portal to render its options. This portal
+      // is itself not lazy. As a result, if we do not unmount the popover when it is closed, the react-select
+      // component still exists but is invisible, and intercepts clicks!
+      isLazy
+      lazyBehavior="unmount"
+      isOpen={disclosure.isOpen}
+      closeOnBlur={false}
+      modifiers={POPPER_MODIFIERS}
+    >
+      <Thumbnail disclosure={disclosure} />
+      <Portal>
+        <PopoverContent ref={ref} w={400}>
+          <PopoverArrow />
+          <PopoverBody>
+            <Flex flexDir="column" gap={2} w="full" h="full">
+              <RefImageHeader />
+              <Divider />
+              <RefImageSettings />
+            </Flex>
+          </PopoverBody>
+        </PopoverContent>
+      </Portal>
+    </Popover>
+  );
+});
+RefImage.displayName = 'RefImage';
+
+const Thumbnail = memo(({ disclosure }: { disclosure: UseDisclosure }) => {
+  const id = useRefImageIdContext();
+  const entity = useRefImageEntity(id);
+  const { data: imageDTO } = useGetImageDTOQuery(entity.config.image?.image_name ?? skipToken);
+
+  if (!entity.config.image) {
+    return (
+      <PopoverAnchor>
+        <IconButton
+          id={getRefImagePopoverTriggerId(id)}
+          aria-label="Open Reference Image Settings"
+          h="full"
+          variant="ghost"
+          aspectRatio="1/1"
+          borderWidth="2px !important"
+          borderStyle="dashed !important"
+          borderColor="errorAlpha.500"
+          borderRadius="base"
+          icon={<PiImageBold />}
+          colorScheme="error"
+          onClick={disclosure.toggle}
+          flexShrink={0}
+        />
+      </PopoverAnchor>
+    );
+  }
+  return (
+    <PopoverAnchor>
+      <Image
+        borderWidth={1}
+        borderStyle="solid"
+        id={getRefImagePopoverTriggerId(id)}
+        role="button"
+        src={imageDTO?.thumbnail_url}
+        objectFit="contain"
+        aspectRatio="1/1"
+        // width={imageDTO?.width}
+        height={imageDTO?.height}
+        fallback={<Skeleton h="full" aspectRatio="1/1" />}
+        maxW="full"
+        maxH="full"
+        borderRadius="base"
+        onClick={disclosure.toggle}
+        flexShrink={0}
+        // sx={imageSx}
+        // data-is-open={disclosure.isOpen}
+      />
+    </PopoverAnchor>
+  );
+});
+Thumbnail.displayName = 'Thumbnail';

invokeai/frontend/web/src/features/controlLayers/components/RefImage/RefImageHeader.tsx

@@ -1,46 +1,38 @@
-import type { SystemStyleObject } from '@invoke-ai/ui-library';
 import { Flex, IconButton, Text } from '@invoke-ai/ui-library';
-import { createSelector } from '@reduxjs/toolkit';
-import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
+import { useAppDispatch } from 'app/store/storeHooks';
 import { useRefImageEntity } from 'features/controlLayers/components/RefImage/useRefImageEntity';
 import { useRefImageIdContext } from 'features/controlLayers/contexts/RefImageIdContext';
-import { refImageDeleted, selectRefImageEntityIds } from 'features/controlLayers/store/refImagesSlice';
-import { memo, useCallback, useMemo } from 'react';
+import { refImageDeleted } from 'features/controlLayers/store/refImagesSlice';
+import { memo, useCallback } from 'react';
 import { PiTrashBold } from 'react-icons/pi';
 
-const textSx: SystemStyleObject = {
-  color: 'base.300',
-  '&[data-is-error="true"]': {
-    color: 'error.300',
-  },
-};
-
 export const RefImageHeader = memo(() => {
-  const dispatch = useAppDispatch();
   const id = useRefImageIdContext();
-  const selectRefImageNumber = useMemo(
-    () => createSelector(selectRefImageEntityIds, (ids) => ids.indexOf(id) + 1),
-    [id]
-  );
-  const refImageNumber = useAppSelector(selectRefImageNumber);
+  const dispatch = useAppDispatch();
   const entity = useRefImageEntity(id);
   const deleteRefImage = useCallback(() => {
     dispatch(refImageDeleted({ id }));
   }, [dispatch, id]);
 
   return (
-    <Flex justifyContent="space-between" alignItems="center" w="full" ps={2}>
-      <Text fontWeight="semibold" sx={textSx} data-is-error={!entity.config.image}>
-        Reference Image #{refImageNumber}
-      </Text>
+    <Flex justifyContent="space-between" alignItems="center" w="full">
+      {entity.config.image !== null && (
+        <Text fontWeight="semibold" color="base.300">
+          Reference Image
+        </Text>
+      )}
+      {entity.config.image === null && (
+        <Text fontWeight="semibold" color="base.300">
+          No Reference Image Selected
+        </Text>
+      )}
       <IconButton
-        tooltip="Delete Reference Image"
         size="xs"
         variant="link"
         alignSelf="stretch"
-        aria-label="Delete ref image"
-        onClick={deleteRefImage}
         icon={<PiTrashBold />}
+        onClick={deleteRefImage}
+        aria-label="Delete reference image"
         colorScheme="error"
       />
     </Flex>

invokeai/frontend/web/src/features/controlLayers/components/RefImage/RefImageList.tsx

@@ -1,16 +1,12 @@
-import { Button, Collapse, Divider, Flex } from '@invoke-ai/ui-library';
+import type { FlexProps } from '@invoke-ai/ui-library';
+import { Button, Flex } from '@invoke-ai/ui-library';
 import { useAppStore } from 'app/store/nanostores/store';
 import { useAppSelector } from 'app/store/storeHooks';
 import { useImageUploadButton } from 'common/hooks/useImageUploadButton';
-import { RefImagePreview } from 'features/controlLayers/components/RefImage/RefImagePreview';
+import { RefImage } from 'features/controlLayers/components/RefImage/RefImage';
 import { RefImageIdContext } from 'features/controlLayers/contexts/RefImageIdContext';
 import { getDefaultRefImageConfig } from 'features/controlLayers/hooks/addLayerHooks';
-import {
-  refImageAdded,
-  selectIsRefImagePanelOpen,
-  selectRefImageEntityIds,
-  selectSelectedRefEntityId,
-} from 'features/controlLayers/store/refImagesSlice';
+import { refImageAdded, selectRefImageEntityIds } from 'features/controlLayers/store/refImagesSlice';
 import { imageDTOToImageWithDims } from 'features/controlLayers/store/util';
 import { addGlobalReferenceImageDndTarget } from 'features/dnd/dnd';
 import { DndDropTarget } from 'features/dnd/DndDropTarget';
@@ -18,38 +14,17 @@ import { memo, useMemo } from 'react';
 import { PiUploadBold } from 'react-icons/pi';
 import type { ImageDTO } from 'services/api/types';
 
-import { RefImageHeader } from './RefImageHeader';
-import { RefImageSettings } from './RefImageSettings';
-
-export const RefImageList = memo(() => {
+export const RefImageList = memo((props: FlexProps) => {
   const ids = useAppSelector(selectRefImageEntityIds);
-  const isPanelOpen = useAppSelector(selectIsRefImagePanelOpen);
-  const selectedEntityId = useAppSelector(selectSelectedRefEntityId);
-
   return (
-    <Flex flexDir="column">
-      <Flex gap={2} h={16}>
-        {ids.map((id) => (
-          <RefImageIdContext.Provider key={id} value={id}>
-            <RefImagePreview />
-          </RefImageIdContext.Provider>
-        ))}
-        {ids.length < 5 && <AddRefImageDropTargetAndButton />}
-        {ids.length >= 5 && <MaxRefImages />}
-      </Flex>
-      <Collapse in={isPanelOpen}>
-        <Flex pt={2} w="full">
-          {selectedEntityId !== null && (
-            <RefImageIdContext.Provider value={selectedEntityId}>
-              <Flex flexDir="column" gap={2} w="full" h="full" borderRadius="base" bg="base.800" p={2}>
-                <RefImageHeader />
-                <Divider />
-                <RefImageSettings />
-              </Flex>
-            </RefImageIdContext.Provider>
-          )}
-        </Flex>
-      </Collapse>
+    <Flex gap={2} h={16} {...props}>
+      {ids.map((id) => (
+        <RefImageIdContext.Provider key={id} value={id}>
+          <RefImage />
+        </RefImageIdContext.Provider>
+      ))}
+      {ids.length < 5 && <AddRefImageDropTargetAndButton />}
+      {ids.length >= 5 && <MaxRefImages />}
     </Flex>
   );
 });

invokeai/frontend/web/src/features/controlLayers/components/RefImage/RefImageModel.tsx

@@ -47,7 +47,7 @@ export const RefImageModel = memo(({ modelKey, onChangeModel }: Props) => {
 
   return (
     <Tooltip label={selectedModel?.description}>
-      <FormControl isInvalid={!value || currentBaseModel !== selectedModel?.base} w="full" minW={0}>
+      <FormControl isInvalid={!value || currentBaseModel !== selectedModel?.base} w="full">
         <Combobox
           options={options}
           placeholder={t('common.placeholderSelectAModel')}

invokeai/frontend/web/src/features/controlLayers/components/RefImage/RefImagePreview.tsx

@@ -1,162 +0,0 @@
-import type { SystemStyleObject } from '@invoke-ai/ui-library';
-import { Flex, Icon, IconButton, Image, Skeleton, Text } from '@invoke-ai/ui-library';
-import { skipToken } from '@reduxjs/toolkit/query';
-import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
-import { round } from 'es-toolkit/compat';
-import { useRefImageEntity } from 'features/controlLayers/components/RefImage/useRefImageEntity';
-import { useRefImageIdContext } from 'features/controlLayers/contexts/RefImageIdContext';
-import {
-  refImageSelected,
-  selectIsRefImagePanelOpen,
-  selectSelectedRefEntityId,
-} from 'features/controlLayers/store/refImagesSlice';
-import { isIPAdapterConfig } from 'features/controlLayers/store/types';
-import { memo, useCallback, useEffect, useMemo, useState } from 'react';
-import { PiExclamationMarkBold, PiImageBold } from 'react-icons/pi';
-import { useGetImageDTOQuery } from 'services/api/endpoints/images';
-
-const baseSx: SystemStyleObject = {
-  '&[data-is-open="true"]': {
-    borderColor: 'invokeBlue.300',
-  },
-};
-
-const weightDisplaySx: SystemStyleObject = {
-  pointerEvents: 'none',
-  transitionProperty: 'opacity',
-  transitionDuration: 'normal',
-  opacity: 0,
-  '&[data-visible="true"]': {
-    opacity: 1,
-  },
-};
-
-const getImageSxWithWeight = (weight: number): SystemStyleObject => {
-  const fillPercentage = Math.max(0, Math.min(100, weight * 100));
-
-  return {
-    ...baseSx,
-    _after: {
-      content: '""',
-      position: 'absolute',
-      inset: 0,
-      background: `linear-gradient(to top, transparent ${fillPercentage}%, rgba(0, 0, 0, 0.8) ${fillPercentage}%)`,
-      pointerEvents: 'none',
-      borderRadius: 'base',
-    },
-  };
-};
-
-export const RefImagePreview = memo(() => {
-  const dispatch = useAppDispatch();
-  const id = useRefImageIdContext();
-  const entity = useRefImageEntity(id);
-  const selectedEntityId = useAppSelector(selectSelectedRefEntityId);
-  const isPanelOpen = useAppSelector(selectIsRefImagePanelOpen);
-  const [showWeightDisplay, setShowWeightDisplay] = useState(false);
-  const { data: imageDTO } = useGetImageDTOQuery(entity.config.image?.image_name ?? skipToken);
-
-  const sx = useMemo(() => {
-    if (!isIPAdapterConfig(entity.config)) {
-      return baseSx;
-    }
-    return getImageSxWithWeight(entity.config.weight);
-  }, [entity.config]);
-
-  useEffect(() => {
-    if (!isIPAdapterConfig(entity.config)) {
-      return;
-    }
-    setShowWeightDisplay(true);
-    const timeout = window.setTimeout(() => {
-      setShowWeightDisplay(false);
-    }, 1000);
-    return () => {
-      window.clearTimeout(timeout);
-    };
-  }, [entity.config]);
-
-  const onClick = useCallback(() => {
-    dispatch(refImageSelected({ id }));
-  }, [dispatch, id]);
-
-  if (!entity.config.image) {
-    return (
-      <IconButton
-        aria-label="Select Ref Image"
-        h="full"
-        variant="ghost"
-        aspectRatio="1/1"
-        borderWidth={1}
-        borderStyle="solid"
-        borderColor="error.300"
-        borderRadius="base"
-        icon={<PiImageBold />}
-        colorScheme="error"
-        onClick={onClick}
-        flexShrink={0}
-        data-is-open={selectedEntityId === id && isPanelOpen}
-        data-is-error={true}
-        sx={sx}
-      />
-    );
-  }
-  return (
-    <Flex
-      position="relative"
-      borderWidth={1}
-      borderStyle="solid"
-      borderRadius="base"
-      aspectRatio="1/1"
-      maxW="full"
-      maxH="full"
-      flexShrink={0}
-      sx={sx}
-      data-is-open={selectedEntityId === id && isPanelOpen}
-      data-is-error={!entity.config.model}
-      role="button"
-      onClick={onClick}
-      cursor="pointer"
-    >
-      <Image
-        src={imageDTO?.thumbnail_url}
-        objectFit="contain"
-        aspectRatio="1/1"
-        height={imageDTO?.height}
-        fallback={<Skeleton h="full" aspectRatio="1/1" />}
-        maxW="full"
-        maxH="full"
-        borderRadius="base"
-      />
-      {isIPAdapterConfig(entity.config) && (
-        <Flex
-          position="absolute"
-          inset={0}
-          fontWeight="semibold"
-          alignItems="center"
-          justifyContent="center"
-          zIndex={1}
-          data-visible={showWeightDisplay}
-          sx={weightDisplaySx}
-        >
-          <Text filter="drop-shadow(0px 0px 4px rgb(0, 0, 0)) drop-shadow(0px 0px 2px rgba(0, 0, 0, 1))">
-            {`${round(entity.config.weight * 100, 2)}%`}
-          </Text>
-        </Flex>
-      )}
-      {!entity.config.model && (
-        <Icon
-          position="absolute"
-          top="50%"
-          left="50%"
-          transform="translateX(-50%) translateY(-50%)"
-          filter="drop-shadow(0px 0px 4px rgb(0, 0, 0)) drop-shadow(0px 0px 2px rgba(0, 0, 0, 1))"
-          color="error.500"
-          boxSize={16}
-          as={PiExclamationMarkBold}
-        />
-      )}
-    </Flex>
-  );
-});
-RefImagePreview.displayName = 'RefImagePreview';

invokeai/frontend/web/src/features/controlLayers/components/SimpleSession/CanvasLaunchpadPanel.tsx

@@ -1,42 +0,0 @@
-import { Button, Flex, Grid, Heading, Text } from '@invoke-ai/ui-library';
-import { useAutoLayoutContext } from 'features/ui/layouts/auto-layout-context';
-import { WORKSPACE_PANEL_ID } from 'features/ui/layouts/shared';
-import { memo, useCallback } from 'react';
-
-import { InitialStateMainModelPicker } from './InitialStateMainModelPicker';
-import { LaunchpadAddStyleReference } from './LaunchpadAddStyleReference';
-import { LaunchpadEditImageButton } from './LaunchpadEditImageButton';
-import { LaunchpadGenerateFromTextButton } from './LaunchpadGenerateFromTextButton';
-import { LaunchpadUseALayoutImageButton } from './LaunchpadUseALayoutImageButton';
-
-export const CanvasLaunchpadPanel = memo(() => {
-  const ctx = useAutoLayoutContext();
-  const focusCanvas = useCallback(() => {
-    ctx.focusPanel(WORKSPACE_PANEL_ID);
-  }, [ctx]);
-  return (
-    <Flex flexDir="column" h="full" w="full" alignItems="center" gap={2}>
-      <Flex flexDir="column" w="full" gap={4} px={14} maxW={768} pt="20vh">
-        <Heading mb={4}>Edit and refine on Canvas.</Heading>
-        <Flex flexDir="column" gap={8}>
-          <Grid gridTemplateColumns="1fr 1fr" gap={8}>
-            <InitialStateMainModelPicker />
-            <Flex flexDir="column" gap={2} justifyContent="center">
-              <Text>
-                Want to learn what prompts work best for each model?{' '}
-                <Button as="a" variant="link" href="#" size="sm">
-                  Check our our Model Guide.
-                </Button>
-              </Text>
-            </Flex>
-          </Grid>
-          <LaunchpadGenerateFromTextButton extraAction={focusCanvas} />
-          <LaunchpadAddStyleReference extraAction={focusCanvas} />
-          <LaunchpadEditImageButton extraAction={focusCanvas} />
-          <LaunchpadUseALayoutImageButton extraAction={focusCanvas} />
-        </Flex>
-      </Flex>
-    </Flex>
-  );
-});
-CanvasLaunchpadPanel.displayName = 'CanvasLaunchpadPanel';

invokeai/frontend/web/src/features/controlLayers/components/SimpleSession/InitialState.tsx

@@ -1,26 +1,29 @@
-import { Alert, Button, Flex, Grid, Heading, Text } from '@invoke-ai/ui-library';
+import { Alert, Button, Divider, Flex, Grid, Heading, Text } from '@invoke-ai/ui-library';
 import { useAppDispatch } from 'app/store/storeHooks';
+import { InitialStateAddAStyleReference } from 'features/controlLayers/components/SimpleSession/InitialStateAddAStyleReference';
+import { InitialStateGenerateFromText } from 'features/controlLayers/components/SimpleSession/InitialStateGenerateFromText';
 import { InitialStateMainModelPicker } from 'features/controlLayers/components/SimpleSession/InitialStateMainModelPicker';
-import { LaunchpadAddStyleReference } from 'features/controlLayers/components/SimpleSession/LaunchpadAddStyleReference';
 import { setActiveTab } from 'features/ui/store/uiSlice';
 import { memo, useCallback } from 'react';
 
-import { LaunchpadGenerateFromTextButton } from './LaunchpadGenerateFromTextButton';
-
-export const GenerateLaunchpadPanel = memo(() => {
+export const InitialState = memo(() => {
   const dispatch = useAppDispatch();
   const newCanvasSession = useCallback(() => {
     dispatch(setActiveTab('canvas'));
   }, [dispatch]);
 
   return (
-    <Flex flexDir="column" h="full" w="full" alignItems="center" gap={2}>
-      <Flex flexDir="column" w="full" gap={4} px={14} maxW={768} pt="20vh">
-        <Heading mb={4}>Generate images from text prompts.</Heading>
-        <Flex flexDir="column" gap={8}>
-          <Grid gridTemplateColumns="1fr 1fr" gap={8}>
+    <Flex flexDir="column" h="full" w="full" gap={2}>
+      <Flex px={2} alignItems="center" minH="24px">
+        <Heading size="sm">Get Started</Heading>
+      </Flex>
+      <Divider />
+      <Flex flexDir="column" h="full" justifyContent="center" mx={16}>
+        <Heading mb={4}>Get started with Invoke.</Heading>
+        <Flex flexDir="column" gap={4}>
+          <Grid gridTemplateColumns="1fr 1fr" gap={4}>
             <InitialStateMainModelPicker />
-            <Flex flexDir="column" gap={2} justifyContent="center">
+            <Flex flexDir="column" gap={2}>
               <Text>
                 Want to learn what prompts work best for each model?{' '}
                 <Button as="a" variant="link" href="#" size="sm">
@@ -29,8 +32,8 @@ export const GenerateLaunchpadPanel = memo(() => {
               </Text>
             </Flex>
           </Grid>
-          <LaunchpadGenerateFromTextButton />
-          <LaunchpadAddStyleReference />
+          <InitialStateGenerateFromText />
+          <InitialStateAddAStyleReference />
           <Alert status="info" borderRadius="base" flexDir="column" gap={2} overflow="unset">
             <Text fontSize="md" fontWeight="semibold">
               Looking to get more control, edit, and iterate on your images?
@@ -44,4 +47,4 @@ export const GenerateLaunchpadPanel = memo(() => {
     </Flex>
   );
 });
-GenerateLaunchpadPanel.displayName = 'GenerateLaunchpad';
+InitialState.displayName = 'InitialState';

invokeai/frontend/web/src/features/controlLayers/components/SimpleSession/InitialStateAddAStyleReference.tsx

@@ -1,7 +1,7 @@
 import { Flex, Heading, Icon, Text } from '@invoke-ai/ui-library';
 import { useAppStore } from 'app/store/nanostores/store';
 import { useImageUploadButton } from 'common/hooks/useImageUploadButton';
-import { LaunchpadButton } from 'features/controlLayers/components/SimpleSession/LaunchpadButton';
+import { InitialStateButtonGridItem } from 'features/controlLayers/components/SimpleSession/InitialStateButtonGridItem';
 import { getDefaultRefImageConfig } from 'features/controlLayers/hooks/addLayerHooks';
 import { refImageAdded } from 'features/controlLayers/store/refImagesSlice';
 import { imageDTOToImageWithDims } from 'features/controlLayers/store/util';
@@ -13,7 +13,7 @@ import type { ImageDTO } from 'services/api/types';
 
 const dndTargetData = addGlobalReferenceImageDndTarget.getData();
 
-export const LaunchpadAddStyleReference = memo((props: { extraAction?: () => void }) => {
+export const InitialStateAddAStyleReference = memo(() => {
   const { dispatch, getState } = useAppStore();
 
   const uploadOptions = useMemo(
@@ -23,17 +23,16 @@ export const LaunchpadAddStyleReference = memo((props: { extraAction?: () => voi
           const config = getDefaultRefImageConfig(getState);
           config.image = imageDTOToImageWithDims(imageDTO);
           dispatch(refImageAdded({ overrides: { config } }));
-          props.extraAction?.();
         },
         allowMultiple: false,
       }) as const,
-    [dispatch, getState, props]
+    [dispatch, getState]
   );
 
   const uploadApi = useImageUploadButton(uploadOptions);
 
   return (
-    <LaunchpadButton {...uploadApi.getUploadButtonProps()} position="relative" gap={8}>
+    <InitialStateButtonGridItem {...uploadApi.getUploadButtonProps()} position="relative" gap={8}>
       <Icon as={PiUserCircleGearBold} boxSize={8} color="base.500" />
       <Flex flexDir="column" alignItems="flex-start" gap={2}>
         <Heading size="sm">Add a Style Reference</Heading>
@@ -44,7 +43,7 @@ export const LaunchpadAddStyleReference = memo((props: { extraAction?: () => voi
         <input {...uploadApi.getUploadInputProps()} />
       </Flex>
       <DndDropTarget dndTarget={newCanvasFromImageDndTarget} dndTargetData={dndTargetData} label="Drop" />
-    </LaunchpadButton>
+    </InitialStateButtonGridItem>
   );
 });
-LaunchpadAddStyleReference.displayName = 'LaunchpadAddStyleReference';
+InitialStateAddAStyleReference.displayName = 'InitialStateAddAStyleReference';

invokeai/frontend/web/src/features/controlLayers/components/SimpleSession/InitialStateButtonGridItem.tsx

@@ -2,7 +2,7 @@ import type { ButtonProps } from '@invoke-ai/ui-library';
 import { Button, forwardRef } from '@invoke-ai/ui-library';
 import { memo } from 'react';
 
-export const LaunchpadButton = memo(
+export const InitialStateButtonGridItem = memo(
   forwardRef(({ children, ...rest }: ButtonProps, ref) => {
     return (
       <Button
@@ -26,4 +26,4 @@ export const LaunchpadButton = memo(
   })
 );
 
-LaunchpadButton.displayName = 'LaunchpadButton';
+InitialStateButtonGridItem.displayName = 'InitialStateButtonGridItem';

invokeai/frontend/web/src/features/controlLayers/components/SimpleSession/InitialStateEditImageCard.tsx

@@ -1,7 +1,7 @@
 import { Flex, Heading, Icon, Text } from '@invoke-ai/ui-library';
 import { useAppStore } from 'app/store/nanostores/store';
 import { useImageUploadButton } from 'common/hooks/useImageUploadButton';
-import { LaunchpadButton } from 'features/controlLayers/components/SimpleSession/LaunchpadButton';
+import { InitialStateButtonGridItem } from 'features/controlLayers/components/SimpleSession/InitialStateButtonGridItem';
 import { newCanvasFromImageDndTarget } from 'features/dnd/dnd';
 import { DndDropTarget } from 'features/dnd/DndDropTarget';
 import { newCanvasFromImage } from 'features/imageActions/actions';
@@ -13,31 +13,28 @@ const NEW_CANVAS_OPTIONS = { type: 'raster_layer', withInpaintMask: true } as co
 
 const dndTargetData = newCanvasFromImageDndTarget.getData(NEW_CANVAS_OPTIONS);
 
-export const LaunchpadEditImageButton = memo((props: { extraAction?: () => void }) => {
+export const InitialStateEditImageCard = memo(() => {
   const { getState, dispatch } = useAppStore();
 
   const onUpload = useCallback(
     (imageDTO: ImageDTO) => {
       newCanvasFromImage({ imageDTO, getState, dispatch, ...NEW_CANVAS_OPTIONS });
-      props.extraAction?.();
     },
-    [dispatch, getState, props]
+    [dispatch, getState]
   );
   const uploadApi = useImageUploadButton({ allowMultiple: false, onUpload });
 
   return (
-    <LaunchpadButton {...uploadApi.getUploadButtonProps()} position="relative" gap={8}>
+    <InitialStateButtonGridItem {...uploadApi.getUploadButtonProps()}>
       <Icon as={PiPencilBold} boxSize={8} color="base.500" />
-      <Flex flexDir="column" alignItems="flex-start" gap={2}>
-        <Heading size="sm">Edit Image</Heading>
-        <Text color="base.300">Add an image to refine.</Text>
-      </Flex>
-      <Flex position="absolute" right={3} bottom={3}>
+      <Heading size="sm">Edit Image</Heading>
+      <Text color="base.300">Add an image to refine.</Text>
+      <Flex w="full" justifyContent="flex-end" p={2}>
         <PiUploadBold />
         <input {...uploadApi.getUploadInputProps()} />
       </Flex>
       <DndDropTarget dndTarget={newCanvasFromImageDndTarget} dndTargetData={dndTargetData} label="Drop" />
-    </LaunchpadButton>
+    </InitialStateButtonGridItem>
   );
 });
-LaunchpadEditImageButton.displayName = 'LaunchpadEditImageButton';
+InitialStateEditImageCard.displayName = 'InitialStateEditImageCard';

invokeai/frontend/web/src/features/controlLayers/components/SimpleSession/InitialStateGenerateFromText.tsx

@@ -0,0 +1,28 @@
+import { Flex, Heading, Icon, Text } from '@invoke-ai/ui-library';
+import { InitialStateButtonGridItem } from 'features/controlLayers/components/SimpleSession/InitialStateButtonGridItem';
+import { memo } from 'react';
+import { PiCursorTextBold, PiTextAaBold } from 'react-icons/pi';
+
+const focusOnPrompt = () => {
+  const promptElement = document.getElementById('prompt');
+  if (promptElement instanceof HTMLTextAreaElement) {
+    promptElement.focus();
+    promptElement.select();
+  }
+};
+
+export const InitialStateGenerateFromText = memo(() => {
+  return (
+    <InitialStateButtonGridItem onClick={focusOnPrompt} position="relative" gap={8}>
+      <Icon as={PiTextAaBold} boxSize={8} color="base.500" />
+      <Flex flexDir="column" alignItems="flex-start" gap={2}>
+        <Heading size="sm">Generate from Text</Heading>
+        <Text color="base.300">Enter a prompt and Invoke.</Text>
+      </Flex>
+      <Flex position="absolute" right={3} bottom={3}>
+        <PiCursorTextBold />
+      </Flex>
+    </InitialStateButtonGridItem>
+  );
+});
+InitialStateGenerateFromText.displayName = 'InitialStateGenerateFromText';