routes working

invokeai/app/services/board_images.py

@@ -2,7 +2,6 @@ from abc import ABC, abstractmethod
 from logging import Logger
 from invokeai.app.services.board_image_record_storage import BoardImageRecordStorageBase
 from invokeai.app.services.board_record_storage import (
-    BoardDTO,
     BoardRecord,
     BoardRecordStorageBase,
 )
@@ -11,6 +10,7 @@ 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
 

invokeai/app/services/board_record_storage.py

@@ -6,41 +6,11 @@ import threading
 from typing import Optional, Union
 import uuid
 from invokeai.app.services.image_record_storage import OffsetPaginatedResults
+from invokeai.app.services.models.board_record import BoardRecord, deserialize_board_record
 
 from pydantic import BaseModel, Field, Extra
 
 
-class BoardRecord(BaseModel):
-    """Deserialized board record."""
-
-    board_id: str = Field(description="The unique ID of the board.")
-    """The unique ID of the board."""
-    board_name: str = Field(description="The name of the board.")
-    """The name of the board."""
-    created_at: Union[datetime, str] = Field(
-        description="The created timestamp of the board."
-    )
-    """The created timestamp of the image."""
-    updated_at: Union[datetime, str] = Field(
-        description="The updated timestamp of the board."
-    )
-    """The updated timestamp of the image."""
-    cover_image_name: Optional[str] = Field(
-        description="The name of the cover image of the board."
-    )
-    """The name of the cover image of the board."""
-
-
-class BoardDTO(BoardRecord):
-    """Deserialized board record with cover image URL and image count."""
-
-    cover_image_url: Optional[str] = Field(
-        description="The URL of the thumbnail of the board's cover image."
-    )
-    """The URL of the thumbnail of the most recent image in the board."""
-    image_count: int = Field(description="The number of images in the board.")
-    """The number of images in the board."""
-
 
 class BoardChanges(BaseModel, extra=Extra.forbid):
     board_name: Optional[str] = Field(description="The board's new name.")
@@ -221,6 +191,7 @@ class SqliteBoardRecordStorage(BoardRecordStorageBase):
             return BoardRecord(**result)
         except sqlite3.Error as e:
             self._conn.rollback()
+            print(e)
             raise BoardRecordSaveException from e
         finally:
             self._lock.release()
@@ -307,7 +278,7 @@ class SqliteBoardRecordStorage(BoardRecordStorageBase):
             )
 
             result = cast(list[sqlite3.Row], self._cursor.fetchall())
-            boards = [BoardRecord(**dict(row)) for row in result]
+            boards = list(map(lambda r: deserialize_board_record(dict(r)), result))
 
             # Get the total number of boards
             self._cursor.execute(

invokeai/app/services/boards.py

@@ -5,8 +5,6 @@ from invokeai.app.services.board_image_record_storage import BoardImageRecordSto
 from invokeai.app.services.board_images import board_record_to_dto
 
 from invokeai.app.services.board_record_storage import (
-    BoardDTO,
-    BoardRecord,
     BoardChanges,
     BoardRecordStorageBase,
 )
@@ -14,7 +12,7 @@ from invokeai.app.services.image_record_storage import (
     ImageRecordStorageBase,
     OffsetPaginatedResults,
 )
-from invokeai.app.services.models.image_record import ImageDTO
+from invokeai.app.services.models.board_record import BoardDTO
 from invokeai.app.services.urls import UrlServiceBase
 
 

invokeai/app/services/image_record_storage.py

@@ -261,17 +261,6 @@ class SqliteImageRecordStorage(ImageRecordStorageBase):
                     (changes.is_intermediate, image_name),
                 )
 
-            # Change the image's `is_intermediate`` flag
-            if changes.is_intermediate is not None:
-                self._cursor.execute(
-                    f"""--sql
-                    UPDATE images
-                    SET board_id = ?
-                    WHERE image_name = ?;
-                    """,
-                    (changes.is_intermediate, image_name),
-                )
-
             self._conn.commit()
         except sqlite3.Error as e:
             self._conn.rollback()

invokeai/app/services/models/board_record.py

@@ -0,0 +1,57 @@
+from typing import Optional, Union
+from datetime import datetime
+from pydantic import BaseModel, Extra, Field, StrictBool, StrictStr
+from invokeai.app.util.misc import get_iso_timestamp
+
+class BoardRecord(BaseModel):
+    """Deserialized board record."""
+
+    board_id: str = Field(description="The unique ID of the board.")
+    """The unique ID of the board."""
+    board_name: str = Field(description="The name of the board.")
+    """The name of the board."""
+    created_at: Union[datetime, str] = Field(
+        description="The created timestamp of the board."
+    )
+    """The created timestamp of the image."""
+    updated_at: Union[datetime, str] = Field(
+        description="The updated timestamp of the board."
+    )
+    """The updated timestamp of the image."""
+    cover_image_name: Optional[str] = Field(
+        description="The name of the cover image of the board."
+    )
+    """The name of the cover image of the board."""
+
+
+class BoardDTO(BoardRecord):
+    """Deserialized board record with cover image URL and image count."""
+
+    cover_image_url: Optional[str] = Field(
+        description="The URL of the thumbnail of the board's cover image."
+    )
+    """The URL of the thumbnail of the most recent image in the board."""
+    image_count: int = Field(description="The number of images in the board.")
+    """The number of images in the board."""
+
+
+
+
+def deserialize_board_record(board_dict: dict) -> BoardRecord:
+    """Deserializes a board record."""
+
+    # Retrieve all the values, setting "reasonable" defaults if they are not present.
+
+    board_id = board_dict.get("board_id", "unknown")
+    board_name = board_dict.get("board_name", "unknown")
+    created_at = board_dict.get("created_at", get_iso_timestamp())
+    updated_at = board_dict.get("updated_at", get_iso_timestamp())
+    deleted_at = board_dict.get("deleted_at", get_iso_timestamp())
+
+    return BoardRecord(
+        board_id=board_id,
+        board_name=board_name,
+        created_at=created_at,
+        updated_at=updated_at,
+        deleted_at=deleted_at,
+    )