From 559654f0cafb400edf127b7bc5bb9c2089ebadbb Mon Sep 17 00:00:00 2001
From: psychedelicious <4822129+psychedelicious@users.noreply.github.com>
Date: Thu, 27 Feb 2025 08:56:44 +1000
Subject: [PATCH] revert(app): get_all_board_image_names_for_board requires
 board_id

---
 invokeai/app/api/routers/boards.py                  |  4 ++--
 .../board_image_records/board_image_records_base.py |  4 ++--
 .../board_image_records_sqlite.py                   | 13 ++++---------
 .../app/services/board_images/board_images_base.py  |  4 ++--
 .../services/board_images/board_images_default.py   |  4 ++--
 5 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/invokeai/app/api/routers/boards.py b/invokeai/app/api/routers/boards.py
index 41f15b3fea..05f008268a 100644
--- a/invokeai/app/api/routers/boards.py
+++ b/invokeai/app/api/routers/boards.py
@@ -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]:
diff --git a/invokeai/app/services/board_image_records/board_image_records_base.py b/invokeai/app/services/board_image_records/board_image_records_base.py
index 665e8fdf96..c5f64df844 100644
--- a/invokeai/app/services/board_image_records/board_image_records_base.py
+++ b/invokeai/app/services/board_image_records/board_image_records_base.py
@@ -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]:
diff --git a/invokeai/app/services/board_image_records/board_image_records_sqlite.py b/invokeai/app/services/board_image_records/board_image_records_sqlite.py
index 16329f2564..a47b2b0b35 100644
--- a/invokeai/app/services/board_image_records/board_image_records_sqlite.py
+++ b/invokeai/app/services/board_image_records/board_image_records_sqlite.py
@@ -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:
diff --git a/invokeai/app/services/board_images/board_images_base.py b/invokeai/app/services/board_images/board_images_base.py
index 04118b5f62..c16d971cd2 100644
--- a/invokeai/app/services/board_images/board_images_base.py
+++ b/invokeai/app/services/board_images/board_images_base.py
@@ -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]:
diff --git a/invokeai/app/services/board_images/board_images_default.py b/invokeai/app/services/board_images/board_images_default.py
index a41097281d..437495189f 100644
--- a/invokeai/app/services/board_images/board_images_default.py
+++ b/invokeai/app/services/board_images/board_images_default.py
@@ -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]: