feat(app): avoid nested cursors in board_image_records service

Author: psychedelicious

invokeai/app/services/board_image_records/board_image_records_sqlite.py

@@ -12,21 +12,18 @@
 
 
 class SqliteBoardImageRecordStorage(BoardImageRecordStorageBase):
-    _conn: sqlite3.Connection
-    _cursor: sqlite3.Cursor
-
     def __init__(self, db: SqliteDatabase) -> None:
         super().__init__()
         self._conn = db.conn
-        self._cursor = self._conn.cursor()
 
     def add_image_to_board(
         self,
         board_id: str,
         image_name: str,
     ) -> None:
         try:
-            self._cursor.execute(
+            cursor = self._conn.cursor()
+            cursor.execute(
                 """--sql
                 INSERT INTO board_images (board_id, image_name)
                 VALUES (?, ?)
@@ -44,7 +41,8 @@ def remove_image_from_board(
         image_name: str,
     ) -> None:
         try:
-            self._cursor.execute(
+            cursor = self._conn.cursor()
+            cursor.execute(
                 """--sql
                 DELETE FROM board_images
                 WHERE image_name = ?;
@@ -63,7 +61,8 @@ def get_images_for_board(
         limit: int = 10,
     ) -> OffsetPaginatedResults[ImageRecord]:
         # TODO: this isn't paginated yet?
-        self._cursor.execute(
+        cursor = self._conn.cursor()
+        cursor.execute(
             """--sql
             SELECT images.*
             FROM board_images
@@ -73,15 +72,15 @@ def get_images_for_board(
             """,
             (board_id,),
         )
-        result = cast(list[sqlite3.Row], self._cursor.fetchall())
+        result = cast(list[sqlite3.Row], cursor.fetchall())
         images = [deserialize_image_record(dict(r)) for r in result]
 
-        self._cursor.execute(
+        cursor.execute(
             """--sql
             SELECT COUNT(*) FROM images WHERE 1=1;
             """
         )
-        count = cast(int, self._cursor.fetchone()[0])
+        count = cast(int, cursor.fetchone()[0])
 
         return OffsetPaginatedResults(items=images, offset=offset, limit=limit, total=count)
 
@@ -128,31 +127,34 @@ def get_all_board_image_names_for_board(
         stmt += ";"
 
         # Execute the query
-        self._cursor.execute(stmt, params)
+        cursor = self._conn.cursor()
+        cursor.execute(stmt, params)
 
-        result = cast(list[sqlite3.Row], self._cursor.fetchall())
+        result = cast(list[sqlite3.Row], cursor.fetchall())
         image_names = [r[0] for r in result]
         return image_names
 
     def get_board_for_image(
         self,
         image_name: str,
     ) -> Optional[str]:
-        self._cursor.execute(
+        cursor = self._conn.cursor()
+        cursor.execute(
             """--sql
                 SELECT board_id
                 FROM board_images
                 WHERE image_name = ?;
                 """,
             (image_name,),
         )
-        result = self._cursor.fetchone()
+        result = cursor.fetchone()
         if result is None:
             return None
         return cast(str, result[0])
 
     def get_image_count_for_board(self, board_id: str) -> int:
-        self._cursor.execute(
+        cursor = self._conn.cursor()
+        cursor.execute(
             """--sql
                 SELECT COUNT(*)
                 FROM board_images
@@ -162,5 +164,5 @@ def get_image_count_for_board(self, board_id: str) -> int:
                 """,
             (board_id,),
         )
-        count = cast(int, self._cursor.fetchone()[0])
+        count = cast(int, cursor.fetchone()[0])
         return count