Skip to content

Commit

Permalink
fix(api): add new args to all uses of get_all_board_image_names_for_b…
Browse files Browse the repository at this point in the history
…oard
  • Loading branch information
Mary Hipp authored and maryhipp committed Feb 26, 2025
1 parent 1cbd609 commit 0063315
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 6 deletions.
6 changes: 5 additions & 1 deletion invokeai/app/services/bulk_download/bulk_download_default.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,11 @@ def _image_handler(self, image_names: list[str]) -> list[ImageDTO]:
return [self._invoker.services.images.get_dto(image_name) for image_name in image_names]

def _board_handler(self, board_id: str) -> list[ImageDTO]:
image_names = self._invoker.services.board_image_records.get_all_board_image_names_for_board(board_id)
image_names = self._invoker.services.board_image_records.get_all_board_image_names_for_board(
board_id,
categories=None,
is_intermediate=None,
)
return self._image_handler(image_names)

def generate_item_id(self, board_id: Optional[str]) -> str:
Expand Down
8 changes: 6 additions & 2 deletions invokeai/app/services/images/images_default.py
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,11 @@ def delete(self, image_name: str):

def delete_images_on_board(self, board_id: str):
try:
image_names = self.__invoker.services.board_image_records.get_all_board_image_names_for_board(board_id)
image_names = self.__invoker.services.board_image_records.get_all_board_image_names_for_board(
board_id,
categories=None,
is_intermediate=None,
)
for image_name in image_names:
self.__invoker.services.image_files.delete(image_name)
self.__invoker.services.image_records.delete_many(image_names)
Expand All @@ -278,7 +282,7 @@ def delete_images_on_board(self, board_id: str):
self.__invoker.services.logger.error("Failed to delete image files")
raise
except Exception as e:
self.__invoker.services.logger.error("Problem deleting image records and files")
self.__invoker.services.logger.error(f"Problem deleting image records and files: {str(e)}")
raise e

def delete_intermediates(self) -> int:
Expand Down
14 changes: 11 additions & 3 deletions invokeai/app/services/shared/invocation_context.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,15 @@

from invokeai.app.invocations.constants import IMAGE_MODES
from invokeai.app.invocations.fields import MetadataField, WithBoard, WithMetadata
from invokeai.app.services.board_records.board_records_common import BoardRecordOrderBy
from invokeai.app.services.boards.boards_common import BoardDTO
from invokeai.app.services.config.config_default import InvokeAIAppConfig
from invokeai.app.services.image_records.image_records_common import ImageCategory, ResourceOrigin
from invokeai.app.services.images.images_common import ImageDTO
from invokeai.app.services.invocation_services import InvocationServices
from invokeai.app.services.model_records.model_records_base import UnknownModelException
from invokeai.app.services.session_processor.session_processor_common import ProgressImage
from invokeai.app.services.shared.sqlite.sqlite_common import SQLiteDirection
from invokeai.app.util.step_callback import flux_step_callback, stable_diffusion_step_callback
from invokeai.backend.model_manager.config import (
AnyModel,
Expand Down Expand Up @@ -102,7 +104,9 @@ def get_all(self) -> list[BoardDTO]:
Returns:
A list of all boards.
"""
return self._services.boards.get_all()
return self._services.boards.get_all(
order_by=BoardRecordOrderBy.CreatedAt, direction=SQLiteDirection.Descending
)

def add_image_to_board(self, board_id: str, image_name: str) -> None:
"""Adds an image to a board.
Expand All @@ -122,7 +126,11 @@ def get_all_image_names_for_board(self, board_id: str) -> list[str]:
Returns:
A list of all image names for the board.
"""
return self._services.board_images.get_all_board_image_names_for_board(board_id)
return self._services.board_images.get_all_board_image_names_for_board(
board_id,
categories=None,
is_intermediate=None,
)


class LoggerInterface(InvocationContextInterface):
Expand Down Expand Up @@ -283,7 +291,7 @@ def get_path(self, image_name: str, thumbnail: bool = False) -> Path:
Returns:
The local path of the image or thumbnail.
"""
return self._services.images.get_path(image_name, thumbnail)
return Path(self._services.images.get_path(image_name, thumbnail))


class TensorsInterface(InvocationContextInterface):
Expand Down

0 comments on commit 0063315

Please sign in to comment.