revert(app): get_all_board_image_names_for_board requires board_id

This commit is contained in:
psychedelicious
2025-02-27 08:56:44 +10:00
parent 5d33874d58
commit 559654f0ca
5 changed files with 12 additions and 17 deletions

View File

@ -1,4 +1,4 @@
from typing import Literal, Optional, Union
from typing import Optional, Union
from fastapi import Body, HTTPException, Path, Query
from fastapi.routing import APIRouter
@ -146,7 +146,7 @@ async def list_boards(
response_model=list[str],
)
async def list_all_board_image_names(
board_id: str | Literal["none"] = Path(description="The id of the board"),
board_id: str = Path(description="The id of the board"),
categories: list[ImageCategory] | None = Query(default=None, description="The categories of image to include."),
is_intermediate: bool | None = Query(default=None, description="Whether to list intermediate images."),
) -> list[str]:

View File

@ -1,5 +1,5 @@
from abc import ABC, abstractmethod
from typing import Literal, Optional
from typing import Optional
from invokeai.app.services.image_records.image_records_common import ImageCategory
@ -27,7 +27,7 @@ class BoardImageRecordStorageBase(ABC):
@abstractmethod
def get_all_board_image_names_for_board(
self,
board_id: str | Literal["none"],
board_id: str,
categories: list[ImageCategory] | None,
is_intermediate: bool | None,
) -> list[str]:

View File

@ -1,6 +1,6 @@
import sqlite3
import threading
from typing import Literal, Optional, cast
from typing import Optional, cast
from invokeai.app.services.board_image_records.board_image_records_base import BoardImageRecordStorageBase
from invokeai.app.services.image_records.image_records_common import (
@ -103,7 +103,7 @@ class SqliteBoardImageRecordStorage(BoardImageRecordStorageBase):
def get_all_board_image_names_for_board(
self,
board_id: str | Literal["none"],
board_id: str,
categories: list[ImageCategory] | None,
is_intermediate: bool | None,
) -> list[str]:
@ -118,14 +118,9 @@ class SqliteBoardImageRecordStorage(BoardImageRecordStorageBase):
FROM images
LEFT JOIN board_images ON board_images.image_name = images.image_name
WHERE 1=1
AND board_images.board_id = ?
"""
# Add the board_id filter
if board_id == "none":
stmt += "AND board_images.board_id IS NULL"
else:
stmt += "AND board_images.board_id = ?"
params.append(board_id)
params.append(board_id)
# Add the category filter
if categories is not None:

View File

@ -1,5 +1,5 @@
from abc import ABC, abstractmethod
from typing import Literal, Optional
from typing import Optional
from invokeai.app.services.image_records.image_records_common import ImageCategory
@ -27,7 +27,7 @@ class BoardImagesServiceABC(ABC):
@abstractmethod
def get_all_board_image_names_for_board(
self,
board_id: str | Literal["none"],
board_id: str,
categories: list[ImageCategory] | None,
is_intermediate: bool | None,
) -> list[str]:

View File

@ -1,4 +1,4 @@
from typing import Literal, Optional
from typing import Optional
from invokeai.app.services.board_images.board_images_base import BoardImagesServiceABC
from invokeai.app.services.image_records.image_records_common import ImageCategory
@ -26,7 +26,7 @@ class BoardImagesService(BoardImagesServiceABC):
def get_all_board_image_names_for_board(
self,
board_id: str | Literal["none"],
board_id: str,
categories: list[ImageCategory] | None,
is_intermediate: bool | None,
) -> list[str]: