mirror of
https://github.com/invoke-ai/InvokeAI
synced 2024-08-30 20:32:17 +00:00
bf94412d14
multi-select actions include:
- drag to board to move all to that board
- right click to add all to board or delete all
backend changes:
- add routes for changing board for list of image names, deleting list of images
- change image-specific routes to `images/i/{image_name}` to not clobber other routes (like `images/upload`, `images/delete`)
- subclass pydantic `BaseModel` as `BaseModelExcludeNull`, which excludes null values when calling `dict()` on the model. this fixes inconsistent types related to JSON parsing null values into `null` instead of `undefined`
- remove `board_id` from `remove_image_from_board`
frontend changes:
- multi-selection stuff uses `ImageDTO[]` as payloads, for dnd and other mutations. this gives us access to image `board_id`s when hitting routes, and enables efficient cache updates.
- consolidate change board and delete image modals to handle single and multiples
- board totals are now re-fetched on mutation and not kept in sync manually - was way too tedious to do this
- fixed warning about nested `<p>` elements
- closes #4088 , need to handle case when `autoAddBoardId` is `"none"`
- add option to show gallery image delete button on every gallery image
frontend refactors/organisation:
- make typegen script js instead of ts
- enable `noUncheckedIndexedAccess` to help avoid bugs when indexing into arrays, many small changes needed to satisfy TS after this
- move all image-related endpoints into `endpoints/images.ts`, its a big file now, but this fixes a number of circular dependency issues that were otherwise felt impossible to resolve
120 lines
3.4 KiB
Python
120 lines
3.4 KiB
Python
from abc import ABC, abstractmethod
|
|
from logging import Logger
|
|
from typing import List, Union, Optional
|
|
from invokeai.app.services.board_image_record_storage import BoardImageRecordStorageBase
|
|
from invokeai.app.services.board_record_storage import (
|
|
BoardRecord,
|
|
BoardRecordStorageBase,
|
|
)
|
|
|
|
from invokeai.app.services.image_record_storage import (
|
|
ImageRecordStorageBase,
|
|
OffsetPaginatedResults,
|
|
)
|
|
from invokeai.app.services.models.board_record import BoardDTO
|
|
from invokeai.app.services.models.image_record import ImageDTO, image_record_to_dto
|
|
from invokeai.app.services.urls import UrlServiceBase
|
|
|
|
|
|
class BoardImagesServiceABC(ABC):
|
|
"""High-level service for board-image relationship management."""
|
|
|
|
@abstractmethod
|
|
def add_image_to_board(
|
|
self,
|
|
board_id: str,
|
|
image_name: str,
|
|
) -> None:
|
|
"""Adds an image to a board."""
|
|
pass
|
|
|
|
@abstractmethod
|
|
def remove_image_from_board(
|
|
self,
|
|
image_name: str,
|
|
) -> None:
|
|
"""Removes an image from a board."""
|
|
pass
|
|
|
|
@abstractmethod
|
|
def get_all_board_image_names_for_board(
|
|
self,
|
|
board_id: str,
|
|
) -> list[str]:
|
|
"""Gets all board images for a board, as a list of the image names."""
|
|
pass
|
|
|
|
@abstractmethod
|
|
def get_board_for_image(
|
|
self,
|
|
image_name: str,
|
|
) -> Optional[str]:
|
|
"""Gets an image's board id, if it has one."""
|
|
pass
|
|
|
|
|
|
class BoardImagesServiceDependencies:
|
|
"""Service dependencies for the BoardImagesService."""
|
|
|
|
board_image_records: BoardImageRecordStorageBase
|
|
board_records: BoardRecordStorageBase
|
|
image_records: ImageRecordStorageBase
|
|
urls: UrlServiceBase
|
|
logger: Logger
|
|
|
|
def __init__(
|
|
self,
|
|
board_image_record_storage: BoardImageRecordStorageBase,
|
|
image_record_storage: ImageRecordStorageBase,
|
|
board_record_storage: BoardRecordStorageBase,
|
|
url: UrlServiceBase,
|
|
logger: Logger,
|
|
):
|
|
self.board_image_records = board_image_record_storage
|
|
self.image_records = image_record_storage
|
|
self.board_records = board_record_storage
|
|
self.urls = url
|
|
self.logger = logger
|
|
|
|
|
|
class BoardImagesService(BoardImagesServiceABC):
|
|
_services: BoardImagesServiceDependencies
|
|
|
|
def __init__(self, services: BoardImagesServiceDependencies):
|
|
self._services = services
|
|
|
|
def add_image_to_board(
|
|
self,
|
|
board_id: str,
|
|
image_name: str,
|
|
) -> None:
|
|
self._services.board_image_records.add_image_to_board(board_id, image_name)
|
|
|
|
def remove_image_from_board(
|
|
self,
|
|
image_name: str,
|
|
) -> None:
|
|
self._services.board_image_records.remove_image_from_board(image_name)
|
|
|
|
def get_all_board_image_names_for_board(
|
|
self,
|
|
board_id: str,
|
|
) -> list[str]:
|
|
return self._services.board_image_records.get_all_board_image_names_for_board(board_id)
|
|
|
|
def get_board_for_image(
|
|
self,
|
|
image_name: str,
|
|
) -> Optional[str]:
|
|
board_id = self._services.board_image_records.get_board_for_image(image_name)
|
|
return board_id
|
|
|
|
|
|
def board_record_to_dto(board_record: BoardRecord, cover_image_name: Optional[str], image_count: int) -> BoardDTO:
|
|
"""Converts a board record to a board DTO."""
|
|
return BoardDTO(
|
|
**board_record.dict(exclude={"cover_image_name"}),
|
|
cover_image_name=cover_image_name,
|
|
image_count=image_count,
|
|
)
|